diff options
| author | Justin Luth <justin_luth@sil.org> | 2016-09-13 16:56:38 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-09-14 08:15:45 +0000 |
| commit | e44addfd5d227123928d1295bb8582799aaac6a0 (patch) | |
| tree | 5a833bf0b7c6d0823748e9ed0c2bc0ef9be55274 /writerfilter | |
| parent | 7b784e4e3927d91a96cd0b54fc43c9b488822e47 (diff) | |
writerfilter style: use emplace_back, avoiding typedef
Change-Id: I106f94ad4b8c8711a563971cb43d71aa90b139f8
Reviewed-on: https://gerrit.libreoffice.org/28868
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 081845fd841d..ae00da431bd3 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -51,7 +51,6 @@ namespace dmapper { typedef ::std::map< OUString, OUString> StringPairMap_t; -typedef ::std::pair<OUString, uno::Reference< style::XStyle>> ParentOfStylePair_t; StyleSheetEntry::StyleSheetEntry() : @@ -917,7 +916,7 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable ) xStyleFamilies->getByName("NumberingStyles") >>= xNumberingStyles; if(xCharStyles.is() && xParaStyles.is()) { - std::vector< ParentOfStylePair_t > aMissingParent; + std::vector< ::std::pair<OUString, uno::Reference<style::XStyle>> > aMissingParent; std::vector<beans::PropertyValue> aTableStylesVec; std::vector< StyleSheetEntryPtr >::iterator aIt = m_pImpl->m_aStyleSheetEntries.begin(); while( aIt != m_pImpl->m_aStyleSheetEntries.end() ) @@ -1152,7 +1151,7 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable ) { const OUString sParentStyle = xStyle->getParentStyle(); if( !sParentStyle.isEmpty() && !xStyles->hasByName( sParentStyle ) ) - aMissingParent.push_back( ParentOfStylePair_t(sParentStyle, xStyle) ); + aMissingParent.emplace_back( sParentStyle, xStyle ); xStyles->insertByName( sConvertedStyleName, uno::makeAny( xStyle) ); } |