ooo-build r12591 - in trunk: . patches/dev300

[jonp svn gnome org]

Author: jonp
Date: Mon May 19 14:20:24 2008
New Revision: 12591
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12591&view=rev

Log:
	* patches/dev300/sc-print-selected-sheets.diff: After a Format Page,
	  SfxViewShell::Current() returns a different object, so
	  ScDocShell::GetCurTab() always returns 0 and not the currently selected
	  tab.  Cache the current tab in the constructor so we can refer to the
	  appropriate tab within ScPreview::CalcPages.  Fixes n#386052.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/sc-print-selected-sheets.diff

Modified: trunk/patches/dev300/sc-print-selected-sheets.diff
==============================================================================
--- trunk/patches/dev300/sc-print-selected-sheets.diff	(original)
+++ trunk/patches/dev300/sc-print-selected-sheets.diff	Mon May 19 14:20:24 2008
@@ -1,16 +1,40 @@
+Index: sc/source/ui/inc/preview.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/inc/preview.hxx,v
+retrieving revision 1.11
+diff -u -p -r1.11 preview.hxx
+--- sc/source/ui/inc/preview.hxx	10 Apr 2008 23:16:01 -0000	1.11
++++ sc/source/ui/inc/preview.hxx	19 May 2008 14:06:41 -0000
+@@ -66,6 +66,8 @@ private:
+ 	ScPreviewLocationData* pLocationData;	// stores table layout for accessibility API
+ 	FmFormView*		pDrawView;
+ 
++    SCTAB           nCurTab;
++
+ 										// intern:
+ 	BOOL			bInPaint;
+ 	BOOL			bInGetState;
 Index: sc/source/ui/view/preview.cxx
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/view/preview.cxx,v
-retrieving revision 1.32
-diff -u -p -r1.32 preview.cxx
---- sc/source/ui/view/preview.cxx	10 May 2007 17:01:54 -0000	1.32
-+++ sc/source/ui/view/preview.cxx	15 Dec 2007 03:19:12 -0000
-@@ -231,8 +231,17 @@ void ScPreview::CalcPages( SCTAB nToWhic
+retrieving revision 1.34
+diff -u -p -r1.34 preview.cxx
+--- sc/source/ui/view/preview.cxx	11 Apr 2008 01:35:53 -0000	1.34
++++ sc/source/ui/view/preview.cxx	19 May 2008 14:06:41 -0000
+@@ -109,6 +109,7 @@ ScPreview::ScPreview( Window* pParent, S
+ 	bLocationValid( FALSE ),
+ 	pLocationData( NULL ),
+ 	pDrawView( NULL ),
++    nCurTab ( ScDocShell::GetCurTab() ),
+ 	bInPaint( FALSE ),
+ 	bInGetState( FALSE ),
+ 	pDocShell( pDocSh ),
+@@ -244,8 +245,17 @@ void ScPreview::CalcPages( SCTAB nToWhic
  	//	but always all sheets are used (there is no selected sheet)
  	ScPrintOptions aOptions = SC_MOD()->GetPrintOptions();
  
 +	ScMarkData aMarkData;
-+	aMarkData.SelectTable( ScDocShell::GetCurTab(), TRUE );
++	aMarkData.SelectTable( nCurTab, TRUE );
 +
  	for (SCTAB i=nStart; i<nAnz; i++)
  	{