diff options
| -rw-r--r-- | include/editeng/outliner.hxx | 8 | ||||
| -rw-r--r-- | include/svx/svdomeas.hxx | 2 | ||||
| -rw-r--r-- | include/svx/svdotext.hxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 6 | ||||
| -rw-r--r-- | svx/source/svdraw/svdomeas.cxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdotxfl.cxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdoutl.cxx | 2 |
7 files changed, 12 insertions, 12 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; diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 6722ad349d1c..97c7e9129d3a 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -475,8 +475,8 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerStatusEventHdl,EditStatus*,pEditStat) IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI) { bool bOk=false; - String& rStr=pFI->GetRepresentation(); - rStr.Erase(); + OUString& rStr=pFI->GetRepresentation(); + rStr = ""; SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() ); if (pTextObj!=NULL) { Color* pTxtCol=NULL; @@ -499,7 +499,7 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI) Link aDrawOutlLink=rDrawOutl.GetCalcFieldValueHdl(); if (!bOk && aDrawOutlLink.IsSet()) { aDrawOutlLink.Call(pFI); - bOk = (sal_Bool)rStr.Len(); + bOk = !rStr.isEmpty(); } if (!bOk && aOldCalcFieldValueLink.IsSet()) { return aOldCalcFieldValueLink.Call(pFI); diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index a1bce28da556..a482dac80549 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -587,7 +587,7 @@ basegfx::B2DPolyPolygon SdrMeasureObj::ImpCalcXPoly(const ImpMeasurePoly& rPol) bool SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, bool bEdit, - Color*& rpTxtColor, Color*& rpFldColor, XubString& rRet) const + Color*& rpTxtColor, Color*& rpFldColor, OUString& rRet) const { const SvxFieldData* pField=rField.GetField(); SdrMeasureField* pMeasureField=PTR_CAST(SdrMeasureField,pField); diff --git a/svx/source/svdraw/svdotxfl.cxx b/svx/source/svdraw/svdotxfl.cxx index 264f5e4ac36c..154e7707d73a 100644 --- a/svx/source/svdraw/svdotxfl.cxx +++ b/svx/source/svdraw/svdotxfl.cxx @@ -41,7 +41,7 @@ void SdrRegisterFieldClasses() ///////////////////////////////////////////////////////////////////////////////////////////////// */ bool SdrTextObj::CalcFieldValue(const SvxFieldItem& /*rField*/, sal_Int32 /*nPara*/, sal_uInt16 /*nPos*/, - bool /*bEdit*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/, XubString& /*rRet*/) const + bool /*bEdit*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/, OUString& /*rRet*/) const { return false; } diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx index 9439514608a9..0e7ce6b133be 100644 --- a/svx/source/svdraw/svdoutl.cxx +++ b/svx/source/svdraw/svdoutl.cxx @@ -78,7 +78,7 @@ OUString SdrOutliner::CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara Color*& rpTxtColor, Color*& rpFldColor) { bool bOk = false; - XubString aRet; + OUString aRet; if(mpTextObj.is()) bOk = static_cast< SdrTextObj* >( mpTextObj.get())->CalcFieldValue(rField, nPara, nPos, sal_False, rpTxtColor, rpFldColor, aRet); |