make ResId::toString a non-static member

Change-Id: I756c0a19bea7b1cc0e290d9f382a04d655819bfb

17 files changed, 59 insertions, 58 deletions

diff --git a/svx/inc/svx/dialmgr.hxx b/svx/inc/svx/dialmgr.hxx
index 41c4028c0637..d2f15abc65ff 100644
--- a/svx/inc/svx/dialmgr.hxx
+++ b/svx/inc/svx/dialmgr.hxx
@@ -43,7 +43,7 @@ struct SVX_DLLPUBLIC DialogsResMgr
 
 #define DIALOG_MGR()    (*DialogsResMgr::GetResMgr())
 #define SVX_RES(i)      ResId(i,DIALOG_MGR())
-#define SVX_RESSTR(i)   ResId::toString(ResId(i,DIALOG_MGR()))
+#define SVX_RESSTR(i)   SVX_RES(i).toString()
 
 #endif
 
diff --git a/svx/inc/svx/galmisc.hxx b/svx/inc/svx/galmisc.hxx
index 7f4563e89f7e..2f1edebfd0a4 100644
--- a/svx/inc/svx/galmisc.hxx
+++ b/svx/inc/svx/galmisc.hxx
@@ -84,7 +84,8 @@ enum SgaObjKind
 
 #define USERDATA_HDL()          (LINK(this,SgaUserDataFactory,MakeUserData))
 
-#define GAL_RESID( nId )        ResId( nId, *GetGalleryResMgr() )
+#define GAL_RES(nId)            ResId(nId, *GetGalleryResMgr())
+#define GAL_RESSTR(nId)         GAL_RES(nId).toString()
 #define STREAMBUF_SIZE          16384L
 
 #define SGA_IMPORT_NONE         0x0000
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 9c14c0066735..0ec2329c4303 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -68,7 +68,7 @@ String GetDicInfoStr( const String& rName, const sal_uInt16 nLang, sal_Bool bNeg
     }
 
     if ( LANGUAGE_NONE == nLang )
-        aTmp += String( ResId( RID_SVXSTR_LANGUAGE_ALL, DIALOG_MGR() ) );
+        aTmp += SVX_RESSTR(RID_SVXSTR_LANGUAGE_ALL);
     else
     {
         aTmp += sal_Unicode( '[' );
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index f1c50decc842..1c7a03174cc7 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -74,18 +74,18 @@ OSystemParseContext::~OSystemParseContext()
     SolarMutexGuard aGuard;
     switch (_eCode)
     {
-        case ERROR_GENERAL:                 aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_ERROR); break;
-        case ERROR_VALUE_NO_LIKE:           aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE); break;
-        case ERROR_FIELD_NO_LIKE:           aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_FIELD_NO_LIKE); break;
-        case ERROR_INVALID_COMPARE:         aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE); break;
-        case ERROR_INVALID_INT_COMPARE:     aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID); break;
-        case ERROR_INVALID_DATE_COMPARE:    aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID); break;
-        case ERROR_INVALID_REAL_COMPARE:    aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID); break;
-        case ERROR_INVALID_TABLE:           aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_TABLE); break;
-        case ERROR_INVALID_TABLE_OR_QUERY:  aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_TABLE_OR_QUERY); break;
-        case ERROR_INVALID_COLUMN:          aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_COLUMN); break;
-        case ERROR_INVALID_TABLE_EXIST:     aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_TABLE_EXISTS); break;
-        case ERROR_INVALID_QUERY_EXIST:     aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_QUERY_EXISTS); break;
+        case ERROR_GENERAL:                 aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_ERROR); break;
+        case ERROR_VALUE_NO_LIKE:           aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE); break;
+        case ERROR_FIELD_NO_LIKE:           aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_FIELD_NO_LIKE); break;
+        case ERROR_INVALID_COMPARE:         aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE); break;
+        case ERROR_INVALID_INT_COMPARE:     aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID); break;
+        case ERROR_INVALID_DATE_COMPARE:    aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID); break;
+        case ERROR_INVALID_REAL_COMPARE:    aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID); break;
+        case ERROR_INVALID_TABLE:           aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE); break;
+        case ERROR_INVALID_TABLE_OR_QUERY:  aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE_OR_QUERY); break;
+        case ERROR_INVALID_COLUMN:          aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_COLUMN); break;
+        case ERROR_INVALID_TABLE_EXIST:     aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE_EXISTS); break;
+        case ERROR_INVALID_QUERY_EXIST:     aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_QUERY_EXISTS); break;
         case ERROR_NONE: break;
     }
     return aMsg;
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 8a54bd4149ed..94ac4fd09133 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -679,7 +679,7 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmPar
                 }
 
                 // title for the next conditions
