[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sc/source

Dennis Francis (via logerrit) logerrit at kemper.freedesktop.org
Mon Jul 6 15:43:39 UTC 2020


 sc/source/ui/view/gridwin.cxx |   12 ++++++++++++
 1 file changed, 12 insertions(+)

New commits:
commit 320f0c0e6c7d4af6849b6a72ecf9988fe32689f8
Author:     Dennis Francis <dennis.francis at collabora.com>
AuthorDate: Wed Jun 3 14:59:12 2020 +0530
Commit:     Dennis Francis <dennis.francis at collabora.com>
CommitDate: Mon Jul 6 17:43:03 2020 +0200

    ScGridWindow::UpdateEditViewPos: keep EditView's print-twips data updated
    
    Change-Id: I2f6fab371a107a4f16704030e341198a541020f8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98063
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Dennis Francis <dennis.francis at collabora.com>

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 9a612552fd14..2ffc54a129b8 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -4557,6 +4557,18 @@ void ScGridWindow::UpdateEditViewPos()
         {
             // bForceToTop = sal_True for editing
             tools::Rectangle aPixRect = pViewData->GetEditArea( eWhich, nCol, nRow, this, nullptr, true );
+
+            if (comphelper::LibreOfficeKit::isActive() &&
+                comphelper::LibreOfficeKit::isCompatFlagSet(
+                    comphelper::LibreOfficeKit::Compat::scPrintTwipsMsgs))
+            {
+                tools::Rectangle aPTwipsRect = pViewData->GetEditArea(eWhich, nCol, nRow, this, nullptr,
+                        true, true /* bInPrintTwips */);
+                tools::Rectangle aOutputAreaPTwips = pView->GetLOKSpecialOutputArea();
+                aOutputAreaPTwips.SetPos(aPTwipsRect.TopLeft());
+                pView->SetLOKSpecialOutputArea(aOutputAreaPTwips);
+            }
+
             Point aScrPos = PixelToLogic( aPixRect.TopLeft(), pViewData->GetLogicMode() );
 
             tools::Rectangle aRect = pView->GetOutputArea();


More information about the Libreoffice-commits mailing list