diff options
Diffstat (limited to 'sw')
| -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 |
5 files changed, 10 insertions, 13 deletions
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! |