-                aTitle = SVX_RES( RID_STR_FILTER_FILTER_OR );
+                aTitle = SVX_RESSTR( RID_STR_FILTER_FILTER_OR );
             }
 
             // now add dependent controllers
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index b51d91b4c481..67f89bc51c6c 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -1008,7 +1008,7 @@ FmUndoPropertyAction::FmUndoPropertyAction(FmFormModel& rNewMod, const PropertyC
     if (rNewMod.GetObjectShell())
         rNewMod.GetObjectShell()->SetModified(sal_True);
     if(static_STR_UNDO_PROPERTY.Len() == 0)
-        static_STR_UNDO_PROPERTY = SVX_RES(RID_STR_UNDO_PROPERTY);
+        static_STR_UNDO_PROPERTY = SVX_RESSTR(RID_STR_UNDO_PROPERTY);
 }
 
 
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 5c1522eadba4..7d0f8d7c5c5a 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -4058,11 +4058,11 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) th
     sal_Int32 nLength = aEvent.Rows;
     if ( nLength > 1 )
     {
-        sTitle = SVX_RES( RID_STR_DELETECONFIRM_RECORDS );
+        sTitle = SVX_RESSTR( RID_STR_DELETECONFIRM_RECORDS );
         sTitle.SearchAndReplace( '#', String::CreateFromInt32( nLength ) );
     }
     else
-        sTitle = SVX_RES( RID_STR_DELETECONFIRM_RECORD );
+        sTitle = SVX_RESSTR( RID_STR_DELETECONFIRM_RECORD );
 
     try
     {
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index bae1e49357ad..eee6078b5eb0 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1819,16 +1819,16 @@ namespace svxform
             String aUndoStr;
             if ( m_arrCurrentSelection.size() == 1 )
             {
-                aUndoStr = SVX_RES(RID_STR_UNDO_CONTAINER_REMOVE);
+                aUndoStr = SVX_RESSTR(RID_STR_UNDO_CONTAINER_REMOVE);
                 if (m_nFormsSelected)
-                    aUndoStr.SearchAndReplaceAscii( "#", SVX_RES( RID_STR_FORM ) );
+                    aUndoStr.SearchAndReplaceAscii( "#", SVX_RESSTR( RID_STR_FORM ) );
                 else
                     // it must be a control (else the root would be selected, but it cannot be deleted)
-                    aUndoStr.SearchAndReplaceAscii( "#", SVX_RES( RID_STR_CONTROL ) );
+                    aUndoStr.SearchAndReplaceAscii( "#", SVX_RESSTR( RID_STR_CONTROL ) );
             }
             else
             {
-                aUndoStr = SVX_RES(RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE);
+                aUndoStr = SVX_RESSTR(RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE);
                 aUndoStr.SearchAndReplaceAscii( "#", String::CreateFromInt32( m_arrCurrentSelection.size() ) );
             }
             pFormModel->BegUndo(aUndoStr);
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index e5f3c8501b08..35404a022bbb 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -301,9 +301,9 @@ namespace svxform
         {
             XubString aStr;
             if (pEntry->ISA(FmFormData))
-                aStr = SVX_RES(RID_STR_FORM);
+                aStr = SVX_RESSTR(RID_STR_FORM);
             else
-                aStr = SVX_RES(RID_STR_CONTROL);
+                aStr = SVX_RESSTR(RID_STR_CONTROL);
 
             Reference< XIndexContainer >  xContainer;
             if (pFolder)
@@ -408,13 +408,13 @@ namespace svxform
         {
             XubString        aStr;
             if (pEntry->ISA(FmFormData))
-                aStr = SVX_RES(RID_STR_FORM);
+                aStr = SVX_RESSTR(RID_STR_FORM);
             else
-                aStr = SVX_RES(RID_STR_CONTROL);
+                aStr = SVX_RESSTR(RID_STR_CONTROL);
 
             if( bUndo )
             {
-                XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_REMOVE));
+                XubString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_REMOVE));
                 aUndoStr.SearchAndReplace('#', aStr);
                 m_pFormModel->BegUndo(aUndoStr);
             }
diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx
index 4c80b8af3d28..ef88a608b75c 100644
--- a/svx/source/gallery2/galbrws.cxx
+++ b/svx/source/gallery2/galbrws.cxx
@@ -83,7 +83,7 @@ void GallerySplitter::DataChanged( const DataChangedEvent& rDCEvt )
 GalleryChildWindow::GalleryChildWindow( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) :
     SfxChildWindow( _pParent, nId )
 {
-    pWindow = new GalleryBrowser( pBindings, this, _pParent, GAL_RESID( RID_SVXDLG_GALLERYBROWSER ) );
+    pWindow = new GalleryBrowser( pBindings, this, _pParent, GAL_RES( RID_SVXDLG_GALLERYBROWSER ) );
     eChildAlignment = SFX_ALIGN_TOP;
     ( (GalleryBrowser*) pWindow )->Initialize( pInfo );
 };
@@ -107,9 +107,9 @@ GalleryBrowser::GalleryBrowser( SfxBindings* _pBindings, SfxChildWindow* pCW,
     SfxDockingWindow( _pBindings, pCW, pParent, rResId )
 {
     mpGallery = Gallery::GetGalleryInstance();
-    mpBrowser1 = new GalleryBrowser1( this, GAL_RESID( GALLERY_BROWSER1 ), mpGallery );
-    mpSplitter = new GallerySplitter( this, GAL_RESID( GALLERY_SPLITTER ) );
-    mpBrowser2 = new GalleryBrowser2( this, GAL_RESID( GALLERY_BROWSER2 ), mpGallery );
+    mpBrowser1 = new GalleryBrowser1( this, GAL_RES( GALLERY_BROWSER1 ), mpGallery );
+    mpSplitter = new GallerySplitter( this, GAL_RES( GALLERY_SPLITTER ) );
+    mpBrowser2 = new GalleryBrowser2( this, GAL_RES( GALLERY_BROWSER2 ), mpGallery );
 
     FreeResource();
     SetMinOutputSizePixel( maLastSize = GetOutputSizePixel() );
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index d581973fe00f..143dde6d8d9c 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -153,7 +153,7 @@ GalleryBrowser1::GalleryBrowser1( GalleryBrowser* pParent, const ResId& rResId,
     StartListening( *mpGallery );
 
     maNewTheme.SetHelpId( HID_GALLERY_NEWTHEME );
-    maNewTheme.SetText( String( GAL_RESID( RID_SVXSTR_GALLERY_CREATETHEME ) ) );
+    maNewTheme.SetText( GAL_RESSTR(RID_SVXSTR_GALLERY_CREATETHEME));
     maNewTheme.SetClickHdl( LINK( this, GalleryBrowser1, ClickNewThemeHdl ) );
 
     // disable creation of new themes if a writable directory is not available
@@ -162,7 +162,7 @@ GalleryBrowser1::GalleryBrowser1( GalleryBrowser* pParent, const ResId& rResId,
 
     mpThemes->SetHelpId( HID_GALLERY_THEMELIST );
     mpThemes->SetSelectHdl( LINK( this, GalleryBrowser1, SelectThemeHdl ) );
-    mpThemes->SetAccessibleName(String(SVX_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) ) );
+    mpThemes->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERYPROPS_GALTHEME));
 
     for( sal_uIntPtr i = 0, nCount = mpGallery->GetThemeCount(); i < nCount; i++ )
         ImplInsertThemeEntry( mpGallery->GetThemeInfo( i ) );
@@ -422,7 +422,7 @@ void GalleryBrowser1::ImplExecute( sal_uInt16 nId )
 
         case( MN_DELETE  ):
         {
-            if( QueryBox( NULL, WB_YES_NO, String( GAL_RESID( RID_SVXSTR_GALLERY_DELETETHEME ) ) ).Execute() == RET_YES )
+            if( QueryBox( NULL, WB_YES_NO, GAL_RESSTR(RID_SVXSTR_GALLERY_DELETETHEME)).Execute() == RET_YES )
                 mpGallery->RemoveTheme( mpThemes->GetSelectEntry() );
         }
         break;
@@ -652,7 +652,7 @@ IMPL_LINK_NOARG(GalleryBrowser1, ShowContextMenuHdl)
 
     if( !aExecVector.empty() )
     {
-        PopupMenu aMenu( GAL_RESID( RID_SVXMN_GALLERY1 ) );
+        PopupMenu aMenu( GAL_RES( RID_SVXMN_GALLERY1 ) );
 
         aMenu.EnableItem( MN_ACTUALIZE, ::std::find( aExecVector.begin(), aExecVector.end(), MN_ACTUALIZE ) != aExecVector.end() );
         aMenu.EnableItem( MN_RENAME, ::std::find( aExecVector.begin(), aExecVector.end(), MN_RENAME ) != aExecVector.end() );
@@ -694,7 +694,7 @@ IMPL_LINK_NOARG(GalleryBrowser1, SelectThemeHdl)
 
 IMPL_LINK_NOARG(GalleryBrowser1, ClickNewThemeHdl)
 {
-    String  aNewTheme( GAL_RESID( RID_SVXSTR_GALLERY_NEWTHEME ) );
+    String  aNewTheme( GAL_RESSTR(RID_SVXSTR_GALLERY_NEWTHEME) );
     String  aName( aNewTheme );
     sal_uIntPtr nCount = 0;
 
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 3da4fe96709a..70cd6578be37 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -171,7 +171,7 @@ public:
 // ------------------------------------------------------------------------
 
 GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos, sal_Bool bPreview ) :
-    PopupMenu           ( GAL_RESID( RID_SVXMN_GALLERY2 ) ),
+    PopupMenu           ( GAL_RES( RID_SVXMN_GALLERY2 ) ),
     SfxControllerItem   ( SID_GALLERY_ENABLE_ADDCOPY, SfxViewFrame::Current()->GetBindings() ),
     maBackgroundPopup   ( pTheme, nObjectPos ),
     mpTheme             ( pTheme ),
@@ -324,20 +324,20 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId,
     maViewBox.InsertItem( TBX_ID_ICON, aDummyImage );
     maViewBox.SetItemBits( TBX_ID_ICON, TIB_RADIOCHECK | TIB_AUTOCHECK );
     maViewBox.SetHelpId( TBX_ID_ICON, HID_GALLERY_ICONVIEW );
-    maViewBox.SetQuickHelpText( TBX_ID_ICON, String( GAL_RESID( RID_SVXSTR_GALLERY_ICONVIEW ) ) );
+    maViewBox.SetQuickHelpText( TBX_ID_ICON, GAL_RESSTR(RID_SVXSTR_GALLERY_ICONVIEW) );
 
     maViewBox.InsertItem( TBX_ID_LIST, aDummyImage );
     maViewBox.SetItemBits( TBX_ID_LIST, TIB_RADIOCHECK | TIB_AUTOCHECK );
     maViewBox.SetHelpId( TBX_ID_LIST, HID_GALLERY_LISTVIEW );
-    maViewBox.SetQuickHelpText( TBX_ID_LIST, String( GAL_RESID( RID_SVXSTR_GALLERY_LISTVIEW ) ) );
+    maViewBox.SetQuickHelpText( TBX_ID_LIST, GAL_RESSTR(RID_SVXSTR_GALLERY_LISTVIEW) );
 
     maViewBox.SetBorder( 0, 1 );
     MiscHdl( NULL );
     maViewBox.SetSelectHdl( LINK( this, GalleryBrowser2, SelectTbxHdl ) );
     maViewBox.Show();
 
-    mpIconView->SetAccessibleName(String( SVX_RES( RID_SVXSTR_GALLERY_THEMEITEMS ) ));
-    mpListView->SetAccessibleName(String( SVX_RES( RID_SVXSTR_GALLERY_THEMEITEMS ) ));
+    mpIconView->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERY_THEMEITEMS));
+    mpListView->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERY_THEMEITEMS));
 
     maInfoBar.Show();
     maSeparator.Show();
