diff options
| author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-02-24 16:08:05 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-02-26 15:51:23 +0000 |
| commit | 465dbaecf9890b7117a45d02ea982ef7aca32720 (patch) | |
| tree | 69b31b155bc17799d260aa9addd4fb855757a42d /editeng | |
| parent | 73b50b73366f069b2ba680cec35b09d566209109 (diff) | |
fdo#38838 Replaced some use of (Xub)String with OUString.
Change-Id: I5a8f2d1a5762c20d21d31b04778a9e2cac8df9cb
Reviewed-on: https://gerrit.libreoffice.org/2364
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/items/frmitems.cxx | 4 | ||||
| -rw-r--r-- | editeng/source/items/itemtype.cxx | 16 | ||||
| -rw-r--r-- | editeng/source/outliner/outliner.cxx | 2 |
3 files changed, 9 insertions, 13 deletions
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index c486f0d71099..e728d1968885 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -97,7 +97,7 @@ inline void SetValueProp( XubString& rStr, const sal_uInt16 nValue, if( 100 == nProp ) rStr += OUString::number( nValue ); else - ( rStr += OUString::number( nProp )) += sal_Unicode('%'); + rStr += OUString::number(nProp) + "%"; } inline void SetValueProp( XubString& rStr, const short nValue, @@ -106,7 +106,7 @@ inline void SetValueProp( XubString& rStr, const short nValue, if( 100 == nProp ) rStr += OUString::number( nValue ); else - ( rStr += OUString::number( nProp )) += sal_Unicode('%'); + rStr += OUString::number(nProp) + "%"; } // ----------------------------------------------------------------------- diff --git a/editeng/source/items/itemtype.cxx b/editeng/source/items/itemtype.cxx index d3e2c9746286..daaba33f2273 100644 --- a/editeng/source/items/itemtype.cxx +++ b/editeng/source/items/itemtype.cxx @@ -137,7 +137,7 @@ XubString GetSvxString( sal_uInt16 nId ) XubString GetColorString( const Color& rCol ) { - XubString sStr; + OUString sStr; ColorData nColData = RGB_COLORDATA( rCol.GetRed(), rCol.GetGreen(), rCol.GetBlue() ); @@ -158,16 +158,12 @@ XubString GetColorString( const Color& rCol ) if ( nColor < sizeof(aColAry)/sizeof(ColorData) ) sStr = EE_RESSTR( RID_SVXITEMS_COLOR_BEGIN + nColor + 1 ); - if ( !sStr.Len() ) + if ( sStr.isEmpty() ) { - sStr.AppendAscii(RTL_CONSTASCII_STRINGPARAM( "RGB" )); - sStr += sal_Unicode('('); - sStr += OUString::number( rCol.GetRed() ); - sStr += cpDelim; - sStr += OUString::number( rCol.GetGreen() ); - sStr += cpDelim; - sStr += OUString::number( rCol.GetBlue() ); - sStr += sal_Unicode(')'); + sStr += "RGB(" + + OUString::number( rCol.GetRed() ) + OUString(cpDelim) + + OUString::number( rCol.GetGreen() ) + OUString(cpDelim) + + OUString::number( rCol.GetBlue() ) + ")"; } return sStr; } diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 6294aeaa5af2..e81286c8c5fb 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -715,7 +715,7 @@ void Outliner::ImplSetLevelDependendStyleSheet( sal_uInt16 nPara, SfxStyleSheet* DBG_ASSERT( pNewStyle, "AutoStyleSheetName - Style not found!" ); if ( pNewStyle && ( pNewStyle != GetStyleSheet( nPara ) ) ) { - SfxItemSet aOldAttrs( GetParaAttribs( nPara ) ); + SfxItemSet aOldAttrs( GetParaAttribs( nPara ) ); SetStyleSheet( nPara, pNewStyle ); if ( aOldAttrs.GetItemState( EE_PARA_NUMBULLET ) == SFX_ITEM_ON ) { |