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

[Tamás Zolnai (via logerrit)]

 embeddedobj/source/commonembedding/embedobj.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 58644008d6c1ce9c4c1c1f33740871103225d759
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue Jul 30 15:15:16 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Sep 3 21:43:01 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. ]
    
    (cherry picked from commit e56d143c36af028825a8e824201a3aa193862af4)
    
    Change-Id: Id1c598c84adc12b8b52d006992d85dcae5601ad9
    Reviewed-on: https://gerrit.libreoffice.org/78308
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx
index 14e7246b7b42..de57bec51ed3 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() )