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

List:       koffice-devel
Subject:    [patch] fix for the rest of bug 67515
From:       Ian Reinhart Geiser <geiseri () kde ! org>
Date:       2003-12-16 3:38:45
[Download RAW message or body]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi this patch fixes the rest of bug 67515.  It allows you to print out slides 
iwth text variables and to export them to HTML.  Can I please apply?  

Cheers
	-ian reinhart geiser

- ---cut here ---
Index: kprcanvas.h 
 =================================================================== 
 RCS file: /home/kde/koffice/kpresenter/kprcanvas.h,v 
 retrieving revision 1.143 
 diff -u -u -r1.143 kprcanvas.h 
 --- kprcanvas.h 18 Nov 2003 07:02:29 -0000 1.143 
 +++ kprcanvas.h 14 Dec 2003 18:58:48 -0000 
 @@ -420,7 +420,7 @@ 
 void _repaint( const QRect &r ); 
 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 ); 
 
 Index: kprcanvas.cc 
 =================================================================== 
 RCS file: /home/kde/koffice/kpresenter/kprcanvas.cc,v 
 retrieving revision 1.377 
 diff -u -u -r1.377 kprcanvas.cc 
 --- kprcanvas.cc 18 Nov 2003 07:02:29 -0000 1.377 
 +++ kprcanvas.cc 14 Dec 2003 18:58:54 -0000 
 @@ -3426,7 +3426,10 @@ 
 //draw sticky object 
 //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 ); 
 
 @@ -3462,14 +3465,18 @@ 
 p.end(); 
 } 
 
 -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); 
 - QRect rect = page->getZoomPageRect(); 
 -// TODO set current page to "page" ? 
 + KPrPage* saveActivePage = m_activePage; 
 + KPresenterDoc *doc = m_view->kPresenterDoc(); 
 + KPrPage* page = doc->pageList().at( pageNum ); 
 + QRect rect = page->getZoomPageRect(); 
 + doc->displayActivePage( page ); 
 + setActivePage( page ); 
 drawBackground( painter, rect ); 
 drawObjects( painter, rect, false, SM_NONE, false/*no specific effects*/ ); 
 + setActivePage( saveActivePage ); 
 } 
 
 void KPrCanvas::doObjEffects() 

- ---cut here ---
- -- 
===+<KWeather for KDE 3.1>+=+<http://www.kde.org>+===
   Report for Philadelphia, Northeast Philadelphia Airport
		on Thursday 11 December 2003 09:35
   13°C with winds at 5 km/h NW and 6.4km of visibility.
===============================+<geiseri@kde.org>+===
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2-rc1-SuSE (GNU/Linux)

iD8DBQE/3n5KPy62TRm8dvgRAhUVAJ9FjRsZyunzE9bRJUA5uVZhBpRBnACfYMXe
zzR0DFukhqQfAWVqkCUeXVw=
=QoFh
-----END PGP SIGNATURE-----
_______________________________________________
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]