sc/source/ui/inc/viewdata.hxx | 2 +-
sc/source/ui/view/viewdata.cxx | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit acfca423e0f55d4f3ae5511ede4aaf5860480027
Author: Dennis Francis <dennis.fran...@collabora.com>
AuthorDate: Tue Jun 2 15:32:29 2020 +0530
Commit: Dennis Francis <dennis.fran...@collabora.com>
CommitDate: Mon Jul 6 17:38:36 2020 +0200
Allow edit-area computation in print-twips...
via a optional flag bInPrintTwips (false by default) in
ScViewData::GetEditArea()
Change-Id: I9bf7465b703a2df817fe438db3671261d0d907a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98058
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Dennis Francis <dennis.fran...@collabora.com>
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 45aacdee6bd1..f14b2be781db 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -595,7 +595,7 @@ public:
SCROW GetEditEndRow() const { return nEditEndRow; }
tools::Rectangle GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW
nPosY, vcl::Window* pWin,
- const ScPatternAttr* pPattern, bool
bForceToTop );
+ const ScPatternAttr* pPattern, bool
bForceToTop, bool bInPrintTwips = false );
void SetTabNo( SCTAB nNewTab );
void SetActivePart( ScSplitPos eNewActive );
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 2393f27a27ae..41ad87390b68 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -1419,10 +1419,12 @@ void ScViewData::SetMaxTiledRow( SCROW nNewMaxRow )
tools::Rectangle ScViewData::GetEditArea( ScSplitPos eWhich, SCCOL nPosX,
SCROW nPosY,
vcl::Window* pWin, const
ScPatternAttr* pPattern,
- bool bForceToTop )
+ bool bForceToTop, bool bInPrintTwips
)
{
- return ScEditUtil( pDoc, nPosX, nPosY, nTabNo,
GetScrPos(nPosX,nPosY,eWhich,true),
- pWin, nPPTX, nPPTY, GetZoomX(), GetZoomY() ).
+ Point aCellTopLeft = bInPrintTwips ?
+ GetPrintTwipsPos(nPosX, nPosY) : GetScrPos(nPosX, nPosY, eWhich,
true);
+ return ScEditUtil( pDoc, nPosX, nPosY, nTabNo, aCellTopLeft,
+ pWin, nPPTX, nPPTY, GetZoomX(), GetZoomY(),
bInPrintTwips ).
GetEditArea( pPattern, bForceToTop );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
