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

List:       koffice-devel
Subject:    koffice/kpresenter
From:       Ian Reinhart Geiser <geiseri () kde ! org>
Date:       2003-12-16 15:12:49
[Download RAW message or body]

CVS commit by geiseri: 

Fix text variables in printings, icon previews, and web export.
Blessed by David and Lukas.

CCMAIL: koffice-devel@mail.kde.org
CCMAIL: 67515-done@bugs.kde.org


  M +12 -5     kprcanvas.cc   1.378
  M +1 -1      kprcanvas.h   1.144


--- koffice/kpresenter/kprcanvas.cc  #1.377:1.378
@@ -3427,5 +3427,8 @@ void KPrCanvas::drawPageInPix( QPixmap &
     //the numbers for the sticky page have to be recalculated
     KPrPage* saveActivePage = m_activePage;
-    setActivePage(m_view->kPresenterDoc()->pageList().at(currPresPage-1));
+    KPresenterDoc *doc = m_view->kPresenterDoc();
+    doc->displayActivePage( doc->pageList().at( currPresPage-1 ) );
+    setActivePage(doc->pageList().at( currPresPage - 1 ) );
+    //setActivePage(m_view->kPresenterDoc()->pageList().at(currPresPage-1));
     drawAllObjectsInPage( &p, stickyPage()->objectList() );
     setActivePage( saveActivePage );
@@ -3463,12 +3466,16 @@ void KPrCanvas::drawCurrentPageInPix( QP
 }
 
-void KPrCanvas::printPage( QPainter* painter, int pageNum ) const
+void KPrCanvas::printPage( QPainter* painter, int pageNum ) 
 {
     //kdDebug(33001) << "KPrCanvas::printPage" << endl;
-    KPrPage* page = m_view->kPresenterDoc()->pageList().at(pageNum);
+    KPrPage* saveActivePage = m_activePage;
+    KPresenterDoc *doc = m_view->kPresenterDoc();
+    KPrPage* page = doc->pageList().at( pageNum );
     QRect rect = page->getZoomPageRect();
-// TODO set current page to "page" ?
+    doc->displayActivePage( page );
+    setActivePage( page );
     drawBackground( painter, rect );
     drawObjects( painter, rect, false, SM_NONE, false/*no specific effects*/ );
+    setActivePage( saveActivePage );
 }
 

--- koffice/kpresenter/kprcanvas.h  #1.143:1.144
@@ -421,5 +421,5 @@ protected:
     void _repaint( KPObject *o );
 
-    void printPage( QPainter*, int pageNum ) const;
+    void printPage( QPainter*, int pageNum );
     void doObjEffects();
     void drawObject( KPObject*, QPixmap*, int, int, int, int, int, int );


_______________________________________________
koffice-devel mailing list
koffice-devel@mail.kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel
[prev in list] [next in list] [prev in thread] [next in thread]