mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unused m_xLastFrame in Desktop

Browse Source 
sinice

    commit abf3022d63
    Date:   Wed Jul 31 10:03:28 2002 +0000
    #101886# roll it back temp.

Change-Id: If1058c0130d1a2c68bc041a3f7433df87effc0e4
This commit is contained in:
Noel Grandin
2017-09-18 14:25:59 +02:00
parent d7844222bb
commit f320d1edeb
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/inc/services/desktop.hxx
View File

@@ -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::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"! 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()! 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; css::uno::Any m_aInteractionRequest;
bool m_bSuspendQuickstartVeto; /// don't ask quickstart for a veto 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 std::unique_ptr<SvtCommandOptions> m_xCommandOptions; /// ref counted class to support disabling commands defined by configuration file

6
framework/source/services/desktop.cxx
View File

@@ -165,7 +165,6 @@ Desktop::Desktop( const css::uno::Reference< css::uno::XComponentContext >& xCon
, m_xFramesHelper ( ) , m_xFramesHelper ( )
, m_xDispatchHelper ( ) , m_xDispatchHelper ( )
, m_eLoadState ( E_NOTSET ) , m_eLoadState ( E_NOTSET )
, m_xLastFrame ( )
, m_aInteractionRequest ( ) , m_aInteractionRequest ( )
, m_bSuspendQuickstartVeto( false ) , m_bSuspendQuickstartVeto( false )
, m_sName ( ) , m_sName ( )
@@ -1104,7 +1103,6 @@ void SAL_CALL Desktop::disposing()
// At least clean up other member references. // At least clean up other member references.
m_xDispatchHelper.clear(); m_xDispatchHelper.clear();
m_xFramesHelper.clear(); m_xFramesHelper.clear();
m_xLastFrame.clear();
m_xContext.clear(); m_xContext.clear();
m_xPipeTerminator.clear(); m_xPipeTerminator.clear();
@@ -1185,11 +1183,11 @@ void SAL_CALL Desktop::dispatchFinished( const css::frame::DispatchResultEvent&
SolarMutexGuard g; SolarMutexGuard g;
if( m_eLoadState != E_INTERACTION ) if( m_eLoadState != E_INTERACTION )
{ {
m_xLastFrame.clear();
m_eLoadState = E_FAILED; m_eLoadState = E_FAILED;
if( aEvent.State == css::frame::DispatchResultState::SUCCESS ) 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; m_eLoadState = E_SUCCESSFUL;
} }
} }