Kaydet (Commit) bc30ba74 authored tarafından Noel Power's avatar Noel Power

Revert "Fixed #i116848# Shapes are at wrong position"

This reverts commit 31012ab9.
üst a11fa1a4
...@@ -243,7 +243,7 @@ void ScDrawView::CalcNormScale( Fraction& rFractX, Fraction& rFractY ) const ...@@ -243,7 +243,7 @@ void ScDrawView::CalcNormScale( Fraction& rFractX, Fraction& rFractY ) const
if (nEndCol<20) if (nEndCol<20)
nEndCol = 20; nEndCol = 20;
if (nEndRow<20) if (nEndRow<20)
nEndRow = 20; nEndRow = 1000;
Fraction aZoom(1,1); Fraction aZoom(1,1);
ScDrawUtil::CalcScale( pDoc, nTab, 0,0, nEndCol,nEndRow, pDev, aZoom,aZoom, ScDrawUtil::CalcScale( pDoc, nTab, 0,0, nEndCol,nEndRow, pDev, aZoom,aZoom,
......
...@@ -329,7 +329,7 @@ void ScDrawView::RecalcScale() ...@@ -329,7 +329,7 @@ void ScDrawView::RecalcScale()
if (nEndCol<20) if (nEndCol<20)
nEndCol = 20; nEndCol = 20;
if (nEndRow<20) if (nEndRow<20)
nEndRow = 20; // #i116848# instead of a large row number for an empty sheet, heights are multiplied in CalcScale nEndRow = 1000;
ScDrawUtil::CalcScale( pDoc, nTab, 0,0, nEndCol,nEndRow, pDev,aZoomX,aZoomY,nPPTX,nPPTY, ScDrawUtil::CalcScale( pDoc, nTab, 0,0, nEndCol,nEndRow, pDev,aZoomX,aZoomY,nPPTX,nPPTY,
aScaleX,aScaleY ); aScaleX,aScaleY );
......
...@@ -264,7 +264,7 @@ MapMode ScGridWindow::GetDrawMapMode( bool bForce ) ...@@ -264,7 +264,7 @@ MapMode ScGridWindow::GetDrawMapMode( bool bForce )
SCROW nEndRow = 0; SCROW nEndRow = 0;
pDoc->GetTableArea( nTab, nEndCol, nEndRow ); pDoc->GetTableArea( nTab, nEndCol, nEndRow );
if (nEndCol<20) nEndCol = 20; if (nEndCol<20) nEndCol = 20;
if (nEndRow<20) nEndRow = 20; if (nEndRow<20) nEndRow = 1000;
ScDrawUtil::CalcScale( pDoc, nTab, 0,0, nEndCol,nEndRow, this, ScDrawUtil::CalcScale( pDoc, nTab, 0,0, nEndCol,nEndRow, this,
pViewData->GetZoomX(),pViewData->GetZoomY(), pViewData->GetZoomX(),pViewData->GetZoomY(),
pViewData->GetPPTX(),pViewData->GetPPTY(), pViewData->GetPPTX(),pViewData->GetPPTY(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment