[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 3 commits - sc/source

[Jan Holesovsky]

 sc/source/ui/view/drawvie4.cxx |    2 +-
 sc/source/ui/view/drawview.cxx |    2 +-
 sc/source/ui/view/gridwin3.cxx |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8f416acd20a702f4dbb28f28b0e01b98d0e87925
Merge: 2e9051f... 2d9884e...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Nov 11 18:10:07 2010 +0100

    Merge commit 'ooo/OOO330_m14' into libreoffice-3-3

commit 2d9884e79d5885ee708e29dbd21b13ad0c3e6631
Merge: 2a75245... 1a647a5...
Author: Kurt Zenker <kz at openoffice.org>
Date:   Fri Nov 5 16:56:27 2010 +0100

    CWS-TOOLING: integrate CWS calc33stopper2

commit 1a647a5e1b76e24cf250ef66dc9604e956e3112d
Author: Daniel Rentz [dr] <daniel.rentz at oracle.com>
Date:   Tue Nov 2 17:28:24 2010 +0100

    calc33stopper2: #i115313# revert calculation of scaling factor for drawing layer to behaviour of OOo 3.2

diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index 0d0f0a0..3d47dca 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -282,7 +282,7 @@ void ScDrawView::CalcNormScale( Fraction& rFractX, Fraction& rFractY ) const
     pDoc->GetTableArea( nTab, nEndCol, nEndRow );
     if (nEndCol<20)
         nEndCol = 20;
-    if (nEndRow<1000)
+    if (nEndRow<20)
         nEndRow = 1000;
 
     Fraction aZoom(1,1);
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 921f256..2564360 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -376,7 +376,7 @@ void ScDrawView::RecalcScale()
     pDoc->GetTableArea( nTab, nEndCol, nEndRow );
     if (nEndCol<20)
         nEndCol = 20;
-    if (nEndRow<1000)
+    if (nEndRow<20)
         nEndRow = 1000;
 
     ScDrawUtil::CalcScale( pDoc, nTab, 0,0, nEndCol,nEndRow, pDev,aZoomX,aZoomY,nPPTX,nPPTY,
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index 9ba9ee6..3be1427 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -265,7 +265,7 @@ MapMode ScGridWindow::GetDrawMapMode( BOOL bForce )
             SCROW nEndRow = 0;
             pDoc->GetTableArea( nTab, nEndCol, nEndRow );
             if (nEndCol<20) nEndCol = 20;
-            if (nEndRow<1000) nEndRow = 1000;
+            if (nEndRow<20) nEndRow = 1000;
             ScDrawUtil::CalcScale( pDoc, nTab, 0,0, nEndCol,nEndRow, this,
                                     pViewData->GetZoomX(),pViewData->GetZoomY(),
                                     pViewData->GetPPTX(),pViewData->GetPPTY(),