Skip to content

C
core
Kaydet (Commit) 0136b4e5 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

XubString->OUString 

Change-Id: I888537cbaec11ef52b1e89b61f7351c6b7769819
üst 5621aa6b
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 40 deletions
editeng/source/editeng/editobj.cxx
Dosyayı görüntüle @ 0136b4e5
...@@ -276,24 +276,24 @@ bool EditTextObject::RemoveCharAttribs( sal_uInt16 nWhich ) ...@@ -276,24 +276,24 @@ bool EditTextObject::RemoveCharAttribs( sal_uInt16 nWhich )
return mpImpl->RemoveCharAttribs(nWhich); return mpImpl->RemoveCharAttribs(nWhich);
} }
void EditTextObject::GetStyleSheet(sal_Int32 nPara, String& rName, SfxStyleFamily& eFamily) const void EditTextObject::GetStyleSheet(sal_Int32 nPara, OUString& rName, SfxStyleFamily& eFamily) const
{ {
mpImpl->GetStyleSheet(nPara, rName, eFamily); mpImpl->GetStyleSheet(nPara, rName, eFamily);
} }
void EditTextObject::SetStyleSheet(sal_Int32 nPara, const String& rName, const SfxStyleFamily& eFamily) void EditTextObject::SetStyleSheet(sal_Int32 nPara, const OUString& rName, const SfxStyleFamily& eFamily)
{ {
mpImpl->SetStyleSheet(nPara, rName, eFamily); mpImpl->SetStyleSheet(nPara, rName, eFamily);
} }
bool EditTextObject::ChangeStyleSheets( bool EditTextObject::ChangeStyleSheets(
const XubString& rOldName, SfxStyleFamily eOldFamily, const XubString& rNewName, SfxStyleFamily eNewFamily ) const OUString& rOldName, SfxStyleFamily eOldFamily, const OUString& rNewName, SfxStyleFamily eNewFamily)
{ {
return mpImpl->ChangeStyleSheets(rOldName, eOldFamily, rNewName, eNewFamily); return mpImpl->ChangeStyleSheets(rOldName, eOldFamily, rNewName, eNewFamily);
} }
void EditTextObject::ChangeStyleSheetName( void EditTextObject::ChangeStyleSheetName(
SfxStyleFamily eFamily, const XubString& rOldName, const XubString& rNewName ) SfxStyleFamily eFamily, const OUString& rOldName, const OUString& rNewName)
{ {
mpImpl->ChangeStyleSheetName(eFamily, rOldName, rNewName); mpImpl->ChangeStyleSheetName(eFamily, rOldName, rNewName);
} }
...@@ -824,7 +824,7 @@ bool EditTextObjectImpl::RemoveCharAttribs( sal_uInt16 _nWhich ) ...@@ -824,7 +824,7 @@ bool EditTextObjectImpl::RemoveCharAttribs( sal_uInt16 _nWhich )
return bChanged; return bChanged;
} }
void EditTextObjectImpl::GetStyleSheet(sal_Int32 nPara, String& rName, SfxStyleFamily& rFamily) const void EditTextObjectImpl::GetStyleSheet(sal_Int32 nPara, OUString& rName, SfxStyleFamily& rFamily) const
{ {
if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size()) if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size())
return; return;
...@@ -834,7 +834,7 @@ void EditTextObjectImpl::GetStyleSheet(sal_Int32 nPara, String& rName, SfxStyleF ...@@ -834,7 +834,7 @@ void EditTextObjectImpl::GetStyleSheet(sal_Int32 nPara, String& rName, SfxStyleF
rFamily = rC.GetFamily(); rFamily = rC.GetFamily();
} }
void EditTextObjectImpl::SetStyleSheet(sal_Int32 nPara, const String& rName, const SfxStyleFamily& rFamily) void EditTextObjectImpl::SetStyleSheet(sal_Int32 nPara, const OUString& rName, const SfxStyleFamily& rFamily)
{ {
if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size()) if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size())
return; return;
...@@ -868,8 +868,8 @@ bool EditTextObjectImpl::ImpChangeStyleSheets( ...@@ -868,8 +868,8 @@ bool EditTextObjectImpl::ImpChangeStyleSheets(
} }
bool EditTextObjectImpl::ChangeStyleSheets( bool EditTextObjectImpl::ChangeStyleSheets(
const XubString& rOldName, SfxStyleFamily eOldFamily, const OUString& rOldName, SfxStyleFamily eOldFamily,
const XubString& rNewName, SfxStyleFamily eNewFamily ) const OUString& rNewName, SfxStyleFamily eNewFamily)
{ {
sal_Bool bChanges = ImpChangeStyleSheets( rOldName, eOldFamily, rNewName, eNewFamily ); sal_Bool bChanges = ImpChangeStyleSheets( rOldName, eOldFamily, rNewName, eNewFamily );
if ( bChanges ) if ( bChanges )
...@@ -879,7 +879,7 @@ bool EditTextObjectImpl::ChangeStyleSheets( ...@@ -879,7 +879,7 @@ bool EditTextObjectImpl::ChangeStyleSheets(
} }
void EditTextObjectImpl::ChangeStyleSheetName( SfxStyleFamily eFamily, void EditTextObjectImpl::ChangeStyleSheetName( SfxStyleFamily eFamily,
const XubString& rOldName, const XubString& rNewName ) const OUString& rOldName, const OUString& rNewName )
{ {
ImpChangeStyleSheets( rOldName, eFamily, rNewName, eFamily ); ImpChangeStyleSheets( rOldName, eFamily, rNewName, eFamily );
} }
......
editeng/source/editeng/editobj2.hxx
Dosyayı görüntüle @ 0136b4e5
...@@ -228,11 +228,11 @@ public: ...@@ -228,11 +228,11 @@ public:
const SfxItemSet& GetParaAttribs(sal_Int32 nPara) const; const SfxItemSet& GetParaAttribs(sal_Int32 nPara) const;
void SetParaAttribs(sal_Int32 nPara, const SfxItemSet& rAttribs); void SetParaAttribs(sal_Int32 nPara, const SfxItemSet& rAttribs);
void GetStyleSheet(sal_Int32 nPara, String& rName, SfxStyleFamily& eFamily) const; void GetStyleSheet(sal_Int32 nPara, OUString& rName, SfxStyleFamily& eFamily) const;
void SetStyleSheet(sal_Int32 nPara, const String& rName, const SfxStyleFamily& eFamily); void SetStyleSheet(sal_Int32 nPara, const OUString& rName, const SfxStyleFamily& eFamily);
bool ChangeStyleSheets( bool ChangeStyleSheets(
const XubString& rOldName, SfxStyleFamily eOldFamily, const String& rNewName, SfxStyleFamily eNewFamily ); const OUString& rOldName, SfxStyleFamily eOldFamily, const OUString& rNewName, SfxStyleFamily eNewFamily);
void ChangeStyleSheetName( SfxStyleFamily eFamily, const XubString& rOldName, const XubString& rNewName ); void ChangeStyleSheetName(SfxStyleFamily eFamily, const OUString& rOldName, const OUString& rNewName);
editeng::FieldUpdater GetFieldUpdater(); editeng::FieldUpdater GetFieldUpdater();
......
editeng/source/items/itemtype.cxx
Dosyayı görüntüle @ 0136b4e5
...@@ -23,14 +23,14 @@ ...@@ -23,14 +23,14 @@
#include <unotools/localedatawrapper.hxx> #include <unotools/localedatawrapper.hxx>
#include <editeng/itemtype.hxx> #include <editeng/itemtype.hxx>
#include <editeng/eerdll.hxx> #include <editeng/eerdll.hxx>
#include <rtl/ustrbuf.hxx>
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
XubString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, const IntlWrapper* pIntl ) OUString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, const IntlWrapper* pIntl )
{ {
sal_Bool bNeg = sal_False; sal_Bool bNeg = sal_False;
long nRet = 0; sal_Int32 nRet = 0;
XubString sRet;
if ( nVal < 0 ) if ( nVal < 0 )
{ {
...@@ -63,7 +63,7 @@ XubString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, c ...@@ -63,7 +63,7 @@ XubString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, c
case SFX_MAPUNIT_10TH_INCH: case SFX_MAPUNIT_10TH_INCH:
case SFX_MAPUNIT_INCH: case SFX_MAPUNIT_INCH:
{ {
nRet = (long)OutputDevice::LogicToLogic( nRet = OutputDevice::LogicToLogic(
nVal, (MapUnit)eSrcUnit, (MapUnit)SFX_MAPUNIT_1000TH_INCH ); nVal, (MapUnit)eSrcUnit, (MapUnit)SFX_MAPUNIT_1000TH_INCH );
switch ( eDestUnit ) switch ( eDestUnit )
...@@ -84,12 +84,12 @@ XubString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, c ...@@ -84,12 +84,12 @@ XubString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, c
default: default:
OSL_FAIL( "not supported mapunit" ); OSL_FAIL( "not supported mapunit" );
return sRet; return OUString();
} }
if ( SFX_MAPUNIT_CM == eDestUnit || SFX_MAPUNIT_INCH == eDestUnit ) if ( SFX_MAPUNIT_CM == eDestUnit || SFX_MAPUNIT_INCH == eDestUnit )
{ {
long nMod = nRet % 10; sal_Int32 nMod = nRet % 10;
if ( nMod > 4 ) if ( nMod > 4 )
nRet += 10 - nMod; nRet += 10 - nMod;
...@@ -97,45 +97,47 @@ XubString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, c ...@@ -97,45 +97,47 @@ XubString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, c
nRet -= nMod; nRet -= nMod;
} }
OUStringBuffer sRet;
if ( bNeg ) if ( bNeg )
sRet += sal_Unicode('-'); sRet.append('-');
long nDiff = 1000; long nDiff = 1000;
for( int nDigits = 4; nDigits; --nDigits, nDiff /= 10 ) for( int nDigits = 4; nDigits; --nDigits, nDiff /= 10 )
{ {
if ( nRet < nDiff ) if ( nRet < nDiff )
sRet += sal_Unicode('0'); sRet.append('0');
else else
sRet += OUString::number( nRet / nDiff ); sRet.append(nRet / nDiff);
nRet %= nDiff; nRet %= nDiff;
if( 4 == nDigits ) if( 4 == nDigits )
{ {
if(pIntl) if(pIntl)
sRet += pIntl->getLocaleData()->getNumDecimalSep(); sRet.append(pIntl->getLocaleData()->getNumDecimalSep());
else else
sRet += ','; sRet.append(',');
if( !nRet ) if( !nRet )
{ {
sRet += sal_Unicode('0'); sRet.append('0');
break; break;
} }
} }
else if( !nRet ) else if( !nRet )
break; break;
} }
return sRet; return sRet.makeStringAndClear();
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
XubString GetSvxString( sal_uInt16 nId ) OUString GetSvxString( sal_uInt16 nId )
{ {
return EE_RESSTR( nId ); return EE_RESSTR( nId );
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
XubString GetColorString( const Color& rCol ) OUString GetColorString( const Color& rCol )
{ {
OUString sStr; OUString sStr;
......
include/editeng/editobj.hxx
Dosyayı görüntüle @ 0136b4e5
...@@ -106,11 +106,11 @@ public: ...@@ -106,11 +106,11 @@ public:
const SfxItemSet& GetParaAttribs(sal_Int32 nPara) const; const SfxItemSet& GetParaAttribs(sal_Int32 nPara) const;
void GetStyleSheet(sal_Int32 nPara, String& rName, SfxStyleFamily& eFamily) const; void GetStyleSheet(sal_Int32 nPara, OUString& rName, SfxStyleFamily& eFamily) const;
void SetStyleSheet(sal_Int32 nPara, const String& rName, const SfxStyleFamily& eFamily); void SetStyleSheet(sal_Int32 nPara, const OUString& rName, const SfxStyleFamily& eFamily);
bool ChangeStyleSheets( bool ChangeStyleSheets(
const XubString& rOldName, SfxStyleFamily eOldFamily, const XubString& rNewName, SfxStyleFamily eNewFamily ); const OUString& rOldName, SfxStyleFamily eOldFamily, const OUString& rNewName, SfxStyleFamily eNewFamily);
void ChangeStyleSheetName( SfxStyleFamily eFamily, const XubString& rOldName, const XubString& rNewName ); void ChangeStyleSheetName(SfxStyleFamily eFamily, const OUString& rOldName, const OUString& rNewName);
editeng::FieldUpdater GetFieldUpdater(); editeng::FieldUpdater GetFieldUpdater();
......
include/editeng/itemtype.hxx
Dosyayı görüntüle @ 0136b4e5
...@@ -36,14 +36,14 @@ class IntlWrapper; ...@@ -36,14 +36,14 @@ class IntlWrapper;
static const sal_Unicode cpDelim[] = { ',' , ' ', '\0' }; static const sal_Unicode cpDelim[] = { ',' , ' ', '\0' };
EDITENG_DLLPUBLIC String GetSvxString( sal_uInt16 nId ); EDITENG_DLLPUBLIC OUString GetSvxString( sal_uInt16 nId );
EDITENG_DLLPUBLIC String GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, const IntlWrapper * pIntl ); EDITENG_DLLPUBLIC OUString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, const IntlWrapper * pIntl );
String GetColorString( const Color& rCol ); OUString GetColorString( const Color& rCol );
EDITENG_DLLPUBLIC sal_uInt16 GetMetricId( SfxMapUnit eUnit ); EDITENG_DLLPUBLIC sal_uInt16 GetMetricId( SfxMapUnit eUnit );
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
inline String GetBoolString( sal_Bool bVal ) inline OUString GetBoolString(bool bVal)
{ {
return EE_RESSTR(bVal ? RID_SVXITEMS_TRUE : RID_SVXITEMS_FALSE); return EE_RESSTR(bVal ? RID_SVXITEMS_TRUE : RID_SVXITEMS_FALSE);
} }
......
svx/source/svdraw/svdotxat.cxx
Dosyayı görüntüle @ 0136b4e5
...@@ -232,7 +232,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners() ...@@ -232,7 +232,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
// the container aStyles. The Family is always appended to the name // the container aStyles. The Family is always appended to the name
// of the stylesheet. // of the stylesheet.
const EditTextObject& rTextObj=pOutlinerParaObject->GetTextObject(); const EditTextObject& rTextObj=pOutlinerParaObject->GetTextObject();
XubString aStyleName; OUString aStyleName;
SfxStyleFamily eStyleFam; SfxStyleFamily eStyleFam;
sal_Int32 nParaAnz=rTextObj.GetParagraphCount(); sal_Int32 nParaAnz=rTextObj.GetParagraphCount();
...@@ -240,13 +240,13 @@ void SdrTextObj::ImpSetTextStyleSheetListeners() ...@@ -240,13 +240,13 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
{ {
rTextObj.GetStyleSheet(nParaNum, aStyleName, eStyleFam); rTextObj.GetStyleSheet(nParaNum, aStyleName, eStyleFam);
if(aStyleName.Len()) if (!aStyleName.isEmpty())
{ {
OUStringBuffer aFam; OUStringBuffer aFam;
aFam.append(static_cast<sal_Int32>(eStyleFam)); aFam.append(static_cast<sal_Int32>(eStyleFam));
comphelper::string::padToLength(aFam, 5, ' '); comphelper::string::padToLength(aFam, 5, ' ');
aStyleName += sal_Unicode('|'); aStyleName += OUString('|');
aStyleName += aFam.makeStringAndClear(); aStyleName += aFam.makeStringAndClear();
sal_Bool bFnd(sal_False); sal_Bool bFnd(sal_False);
...@@ -256,7 +256,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners() ...@@ -256,7 +256,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
{ {
// we don't want duplicate stylesheets // we don't want duplicate stylesheets
nNum--; nNum--;
bFnd = aStyleName.Equals(*aStyleNames[nNum]); bFnd = aStyleName.equals(*aStyleNames[nNum]);
} }
if(!bFnd) if(!bFnd)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment