convert remnants of String in SVX to String

Change-Id: I66fd6387c3fcd33c6ae0b431810abf6679345767

36 files changed, 77 insertions, 93 deletions

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index a8170f4b4776..5665cc93e1df 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -2197,7 +2197,7 @@ void EnhancedCustomShape2d::AdaptObjColor(SdrPathObj& rObj, const SfxItemSet& rC
                         static_cast< short > ( GetLuminanceChange(
                             std::min(nColorIndex, nColorCount-1))));
 
-                    rObj.SetMergedItem(XFillBitmapItem(String(), Graphic(aBitmap)));
+                    rObj.SetMergedItem(XFillBitmapItem(OUString(), Graphic(aBitmap)));
                 }
 
                 break;
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index c2d5187f757c..2aa86e14c6c1 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -533,8 +533,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
                             Size aSize( (sal_Int32)( aBmpSize.Width() * fXScale ),
                                                     (sal_Int32)( aBmpSize.Height() * fYScale ) );
                             Rectangle aCropRect( aPt, aSize );
-                             aFillBmp.Crop( aCropRect );
-                            p3DObj->SetMergedItem(XFillBitmapItem(String(), Graphic(aFillBmp)));
+                            aFillBmp.Crop( aCropRect );
+                            p3DObj->SetMergedItem(XFillBitmapItem(OUString(), Graphic(aFillBmp)));
                         }
                     }
                     pScene->Insert3DObj( p3DObj );
@@ -560,7 +560,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
 
                     if ( ( aLocalFillStyle == XFILL_BITMAP ) && !aFillBmp.IsEmpty() )
                     {
-                        p3DObj->SetMergedItem(XFillBitmapItem(String(), Graphic(aFillBmp)));
+                        p3DObj->SetMergedItem(XFillBitmapItem(OUString(), Graphic(aFillBmp)));
                     }
                 }
                 else if ( aLocalFillStyle == XFILL_NONE )
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index e08d15ca40bf..8a3a656290e2 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -185,7 +185,7 @@ void CompressGraphicsDialog::Update()
     aNativeSizeString = aNativeSizeString.replaceAll("$(CAPACITY)",  OUString::number(aNativeSize / 1024));
     m_pFixedText5->SetText(aNativeSizeString);
 
-    m_pFixedText6->SetText(String("??"));
+    m_pFixedText6->SetText("??");
 }
 
 void CompressGraphicsDialog::UpdateNewWidthMF()
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index a9dc9d52a06a..1e2c924f510a 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -406,7 +406,7 @@ void Svx3DLightControl::ConstructLightObjects()
             SfxItemSet aSet(mpModel->GetItemPool());
             aSet.Put( XLineStyleItem( XLINE_NONE ) );
             aSet.Put( XFillStyleItem( XFILL_SOLID ) );
-            aSet.Put( XFillColorItem(String(), GetLightColor(a)));
+            aSet.Put( XFillColorItem(OUString(), GetLightColor(a)));
             pNewLight->SetMergedItemSet(aSet);
 
             maLightObjects[a] = pNewLight;
@@ -433,7 +433,7 @@ void Svx3DLightControl::AdaptToSelectedLight()
         // make mpLampBottomObject/mpLampShaftObject visible (yellow hairline)
         SfxItemSet aSet(mpModel->GetItemPool());
         aSet.Put( XLineStyleItem( XLINE_SOLID ) );
