reduce use of UniString from ResID ctor

Change-Id: I8d7619e7807ff2d400ec5c7fd181375130245728

13 files changed, 56 insertions, 57 deletions

diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index 351084169a8b..cf72741fc8e1 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -131,7 +131,7 @@ namespace svx
         {
             if ( ::utl::UCBContentHelper::Exists( sURL ) )
             {
-                QueryBox aBox( m_rLocationInput.GetSystemWindow(), WB_YES_NO, SVX_RES( RID_STR_ALREADYEXISTOVERWRITE ) );
+                QueryBox aBox( m_rLocationInput.GetSystemWindow(), WB_YES_NO, SVX_RESSTR(RID_STR_ALREADYEXISTOVERWRITE) );
                 if ( aBox.Execute() != RET_YES )
                     return false;
             }
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index eb3d7d0636fb..ecbece7a3cf3 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -841,9 +841,9 @@ namespace svxform
         {
             // now, we can access the local resources from the dialog's
             // resource context
-            m_sDoc_UI      = String( ResId( STR_REPLACE_DOC, *pMgr ) );
-            m_sInstance_UI = String( ResId( STR_REPLACE_INST, *pMgr ) );
-            m_sNone_UI     = String( ResId( STR_REPLACE_NONE, *pMgr ) );
+            m_sDoc_UI      = ResId( STR_REPLACE_DOC, *pMgr ).toString();
+            m_sInstance_UI = ResId( STR_REPLACE_INST, *pMgr ).toString();
+            m_sNone_UI     = ResId( STR_REPLACE_NONE, *pMgr ).toString();
         }
 
     public:
@@ -912,9 +912,9 @@ namespace svxform
         // load UI resources from resource file
         virtual void _initResources(ResMgr* pMgr)
         {
-            m_sPost_UI = String( ResId( STR_METHOD_POST, *pMgr ) );
-            m_sPut_UI  = String( ResId( STR_METHOD_PUT, *pMgr ) );
-            m_sGet_UI  = String( ResId( STR_METHOD_GET, *pMgr ) );
+            m_sPost_UI = ResId( STR_METHOD_POST, *pMgr ).toString();
+            m_sPut_UI  = ResId( STR_METHOD_PUT, *pMgr ).toString();
+            m_sGet_UI  = ResId( STR_METHOD_GET, *pMgr ).toString();
         }
 
     public:
@@ -2500,10 +2500,10 @@ namespace svxform
         m_xUIHelper     ( _rUIHelper ),
         m_pItemNode     ( _pNode ),
         m_eItemType     ( DITNone ),
-        m_sFL_Element   ( SVX_RES( STR_FIXEDLINE_ELEMENT ) ),
-        m_sFL_Attribute ( SVX_RES( STR_FIXEDLINE_ATTRIBUTE ) ),
-        m_sFL_Binding   ( SVX_RES( STR_FIXEDLINE_BINDING ) ),
-        m_sFT_BindingExp( SVX_RES( STR_FIXEDTEXT_BINDING ) )
+        m_sFL_Element   ( SVX_RESSTR( STR_FIXEDLINE_ELEMENT ) ),
+        m_sFL_Attribute ( SVX_RESSTR( STR_FIXEDLINE_ATTRIBUTE ) ),
+        m_sFL_Binding   ( SVX_RESSTR( STR_FIXEDLINE_BINDING ) ),
+        m_sFT_BindingExp( SVX_RESSTR( STR_FIXEDTEXT_BINDING ) )
 
     {
         FreeResource();
@@ -3148,9 +3148,9 @@ namespace svxform
     {
         static long aStaticTabs[]= { 3, 0, 35, 200 };
         m_aNamespacesList.SvSimpleTable::SetTabs( aStaticTabs );
-        String sHeader = String( SVX_RES( STR_HEADER_PREFIX ) );
+        String sHeader = SVX_RESSTR( STR_HEADER_PREFIX );
         sHeader += '\t';
-        sHeader += String( SVX_RES( STR_HEADER_URL ) );
+        sHeader += SVX_RESSTR(STR_HEADER_URL);
         m_aNamespacesList.InsertHeaderEntry(
             sHeader, HEADERBAR_APPEND, HIB_LEFT /*| HIB_FIXEDPOS | HIB_FIXED*/ );
 
@@ -3318,7 +3318,7 @@ namespace svxform
 
     {
         if ( _bIsEdit )
-            SetText( String( SVX_RES( STR_EDIT_TEXT ) ) );
+            SetText(SVX_RESSTR(STR_EDIT_TEXT));
 
         FreeResource();
 
@@ -3484,9 +3484,9 @@ namespace svxform
     void AddSubmissionDialog::FillAllBoxes()
     {
         // method box
-        m_aMethodLB.InsertEntry( String( SVX_RES( STR_METHOD_POST   ) ) );
-        m_aMethodLB.InsertEntry( String( SVX_RES( STR_METHOD_PUT ) ) );
-        m_aMethodLB.InsertEntry( String( SVX_RES( STR_METHOD_GET ) ) );
+        m_aMethodLB.InsertEntry( SVX_RESSTR( STR_METHOD_POST   ) );
+        m_aMethodLB.InsertEntry( SVX_RESSTR( STR_METHOD_PUT ) );
+        m_aMethodLB.InsertEntry( SVX_RESSTR( STR_METHOD_GET ) );
         m_aMethodLB.SelectEntryPos(0);
 
         // binding box
@@ -3543,9 +3543,9 @@ namespace svxform
         }
 
         // replace box
-        m_aReplaceLB.InsertEntry( String( SVX_RES( STR_REPLACE_NONE ) ) );
-        m_aReplaceLB.InsertEntry( String( SVX_RES( STR_REPLACE_INST ) ) );
-        m_aReplaceLB.InsertEntry( String( SVX_RES( STR_REPLACE_DOC ) ) );
+        m_aReplaceLB.InsertEntry( SVX_RESSTR( STR_REPLACE_NONE ) );
+        m_aReplaceLB.InsertEntry( SVX_RESSTR( STR_REPLACE_INST ) );
+        m_aReplaceLB.InsertEntry( SVX_RESSTR( STR_REPLACE_DOC ) );
 
 
         // init the controls with the values of the submission
@@ -3612,7 +3612,7 @@ namespace svxform
 
     {
         if ( _bEdit )
-            SetText( String( SVX_RES( STR_EDIT_TEXT ) ) );
+            SetText(SVX_RESSTR(STR_EDIT_TEXT));
 
         FreeResource();
     }
@@ -3643,7 +3643,7 @@ namespace svxform
 
     {
         if ( _bEdit )
-            SetText( String( SVX_RES( STR_EDIT_TEXT ) ) );
+            SetText(SVX_RESSTR(STR_EDIT_TEXT));
 
         FreeResource();
 
@@ -3651,7 +3651,7 @@ namespace svxform
         m_aFilePickerBtn.SetClickHdl( LINK( this, AddInstanceDialog, FilePickerHdl ) );
 
         // load the filter name from fps_office resource
-        m_sAllFilterName = String( ResId( STR_FILTERNAME_ALL, *ResMgr::CreateResMgr("fps_office") ) );
+        m_sAllFilterName = ResId(STR_FILTERNAME_ALL, *ResMgr::CreateResMgr("fps_office")).toString();
     }
 
     AddInstanceDialog::~AddInstanceDialog()
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 75766609ca25..7e9218dfb818 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -491,7 +491,7 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& _Event
     // if the first term was removed, then the to-be first term needs its text updated
     if ( _Event.DisjunctiveTerm == 0 )
     {
-        rTermItems[1]->SetText( String( SVX_RES( RID_STR_FILTER_FILTER_FOR ) ) );
+        rTermItems[1]->SetText( SVX_RESSTR(RID_STR_FILTER_FILTER_FOR));
         FmFilterTextChangedHint aChangeHint( rTermItems[1] );
         m_pModel->Broadcast( aChangeHint );
     }
@@ -527,7 +527,7 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& _Event )
 
     const ::std::vector< FmFilterData* >::iterator insertPos = pFormItem->GetChildren().begin() + nInsertPos;
 
-    FmFilterItems* pFilterItems = new FmFilterItems( pFormItem, String( SVX_RES( RID_STR_FILTER_FILTER_OR ) ) );
+    FmFilterItems* pFilterItems = new FmFilterItems(pFormItem, SVX_RESSTR(RID_STR_FILTER_FILTER_OR));
     m_pModel->Insert( insertPos, pFilterItems );
 }
 
@@ -630,7 +630,7 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmPar
             Reference< XFilterController > xFilterController( pFormItem->GetFilterController(), UNO_SET_THROW );
 
             // insert the existing filters for the form
-            String aTitle( SVX_RES( RID_STR_FILTER_FILTER_FOR ) );
+            OUString aTitle(SVX_RESSTR(RID_STR_FILTER_FILTER_FOR));
 
             Sequence< Sequence< OUString > > aExpressions = xFilterController->getPredicateExpressions();
             for (   const Sequence< OUString >* pConjunctionTerm = aExpressions.getConstArray();
@@ -1246,7 +1246,7 @@ sal_Bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const OUString
         {
             // display the error and return sal_False
             SQLContext aError;
-            aError.Message = String(SVX_RES(RID_STR_SYNTAXERROR));
+            aError.Message = SVX_RESSTR(RID_STR_SYNTAXERROR);
             aError.Details = aErrorMsg;
             displayException(aError, this);
 
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 5b7c5a72521c..72bdf74816da 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -183,7 +183,7 @@ OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj)
             nClassNameResourceId = RID_STR_CONTROL; break;
     }
 
-    return OUString( String( SVX_RES( nClassNameResourceId ) ) );
+    return SVX_RESSTR(nClassNameResourceId);
 }
 
 //========================================================================
@@ -421,13 +421,13 @@ void FmPropBrw::implSetNewSelection( const InterfaceBag& _rSelection )
 
         if ( _rSelection.empty() )
         {
-            sTitle = String( SVX_RES( RID_STR_NO_PROPERTIES ) );
+            sTitle = SVX_RESSTR(RID_STR_NO_PROPERTIES);
         }
         else if ( _rSelection.size() > 1 )
         {
             // no form component and (no form or no name) -> Multiselection
-            sTitle = String( SVX_RES( RID_STR_PROPERTIES_CONTROL ) );
-            sTitle += String( SVX_RES( RID_STR_PROPTITLE_MULTISELECT ) );
+            sTitle = SVX_RESSTR(RID_STR_PROPERTIES_CONTROL);
+            sTitle += SVX_RESSTR(RID_STR_PROPTITLE_MULTISELECT);
         }
         else
         {
@@ -437,15 +437,15 @@ void FmPropBrw::implSetNewSelection( const InterfaceBag& _rSelection )
                 sal_Int16 nClassID = FormComponentType::CONTROL;
                 xSingleSelection->getPropertyValue( FM_PROP_CLASSID ) >>= nClassID;
 
-                sTitle = String( SVX_RES( RID_STR_PROPERTIES_CONTROL ) );
-                sTitle += String( GetUIHeadlineName( nClassID, makeAny( xSingleSelection ) ) );
+                sTitle = SVX_RESSTR(RID_STR_PROPERTIES_CONTROL);
+                sTitle += GetUIHeadlineName(nClassID, makeAny(xSingleSelection));
             }
             else if ( Reference< XForm >( xSingleSelection, UNO_QUERY ).is() )
-                sTitle = String( SVX_RES( RID_STR_PROPERTIES_FORM ) );
+                sTitle = SVX_RESSTR(RID_STR_PROPERTIES_FORM);
         }
 
         if ( implIsReadOnlyModel() )
