[Libreoffice-commits] core.git: writerfilter/source

[Justin Luth]

 writerfilter/source/dmapper/StyleSheetTable.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit e44addfd5d227123928d1295bb8582799aaac6a0
Author: Justin Luth <justin_luth at sil.org>
Date:   Tue Sep 13 16:56:38 2016 +0300

    writerfilter style: use emplace_back, avoiding typedef
    
    Change-Id: I106f94ad4b8c8711a563971cb43d71aa90b139f8
    Reviewed-on: https://gerrit.libreoffice.org/28868
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 081845f..ae00da4 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) );
                     }