diff options
author | Noel Power <noel.power@novell.com> | 2012-05-24 14:48:16 +0100 |
---|---|---|
committer | Noel Power <noel.power@novell.com> | 2012-05-25 11:34:05 +0100 |
commit | bc30ba74e880122b257cc6aa2965a79851fa4608 (patch) | |
tree | b143dddebf36f506a89bd0daf1cb37f820d08826 | |
parent | a11fa1a4ac7ab27328b5e5376ea7597b1e69ddd1 (diff) |
Revert "Fixed #i116848# Shapes are at wrong position"
This reverts commit 31012ab9d7035f942486c87ecc1a79b4d6579975.
-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 56e0ec4677ed..2bf5be38977f 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx | |||
@@ -243,7 +243,7 @@ void ScDrawView::CalcNormScale( Fraction& rFractX, Fraction& rFractY ) const | |||
243 | if (nEndCol<20) | 243 | if (nEndCol<20) |
244 | nEndCol = 20; | 244 | nEndCol = 20; |
245 | if (nEndRow<20) | 245 | if (nEndRow<20) |
246 | nEndRow = 20; | 246 | nEndRow = 1000; |
247 | 247 | ||
248 | Fraction aZoom(1,1); | 248 | Fraction aZoom(1,1); |
249 | ScDrawUtil::CalcScale( pDoc, nTab, 0,0, nEndCol,nEndRow, pDev, aZoom,aZoom, | 249 | 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 27beef2b1eb5..cf9def202047 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx | |||
@@ -329,7 +329,7 @@ void ScDrawView::RecalcScale() | |||
329 | if (nEndCol<20) | 329 | if (nEndCol<20) |
330 | nEndCol = 20; | 330 | nEndCol = 20; |
331 | if (nEndRow<20) | 331 | if (nEndRow<20) |
332 | nEndRow = 20; // #i116848# instead of a large row number for an empty sheet, heights are multiplied in CalcScale | 332 | nEndRow = 1000; |
333 | 333 | ||
334 | ScDrawUtil::CalcScale( pDoc, nTab, 0,0, nEndCol,nEndRow, pDev,aZoomX,aZoomY,nPPTX,nPPTY, | 334 | ScDrawUtil::CalcScale( pDoc, nTab, 0,0, nEndCol,nEndRow, pDev,aZoomX,aZoomY,nPPTX,nPPTY, |
335 | aScaleX,aScaleY ); | 335 | aScaleX,aScaleY ); |
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index a07156184872..228bdd3c4e3a 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx | |||
@@ -264,7 +264,7 @@ MapMode ScGridWindow::GetDrawMapMode( bool bForce ) | |||
264 | SCROW nEndRow = 0; | 264 | SCROW nEndRow = 0; |
265 | pDoc->GetTableArea( nTab, nEndCol, nEndRow ); | 265 | pDoc->GetTableArea( nTab, nEndCol, nEndRow ); |
266 | if (nEndCol<20) nEndCol = 20; | 266 | if (nEndCol<20) nEndCol = 20; |
267 | if (nEndRow<20) nEndRow = 20; | 267 | if (nEndRow<20) nEndRow = 1000; |
268 | ScDrawUtil::CalcScale( pDoc, nTab, 0,0, nEndCol,nEndRow, this, | 268 | ScDrawUtil::CalcScale( pDoc, nTab, 0,0, nEndCol,nEndRow, this, |
269 | pViewData->GetZoomX(),pViewData->GetZoomY(), | 269 | pViewData->GetZoomX(),pViewData->GetZoomY(), |
270 | pViewData->GetPPTX(),pViewData->GetPPTY(), | 270 | pViewData->GetPPTX(),pViewData->GetPPTY(), |