diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-03-30 07:59:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-30 14:07:20 +0100 |
| commit | 1889728897e16800d58773a302eb5232a6fada76 (patch) | |
| tree | 9c2dc5ec0054da6705b37920c1e5f2f8a4f064da /xmloff | |
| parent | e60911f5fc6f76032942cd16c24a8f2673dae5d2 (diff) | |
remove static OUStrings from static_initialization_and_destruction chain
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/chart/SchXMLTableContext.cxx | 9 | ||||
| -rw-r--r-- | xmloff/source/text/txtparae.cxx | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx index 57841fa1c296..935ea69e2ca5 100644 --- a/xmloff/source/chart/SchXMLTableContext.cxx +++ b/xmloff/source/chart/SchXMLTableContext.cxx @@ -68,8 +68,8 @@ using ::rtl::OUString; namespace { -const OUString lcl_aLabelPrefix( RTL_CONSTASCII_USTRINGPARAM("label ")); -const OUString lcl_aCategoriesRange( RTL_CONSTASCII_USTRINGPARAM("categories")); +const char aLabelPrefix[] = "label "; +const char aCategoriesRange[] = "categories"; typedef ::std::multimap< ::rtl::OUString, ::rtl::OUString > lcl_tOriginalRangeToInternalRangeMap; @@ -116,6 +116,9 @@ void lcl_fillRangeMapping( sal_Int32 nRowOffset = ( rTable.bHasHeaderRow ? 1 : 0 ); sal_Int32 nColOffset = ( rTable.bHasHeaderColumn ? 1 : 0 ); + const OUString lcl_aCategoriesRange(aCategoriesRange); + const OUString lcl_aLabelPrefix(aLabelPrefix); + // Fill range mapping const size_t nTableRowCount( rTable.aData.size()); for( size_t nRow = 0; nRow < nTableRowCount; ++nRow ) @@ -901,6 +904,8 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary( lcl_fillRangeMapping( rTable, aRangeMap, eDataRowSource ); + const OUString lcl_aCategoriesRange(aCategoriesRange); + bool bCategoriesApplied = false; // translate ranges (using the map created before) for( tSchXMLLSequencesPerIndex::const_iterator aLSeqIt( rLSequencesPerIndex.begin()); diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 029fd97be203..522d43fd558e 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -225,11 +225,7 @@ namespace framebound_map_t m_vFrameBoundsOf; const Reference<XEnumerationAccess> m_xEnumAccess; void Fill(const filter_t& rFilter); - static const OUString our_sAnchorType; - static const OUString our_sAnchorFrame; }; - const OUString BoundFrames::our_sAnchorType(RTL_CONSTASCII_USTRINGPARAM("AnchorType")); - const OUString BoundFrames::our_sAnchorFrame(RTL_CONSTASCII_USTRINGPARAM("AnchorFrame")); class FieldParamExporter { @@ -340,6 +336,8 @@ void BoundFrames::Fill(const filter_t& rFilter) const Reference< XEnumeration > xEnum = m_xEnumAccess->createEnumeration(); if(!xEnum.is()) return; + const OUString our_sAnchorType(RTL_CONSTASCII_USTRINGPARAM("AnchorType")); + const OUString our_sAnchorFrame(RTL_CONSTASCII_USTRINGPARAM("AnchorFrame")); while(xEnum->hasMoreElements()) { Reference<XPropertySet> xPropSet(xEnum->nextElement(), UNO_QUERY); |