diff options
| author | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-08-27 14:24:18 +0200 |
|---|---|---|
| committer | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-08-30 21:37:10 +0200 |
| commit | d8c049fa8d32b8d7250c421c93153873e10db1cb (patch) | |
| tree | 00b3f88849c51c6fd19d51f3ffae57fec6b01d6d /sc/source/ui/view | |
| parent | 49870ccb9b405573595b43df95a6704108c276d6 (diff) | |
Use MapMode instead of PPT for ScEditUtil::GetEditArea
Change-Id: I3fbc33da3f32723e37c5004f7883fa6ab4107921
Diffstat (limited to 'sc/source/ui/view')
| -rw-r--r-- | sc/source/ui/view/output2.cxx | 18 | ||||
| -rw-r--r-- | sc/source/ui/view/viewdata.cxx | 12 |
2 files changed, 19 insertions, 11 deletions
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 23300387d009..bc1b258909c5 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -2790,8 +2790,10 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) // use same GetEditArea call as in ScViewData::SetEditEngine Fraction aFract(1,1); - Rectangle aUtilRect = ScEditUtil( mpDoc, rParam.mnCellX, rParam.mnCellY, nTab, Point(0,0), pFmtDevice, - HMM_PER_TWIPS, HMM_PER_TWIPS, aFract, aFract ).GetEditArea( rParam.mpPattern, false ); + Rectangle aUtilRect = ScEditUtil( mpDoc, rParam.mnCellX, rParam.mnCellY, + nTab, Point(0,0), pFmtDevice, + mpViewData->GetPaintMapMode(), + aFract, aFract ).GetEditArea( rParam.mpPattern, false ); aLogicSize.Width() = aUtilRect.GetWidth(); } rParam.mpEngine->SetPaperSize(aLogicSize); @@ -3812,8 +3814,10 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam) // use same GetEditArea call as in ScViewData::SetEditEngine Fraction aFract(1,1); - Rectangle aUtilRect = ScEditUtil( mpDoc, rParam.mnCellX, rParam.mnCellY, nTab, Point(0,0), pFmtDevice, - HMM_PER_TWIPS, HMM_PER_TWIPS, aFract, aFract ).GetEditArea( rParam.mpPattern, false ); + Rectangle aUtilRect = ScEditUtil( mpDoc, rParam.mnCellX, rParam.mnCellY, + nTab, Point(0,0), pFmtDevice, + mpViewData->GetPaintMapMode(), + aFract, aFract ).GetEditArea( rParam.mpPattern, false ); aLogicSize.Width() = aUtilRect.GetWidth(); } rParam.mpEngine->SetPaperSize(aLogicSize); @@ -4168,8 +4172,10 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) // use same GetEditArea call as in ScViewData::SetEditEngine Fraction aFract(1,1); - Rectangle aUtilRect = ScEditUtil( mpDoc, rParam.mnCellX, rParam.mnCellY, nTab, Point(0,0), pFmtDevice, - HMM_PER_TWIPS, HMM_PER_TWIPS, aFract, aFract ).GetEditArea( rParam.mpPattern, false ); + Rectangle aUtilRect = ScEditUtil( mpDoc, rParam.mnCellX, rParam.mnCellY, + nTab, Point(0,0), pFmtDevice, + mpViewData->GetPaintMapMode(), + aFract, aFract ).GetEditArea( rParam.mpPattern, false ); aLogicSize.Width() = aUtilRect.GetWidth(); } rParam.mpEngine->SetPaperSize(aLogicSize); diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 8ba9b7e95766..a63f003526e3 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -919,8 +919,8 @@ Rectangle ScViewData::GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW nPosY, bool bForceToTop ) { return ScEditUtil( pDoc, nPosX, nPosY, nTabNo, GetScrPos(nPosX,nPosY,eWhich,true), - pWin, nPPTX, nPPTY, GetZoomX(), GetZoomY() ). - GetEditArea( pPattern, bForceToTop ); + pWin, maPaintMapMode, GetZoomX(), GetZoomY() ). + GetEditArea( pPattern, bForceToTop ); } void ScViewData::SetEditEngine( ScSplitPos eWhich, @@ -970,8 +970,9 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, bool bAsianVertical = pNewEngine->IsVertical(); // set by InputHandler Rectangle aPixRect = ScEditUtil( pDoc, nNewX,nNewY,nTabNo, GetScrPos(nNewX,nNewY,eWhich), - pWin, nPPTX,nPPTY,GetZoomX(),GetZoomY() ). - GetEditArea( pPattern, true ); + pWin, maPaintMapMode, + GetZoomX(),GetZoomY() ). + GetEditArea( pPattern, true ); // when right-aligned, leave space for the cursor // in vertical mode, editing is always right-aligned @@ -1045,7 +1046,8 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, Fraction aFract(1,1); Rectangle aUtilRect = ScEditUtil( pDoc,nNewX,nNewY,nTabNo, Point(0,0), pWin, - HMM_PER_TWIPS, HMM_PER_TWIPS, aFract, aFract ).GetEditArea( pPattern, false ); + maPaintMapMode, aFract, aFract ). + GetEditArea( pPattern, false ); aPaperSize.Width() = aUtilRect.GetWidth(); } pNewEngine->SetPaperSize( aPaperSize ); |