summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--framework/inc/services/desktop.hxx1
-rw-r--r--framework/source/services/desktop.cxx6
2 files changed, 2 insertions, 5 deletions
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index a77c816e9d2a..bdcd42271de2 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -399,7 +399,6 @@ class Desktop : private cppu::BaseMutex,
css::uno::Reference< css::frame::XFrames > m_xFramesHelper; /// helper for XFrames, XIndexAccess, XElementAccess and implementation of a childcontainer!
css::uno::Reference< css::frame::XDispatchProvider > m_xDispatchHelper; /// helper to dispatch something for new tasks, created by "_blank"!
ELoadState m_eLoadState; /// hold information about state of asynchron loading of component for loadComponentFromURL()!
- css::uno::Reference< css::frame::XFrame > m_xLastFrame; /// last target of "loadComponentFromURL()"!
css::uno::Any m_aInteractionRequest;
bool m_bSuspendQuickstartVeto; /// don't ask quickstart for a veto
std::unique_ptr<SvtCommandOptions> m_xCommandOptions; /// ref counted class to support disabling commands defined by configuration file
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 580f42b0caeb..2f3ffe8c2a56 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -165,7 +165,6 @@ Desktop::Desktop( const css::uno::Reference< css::uno::XComponentContext >& xCon
, m_xFramesHelper ( )
, m_xDispatchHelper ( )
, m_eLoadState ( E_NOTSET )
- , m_xLastFrame ( )
, m_aInteractionRequest ( )
, m_bSuspendQuickstartVeto( false )
, m_sName ( )
@@ -1104,7 +1103,6 @@ void SAL_CALL Desktop::disposing()
// At least clean up other member references.
m_xDispatchHelper.clear();
m_xFramesHelper.clear();
- m_xLastFrame.clear();
m_xContext.clear();
m_xPipeTerminator.clear();
@@ -1185,11 +1183,11 @@ void SAL_CALL Desktop::dispatchFinished( const css::frame::DispatchResultEvent&
SolarMutexGuard g;
if( m_eLoadState != E_INTERACTION )
{
- m_xLastFrame.clear();
m_eLoadState = E_FAILED;
if( aEvent.State == css::frame::DispatchResultState::SUCCESS )
{
- if ( aEvent.Result >>= m_xLastFrame )
+ css::uno::Reference< css::frame::XFrame > xLastFrame; /// last target of "loadComponentFromURL()"!
+ if ( aEvent.Result >>= xLastFrame )
m_eLoadState = E_SUCCESSFUL;
}
}