Kaydet (Commit) a41c9866 authored tarafından Noel Grandin's avatar Noel Grandin

convert svx/source/mnucrtls/*.cxx from String to OUString

Change-Id: Ica33c8217cd6b57e6d1d16b01061a6e6422b46c6
üst 71622632
...@@ -75,8 +75,8 @@ SfxPopupWindow* SvxClipBoardControl::CreatePopupWindow() ...@@ -75,8 +75,8 @@ SfxPopupWindow* SvxClipBoardControl::CreatePopupWindow()
for (sal_uInt16 i = 0; i < nCount; ++i) for (sal_uInt16 i = 0; i < nCount; ++i)
{ {
sal_uIntPtr nFmtID = pFmtItem->GetClipbrdFormatId( i ); sal_uIntPtr nFmtID = pFmtItem->GetClipbrdFormatId( i );
String aFmtStr( pFmtItem->GetClipbrdFormatName( i ) ); OUString aFmtStr( pFmtItem->GetClipbrdFormatName( i ) );
if (!aFmtStr.Len()) if (aFmtStr.isEmpty())
aFmtStr = SvPasteObjectHelper::GetSotFormatUIName( nFmtID ); aFmtStr = SvPasteObjectHelper::GetSotFormatUIName( nFmtID );
pPopup->InsertItem( (sal_uInt16)nFmtID, aFmtStr ); pPopup->InsertItem( (sal_uInt16)nFmtID, aFmtStr );
} }
......
...@@ -102,7 +102,7 @@ void SvxFontMenuControl::StateChanged( ...@@ -102,7 +102,7 @@ void SvxFontMenuControl::StateChanged(
if ( !pMenu->GetItemCount() ) if ( !pMenu->GetItemCount() )
FillMenu(); FillMenu();
const SvxFontItem* pFontItem = PTR_CAST( SvxFontItem, pState ); const SvxFontItem* pFontItem = PTR_CAST( SvxFontItem, pState );
String aFont; OUString aFont;
if ( pFontItem ) if ( pFontItem )
aFont = pFontItem->GetFamilyName(); aFont = pFontItem->GetFamilyName();
......
...@@ -276,8 +276,8 @@ namespace sdr ...@@ -276,8 +276,8 @@ namespace sdr
{ {
if((OBJ_OUTLINETEXT == rObj.GetTextKind()) && (SdrInventor == rObj.GetObjInventor())) if((OBJ_OUTLINETEXT == rObj.GetTextKind()) && (SdrInventor == rObj.GetObjInventor()))
{ {
String aNewStyleSheetName(GetStyleSheet()->GetName()); OUString aNewStyleSheetName(GetStyleSheet()->GetName());
aNewStyleSheetName.Erase(aNewStyleSheetName.Len() - 1, 1); aNewStyleSheetName = aNewStyleSheetName.copy(0, aNewStyleSheetName.getLength() - 1);
sal_Int16 nDepth = rOutliner.GetDepth(nPara); sal_Int16 nDepth = rOutliner.GetDepth(nPara);
aNewStyleSheetName += OUString::number( nDepth <= 0 ? 1 : nDepth + 1); aNewStyleSheetName += OUString::number( nDepth <= 0 ? 1 : nDepth + 1);
...@@ -600,11 +600,11 @@ namespace sdr ...@@ -600,11 +600,11 @@ namespace sdr
if(pExtendedHint if(pExtendedHint
&& SFX_STYLESHEET_MODIFIED == pExtendedHint->GetHint()) && SFX_STYLESHEET_MODIFIED == pExtendedHint->GetHint())
{ {
String aOldName(pExtendedHint->GetOldName()); OUString aOldName(pExtendedHint->GetOldName());
String aNewName(pExtendedHint->GetStyleSheet()->GetName()); OUString aNewName(pExtendedHint->GetStyleSheet()->GetName());
SfxStyleFamily eFamily = pExtendedHint->GetStyleSheet()->GetFamily(); SfxStyleFamily eFamily = pExtendedHint->GetStyleSheet()->GetFamily();
if(!aOldName.Equals(aNewName)) if(aOldName != aNewName)
{ {
sal_Int32 nText = rTextProvider.getTextCount(); sal_Int32 nText = rTextProvider.getTextCount();
while( --nText > 0 ) while( --nText > 0 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment