reduce use of UniString from ResID ctor

Change-Id: I8d7619e7807ff2d400ec5c7fd181375130245728

30 files changed, 158 insertions, 158 deletions

diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 96f1b59f484e..c213b7b1dd8b 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -116,7 +116,7 @@ namespace abp
 #else
         m_aSettings.eType = AST_OTHER;
 #endif
-        m_aSettings.sDataSourceName = String(ModuleRes(RID_STR_DEFAULT_NAME));
+        m_aSettings.sDataSourceName = ModuleRes(RID_STR_DEFAULT_NAME).toString();
         m_aSettings.bRegisterDataSource = false;
         m_aSettings.bIgnoreNoTable = false;
 
@@ -150,7 +150,7 @@ namespace abp
         if ( nResId )
         {
             svt::OLocalResourceAccess aAccess( ModuleRes( RID_DLG_ADDRESSBOOKSOURCEPILOT ), RSC_MODALDIALOG );
-            sDisplayName = String( ModuleRes( nResId ) );
+            sDisplayName = ModuleRes(nResId).toString();
         }
 
         return sDisplayName;
diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx
index 7339d1420b45..db24269e2cf5 100644
--- a/extensions/source/abpilot/admininvokationimpl.cxx
+++ b/extensions/source/abpilot/admininvokationimpl.cxx
@@ -79,8 +79,8 @@ namespace abp
             *pArguments++ <<= PropertyValue(OUString("ParentWindow"), -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE);
 
             // the title of the dialog
