diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-04 08:56:11 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-04 08:56:11 +0200 |
commit | c9bb48386bad7d2a40e6958883328145ae439cad (patch) | |
tree | 8576ed314b2d219fdd96b8c1990f16fb70847a54 /writerfilter | |
parent | 9865440d217d975206a3f91612f0666312bc8fd8 (diff) |
Revert "new loplugin typedefparam"
This reverts commit 9865440d217d975206a3f91612f0666312bc8fd8.
This is not ready to land yet, seems like the latest update
of the logic reveals a bunch more places I need to fix before it can land.
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/BorderHandler.hxx | 5 | ||||
-rw-r--r-- | writerfilter/source/dmapper/CellColorHandler.hxx | 3 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper.hxx | 9 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableManager.cxx | 6 | ||||
-rw-r--r-- | writerfilter/source/dmapper/PropertyMap.hxx | 7 |
5 files changed, 12 insertions, 18 deletions
diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx index b986b2ed997a..9d8001d51050 100644 --- a/writerfilter/source/dmapper/BorderHandler.hxx +++ b/writerfilter/source/dmapper/BorderHandler.hxx @@ -19,10 +19,9 @@ #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_BORDERHANDLER_HXX #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_BORDERHANDLER_HXX -#include <memory> #include <vector> #include "LoggedResources.hxx" -#include "PropertyMap.hxx" +#include <memory> #include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <o3tl/enumarray.hxx> @@ -68,7 +67,7 @@ public: explicit BorderHandler( bool bOOXML ); virtual ~BorderHandler() override; - PropertyMapPtr getProperties(); + ::tools::SvRef<PropertyMap> getProperties(); css::table::BorderLine2 getBorderLine(); sal_Int32 getLineDistance() const { return m_nLineDistance;} bool getShadow() { return m_bShadow;} diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx b/writerfilter/source/dmapper/CellColorHandler.hxx index 8e77c1c080be..fb72be4262bb 100644 --- a/writerfilter/source/dmapper/CellColorHandler.hxx +++ b/writerfilter/source/dmapper/CellColorHandler.hxx @@ -20,7 +20,6 @@ #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_CELLCOLORHANDLER_HXX #include "LoggedResources.hxx" -#include "PropertyMap.hxx" #include <memory> #include <vector> @@ -55,7 +54,7 @@ public: CellColorHandler( ); virtual ~CellColorHandler() override; - TablePropertyMapPtr getProperties(); + ::tools::SvRef<TablePropertyMap> getProperties(); void setOutputFormat( OutputFormat format ) { m_OutputFormat = format; } diff --git a/writerfilter/source/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx index 78e4cf535bbd..e6b082cfcd47 100644 --- a/writerfilter/source/dmapper/DomainMapper.hxx +++ b/writerfilter/source/dmapper/DomainMapper.hxx @@ -21,7 +21,6 @@ #include <dmapper/DomainMapperFactory.hxx> #include "LoggedResources.hxx" -#include "PropertyMap.hxx" #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/style/TabAlign.hpp> @@ -65,8 +64,6 @@ class StyleSheetTable; class GraphicZOrderHelper; class GraphicNamingHelper; -typedef tools::SvRef<StyleSheetTable> StyleSheetTablePtr; - class DomainMapper : public LoggedProperties, public LoggedTable, public BinaryObj, public LoggedStream { @@ -89,9 +86,9 @@ public: virtual void data(const sal_uInt8* buf, size_t len, writerfilter::Reference<Properties>::Pointer_t ref) override; - void sprmWithProps( Sprm& sprm, const PropertyMapPtr& pContext ); + void sprmWithProps( Sprm& sprm, const ::tools::SvRef<PropertyMap>& pContext ); - void PushStyleSheetProperties( const PropertyMapPtr& pStyleProperties, bool bAffectTableMngr = false ); + void PushStyleSheetProperties( const ::tools::SvRef<PropertyMap>& pStyleProperties, bool bAffectTableMngr = false ); void PopStyleSheetProperties( bool bAffectTableMngr = false ); void PushListProperties( const ::tools::SvRef<PropertyMap>& pListProperties ); @@ -103,7 +100,7 @@ public: css::uno::Reference<css::text::XTextRange> GetCurrentTextRange(); OUString getOrCreateCharStyle( PropertyValueVector_t& rCharProperties, bool bAlwaysCreate ); - StyleSheetTablePtr const & GetStyleSheetTable( ); + tools::SvRef< StyleSheetTable > const & GetStyleSheetTable( ); GraphicZOrderHelper* graphicZOrderHelper(); GraphicNamingHelper& GetGraphicNamingHelper(); diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 74ca53ab814f..20d6fb60b3a9 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -389,7 +389,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) return bRet; } -DomainMapperTableManager::IntVectorPtr const & DomainMapperTableManager::getCurrentGrid( ) +std::shared_ptr< vector<sal_Int32> > const & DomainMapperTableManager::getCurrentGrid( ) { return m_aTableGrid.back( ); } @@ -399,12 +399,12 @@ bool DomainMapperTableManager::hasCurrentSpans() const return !m_aGridSpans.empty(); } -DomainMapperTableManager::IntVectorPtr const & DomainMapperTableManager::getCurrentSpans( ) +std::shared_ptr< vector< sal_Int32 > > const & DomainMapperTableManager::getCurrentSpans( ) { return m_aGridSpans.back( ); } -DomainMapperTableManager::IntVectorPtr const & DomainMapperTableManager::getCurrentCellWidths( ) +std::shared_ptr< vector< sal_Int32 > > const & DomainMapperTableManager::getCurrentCellWidths( ) { return m_aCellWidths.back( ); } diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx index 4d2a9cd2047a..69f5a905cb0c 100644 --- a/writerfilter/source/dmapper/PropertyMap.hxx +++ b/writerfilter/source/dmapper/PropertyMap.hxx @@ -114,9 +114,6 @@ public: GrabBagType getGrabBagType() const { return m_GrabBagType; } }; -class PropertyMap; -typedef tools::SvRef< PropertyMap > PropertyMapPtr; - class PropertyMap : public virtual SvRefBase { private: @@ -145,7 +142,7 @@ public: void Erase( PropertyIds eId); // Imports properties from pMap - void InsertProps( const PropertyMapPtr& rMap, const bool bOverwrite = true ); + void InsertProps( const tools::SvRef< PropertyMap >& rMap, const bool bOverwrite = true ); // Returns a copy of the property if it exists, .first is its PropertyIds and .second is its Value (type css::uno::Any) boost::optional< Property > getProperty( PropertyIds eId ) const; @@ -179,6 +176,8 @@ protected: } }; +typedef tools::SvRef< PropertyMap > PropertyMapPtr; + class SectionPropertyMap : public PropertyMap { public: |