-        aSet.Put( XLineColorItem(String(), COL_YELLOW));
+        aSet.Put( XLineColorItem(OUString(), COL_YELLOW));
         aSet.Put( XLineWidthItem(0));
         aSet.Put( XFillStyleItem( XFILL_NONE ) );
         mpLampBottomObject->SetMergedItemSet(aSet);
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 14bf9cb505f2..4463a179e7bd 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1205,7 +1205,7 @@ void GradientLB::SelectEntryByList( const XGradientListRef &pList, const OUStrin
     long nCount = pList->Count();
     XGradientEntry* pEntry;
     bool bFound = false;
-    String aStr;
+    OUString aStr;
 
     long i;
     for( i = 0; i < nCount && !bFound; i++ )
diff --git a/svx/source/dialog/sendreportunx.cxx b/svx/source/dialog/sendreportunx.cxx
index 7d1afc6ccce0..7713a7c680dc 100644
--- a/svx/source/dialog/sendreportunx.cxx
+++ b/svx/source/dialog/sendreportunx.cxx
@@ -151,10 +151,10 @@ static bool get_profile_bool( const char *pFileName, const char *pSectionName, c
     return false;
 }
 
-static String get_profile_String( const char *pFileName, const char *pSectionName, const char *pKeyName, const char * = NULL )
+static OUString get_profile_String( const char *pFileName, const char *pSectionName, const char *pKeyName, const char * = NULL )
 {
     string  str = get_profile_string( pFileName, pSectionName, pKeyName );
-    String  result( str.c_str(), RTL_TEXTENCODING_UTF8 );
+    OUString  result( str.c_str(), str.length(), RTL_TEXTENCODING_UTF8 );
 
     return result;
 }
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 619511957c23..eb54d3cf2ca8 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -1672,7 +1672,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         // set FillColor hard to WHITE when it's SFX_ITEM_DONTCARE so that
         // the default (Blue7) is not used for 3d preview
         if(SFX_ITEM_DONTCARE == aSet.GetItemState(XATTR_FILLCOLOR, sal_False))
-            aSet.Put(XFillColorItem(String(), Color(COL_WHITE)));
+            aSet.Put(XFillColorItem(OUString(), Color(COL_WHITE)));
 
         aCtlPreview.Set3DAttributes(aSet);
         aCtlLightPreview.GetSvx3DLightControl().Set3DAttributes(aSet);
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 15a4787a68bd..3aee208d33ae 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -736,7 +736,7 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, boo
             // Fill color must be the color line, because the object was
             // previously just a line
             Color aColorLine = ((const XLineColorItem&)(aSet.Get(XATTR_LINECOLOR))).GetColorValue();
-            aSet.Put(XFillColorItem(String(), aColorLine));
+            aSet.Put(XFillColorItem(OUString(), aColorLine));
         }
 
         // Create a new extrude object
@@ -1578,7 +1578,7 @@ void E3dView::Break3DObj()
         // ALL selected objects are changed
         sal_uInt32 nCount = GetMarkedObjectCount();
 
-        BegUndo(String(SVX_RESSTR(RID_SVX_3D_UNDO_BREAK_LATHE)));
+        BegUndo(SVX_RESSTR(RID_SVX_3D_UNDO_BREAK_LATHE));
         for(sal_uInt32 a=0;a<nCount;a++)
         {
             E3dObject* pObj = (E3dObject*)GetMarkedObjectByIndex(a);
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 94ebe2298d58..8d6e0752645d 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -108,7 +108,7 @@ Font ImplCreateFont( const ::com::sun::star::awt::FontDescriptor& rDescr )
     aFont.SetStyleName( rDescr.StyleName );
     aFont.SetSize( ::Size( rDescr.Width, rDescr.Height ) );
     aFont.SetFamily( (FontFamily)rDescr.Family );
-    aFont.SetCharSet( (CharSet)rDescr.CharSet );
+    aFont.SetCharSet( (rtl_TextEncoding)rDescr.CharSet );
     aFont.SetPitch( (FontPitch)rDescr.Pitch );
     aFont.SetWidthType( VCLUnoHelper::ConvertFontWidth( rDescr.CharacterWidth ) );
     aFont.SetWeight( VCLUnoHelper::ConvertFontWeight( rDescr.Weight ) );
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index b7c3edfc152f..6e5274b2ac95 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -640,7 +640,7 @@ void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich)
                 m_aAbsolute.SetValue(m_nCurrentPos + 1);
             }
             else
-                m_aAbsolute.SetText(String());
+                m_aAbsolute.SetText(OUString());
             break;
         case NavigationBar::RECORD_TEXT:
             pWnd = &m_aRecordText;
