Merge remote branch 'origin/libreoffice-3-3'
This commit is contained in:
commit
60822195d3
3 changed files with 3 additions and 3 deletions
|
@ -245,7 +245,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);
|
||||
|
|
|
@ -377,7 +377,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,
|
||||
|
|
|
@ -266,7 +266,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(),
|
||||
|
|
Loading…
Reference in a new issue