summaryrefslogtreecommitdiff
path: root/writerfilter/source/dmapper
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-02-28 13:09:02 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-03-04 07:32:43 +0100
commit9865440d217d975206a3f91612f0666312bc8fd8 (patch)
tree7d5926e5bfe94c05a923ea68dba0ac6793c5a4a9 /writerfilter/source/dmapper
parente7f71c7ab675f238b61d7f28e7f79f51c7e19801 (diff)
new loplugin typedefparam
verify that parameters use the exact same typedef-names (if any) in definition and declaration Change-Id: I55d2817f599b0253904dce2d35a1a93967e15a77 Reviewed-on: https://gerrit.libreoffice.org/68439 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'writerfilter/source/dmapper')
-rw-r--r--writerfilter/source/dmapper/BorderHandler.hxx5
-rw-r--r--writerfilter/source/dmapper/CellColorHandler.hxx3
-rw-r--r--writerfilter/source/dmapper/DomainMapper.hxx9
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableManager.cxx6
-rw-r--r--writerfilter/source/dmapper/PropertyMap.hxx7
5 files changed, 18 insertions, 12 deletions
diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx
index 9d8001d51050..b986b2ed997a 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/writerfilter/source/dmapper/BorderHandler.hxx
@@ -19,9 +19,10 @@
#ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_BORDERHANDLER_HXX
#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_BORDERHANDLER_HXX
+#include <memory>
#include <vector>
#include "LoggedResources.hxx"
-#include <memory>
+#include "PropertyMap.hxx"
#include <com/sun/star/table/BorderLine2.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <o3tl/enumarray.hxx>
@@ -67,7 +68,7 @@ public:
explicit BorderHandler( bool bOOXML );
virtual ~BorderHandler() override;
- ::tools::SvRef<PropertyMap> getProperties();
+ PropertyMapPtr 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 fb72be4262bb..8e77c1c080be 100644
--- a/writerfilter/source/dmapper/CellColorHandler.hxx
+++ b/writerfilter/source/dmapper/CellColorHandler.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_CELLCOLORHANDLER_HXX
#include "LoggedResources.hxx"
+#include "PropertyMap.hxx"
#include <memory>
#include <vector>
@@ -54,7 +55,7 @@ public:
CellColorHandler( );
virtual ~CellColorHandler() override;
- ::tools::SvRef<TablePropertyMap> getProperties();
+ TablePropertyMapPtr getProperties();
void setOutputFormat( OutputFormat format ) { m_OutputFormat = format; }
diff --git a/writerfilter/source/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx
index e6b082cfcd47..78e4cf535bbd 100644
--- a/writerfilter/source/dmapper/DomainMapper.hxx
+++ b/writerfilter/source/dmapper/DomainMapper.hxx
@@ -21,6 +21,7 @@
#include <dmapper/DomainMapperFactory.hxx>
#include "LoggedResources.hxx"
+#include "PropertyMap.hxx"
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/style/TabAlign.hpp>
@@ -64,6 +65,8 @@ class StyleSheetTable;
class GraphicZOrderHelper;
class GraphicNamingHelper;
+typedef tools::SvRef<StyleSheetTable> StyleSheetTablePtr;
+
class DomainMapper : public LoggedProperties, public LoggedTable,
public BinaryObj, public LoggedStream
{
@@ -86,9 +89,9 @@ public:
virtual void data(const sal_uInt8* buf, size_t len,
writerfilter::Reference<Properties>::Pointer_t ref) override;
- void sprmWithProps( Sprm& sprm, const ::tools::SvRef<PropertyMap>& pContext );
+ void sprmWithProps( Sprm& sprm, const PropertyMapPtr& pContext );
- void PushStyleSheetProperties( const ::tools::SvRef<PropertyMap>& pStyleProperties, bool bAffectTableMngr = false );
+ void PushStyleSheetProperties( const PropertyMapPtr& pStyleProperties, bool bAffectTableMngr = false );
void PopStyleSheetProperties( bool bAffectTableMngr = false );
void PushListProperties( const ::tools::SvRef<PropertyMap>& pListProperties );
@@ -100,7 +103,7 @@ public:
css::uno::Reference<css::text::XTextRange> GetCurrentTextRange();
OUString getOrCreateCharStyle( PropertyValueVector_t& rCharProperties, bool bAlwaysCreate );
- tools::SvRef< StyleSheetTable > const & GetStyleSheetTable( );
+ StyleSheetTablePtr const & GetStyleSheetTable( );
GraphicZOrderHelper* graphicZOrderHelper();
GraphicNamingHelper& GetGraphicNamingHelper();
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 20d6fb60b3a9..74ca53ab814f 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -389,7 +389,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
return bRet;
}
-std::shared_ptr< vector<sal_Int32> > const & DomainMapperTableManager::getCurrentGrid( )
+DomainMapperTableManager::IntVectorPtr const & DomainMapperTableManager::getCurrentGrid( )
{
return m_aTableGrid.back( );
}
@@ -399,12 +399,12 @@ bool DomainMapperTableManager::hasCurrentSpans() const
return !m_aGridSpans.empty();
}
-std::shared_ptr< vector< sal_Int32 > > const & DomainMapperTableManager::getCurrentSpans( )
+DomainMapperTableManager::IntVectorPtr const & DomainMapperTableManager::getCurrentSpans( )
{
return m_aGridSpans.back( );
}
-std::shared_ptr< vector< sal_Int32 > > const & DomainMapperTableManager::getCurrentCellWidths( )
+DomainMapperTableManager::IntVectorPtr const & DomainMapperTableManager::getCurrentCellWidths( )
{
return m_aCellWidths.back( );
}
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 69f5a905cb0c..4d2a9cd2047a 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -114,6 +114,9 @@ public:
GrabBagType getGrabBagType() const { return m_GrabBagType; }
};
+class PropertyMap;
+typedef tools::SvRef< PropertyMap > PropertyMapPtr;
+
class PropertyMap : public virtual SvRefBase
{
private:
@@ -142,7 +145,7 @@ public:
void Erase( PropertyIds eId);
// Imports properties from pMap
- void InsertProps( const tools::SvRef< PropertyMap >& rMap, const bool bOverwrite = true );
+ void InsertProps( const PropertyMapPtr& 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;
@@ -176,8 +179,6 @@ protected:
}
};
-typedef tools::SvRef< PropertyMap > PropertyMapPtr;
-
class SectionPropertyMap : public PropertyMap
{
public: