diff options
| author | Ricardo Montania <ricardo@linuxafundo.com.br> | 2012-11-02 15:56:05 -0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-11-14 16:39:16 +0000 |
| commit | 752cb97a8fb189b6e11d3a55704222b9aba1b11a (patch) | |
| tree | ddef093e164eb6e2b8e1097ee008d20b2e019179 /cui | |
| parent | dff0a481db662816b06f8496b30786cee5fc3dd5 (diff) | |
fdo#38838 UniString removal
Change-Id: I7bf9b0e94bff9047544f6aba9669b8e0a3d3a2a5
Reviewed-on: https://gerrit.libreoffice.org/971
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/chardlg.cxx | 14 | ||||
| -rw-r--r-- | cui/source/tabpages/grfpage.cxx | 15 |
2 files changed, 15 insertions, 14 deletions
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 62b539c35541..80ebc3207228 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -3250,13 +3250,13 @@ void SvxCharPositionPage::FillUserData() { const sal_Unicode cTok = ';'; - String sUser( UniString::CreateFromInt32( m_nSuperEsc ) ); - sUser.Append( cTok ); - sUser.Append( UniString::CreateFromInt32( m_nSubEsc ) ); - sUser.Append( cTok ); - sUser.Append( UniString::CreateFromInt32( m_nSuperProp ) ); - sUser.Append( cTok ); - sUser.Append( UniString::CreateFromInt32( m_nSubProp ) ); + OUString sUser( OUString::valueOf( m_nSuperEsc ) ); + sUser += OUString( cTok ); + sUser += OUString::valueOf( m_nSubEsc ); + sUser += OUString (cTok ); + sUser += OUString::valueOf( m_nSuperProp ); + sUser += OUString ( cTok ); + sUser += OUString::valueOf( m_nSubProp ); SetUserData( sUser ); } diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 2297dd8589f5..60ae1da9add9 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -29,6 +29,7 @@ #include <grfpage.hxx> #include <svx/grfcrop.hxx> #include <grfpage.hrc> +#include <rtl/ustring.hxx> #include <cuires.hrc> #include <svx/dialogs.hrc> // for RID_SVXPAGE_GRFCROP @@ -663,10 +664,10 @@ void SvxGrfCropPage::GraphicHasChanged( sal_Bool bFound ) aFld.SetMax( LONG_MAX - 1 ); aFld.SetValue( aFld.Normalize( aOrigSize.Width() ), eUnit ); - String sTemp = aFld.GetText(); + OUString sTemp = aFld.GetText(); aFld.SetValue( aFld.Normalize( aOrigSize.Height() ), eUnit ); // multiplication sign (U+00D7) - sTemp += UniString("\xc3\x97", RTL_TEXTENCODING_UTF8); + sTemp += OUString( sal_Unicode (0x00D7) ); sTemp += aFld.GetText(); if ( aOrigPixelSize.Width() && aOrigPixelSize.Height() ) { @@ -674,14 +675,14 @@ void SvxGrfCropPage::GraphicHasChanged( sal_Bool bFound ) ((float)aOrigSize.Width()/TWIP_TO_INCH)+0.5)); int ay = int(floor((float)aOrigPixelSize.Height() / ((float)aOrigSize.Height()/TWIP_TO_INCH)+0.5)); - sTemp += rtl::OUString(" "); + sTemp += OUString(" "); sTemp += CUI_RESSTR( STR_PPI ); - String sPPI = UniString::CreateFromInt32(ax); + OUString sPPI = OUString::valueOf(ax); if (abs(ax - ay) > 1) { - sPPI += UniString("\xc3\x97", RTL_TEXTENCODING_UTF8); - sPPI += UniString::CreateFromInt32(ay); + sPPI += OUString( sal_Unicode (0x00D7) ); + sPPI += OUString::valueOf(ay); } - sTemp.SearchAndReplaceAscii("%1", sPPI); + sTemp.replaceAll("%1", sPPI); } aOrigSizeFT.SetText( sTemp ); } |