-            sTitle += String( SVX_RES( RID_STR_READONLY_VIEW ) );
+            sTitle += SVX_RESSTR(RID_STR_READONLY_VIEW);
 
         SetText( sTitle );
 
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index f938a1a039c8..42a01e6ea6d2 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -387,7 +387,7 @@ Reference< XForm >  FmFormPageImpl::getDefaultForm()
         if ( Reference<XNameAccess>(xForms,UNO_QUERY_THROW)->hasElements() )
         {
             // suche die Standardform
-            OUString sStandardFormname = String( SVX_RES( RID_STR_STDFORMNAME ) );
+            OUString sStandardFormname = SVX_RESSTR(RID_STR_STDFORMNAME);
 
             try
             {
@@ -416,8 +416,8 @@ Reference< XForm >  FmFormPageImpl::getDefaultForm()
 
         if( pModel->IsUndoEnabled() )
         {
-            XubString aStr(SVX_RES(RID_STR_FORM));
-            XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT));
+            OUString aStr(SVX_RESSTR(RID_STR_FORM));
+            XubString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT));
             aUndoStr.SearchAndReplace(OUString('#'), aStr);
             pModel->BegUndo(aUndoStr);
         }
@@ -431,7 +431,7 @@ Reference< XForm >  FmFormPageImpl::getDefaultForm()
             xFormProps->setPropertyValue( FM_PROP_COMMANDTYPE, makeAny( sal_Int32( CommandType::TABLE ) ) );
 
             // and the "Standard" name
-            OUString sName = String( SVX_RES( RID_STR_STDFORMNAME ) );
+            OUString sName = SVX_RESSTR(RID_STR_STDFORMNAME);
             xFormProps->setPropertyValue( FM_PROP_NAME, makeAny( sName ) );
 
             if( pModel->IsUndoEnabled() )
@@ -498,8 +498,8 @@ Reference< ::com::sun::star::form::XForm >  FmFormPageImpl::findPlaceInFormCompo
 
             if( bUndo )
             {
-                XubString aStr(SVX_RES(RID_STR_FORM));
-                XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT));
+                OUString aStr(SVX_RESSTR(RID_STR_FORM));
+                XubString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT));
                 aUndoStr.SearchAndReplace(OUString('#'), aStr);
                 pModel->BegUndo(aUndoStr);
             }
@@ -526,7 +526,7 @@ Reference< ::com::sun::star::form::XForm >  FmFormPageImpl::findPlaceInFormCompo
 
             const bool bTableOrQuery = ( CommandType::TABLE == nCommandType ) || ( CommandType::QUERY == nCommandType );
             OUString sName = FormControlFactory::getUniqueName( xNamedSet,
-                bTableOrQuery ? rCursorSource : OUString( String( SVX_RES( RID_STR_STDFORMNAME ) ) ) );
+                bTableOrQuery ? rCursorSource : SVX_RESSTR(RID_STR_STDFORMNAME) );
 
             xFormProps->setPropertyValue( FM_PROP_NAME, makeAny( sName ) );
 
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 27b08a7d89d1..4d6ee1a54752 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1290,7 +1290,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
                     break;
                 case DataType::TIMESTAMP:
                     bDateNTimeField = sal_True;
