convert include/svx/xtable.hxx from String to OUString

Change-Id: I5230e5bfe1297875388ef798ed75b675ba09dd89

12 files changed, 50 insertions, 50 deletions

diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 0e5b505796b4..bee9e6b74717 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -845,7 +845,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickSaveHdl_Impl)
     INetURLObject aFile( SvtPathOptions().GetPalettePath() );
     DBG_ASSERT( aFile.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
 
-    if( pBitmapList->GetName().Len() )
+    if( !pBitmapList->GetName().isEmpty() )
     {
         aFile.Append( pBitmapList->GetName() );
 
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 4a649f987525..c7aea5c72bf0 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -212,7 +212,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickSaveHdl_Impl)
 
     XPropertyListRef pList = GetList();
 
-    if( pList->GetName().Len() )
+    if( !pList->GetName().isEmpty() )
     {
         aFile.Append( pList->GetName() );
 
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 05151117e821..cf3c043c45ee 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -716,7 +716,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickSaveHdl_Impl)
     INetURLObject aFile( SvtPathOptions().GetPalettePath() );
     DBG_ASSERT( aFile.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
 
-    if( pGradientList->GetName().Len() )
+    if( !pGradientList->GetName().isEmpty() )
     {
         aFile.Append( pGradientList->GetName() );
 
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 9fea458af616..7a665ccc1540 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -749,7 +749,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl)
     INetURLObject aFile( SvtPathOptions().GetPalettePath() );
     DBG_ASSERT( aFile.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
 
-    if( pHatchingList->GetName().Len() )
+    if( !pHatchingList->GetName().isEmpty() )
     {
         aFile.Append( pHatchingList->GetName() );
 
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index ef60c66db07a..b490bd440f06 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -801,7 +801,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl)
     INetURLObject aFile( SvtPathOptions().GetPalettePath() );
     DBG_ASSERT( aFile.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
 
-    if( pDashList->GetName().Len() )
+    if( !pDashList->GetName().isEmpty() )
     {
         aFile.Append( pDashList->GetName() );
 
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index e5c8706ba278..f3ee496b4ba3 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -608,7 +608,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl)
     INetURLObject aFile( SvtPathOptions().GetPalettePath() );
     DBG_ASSERT( aFile.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
 
-    if( pLineEndList->GetName().Len() )
+    if( !pLineEndList->GetName().isEmpty() )
     {
         aFile.Append( pLineEndList->GetName() );
 
diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx
index e3aff134197f..5d4463b96b17 100644
--- a/include/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
@@ -61,7 +61,7 @@ private:
     Color   aColor;
 
 public:
-    XColorEntry(const Color& rColor, const String& rName);
+    XColorEntry(const Color& rColor, const OUString& rName);
     XColorEntry(const XColorEntry& rOther);
 
     const Color& GetColor() const
@@ -80,7 +80,7 @@ private:
     basegfx::B2DPolyPolygon aB2DPolyPolygon;
 
 public:
-    XLineEndEntry(const basegfx::B2DPolyPolygon& rB2DPolyPolygon, const String& rName);
+    XLineEndEntry(const basegfx::B2DPolyPolygon& rB2DPolyPolygon, const OUString& rName);
     XLineEndEntry(const XLineEndEntry& rOther);
 
     const basegfx::B2DPolyPolygon& GetLineEnd() const
@@ -99,7 +99,7 @@ private:
     XDash   aDash;
 
 public:
-    XDashEntry(const XDash& rDash, const String& rName);
+    XDashEntry(const XDash& rDash, const OUString& rName);
     XDashEntry(const XDashEntry& rOther);
 
     const XDash& GetDash() const
@@ -118,7 +118,7 @@ private:
     XHatch  aHatch;
 
 public:
-    XHatchEntry(const XHatch& rHatch, const String& rName);
+    XHatchEntry(const XHatch& rHatch, const OUString& rName);
     XHatchEntry(const XHatchEntry& rOther);
 
     const XHatch& GetHatch() const
@@ -137,7 +137,7 @@ private:
     XGradient  aGradient;
 
 public:
-    XGradientEntry(const XGradient& rGradient, const String& rName);
+    XGradientEntry(const XGradient& rGradient, const OUString& rName);
     XGradientEntry(const XGradientEntry& rOther);
 
     const XGradient& GetGradient() const
@@ -156,7 +156,7 @@ private:
     GraphicObject   maGraphicObject;
 
 public:
-    XBitmapEntry(const GraphicObject& rGraphicObject, const String& rName);
+    XBitmapEntry(const GraphicObject& rGraphicObject, const OUString& rName);
     XBitmapEntry(const XBitmapEntry& rOther);
 
     const GraphicObject& GetGraphicObject() const
@@ -199,15 +199,15 @@ protected:
     typedef ::std::vector< Bitmap* > BitmapList_impl;
 
     XPropertyListType   meType;
-    String              maName; // not persistent
-    String              maPath;
+    OUString            maName; // not persistent
+    OUString            maPath;
 
     XPropertyEntryList_impl maList;
 
     bool                mbListDirty;
     bool                mbEmbedInDocument;
 
-    XPropertyList(XPropertyListType t, const String& rPath);
+    XPropertyList(XPropertyListType t, const OUString& rPath);
 
     virtual Bitmap CreateBitmapForUI(long nIndex) = 0;
 
@@ -225,11 +225,11 @@ public:
     long GetIndex(const OUString& rName) const;
     Bitmap GetUiBitmap(long nIndex) const;
 
-    const String& GetName() const { return maName; }
-    void SetName(const String& rString);
+    const OUString& GetName() const { return maName; }
+    void SetName(const OUString& rString);
 
-    const String& GetPath() const { return maPath; }
-    void SetPath(const String& rString) { maPath = rString; }
+    const OUString& GetPath() const { return maPath; }
+    void SetPath(const OUString& rString) { maPath = rString; }
 
     bool IsDirty() const { return mbListDirty; }
     void SetDirty(bool bDirty = true) { mbListDirty = bDirty; }
@@ -256,7 +256,7 @@ public:
 
     // Factory method for sub-classes
     static XPropertyListRef CreatePropertyList(XPropertyListType t,
-                                                const String& rPath);
+                                                const OUString& rPath);
     // as above but initializes name as expected
     static XPropertyListRef CreatePropertyListFromURL(XPropertyListType t,
                                                        const OUString & rUrl);
@@ -280,7 +280,7 @@ protected:
     virtual Bitmap  CreateBitmapForUI(long nIndex);
 
 public:
-    explicit XColorList(const String& rPath)
+    explicit XColorList(const OUString& rPath)
         : XPropertyList(XCOLOR_LIST, rPath) {}
 
     using XPropertyList::Replace;
@@ -306,7 +306,7 @@ protected:
     virtual Bitmap CreateBitmapForUI(long nIndex);
 
 public:
-    explicit XLineEndList(const String& rPath);
+    explicit XLineEndList(const OUString& rPath);
     virtual ~XLineEndList();
 
     using XPropertyList::Remove;
@@ -325,15 +325,15 @@ class SVX_DLLPUBLIC XDashList : public XPropertyList
 {
 private:
     Bitmap              maBitmapSolidLine;
-    String              maStringSolidLine;
-    String              maStringNoLine;
+    OUString            maStringSolidLine;
+    OUString            maStringNoLine;
 
 protected:
     Bitmap ImpCreateBitmapForXDash(const XDash* pDash);
     virtual Bitmap CreateBitmapForUI(long nIndex);
 
 public:
-    explicit XDashList(const String& rPath);
+    explicit XDashList(const OUString& rPath);
     virtual ~XDashList();
 
     using XPropertyList::Replace;
@@ -352,8 +352,8 @@ public:
 
     // Special calls to get the translated strings for the UI entry for no
     // line style (XLINE_NONE) and solid line style (XLINE_SOLID) for dialogs
-    String GetStringForUiSolidLine() const;
-    String GetStringForUiNoLine() const;
+    OUString GetStringForUiSolidLine() const;
+    OUString GetStringForUiNoLine() const;
 };
 
 // -------------------
@@ -366,7 +366,7 @@ protected:
     virtual Bitmap CreateBitmapForUI(long nIndex);
 
 public:
-    explicit XHatchList(const String& rPath);
+    explicit XHatchList(const OUString& rPath);
     virtual ~XHatchList();
 
     using XPropertyList::Replace;
@@ -388,7 +388,7 @@ protected:
     virtual Bitmap CreateBitmapForUI(long nIndex);
 
 public:
-    explicit XGradientList(const String& rPath);
+    explicit XGradientList(const OUString& rPath);
     virtual ~XGradientList();
 
     using XPropertyList::Replace;
@@ -411,7 +411,7 @@ protected:
     virtual Bitmap CreateBitmapForUI(long nIndex);
 
 public:
-    explicit XBitmapList(const String& rPath)
+    explicit XBitmapList(const OUString& rPath)
         : XPropertyList(XBITMAP_LIST, rPath) {}
 
     using XPropertyList::Replace;
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 0da58d45486b..7cb5ed36727b 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -33,7 +33,7 @@
 
 using namespace com::sun::star;
 
-XDashList::XDashList(const String& rPath)
+XDashList::XDashList(const OUString& rPath)
     : XPropertyList(XDASH_LIST, rPath)
     , maBitmapSolidLine()
     , maStringSolidLine()
@@ -202,9 +202,9 @@ Bitmap XDashList::GetBitmapForUISolidLine() const
     return maBitmapSolidLine;
 }
 
-String XDashList::GetStringForUiSolidLine() const
+OUString XDashList::GetStringForUiSolidLine() const
 {
-    if(!maStringSolidLine.Len())
+    if(maStringSolidLine.isEmpty())
     {
         const_cast< XDashList* >(this)->maStringSolidLine = ResId(RID_SVXSTR_SOLID, DIALOG_MGR()).toString();
     }
@@ -212,9 +212,9 @@ String XDashList::GetStringForUiSolidLine() const
     return maStringSolidLine;
 }
 
-String XDashList::GetStringForUiNoLine() const
+OUString XDashList::GetStringForUiNoLine() const
 {
-    if(!maStringNoLine.Len())
+    if(maStringNoLine.isEmpty())
     {
         // formally was RID_SVXSTR_INVISIBLE, but tomake equal
         // everywhere, use RID_SVXSTR_NONE
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index dd3d1abdfc3a..a78cde57e1c9 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -34,7 +34,7 @@
 
 using namespace com::sun::star;
 
-XGradientList::XGradientList( const String& rPath )
+XGradientList::XGradientList( const OUString& rPath )
 :   XPropertyList( XGRADIENT_LIST, rPath )
 {
 }
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index c58901bdad19..ba75ca3265c2 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -34,7 +34,7 @@
 using namespace ::com::sun::star;
 using namespace ::rtl;
 
-XHatchList::XHatchList(const String& rPath)
+XHatchList::XHatchList(const OUString& rPath)
   : XPropertyList( XHATCH_LIST, rPath )
 {
 }
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index eca37ed2950d..53894b838a2e 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -38,7 +38,7 @@ Color RGB_Color( ColorData nColorName )
 
 // class XColorEntry
 
-XColorEntry::XColorEntry(const Color& rColor, const String& rName)
+XColorEntry::XColorEntry(const Color& rColor, const OUString& rName)
 :   XPropertyEntry(rName),
     aColor(rColor)
 {
@@ -52,7 +52,7 @@ aColor(rOther.aColor)
 
 // class XLineEndEntry
 
-XLineEndEntry::XLineEndEntry(const basegfx::B2DPolyPolygon& rB2DPolyPolygon, const String& rName)
+XLineEndEntry::XLineEndEntry(const basegfx::B2DPolyPolygon& rB2DPolyPolygon, const OUString& rName)
 :   XPropertyEntry(rName),
     aB2DPolyPolygon(rB2DPolyPolygon)
 {
@@ -66,7 +66,7 @@ XLineEndEntry::XLineEndEntry(const XLineEndEntry& rOther)
 
 // class XDashEntry
 
-XDashEntry::XDashEntry(const XDash& rDash, const String& rName)
+XDashEntry::XDashEntry(const XDash& rDash, const OUString& rName)
 :   XPropertyEntry(rName),
     aDash(rDash)
 {
@@ -80,7 +80,7 @@ aDash(rOther.aDash)
 
 // class XHatchEntry
 
-XHatchEntry::XHatchEntry(const XHatch& rHatch, const String& rName)
+XHatchEntry::XHatchEntry(const XHatch& rHatch, const OUString& rName)
 :   XPropertyEntry(rName),
     aHatch(rHatch)
 {
@@ -94,7 +94,7 @@ XHatchEntry::XHatchEntry(const XHatchEntry& rOther)
 
 // class XGradientEntry
 
-XGradientEntry::XGradientEntry(const XGradient& rGradient, const String& rName)
+XGradientEntry::XGradientEntry(const XGradient& rGradient, const OUString& rName)
 :   XPropertyEntry(rName),
     aGradient(rGradient)
 {
@@ -108,7 +108,7 @@ XGradientEntry::XGradientEntry(const XGradientEntry& rOther)
 
 // class XBitmapEntry
 
-XBitmapEntry::XBitmapEntry(const GraphicObject& rGraphicObject, const String& rName)
+XBitmapEntry::XBitmapEntry(const GraphicObject& rGraphicObject, const OUString& rName)
 :   XPropertyEntry(rName),
     maGraphicObject(rGraphicObject)
 {
@@ -122,7 +122,7 @@ XBitmapEntry::XBitmapEntry(const XBitmapEntry& rOther)
 
 XPropertyList::XPropertyList(
     XPropertyListType type,
-    const String& rPath
+    const OUString& rPath
 ) : meType           ( type ),
     maName           ( RTL_CONSTASCII_USTRINGPARAM( "standard" ) ),
     maPath           ( rPath ),
@@ -222,9 +222,9 @@ XPropertyEntry* XPropertyList::Remove( long nIndex )
     return pEntry;
 }
 
-void XPropertyList::SetName( const String& rString )
+void XPropertyList::SetName( const OUString& rString )
 {
-    if(rString.Len())
+    if(!rString.isEmpty())
     {
         maName = rString;
     }
@@ -240,7 +240,7 @@ bool XPropertyList::Load()
 
         if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
         {
-            DBG_ASSERT( !maPath.Len(), "invalid URL" );
+            DBG_ASSERT( maPath.isEmpty(), "invalid URL" );
             return false;
         }
 
@@ -271,7 +271,7 @@ bool XPropertyList::Save()
 
     if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
     {
-        DBG_ASSERT( !maPath.Len(), "invalid URL" );
+        DBG_ASSERT( maPath.isEmpty(), "invalid URL" );
         return false;
     }
 
@@ -292,7 +292,7 @@ bool XPropertyList::SaveTo( const uno::Reference< embed::XStorage > &xStorage,
 }
 
 XPropertyListRef XPropertyList::CreatePropertyList( XPropertyListType t,
-                                                    const String& rPath )
+                                                    const OUString& rPath )
 {
     XPropertyListRef pRet;
 
diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index 1dae9c89c33e..4e782027f7ff 100644
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -33,7 +33,7 @@
 
 using namespace com::sun::star;
 
-XLineEndList::XLineEndList( const String& rPath )
+XLineEndList::XLineEndList( const OUString& rPath )
     : XPropertyList( XLINE_END_LIST, rPath )
 {
 }