diff options
| author | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2013-02-06 16:19:18 +0100 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-02-06 17:12:24 +0000 |
| commit | 82e3760855fdb3f549b21fa6d37eb75a2adf31b4 (patch) | |
| tree | 93251a4bafb7198e1edbb4bab1ff46c2a8108b83 /svtools | |
| parent | 35df0bd6e3674ea861d06da54f5c016f10cedb18 (diff) | |
replace (Xub)String with OUString in vcl
Change-Id: I0a44bab196ae239d3bdea75fd2b657bdfa4ecf31
Reviewed-on: https://gerrit.libreoffice.org/2011
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/inc/svtools/ctrlbox.hxx | 2 | ||||
| -rw-r--r-- | svtools/source/control/ctrlbox.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx index 6b83e9fa1dce..0a8e566413f2 100644 --- a/svtools/inc/svtools/ctrlbox.hxx +++ b/svtools/inc/svtools/ctrlbox.hxx @@ -512,7 +512,7 @@ class SVT_DLLPUBLIC FontSizeBox : public MetricBox #endif protected: - virtual XubString CreateFieldText( sal_Int64 nValue ) const; + virtual OUString CreateFieldText( sal_Int64 nValue ) const; public: FontSizeBox( Window* pParent, WinBits nWinStyle = 0 ); diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 09cf09f4f6c0..0b6d591b3190 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -1954,11 +1954,11 @@ void FontSizeBox::SetRelative( sal_Bool bNewRelative ) // ----------------------------------------------------------------------- -XubString FontSizeBox::CreateFieldText( sal_Int64 nValue ) const +OUString FontSizeBox::CreateFieldText( sal_Int64 nValue ) const { - XubString sRet( MetricBox::CreateFieldText( nValue ) ); - if ( bRelativeMode && bPtRelative && (0 <= nValue) && sRet.Len() ) - sRet.Insert( '+', 0 ); + OUString sRet( MetricBox::CreateFieldText( nValue ) ); + if ( bRelativeMode && bPtRelative && (0 <= nValue) && !sRet.isEmpty() ) + sRet = "+" + sRet; return sRet; } |