diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-04 14:15:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-05 08:55:08 +0200 |
| commit | a41c9866bd9da0527468f7fe7c9eb6fa4839ccf1 (patch) | |
| tree | b09e7f3ef4cadeb734d2fcd16a599515311acc80 /svx | |
| parent | 71622632e67de680376b09d9d23e285c4fb2eea3 (diff) | |
convert svx/source/mnucrtls/*.cxx from String to OUString
Change-Id: Ica33c8217cd6b57e6d1d16b01061a6e6422b46c6
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/mnuctrls/clipboardctl.cxx | 4 | ||||
| -rw-r--r-- | svx/source/mnuctrls/fntctl.cxx | 2 | ||||
| -rw-r--r-- | svx/source/sdr/properties/textproperties.cxx | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index ea129a988a87..b3f9d057406c 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -75,8 +75,8 @@ SfxPopupWindow* SvxClipBoardControl::CreatePopupWindow() for (sal_uInt16 i = 0; i < nCount; ++i) { sal_uIntPtr nFmtID = pFmtItem->GetClipbrdFormatId( i ); - String aFmtStr( pFmtItem->GetClipbrdFormatName( i ) ); - if (!aFmtStr.Len()) + OUString aFmtStr( pFmtItem->GetClipbrdFormatName( i ) ); + if (aFmtStr.isEmpty()) aFmtStr = SvPasteObjectHelper::GetSotFormatUIName( nFmtID ); pPopup->InsertItem( (sal_uInt16)nFmtID, aFmtStr ); } diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx index 9aebd0798008..65ec3097d9a0 100644 --- a/svx/source/mnuctrls/fntctl.cxx +++ b/svx/source/mnuctrls/fntctl.cxx @@ -102,7 +102,7 @@ void SvxFontMenuControl::StateChanged( if ( !pMenu->GetItemCount() ) FillMenu(); const SvxFontItem* pFontItem = PTR_CAST( SvxFontItem, pState ); - String aFont; + OUString aFont; if ( pFontItem ) aFont = pFontItem->GetFamilyName(); diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index 7aa010a7dde4..a0ed0b7631c0 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -276,8 +276,8 @@ namespace sdr { if((OBJ_OUTLINETEXT == rObj.GetTextKind()) && (SdrInventor == rObj.GetObjInventor())) { - String aNewStyleSheetName(GetStyleSheet()->GetName()); - aNewStyleSheetName.Erase(aNewStyleSheetName.Len() - 1, 1); + OUString aNewStyleSheetName(GetStyleSheet()->GetName()); + aNewStyleSheetName = aNewStyleSheetName.copy(0, aNewStyleSheetName.getLength() - 1); sal_Int16 nDepth = rOutliner.GetDepth(nPara); aNewStyleSheetName += OUString::number( nDepth <= 0 ? 1 : nDepth + 1); @@ -600,11 +600,11 @@ namespace sdr if(pExtendedHint && SFX_STYLESHEET_MODIFIED == pExtendedHint->GetHint()) { - String aOldName(pExtendedHint->GetOldName()); - String aNewName(pExtendedHint->GetStyleSheet()->GetName()); + OUString aOldName(pExtendedHint->GetOldName()); + OUString aNewName(pExtendedHint->GetStyleSheet()->GetName()); SfxStyleFamily eFamily = pExtendedHint->GetStyleSheet()->GetFamily(); - if(!aOldName.Equals(aNewName)) + if(aOldName != aNewName) { sal_Int32 nText = rTextProvider.getTextCount(); while( --nText > 0 ) |