XubString->OUString

Change-Id: I7b76026012af2b57861ec8d3dfd285d9e871d74c

9 files changed, 15 insertions, 15 deletions

diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 89067a265ecc..142be57a958b 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1547,7 +1547,7 @@ sal_uLong EditEngine::Read( SvStream& rInput, const String& rBaseURL, EETextForm
     DBG_CHKTHIS( EditEngine, 0 );
     sal_Bool bUndoEnabled = pImpEditEngine->IsUndoEnabled();
     pImpEditEngine->EnableUndo( sal_False );
-    pImpEditEngine->SetText( XubString() );
+    pImpEditEngine->SetText( OUString() );
     EditPaM aPaM( pImpEditEngine->GetEditDoc().GetStartPaM() );
     pImpEditEngine->Read( rInput, rBaseURL, eFormat, EditSelection( aPaM, aPaM ), pHTTPHeaderAttrs );
     pImpEditEngine->EnableUndo( bUndoEnabled );
@@ -2760,7 +2760,7 @@ void EditEngine::SetFontInfoInItemSet( SfxItemSet& rSet, const Font& rFont )
 void EditEngine::SetFontInfoInItemSet( SfxItemSet& rSet, const SvxFont& rFont )
 {
     rSet.Put( SvxLanguageItem( rFont.GetLanguage(), EE_CHAR_LANGUAGE ) );
-    rSet.Put( SvxFontItem( rFont.GetFamily(), rFont.GetName(), XubString(), rFont.GetPitch(), rFont.GetCharSet(), EE_CHAR_FONTINFO ) );
+    rSet.Put( SvxFontItem( rFont.GetFamily(), rFont.GetName(), OUString(), rFont.GetPitch(), rFont.GetCharSet(), EE_CHAR_FONTINFO ) );
     rSet.Put( SvxFontHeightItem( rFont.GetSize().Height(), 100, EE_CHAR_FONTHEIGHT )  );
     rSet.Put( SvxCharScaleWidthItem( 100, EE_CHAR_FONTWIDTH ) );
     rSet.Put( SvxShadowedItem( rFont.IsShadow(), EE_CHAR_SHADOW )  );
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 50e18065f74d..689d6804d445 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1175,7 +1175,7 @@ void ImpEditEngine::SetText( const EditTextObject& rTextObject )
     sal_Bool _bUpdate = GetUpdateMode();
     sal_Bool _bUndo = IsUndoEnabled();
 
-    SetText( XubString() );
+    SetText( OUString() );
     EditPaM aPaM = aEditDoc.GetStartPaM();
 
     SetUpdateMode( sal_False );
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index fcb0bb067f08..92507c066371 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -227,7 +227,7 @@ void ImpEditEngine::UndoActionStart( sal_uInt16 nId, const ESelection& aSel )
 {
     if ( IsUndoEnabled() && !IsInUndo() )
     {
-        GetUndoManager().EnterListAction( GetEditEnginePtr()->GetUndoComment( nId ), XubString(), nId );
+        GetUndoManager().EnterListAction( GetEditEnginePtr()->GetUndoComment( nId ), OUString(), nId );
         DBG_ASSERT( !pUndoMarkSelection, "UndoAction SelectionMarker?" );
         pUndoMarkSelection = new ESelection( aSel );
     }
@@ -237,7 +237,7 @@ void ImpEditEngine::UndoActionStart( sal_uInt16 nId )
 {
     if ( IsUndoEnabled() && !IsInUndo() )
     {
-        GetUndoManager().EnterListAction( GetEditEnginePtr()->GetUndoComment( nId ), XubString(), nId );
+        GetUndoManager().EnterListAction( GetEditEnginePtr()->GetUndoComment( nId ), OUString(), nId );
         DBG_ASSERT( !pUndoMarkSelection, "UndoAction SelectionMarker?" );
     }
 }
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 010b037e7df5..df2694c83df0 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -442,7 +442,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
                                 // switch from line to fill, copy line attr to fill attr (color, transparence)
                                 aLocalSet.Put(XLineWidthItem(0));
                                 aLocalSet.Put(XLineStyleItem(XLINE_NONE));
-                                aLocalSet.Put(XFillColorItem(XubString(), ((const XLineColorItem&)(aLocalSet.Get(XATTR_LINECOLOR))).GetColorValue()));
+                                aLocalSet.Put(XFillColorItem(OUString(), ((const XLineColorItem&)(aLocalSet.Get(XATTR_LINECOLOR))).GetColorValue()));
                                 aLocalSet.Put(XFillStyleItem(XFILL_SOLID));
                                 aLocalSet.Put(XFillTransparenceItem(((const XLineTransparenceItem&)(aLocalSet.Get(XATTR_LINETRANSPARENCE))).GetValue()));
                                 aLocalFillStyle = XFILL_SOLID;
diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx
index 3e8cc4a12cc3..5abfd58e747b 100644
--- a/svx/source/sidebar/line/LineWidthControl.cxx
+++ b/svx/source/sidebar/line/LineWidthControl.cxx
@@ -250,7 +250,7 @@ void LineWidthControl::SetWidthSelect( long lValue, bool bValuable, SfxMapUnit e
     MapUnit ePntUnit( MAP_TWIP );
     lValue = LogicToLogic( lValue , eOrgUnit, ePntUnit );
 
-    XubString strCurrValue = maMFWidth.GetText();
+    OUString strCurrValue = maMFWidth.GetText();
     sal_uInt16 i = 0;
     for(; i < 8; i++)
         if(strCurrValue == rStr[i])
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index a6e27ff3380f..72d6d57e0613 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -996,7 +996,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaPolyPolygonAction& rAct)
 
 /**************************************************************************************************/
 
-void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const XubString& rStr, const MetaAction& rAct )
+void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const OUString& rStr, const MetaAction& rAct )
 {
     // calc text box size, add 5% to make it fit safely
 
diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx
index 93e39041e7a8..992aabe93643 100644
--- a/svx/source/svdraw/svdfmtf.hxx
+++ b/svx/source/svdraw/svdfmtf.hxx
@@ -141,7 +141,7 @@ protected:
     void DoAction(MetaTextLanguageAction& rAct)  { rAct.Execute(&maVD); mbFntDirty = true; }
     void DoAction(MetaOverlineColorAction& rAct)  { rAct.Execute(&maVD); mbFntDirty = true; }
 
-    void ImportText(const Point& rPos, const XubString& rStr, const MetaAction& rAct);
+    void ImportText(const Point& rPos, const OUString& rStr, const MetaAction& rAct);
     void SetAttributes(SdrObject* pObj, bool bForceTextAttr = false);
     void InsertObj(SdrObject* pObj, bool bScale = true);
     void MapScaling();
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 8e200faa74a1..9f9b45342e1a 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2190,7 +2190,7 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
         nLayer=((const SdrLayerIdItem*)pPoolItem)->GetValue();
     }
     if (rAttr.GetItemState(SDRATTR_LAYERNAME,true,&pPoolItem)==SFX_ITEM_SET && pModel!=NULL) {
-        XubString aLayerName=((const SdrLayerNameItem*)pPoolItem)->GetValue();
+        OUString aLayerName=((const SdrLayerNameItem*)pPoolItem)->GetValue();
         const SdrLayerAdmin* pLayAd=pPage!=NULL ? &pPage->GetLayerAdmin() : pModel!=NULL ? &pModel->GetLayerAdmin() : NULL;
         if (pLayAd!=NULL) {
             const SdrLayer* pLayer=pLayAd->GetLayer(aLayerName, true);
@@ -2205,7 +2205,7 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
     }
 
     if (rAttr.GetItemState(SDRATTR_OBJECTNAME,true,&pPoolItem)==SFX_ITEM_SET) {
-        XubString aName=((const SdrObjectNameItem*)pPoolItem)->GetValue();
+        OUString aName=((const SdrObjectNameItem*)pPoolItem)->GetValue();
         SetName(aName);
     }
     Rectangle aNewLogic(rLogic);
@@ -2259,9 +2259,9 @@ void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr, bool bMerge) const
     if (rLogic.GetHeight()!=rSnap.GetHeight()) {
         lcl_SetItem(rAttr,bMerge,SdrLogicSizeHeightItem(rLogic.GetHeight()-1));
     }
-    XubString aName(GetName());
+    OUString aName(GetName());
 
-    if(aName.Len())
+    if (!aName.isEmpty())
     {
         lcl_SetItem(rAttr, bMerge, SdrObjectNameItem(aName));
     }
@@ -2510,7 +2510,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas
                 aSet.Put(XLineStyleItem(XLINE_NONE));
                 Color aColorLine = ((const XLineColorItem&)(aSet.Get(XATTR_LINECOLOR))).GetColorValue();
                 sal_uInt16 nTransLine = ((const XLineTransparenceItem&)(aSet.Get(XATTR_LINETRANSPARENCE))).GetValue();
-                aSet.Put(XFillColorItem(XubString(), aColorLine));
+                aSet.Put(XFillColorItem(OUString(), aColorLine));
                 aSet.Put(XFillStyleItem(XFILL_SOLID));
                 aSet.Put(XFillTransparenceItem(nTransLine));
 
diff --git a/sw/source/ui/sidebar/PageMarginControl.cxx b/sw/source/ui/sidebar/PageMarginControl.cxx
index 05822c1f32af..a15ac8e68b41 100644
--- a/sw/source/ui/sidebar/PageMarginControl.cxx
+++ b/sw/source/ui/sidebar/PageMarginControl.cxx
@@ -250,7 +250,7 @@ void PageMarginControl::FillValueSet(
     }
     else
     {
-        aHelpText = XubString();
+        aHelpText = OUString();
     }
     mpMarginValueSet->AddItem(
         (bUserCustomValuesAvailable ? SW_RES(IMG_CUSTOM) : SW_RES(IMG_CUSTOM_DIS) ), 0,