diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-08-16 08:36:57 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-16 13:59:30 +0100 |
| commit | d69d6f4dc8eef7cd85929a2655c523d2f17263e0 (patch) | |
| tree | 1a598169dbfa6152061f3fa0b5383f9a1392a096 /framework/source | |
| parent | ecbb33dd8044ad45cf05f868f829e635e03d7589 (diff) | |
Related: fdo#38838 ToInt64 and a EqualsIgnoreCaseAscii variant are now unused
Change-Id: I2a2cc56cf005f564c798b8d43ef7e8c4b7f9eeff
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/uielement/macrosmenucontroller.cxx | 4 | ||||
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index f9dd1f3bf722..f7feca02d4bc 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -157,10 +157,10 @@ IMPL_STATIC_LINK_NOINSTANCE( MacrosMenuController, ExecuteHdl_Impl, ExecuteInfo* return 0; } -String MacrosMenuController::RetrieveLabelFromCommand( const String& aCmdURL ) +OUString MacrosMenuController::RetrieveLabelFromCommand(const OUString& rCmdURL) { sal_Bool bModuleIdentified = !m_aModuleIdentifier.isEmpty(); - return framework::RetrieveLabelFromCommand(aCmdURL, m_xContext, m_xUICommandLabels,m_xFrame,m_aModuleIdentifier,bModuleIdentified,"Label"); + return framework::RetrieveLabelFromCommand(rCmdURL, m_xContext, m_xUICommandLabels,m_xFrame,m_aModuleIdentifier,bModuleIdentified,"Label"); } void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 startItemId ) diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 34f1b3eb75f3..ad667efa7e01 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1149,9 +1149,9 @@ sal_Bool MenuBarManager::MustBeHidden( PopupMenu* pPopupMenu, const Reference< X return sal_True; } -String MenuBarManager::RetrieveLabelFromCommand( const String& aCmdURL ) +OUString MenuBarManager::RetrieveLabelFromCommand(const OUString& rCmdURL) { - return framework::RetrieveLabelFromCommand(aCmdURL, m_xContext, m_xUICommandLabels,m_xFrame,m_aModuleIdentifier,m_bModuleIdentified,"Label"); + return framework::RetrieveLabelFromCommand(rCmdURL, m_xContext, m_xUICommandLabels,m_xFrame,m_aModuleIdentifier,m_bModuleIdentified,"Label"); } |