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 /oox | |
| 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 'oox')
| -rw-r--r-- | oox/source/core/relations.cxx | 6 | ||||
| -rw-r--r-- | oox/source/core/xmlfilterbase.cxx | 6 | ||||
| -rw-r--r-- | oox/source/ole/axcontrol.cxx | 4 | ||||
| -rw-r--r-- | oox/source/ole/vbamodule.cxx | 2 |
4 files changed, 7 insertions, 11 deletions
diff --git a/oox/source/core/relations.cxx b/oox/source/core/relations.cxx index 5c75b3394cfe..b7a4faad8fed 100644 --- a/oox/source/core/relations.cxx +++ b/oox/source/core/relations.cxx @@ -40,14 +40,12 @@ OUString lclAppendFileName( const OUString& rPath, const OUString& rFileName ) OUString createOfficeDocRelationTypeTransitional(const OUString& rType) { - static const OUString aTransitionalBase("http://schemas.openxmlformats.org/officeDocument/2006/relationships/"); - return aTransitionalBase + rType; + return OUString("http://schemas.openxmlformats.org/officeDocument/2006/relationships/") + rType; } OUString createOfficeDocRelationTypeStrict(const OUString& rType) { - static const OUString aStrictBase("http://purl.oclc.org/ooxml/officeDocument/relationships/"); - return aStrictBase + rType; + return OUString("http://purl.oclc.org/ooxml/officeDocument/relationships/") + rType; } } diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index 8f1b99254917..18a443af0380 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -250,14 +250,12 @@ namespace { OUString getTransitionalRelationshipOfficeDocType(const OUString& rPart) { - static const OUString aBase("http://schemas.openxmlformats.org/officeDocument/2006/relationships/"); - return aBase + rPart; + return OUString("http://schemas.openxmlformats.org/officeDocument/2006/relationships/") + rPart; } OUString getStrictRelationshipOfficeDocType(const OUString& rPart) { - static const OUString aBase("http://purl.oclc.org/ooxml/officeDocument/relationships/"); - return aBase + rPart; + return OUString("http://purl.oclc.org/ooxml/officeDocument/relationships/") + rPart; } } diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index cb9e7d25b859..76cc98927d87 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -2520,8 +2520,8 @@ HtmlSelectModel::HtmlSelectModel() bool HtmlSelectModel::importBinaryModel( BinaryInputStream& rInStrm ) { - static OUString sMultiple( "<SELECT MULTIPLE" ); - static OUString sSelected( "OPTION SELECTED" ); + static const char sMultiple[] = "<SELECT MULTIPLE"; + static const char sSelected[] = "OPTION SELECTED"; OUString sStringContents = rInStrm.readUnicodeArray( rInStrm.size() ); diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx index b6794f319e39..86689ebe6332 100644 --- a/oox/source/ole/vbamodule.cxx +++ b/oox/source/ole/vbamodule.cxx @@ -144,7 +144,7 @@ void VbaModule::createEmptyModule( const Reference< container::XNameContainer >& OUString VbaModule::readSourceCode( StorageBase& rVbaStrg ) const { OUStringBuffer aSourceCode; - const static OUString sUnmatchedRemovedTag( "Rem removed unmatched Sub/End: " ); + static const char sUnmatchedRemovedTag[] = "Rem removed unmatched Sub/End: "; if( !maStreamName.isEmpty() && (mnOffset != SAL_MAX_UINT32) ) { BinaryXInputStream aInStrm( rVbaStrg.openInputStream( maStreamName ), true ); |