-                    sLabelPostfix = String( SVX_RES( RID_STR_POSTFIX_DATE ) );
+                    sLabelPostfix = SVX_RESSTR(RID_STR_POSTFIX_DATE);
                     // DON'T break !
                 case DataType::DATE:
                     nOBJID = OBJ_FM_DATEFIELD;
@@ -1332,7 +1332,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
         {   // so far we created a date field only, but we also need a time field
             pLabel = pControl = NULL;
             if  (   createControlLabelPair( *pOutDev, 0, 1000, xField, xNumberFormats, OBJ_FM_TIMEFIELD,
-                        String( SVX_RES( RID_STR_POSTFIX_TIME ) ), pLabel, pControl,
+                        SVX_RESSTR(RID_STR_POSTFIX_TIME), pLabel, pControl,
                         xDataSource, sDataSource, sCommand, nCommandType )
                 )
             {
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index 033c72545f3c..8364115fa320 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -487,7 +487,7 @@ namespace svxform
                     }
 
                     if ( nTitleResId )
-                        sInitialLabel = String( SVX_RES( nTitleResId ) );
+                        sInitialLabel = SVX_RESSTR(nTitleResId);
 
                     _rxControlModel->setPropertyValue(
                         FM_PROP_LABEL,
@@ -691,7 +691,7 @@ namespace svxform
                 nResId = RID_STR_CONTROL;     break;
         }
 
-        return String( SVX_RES( nResId ) );
+        return SVX_RESSTR(nResId);
     }
 
     //------------------------------------------------------------------------------
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 3a7bcee3ab1a..4760d300409c 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -490,7 +490,7 @@ void FmXAutoControl::createPeer( const Reference< XToolkit > & rxToolkit, const
     Reference< XTextComponent >  xText(getPeer() , UNO_QUERY);
     if (xText.is())
     {
-        xText->setText(OUString(String(SVX_RES(RID_STR_AUTOFIELD))));
+        xText->setText(SVX_RESSTR(RID_STR_AUTOFIELD));
         xText->setEditable(sal_False);
     }
 }
@@ -3654,7 +3654,7 @@ namespace
     void displayErrorSetFocus( const String& _rMessage, const Reference< XControl >& _rxFocusControl, Window* _pDialogParent )
     {
         SQLContext aError;
-        aError.Message = String( SVX_RES( RID_STR_WRITEERROR ) );
+        aError.Message = SVX_RESSTR(RID_STR_WRITEERROR);
         aError.Details = _rMessage;
         displayException( aError, _pDialogParent );
 
@@ -3777,7 +3777,7 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent
             if ( !rColInfo.xColumn->getString().isEmpty() || !rColInfo.xColumn->wasNull() )
                 continue;
 
-            String sMessage( SVX_RES( RID_ERR_FIELDREQUIRED ) );
+            String sMessage( SVX_RESSTR( RID_ERR_FIELDREQUIRED ) );
             sMessage.SearchAndReplace( OUString('#'), rColInfo.sName );
 
             // the control to focus
@@ -4059,7 +4059,7 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) th
         SQLWarning aWarning;
         aWarning.Message = sTitle;
         SQLWarning aDetails;
-        aDetails.Message = String( SVX_RES( RID_STR_DELETECONFIRM ) );
+        aDetails.Message = SVX_RESSTR(RID_STR_DELETECONFIRM);
         aWarning.NextException <<= aDetails;
 
         OInteractionRequest* pRequest = new OInteractionRequest( makeAny( aWarning ) );
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 7eb6fb203d28..57056505f16c 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -595,7 +595,7 @@ namespace svxform
             //////////////////////////////////////////////////////////////////////
             // Default-Eintrag "Formulare"
             Image aRootImage( m_aNavigatorImages.GetImage( RID_SVXIMG_FORMS ) );
-            m_pRootEntry = InsertEntry( SVX_RES(RID_STR_FORMS), aRootImage, aRootImage,
+            m_pRootEntry = InsertEntry( SVX_RESSTR(RID_STR_FORMS), aRootImage, aRootImage,
                 NULL, sal_False, 0, NULL );
         }
         else if (!m_bMarkingObjects && rHint.ISA(FmNavRequestSelectHint))
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 867b9c6d1498..263826e84f19 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -291,7 +291,7 @@ namespace svxform
 
             if( bUndo )
             {
-                XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT));
+                XubString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT));
                 aUndoStr.SearchAndReplace(OUString('#'), aStr);
                 m_pFormModel->BegUndo(aUndoStr);
             }
diff --git a/svx/source/form/stringlistresource.cxx b/svx/source/form/stringlistresource.cxx
index 9cf871f46d4b..876b9424df7c 100644
--- a/svx/source/form/stringlistresource.cxx
+++ b/svx/source/form/stringlistresource.cxx
@@ -35,8 +35,7 @@ namespace svx
         ResId aLocalID( nLocalID, *_rResId.GetResMgr() );
         while ( IsAvailableRes( aLocalID.SetRT( RSC_STRING ) ) )
         {
-            String sLocalString( aLocalID );
-            m_aStrings.push_back( sLocalString );
+            m_aStrings.push_back( aLocalID.toString() );
             aLocalID = ResId( ++nLocalID, *_rResId.GetResMgr() );
         }
     }
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index a7af1eca6015..78ebec695ac2 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -318,7 +318,7 @@ void FmFieldWin::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoo
 void FmFieldWin::UpdateContent(FmFormShell* pShell)
 {
     pListBox->Clear();
-    String aTitle( SVX_RES( RID_STR_FIELDSELECTION ) );
+    OUString aTitle(SVX_RESSTR(RID_STR_FIELDSELECTION));
     SetText( aTitle );
 
     if (!pShell || !pShell->GetImpl())
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index 8819e8067781..a2628f497955 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -321,7 +321,7 @@ SvxFmTbxCtlRecText::~SvxFmTbxCtlRecText()
 //-----------------------------------------------------------------------
 Window* SvxFmTbxCtlRecText::CreateItemWindow( Window* pParent )
 {
-    XubString aText( SVX_RES(RID_STR_REC_TEXT) );
+    OUString aText(SVX_RESSTR(RID_STR_REC_TEXT));
     FixedText* pFixedText = new FixedText( pParent );
     Size aSize( pFixedText->GetTextWidth( aText ), pFixedText->GetTextHeight( ) );
     pFixedText->SetText( aText );
@@ -355,7 +355,7 @@ SvxFmTbxCtlRecFromText::~SvxFmTbxCtlRecFromText()
 //-----------------------------------------------------------------------
 Window* SvxFmTbxCtlRecFromText::CreateItemWindow( Window* pParent )
 {
-    XubString aText( SVX_RES(RID_STR_REC_FROM_TEXT) );
+    OUString aText(SVX_RESSTR(RID_STR_REC_FROM_TEXT));
     FixedText* pFixedText = new FixedText( pParent, WB_CENTER );
     Size aSize( pFixedText->GetTextWidth( aText ), pFixedText->GetTextHeight( ) );
     aSize.Width() += 12;