diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-30 17:14:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-05 08:54:17 +0200 |
| commit | 1e110338a1917504a79aa8250a93e0dc4641e448 (patch) | |
| tree | 8e9259e5ecc971efab06a276f167b541c9bf1f00 /include | |
| parent | 75c850aa06cfdaf509b9dfbef707406c9738da13 (diff) | |
convert a slice of editeng and svx from String to OUString
specifically the aRepresentation field/methods in EditFieldInfo
and the CalcFieldValue method in SdrTextObj, because they
have a tricky dependency.
Change-Id: Id1f9dc6d7cacc075983bd224d11dd4de1085a9c1
Diffstat (limited to 'include')
| -rw-r--r-- | include/editeng/outliner.hxx | 8 | ||||
| -rw-r--r-- | include/svx/svdomeas.hxx | 2 | ||||
| -rw-r--r-- | include/svx/svdotext.hxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index ab67096d4644..3eab1441f81d 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -505,7 +505,7 @@ private: Color* pTxtColor; Color* pFldColor; - String aRepresentation; + OUString aRepresentation; sal_Int32 nPara; xub_StrLen nPos; @@ -551,9 +551,9 @@ public: sal_Bool IsSimpleClick() const { return bSimpleClick; } void SetSimpleClick( sal_Bool bSimple ) { bSimpleClick = bSimple; } - const String& GetRepresentation() const { return aRepresentation; } - String& GetRepresentation() { return aRepresentation; } - void SetRepresentation( const String& rStr ) { aRepresentation = rStr; } + const OUString& GetRepresentation() const { return aRepresentation; } + OUString& GetRepresentation() { return aRepresentation; } + void SetRepresentation( const OUString& rStr ){ aRepresentation = rStr; } void SetSdrPage( SdrPage* pPage ) { mpSdrPage = pPage; } SdrPage* GetSdrPage() const { return mpSdrPage; } diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx index e70d039b133d..435ea2002f37 100644 --- a/include/svx/svdomeas.hxx +++ b/include/svx/svdomeas.hxx @@ -145,7 +145,7 @@ public: virtual OutlinerParaObject* GetOutlinerParaObject() const; virtual bool CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, - bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const; + bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, OUString& rRet) const; // #i97878# virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index b656777b2167..c298ecc97116 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -474,7 +474,7 @@ public: virtual void ReformatText(); virtual bool CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, - bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const; + bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, OUString& rRet) const; virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const; |