diff options
author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-03-02 15:40:14 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-07 19:50:37 +0000 |
commit | 3bc29af446fd1d9bd267ade1b1a5fca725ca8166 (patch) | |
tree | 2bde3b590111a78b5020f419f9f8471029f12fdc | |
parent | e6288a5d889da7db5bf23174f85c29ccfcaa44d5 (diff) |
fdo#38838 Replaced some use of (Uni)String with OUString.
Change-Id: Iad623c9300919fbae34279268a5a720f978c6434
Reviewed-on: https://gerrit.libreoffice.org/2514
Reviewed-by: Joren De Cuyper <joren.libreoffice@telenet.be>
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
-rw-r--r-- | sd/inc/stlsheet.hxx | 2 | ||||
-rw-r--r-- | sd/source/core/drawdoc3.cxx | 2 | ||||
-rw-r--r-- | sd/source/core/stlpool.cxx | 14 | ||||
-rw-r--r-- | sd/source/core/stlsheet.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/func/futempl.cxx | 2 | ||||
-rw-r--r-- | svl/inc/svl/style.hxx | 8 | ||||
-rw-r--r-- | svl/source/items/style.cxx | 4 | ||||
-rw-r--r-- | sw/inc/docstyle.hxx | 4 | ||||
-rw-r--r-- | sw/inc/swtypes.hxx | 1 | ||||
-rw-r--r-- | sw/source/core/bastyp/swtypes.cxx | 1 | ||||
-rw-r--r-- | sw/source/core/fields/fldbas.cxx | 5 | ||||
-rw-r--r-- | sw/source/ui/app/docstyle.cxx | 12 | ||||
-rw-r--r-- | tools/source/rc/resmgr.cxx | 2 | ||||
-rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 8 |
14 files changed, 33 insertions, 36 deletions
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index 191bcf97b471..84762222a7b7 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -61,7 +61,7 @@ public: virtual bool HasParentSupport() const; virtual bool HasClearParentSupport() const; virtual bool SetName( const UniString& ); - virtual void SetHelpId( const String& r, sal_uLong nId ); + virtual void SetHelpId( const OUString& r, sal_uLong nId ); void AdjustToFontHeight(SfxItemSet& rSet, sal_Bool bOnlyMissingItems = sal_True); diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index b811e325dd7a..2389beb6a7ab 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -1439,7 +1439,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, else { // create new style - String aHelpFile; + OUString aHelpFile; pMySheet = static_cast<SfxStyleSheet*>( &mxStyleSheetPool->Make(aName, SD_STYLE_FAMILY_MASTERPAGE, pHisSheet->GetMask()) ); pMySheet->SetHelpId( aHelpFile, pHisSheet->GetHelpId(aHelpFile) ); pMySheet->GetItemSet().ClearItem(0); // Delete all diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 8fb287fc21a4..86c6915d1763 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -193,7 +193,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo * outline levels **************************************************************************/ String aName(SdResId(STR_LAYOUT_OUTLINE)); - String aHelpFile; + OUString aHelpFile; SfxStyleSheetBase* pParent = NULL; SvxLRSpaceItem aSvxLRSpaceItem( EE_PARA_LRSPACE ); @@ -599,7 +599,7 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets) { - String aHelpFile; + OUString aHelpFile; sal_uInt32 nCount = rSourcePool.aStyles.size(); @@ -659,7 +659,7 @@ void SdStyleSheetPool::CopyLayoutSheets(const String& rLayoutName, SdStyleSheetP std::vector<String> aNameList; CreateLayoutSheetNames(rLayoutName,aNameList); - String sEmpty; + OUString sEmpty; for (std::vector<String>::const_iterator it = aNameList.begin(); it != aNameList.end(); ++it) { pSheet = Find(*it, SD_STYLE_FAMILY_MASTERPAGE); @@ -784,7 +784,7 @@ void SdStyleSheetPool::CreateLayoutSheetList(const String& rLayoutName, SdStyleS void SdStyleSheetPool::CreatePseudosIfNecessary() { String aName; - String aHelpFile; + OUString aHelpFile; SfxStyleSheetBase* pSheet = NULL; SfxStyleSheetBase* pParent = NULL; @@ -869,7 +869,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary() void SdStyleSheetPool::UpdateStdNames() { - String aHelpFile; + OUString aHelpFile; sal_uInt32 nCount = aStyles.size(); std::vector<SfxStyleSheetBase*> aEraseList; @@ -880,7 +880,7 @@ void SdStyleSheetPool::UpdateStdNames() if( !pStyle->IsUserDefined() ) { String aOldName = pStyle->GetName(); - sal_uLong nHelpId = pStyle->GetHelpId( aHelpFile ); + sal_uLong nHelpId = pStyle->GetHelpId( aHelpFile ); SfxStyleFamily eFam = pStyle->GetFamily(); sal_Bool bHelpKnown = sal_True; @@ -972,7 +972,7 @@ void SdStyleSheetPool::UpdateStdNames() void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet, Font& rBulletFont ) { - String aHelpFile; + OUString aHelpFile; sal_uLong nHelpId = pSheet->GetHelpId( aHelpFile ); SfxItemSet& rSet = pSheet->GetItemSet(); diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 08540496fedd..52a60e509703 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -662,7 +662,7 @@ bool SdStyleSheet::SetName( const UniString& rName ) // -------------------------------------------------------------------- -void SdStyleSheet::SetHelpId( const String& r, sal_uLong nId ) +void SdStyleSheet::SetHelpId( const OUString& r, sal_uLong nId ) { SfxStyleSheet::SetHelpId( r, nId ); @@ -1073,7 +1073,7 @@ void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, con if( (pEntry->nWID == EE_PARA_NUMBULLET) && (GetFamily() == SD_STYLE_FAMILY_MASTERPAGE) ) { - String aStr; + OUString aStr; const sal_uInt32 nTempHelpId = GetHelpId( aStr ); if( (nTempHelpId >= HID_PSEUDOSHEET_OUTLINE2) && (nTempHelpId <= HID_PSEUDOSHEET_OUTLINE9) ) diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index da0c3ad39aa0..087d20e2f9f1 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -238,7 +238,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) if ( pStyleSheet && pStyleSheet->GetFamily() != SD_STYLE_FAMILY_PSEUDO ) { SfxStyleSheet* pOldStyleSheet = mpView->GetStyleSheet(); - String aStr; + OUString aStr; if( // if the object had no style sheet, allow all !pOldStyleSheet || diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx index 18c0cebcf0fb..e1c1b554ee36 100644 --- a/svl/inc/svl/style.hxx +++ b/svl/inc/svl/style.hxx @@ -83,8 +83,8 @@ protected: SfxStyleFamily nFamily; // Familie UniString aName, aParent, aFollow; - rtl::OUString maDisplayName; - String aHelpFile; // Name der Hilfedatei + OUString maDisplayName; + OUString aHelpFile; // Name der Hilfedatei SfxItemSet* pSet; // ItemSet sal_uInt16 nMask; // Flags @@ -138,8 +138,8 @@ public: virtual sal_Bool IsHidden() const { return bHidden; } virtual void SetHidden( sal_Bool bValue ); - virtual sal_uLong GetHelpId( String& rFile ); - virtual void SetHelpId( const String& r, sal_uLong nId ); + virtual sal_uLong GetHelpId( OUString& rFile ); + virtual void SetHelpId( const OUString& r, sal_uLong nId ); virtual SfxItemSet& GetItemSet(); virtual sal_uInt16 GetVersion() const; diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 614bee831e68..eec3036b22fe 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -284,13 +284,13 @@ SfxItemSet& SfxStyleSheetBase::GetItemSet() // Hilfe-Datei und -ID setzen und abfragen -sal_uLong SfxStyleSheetBase::GetHelpId( String& rFile ) +sal_uLong SfxStyleSheetBase::GetHelpId( OUString& rFile ) { rFile = aHelpFile; return nHelpId; } -void SfxStyleSheetBase::SetHelpId( const String& rFile, sal_uLong nId ) +void SfxStyleSheetBase::SetHelpId( const OUString& rFile, sal_uLong nId ) { aHelpFile = rFile; nHelpId = nId; diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index 42d1b9206c72..7932edc63a61 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -114,8 +114,8 @@ public: virtual const String& GetParent() const; virtual const String& GetFollow() const; - virtual sal_uLong GetHelpId( String& rFile ); - virtual void SetHelpId( const String& r, sal_uLong nId ); + virtual sal_uLong GetHelpId( OUString& rFile ); + virtual void SetHelpId( const OUString& r, sal_uLong nId ); /** Preset the members without physical access. Used by StyleSheetPool. */ diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 9c3c18bd469d..c24008a0010d 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -81,6 +81,7 @@ const SwTwips lMinBorder = 1134; // Constant strings. SW_DLLPUBLIC extern String aEmptyStr; // "" +SW_DLLPUBLIC extern OUString aEmptyOUStr; // remove once aEmptyStr can be changed to OUString SW_DLLPUBLIC extern OUString aDotStr; // '.' // For inserting of captions (what and where to insert). diff --git a/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx index 97329e9a7131..d4a49a9cbd3d 100644 --- a/sw/source/core/bastyp/swtypes.cxx +++ b/sw/source/core/bastyp/swtypes.cxx @@ -48,6 +48,7 @@ using namespace com::sun::star; String aEmptyStr; // constant string +OUString aEmptyOUStr; // remove once aEmptyStr can be changed to OUString OUString aDotStr('.'); // constant string IMPL_FIXEDMEMPOOL_NEWDEL( SwAttrSet ) diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index 5671cc02849c..813434838958 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -141,11 +141,6 @@ SwFieldType::SwFieldType( sal_uInt16 nWhichId ) { } -namespace -{ - rtl::OUString aEmptyOUStr; -} - const rtl::OUString& SwFieldType::GetName() const { return aEmptyOUStr; diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx index 4de30f3ecb9d..a2c124e51485 100644 --- a/sw/source/ui/app/docstyle.cxx +++ b/sw/source/ui/app/docstyle.cxx @@ -1705,7 +1705,7 @@ sal_Bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType ) if( pDesc->GetPoolHlpFileId() != UCHAR_MAX ) aHelpFile = *rDoc.GetDocPattern( pDesc->GetPoolHlpFileId() ); else - aHelpFile.Erase(); + aHelpFile = ""; } else if( !bCreate ) nPoolId = SwStyleNameMapper::GetPoolIdFromUIName( aName, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC ); @@ -1733,7 +1733,7 @@ sal_Bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType ) if( pNumRule->GetPoolHlpFileId() != UCHAR_MAX ) aHelpFile = *rDoc.GetDocPattern( pNumRule->GetPoolHlpFileId() ); else - aHelpFile.Erase(); + aHelpFile = ""; } else if( !bCreate ) nPoolId = SwStyleNameMapper::GetPoolIdFromUIName( aName, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE ); @@ -1778,7 +1778,7 @@ sal_Bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType ) if( pFmt->GetPoolHlpFileId() != UCHAR_MAX ) aHelpFile = *rDoc.GetDocPattern( pFmt->GetPoolHlpFileId() ); else - aHelpFile.Erase(); + aHelpFile = ""; if( RES_CONDTXTFMTCOLL == pFmt->Which() ) _nMask |= SWSTYLEBIT_CONDCOLL; @@ -1969,13 +1969,13 @@ bool SwDocStyleSheet::IsUsed() const } -sal_uLong SwDocStyleSheet::GetHelpId( String& rFile ) +sal_uLong SwDocStyleSheet::GetHelpId( OUString& rFile ) { sal_uInt16 nId = 0; sal_uInt16 nPoolId = 0; unsigned char nFileId = UCHAR_MAX; - rFile = rtl::OUString("swrhlppi.hlp"); + rFile = "swrhlppi.hlp"; const SwFmt* pTmpFmt = 0; switch( nFamily ) @@ -2069,7 +2069,7 @@ sal_uLong SwDocStyleSheet::GetHelpId( String& rFile ) } -void SwDocStyleSheet::SetHelpId( const String& r, sal_uLong nId ) +void SwDocStyleSheet::SetHelpId( const OUString& r, sal_uLong nId ) { sal_uInt8 nFileId = static_cast< sal_uInt8 >(rDoc.SetDocPattern( r )); sal_uInt16 nHId = static_cast< sal_uInt16 >(nId); //!! SFX changed over to ULONG arbitrarily! diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 4fe8e82f13ed..e8c9db7c67ea 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -1627,7 +1627,7 @@ OUString ResMgr::ReadStringWithoutHook() if( (rTop.Flags & RC_NOTFOUND) ) { #if OSL_DEBUG_LEVEL > 0 - aRet = OUString("<resource not found>"); + aRet = "<resource not found>"; #endif } else diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 3df9f648e8a2..63c71a09e9e0 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -1461,16 +1461,16 @@ void ImplGetLogFontFromFontSelect( HDC hDC, LOGFONTW& rLogFont, bool /*bTestVerticalAvail*/ ) { - UniString aName; + OUString aName; if ( pFont->mpFontData ) aName = pFont->mpFontData->GetFamilyName(); else aName = pFont->GetFamilyName().GetToken( 0 ); - UINT nNameLen = aName.Len(); + UINT nNameLen = aName.getLength(); if ( nNameLen > (sizeof( rLogFont.lfFaceName )/sizeof( wchar_t ))-1 ) nNameLen = (sizeof( rLogFont.lfFaceName )/sizeof( wchar_t ))-1; - memcpy( rLogFont.lfFaceName, aName.GetBuffer(), nNameLen*sizeof( wchar_t ) ); + memcpy( rLogFont.lfFaceName, aName.getStr(), nNameLen*sizeof( wchar_t ) ); rLogFont.lfFaceName[nNameLen] = 0; if( !pFont->mpFontData ) @@ -1520,7 +1520,7 @@ void ImplGetLogFontFromFontSelect( HDC hDC, if( !bAvailable ) { // restore non-vertical name if not vertical mode isn't available - memcpy( &rLogFont.lfFaceName[0], aName.GetBuffer(), nNameLen*sizeof(wchar_t) ); + memcpy( &rLogFont.lfFaceName[0], aName.getStr(), nNameLen*sizeof(wchar_t) ); if( nNameLen < LF_FACESIZE ) rLogFont.lfFaceName[nNameLen] = '\0'; } |