@@ -648,9 +648,9 @@ void GalleryBrowser2::SelectTheme( const String& rThemeName )
     mpListView = new GalleryListView( this, mpCurTheme );
     mpPreview = new GalleryPreview( this, mpCurTheme );
 
-    mpIconView->SetAccessibleName(String( SVX_RES( RID_SVXSTR_GALLERY_THEMEITEMS ) ));
-    mpListView->SetAccessibleName(String( SVX_RES( RID_SVXSTR_GALLERY_THEMEITEMS ) ));
-    mpPreview->SetAccessibleName(String( SVX_RES( RID_SVXSTR_GALLERY_PREVIEW ) ));
+    mpIconView->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERY_THEMEITEMS));
+    mpListView->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERY_THEMEITEMS));
+    mpPreview->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERY_PREVIEW));
 
     const Link aSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) );
 
@@ -1013,7 +1013,7 @@ void GalleryBrowser2::ImplExecute( sal_uInt16 nId )
             case( MN_DELETE ):
             {
                 if( !mpCurTheme->IsReadOnly() &&
-                    QueryBox( NULL, WB_YES_NO, String( GAL_RESID( RID_SVXSTR_GALLERY_DELETEOBJ ) ) ).Execute() == RET_YES )
+                    QueryBox(NULL, WB_YES_NO, GAL_RESSTR(RID_SVXSTR_GALLERY_DELETEOBJ)).Execute() == RET_YES )
                 {
                     mpCurTheme->RemoveObject( mnCurActionPos );
                 }