@@ -916,7 +916,7 @@ void DbGridControl::InsertHandleColumn()
 {
     // BrowseBox has problems when painting without a handleColumn (hide it here)
     if (HasHandle())
-        BrowseBox::InsertHandleColumn(GetDefaultColumnWidth(String()));
+        BrowseBox::InsertHandleColumn(GetDefaultColumnWidth(OUString()));
     else
         BrowseBox::InsertHandleColumn(0);
 }
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 674bcfd006e1..f8b17f1f9fcc 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -165,7 +165,7 @@ DECLARE_STL_STDKEY_MAP(Reference< XPropertySet >, PropertySetInfo, PropertySetIn
 
 //------------------------------------------------------------------------------
 
-String static_STR_UNDO_PROPERTY;
+OUString static_STR_UNDO_PROPERTY;
 //------------------------------------------------------------------------------
 DBG_NAME(FmXUndoEnvironment)
 //------------------------------------------------------------------------------
@@ -973,7 +973,7 @@ FmUndoPropertyAction::FmUndoPropertyAction(FmFormModel& rNewMod, const PropertyC
 {
     if (rNewMod.GetObjectShell())
         rNewMod.GetObjectShell()->SetModified(sal_True);
-    if(static_STR_UNDO_PROPERTY.Len() == 0)
+    if(static_STR_UNDO_PROPERTY.isEmpty())
         static_STR_UNDO_PROPERTY = SVX_RESSTR(RID_STR_UNDO_PROPERTY);
 }
 
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index 8e2e81eb882e..ab79fe9575de 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -282,7 +282,7 @@ void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID, SfxItemState eState, cons
 
     sal_Bool bEnable = SFX_ITEM_DISABLED != eState && pState;
     if (!bEnable)
-        pWin->SetText(String());
+        pWin->SetText(OUString());
 
     //////////////////////////////////////////////////////////////////////
     // Enablen/disablen des Fensters
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index f4462949adf7..a6c0b434d10b 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -34,7 +34,7 @@ namespace
 
 // - GalleryExplorer -
 
-bool GalleryExplorer::FillThemeList( std::vector<String>& rThemeList )
+bool GalleryExplorer::FillThemeList( std::vector<OUString>& rThemeList )
 {
     Gallery* pGal = ::Gallery::GetGalleryInstance();
 
@@ -52,7 +52,7 @@ bool GalleryExplorer::FillThemeList( std::vector<String>& rThemeList )
     return !rThemeList.empty();
 }
 
-sal_Bool GalleryExplorer::FillObjList( const OUString& rThemeName, std::vector<String> &rObjList )
+sal_Bool GalleryExplorer::FillObjList( const OUString& rThemeName, std::vector<OUString> &rObjList )
 {
     Gallery* pGal = ::Gallery::GetGalleryInstance();
 
@@ -73,7 +73,7 @@ sal_Bool GalleryExplorer::FillObjList( const OUString& rThemeName, std::vector<S
     return !rObjList.empty();
 }
 
-sal_Bool GalleryExplorer::FillObjList( const sal_uInt32 nThemeId, std::vector<String> &rObjList )
+bool GalleryExplorer::FillObjList( const sal_uInt32 nThemeId, std::vector<OUString> &rObjList )
 {
     Gallery* pGal = ::Gallery::GetGalleryInstance();
 
@@ -83,22 +83,6 @@ sal_Bool GalleryExplorer::FillObjList( const sal_uInt32 nThemeId, std::vector<St
     return FillObjList( pGal->GetThemeName( nThemeId ), rObjList );
 }
 
-bool GalleryExplorer::FillObjList( const sal_uInt32 nThemeId, std::vector<OUString> &rObjList )
-{
-    std::vector<String> aObjList;
-    if (!FillObjList(nThemeId, aObjList))
-        return false;
-
-    std::vector<OUString> aList;
-    aList.reserve(aObjList.size());
-    std::vector<String>::const_iterator it = aObjList.begin(), itEnd = aObjList.end();
-    for (; it != itEnd; ++it)
-        aList.push_back(*it);
-
-    rObjList.swap(aList);
-    return true;
-}
-
 sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vector< OUString >& rList )
 {
     Gallery* pGal = ::Gallery::GetGalleryInstance();
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index a2f04bf6e783..1b3409be063d 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -211,7 +211,7 @@ OUString GetReducedString( const INetURLObject& rURL, sal_Int32 nMaxLen )
     return aReduced;
 }
 
-String GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL )
+OUString GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL )
 {
     OUString aRet;
 
diff --git a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
index 78e6c5e2c55d..3f06f2c5a243 100644
--- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
@@ -123,7 +123,7 @@ namespace sdr
                     // #41666# Hatch color is set hard to shadow color
                     XHatch aHatch = ((XFillHatchItem&)(rItemSet.Get(XATTR_FILLHATCH))).GetHatchValue();
                     aHatch.SetColor(aShadowColor);
-                    aSet.Put(XFillHatchItem(String(),aHatch));
+                    aSet.Put(XFillHatchItem(OUString(),aHatch));
                 }
                 else
                 {
@@ -133,7 +133,7 @@ namespace sdr
                         aSet.Put(XFillStyleItem(XFILL_SOLID));
                     }
 
-                    aSet.Put(XFillColorItem(String(),aShadowColor));
+                    aSet.Put(XFillColorItem(OUString(),aShadowColor));
                     aSet.Put(XFillTransparenceItem(nShadowTransparence));
                 }
 
diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx
index e535f2d538df..cabec474025e 100644
--- a/svx/source/sdr/properties/measureproperties.cxx
+++ b/svx/source/sdr/properties/measureproperties.cxx
@@ -117,9 +117,9 @@ namespace sdr
             aNewPolygon.append(basegfx::B2DPoint(0.0, 400.0));
             aNewPolygon.setClosed(true);
 
-            mpItemSet->Put(XLineStartItem(String(), basegfx::B2DPolyPolygon(aNewPolygon)));
+            mpItemSet->Put(XLineStartItem(OUString(), basegfx::B2DPolyPolygon(aNewPolygon)));
             mpItemSet->Put(XLineStartWidthItem(200));
-            mpItemSet->Put(XLineEndItem(String(), basegfx::B2DPolyPolygon(aNewPolygon)));
+            mpItemSet->Put(XLineEndItem(OUString(), basegfx::B2DPolyPolygon(aNewPolygon)));
             mpItemSet->Put(XLineEndWidthItem(200));
             mpItemSet->Put(XLineStyleItem(XLINE_SOLID));
         }
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index a0ed0b7631c0..73c65e1525dd 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -375,7 +375,7 @@ namespace sdr
             if(bTextFrame)
             {
                 mpItemSet->Put(XLineStyleItem(XLINE_NONE));
-                mpItemSet->Put(XFillColorItem(String(), Color(COL_WHITE)));
+                mpItemSet->Put(XFillColorItem(OUString(), Color(COL_WHITE)));
                 mpItemSet->Put(XFillStyleItem(XFILL_NONE));
             }
             else
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index b3b725dcbc4f..e56ae685ea3a 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -283,7 +283,7 @@ void GraphicPropertyPanel::NotifyItemUpdate(
             else
             {
                 mpMtrBrightness->Enable();
-                mpMtrBrightness->SetText(String());
+                mpMtrBrightness->SetText(OUString());
             }
             break;
         }
@@ -307,7 +307,7 @@ void GraphicPropertyPanel::NotifyItemUpdate(
             else
             {
                 mpMtrContrast->Enable();
-                mpMtrContrast->SetText(String());
+                mpMtrContrast->SetText(OUString());
             }
             break;
         }
@@ -331,7 +331,7 @@ void GraphicPropertyPanel::NotifyItemUpdate(
             else
             {
                 mpMtrTrans->Enable();
-                mpMtrTrans->SetText(String());
+                mpMtrTrans->SetText(OUString());
             }
             break;
         }
@@ -379,7 +379,7 @@ void GraphicPropertyPanel::NotifyItemUpdate(
             else
             {
                 mpMtrRed->Enable();
-                mpMtrRed->SetText(String());
+                mpMtrRed->SetText(OUString());
             }
             break;
         }
@@ -403,7 +403,7 @@ void GraphicPropertyPanel::NotifyItemUpdate(
             else
             {
                 mpMtrGreen->Enable();
-                mpMtrGreen->SetText(String());
+                mpMtrGreen->SetText(OUString());
             }
             break;
         }
@@ -427,7 +427,7 @@ void GraphicPropertyPanel::NotifyItemUpdate(
             else
             {
                 mpMtrBlue->Enable();
-                mpMtrBlue->SetText(String());
+                mpMtrBlue->SetText(OUString());
             }
             break;
         }
@@ -451,7 +451,7 @@ void GraphicPropertyPanel::NotifyItemUpdate(
             else
             {
                 mpMtrGamma->Enable();
-                mpMtrGamma->SetText(String());
+                mpMtrGamma->SetText(OUString());
             }
             break;
         }
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index d4e632e213c2..e89fab88c349 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -447,7 +447,7 @@ void LinePropertyPanel::NotifyItemUpdate(
             }
 
             mpMFTransparent->SetValue(0);//add
-            mpMFTransparent->SetText(String());
+            mpMFTransparent->SetText(OUString());
             break;
         }
         case SID_ATTR_LINE_WIDTH:
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 055edd3ead5e..e49c76dcc8b1 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -174,7 +174,7 @@ OUString NBOTypeMgrBase::GetBulCharFmtName()
 {
     return aNumCharFmtName;
 }
-void NBOTypeMgrBase::ImplLoad(String filename)
+void NBOTypeMgrBase::ImplLoad(OUString filename)
 {
     bIsLoading = true;
     SfxMapUnit      eOldCoreUnit=eCoreUnit;
@@ -214,7 +214,7 @@ void NBOTypeMgrBase::ImplLoad(String filename)
     eCoreUnit = eOldCoreUnit;
     bIsLoading = false;
 }
