diff options
| author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-02-08 09:06:10 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-02-08 14:57:16 +0000 |
| commit | 9e310cc32923ceb4b18d97ce68d54a339b935f01 (patch) | |
| tree | d79b44b80c15f6bdb3116db4c9b6955a9e6cb4c9 /sfx2/source | |
| parent | 9c427991d9658a870ee0eb1bdc4cd3b393c93fd5 (diff) | |
fdo#38838 Some removal/replacement of the String/UniString with OUString
Change-Id: I6daea312198fae3a9717bd8d4fea6371aa4cd275
Reviewed-on: https://gerrit.libreoffice.org/1962
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/dialog/mgetempl.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/dialog/styledlg.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/doc/objcont.cxx | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index f07725866594..b28972086335 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -584,7 +584,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) if ( pStyle->HasFollowSupport() && aFollowLb.IsEnabled() ) { - const String aFollowEntry( aFollowLb.GetSelectEntry() ); + const OUString aFollowEntry( aFollowLb.GetSelectEntry() ); if ( pStyle->GetFollow() != aFollowEntry ) { @@ -601,10 +601,10 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) if ( aBaseLb.IsEnabled() ) { - String aParentEntry( aBaseLb.GetSelectEntry() ); + OUString aParentEntry( aBaseLb.GetSelectEntry() ); if ( SfxResId(STR_NONE).toString().equals(aParentEntry) || aParentEntry == pStyle->GetName() ) - aParentEntry.Erase(); + aParentEntry = OUString(); if ( pStyle->GetParent() != aParentEntry ) { diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index 5598b08f65ac..bf60f44eadf2 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -64,9 +64,7 @@ SfxStyleDialog::SfxStyleDialog SetCurPageId( ID_TABPAGE_MANAGESTYLES ); else { - String sTxt( GetText() ); - sTxt += DEFINE_CONST_UNICODE(": ") ; - sTxt += rStyle.GetName(); + OUString sTxt = OUString(GetText()) + ": " + rStyle.GetName(); SetText( sTxt ); } delete pExampleSet; // in SfxTabDialog::Ctor() already created diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 6f816aa814e1..cafd12747a63 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -487,7 +487,7 @@ sal_Bool SfxObjectShell::Insert(SfxObjectShell &rSource, } // if such a template already exists: delete! - String aOldName(pHisSheet->GetName()); + OUString aOldName(pHisSheet->GetName()); SfxStyleFamily eOldFamily = pHisSheet->GetFamily(); SfxStyleSheetBase* pExist = pMyPool->Find(aOldName, eOldFamily); @@ -600,8 +600,8 @@ sal_Bool SfxObjectShell::Remove SetOrganizerSearchMask(pMyPool); SfxStyleSheetBase* pMySheet = (*pMyPool)[nIdx2]; - String aName(pMySheet->GetName()); - String aEmpty; + OUString aName(pMySheet->GetName()); + OUString aEmpty; SfxStyleFamily eFamily = pMySheet->GetFamily(); pMyPool->Remove(pMySheet); bRet = sal_True; |