[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sfx2/source
Marco Cecchetti (via logerrit)
logerrit at kemper.freedesktop.org
Tue Oct 8 10:46:46 UTC 2019
sfx2/source/view/ipclient.cxx | 11 -----------
1 file changed, 11 deletions(-)
New commits:
commit 3672ca8c34f5de4692fdc7ca205babff14a91990
Author: Marco Cecchetti <marco.cecchetti at collabora.com>
AuthorDate: Tue Oct 8 12:09:21 2019 +0200
Commit: Marco Cecchetti <marco.cecchetti at collabora.com>
CommitDate: Tue Oct 8 12:45:06 2019 +0200
lok: re-enabling chart editing on mobile
Change-Id: I0e05cc2c41ba045e62ad87203f7000f2b568add3
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 55fbdbaea2eb..9dd4503eff7f 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -932,17 +932,6 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb )
{
m_xImp->m_xObject->setClientSite( m_xImp->m_xClient );
- // Disable embedded object editing (e.g. chart) on mobile
- if ( comphelper::LibreOfficeKit::isActive() && comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView())
- && m_xImp->m_xObject->getCurrentState() == embed::EmbedStates::RUNNING )
- {
- // Also check next state
- // Needs to be embed::EmbedStates::UI_ACTIVE or embed::EmbedStates::INPLACE_ACTIVE
- // Conversion table is in embeddedobj/source/commonembedding/miscobj.cxx
- if (nVerb != embed::EmbedVerbs::MS_OLEVERB_OPEN && nVerb != embed::EmbedVerbs::MS_OLEVERB_HIDE)
- return nError;
- }
-
m_xImp->m_xObject->doVerb( nVerb );
}
catch ( embed::UnreachableStateException& )
More information about the Libreoffice-commits
mailing list