FwkResId and FwlResId are the same

and FWK_RESSTR/.toString can be removed now

Change-Id: I7d2d56681fc9be31948bbb4dae737a75cc59d065

16 files changed, 40 insertions, 131 deletions

diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index 246b83ae80a7..bb683abf9f75 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -51,7 +51,6 @@ $(eval $(call gb_Library_use_libraries,fwl,\
 ))
 
 $(eval $(call gb_Library_add_exception_objects,fwl,\
-    framework/source/classes/fwlresid \
     framework/source/dispatch/mailtodispatcher \
     framework/source/dispatch/oxt_handler \
     framework/source/dispatch/popupmenudispatcher \
diff --git a/framework/inc/classes/fwlresid.hxx b/framework/inc/classes/fwlresid.hxx
deleted file mode 100644
index 11a0ac702af3..000000000000
--- a/framework/inc/classes/fwlresid.hxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_FWLRESID_HXX
-#define INCLUDED_FRAMEWORK_INC_CLASSES_FWLRESID_HXX
-
-#include <tools/resid.hxx>
-
-namespace framework
-{
-
-class FwlResId : public ResId
-{
-    public:
-        FwlResId( sal_uInt16 nId );
-
-    static ResMgr*  GetResManager();
-};
-
-}
-
-#endif // __FRAMEWORK_CLASSES_FwlResId
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index 62ba06b9fe14..649b9f35e1e1 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -149,16 +149,16 @@ OUString lcl_getLocalizedMessage(::sal_Int32 nID)
     switch(nID)
     {
         case ID_CORRUPT_UICONFIG_SHARE :
-                sMessage = FWK_RESSTR(STR_CORRUPT_UICFG_SHARE);
+                sMessage = FwkResId(STR_CORRUPT_UICFG_SHARE);
 
                 break;
 
         case ID_CORRUPT_UICONFIG_USER :
-                sMessage = FWK_RESSTR(STR_CORRUPT_UICFG_USER);
+                sMessage = FwkResId(STR_CORRUPT_UICFG_USER);
                 break;
 
         case ID_CORRUPT_UICONFIG_GENERAL :
-                sMessage = FWK_RESSTR(STR_CORRUPT_UICFG_GENERAL);
+                sMessage = FwkResId(STR_CORRUPT_UICFG_GENERAL);
                 break;
     }
 
diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx
deleted file mode 100644
index 3fd5f6039945..000000000000
--- a/framework/source/classes/fwlresid.cxx
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "classes/fwlresid.hxx"
-#include <osl/mutex.hxx>
-#include <rtl/strbuf.hxx>
-#include <tools/resmgr.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
-
-namespace framework
-{
-
-ResMgr* FwlResId::GetResManager()
-{
-    static ResMgr*  pResMgr = nullptr;
-
-    if ( !pResMgr )
-    {
-        SolarMutexGuard aSolarGuard;
-        pResMgr = ResMgr::CreateResMgr("fwe", Application::GetSettings().GetUILanguageTag());
-    }
-
-    return pResMgr;
-}
-
-FwlResId::FwlResId( sal_uInt16 nId ) :
-    ResId( nId, *FwlResId::GetResManager() )
-{
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index f50db759964c..406819db1890 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -1066,7 +1066,7 @@ void ToolbarLayoutManager::setDockingAreaOffsets( const ::tools::Rectangle& rOff
 
 OUString ToolbarLayoutManager::implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ) const
 {
-    OUString aAddonGenericTitle(FWK_RESSTR(STR_TOOLBAR_TITLE_ADDON));
+    OUString aAddonGenericTitle(FwkResId(STR_TOOLBAR_TITLE_ADDON));
     const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper();
 
     OUString aNumStr = rI18nHelper.GetNum( nNumber, 0, false, false );
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 827e045629ff..48cb5bad7861 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -4157,8 +4157,8 @@ bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace)
 
 void AutoRecovery::impl_showFullDiscError()
 {
-    OUString sBtn(FWK_RESSTR(STR_FULL_DISC_RETRY_BUTTON));
-    OUString sMsg(FWK_RESSTR(STR_FULL_DISC_MSG));
+    OUString sBtn(FwkResId(STR_FULL_DISC_RETRY_BUTTON));
+    OUString sMsg(FwkResId(STR_FULL_DISC_MSG));
 
     OUString sBackupURL(SvtPathOptions().GetBackupPath());
     INetURLObject aConverter(sBackupURL);
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index ab5bb5b42c8c..1791e857f4ec 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -116,7 +116,7 @@ void Desktop::constructorInit()
     m_xDispatchHelper.set( static_cast< ::cppu::OWeakObject* >(pInterceptionHelper), css::uno::UNO_QUERY );
 
     OUStringBuffer sUntitledPrefix (256);
-    sUntitledPrefix.append      (FWK_RESSTR(STR_UNTITLED_DOCUMENT));
+    sUntitledPrefix.append      (FwkResId(STR_UNTITLED_DOCUMENT));
     sUntitledPrefix.append (" ");
 
     ::comphelper::NumberedCollection* pNumbers = new ::comphelper::NumberedCollection ();
diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx
index 6cd00ff41112..8efb744c9581 100644
--- a/framework/source/uielement/footermenucontroller.cxx
+++ b/framework/source/uielement/footermenucontroller.cxx
@@ -21,7 +21,7 @@
 
 #include "services.h"
 #include <classes/resource.hrc>
-#include <classes/fwlresid.hxx>
+#include <classes/fwkresid.hxx>
 
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 12f6d4f3558a..af627d73b17f 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -216,13 +216,13 @@ void GenericToolbarController::statusChanged( const FeatureStateEvent& Event )
                 }
                 else if ( aStrValue.startsWith("($2)") )
                 {
-                    OUString aTmp(FWK_RESSTR(STR_CLOSEDOC_ANDRETURN));
+                    OUString aTmp(FwkResId(STR_CLOSEDOC_ANDRETURN));
                     aTmp += aStrValue.copy( 4 );
                     aStrValue = aTmp;
                 }
                 else if ( aStrValue.startsWith("($3)") )
                 {
-                    OUString aTmp(FWK_RESSTR(STR_SAVECOPYDOC));
+                    OUString aTmp(FwkResId(STR_SAVECOPYDOC));
                     aTmp += aStrValue.copy( 4 );
                     aStrValue = aTmp;
                 }
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index 030574b822f8..8c1a64b34f44 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -22,7 +22,7 @@
 #include "services.h"
 
 #include <classes/resource.hrc>
-#include <classes/fwlresid.hxx>
+#include <classes/fwkresid.hxx>
 
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -159,7 +159,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< css::frame::XModel >&
                 if ( bAllOneState && ( nCount > 1 ))
                 {
                     // Insert special item for all command
-                    pVCLPopupMenu->InsertItem( ALL_MENUITEM_ID, FwlResId(STR_MENU_HEADFOOTALL).toString(), MenuItemBits::NONE, OString(), 0 );
+                    pVCLPopupMenu->InsertItem( ALL_MENUITEM_ID, FwkResId(STR_MENU_HEADFOOTALL), MenuItemBits::NONE, OString(), 0 );
 
                     OUStringBuffer aStrBuf( aCmd );
                     aStrBuf.append( "?On:bool=" );
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index e524361c2834..dceee7969f39 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -40,7 +40,7 @@
 #include <i18nlangtag/mslangid.hxx>
 #include <svl/languageoptions.hxx>
 #include <svtools/langtab.hxx>
-#include <classes/fwlresid.hxx>
+#include <classes/fwkresid.hxx>
 
 #include <classes/resource.hrc>
 
@@ -224,19 +224,19 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
 
     // entry for LANGUAGE_NONE
     ++nItemId;
-    pPopupMenu->InsertItem( nItemId, FwlResId(STR_LANGSTATUS_NONE).toString() );
+    pPopupMenu->InsertItem( nItemId, FwkResId(STR_LANGSTATUS_NONE) );
     aCmd = aCmd_Language + "LANGUAGE_NONE";
     pPopupMenu->SetItemCommand( nItemId, aCmd );
 
     // entry for 'Reset to default language'
     ++nItemId;
-    pPopupMenu->InsertItem( nItemId, FwlResId(STR_RESET_TO_DEFAULT_LANGUAGE).toString() );
+    pPopupMenu->InsertItem( nItemId, FwkResId(STR_RESET_TO_DEFAULT_LANGUAGE) );
     aCmd = aCmd_Language + "RESET_LANGUAGES";
     pPopupMenu->SetItemCommand( nItemId, aCmd );
 
     // entry for opening the Format/Character dialog
     ++nItemId;
-    pPopupMenu->InsertItem( nItemId, FwlResId(STR_LANGSTATUS_MORE).toString());
+    pPopupMenu->InsertItem( nItemId, FwkResId(STR_LANGSTATUS_MORE));
     pPopupMenu->SetItemCommand( nItemId, aCmd_Dialog );
 }
 
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 8b2e69d4f8f7..03bb59cbce0a 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -124,8 +124,8 @@ void SAL_CALL LangSelectionStatusbarController::initialize( const css::uno::Sequ
 
     if ( m_xStatusbarItem.is() )
     {
-        m_xStatusbarItem->setText( FWK_RESSTR(STR_LANGSTATUS_MULTIPLE_LANGUAGES) );
-        m_xStatusbarItem->setQuickHelpText(FWK_RESSTR(STR_LANGSTATUS_HINT));
+        m_xStatusbarItem->setText( FwkResId(STR_LANGSTATUS_MULTIPLE_LANGUAGES) );
+        m_xStatusbarItem->setQuickHelpText(FwkResId(STR_LANGSTATUS_HINT));
     }
 }
 
@@ -171,11 +171,11 @@ void LangSelectionStatusbarController::LangMenu(
         }
     }
 
-    xPopupMenu->insertItem( MID_LANG_SEL_NONE,  FWK_RESSTR(STR_LANGSTATUS_NONE), 0, MID_LANG_SEL_NONE );
+    xPopupMenu->insertItem( MID_LANG_SEL_NONE,  FwkResId(STR_LANGSTATUS_NONE), 0, MID_LANG_SEL_NONE );
     if ( sNone == m_aCurLang )
         xPopupMenu->checkItem( MID_LANG_SEL_NONE, true );
-    xPopupMenu->insertItem( MID_LANG_SEL_RESET, FWK_RESSTR(STR_RESET_TO_DEFAULT_LANGUAGE), 0, MID_LANG_SEL_RESET );
-    xPopupMenu->insertItem( MID_LANG_SEL_MORE,  FWK_RESSTR(STR_LANGSTATUS_MORE), 0, MID_LANG_SEL_MORE );
+    xPopupMenu->insertItem( MID_LANG_SEL_RESET, FwkResId(STR_RESET_TO_DEFAULT_LANGUAGE), 0, MID_LANG_SEL_RESET );
+    xPopupMenu->insertItem( MID_LANG_SEL_MORE,  FwkResId(STR_LANGSTATUS_MORE), 0, MID_LANG_SEL_MORE );
 
     // add entries to submenu ('set language for paragraph')
     nItemId = static_cast< sal_Int16 >(MID_LANG_PARA_1);
@@ -193,13 +193,13 @@ void LangSelectionStatusbarController::LangMenu(
             ++nItemId;
         }
     }
-    subPopupMenu->insertItem( MID_LANG_PARA_NONE,  FWK_RESSTR(STR_LANGSTATUS_NONE), 0, MID_LANG_PARA_NONE );
-    subPopupMenu->insertItem( MID_LANG_PARA_RESET, FWK_RESSTR(STR_RESET_TO_DEFAULT_LANGUAGE), 0, MID_LANG_PARA_RESET );
-    subPopupMenu->insertItem( MID_LANG_PARA_MORE,  FWK_RESSTR(STR_LANGSTATUS_MORE), 0, MID_LANG_PARA_MORE );
+    subPopupMenu->insertItem( MID_LANG_PARA_NONE,  FwkResId(STR_LANGSTATUS_NONE), 0, MID_LANG_PARA_NONE );
+    subPopupMenu->insertItem( MID_LANG_PARA_RESET, FwkResId(STR_RESET_TO_DEFAULT_LANGUAGE), 0, MID_LANG_PARA_RESET );
+    subPopupMenu->insertItem( MID_LANG_PARA_MORE,  FwkResId(STR_LANGSTATUS_MORE), 0, MID_LANG_PARA_MORE );
 
     // add last two entries to main menu
     xPopupMenu->insertSeparator( MID_LANG_PARA_SEPARATOR );
-    xPopupMenu->insertItem( MID_LANG_PARA_STRING, FWK_RESSTR(STR_SET_LANGUAGE_FOR_PARAGRAPH), 0, MID_LANG_PARA_STRING );
+    xPopupMenu->insertItem( MID_LANG_PARA_STRING, FwkResId(STR_SET_LANGUAGE_FOR_PARAGRAPH), 0, MID_LANG_PARA_STRING );
     xPopupMenu->setPopupMenu( MID_LANG_PARA_STRING, subPopupMenu );
 
     // now display the popup menu and execute every command ...
@@ -310,7 +310,7 @@ void SAL_CALL LangSelectionStatusbarController::statusChanged( const FeatureStat
                 OUString aStatusText = aSeq[0];
                 if (aStatusText == "*")
                 {
-                    aStatusText = FWK_RESSTR(STR_LANGSTATUS_MULTIPLE_LANGUAGES);
+                    aStatusText = FwkResId(STR_LANGSTATUS_MULTIPLE_LANGUAGES);
                 }
                 m_xStatusbarItem->setText( aStatusText );
 
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index eadf7764af49..62aba551fcad 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -422,19 +422,19 @@ void SAL_CALL MenuBarManager::statusChanged( const FeatureStateEvent& Event )
                         // Replacement for place holders
                         if ( aItemText.startsWith("($1)") )
                         {
-                            OUString aTmp(FWK_RESSTR(STR_UPDATEDOC));
+                            OUString aTmp(FwkResId(STR_UPDATEDOC));
                             aTmp += " " + aItemText.copy( 4 );
                             aItemText = aTmp;
                         }
                         else if ( aItemText.startsWith("($2)") )
                         {
-                            OUString aTmp(FWK_RESSTR(STR_CLOSEDOC_ANDRETURN));
+                            OUString aTmp(FwkResId(STR_CLOSEDOC_ANDRETURN));
                             aTmp += aItemText.copy( 4 );
                             aItemText = aTmp;
                         }
                         else if ( aItemText.startsWith("($3)") )
                         {
-                            OUString aTmp(FWK_RESSTR(STR_SAVECOPYDOC));
+                            OUString aTmp(FwkResId(STR_SAVECOPYDOC));
                             aTmp += aItemText.copy( 4 );
                             aItemText = aTmp;
                         }
@@ -1233,7 +1233,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
                             pPopup->InsertSeparator();
 
                         // Use resource to load popup menu title
-                        OUString aAddonsStrRes(FWK_RESSTR(STR_MENU_ADDONS));
+                        OUString aAddonsStrRes(FwkResId(STR_MENU_ADDONS));
                         pPopup->InsertItem( ITEMID_ADDONLIST, aAddonsStrRes );
                         pPopup->SetPopupMenu( ITEMID_ADDONLIST, pSubMenu );
 
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 9105f945e89c..a4d967c2bb76 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -204,11 +204,11 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
             pVCLPopupMenu->InsertSeparator();
             // Clear List menu entry
             pVCLPopupMenu->InsertItem( sal_uInt16( nCount + 1 ),
-                                       FWK_RESSTR(STR_CLEAR_RECENT_FILES) );
+                                       FwkResId(STR_CLEAR_RECENT_FILES) );
             pVCLPopupMenu->SetItemCommand( sal_uInt16( nCount + 1 ),
                                            CMD_CLEAR_LIST );
             pVCLPopupMenu->SetHelpText( sal_uInt16( nCount + 1 ),
-                                        FWK_RESSTR(STR_CLEAR_RECENT_FILES_HELP) );
+                                        FwkResId(STR_CLEAR_RECENT_FILES_HELP) );
 
             // Open remote menu entry
             if ( m_bShowToolbarEntries )
@@ -228,7 +228,7 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
             else
             {
                 // No recent documents => insert "no document" string
-                pVCLPopupMenu->InsertItem( 1, FWK_RESSTR(STR_NODOCUMENT) );
+                pVCLPopupMenu->InsertItem( 1, FwkResId(STR_NODOCUMENT) );
                 // Do not disable it, otherwise the Toolbar controller and MenuButton
                 // will display SV_RESID_STRING_NOSELECTIONPOSSIBLE instead of STR_NODOCUMENT
                 pVCLPopupMenu->SetItemBits( 1, pVCLPopupMenu->GetItemBits( 1 ) | MenuItemBits::NOSELECT );
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index ae83a001224b..d2d1183d88f6 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1434,14 +1434,14 @@ void ToolBarManager::AddCustomizeMenuItems(ToolBox* pToolBar)
 
     if (MenuItemAllowed(MENUITEM_TOOLBAR_VISIBLEBUTTON))
     {
-        pMenu->InsertItem(MENUITEM_TOOLBAR_VISIBLEBUTTON, FWK_RESSTR(STR_TOOLBAR_VISIBLE_BUTTONS));
+        pMenu->InsertItem(MENUITEM_TOOLBAR_VISIBLEBUTTON, FwkResId(STR_TOOLBAR_VISIBLE_BUTTONS));
         xVisibleItemsPopupMenu = VclPtr<PopupMenu>::Create();
         pMenu->SetPopupMenu(MENUITEM_TOOLBAR_VISIBLEBUTTON, xVisibleItemsPopupMenu);
     }
 
     if (MenuItemAllowed(MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR) && m_pToolBar->IsCustomize())
     {
-        pMenu->InsertItem(MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, FWK_RESSTR(STR_TOOLBAR_CUSTOMIZE_TOOLBAR));
+        pMenu->InsertItem(MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, FwkResId(STR_TOOLBAR_CUSTOMIZE_TOOLBAR));
         pMenu->SetItemCommand(MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, ".uno:ConfigureToolboxVisible");
     }
 
@@ -1452,10 +1452,10 @@ void ToolBarManager::AddCustomizeMenuItems(ToolBox* pToolBar)
     }
 
     if (MenuItemAllowed(MENUITEM_TOOLBAR_DOCKTOOLBAR))
-        pMenu->InsertItem(MENUITEM_TOOLBAR_DOCKTOOLBAR, FWK_RESSTR(STR_TOOLBAR_DOCK_TOOLBAR));
+        pMenu->InsertItem(MENUITEM_TOOLBAR_DOCKTOOLBAR, FwkResId(STR_TOOLBAR_DOCK_TOOLBAR));
 
     if (MenuItemAllowed(MENUITEM_TOOLBAR_DOCKALLTOOLBAR))
-        pMenu->InsertItem(MENUITEM_TOOLBAR_DOCKALLTOOLBAR, FWK_RESSTR(STR_TOOLBAR_DOCK_ALL_TOOLBARS));
+        pMenu->InsertItem(MENUITEM_TOOLBAR_DOCKALLTOOLBAR, FwkResId(STR_TOOLBAR_DOCK_ALL_TOOLBARS));
 
     if (nGroupLen != pMenu->GetItemCount())
     {
@@ -1464,10 +1464,10 @@ void ToolBarManager::AddCustomizeMenuItems(ToolBox* pToolBar)
     }
 
     if (MenuItemAllowed(MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION))
-        pMenu->InsertItem(MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, FWK_RESSTR(STR_TOOLBAR_LOCK_TOOLBAR));
+        pMenu->InsertItem(MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, FwkResId(STR_TOOLBAR_LOCK_TOOLBAR));
 
     if (MenuItemAllowed(MENUITEM_TOOLBAR_CLOSE))
-        pMenu->InsertItem(MENUITEM_TOOLBAR_CLOSE, FWK_RESSTR(STR_TOOLBAR_CLOSE_TOOLBAR));
+        pMenu->InsertItem(MENUITEM_TOOLBAR_CLOSE, FwkResId(STR_TOOLBAR_CLOSE_TOOLBAR));
 
     if (m_pToolBar->IsCustomize())
     {
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 2f5805ddc0ca..b587b7e24cca 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -454,7 +454,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
             }
         }
 
-        OUString aLabelStr(FWK_RESSTR(STR_RESTORE_TOOLBARS));
+        OUString aLabelStr(FwkResId(STR_RESTORE_TOOLBARS));
         OUString aRestoreCmd( CMD_RESTOREVISIBILITY );
         addCommand( m_xPopupMenu, aRestoreCmd, aLabelStr );
     }