diff options
| -rw-r--r-- | framework/inc/uielement/statusbarmanager.hxx | 1 | ||||
| -rw-r--r-- | framework/source/uielement/statusbarmanager.cxx | 12 |
2 files changed, 6 insertions, 7 deletions
diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx index bbafb5f55f43..e2c4966c091b 100644 --- a/framework/inc/uielement/statusbarmanager.hxx +++ b/framework/inc/uielement/statusbarmanager.hxx @@ -95,7 +95,6 @@ class StatusBarManager final: public ::cppu::WeakImplHelper< m_bFrameActionRegistered : 1, m_bUpdateControllers : 1; VclPtr<StatusBar> m_pStatusBar; - OUString m_aModuleIdentifier; css::uno::Reference< css::frame::XFrame > m_xFrame; StatusBarControllerMap m_aControllerMap; osl::Mutex m_mutex; diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 176f0d5b33a3..9caa46cc539d 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -307,7 +307,7 @@ void StatusBarManager::CreateControllers() aPropVector.push_back( uno::makeAny( aPropValue ) ); aPropValue.Name = "ModuleIdentifier"; - aPropValue.Value <<= m_aModuleIdentifier; + aPropValue.Value <<= OUString(); aPropVector.push_back( uno::makeAny( aPropValue ) ); aPropValue.Name = "Frame"; @@ -336,7 +336,7 @@ void StatusBarManager::CreateControllers() // 1) UNO Statusbar controllers, registered in Controllers.xcu if ( m_xStatusbarControllerFactory.is() && - m_xStatusbarControllerFactory->hasController( aCommandURL, m_aModuleIdentifier )) + m_xStatusbarControllerFactory->hasController( aCommandURL, "" )) { xController.set(m_xStatusbarControllerFactory->createInstanceWithArgumentsAndContext( aCommandURL, aArgs, m_xContext ), @@ -447,7 +447,7 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc if (( nType == css::ui::ItemType::DEFAULT ) && !aCommandURL.isEmpty() ) { - OUString aString( vcl::CommandInfoProvider::GetLabelForCommand(aCommandURL, m_aModuleIdentifier)); + OUString aString( vcl::CommandInfoProvider::GetLabelForCommand(aCommandURL, "")); StatusBarItemBits nItemBits( impl_convertItemStyleToItemBits( nStyle )); m_pStatusBar->InsertItem( nId, nWidth, nItemBits, nOffset ); @@ -474,7 +474,7 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc for ( sal_uInt32 i = 0; i < nCount; i++ ) { MergeStatusbarInstruction &rInstruction = aMergeInstructions[i]; - if ( !StatusbarMerger::IsCorrectContext( rInstruction.aMergeContext, m_aModuleIdentifier ) ) + if ( !StatusbarMerger::IsCorrectContext( rInstruction.aMergeContext, "" ) ) continue; AddonStatusbarItemContainer aItems; @@ -486,7 +486,7 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc StatusbarMerger::ProcessMergeOperation( m_pStatusBar, nRefPos, nItemId, - m_aModuleIdentifier, + "", rInstruction.aMergeCommand, rInstruction.aMergeCommandParameter, aItems ); @@ -495,7 +495,7 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc { StatusbarMerger::ProcessMergeFallback( m_pStatusBar, nItemId, - m_aModuleIdentifier, + "", rInstruction.aMergeCommand, rInstruction.aMergeCommandParameter, aItems ); |