svn commit: r1172137 - in /incubator/ooo/trunk/main/sc/source/core/data: table1.cxx table5.cxx

[ms...@apache.org]

Author: mst
Date: Sat Sep 17 22:44:49 2011
New Revision: 1172137

URL: http://svn.apache.org/viewvc?rev=1172137&view=rev
Log:
calc69: #i117952# invalidate page breaks when print range is removed

# HG changeset patch
# User Niklas Nebel <nn...@openoffice.org>
# Date 1304421600 -7200
# Node ID 1c6c8dec2313416c6de595eb2cfac3e98250fea6
# Parent  fa9c1f212c378f6ed519ec2db9f74588f6b0a620

Modified:
    incubator/ooo/trunk/main/sc/source/core/data/table1.cxx
    incubator/ooo/trunk/main/sc/source/core/data/table5.cxx

Modified: incubator/ooo/trunk/main/sc/source/core/data/table1.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/core/data/table1.cxx?rev=1172137&r1=1172136&r2=1172137&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/core/data/table1.cxx (original)
+++ incubator/ooo/trunk/main/sc/source/core/data/table1.cxx Sat Sep 17 22:44:49 2011
@@ -1569,6 +1569,7 @@ void ScTable::ClearPrintRanges()
 {
     aPrintRanges.clear();
     bPrintEntireSheet = sal_False;
+    InvalidatePageBreaks();     // #i117952# forget page breaks for an old print range
 
     if (IsStreamValid())
         SetStreamValid(sal_False);
@@ -1617,6 +1618,7 @@ void ScTable::RestorePrintRanges( const 
 	SetRepeatColRange( rSaveTab.GetRepeatCol() );
 	SetRepeatRowRange( rSaveTab.GetRepeatRow() );
 
+    InvalidatePageBreaks();     // #i117952# forget page breaks for an old print range
     UpdatePageBreaks(NULL);
 }
 

Modified: incubator/ooo/trunk/main/sc/source/core/data/table5.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/core/data/table5.cxx?rev=1172137&r1=1172136&r2=1172137&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/core/data/table5.cxx (original)
+++ incubator/ooo/trunk/main/sc/source/core/data/table5.cxx Sat Sep 17 22:44:49 2011
@@ -1056,6 +1056,10 @@ Size ScTable::GetPageSize() const
 
 void ScTable::SetRepeatArea( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow )
 {
+    // #i117952# page break calculation uses these values (set from ScPrintFunc), not pRepeatColRange/pRepeatRowRange
+    if ( nStartCol != nRepeatStartX || nEndCol != nRepeatEndX || nStartRow != nRepeatStartY || nEndRow != nRepeatEndY )
+        InvalidatePageBreaks();
+
 	nRepeatStartX = nStartCol;
 	nRepeatEndX   = nEndCol;
 	nRepeatStartY = nStartRow;