[Libreoffice-commits] core.git: embeddedobj/source
Tamás Zolnai (via logerrit)
logerrit at kemper.freedesktop.org
Thu Aug 29 13:50:00 UTC 2019
embeddedobj/source/commonembedding/embedobj.cxx | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit e56d143c36af028825a8e824201a3aa193862af4
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue Jul 30 15:15:16 2019 +0200
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Aug 29 15:49:19 2019 +0200
lok: Disable chart editing on mobile
Disabled editing of all embedded objects.
[ Miklos: motivation is that the UI is complex and the small mobile
screen is not suitable to expose this functionality as-is. Disable till
a more compact UI can be exposed. ]
Change-Id: Id1c598c84adc12b8b52d006992d85dcae5601ad9
Reviewed-on: https://gerrit.libreoffice.org/78270
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
Tested-by: Jenkins
diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx
index 3370c273dc6a..7bed8710ba2c 100644
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -227,6 +227,13 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState )
}
else
{
+ if(comphelper::LibreOfficeKit::isActive() && comphelper::LibreOfficeKit::isMobile())
+ {
+ // Disable embedded object editing (e.g. chart) on mobile
+ if(nNextState == embed::EmbedStates::INPLACE_ACTIVE || nNextState == embed::EmbedStates::UI_ACTIVE)
+ return;
+ }
+
if ( nNextState == embed::EmbedStates::INPLACE_ACTIVE )
{
if ( !m_xClientSite.is() )
More information about the Libreoffice-commits
mailing list