diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-20 09:49:51 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-01 10:08:36 +0200 |
| commit | 9dc41e228dd60c60a4364d26270c9769d2939ded (patch) | |
| tree | 960bad38180b7cc8d185e392fc67df8975eecf00 /svx/source/tbxctrls | |
| parent | fd8f8bdaadc6bac6cf57c335422482a6793211a2 (diff) | |
convert remnants of String in SVX to String
Change-Id: I66fd6387c3fcd33c6ae0b431810abf6679345767
Diffstat (limited to 'svx/source/tbxctrls')
| -rw-r--r-- | svx/source/tbxctrls/colrctrl.cxx | 2 | ||||
| -rw-r--r-- | svx/source/tbxctrls/extrusioncontrols.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 17e040d84891..959123536811 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -416,7 +416,7 @@ IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl) SfxDispatcher* pDispatcher = GetBindings().GetDispatcher(); sal_uInt16 nPos = aColorSet.GetSelectItemId(); Color aColor( aColorSet.GetItemColor( nPos ) ); - String aStr( aColorSet.GetItemText( nPos ) ); + OUString aStr( aColorSet.GetItemText( nPos ) ); if (aColorSet.IsLeftButton()) { diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 26b8a4f5c01e..fd71d7a4f52a 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -345,7 +345,7 @@ ExtrusionDepthWindow::ExtrusionDepthWindow( SetSelectHdl( LINK( this, ExtrusionDepthWindow, SelectHdl ) ); - String aEmpty; + OUString aEmpty; appendEntry( 0, aEmpty, maImgDepth0 ); appendEntry( 1, aEmpty, maImgDepth1 ); appendEntry( 2, aEmpty, maImgDepth2 ); |