diff options
author | Noel Grandin <noel@peralex.com> | 2013-08-20 13:13:58 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-08-22 10:49:29 +0200 |
commit | edffe40425ea44437844e73f238332ef281e8939 (patch) | |
tree | 9718a3840eee3dfb790b72e86a24ea5407d1e2f0 /svtools | |
parent | ea5cba1f88a4e183b135ee8df72fae9c0ee32aa6 (diff) |
convert svtools/source/contnr/imivctl.hxx from String to OUString
Change-Id: Ieac230b495c84b58362e176bf934afea0c391476
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/contnr/imivctl.hxx | 4 | ||||
-rw-r--r-- | svtools/source/contnr/imivctl1.cxx | 28 | ||||
-rw-r--r-- | svtools/source/contnr/ivctrl.cxx | 2 |
3 files changed, 17 insertions, 17 deletions
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index d43999895881..88237933089e 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -411,7 +411,7 @@ public: SvxIconChoiceCtrlEntry*, const Point* pPos = 0, sal_Bool bForInplaceEdit = sal_False, - const String* pStr = 0 + const OUString* pStr = 0 ); long CalcBoundingWidth( SvxIconChoiceCtrlEntry* ) const; @@ -449,7 +449,7 @@ public: SvxIconChoiceCtrlEntry* pEntry, sal_uInt16 nPaintFlags, OutputDevice* pOut, - const String* pStr = 0, + const OUString* pStr = 0, ::vcl::ControlLayoutData* _pLayoutData = NULL ); diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 201b03178bad..1cd006b49ca0 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -1664,11 +1664,11 @@ void SvxIconChoiceCtrl_Impl::PaintEmphasis( void SvxIconChoiceCtrl_Impl::PaintItem( const Rectangle& rRect, IcnViewFieldType eItem, SvxIconChoiceCtrlEntry* pEntry, sal_uInt16 nPaintFlags, - OutputDevice* pOut, const String* pStr, ::vcl::ControlLayoutData* _pLayoutData ) + OutputDevice* pOut, const OUString* pStr, ::vcl::ControlLayoutData* _pLayoutData ) { if( eItem == IcnViewFieldTypeText ) { - String aText; + OUString aText; if( !pStr ) aText = pView->GetEntryText( pEntry, sal_False ); else @@ -1786,7 +1786,7 @@ void SvxIconChoiceCtrl_Impl::PaintEntry( SvxIconChoiceCtrlEntry* pEntry, const P } */ - String aEntryText( pView->GetEntryText( pEntry, sal_False ) ); + OUString aEntryText( pView->GetEntryText( pEntry, sal_False ) ); Rectangle aTextRect( CalcTextRect(pEntry,&rPos,sal_False,&aEntryText)); Rectangle aBmpRect( CalcBmpRect(pEntry, &rPos ) ); @@ -2038,9 +2038,9 @@ Rectangle SvxIconChoiceCtrl_Impl::CalcBmpRect( SvxIconChoiceCtrlEntry* pEntry, c } Rectangle SvxIconChoiceCtrl_Impl::CalcTextRect( SvxIconChoiceCtrlEntry* pEntry, - const Point* pEntryPos, sal_Bool bEdit, const String* pStr ) + const Point* pEntryPos, sal_Bool bEdit, const OUString* pStr ) { - String aEntryText; + OUString aEntryText; if( !pStr ) aEntryText = pView->GetEntryText( pEntry, bEdit ); else @@ -2557,7 +2557,7 @@ Size SvxIconChoiceCtrl_Impl::GetMinGrid() const Size aMinSize( aImageSize ); aMinSize.Width() += 2 * LROFFS_BOUND; aMinSize.Height() += TBOFFS_BOUND; // single offset is enough (FileDlg) - String aStrDummy( RTL_CONSTASCII_USTRINGPARAM( "XXX" ) ); + OUString aStrDummy( "XXX" ); Size aTextSize( pView->GetTextWidth( aStrDummy ), pView->GetTextHeight() ); if( nWinBits & WB_ICON ) { @@ -3200,7 +3200,7 @@ void SvxIconChoiceCtrl_Impl::EditEntry( SvxIconChoiceCtrlEntry* pEntry ) SetNoSelection(); pCurEditedEntry = pEntry; - String aEntryText( pView->GetEntryText( pEntry, sal_True ) ); + OUString aEntryText( pView->GetEntryText( pEntry, sal_True ) ); Rectangle aRect( CalcTextRect( pEntry, 0, sal_True, &aEntryText ) ); MakeVisible( aRect ); Point aPos( aRect.TopLeft() ); @@ -3233,7 +3233,7 @@ IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, TextEditEndedHdl) return 0; } - String aText; + OUString aText; if ( !pEdit->EditingCanceled() ) aText = pEdit->GetText(); else @@ -3674,10 +3674,10 @@ sal_Bool SvxIconChoiceCtrl_Impl::RequestHelp( const HelpEvent& rHEvt ) if ( !pEntry ) return sal_False; - String sQuickHelpText = pEntry->GetQuickHelpText(); - String aEntryText( pView->GetEntryText( pEntry, sal_False ) ); + OUString sQuickHelpText = pEntry->GetQuickHelpText(); + OUString aEntryText( pView->GetEntryText( pEntry, sal_False ) ); Rectangle aTextRect( CalcTextRect( pEntry, 0, sal_False, &aEntryText ) ); - if ( ( !aTextRect.IsInside( aPos ) || !aEntryText.Len() ) && !sQuickHelpText.Len() ) + if ( ( !aTextRect.IsInside( aPos ) || aEntryText.isEmpty() ) && sQuickHelpText.isEmpty() ) return sal_False; Rectangle aOptTextRect( aTextRect ); @@ -3685,7 +3685,7 @@ sal_Bool SvxIconChoiceCtrl_Impl::RequestHelp( const HelpEvent& rHEvt ) sal_uInt16 nNewFlags = nCurTextDrawFlags; nNewFlags &= ~( TEXT_DRAW_CLIP | TEXT_DRAW_ENDELLIPSIS ); aOptTextRect = pView->GetTextRect( aOptTextRect, aEntryText, nNewFlags ); - if ( aOptTextRect != aTextRect || sQuickHelpText.Len() > 0 ) + if ( aOptTextRect != aTextRect || !sQuickHelpText.isEmpty() ) { //aTextRect.Right() = aTextRect.Left() + aRealSize.Width() + 4; Point aPt( aOptTextRect.TopLeft() ); @@ -3695,8 +3695,8 @@ sal_Bool SvxIconChoiceCtrl_Impl::RequestHelp( const HelpEvent& rHEvt ) aPt.Y() -= 1; aPt.X() -= 3; aOptTextRect.SetPos( aPt ); - String sHelpText; - if ( sQuickHelpText.Len() > 0 ) + OUString sHelpText; + if ( !sQuickHelpText.isEmpty() ) sHelpText = sQuickHelpText; else sHelpText = aEntryText; diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 36ecadc0a264..09f46caf5473 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -454,7 +454,7 @@ void SvtIconChoiceCtrl::FillLayoutData() const SvxIconChoiceCtrlEntry* pEntry = GetEntry( nPos ); Point aPos = _pImp->GetEntryBoundRect( pEntry ).TopLeft(); - String sEntryText = pEntry->GetDisplayText( ); + OUString sEntryText = pEntry->GetDisplayText( ); Rectangle aTextRect = _pImp->CalcTextRect( pEntry, &aPos, sal_False, &sEntryText ); sal_Bool bLargeIconMode = WB_ICON == ( _pImp->GetStyle() & ( VIEWMODE_MASK ) ); |