[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/tools/f-office
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2010-07-30 5:08:43
Message-ID: 20100730050843.9FFCAAC783 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1156947 by rempt:

Make FreOffice follow the KWDocument::kwcanvas->canvasBase refactor

I actually think that Koview should have a canvasBase method.

 M  +4 -4      MainWindow.cpp  


--- trunk/koffice/tools/f-office/MainWindow.cpp #1156946:1156947
@@ -95,7 +95,7 @@
 #include <KoTextEditor.h>
 #include <KoPAView.h>
 #include <KoStore.h>
-#include <KWCanvas.h>
+#include <KoCanvasBase.h>
 #include <styles/KoListLevelProperties.h>
 #include <KoList.h>
 #include <Map.h>
@@ -1316,7 +1316,7 @@
     if(type == Text) {
         m_doubleClick = true;
         m_kwview = qobject_cast<KWView *>(m_view);
-        m_editor = qobject_cast<KoTextEditor *>(m_kwview->kwcanvas()->toolProxy()->selection());
+        m_editor = qobject_cast<KoTextEditor *>(m_kwview->canvasBase()->toolProxy()->selection());
         charstyle=new KoCharacterStyle();
         charstyle->setFontCapitalization(QFont::AllLowercase);
         charstyle->setFontPointSize(m_fontsize);
@@ -1745,7 +1745,7 @@
     } else {
         KoToolManager::instance()->removeCanvasController(m_controller);
         if(m_kwview)
-            m_kwview->kwcanvas()->toolProxy()->deleteSelection();
+            m_kwview->canvasBase()->toolProxy()->deleteSelection();
         delete m_doc;
         m_doc = 0;
         delete m_view;
@@ -1963,7 +1963,7 @@
         m_doubleClick = true;
         m_ui->actionEdit->setVisible(true);
         m_kwview = qobject_cast<KWView *>(m_view);
-        m_editor = qobject_cast<KoTextEditor *>(m_kwview->kwcanvas()->toolProxy()->selection());
+        m_editor = qobject_cast<KoTextEditor *>(m_kwview->canvasBase()->toolProxy()->selection());
     } else {
         if(m_type == Presentation) {
             m_ui->actionEdit->setVisible(false);
[prev in list] [next in list] [prev in thread] [next in thread]