mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert a slice of editeng and svx from String to OUString

Browse Source 
specifically the aRepresentation field/methods in EditFieldInfo
and the CalcFieldValue method in SdrTextObj, because they
have a tricky dependency.

Change-Id: Id1f9dc6d7cacc075983bd224d11dd4de1085a9c1
This commit is contained in:
Noel Grandin
2013-08-30 17:14:17 +02:00
parent 75c850aa06
commit 1e110338a1
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/editeng/outliner.hxx
View File

@@ -505,7 +505,7 @@ private:
Color* pTxtColor; Color* pTxtColor;
Color* pFldColor; Color* pFldColor;
String aRepresentation; OUString aRepresentation;
sal_Int32 nPara; sal_Int32 nPara;
xub_StrLen nPos; xub_StrLen nPos;
@@ -551,9 +551,9 @@ public:
sal_Bool IsSimpleClick() const { return bSimpleClick; } sal_Bool IsSimpleClick() const { return bSimpleClick; }
void SetSimpleClick( sal_Bool bSimple ) { bSimpleClick = bSimple; } void SetSimpleClick( sal_Bool bSimple ) { bSimpleClick = bSimple; }
const String& GetRepresentation() const { return aRepresentation; } const OUString& GetRepresentation() const { return aRepresentation; }
String& GetRepresentation() { return aRepresentation; } OUString& GetRepresentation() { return aRepresentation; }
void SetRepresentation( const String& rStr ) { aRepresentation = rStr; } void SetRepresentation( const OUString& rStr ){ aRepresentation = rStr; }
void SetSdrPage( SdrPage* pPage ) { mpSdrPage = pPage; } void SetSdrPage( SdrPage* pPage ) { mpSdrPage = pPage; }
SdrPage* GetSdrPage() const { return mpSdrPage; } SdrPage* GetSdrPage() const { return mpSdrPage; }

2
include/svx/svdomeas.hxx
View File

@@ -145,7 +145,7 @@ public:
virtual OutlinerParaObject* GetOutlinerParaObject() const; virtual OutlinerParaObject* GetOutlinerParaObject() const;
virtual bool CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, 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# // #i97878#
virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const;

2
include/svx/svdotext.hxx
View File

@@ -474,7 +474,7 @@ public:
virtual void ReformatText(); virtual void ReformatText();
virtual bool CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, 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; virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const;

6
svx/source/svdraw/svdedxv.cxx
View File

@@ -475,8 +475,8 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerStatusEventHdl,EditStatus*,pEditStat)
IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI) IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
{ {
bool bOk=false; bool bOk=false;
String& rStr=pFI->GetRepresentation(); OUString& rStr=pFI->GetRepresentation();
rStr.Erase(); rStr = "";
SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() ); SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() );
if (pTextObj!=NULL) { if (pTextObj!=NULL) {
Color* pTxtCol=NULL; Color* pTxtCol=NULL;
@@ -499,7 +499,7 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
Link aDrawOutlLink=rDrawOutl.GetCalcFieldValueHdl(); Link aDrawOutlLink=rDrawOutl.GetCalcFieldValueHdl();
if (!bOk && aDrawOutlLink.IsSet()) { if (!bOk && aDrawOutlLink.IsSet()) {
aDrawOutlLink.Call(pFI); aDrawOutlLink.Call(pFI);
bOk = (sal_Bool)rStr.Len(); bOk = !rStr.isEmpty();
} }
if (!bOk && aOldCalcFieldValueLink.IsSet()) { if (!bOk && aOldCalcFieldValueLink.IsSet()) {
return aOldCalcFieldValueLink.Call(pFI); return aOldCalcFieldValueLink.Call(pFI);

2
svx/source/svdraw/svdomeas.cxx
View File

@@ -587,7 +587,7 @@ basegfx::B2DPolyPolygon SdrMeasureObj::ImpCalcXPoly(const ImpMeasurePoly& rPol)
bool SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, bool SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos,
bool bEdit, bool bEdit,
Color*& rpTxtColor, Color*& rpFldColor, XubString& rRet) const Color*& rpTxtColor, Color*& rpFldColor, OUString& rRet) const
{ {
const SvxFieldData* pField=rField.GetField(); const SvxFieldData* pField=rField.GetField();
SdrMeasureField* pMeasureField=PTR_CAST(SdrMeasureField,pField); SdrMeasureField* pMeasureField=PTR_CAST(SdrMeasureField,pField);

2
svx/source/svdraw/svdotxfl.cxx
View File

@@ -41,7 +41,7 @@ void SdrRegisterFieldClasses()
///////////////////////////////////////////////////////////////////////////////////////////////// */ ///////////////////////////////////////////////////////////////////////////////////////////////// */
bool SdrTextObj::CalcFieldValue(const SvxFieldItem& /*rField*/, sal_Int32 /*nPara*/, sal_uInt16 /*nPos*/, 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; return false;
} }

2
svx/source/svdraw/svdoutl.cxx
View File

@@ -78,7 +78,7 @@ OUString SdrOutliner::CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara
Color*& rpTxtColor, Color*& rpFldColor) Color*& rpTxtColor, Color*& rpFldColor)
{ {
bool bOk = false; bool bOk = false;
XubString aRet; OUString aRet;
if(mpTextObj.is()) if(mpTextObj.is())
bOk = static_cast< SdrTextObj* >( mpTextObj.get())->CalcFieldValue(rField, nPara, nPos, sal_False, rpTxtColor, rpFldColor, aRet); bOk = static_cast< SdrTextObj* >( mpTextObj.get())->CalcFieldValue(rField, nPara, nPos, sal_False, rpTxtColor, rpFldColor, aRet);