diff options
author | Noel Grandin <noel@peralex.com> | 2013-09-04 13:48:13 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-09-05 08:55:06 +0200 |
commit | a4da41c429afecf8fbbb11930fcd254df6d16570 (patch) | |
tree | 639a9764c72c884388584ecfd1a95d71bdc5c97e /svx | |
parent | 5da63b03c0ad1b93e6918d901b48f5850588a42b (diff) |
convert svx/source/stbctrls/*.cxx from String to OUString
Change-Id: I90b070ae14b472c0107943475e6229606ab7732e
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/stbctrls/insctrl.cxx | 4 | ||||
-rw-r--r-- | svx/source/stbctrls/pszctrl.cxx | 28 | ||||
-rw-r--r-- | svx/source/stbctrls/selctrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/stbctrls/xmlsecctrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/stbctrls/zoomctrl.cxx | 10 | ||||
-rw-r--r-- | svx/source/stbctrls/zoomsliderctrl.cxx | 2 |
6 files changed, 24 insertions, 24 deletions
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index 08b848128c98..ccf81f154a1c 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -53,7 +53,7 @@ void SvxInsertStatusBarControl::StateChanged( sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState ) { if ( SFX_ITEM_AVAILABLE != eState ) - GetStatusBar().SetItemText( GetId(), String() ); + GetStatusBar().SetItemText( GetId(), "" ); else { DBG_ASSERT( pState->ISA( SfxBoolItem ), "invalid item type" ); @@ -98,7 +98,7 @@ void SvxInsertStatusBarControl::Paint( const UserDrawEvent& ) void SvxInsertStatusBarControl::DrawItemText_Impl() { - String aText; + OUString aText; if ( !bInsert ) aText = SVX_RESSTR( RID_SVXSTR_OVERWRITE_TEXT ); diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 537ac12579cc..8330399e1851 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -139,16 +139,16 @@ struct SvxPosSizeStatusBarControl_Impl */ { - Point aPos; // valid when a position is shown - Size aSize; // valid when a size is shown - String aStr; // valid when a text is shown - bool bPos; // show position ? - bool bSize; // set size ? - bool bTable; // set table index ? - bool bHasMenu; // set StarCalc popup menu ? + Point aPos; // valid when a position is shown + Size aSize; // valid when a size is shown + OUString aStr; // valid when a text is shown + bool bPos; // show position ? + bool bSize; // set size ? + bool bTable; // set table index ? + bool bHasMenu; // set StarCalc popup menu ? sal_uInt16 nFunction; // the selected StarCalc function - Image aPosImage; // Image to show the position - Image aSizeImage; // Image to show the size + Image aPosImage; // Image to show the position + Image aSizeImage; // Image to show the size }; // class SvxPosSizeStatusBarControl ------------------------------------------ @@ -219,7 +219,7 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eSt { // Because the combi-controller, always sets the curent Id as HelpId // first clean the cached HelpText - GetStatusBar().SetHelpText( GetId(), String() ); + GetStatusBar().SetHelpText( GetId(), "" ); switch ( nSID ) { @@ -291,7 +291,7 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eSt // set only strings as text at the statusBar, so that the Help-Tips // can work with the text, when it is too long for the statusBar - String aText; + OUString aText; if ( pImp->bTable ) aText = pImp->aStr; GetStatusBar().SetItemText( GetId(), aText ); @@ -369,8 +369,8 @@ void SvxPosSizeStatusBarControl::Paint( const UserDrawEvent& rUsrEvt ) pDev->DrawImage( aPnt, pImp->aPosImage ); aPnt.X() += pImp->aPosImage.GetSizePixel().Width(); aPnt.X() += PAINT_OFFSET; - String aStr = GetMetricStr_Impl( pImp->aPos.X()); - aStr.AppendAscii(" / "); + OUString aStr = GetMetricStr_Impl( pImp->aPos.X()); + aStr += " / "; aStr += GetMetricStr_Impl( pImp->aPos.Y()); pDev->DrawRect( Rectangle( aPnt, Point( nSizePosX, rRect.Bottom() ) ) ); @@ -386,7 +386,7 @@ void SvxPosSizeStatusBarControl::Paint( const UserDrawEvent& rUsrEvt ) Point aDrwPnt = aPnt; aPnt.X() += PAINT_OFFSET; aStr = GetMetricStr_Impl( pImp->aSize.Width() ); - aStr.AppendAscii(" x "); + aStr += " x "; aStr += GetMetricStr_Impl( pImp->aSize.Height() ); pDev->DrawRect( Rectangle( aDrwPnt, rRect.BottomRight() ) ); pDev->DrawText( aPnt, aStr ); diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index c5a4eaf15f60..e54760d3a9b6 100644 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -80,7 +80,7 @@ SvxSelectionModeControl::SvxSelectionModeControl( sal_uInt16 _nSlotId, mnState( 0 ), maImage( SVX_RES( RID_SVXBMP_SELECTION ) ) { - GetStatusBar().SetItemText( GetId(), String() ); + GetStatusBar().SetItemText( GetId(), "" ); } // ----------------------------------------------------------------------- diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index 45b1f9668793..b2e2eb9a0b89 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -86,7 +86,7 @@ void XmlSecStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, cons if( GetStatusBar().AreItemsVisible() ) // necessary ? GetStatusBar().SetItemData( GetId(), 0 ); - GetStatusBar().SetItemText( GetId(), String() ); // necessary ? + GetStatusBar().SetItemText( GetId(), "" ); // necessary ? sal_uInt16 nResId = RID_SVXSTR_XMLSEC_NO_SIG; if ( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_OK ) diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index 80db8d45f73b..b5be076ec3fd 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -113,15 +113,15 @@ void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, { if( SFX_ITEM_AVAILABLE != eState ) { - GetStatusBar().SetItemText( GetId(), String() ); + GetStatusBar().SetItemText( GetId(), "" ); nValueSet = 0; } else if ( pState->ISA( SfxUInt16Item) ) { const SfxUInt16Item* pItem = (const SfxUInt16Item*)pState; nZoom = pItem->GetValue(); - String aStr( OUString::number(nZoom) ); - aStr += '%'; + OUString aStr( OUString::number(nZoom) ); + aStr += "%"; GetStatusBar().SetItemText( GetId(), aStr ); if ( pState->ISA(SvxZoomItem) ) @@ -140,8 +140,8 @@ void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, void SvxZoomStatusBarControl::Paint( const UserDrawEvent& ) { - String aStr( OUString::number( nZoom )); - aStr += '%'; + OUString aStr( OUString::number( nZoom )); + aStr += "%"; GetStatusBar().SetItemText( GetId(), aStr ); } diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index 94e2777fdf59..64d46bed51a2 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -190,7 +190,7 @@ void SvxZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eStat { if ( (SFX_ITEM_AVAILABLE != eState) || pState->ISA( SfxVoidItem ) ) { - GetStatusBar().SetItemText( GetId(), String() ); + GetStatusBar().SetItemText( GetId(), "" ); mpImpl->mbValuesSet = false; } else |