diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-08-26 22:24:36 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-08-27 08:00:32 +0200 |
| commit | a6050c32f30796743f9ab9b2a5c793ced9b8f747 (patch) | |
| tree | a2fa6d05708d1c99414893064adaee56460ac728 /framework | |
| parent | 01ed4bf52db701c4e7824f4a92b5a3afa2a5ca4b (diff) | |
Clean up aEmpty
Change-Id: I4c4294b7fb1cb537ba3ae3e6e7e747a3333b7469
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/fontmenucontroller.cxx | 3 | ||||
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 71176480a40a..70229e9357c1 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -156,7 +156,6 @@ void SAL_CALL FontMenuController::itemActivated( const css::awt::MenuEvent& ) th // find new font name and set check mark! sal_uInt16 nChecked = 0; sal_uInt16 nItemCount = m_xPopupMenu->getItemCount(); - OUString aEmpty; for( sal_uInt16 i = 0; i < nItemCount; i++ ) { sal_uInt16 nItemId = m_xPopupMenu->getItemId( i ); @@ -169,7 +168,7 @@ void SAL_CALL FontMenuController::itemActivated( const css::awt::MenuEvent& ) th // TODO: must be replaced by implementation of VCL, when available sal_Int32 nIndex = aText.indexOf( (sal_Unicode)'~' ); if ( nIndex >= 0 ) - aText = aText.replaceAt( nIndex, 1, aEmpty ); + aText = aText.replaceAt( nIndex, 1, "" ); // TODO: must be replaced by implementation of VCL, when available if ( aText == m_aFontFamilyName ) diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 946571eaa378..421cb05213a1 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1150,7 +1150,6 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF framework::AddonMenuManager::MergeAddonHelpMenu( rFrame, static_cast<MenuBar *>(pMenu), m_xContext ); } - OUString aEmpty; bool bAccessibilityEnabled( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() ); sal_uInt16 nItemCount = pMenu->GetItemCount(); OUString aItemCommand; @@ -1190,7 +1189,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF if (!pMenu->GetHelpCommand(nItemId).isEmpty()) { aModuleIdentifier = pMenu->GetHelpCommand( nItemId ); - pMenu->SetHelpCommand( nItemId, aEmpty ); + pMenu->SetHelpCommand( nItemId, "" ); } if ( m_xPopupMenuControllerFactory.is() && |