[Libreoffice-commits] core.git: sfx2/source

Szymon KÅ‚os (via logerrit) logerrit at kemper.freedesktop.org
Thu Apr 8 07:32:40 UTC 2021


 sfx2/source/view/ipclient.cxx |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 4bfe04aec4dddf8e612160ceda87ef9f5ea4bb42
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Mar 19 14:18:12 2021 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Apr 8 09:31:48 2021 +0200

    online: send selection coordinates with inplace mode
    
    Change-Id: I38964fc522924b61313bc38ecf03e007fc6f3b8d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112742
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Gökay ŞATIR <gokaysatir at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113727
    Tested-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 30626d285709..7f8c2c89e829 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -335,7 +335,18 @@ void SAL_CALL SfxInPlaceClient_Impl::activatingInplace()
     if ( comphelper::LibreOfficeKit::isActive() )
     {
         if ( SfxViewShell* pViewShell = m_pClient->GetViewShell() )
-            pViewShell->libreOfficeKitViewCallback( LOK_CALLBACK_GRAPHIC_SELECTION, "INPLACE" );
+        {
+            tools::Rectangle aRect(m_pClient->GetObjArea());
+
+            if (m_pClient->GetEditWin())
+            {
+                if (m_pClient->GetEditWin()->GetMapMode().GetMapUnit() == MapUnit::Map100thMM)
+                    aRect = OutputDevice::LogicToLogic(aRect, MapMode(MapUnit::Map100thMM), MapMode(MapUnit::MapTwip));
+            }
+
+            OString str = aRect.toString() + ", \"INPLACE\"";
+            pViewShell->libreOfficeKitViewCallback( LOK_CALLBACK_GRAPHIC_SELECTION, str.getStr() );
+        }
     }
 
 }


More information about the Libreoffice-commits mailing list