diff options
author | Noel Grandin <noel@peralex.com> | 2015-08-03 12:34:22 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-08-03 12:16:33 +0000 |
commit | a4fd6c4f9e5b010f00ba7cc84a4b2d5d8950813a (patch) | |
tree | 6b2aa80c50d3937cfe17053a5da48f19855dcb68 /writerfilter | |
parent | 5256953397b495e9271cec92cc78514d772acaf5 (diff) |
inline some use-once typedefs
Change-Id: I02cbbba56a2ad83e0ac3d806265a7e0d6a29594d
Reviewed-on: https://gerrit.libreoffice.org/17495
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'writerfilter')
11 files changed, 10 insertions, 17 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 4493b6886881..267dc54a874a 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1907,7 +1907,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) if( pProperties.get()) { - SectionColumnHandlerPtr pSectHdl( new SectionColumnHandler ); + std::shared_ptr< SectionColumnHandler > pSectHdl( new SectionColumnHandler ); pProperties->resolve(*pSectHdl); if(pSectionContext && !m_pImpl->isInIndexContext()) { @@ -1968,7 +1968,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); if( pProperties.get( ) && pSectionContext ) { - PageBordersHandlerPtr pHandler( new PageBordersHandler ); + std::shared_ptr< PageBordersHandler > pHandler( new PageBordersHandler ); pProperties->resolve( *pHandler ); // Set the borders to the context and apply them to the styles @@ -2462,7 +2462,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) case NS_ooxml::LN_stylisticSets_stylisticSets: case NS_ooxml::LN_cntxtAlts_cntxtAlts: { - TextEffectsHandlerPtr pTextEffectsHandlerPtr( new TextEffectsHandler(nSprmId) ); + std::shared_ptr<TextEffectsHandler> pTextEffectsHandlerPtr( new TextEffectsHandler(nSprmId) ); boost::optional<PropertyIds> aPropertyId = pTextEffectsHandlerPtr->getGrabBagPropertyId(); if(aPropertyId) { diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 519f8e5eb480..8dc1856f6ceb 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -266,7 +266,6 @@ struct AnnotationPosition css::uno::Reference<css::text::XTextRange> m_xStart; css::uno::Reference<css::text::XTextRange> m_xEnd; }; -typedef std::unordered_map< sal_Int32, AnnotationPosition > AnnotationPositions_t; struct LineNumberSettings { @@ -434,7 +433,7 @@ private: //annotation import css::uno::Reference< css::beans::XPropertySet > m_xAnnotationField; sal_Int32 m_nAnnotationId; - AnnotationPositions_t m_aAnnotationPositions; + std::unordered_map< sal_Int32, AnnotationPosition > m_aAnnotationPositions; void GetCurrentLocale(css::lang::Locale& rLocale); void SetNumberFormat(const OUString& rCommand, css::uno::Reference<css::beans::XPropertySet> const& xPropertySet, bool bDetectFormat = false); diff --git a/writerfilter/source/dmapper/LatentStyleHandler.hxx b/writerfilter/source/dmapper/LatentStyleHandler.hxx index fd7bf6a431f1..5759785e8c8e 100644 --- a/writerfilter/source/dmapper/LatentStyleHandler.hxx +++ b/writerfilter/source/dmapper/LatentStyleHandler.hxx @@ -36,7 +36,6 @@ public: std::vector<css::beans::PropertyValue> getAttributes() const; }; -typedef std::shared_ptr<LatentStyleHandler> LatentStyleHandlerPtr; } // namespace dmapper } // namespace writerfilter diff --git a/writerfilter/source/dmapper/PageBordersHandler.hxx b/writerfilter/source/dmapper/PageBordersHandler.hxx index 7c2d3adf72c8..ce3660ccafbe 100644 --- a/writerfilter/source/dmapper/PageBordersHandler.hxx +++ b/writerfilter/source/dmapper/PageBordersHandler.hxx @@ -68,7 +68,6 @@ public: }; void SetBorders( SectionPropertyMap* pSectContext ); }; -typedef std::shared_ptr< PageBordersHandler > PageBordersHandlerPtr; } } diff --git a/writerfilter/source/dmapper/SectionColumnHandler.hxx b/writerfilter/source/dmapper/SectionColumnHandler.hxx index bd63179c4551..c8ab4f15b34c 100644 --- a/writerfilter/source/dmapper/SectionColumnHandler.hxx +++ b/writerfilter/source/dmapper/SectionColumnHandler.hxx @@ -59,7 +59,7 @@ public: const std::vector<_Column>& GetColumns() const { return m_aCols;} }; -typedef std::shared_ptr< SectionColumnHandler > SectionColumnHandlerPtr; + }} #endif diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index cdc0e59f38ce..c062917dc8fa 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -444,7 +444,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val) if ( nType == STYLE_TYPE_TABLE ) { StyleSheetEntryPtr pEntry = m_pImpl->m_pCurrentEntry; - TableStyleSheetEntryPtr pTableEntry( new TableStyleSheetEntry( *pEntry.get( ), this ) ); + std::shared_ptr<TableStyleSheetEntry> pTableEntry( new TableStyleSheetEntry( *pEntry.get( ), this ) ); m_pImpl->m_pCurrentEntry = pTableEntry; } else @@ -732,7 +732,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm) writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); if (pProperties.get()) { - LatentStyleHandlerPtr pLatentStyleHandler(new LatentStyleHandler()); + std::shared_ptr<LatentStyleHandler> pLatentStyleHandler(new LatentStyleHandler()); pProperties->resolve(*pLatentStyleHandler); beans::PropertyValue aValue; aValue.Name = "lsdException"; @@ -750,7 +750,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm) if (!m_pImpl->m_pCurrentEntry) break; - TablePropertiesHandlerPtr pTblHandler(new TablePropertiesHandler()); + std::shared_ptr<TablePropertiesHandler> pTblHandler(new TablePropertiesHandler()); pTblHandler->SetProperties( m_pImpl->m_pCurrentEntry->pProperties ); if ( !pTblHandler->sprm( rSprm ) ) { diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx index ba056309a8fc..7296ca3c13c0 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.hxx +++ b/writerfilter/source/dmapper/StyleSheetTable.hxx @@ -152,7 +152,7 @@ public: protected: PropertyMapPtr GetLocalPropertiesFromMask( sal_Int32 nMask ); }; -typedef std::shared_ptr<TableStyleSheetEntry> TableStyleSheetEntryPtr; + }} diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx b/writerfilter/source/dmapper/TDefTableHandler.hxx index 18fd4241e1bb..0765f66d1739 100644 --- a/writerfilter/source/dmapper/TDefTableHandler.hxx +++ b/writerfilter/source/dmapper/TDefTableHandler.hxx @@ -79,7 +79,6 @@ public: static OUString getBorderTypeString(sal_Int32 nType); static OUString getThemeColorTypeString(sal_Int32 nType); }; -typedef std::shared_ptr< TDefTableHandler > TDefTableHandlerPtr; }} #endif diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx index 4db5a8c167b3..5d42d0005c72 100644 --- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx +++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx @@ -243,7 +243,7 @@ namespace dmapper { if( pProperties.get()) { //in OOXML there's one set of borders at each cell (if there is any) - TDefTableHandlerPtr pTDefTableHandler( new TDefTableHandler()); + std::shared_ptr< TDefTableHandler > pTDefTableHandler( new TDefTableHandler()); if (m_pCurrentInteropGrabBag) pTDefTableHandler->enableInteropGrabBag("tcBorders"); pProperties->resolve( *pTDefTableHandler ); diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.hxx b/writerfilter/source/dmapper/TablePropertiesHandler.hxx index cc1d72c967af..1532f7f2874a 100644 --- a/writerfilter/source/dmapper/TablePropertiesHandler.hxx +++ b/writerfilter/source/dmapper/TablePropertiesHandler.hxx @@ -86,7 +86,6 @@ private: m_pCurrentProperties->InsertProps(pProps); }; }; -typedef std::shared_ptr<TablePropertiesHandler> TablePropertiesHandlerPtr; } } diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/writerfilter/source/dmapper/TextEffectsHandler.hxx index cce0872bb283..a0cddf3c8c51 100644 --- a/writerfilter/source/dmapper/TextEffectsHandler.hxx +++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx @@ -69,8 +69,6 @@ public: }; -typedef std::shared_ptr<TextEffectsHandler> TextEffectsHandlerPtr; - }} #endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TEXTEFFECTSHANDLER_HXX |