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

drop some more XubStrings

Browse Source 
Change-Id: Ibca2e4a0cfd1b504f87fea1d4e47536c1abd8ac0
This commit is contained in:
Caolán McNamara
2013-07-10 10:20:24 +01:00
parent 43f2c887a0
commit 39f392e41a
8 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/svx/ctredlin.hxx
View File

@@ -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();

4
include/svx/fmmodel.hxx
View File

@@ -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();

6
include/svx/fontlb.hxx
View File

@@ -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.

2
include/svx/svdomeas.hxx
View File

@@ -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;

9
svx/source/dialog/ctredlin.cxx
View File

@@ -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;

6
svx/source/dialog/fontlb.cxx
View File

@@ -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(

34
svx/source/form/fmmodel.cxx
View File

@@ -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);

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

@@ -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)
{