diff options
| author | Noel Grandin <noel@peralex.com> | 2014-11-03 14:03:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-11-05 08:44:19 +0200 |
| commit | 705c48d32eec0aa5180e60ca157daca4b154e4a3 (patch) | |
| tree | 97f43496f4b429a2b8d03b1e71cb2a1c33142a15 /sfx2/source/dialog | |
| parent | b7d8a58ff2698ffc6e22943f64aa97c5ea253bd9 (diff) | |
fdo#38835 strip out OUString globals
they are largely unnecessary these days, since our OUString infrastructure
gained optimised handling for static char constants.
Change-Id: I07f73484f82d0582252cb4324d4107c998432c37
Diffstat (limited to 'sfx2/source/dialog')
| -rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/dialog/filtergrouping.cxx | 16 |
2 files changed, 10 insertions, 12 deletions
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index c95842da425b..18da893e5823 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -132,9 +132,9 @@ namespace const OUString* GetLastFilterConfigId( FileDialogHelper::Context _eContext ) { - static const OUString aSD_EXPORT_IDENTIFIER( "SdExportLastFilter" ); - static const OUString aSI_EXPORT_IDENTIFIER( "SiExportLastFilter" ); - static const OUString aSW_EXPORT_IDENTIFIER( "SwExportLastFilter" ); + static const OUString aSD_EXPORT_IDENTIFIER("SdExportLastFilter"); + static const OUString aSI_EXPORT_IDENTIFIER("SiExportLastFilter"); + static const OUString aSW_EXPORT_IDENTIFIER("SwExportLastFilter"); const OUString* pRet = NULL; diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index b9af92d7c0f3..634d323f5e79 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -152,8 +152,8 @@ namespace sfx2 void lcl_ReadFilterClass( const OConfigurationNode& _rClassesNode, const OUString& _rLogicalClassName, FilterClass& /* [out] */ _rClass ) { - static const OUString sDisplaNameNodeName( "DisplayName" ); - static const OUString sSubFiltersNodeName( "Filters" ); + static const char sDisplaNameNodeName[] = "DisplayName"; + static const char sSubFiltersNodeName[] = "Filters"; // the description node for the current class OConfigurationNode aClassDesc = _rClassesNode.openNode( _rLogicalClassName ); @@ -403,11 +403,9 @@ namespace sfx2 static const sal_Unicode s_cWildcardSeparator( ';' ); - - const OUString& getSeparatorString() + static OUString getSeparatorString() { - static OUString s_sSeparatorString( &s_cWildcardSeparator, 1 ); - return s_sSeparatorString; + return OUString(";"); } @@ -1177,9 +1175,9 @@ namespace sfx2 const OUString& _rExtension, bool _bForOpen, FileDialogHelper_Impl& _rFileDlgImpl ) { - static OUString sAllFilter( "(*.*)" ); - static OUString sOpenBracket( " (" ); - static OUString sCloseBracket( ")" ); + static const char sAllFilter[] = "(*.*)"; + static const char sOpenBracket[] = " ("; + static const char sCloseBracket[] = ")"; OUString sRet = _rDisplayText; if ( sRet.indexOf( sAllFilter ) == -1 ) |