Kaydet (Commit) a3646b25 authored tarafından Marco Cecchetti's avatar Marco Cecchetti Kaydeden (comit) Marco Cecchetti

lok - chart - state switch issue triggers an OLE general error msg box

Change-Id: I6addd95d1ad3461b6e21328512cbd1301a36cd19
Reviewed-on: https://gerrit.libreoffice.org/50368Reviewed-by: 's avatarJan Holesovsky <kendy@collabora.com>
Tested-by: 's avatarJan Holesovsky <kendy@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/50482Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMarco Cecchetti <mrcekets@gmail.com>
üst 82d38099
......@@ -40,6 +40,7 @@
#include <com/sun/star/embed/EmbedMisc.hpp>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <comphelper/lok.hxx>
#include <vcl/svapp.hxx>
......@@ -312,22 +313,25 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState )
catch( const uno::Exception& )
{}
// 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_xDocHolder->ShowUI( xContainerLM, xContainerDP, aModuleName );
xContainerLM->unlock();
if ( bOk )
{
m_nObjectState = nNextState;
m_xDocHolder->ResizeHatchWindow();
}
else
if (!comphelper::LibreOfficeKit::isActive())
{
xInplaceClient->deactivatedUI();
throw embed::WrongStateException(); //TODO: can't activate UI
// 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_xDocHolder->ShowUI( xContainerLM, xContainerDP, aModuleName );
xContainerLM->unlock();
if ( bOk )
{
m_nObjectState = nNextState;
m_xDocHolder->ResizeHatchWindow();
}
else
{
xInplaceClient->deactivatedUI();
throw embed::WrongStateException(); //TODO: can't activate UI
}
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment