diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index c88b74238ae9..861c050fd878 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -74,7 +74,7 @@ private: Color aPrivColor; public: - SvLBoxColorString( SvTreeListEntry*,sal_uInt16 nFlags,const XubString& rStr, + SvLBoxColorString( SvTreeListEntry*, sal_uInt16 nFlags, const OUString& rStr, const Color& rCol); SvLBoxColorString(); ~SvLBoxColorString(); diff --git a/include/svx/fmmodel.hxx b/include/svx/fmmodel.hxx index 980f2a58e3d8..0d0fe0bc443c 100644 --- a/include/svx/fmmodel.hxx +++ b/include/svx/fmmodel.hxx @@ -49,9 +49,9 @@ public: TYPEINFO(); FmFormModel(SfxItemPool* pPool=NULL, SfxObjectShell* pPers=NULL ); - FmFormModel(const XubString& rPath, SfxItemPool* pPool=NULL, + FmFormModel(const OUString& rPath, SfxItemPool* pPool=NULL, SfxObjectShell* pPers=NULL ); - FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers, + FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers, bool bUseExtColorTable); virtual ~FmFormModel(); diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx index b45ed086efd0..5d9cc80daa25 100644 --- a/include/svx/fontlb.hxx +++ b/include/svx/fontlb.hxx @@ -39,7 +39,7 @@ public: SvLBoxFontString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, - const XubString& rString, + const OUString& rString, const Font& rFont, const Color* pColor = NULL ); @@ -83,9 +83,9 @@ public: void SetNoSelection(); /** Returns the position of the entry currently selected or LIST_APPEND. */ - sal_uLong GetSelectEntryPos() const; + sal_uLong GetSelectEntryPos() const; /** Returns the text of the selected entry or an empty string. */ - XubString GetSelectEntry() const; + OUString GetSelectEntry() const; protected: /** Initializes a new SvLBoxFontString entry. diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx index 8076635067ea..ad3e7370f781 100644 --- a/include/svx/svdomeas.hxx +++ b/include/svx/svdomeas.hxx @@ -73,7 +73,7 @@ protected: protected: void ImpTakeAttr(ImpMeasureRec& rRec) const; - void TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMeasureFieldKind ) const; + OUString TakeRepresentation(SdrMeasureFieldKind eMeasureFieldKind) const; void ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& rPol) const; basegfx::B2DPolyPolygon ImpCalcXPoly(const ImpMeasurePoly& rPol) const; void ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) const; diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index e084b0451040..d6c2a9270f58 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -63,7 +63,7 @@ RedlinData::~RedlinData() //---------------------------------------------------------------------------- SvxRedlinEntry::SvxRedlinEntry() - :SvTreeListEntry() + : SvTreeListEntry() { } @@ -77,10 +77,9 @@ SvxRedlinEntry::~SvxRedlinEntry() DBG_NAME(SvLBoxColorString); -SvLBoxColorString::SvLBoxColorString( SvTreeListEntry*pEntry,sal_uInt16 nFlags,const XubString& rStr, - const Color& rCol) - -: SvLBoxString( pEntry, nFlags, rStr ) +SvLBoxColorString::SvLBoxColorString(SvTreeListEntry*pEntry, sal_uInt16 nFlags, const OUString& rStr, + const Color& rCol) + : SvLBoxString(pEntry, nFlags, rStr) { DBG_CTOR(SvLBoxColorString,0); aPrivColor=rCol; diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index f5a4d32844fe..a778744c6355 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -34,7 +34,7 @@ SvLBoxFontString::SvLBoxFontString() : } SvLBoxFontString::SvLBoxFontString( - SvTreeListEntry* pEntry, sal_uInt16 nFlags, const XubString& rString, + SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& rString, const Font& rFont, const Color* pColor ) : SvLBoxString( pEntry, nFlags, rString ), maFont( rFont ), @@ -136,9 +136,9 @@ sal_uLong SvxFontListBox::GetSelectEntryPos() const return pSvLBoxEntry ? GetModel()->GetAbsPos( pSvLBoxEntry ) : LIST_APPEND; } -XubString SvxFontListBox::GetSelectEntry() const +OUString SvxFontListBox::GetSelectEntry() const { - return GetEntryText( GetSelectEntryPos() ); + return GetEntryText(GetSelectEntryPos()); } void SvxFontListBox::InitEntry( diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx index b84f8b6912c4..434c2138e91d 100644 --- a/svx/source/form/fmmodel.cxx +++ b/svx/source/form/fmmodel.cxx @@ -59,11 +59,11 @@ struct FmFormModelImplData |* \************************************************************************/ FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers) - :SdrModel(pPool, pPers, LOADREFCOUNTS) - ,m_pImpl(NULL) - ,m_pObjShell(0) - ,m_bOpenInDesignMode(sal_False) - ,m_bAutoControlFocus(sal_False) + : SdrModel(pPool, pPers, LOADREFCOUNTS) + , m_pImpl(NULL) + , m_pObjShell(0) + , m_bOpenInDesignMode(false) + , m_bAutoControlFocus(false) { m_pImpl = new FmFormModelImplData; m_pImpl->pUndoEnv = new FmXUndoEnvironment(*this); @@ -75,12 +75,12 @@ FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers) |* Ctor |* \************************************************************************/ -FmFormModel::FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers) - :SdrModel(rPath, pPool, pPers) - ,m_pImpl(NULL) - ,m_pObjShell(0) - ,m_bOpenInDesignMode(sal_False) - ,m_bAutoControlFocus(sal_False) +FmFormModel::FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers) + : SdrModel(rPath, pPool, pPers) + , m_pImpl(NULL) + , m_pObjShell(0) + , m_bOpenInDesignMode(false) + , m_bAutoControlFocus(false) { m_pImpl = new FmFormModelImplData; m_pImpl->pUndoEnv = new FmXUndoEnvironment(*this); @@ -92,13 +92,13 @@ FmFormModel::FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectSh |* Ctor |* \************************************************************************/ -FmFormModel::FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers, +FmFormModel::FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers, bool bUseExtColorTable) - :SdrModel(rPath, pPool, pPers, bUseExtColorTable, LOADREFCOUNTS) - ,m_pImpl( NULL ) - ,m_pObjShell(0) - ,m_bOpenInDesignMode(sal_False) - ,m_bAutoControlFocus(sal_False) + : SdrModel(rPath, pPool, pPers, bUseExtColorTable, LOADREFCOUNTS) + , m_pImpl(NULL) + , m_pObjShell(0) + , m_bOpenInDesignMode(false) + , m_bAutoControlFocus(false) { m_pImpl = new FmFormModelImplData; m_pImpl->pUndoEnv = new FmXUndoEnvironment(*this); diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 7b3c34c17644..d6077cc99db5 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -78,9 +78,9 @@ SdrMeasureObjGeoData::SdrMeasureObjGeoData() {} SdrMeasureObjGeoData::~SdrMeasureObjGeoData() {} -void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMeasureFieldKind ) const +OUString SdrMeasureObj::TakeRepresentation(SdrMeasureFieldKind eMeasureFieldKind) const { - rStr.Erase(); + String aStr; Fraction aMeasureScale(1, 1); sal_Bool bTextRota90(sal_False); sal_Bool bShowUnit(sal_False); @@ -127,41 +127,41 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe OUString aTmp; pModel->TakeMetricStr(nLen, aTmp, true, nNumDigits); - rStr = aTmp; + aStr = aTmp; if(!aFact.IsValid()) { - rStr = String(); - rStr += sal_Unicode('?'); + aStr = String(); + aStr += sal_Unicode('?'); } sal_Unicode cDec(SvtSysLocale().GetLocaleData().getNumDecimalSep()[0]); - if(rStr.Search(cDec) != STRING_NOTFOUND) + if(aStr.Search(cDec) != STRING_NOTFOUND) { - xub_StrLen nLen2(rStr.Len() - 1); + xub_StrLen nLen2(aStr.Len() - 1); - while(rStr.GetChar(nLen2) == sal_Unicode('0')) + while(aStr.GetChar(nLen2) == sal_Unicode('0')) { - rStr.Erase(nLen2); + aStr.Erase(nLen2); nLen2--; } - if(rStr.GetChar(nLen2) == cDec) + if(aStr.GetChar(nLen2) == cDec) { - rStr.Erase(nLen2); + aStr.Erase(nLen2); nLen2--; } - if(!rStr.Len()) - rStr += sal_Unicode('0'); + if(!aStr.Len()) + aStr += sal_Unicode('0'); } } else { // if there's no Model ... (e. g. preview in dialog) - rStr = String(); - rStr.AppendAscii("4711"); + aStr = String(); + aStr.AppendAscii("4711"); } break; @@ -178,7 +178,7 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe eMeasureUnit = eModUIUnit; if(bShowUnit) - pModel->TakeUnitStr(eMeasureUnit, rStr); + pModel->TakeUnitStr(eMeasureUnit, aStr); } } @@ -188,13 +188,14 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe { if(bTextRota90) { - rStr = String(); - rStr += sal_Unicode(' '); + aStr = String(); + aStr += sal_Unicode(' '); } break; } } + return aStr; } ////////////////////////////////////////////////////////////////////////////// @@ -591,7 +592,7 @@ bool SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, const SvxFieldData* pField=rField.GetField(); SdrMeasureField* pMeasureField=PTR_CAST(SdrMeasureField,pField); if (pMeasureField!=NULL) { - TakeRepresentation(rRet, pMeasureField->GetMeasureFieldKind()); + rRet = TakeRepresentation(pMeasureField->GetMeasureFieldKind()); if (rpFldColor!=NULL) { if (!bEdit) {