-void NBOTypeMgrBase::ImplStore(String filename)
+void NBOTypeMgrBase::ImplStore(OUString filename)
 {
     if (bIsLoading) return;
     SfxMapUnit      eOldCoreUnit=eCoreUnit;
@@ -594,7 +594,7 @@ GraphyicBulletsTypeMgr& GraphyicBulletsTypeMgr::GetInstance()
 
 void GraphyicBulletsTypeMgr::Init()
 {
-    std::vector<String> aGrfNames;
+    std::vector<OUString> aGrfNames;
     GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames);
     for(sal_uInt16 i = 0; i < aGrfNames.size(); i++)
     {
@@ -1370,13 +1370,13 @@ void NumberingTypeMgr::Init()
                         {
                             aLevel.realloc(aLevel.getLength() + 1);
                             PropertyValue& rValue = aLevel.getArray()[aLevel.getLength() - 1];
-                            rValue.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value"));
+                            rValue.Name = OUString("Value");
                             rValue.Value <<= (sal_Int32)(j + 1);
 
                             if (j!=0)
-                                sText += OUString(" ");
+                                sText += " ";
 
-                            sText+=String(xFormatter->makeNumberingString( aLevel, aLocale ));
+                            sText += xFormatter->makeNumberingString( aLevel, aLocale );
                         }
                         catch (const Exception&)
                         {
@@ -1824,7 +1824,7 @@ sal_Bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uIn
                         else
                         {
                          //if it cannot be found then create a new one
-                         Font aCreateFont( pLevelSettings->sBulletFont,String(), Size( 0, 14 ) );
+                         Font aCreateFont( pLevelSettings->sBulletFont, OUString(), Size( 0, 14 ) );
                          aCreateFont.SetCharSet( RTL_TEXTENCODING_DONTKNOW );
                          aCreateFont.SetFamily( FAMILY_DONTKNOW );
                          aCreateFont.SetPitch( PITCH_DONTKNOW );
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 83736ada9436..9b1aa3cbe7c2 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -1015,25 +1015,25 @@ void PosSizePropertyPanel::MetricState( SfxItemState eState, const SfxPoolItem*
         bPosXBlank = true;
     SetFieldUnit( *mpMtrPosX, meDlgUnit, true );
     if(bPosXBlank)
-        mpMtrPosX->SetText(String());
+        mpMtrPosX->SetText(OUString());
 
     if (mpMtrPosY->GetText().isEmpty())
         bPosYBlank = true;
     SetFieldUnit( *mpMtrPosY, meDlgUnit, true );
     if(bPosYBlank)
-        mpMtrPosY->SetText(String());
+        mpMtrPosY->SetText(OUString());
 
     if (mpMtrWidth->GetText().isEmpty())
         bWidthBlank = true;
     SetFieldUnit( *mpMtrWidth, meDlgUnit, true );
     if(bWidthBlank)
-        mpMtrWidth->SetText(String());
+        mpMtrWidth->SetText(OUString());
 
     if (mpMtrHeight->GetText().isEmpty())
         bHeightBlank = true;
     SetFieldUnit( *mpMtrHeight, meDlgUnit, true );
     if(bHeightBlank)
-        mpMtrHeight->SetText(String());
+        mpMtrHeight->SetText(OUString());
 }
 
 
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index fa1307b4e55d..33733fe22085 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -269,7 +269,7 @@ void TextCharacterSpacingControl::Rearrange(bool bLBAvailable,bool bAvailable, l
         maLBKerning.Enable();
         maFTSpacing.Enable();
         maLBKerning.SetNoSelection();
-        maEditKerning.SetText(String());
+        maEditKerning.SetText(OUString());
         maEditKerning.Disable();
         maFTBy.Disable();
     }
@@ -278,7 +278,7 @@ void TextCharacterSpacingControl::Rearrange(bool bLBAvailable,bool bAvailable, l
         maVSSpacing.SetNoSelection();
         maVSSpacing.SelectItem(0);
         mbVS = false;
-        maEditKerning.SetText(String());
+        maEditKerning.SetText(OUString());
         maLBKerning.SetNoSelection();
         maLBKerning.Disable();
         maFTSpacing.Disable();
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 564542edcd50..05b13f59482a 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -456,7 +456,7 @@ sal_Bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, c
                 if (HAS_BASE(SdrCaptionObj,pAktCreate))
                 {
                     SfxItemSet aSet(pMod->GetItemPool());
-                    aSet.Put(XFillColorItem(String(),Color(COL_WHITE))); // in case someone turns on Solid
+                    aSet.Put(XFillColorItem(OUString(),Color(COL_WHITE))); // in case someone turns on Solid
                     aSet.Put(XFillStyleItem(XFILL_NONE));
 
                     pAktCreate->SetMergedItemSet(aSet);
@@ -466,9 +466,9 @@ sal_Bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, c
                 {
                     // default for all text frames: no background, no border
                     SfxItemSet aSet(pMod->GetItemPool());
-                    aSet.Put(XFillColorItem(String(),Color(COL_WHITE))); // in case someone turns on Solid
+                    aSet.Put(XFillColorItem(OUString(),Color(COL_WHITE))); // in case someone turns on Solid
                     aSet.Put(XFillStyleItem(XFILL_NONE));
-                    aSet.Put(XLineColorItem(String(),Color(COL_BLACK))); // in case someone turns on Solid
+                    aSet.Put(XLineColorItem(OUString(),Color(COL_BLACK))); // in case someone turns on Solid
                     aSet.Put(XLineStyleItem(XLINE_NONE));
 
                     pAktCreate->SetMergedItemSet(aSet);
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 386caf7ece55..04ae4cc75291 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -346,7 +346,7 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr
         if(maVD.IsLineColor())
         {
             mpLineAttr->Put(XLineStyleItem(XLINE_SOLID));
-            mpLineAttr->Put(XLineColorItem(String(), maVD.GetLineColor()));
+            mpLineAttr->Put(XLineColorItem(OUString(), maVD.GetLineColor()));
         }
         else
         {
@@ -377,11 +377,11 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr
 
         if(((maDash.GetDots() && maDash.GetDotLen()) || (maDash.GetDashes() && maDash.GetDashLen())) && maDash.GetDistance())
         {
-            mpLineAttr->Put(XLineDashItem(String(), maDash));
+            mpLineAttr->Put(XLineDashItem(OUString(), maDash));
         }
         else
         {
-            mpLineAttr->Put(XLineDashItem(String(), XDash(XDASH_RECT)));
+            mpLineAttr->Put(XLineDashItem(OUString(), XDash(XDASH_RECT)));
         }
     }
     else
@@ -394,7 +394,7 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr
         if(maVD.IsFillColor())
         {
             mpFillAttr->Put(XFillStyleItem(XFILL_SOLID));
-            mpFillAttr->Put(XFillColorItem(String(), maVD.GetFillColor()));
+            mpFillAttr->Put(XFillColorItem(OUString(), maVD.GetFillColor()));
         }
         else
         {
@@ -599,7 +599,7 @@ void ImpSdrGDIMetaFileImport::InsertObj(SdrObject* pObj, bool bScale)
                             aClipSize);
 
                         pObj->SetMergedItem(XFillStyleItem(XFILL_BITMAP));
-                        pObj->SetMergedItem(XFillBitmapItem(String(), Graphic(aClippedBitmap)));
+                        pObj->SetMergedItem(XFillBitmapItem(OUString(), Graphic(aClippedBitmap)));
                         pObj->SetMergedItem(XFillBmpTileItem(false));
                         pObj->SetMergedItem(XFillBmpStretchItem(true));
                     }
@@ -1045,7 +1045,7 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const OUString& rSt
     {
         SfxItemSet aAttr(*mpFillAttr->GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST, 0, 0);
         aAttr.Put(XFillStyleItem(XFILL_SOLID));
-        aAttr.Put(XFillColorItem(String(), aFnt.GetFillColor()));
+        aAttr.Put(XFillColorItem(OUString(), aFnt.GetFillColor()));
         pText->SetMergedItemSet(aAttr);
     }
     sal_uInt32 nWink = aFnt.GetOrientation();
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index bd6d3445cb0b..fad91e91fe74 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -246,7 +246,7 @@ SdrLayer* SdrLayerAdmin::NewLayer(const OUString& rName, sal_uInt16 nPos)
 SdrLayer* SdrLayerAdmin::NewStandardLayer(sal_uInt16 nPos)
 {
     SdrLayerID nID=GetUniqueLayerID();
-    SdrLayer* pLay=new SdrLayer(nID,String());
+    SdrLayer* pLay=new SdrLayer(nID,OUString());
     pLay->SetStandardLayer();
     pLay->SetModel(pModel);
     if(nPos==0xFFFF)
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index a9ac2fd19b10..d874644df991 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -780,7 +780,7 @@ void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt
     Font aFont(OutputDevice::GetDefaultFont(DEFAULTFONT_LATIN_TEXT, nLanguage, DEFAULTFONT_FLAGS_ONLYONE, 0));
     aSvxFontItem.SetFamily(aFont.GetFamily());
     aSvxFontItem.SetFamilyName(aFont.GetName());
-    aSvxFontItem.SetStyleName(String());
+    aSvxFontItem.SetStyleName(OUString());
     aSvxFontItem.SetPitch( aFont.GetPitch());
     aSvxFontItem.SetCharSet( aFont.GetCharSet() );
     pItemPool->SetPoolDefaultItem(aSvxFontItem);
@@ -789,7 +789,7 @@ void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt
     Font aFontCJK(OutputDevice::GetDefaultFont(DEFAULTFONT_CJK_TEXT, nLanguage, DEFAULTFONT_FLAGS_ONLYONE, 0));
     aSvxFontItemCJK.SetFamily( aFontCJK.GetFamily());
     aSvxFontItemCJK.SetFamilyName(aFontCJK.GetName());
-    aSvxFontItemCJK.SetStyleName(String());
+    aSvxFontItemCJK.SetStyleName(OUString());
     aSvxFontItemCJK.SetPitch( aFontCJK.GetPitch());
     aSvxFontItemCJK.SetCharSet( aFontCJK.GetCharSet());
     pItemPool->SetPoolDefaultItem(aSvxFontItemCJK);
@@ -798,7 +798,7 @@ void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt
     Font aFontCTL(OutputDevice::GetDefaultFont(DEFAULTFONT_CTL_TEXT, nLanguage, DEFAULTFONT_FLAGS_ONLYONE, 0));
     aSvxFontItemCTL.SetFamily(aFontCTL.GetFamily());
     aSvxFontItemCTL.SetFamilyName(aFontCTL.GetName());
-    aSvxFontItemCTL.SetStyleName(String());
+    aSvxFontItemCTL.SetStyleName(OUString());
     aSvxFontItemCTL.SetPitch( aFontCTL.GetPitch() );
     aSvxFontItemCTL.SetCharSet( aFontCTL.GetCharSet());
     pItemPool->SetPoolDefaultItem(aSvxFontItemCTL);
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index a68bfb124baa..cdfd07048ab5 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -286,14 +286,14 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS
         // line color and transparency like shadow
         if(bLineUsed)
         {
-            aTempSet.Put(XLineColorItem(String(), aShadowColor));
+            aTempSet.Put(XLineColorItem(OUString(), aShadowColor));
             aTempSet.Put(XLineTransparenceItem(nShadowTransparence));
         }
 
         // fill color and transparency like shadow
         if(bSolidFillUsed)
         {
-            aTempSet.Put(XFillColorItem(String(), aShadowColor));
+            aTempSet.Put(XFillColorItem(OUString(), aShadowColor));
             aTempSet.Put(XFillTransparenceItem(nShadowTransparence));
         }
 
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index ec30110775fc..37b93ca6359c 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1241,7 +1241,7 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const
 
         // solid black lines and no fill
         aNewSet.Put(XLineStyleItem(XLINE_SOLID));
-        aNewSet.Put(XLineColorItem(String(), Color(COL_BLACK)));
+        aNewSet.Put(XLineColorItem(OUString(), Color(COL_BLACK)));
         aNewSet.Put(XFillStyleItem(XFILL_NONE));
         pClone->SetMergedItemSet(aNewSet);
 
@@ -3355,7 +3355,7 @@ SdrObject* SdrObjFactory::MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, S
             case sal_uInt16(OBJ_FRAME      ): pObj=new SdrOle2Obj(true);            break;
             case sal_uInt16(OBJ_CAPTION    ): pObj=new SdrCaptionObj;               break;
             case sal_uInt16(OBJ_PAGE       ): pObj=new SdrPageObj;                  break;
-            case sal_uInt16(OBJ_UNO        ): pObj=new SdrUnoObj(String());         break;
+            case sal_uInt16(OBJ_UNO        ): pObj=new SdrUnoObj(OUString());       break;
             case sal_uInt16(OBJ_CUSTOMSHAPE  ): pObj=new SdrObjCustomShape();       break;
             case sal_uInt16(OBJ_MEDIA      ): pObj=new SdrMediaObj();               break;
             case sal_uInt16(OBJ_TABLE      ): pObj=new ::sdr::table::SdrTableObj(pModel);   break;
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 765ed1c698da..a4cf0c1d9a5d 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -1333,11 +1333,11 @@ SdrObject* SdrOle2Obj::createSdrGrafObjReplacement(bool bAddText, bool /* bUseHC
         pClone->SetMergedItem(XLineStyleItem(XLINE_SOLID));
         const svtools::ColorConfig aColorConfig;
         const svtools::ColorConfigValue aColor(aColorConfig.GetColorValue(svtools::OBJECTBOUNDARIES));
-        pClone->SetMergedItem(XLineColorItem(String(), aColor.nColor));
+        pClone->SetMergedItem(XLineColorItem(OUString(), aColor.nColor));
 
         // bitmap fill
         pClone->SetMergedItem(XFillStyleItem(XFILL_BITMAP));
-        pClone->SetMergedItem(XFillBitmapItem(String(), GetEmptyOLEReplacementGraphic()));
+        pClone->SetMergedItem(XFillBitmapItem(OUString(), GetEmptyOLEReplacementGraphic()));
         pClone->SetMergedItem(XFillBmpTileItem(false));
         pClone->SetMergedItem(XFillBmpStretchItem(false));
 
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index b19615434714..3269efa00883 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -363,7 +363,7 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const
                     if(rCandidate.getIsFilled())
                     {
                         // set needed items
-                        aAttributeSet.Put(XFillColorItem(String(), Color(rCandidate.getBColor())));
+                        aAttributeSet.Put(XFillColorItem(OUString(), Color(rCandidate.getBColor())));
                         aAttributeSet.Put(XLineStyleItem(XLINE_NONE));
                         aAttributeSet.Put(XFillStyleItem(XFILL_SOLID));
 
@@ -373,7 +373,7 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const
                     else
                     {
                         // set needed items
-                        aAttributeSet.Put(XLineColorItem(String(), Color(rCandidate.getBColor())));
+                        aAttributeSet.Put(XLineColorItem(OUString(), Color(rCandidate.getBColor())));
                         aAttributeSet.Put(XLineStyleItem(XLINE_SOLID));
                         aAttributeSet.Put(XLineWidthItem(0));
                         aAttributeSet.Put(XFillStyleItem(XFILL_NONE));
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index b7c43ed370c3..3cb7d905c49b 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -513,7 +513,7 @@ void SdrUnoObj::SetUnoControlModel( const uno::Reference< awt::XControlModel >&
         uno::Reference< beans::XPropertySet > xSet(xUnoControlModel, uno::UNO_QUERY);
         if (xSet.is())
         {
-            uno::Any aValue( xSet->getPropertyValue(String("DefaultControl", osl_getThreadTextEncoding())) );
+            uno::Any aValue( xSet->getPropertyValue("DefaultControl") );
             OUString aStr;
             if( aValue >>= aStr )
                 aUnoControlTypeName = aStr;
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 17e040d84891..959123536811 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -416,7 +416,7 @@ IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl)
     SfxDispatcher* pDispatcher = GetBindings().GetDispatcher();
     sal_uInt16 nPos = aColorSet.GetSelectItemId();
     Color  aColor( aColorSet.GetItemColor( nPos ) );
-    String aStr( aColorSet.GetItemText( nPos ) );
+    OUString aStr( aColorSet.GetItemText( nPos ) );
 
     if (aColorSet.IsLeftButton())
     {
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 26b8a4f5c01e..fd71d7a4f52a 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -345,7 +345,7 @@ ExtrusionDepthWindow::ExtrusionDepthWindow(
 
     SetSelectHdl( LINK( this, ExtrusionDepthWindow, SelectHdl ) );
 
-    String aEmpty;
+    OUString aEmpty;
     appendEntry( 0, aEmpty, maImgDepth0 );
     appendEntry( 1, aEmpty, maImgDepth1 );
     appendEntry( 2, aEmpty, maImgDepth2 );
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index c3d4034cabc7..42c9c213f704 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -525,12 +525,12 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const OUString& rPictureStorageNa
             if( !aMimeType.isEmpty() )
             {
                 aAny <<= aMimeType;
-                xProps->setPropertyValue( String(  "MediaType"  ), aAny );
+                xProps->setPropertyValue( "MediaType", aAny );
             }
 
             const sal_Bool bCompressed = aMimeType.isEmpty() || aMimeType == "image/tiff";
             aAny <<= bCompressed;
-            xProps->setPropertyValue( String(  "Compressed"  ), aAny );
+            xProps->setPropertyValue( "Compressed", aAny );
 
             SvStream* pStream = utl::UcbStreamHelper::CreateStream( aStream.xStream );
             if( bUseGfxLink && aGfxLink.GetDataSize() && aGfxLink.GetData() )
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 101431745f8e..acb51e8ecedf 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -3031,7 +3031,7 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM
         // #85953# if disabled, force name to empty string
         if( !GetName().isEmpty() )
         {
-            return new XFillFloatTransparenceItem(String(), GetGradientValue(), sal_False);
+            return new XFillFloatTransparenceItem(OUString(), GetGradientValue(), sal_False);
         }
     }
 
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index 9056a6d60702..1ac612f81ba8 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -29,7 +29,7 @@ XOutdevItemPool::XOutdevItemPool(
     sal_uInt16 nAttrStart,
     sal_uInt16 nAttrEnd,
     sal_Bool bLoadRefCounts)
-:   SfxItemPool(OUString("XOutdevItemPool"), nAttrStart, nAttrEnd, 0L, 0L, bLoadRefCounts)
+:   SfxItemPool("XOutdevItemPool", nAttrStart, nAttrEnd, 0L, 0L, bLoadRefCounts)
 {
     // prepare some defaults
     const OUString aNullStr;