sfx2/source/view/ipclient.cxx | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
New commits:
commit 77ade963576999544edf6c5c7d474cd757eb32ab
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Fri Mar 19 14:18:12 2021 +0100
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Wed Mar 24 09:37:35 2021 +0100
online: send selection coordinates with inplace mode
Change-Id: I38964fc522924b61313bc38ecf03e007fc6f3b8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112742
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Gökay ŞATIR <gokaysa...@collabora.com>
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 5c4ecc7dcf8a..cefe1586ab9e 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -340,7 +340,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() );
+ }
}
}
commit 042aec6b984332e917532e321e0f33668ad322e2
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Fri Mar 19 11:59:12 2021 +0100
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Wed Mar 24 09:37:29 2021 +0100
online: Don't send chart selection to all views
Steps to reproduce fixed bug:
1. open spreadsheet with chart in two sessions
2. session A: doubleclick on chart (grey overlay appears), then click
somewhere else to exit chart editing mode (grey overlay disappears)
3. session B: doubleclick on chart
result - grey overlay present in both views
Change-Id: I43b390fcf9bb1a3f3cbbbce4cea1052c54255dc6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112736
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 4b7fdada7851..5c4ecc7dcf8a 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -194,12 +194,6 @@ void SAL_CALL SfxInPlaceClient_Impl::notifyEvent( const
document::EventObject& a
if ( m_pClient && aEvent.EventName == "OnVisAreaChanged" && m_nAspect !=
embed::Aspects::MSOLE_ICON )
{
- if ( comphelper::LibreOfficeKit::isActive() )
- {
- if ( SfxViewShell* pViewShell = m_pClient->GetViewShell() )
- pViewShell->libreOfficeKitViewCallback(
LOK_CALLBACK_GRAPHIC_SELECTION, "INPLACE" );
- }
-
m_pClient->FormatChanged(); // for Writer when format of the object is
changed with the area
m_pClient->ViewChanged();
m_pClient->Invalidate();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
