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 /sdext | |
| 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 'sdext')
| -rw-r--r-- | sdext/source/minimizer/configurationaccess.cxx | 5 | ||||
| -rw-r--r-- | sdext/source/pdfimport/sax/saxattrlist.cxx | 5 | ||||
| -rw-r--r-- | sdext/source/pdfimport/wrapper/wrapper.cxx | 8 |
3 files changed, 8 insertions, 10 deletions
diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx index 9dce6f12fbbe..d95bc522219f 100644 --- a/sdext/source/minimizer/configurationaccess.cxx +++ b/sdext/source/minimizer/configurationaccess.cxx @@ -33,10 +33,9 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; -static const OUString& GetPathToConfigurationRoot (void) +static OUString GetPathToConfigurationRoot() { - static const OUString sPathToConfigurationRoot ("org.openoffice.Office.PresentationMinimizer"); - return sPathToConfigurationRoot; + return OUString("org.openoffice.Office.PresentationMinimizer"); } void OptimizerSettings::LoadSettingsFromConfiguration( const Reference< XNameAccess >& rSettings ) diff --git a/sdext/source/pdfimport/sax/saxattrlist.cxx b/sdext/source/pdfimport/sax/saxattrlist.cxx index f42a70369c05..2ec4da5ff431 100644 --- a/sdext/source/pdfimport/sax/saxattrlist.cxx +++ b/sdext/source/pdfimport/sax/saxattrlist.cxx @@ -48,10 +48,9 @@ SaxAttrList::~SaxAttrList() } namespace { - static const OUString& getCDATAString() + static OUString getCDATAString() { - static OUString aStr( "CDATA" ); - return aStr; + return OUString( "CDATA" ); } } diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index 0462c286bc71..79d64fdf1bbf 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -681,10 +681,10 @@ uno::Sequence<beans::PropertyValue> Parser::readImageImpl() static const OString aPbmMarker( "PBM" ); static const OString aPpmMarker( "PPM" ); static const OString aPngMarker( "PNG" ); - static const OUString aJpegFile( "DUMMY.JPEG" ); - static const OUString aPbmFile( "DUMMY.PBM" ); - static const OUString aPpmFile( "DUMMY.PPM" ); - static const OUString aPngFile( "DUMMY.PNG" ); + static const char aJpegFile[] = "DUMMY.JPEG"; + static const char aPbmFile[] = "DUMMY.PBM"; + static const char aPpmFile[] = "DUMMY.PPM"; + static const char aPngFile[] = "DUMMY.PNG"; OString aToken = readNextToken(); const sal_Int32 nImageSize( readInt32() ); |