@@ -1235,8 +1235,8 @@ IMPL_LINK_NOARG(GalleryBrowser2, MiscHdl)
 {
     maViewBox.SetOutStyle( maMiscOptions.GetToolboxStyle() );
 
-    BitmapEx aIconBmpEx = BitmapEx( Image( GAL_RESID( RID_SVXIMG_GALLERY_VIEW_ICON ) ).GetBitmapEx() );
-    BitmapEx aListBmpEx = BitmapEx( Image( GAL_RESID( RID_SVXIMG_GALLERY_VIEW_LIST ) ).GetBitmapEx() );
+    BitmapEx aIconBmpEx = BitmapEx( Image( GAL_RES( RID_SVXIMG_GALLERY_VIEW_ICON ) ).GetBitmapEx() );
+    BitmapEx aListBmpEx = BitmapEx( Image( GAL_RES( RID_SVXIMG_GALLERY_VIEW_LIST ) ).GetBitmapEx() );
 
     if( maMiscOptions.AreCurrentSymbolsLarge() )
     {
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 3565f54afe52..2a00e5cdd2b7 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -89,7 +89,7 @@ bool GalleryPreview::SetGraphic( const INetURLObject& _aURL )
     Graphic aGraphic;
     if( ::avmedia::MediaWindow::isMediaURL( _aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) )
     {
-        aGraphic = BitmapEx( GAL_RESID( RID_SVXBMP_GALLERY_MEDIA ) );
+        aGraphic = BitmapEx( GAL_RES( RID_SVXBMP_GALLERY_MEDIA ) );
     }
     else
     {
@@ -480,8 +480,8 @@ GalleryListView::GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme
 
     SetMode( BROWSER_AUTO_VSCROLL | BROWSER_AUTOSIZE_LASTCOL );
     SetDataRowHeight( 28 );
-    InsertDataColumn( GALLERY_BRWBOX_TITLE, String( GAL_RESID( RID_SVXSTR_GALLERY_TITLE ) ), 256  );
-    InsertDataColumn( GALLERY_BRWBOX_PATH, String( GAL_RESID( RID_SVXSTR_GALLERY_PATH ) ), 256 );
+    InsertDataColumn( GALLERY_BRWBOX_TITLE, GAL_RESSTR(RID_SVXSTR_GALLERY_TITLE), 256  );
+    InsertDataColumn( GALLERY_BRWBOX_PATH, GAL_RESSTR(RID_SVXSTR_GALLERY_PATH), 256 );
 }
 
 // ------------------------------------------------------------------------
@@ -593,7 +593,7 @@ void GalleryListView::PaintField( OutputDevice& rDev, const Rectangle& rRect, sa
                 GraphicObject   aGrfObj;
 
                 if( pObj->GetObjKind() == SGA_OBJ_SOUND )
-                    aGrfObj = Graphic( BitmapEx( GAL_RESID( RID_SVXBMP_GALLERY_MEDIA ) ) );
+                    aGrfObj = Graphic( BitmapEx( GAL_RES( RID_SVXBMP_GALLERY_MEDIA ) ) );
                 else if( pObj->IsThumbBitmap() )
                     aGrfObj = Graphic( pObj->GetThumbBmp() );
                 else
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 4ce012c8577e..670919b73cc8 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -77,7 +77,7 @@ GalleryThemeEntry::GalleryThemeEntry( const INetURLObject& rBaseURL, const Strin
     SetModified( _bNewFile );
 
     if( nId && bThemeNameFromResource )
-        aName = String( GAL_RESID( RID_GALLERYSTR_THEME_START + (sal_uInt16) nId ) );
+        aName = GAL_RESSTR( RID_GALLERYSTR_THEME_START + (sal_uInt16) nId );
 
     if( aName.isEmpty() )
         aName = rName;
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index a618e1dafa51..f6fe5620b529 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -88,7 +88,7 @@ ResMgr* GetGalleryResMgr()
 
 BitmapEx GalleryResGetBitmapEx( sal_uInt32 nId )
 {
-    BitmapEx aBmpEx( GAL_RESID( nId ) );
+    BitmapEx aBmpEx( GAL_RES( nId ) );
 
     if( !aBmpEx.IsTransparent() )
             aBmpEx = BitmapEx( aBmpEx.GetBitmap(), COL_LIGHTMAGENTA );
@@ -420,7 +420,7 @@ GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) :
 
                 if( mpFilter )
                 {
-                    aProgressText = String( GAL_RESID( RID_SVXSTR_GALLERY_FILTER ) );
+                    aProgressText = GAL_RESSTR(RID_SVXSTR_GALLERY_FILTER);
 //                  mpFilter->SetUpdatePercentHdl( LINK( this, GalleryProgress, Update ) );     // sj: progress wasn't working up from SO7 at all
 //                                                                                              // so I am removing this. The gallery progress should
 //                                                                                              // be changed to use the XStatusIndicator instead of XProgressMonitor
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index f0db928d3824..b2ca47641e6f 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -214,7 +214,7 @@ const String SgaObject::GetTitle() const
                     aResId.SetRT( RSC_STRING );
                     if ( pResMgr->IsAvailable( aResId ) )
                     {
-                        aReturnValue = String( aResId );
+                        aReturnValue = aResId.toString();
                     }
                     delete pResMgr;
                 }
@@ -363,7 +363,7 @@ Bitmap SgaObjectSound::GetThumbBmp() const
         break;
     }
 
-    const BitmapEx  aBmpEx( GAL_RESID( nId ) );
+    const BitmapEx  aBmpEx( GAL_RES( nId ) );
     const Color     aTransColor( COL_WHITE );
 
     return aBmpEx.GetBitmap( &aTransColor );
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index de4de7350e8f..d0e2ac8091dd 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -1596,7 +1596,7 @@ const rtl::OUString& GalleryTheme::GetName() const { return IsImported() ? aImpo
 void GalleryTheme::InsertAllThemes( ListBox& rListBox )
 {
     for( sal_uInt16 i = RID_GALLERYSTR_THEME_FIRST; i <= RID_GALLERYSTR_THEME_LAST; i++ )
-        rListBox.InsertEntry( String( GAL_RESID( i ) ) );
+        rListBox.InsertEntry(GAL_RESSTR(i));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */