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

[Marco Cecchetti]

 embeddedobj/source/commonembedding/embedobj.cxx |   36 ++++++++++--------------
 1 file changed, 15 insertions(+), 21 deletions(-)

New commits:
commit edfafb52d98b99ca04d504d8d00ca9890f0e65d9
Author: Marco Cecchetti <mrcekets at gmail.com>
Date:   Mon Feb 26 18:51:48 2018 +0100

    Revert "lok - chart - state switch issue triggers an OLE general error msg box"
    
    It's causing unexpected seg-fault.
    
    This reverts commit ed6aa7a31b9825c8b92131a5acc289c917ebf805.
    
    Change-Id: I120abe8243c8f208e94e6a04fbbd5176a1d37f84
    Reviewed-on: https://gerrit.libreoffice.org/50384
    Reviewed-by: Marco Cecchetti <mrcekets at gmail.com>
    Tested-by: Marco Cecchetti <mrcekets at gmail.com>

diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx
index 32974547a50c..5142871421ff 100644
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -39,7 +39,6 @@
 #include <com/sun/star/embed/EmbedMisc.hpp>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
-#include <comphelper/lok.hxx>
 
 #include <vcl/svapp.hxx>
 
@@ -321,31 +320,26 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState )
                     catch( const uno::Exception& )
                     {}
 
-                    if (!comphelper::LibreOfficeKit::isActive())
+                    // if currently another object is UIactive it will be deactivated; usually this will activate the LM of
+                    // the container. Locking the LM will prevent flicker.
+                    xContainerLM->lock();
+                    xInplaceClient->activatingUI();
+                    bool bOk = m_pDocHolder->ShowUI( xContainerLM, xContainerDP, aModuleName );
+                    xContainerLM->unlock();
+
+                    if ( bOk )
+                    {
+                        m_nObjectState = nNextState;
+                        m_pDocHolder->ResizeHatchWindow();
+                    }
+                    else
                     {
-                        // if currently another object is UIactive it will be deactivated; usually this will activate the LM of
-                        // the container. Locking the LM will prevent flicker.
-                        xContainerLM->lock();
-                        xInplaceClient->activatingUI();
-                        bool bOk = m_pDocHolder->ShowUI( xContainerLM, xContainerDP, aModuleName );
-                        xContainerLM->unlock();
-
-                        if ( bOk )
-                        {
-                            m_nObjectState = nNextState;
-                            m_pDocHolder->ResizeHatchWindow();
-                        }
-                        else
-                        {
-                            xInplaceClient->deactivatedUI();
-                            throw embed::WrongStateException(); //TODO: can't activate UI
-                        }
+                        xInplaceClient->deactivatedUI();
+                        throw embed::WrongStateException(); //TODO: can't activate UI
                     }
                 }
                 else
-                {
                     throw embed::WrongStateException(); //TODO: can't activate UI
-                }
             }
         }
         else