-            String sAdminDialogTitle(ModuleRes(RID_STR_ADMINDIALOGTITLE));
-            *pArguments++ <<= PropertyValue(OUString("Title"), -1, makeAny(OUString(sAdminDialogTitle)), PropertyState_DIRECT_VALUE);
+            OUString sAdminDialogTitle(ModuleRes(RID_STR_ADMINDIALOGTITLE).toString());
+            *pArguments++ <<= PropertyValue(OUString("Title"), -1, makeAny(sAdminDialogTitle), PropertyState_DIRECT_VALUE);
 
             // the name of the new data source
             *pArguments++ <<= PropertyValue(OUString("InitialSelection"), -1, makeAny(m_xDataSource), PropertyState_DIRECT_VALUE);
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index bc0f78eb63a0..68ba6fe5e5f0 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -566,8 +566,8 @@ namespace abp
                   {
                     // prepend some context info
                     SQLContext aDetailedError;
-                    aDetailedError.Message = String( ModuleRes( RID_STR_NOCONNECTION ) );
-                    aDetailedError.Details = String( ModuleRes( RID_STR_PLEASECHECKSETTINGS ) );
+                    aDetailedError.Message = ModuleRes(RID_STR_NOCONNECTION).toString();
+                    aDetailedError.Details = ModuleRes(RID_STR_PLEASECHECKSETTINGS).toString();
                     aDetailedError.NextException = aError;
                     // handle (aka display) the new context info
                     xInteractions->handle( new OInteractionRequest( makeAny( aDetailedError ) ) );
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index 2f482e6575f1..f220fd0b078c 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -84,7 +84,7 @@ namespace abp
                 // ........................................................
                 // create an instance of the dialog service
                 Reference< XWindow > xDialogParent = VCLUnoHelper::GetInterface( _pParent );
-                OUString sTitle = String( ModuleRes( RID_STR_FIELDDIALOGTITLE ) );
+                OUString sTitle(ModuleRes(RID_STR_FIELDDIALOGTITLE).toString());
                 Reference< XExecutableDialog > xDialog = AddressBookSourceDialog::createWithDataSource(_rxORB,
                                                            // the parent window
                                                            xDialogParent,
diff --git a/extensions/source/abpilot/fieldmappingpage.cxx b/extensions/source/abpilot/fieldmappingpage.cxx
index 12a51bd5985c..8776d5d1e063 100644
--- a/extensions/source/abpilot/fieldmappingpage.cxx
+++ b/extensions/source/abpilot/fieldmappingpage.cxx
@@ -80,9 +80,9 @@ namespace abp
     void FieldMappingPage::implUpdateHint()
     {
         const AddressSettings& rSettings = getSettings();
-        String sHint;
+        OUString sHint;
         if ( 0 == rSettings.aFieldMapping.size() )
-            sHint = String( ModuleRes( RID_STR_NOFIELDSASSIGNED ) );
+            sHint = ModuleRes(RID_STR_NOFIELDSASSIGNED).toString();
         m_aHint.SetText( sHint );
     }
 
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 9d6c6e7c08a4..9dbb7be0469b 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -239,7 +239,7 @@ void BibliographyLoader::load(const Reference< XFrame > & rFrame, const OUString
     if(xPrSet.is())
     {
         Any aTitle;
-        aTitle <<= OUString(String(BibResId(RID_BIB_STR_FRAME_TITLE)));
+        aTitle <<= BibResId(RID_BIB_STR_FRAME_TITLE).toString();
         xPrSet->setPropertyValue("Title", aTitle);
     }
     if(aPartName.EqualsAscii("View") || aPartName.EqualsAscii("View1"))
diff --git a/extensions/source/bibliography/bibresid.hxx b/extensions/source/bibliography/bibresid.hxx
index 8188c4e17df4..daa100db103b 100644
--- a/extensions/source/bibliography/bibresid.hxx
+++ b/extensions/source/bibliography/bibresid.hxx
@@ -30,7 +30,7 @@ class BibResId : public ResId
     BibResId( sal_uInt16 nId );
 };
 
-
+#define BIB_RESSTR(i)   BibResId(i).toString()
 
 #endif // ADRRESID_HXX
 
diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx
index dac90718d065..9063b8031bd8 100644
--- a/extensions/source/bibliography/bibview.cxx
+++ b/extensions/source/bibliography/bibview.cxx
@@ -134,7 +134,7 @@ namespace bib
             else if(bExecute)
             {
                 sErrorString += '\n';
-                sErrorString += String( BibResId( RID_MAP_QUESTION ) );
+                sErrorString += BIB_RESSTR(RID_MAP_QUESTION);
                 QueryBox aQuery( this, WB_YES_NO, sErrorString );
                 aQuery.SetDefaultCheckBoxText();
                 short nResult = aQuery.Execute();
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 60a1fc95e94f..668dcc31a9b5 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -360,42 +360,42 @@ MappingDialog_Impl::MappingDialog_Impl(Window* pParent, BibDataManager* pMan) :
     aCustom4LB(this,            BibResId( LB_CUSTOM4        )),
     aCustom5FT(this,            BibResId( FT_CUSTOM5        )),
     aCustom5LB(this,            BibResId( LB_CUSTOM5        )),
-    sNone(BibResId(ST_NONE)),
+    sNone(BIB_RESSTR(ST_NONE)),
     bModified(sal_False)
 {
     FreeResource();
 
-    aIdentifierFT.SetText(String(         BibResId( ST_IDENTIFIER    )));
-    aAuthorityTypeFT.SetText(String(      BibResId( ST_AUTHTYPE )));
-    aAuthorFT.SetText(String(             BibResId( ST_AUTHOR        )));
-    aTitleFT.SetText(String(              BibResId( ST_TITLE         )));
-    aMonthFT.SetText(String(              BibResId( ST_MONTH         )));
-    aYearFT.SetText(String(               BibResId( ST_YEAR          )));
-    aISBNFT.SetText(String(               BibResId( ST_ISBN          )));
-    aBooktitleFT.SetText(String(          BibResId( ST_BOOKTITLE     )));
-    aChapterFT.SetText(String(            BibResId( ST_CHAPTER       )));
-    aEditionFT.SetText(String(            BibResId( ST_EDITION       )));
-    aEditorFT.SetText(String(             BibResId( ST_EDITOR        )));
-    aHowpublishedFT.SetText(String(       BibResId( ST_HOWPUBLISHED  )));
-    aInstitutionFT.SetText(String(        BibResId( ST_INSTITUTION   )));
-    aJournalFT.SetText(String(            BibResId( ST_JOURNAL       )));
-    aNoteFT.SetText(String(               BibResId( ST_NOTE          )));
-    aAnnoteFT.SetText(String(             BibResId( ST_ANNOTE        )));
-    aNumberFT.SetText(String(             BibResId( ST_NUMBER        )));
-    aOrganizationsFT.SetText(String(      BibResId( ST_ORGANIZATION )));
-    aPagesFT.SetText(String(              BibResId( ST_PAGE         )));
-    aPublisherFT.SetText(String(          BibResId( ST_PUBLISHER     )));
-    aAddressFT.SetText(String(            BibResId( ST_ADDRESS       )));
-    aSchoolFT.SetText(String(             BibResId( ST_SCHOOL        )));
-    aSeriesFT.SetText(String(             BibResId( ST_SERIES        )));
-    aReportTypeFT.SetText(String(         BibResId( ST_REPORT    )));
-    aVolumeFT.SetText(String(             BibResId( ST_VOLUME        )));
-    aURLFT.SetText(String(                BibResId( ST_URL           )));
-    aCustom1FT.SetText(String(            BibResId( ST_CUSTOM1       )));
-    aCustom2FT.SetText(String(            BibResId( ST_CUSTOM2       )));
-    aCustom3FT.SetText(String(            BibResId( ST_CUSTOM3       )));
-    aCustom4FT.SetText(String(            BibResId( ST_CUSTOM4       )));
-    aCustom5FT.SetText(String(            BibResId( ST_CUSTOM5       )));
+    aIdentifierFT.SetText(BIB_RESSTR(ST_IDENTIFIER));
+    aAuthorityTypeFT.SetText(BIB_RESSTR(ST_AUTHTYPE));
+    aAuthorFT.SetText(BIB_RESSTR(ST_AUTHOR));
+    aTitleFT.SetText(BIB_RESSTR(ST_TITLE));
+    aMonthFT.SetText(BIB_RESSTR(ST_MONTH));
+    aYearFT.SetText(BIB_RESSTR(ST_YEAR));
+    aISBNFT.SetText(BIB_RESSTR(ST_ISBN));
+    aBooktitleFT.SetText(BIB_RESSTR(ST_BOOKTITLE));
+    aChapterFT.SetText(BIB_RESSTR(ST_CHAPTER));
+    aEditionFT.SetText(BIB_RESSTR(ST_EDITION));
+    aEditorFT.SetText(BIB_RESSTR(ST_EDITOR));
+    aHowpublishedFT.SetText(BIB_RESSTR(ST_HOWPUBLISHED));
+    aInstitutionFT.SetText(BIB_RESSTR(ST_INSTITUTION));
+    aJournalFT.SetText(BIB_RESSTR(ST_JOURNAL));
+    aNoteFT.SetText(BIB_RESSTR(ST_NOTE));
+    aAnnoteFT.SetText(BIB_RESSTR(ST_ANNOTE));
+    aNumberFT.SetText(BIB_RESSTR(ST_NUMBER));
+    aOrganizationsFT.SetText(BIB_RESSTR(ST_ORGANIZATION));
+    aPagesFT.SetText(BIB_RESSTR(ST_PAGE));
+    aPublisherFT.SetText(BIB_RESSTR(ST_PUBLISHER));
+    aAddressFT.SetText(BIB_RESSTR(ST_ADDRESS));
+    aSchoolFT.SetText(BIB_RESSTR(ST_SCHOOL));
+    aSeriesFT.SetText(BIB_RESSTR(ST_SERIES));
+    aReportTypeFT.SetText(BIB_RESSTR(ST_REPORT));
+    aVolumeFT.SetText(BIB_RESSTR(ST_VOLUME));
+    aURLFT.SetText(BIB_RESSTR(ST_URL));
+    aCustom1FT.SetText(BIB_RESSTR(ST_CUSTOM1));
+    aCustom2FT.SetText(BIB_RESSTR(ST_CUSTOM2));
+    aCustom3FT.SetText(BIB_RESSTR(ST_CUSTOM3));
+    aCustom4FT.SetText(BIB_RESSTR(ST_CUSTOM4));
+    aCustom5FT.SetText(BIB_RESSTR(ST_CUSTOM5));
 
     aOKBT.SetClickHdl(LINK(this, MappingDialog_Impl, OkHdl));
     String sTitle = GetText();
@@ -556,8 +556,8 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan )
     aSelectionGB(this,  BibResId( GB_SELECTION )),
     aSelectionLB(this,  BibResId( LB_SELECTION )),
     aSelectionHB(this,  BibResId( HB_SELECTION )),
-    aEntryST(BibResId(ST_ENTRY)),
-    aURLST( BibResId(ST_URL)),
+    aEntryST(BIB_RESSTR(ST_ENTRY)),
+    aURLST(BIB_RESSTR(ST_URL)),
     pDatMan(pMan)
 {
     FreeResource();
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 25bc0f92d6b8..4b226f5604df 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -215,35 +215,35 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan):
     aCustom5FT(&aControlParentWin,      BibResId(FT_CUSTOM5     )),
     aHoriScroll(this, WB_HORZ),
     aVertScroll(this, WB_VERT),
-    sErrorPrefix(BibResId(ST_ERROR_PREFIX)),
+    sErrorPrefix(BIB_RESSTR(ST_ERROR_PREFIX)),
     pDatMan(pMan)
 {
     aControlParentWin.Show();
     aControlParentWin.SetHelpId(HID_BIB_CONTROL_PARENT);
     aStdSize = GetOutputSizePixel();
 
-    aBibTypeArr[0] = String(BibResId(ST_TYPE_ARTICLE));
-    aBibTypeArr[1] = String(BibResId(ST_TYPE_BOOK));
-    aBibTypeArr[2] = String(BibResId(ST_TYPE_BOOKLET));
-    aBibTypeArr[3] = String(BibResId(ST_TYPE_CONFERENCE));
-    aBibTypeArr[4] = String(BibResId(ST_TYPE_INBOOK ));
-    aBibTypeArr[5] = String(BibResId(ST_TYPE_INCOLLECTION));
-    aBibTypeArr[6] = String(BibResId(ST_TYPE_INPROCEEDINGS));
-    aBibTypeArr[7] = String(BibResId(ST_TYPE_JOURNAL       ));
-    aBibTypeArr[8] = String(BibResId(ST_TYPE_MANUAL    ));
-    aBibTypeArr[9] = String(BibResId(ST_TYPE_MASTERSTHESIS));
-    aBibTypeArr[10] = String(BibResId(ST_TYPE_MISC      ));
-    aBibTypeArr[11] = String(BibResId(ST_TYPE_PHDTHESIS ));
-    aBibTypeArr[12] = String(BibResId(ST_TYPE_PROCEEDINGS   ));
-    aBibTypeArr[13] = String(BibResId(ST_TYPE_TECHREPORT    ));
-    aBibTypeArr[14] = String(BibResId(ST_TYPE_UNPUBLISHED   ));
-    aBibTypeArr[15] = String(BibResId(ST_TYPE_EMAIL     ));
-    aBibTypeArr[16] = String(BibResId(ST_TYPE_WWW           ));
-    aBibTypeArr[17] = String(BibResId(ST_TYPE_CUSTOM1       ));
-    aBibTypeArr[18] = String(BibResId(ST_TYPE_CUSTOM2       ));
-    aBibTypeArr[19] = String(BibResId(ST_TYPE_CUSTOM3       ));
-    aBibTypeArr[20] = String(BibResId(ST_TYPE_CUSTOM4       ));
-    aBibTypeArr[21] = String(BibResId(ST_TYPE_CUSTOM5       ));
+    aBibTypeArr[0] = BIB_RESSTR(ST_TYPE_ARTICLE);
+    aBibTypeArr[1] = BIB_RESSTR(ST_TYPE_BOOK);
+    aBibTypeArr[2] = BIB_RESSTR(ST_TYPE_BOOKLET);
+    aBibTypeArr[3] = BIB_RESSTR(ST_TYPE_CONFERENCE);
+    aBibTypeArr[4] = BIB_RESSTR(ST_TYPE_INBOOK );
+    aBibTypeArr[5] = BIB_RESSTR(ST_TYPE_INCOLLECTION);
+    aBibTypeArr[6] = BIB_RESSTR(ST_TYPE_INPROCEEDINGS);
+    aBibTypeArr[7] = BIB_RESSTR(ST_TYPE_JOURNAL       );
+    aBibTypeArr[8] = BIB_RESSTR(ST_TYPE_MANUAL    );
+    aBibTypeArr[9] = BIB_RESSTR(ST_TYPE_MASTERSTHESIS);
+    aBibTypeArr[10] = BIB_RESSTR(ST_TYPE_MISC      );
+    aBibTypeArr[11] = BIB_RESSTR(ST_TYPE_PHDTHESIS );
+    aBibTypeArr[12] = BIB_RESSTR(ST_TYPE_PROCEEDINGS   );
+    aBibTypeArr[13] = BIB_RESSTR(ST_TYPE_TECHREPORT    );
+    aBibTypeArr[14] = BIB_RESSTR(ST_TYPE_UNPUBLISHED   );
+    aBibTypeArr[15] = BIB_RESSTR(ST_TYPE_EMAIL     );
+    aBibTypeArr[16] = BIB_RESSTR(ST_TYPE_WWW           );
+    aBibTypeArr[17] = BIB_RESSTR(ST_TYPE_CUSTOM1       );
+    aBibTypeArr[18] = BIB_RESSTR(ST_TYPE_CUSTOM2       );
+    aBibTypeArr[19] = BIB_RESSTR(ST_TYPE_CUSTOM3       );
+    aBibTypeArr[20] = BIB_RESSTR(ST_TYPE_CUSTOM4       );
+    aBibTypeArr[21] = BIB_RESSTR(ST_TYPE_CUSTOM5       );
 
     FreeResource();
 
@@ -617,37 +617,37 @@ void BibGeneralPage::InitFixedTexts( void )
 {
     String      aFixedStrings[ FIELD_COUNT ] =
     {
-        String( BibResId( ST_IDENTIFIER     ) ),
-        String( BibResId( ST_AUTHTYPE       ) ),
-        String( BibResId( ST_AUTHOR         ) ),
-        String( BibResId( ST_TITLE          ) ),
-        String( BibResId( ST_MONTH          ) ),
-        String( BibResId( ST_YEAR           ) ),
-        String( BibResId( ST_ISBN           ) ),
-        String( BibResId( ST_BOOKTITLE      ) ),
-        String( BibResId( ST_CHAPTER        ) ),
-        String( BibResId( ST_EDITION        ) ),
-        String( BibResId( ST_EDITOR         ) ),
-        String( BibResId( ST_HOWPUBLISHED   ) ),
-        String( BibResId( ST_INSTITUTION    ) ),
-        String( BibResId( ST_JOURNAL        ) ),
-        String( BibResId( ST_NOTE           ) ),
-        String( BibResId( ST_ANNOTE         ) ),
-        String( BibResId( ST_NUMBER         ) ),
-        String( BibResId( ST_ORGANIZATION   ) ),
-        String( BibResId( ST_PAGE           ) ),
-        String( BibResId( ST_PUBLISHER      ) ),
-        String( BibResId( ST_ADDRESS        ) ),
-        String( BibResId( ST_SCHOOL         ) ),
-        String( BibResId( ST_SERIES         ) ),
-        String( BibResId( ST_REPORT         ) ),
-        String( BibResId( ST_VOLUME         ) ),
-        String( BibResId( ST_URL            ) ),
-        String( BibResId( ST_CUSTOM1        ) ),
-        String( BibResId( ST_CUSTOM2        ) ),
-        String( BibResId( ST_CUSTOM3        ) ),
-        String( BibResId( ST_CUSTOM4        ) ),
-        String( BibResId( ST_CUSTOM5        ) )
+        BIB_RESSTR( ST_IDENTIFIER     ),
+        BIB_RESSTR( ST_AUTHTYPE       ),
+        BIB_RESSTR( ST_AUTHOR         ),
+        BIB_RESSTR( ST_TITLE          ),
+        BIB_RESSTR( ST_MONTH          ),
+        BIB_RESSTR( ST_YEAR           ),
+        BIB_RESSTR( ST_ISBN           ),
+        BIB_RESSTR( ST_BOOKTITLE      ),
+        BIB_RESSTR( ST_CHAPTER        ),
+        BIB_RESSTR( ST_EDITION        ),
+        BIB_RESSTR( ST_EDITOR         ),
+        BIB_RESSTR( ST_HOWPUBLISHED   ),
+        BIB_RESSTR( ST_INSTITUTION    ),
+        BIB_RESSTR( ST_JOURNAL        ),
+        BIB_RESSTR( ST_NOTE           ),
+        BIB_RESSTR( ST_ANNOTE         ),
+        BIB_RESSTR( ST_NUMBER         ),
+        BIB_RESSTR( ST_ORGANIZATION   ),
+        BIB_RESSTR( ST_PAGE           ),
+        BIB_RESSTR( ST_PUBLISHER      ),
+        BIB_RESSTR( ST_ADDRESS        ),
+        BIB_RESSTR( ST_SCHOOL         ),
+        BIB_RESSTR( ST_SERIES         ),
+        BIB_RESSTR( ST_REPORT         ),
+        BIB_RESSTR( ST_VOLUME         ),
+        BIB_RESSTR( ST_URL            ),
+        BIB_RESSTR( ST_CUSTOM1        ),
+        BIB_RESSTR( ST_CUSTOM2        ),
+        BIB_RESSTR( ST_CUSTOM3        ),
+        BIB_RESSTR( ST_CUSTOM4        ),
+        BIB_RESSTR( ST_CUSTOM5        )
     };
 
     aFixedTexts[0] = &aIdentifierFT;
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index 507525ce80a4..f1e4aef9ea60 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -262,7 +262,7 @@ namespace dbp
                     nCommandTypeResourceId = RID_STR_TYPE_COMMAND;
                     break;
             }
-            m_pFormContentType->SetText(String(ModuleRes(nCommandTypeResourceId)));
+            m_pFormContentType->SetText(ModuleRes(nCommandTypeResourceId).toString());
         }
 
         OControlWizardPage_Base::initializePage();
@@ -653,7 +653,7 @@ namespace dbp
 
             // prepend an extra SQLContext explaining what we were doing
             SQLContext aContext;
-            aContext.Message = String(ModuleRes(RID_STR_COULDNOTOPENTABLE));
+            aContext.Message = ModuleRes(RID_STR_COULDNOTOPENTABLE).toString();
             aContext.NextException = aSQLException;
 
             // create an interaction handler to display this exception
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index d0885644cedd..4df071e8000b 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -166,11 +166,11 @@ namespace dbp
 
                 case DataType::TIMESTAMP:
                     aColumnServiceNames.push_back(OUString("DateField"));
-                    aColumnLabelPostfixes.push_back(String(ModuleRes(RID_STR_DATEPOSTFIX)));
+                    aColumnLabelPostfixes.push_back(ModuleRes(RID_STR_DATEPOSTFIX).toString());
 
                     aFormFieldNames.push_back(*pSelectedFields);
                     aColumnServiceNames.push_back(OUString("TimeField"));
-                    aColumnLabelPostfixes.push_back(String(ModuleRes(RID_STR_TIMEPOSTFIX)));
+                    aColumnLabelPostfixes.push_back(ModuleRes(RID_STR_TIMEPOSTFIX).toString());
                     break;
 
                 default:
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 597e73943c6f..3097b8eba621 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -490,7 +490,7 @@ namespace dbp
     OOptionDBFieldPage::OOptionDBFieldPage( OControlWizard* _pParent )
         :ODBFieldPage(_pParent)
     {
-        setDescriptionText(String(ModuleRes(RID_STR_GROUPWIZ_DBFIELD)));
+        setDescriptionText(ModuleRes(RID_STR_GROUPWIZ_DBFIELD).toString());
     }
 
     //---------------------------------------------------------------------
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index 20eae70f083e..ca189c3410ab 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -77,11 +77,11 @@ namespace dbp
         {
             case FormComponentType::LISTBOX:
                 m_bListBox = sal_True;
-                setTitleBase(String(ModuleRes(RID_STR_LISTWIZARD_TITLE)));
+                setTitleBase(ModuleRes(RID_STR_LISTWIZARD_TITLE).toString());
                 return sal_True;
             case FormComponentType::COMBOBOX:
                 m_bListBox = sal_False;
-                setTitleBase(String(ModuleRes(RID_STR_COMBOWIZARD_TITLE)));
+                setTitleBase(ModuleRes(RID_STR_COMBOWIZARD_TITLE).toString());
                 return sal_True;
         }
         return sal_False;
@@ -370,7 +370,7 @@ namespace dbp
         ,m_aDisplayedField      (this, ModuleRes(ET_DISPLAYEDFIELD))
         ,m_aInfo                (this, ModuleRes(FT_CONTENTFIELD_INFO))
     {
-        m_aInfo.SetText(String(ModuleRes( isListBox() ? STR_FIELDINFO_LISTBOX : STR_FIELDINFO_COMBOBOX)));
+        m_aInfo.SetText(ModuleRes( isListBox() ? STR_FIELDINFO_LISTBOX : STR_FIELDINFO_COMBOBOX).toString());
         FreeResource();
         m_aSelectTableField.SetSelectHdl(LINK(this, OContentFieldSelection, OnFieldSelected));
         m_aSelectTableField.SetDoubleClickHdl(LINK(this, OContentFieldSelection, OnTableDoubleClicked));
@@ -517,7 +517,7 @@ namespace dbp
     OComboDBFieldPage::OComboDBFieldPage( OControlWizard* _pParent )
         :ODBFieldPage(_pParent)
     {
-        setDescriptionText(String(ModuleRes(RID_STR_COMBOWIZ_DBFIELD)));
+        setDescriptionText(ModuleRes(RID_STR_COMBOWIZ_DBFIELD).toString());
     }
 
     //---------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx
index c5346473d0b4..0b0abf35f459 100644
--- a/extensions/source/propctrlr/defaultforminspection.cxx
+++ b/extensions/source/propctrlr/defaultforminspection.cxx
@@ -181,7 +181,7 @@ namespace pcr
         for ( sal_Int32 i=0; i<nCategories; ++i, ++pReturn )
         {
             pReturn->ProgrammaticName = OUString::createFromAscii( aCategories[i].programmaticName );
-            pReturn->UIName = String( PcrRes( aCategories[i].uiNameResId ) );
+            pReturn->UIName = PcrRes( aCategories[i].uiNameResId ).toString();
             pReturn->HelpURL = HelpIdUrl::getHelpURL( aCategories[i].helpId );
         }
 
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index 45352357d809..bdd203cbc8a4 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -548,7 +548,7 @@ namespace pcr
                     if ( xBinding.is() )
                     {
                         // find a nice name for it
-                        String sBaseName( PcrRes( RID_STR_BINDING_UI_NAME ) );
+                        String sBaseName(PcrRes(RID_STR_BINDING_UI_NAME).toString());
                         sBaseName += OUString(" ");
                         String sNewName;
                         sal_Int32 nNumber = 1;
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index eb1c4adb1956..9388665d518c 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -143,7 +143,7 @@ namespace pcr
     //====================================================================
     EventDescription::EventDescription( EventId _nId, const sal_Char* _pListenerNamespaceAscii, const sal_Char* _pListenerClassAsciiName,
             const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, const OString& _sHelpId, const OString& _sUniqueBrowseId )
-        :sDisplayName( String( PcrRes( _nDisplayNameResId ) ) )
+        :sDisplayName(PcrRes( _nDisplayNameResId ).toString())
         ,sListenerMethodName( OUString::createFromAscii( _pListenerMethodAsciiName ) )
         ,sHelpId( _sHelpId )
         ,sUniqueBrowseId( _sUniqueBrowseId )
diff --git a/extensions/source/propctrlr/formbrowsertools.cxx b/extensions/source/propctrlr/formbrowsertools.cxx
index b2e56658b628..d7b0660c36ac 100644
--- a/extensions/source/propctrlr/formbrowsertools.cxx
+++ b/extensions/source/propctrlr/formbrowsertools.cxx
@@ -49,12 +49,12 @@ namespace pcr
             {
                 Reference< XInterface >  xIFace;
                 aUnoObj >>= xIFace;
-                sClassName = String(PcrRes(RID_STR_PROPTITLE_EDIT));
+                sClassName = PcrRes(RID_STR_PROPTITLE_EDIT).toString();
                 if (xIFace.is())
                 {   // we have a chance to check if it's a formatted field model
                     Reference< XServiceInfo >  xInfo(xIFace, UNO_QUERY);
                     if (xInfo.is() && (xInfo->supportsService(SERVICE_COMPONENT_FORMATTEDFIELD)))
-                        sClassName = String(PcrRes(RID_STR_PROPTITLE_FORMATTED));
+                        sClassName = PcrRes(RID_STR_PROPTITLE_FORMATTED).toString();
                     else if (!xInfo.is())
                     {
                         // couldn't distinguish between formatted and edit with the service name, so try with the properties
@@ -63,7 +63,7 @@ namespace pcr
                         {
                             Reference< XPropertySetInfo >  xPropsInfo = xProps->getPropertySetInfo();
                             if (xPropsInfo.is() && xPropsInfo->hasPropertyByName(PROPERTY_FORMATSSUPPLIER))
-                                sClassName = String(PcrRes(RID_STR_PROPTITLE_FORMATTED));
+                                sClassName = PcrRes(RID_STR_PROPTITLE_FORMATTED).toString();
                         }
                     }
                 }
@@ -71,44 +71,44 @@ namespace pcr
             break;
 
             case FormComponentType::COMMANDBUTTON:
-                sClassName = String(PcrRes(RID_STR_PROPTITLE_PUSHBUTTON)); break;
+                sClassName = PcrRes(RID_STR_PROPTITLE_PUSHBUTTON).toString(); break;
             case FormComponentType::RADIOBUTTON:
-                sClassName = String(PcrRes(RID_STR_PROPTITLE_RADIOBUTTON)); break;
+                sClassName = PcrRes(RID_STR_PROPTITLE_RADIOBUTTON).toString(); break;
             case FormComponentType::CHECKBOX:
-                sClassName = String(PcrRes(RID_STR_PROPTITLE_CHECKBOX)); break;
+                sClassName = PcrRes(RID_STR_PROPTITLE_CHECKBOX).toString(); break;
             case FormComponentType::LISTBOX:
-                sClassName = String(PcrRes(RID_STR_PROPTITLE_LISTBOX)); break;
+                sClassName = PcrRes(RID_STR_PROPTITLE_LISTBOX).toString(); break;
             case FormComponentType::COMBOBOX:
-                sClassName = String(PcrRes(RID_STR_PROPTITLE_COMBOBOX)); break;
+                sClassName = PcrRes(RID_STR_PROPTITLE_COMBOBOX).toString(); break;
             case FormComponentType::GROUPBOX:
-                sClassName = String(PcrRes(RID_STR_PROPTITLE_GROUPBOX)); break;
+                sClassName = PcrRes(RID_STR_PROPTITLE_GROUPBOX).toString(); break;
             case FormComponentType::IMAGEBUTTON:
-                sClassName = String(PcrRes(RID_STR_PROPTITLE_IMAGEBUTTON)); break;
+                sClassName = PcrRes(RID_STR_PROPTITLE_IMAGEBUTTON).toString(); break;
             case FormComponentType::FIXEDTEXT:
-                sClassName = String(PcrRes(RID_STR_PROPTITLE_FIXEDTEXT)); break;
+                sClassName = PcrRes(RID_STR_PROPTITLE_FIXEDTEXT).toString(); break;
             case FormComponentType::GRIDCONTROL:
-                sClassName = String(PcrRes(RID_STR_PROPTITLE_DBGRID)); break;
+                sClassName = PcrRes(RID_STR_PROPTITLE_DBGRID).toString(); break;
             case FormComponentType::FILECONTROL:
-                sClassName = String(PcrRes(RID_STR_PROPTITLE_FILECONTROL)); break;
+                sClassName = PcrRes(RID_STR_PROPTITLE_FILECONTROL).toString(); break;
 
             case FormComponentType::DATEFIELD:
-                sClassName = String(PcrRes(RID_STR_PROPTITLE_DATEFIELD)); break;
+                sClassName = PcrRes(RID_STR_PROPTITLE_DATEFIELD).toString(); break;
             case FormComponentType::TIMEFIELD:
-                sClassName = String(PcrRes(RID_STR_PROPTITLE_TIMEFIELD)); break;
+                sClassName = PcrRes(RID_STR_PROPTITLE_TIMEFIELD).toString(); break;
             case FormComponentType::NUMERICFIELD:
-                sClassName = String(PcrRes(RID_STR_PROPTITLE_NUMERICFIELD)); break;
+                sClassName = PcrRes(RID_STR_PROPTITLE_NUMERICFIELD).toString(); break;
             case FormComponentType::CURRENCYFIELD:
-                sClassName = String(PcrRes(RID_STR_PROPTITLE_CURRENCYFIELD)); break;
+                sClassName = PcrRes(RID_STR_PROPTITLE_CURRENCYFIELD).toString(); break;
             case FormComponentType::PATTERNFIELD:
-                sClassName = String(PcrRes(RID_STR_PROPTITLE_PATTERNFIELD)); break;
+                sClassName = PcrRes(RID_STR_PROPTITLE_PATTERNFIELD).toString(); break;
             case FormComponentType::IMAGECONTROL:
-                sClassName = String(PcrRes(RID_STR_PROPTITLE_IMAGECONTROL)); break;
+                sClassName = PcrRes(RID_STR_PROPTITLE_IMAGECONTROL).toString(); break;
             case FormComponentType::HIDDENCONTROL:
-                sClassName = String(PcrRes(RID_STR_PROPTITLE_HIDDENCONTROL)); break;
+                sClassName = PcrRes(RID_STR_PROPTITLE_HIDDENCONTROL).toString(); break;
 
             case FormComponentType::CONTROL:
             default:
-                sClassName = String(PcrRes(RID_STR_PROPTITLE_UNKNOWNCONTROL)); break;
+                sClassName = PcrRes(RID_STR_PROPTITLE_UNKNOWNCONTROL).toString(); break;
         }
 
         return sClassName;
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 4db154965a10..9ab0cbae4b70 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -141,7 +141,7 @@ namespace pcr
     FormComponentPropertyHandler::FormComponentPropertyHandler( const Reference< XComponentContext >& _rxContext )
         :FormComponentPropertyHandler_Base( _rxContext )
         ,::comphelper::OPropertyContainer(FormComponentPropertyHandler_Base::rBHelper)
-        ,m_sDefaultValueString( String( PcrRes( RID_STR_STANDARD ) ) )
+        ,m_sDefaultValueString( PcrRes(RID_STR_STANDARD).toString() )
         ,m_eComponentClass( eUnknown )
         ,m_bComponentIsSubForm( false )
         ,m_bHaveListSource( false )
@@ -562,7 +562,7 @@ namespace pcr
             OUString sControlValue;
             OSL_VERIFY( _rControlValue >>= sControlValue );
             // Don't convert a placeholder
-            if ( nPropId == PROPERTY_ID_IMAGE_URL && sControlValue.equals( String( PcrRes( RID_EMBED_IMAGE_PLACEHOLDER ) ) ) )
+            if ( nPropId == PROPERTY_ID_IMAGE_URL && sControlValue.equals( PcrRes(RID_EMBED_IMAGE_PLACEHOLDER).toString() ) )
                 aPropertyValue <<= sControlValue;
             else
             {
@@ -760,7 +760,7 @@ namespace pcr
             OUStringBuffer displayName;
             if ( aFont.Name.isEmpty() )
             {
-                displayName.append( String( PcrRes( RID_STR_FONT_DEFAULT ) ) );
+                displayName.append( PcrRes(RID_STR_FONT_DEFAULT).toString() );
             }
             else
             {
@@ -783,7 +783,7 @@ namespace pcr
                     if ( eWeight > WEIGHT_NORMAL )
                         nStyleResID = RID_STR_FONTSTYLE_BOLD;
                 }
-                displayName.append( String( PcrRes( nStyleResID ) ) );
+                displayName.append(PcrRes(nStyleResID).toString());
 
                 // font size
                 if ( aFont.Height )
@@ -2717,7 +2717,7 @@ namespace pcr
 
             SvNumberFormatter* pFormatter = pSupplier->GetNumberFormatter();
             double dPreviewVal = OFormatSampleControl::getPreviewValue(pFormatter,nFormatKey);
-            SvxNumberInfoItem aFormatter( pFormatter, dPreviewVal, String( PcrRes( RID_STR_TEXT_FORMAT ) ), SID_ATTR_NUMBERFORMAT_INFO );
+            SvxNumberInfoItem aFormatter( pFormatter, dPreviewVal, PcrRes(RID_STR_TEXT_FORMAT).toString(), SID_ATTR_NUMBERFORMAT_INFO );
             aCoreSet.Put( aFormatter );
 
             // a tab dialog with a single page
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index f88455a5a543..0f9d6d59d35a 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -272,7 +272,7 @@ namespace pcr
             if ( m_sDetailLabel.isEmpty() )
             {
                 ::svt::OLocalResourceAccess aStringAccess( PcrRes( RID_DLG_FORMLINKS ), RSC_MODALDIALOG );
-                m_sDetailLabel = String( PcrRes( STR_DETAIL_FORM ) );
+                m_sDetailLabel = PcrRes(STR_DETAIL_FORM).toString();
             }
             sDetailType = m_sDetailLabel;
         }
@@ -285,7 +285,7 @@ namespace pcr
             if ( m_sMasterLabel.isEmpty() )
             {
                 ::svt::OLocalResourceAccess aStringAccess( PcrRes( RID_DLG_FORMLINKS ), RSC_MODALDIALOG );
-                m_sMasterLabel = String( PcrRes( STR_MASTER_FORM ) );
+                m_sMasterLabel = PcrRes(STR_MASTER_FORM).toString();
             }
             sMasterType = m_sMasterLabel;
         }
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx
index f1cb08caff6e..ad2febdd64fb 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -80,7 +80,7 @@ namespace pcr
     //========================================================================
 #define DEF_INFO( ident, uinameres, helpid, flags )   \
     OPropertyInfoImpl( PROPERTY_##ident, PROPERTY_ID_##ident, \
-            String( PcrRes( RID_STR_##uinameres ) ), HID_PROP_##helpid, flags )
+            PcrRes( RID_STR_##uinameres ).toString(), HID_PROP_##helpid, flags )
 
 #define DEF_INFO_1( ident, uinameres, helpid, flag1 ) \
     DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 )
@@ -517,7 +517,7 @@ namespace pcr
             PcrRes aLocalId( i );
             while ( aEnumStrings.IsAvailableRes( aLocalId.SetRT( RSC_STRING ) ) )
             {
-                aReturn.push_back( String( aLocalId ) );
+                aReturn.push_back( aLocalId.toString() );
                 aLocalId = PcrRes( ++i );
             }
         }
diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx
index 1a47a5ce2e6d..dbff2de8a03f 100644
--- a/extensions/source/propctrlr/inspectorhelpwindow.cxx
+++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx
@@ -36,7 +36,7 @@ namespace pcr
     {
         SetBackground();
         SetPaintTransparent(sal_True);
-        m_aSeparator.SetText( String( PcrRes( RID_STR_HELP_SECTION_LABEL ) ) );
+        m_aSeparator.SetText( PcrRes(RID_STR_HELP_SECTION_LABEL).toString() );
         m_aSeparator.SetBackground();
         m_aSeparator.Show();
 
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 647a2e33e0c2..eeab02ce297a 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -1376,7 +1376,7 @@ namespace pcr
     {
         try
         {
-            OUString sPlcHolder = String( PcrRes( RID_EMBED_IMAGE_PLACEHOLDER ) );
+            OUString sPlcHolder = PcrRes(RID_EMBED_IMAGE_PLACEHOLDER).toString();
             bool bIsPlaceHolderValue = false;
 
             if ( rName.equals( PROPERTY_IMAGE_URL ) )
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index 376be4d4be22..f4d3643b52d4 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -116,7 +116,7 @@ namespace pcr
 
             // insert the root
             Image aRootImage = m_aModelImages.GetImage(RID_SVXIMG_FORMS);
-            SvTreeListEntry* pRoot = m_aControlTree.InsertEntry(PcrRes(RID_STR_FORMS), aRootImage, aRootImage);
+            SvTreeListEntry* pRoot = m_aControlTree.InsertEntry(PcrRes(RID_STR_FORMS).toString(), aRootImage, aRootImage);
 
             // build the tree
             m_pInitialSelection = NULL;
diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx
index d4d6bb7429c8..67522ddb29de 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.cxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.cxx
@@ -272,7 +272,7 @@ namespace pcr
             if ( xTitle.is() )
             {
                 ::svt::OLocalResourceAccess aEnumStrings( PcrRes( RID_RSC_ENUM_COMMAND_TYPE ), RSC_RESOURCE );
-                OUString sDisplayName = String( PcrRes( CommandType::COMMAND + 1 ) );
+                OUString sDisplayName = PcrRes(CommandType::COMMAND + 1).toString();
                 xTitle->setTitle( sDisplayName );
             }
         }
diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx
index 16a4e75bca40..d3a9f4ff2382 100644
--- a/extensions/source/propctrlr/usercontrol.cxx
+++ b/extensions/source/propctrlr/usercontrol.cxx
@@ -107,7 +107,7 @@ namespace pcr
 
             const bool bIsTextFormat = ( pEntry && pEntry->IsTextFormat() );
             if ( bIsTextFormat )
-                getTypedControlWindow()->SetText( String( PcrRes( RID_STR_TEXT_FORMAT ) ) );
+                getTypedControlWindow()->SetText( PcrRes( RID_STR_TEXT_FORMAT ).toString() );
             else
                 getTypedControlWindow()->SetValue( pEntry ? getPreviewValue( *pEntry ) : 1234.56789 );
         }
@@ -269,7 +269,7 @@ namespace pcr
         :OFileUrlControl_Base( PropertyControlType::Unknown, pParent, nWinStyle | WB_DROPDOWN )
     {
         getTypedControlWindow()->SetDropDownLineCount( 10 );
-        getTypedControlWindow()->SetPlaceHolder( String( PcrRes( RID_EMBED_IMAGE_PLACEHOLDER ) ) ) ;
+        getTypedControlWindow()->SetPlaceHolder( PcrRes( RID_EMBED_IMAGE_PLACEHOLDER ).toString() ) ;
     }
 
     //------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index 3f97f953f293..d13a4ee7120f 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -534,7 +534,7 @@ namespace pcr
         }
 
         // confirmation message
-        String sConfirmation( PcrRes( RID_STR_CONFIRM_DELETE_DATA_TYPE ) );
+        String sConfirmation( PcrRes( RID_STR_CONFIRM_DELETE_DATA_TYPE ).toString() );
         sConfirmation.SearchAndReplaceAscii( "#type#", pType->getName() );
         QueryBox aQuery( NULL, WB_YES_NO, sConfirmation ); // TODO/eForms: proper parent
         if ( aQuery.Execute() != RET_YES )
diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx
index 83e0933dab46..aff2218f832c 100644
--- a/extensions/source/resource/ResourceIndexAccess.cxx
+++ b/extensions/source/resource/ResourceIndexAccess.cxx
@@ -161,7 +161,7 @@ Any SAL_CALL ResourceStringIndexAccess::getByIndex(sal_Int32 nIdx)
             OUString("string resource for id not available"),
             Reference<XInterface>());
 
-    return makeAny(OUString(String(aId)));
+    return makeAny(aId.toString());
 }
 
 Any SAL_CALL ResourceStringListIndexAccess::getByIndex(sal_Int32 nIdx)
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx
index dc017f0c3628..7707dd1f19d7 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -56,16 +56,16 @@ GridWindow::GridWindow(double* pXValues, double* pYValues, int nValues, Window*
     m_aResetTypeBox( this, SaneResId( GRID_DIALOG_TYPE_BOX ) ),
     m_aResetButton( this, SaneResId( GRID_DIALOG_RESET_BTN ) )
 {
-    sal_uInt16 nPos = m_aResetTypeBox.InsertEntry( String( SaneResId( RESET_TYPE_LINEAR_ASCENDING ) ) );
+    sal_uInt16 nPos = m_aResetTypeBox.InsertEntry( SaneResId( RESET_TYPE_LINEAR_ASCENDING ).toString() );
     m_aResetTypeBox.SetEntryData( nPos, (void *)RESET_TYPE_LINEAR_ASCENDING );
 
-    nPos = m_aResetTypeBox.InsertEntry( String( SaneResId( RESET_TYPE_LINEAR_DESCENDING ) ) );
+    nPos = m_aResetTypeBox.InsertEntry( SaneResId( RESET_TYPE_LINEAR_DESCENDING ).toString() );
     m_aResetTypeBox.SetEntryData( nPos, (void *)RESET_TYPE_LINEAR_DESCENDING );
 
-    nPos = m_aResetTypeBox.InsertEntry( String( SaneResId( RESET_TYPE_RESET ) ) );
+    nPos = m_aResetTypeBox.InsertEntry( SaneResId( RESET_TYPE_RESET ).toString() );
     m_aResetTypeBox.SetEntryData( nPos, (void *)RESET_TYPE_RESET );
 
-    nPos = m_aResetTypeBox.InsertEntry( String( SaneResId( RESET_TYPE_EXPONENTIAL ) ) );
+    nPos = m_aResetTypeBox.InsertEntry( SaneResId( RESET_TYPE_EXPONENTIAL ).toString() );
     m_aResetTypeBox.SetEntryData( nPos, (void *)RESET_TYPE_EXPONENTIAL );
 
     m_aResetTypeBox.SelectEntryPos( 0 );
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index 42fd73a8f526..86f2a8fbb73c 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -132,7 +132,7 @@ short SaneDlg::Execute()
     if( ! Sane::IsSane() )
     {
         ErrorBox aErrorBox( NULL, WB_OK | WB_DEF_OK,
-                            String( SaneResId( RID_SANE_NOSANELIB_TXT ) ) );
+                            SaneResId(RID_SANE_NOSANELIB_TXT).toString() );
         aErrorBox.Execute();
         return sal_False;
     }
@@ -411,7 +411,7 @@ IMPL_LINK( SaneDlg, ClickBtnHdl, Button*, pButton )
     {
         if( pButton == &maDeviceInfoButton )
         {
-            String aString( SaneResId( RID_SANE_DEVICEINFO_TXT ) );
+            String aString(SaneResId(RID_SANE_DEVICEINFO_TXT).toString());
             String aSR( RTL_CONSTASCII_USTRINGPARAM( "%s" ) );
             aString.SearchAndReplace( aSR, Sane::GetName( mrSane.GetDeviceNumber() ) );
             aString.SearchAndReplace( aSR, Sane::GetVendor( mrSane.GetDeviceNumber() ) );
@@ -711,7 +711,7 @@ void SaneDlg::AcquirePreview()
     int nOption = mrSane.GetOptionByName( "preview" );
     if( nOption == -1 )
     {
-        String aString( SaneResId( RID_SANE_NORESOLUTIONOPTION_TXT ) );
+        OUString aString(SaneResId(RID_SANE_NORESOLUTIONOPTION_TXT).toString());
         WarningBox aBox( this, WB_OK_CANCEL | WB_DEF_OK, aString );
         if( aBox.Execute() == RET_CANCEL )
             return;
@@ -723,7 +723,7 @@ void SaneDlg::AcquirePreview()
     if( ! mrSane.Start( aTransporter ) )
     {
         ErrorBox aErrorBox( this, WB_OK | WB_DEF_OK,
-                            String( SaneResId( RID_SANE_SCANERROR_TXT ) ) );
+                            SaneResId( RID_SANE_SCANERROR_TXT).toString() );
         aErrorBox.Execute();
     }
     else