diff options
| author | Eike Rathke <erack@redhat.com> | 2011-11-25 00:59:12 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2011-11-25 01:01:17 +0100 |
| commit | 31012ab9d7035f942486c87ecc1a79b4d6579975 (patch) | |
| tree | 20b1beea0ce1e070876771a29ef2b0e5b7347ab8 /sc | |
| parent | 8a838b9fbf46ece9680824cd3a044ab7338bf306 (diff) | |
Fixed #i116848# Shapes are at wrong position
# Original author: Niklas Nebel <nn@openoffice.org>
Taken from OOO340 repository, changeset 7ebd38de6d70 introduced with CWS dr78.
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/view/drawvie4.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/drawview.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/gridwin3.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx index 1e6f330a3fd3..cdd8abb37bc6 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx @@ -245,7 +245,7 @@ void ScDrawView::CalcNormScale( Fraction& rFractX, Fraction& rFractY ) const if (nEndCol<20) nEndCol = 20; if (nEndRow<20) - nEndRow = 1000; + nEndRow = 20; Fraction aZoom(1,1); ScDrawUtil::CalcScale( pDoc, nTab, 0,0, nEndCol,nEndRow, pDev, aZoom,aZoom, diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index bfd65dd0167d..0494dcbe3738 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -332,7 +332,7 @@ void ScDrawView::RecalcScale() if (nEndCol<20) nEndCol = 20; if (nEndRow<20) - nEndRow = 1000; + nEndRow = 20; // #i116848# instead of a large row number for an empty sheet, heights are multiplied in CalcScale ScDrawUtil::CalcScale( pDoc, nTab, 0,0, nEndCol,nEndRow, pDev,aZoomX,aZoomY,nPPTX,nPPTY, aScaleX,aScaleY ); diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index 4e3189c4efb9..69a2b6af5a95 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -266,7 +266,7 @@ MapMode ScGridWindow::GetDrawMapMode( bool bForce ) SCROW nEndRow = 0; pDoc->GetTableArea( nTab, nEndCol, nEndRow ); if (nEndCol<20) nEndCol = 20; - if (nEndRow<20) nEndRow = 1000; + if (nEndRow<20) nEndRow = 20; ScDrawUtil::CalcScale( pDoc, nTab, 0,0, nEndCol,nEndRow, this, pViewData->GetZoomX(),pViewData->GetZoomY(), pViewData->GetPPTX(),pViewData->GetPPTY(), |