diff options
author | Noel Grandin <noel@peralex.com> | 2013-08-29 14:32:14 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-09-05 08:53:55 +0200 |
commit | 55b15c9db561c60fc71103538b2747f6b52b9931 (patch) | |
tree | 9935fe72111fe8ae4f1e56929dbacb5ff77f8838 /include/svx/xtable.hxx | |
parent | 9daa4f31944e1b9510b092ab9fdd433984c85d10 (diff) |
convert include/svx/xtable.hxx from String to OUString
Change-Id: I5230e5bfe1297875388ef798ed75b675ba09dd89
Diffstat (limited to 'include/svx/xtable.hxx')
-rw-r--r-- | include/svx/xtable.hxx | 48 |
1 files changed, 24 insertions, 24 deletions
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; |