diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-07-20 09:06:10 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-07-20 10:00:34 +0200 |
commit | b6e3cad985252d8ce30ca9aa4c7553646c7ad1a5 (patch) | |
tree | 338ff3ce64423c948ee92301271f11886a731aa7 /writerfilter | |
parent | a1dafed34690e76b0d6c1b45ce1a5f3d26f63344 (diff) |
writerfilter, xmlsecurity: various small cleanups
That call in the RTFSprms copy ctor to the parent non-copy ctor was a
bit odd.
Change-Id: Ic219ec22c0b63472766a668406585dbbeebae2f7
Reviewed-on: https://gerrit.libreoffice.org/57763
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/rtftok/rtfreferenceproperties.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfreferenceproperties.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfreferencetable.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfsprm.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfvalue.cxx | 6 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfvalue.hxx | 6 |
6 files changed, 10 insertions, 10 deletions
diff --git a/writerfilter/source/rtftok/rtfreferenceproperties.cxx b/writerfilter/source/rtftok/rtfreferenceproperties.cxx index fed8d2263990..dcb16e4fa53a 100644 --- a/writerfilter/source/rtftok/rtfreferenceproperties.cxx +++ b/writerfilter/source/rtftok/rtfreferenceproperties.cxx @@ -29,7 +29,7 @@ RTFReferenceProperties::~RTFReferenceProperties() = default; void RTFReferenceProperties::resolve(Properties& rHandler) { for (auto& rAttribute : m_aAttributes) - rHandler.attribute(rAttribute.first, *rAttribute.second.get()); + rHandler.attribute(rAttribute.first, *rAttribute.second); for (auto& rSprm : m_aSprms) { RTFSprm aSprm(rSprm.first, rSprm.second); diff --git a/writerfilter/source/rtftok/rtfreferenceproperties.hxx b/writerfilter/source/rtftok/rtfreferenceproperties.hxx index b4cc0a26c02d..1c57aeaf80a9 100644 --- a/writerfilter/source/rtftok/rtfreferenceproperties.hxx +++ b/writerfilter/source/rtftok/rtfreferenceproperties.hxx @@ -22,7 +22,7 @@ class RTFReferenceProperties : public writerfilter::Reference<Properties> public: RTFReferenceProperties(const RTFSprms& rAttributes, const RTFSprms& rSprms); explicit RTFReferenceProperties(const RTFSprms& rAttributes); - virtual ~RTFReferenceProperties() override; + ~RTFReferenceProperties() override; void resolve(Properties& rHandler) override; RTFSprms& getAttributes() { return m_aAttributes; } RTFSprms& getSprms() { return m_aSprms; } diff --git a/writerfilter/source/rtftok/rtfreferencetable.hxx b/writerfilter/source/rtftok/rtfreferencetable.hxx index 58e57e3ea99d..8c9595493373 100644 --- a/writerfilter/source/rtftok/rtfreferencetable.hxx +++ b/writerfilter/source/rtftok/rtfreferencetable.hxx @@ -24,7 +24,7 @@ public: using Entries_t = std::map<int, writerfilter::Reference<Properties>::Pointer_t>; using Entry_t = std::pair<int, writerfilter::Reference<Properties>::Pointer_t>; explicit RTFReferenceTable(Entries_t aEntries); - virtual ~RTFReferenceTable() override; + ~RTFReferenceTable() override; void resolve(Table& rHandler) override; private: diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx index 94acac0d1f25..45c6e351ed5f 100644 --- a/writerfilter/source/rtftok/rtfsprm.cxx +++ b/writerfilter/source/rtftok/rtfsprm.cxx @@ -373,7 +373,7 @@ RTFSprms::RTFSprms() RTFSprms::~RTFSprms() = default; RTFSprms::RTFSprms(const RTFSprms& rSprms) - : SvRefBase() + : SvRefBase(rSprms) { *this = rSprms; } diff --git a/writerfilter/source/rtftok/rtfvalue.cxx b/writerfilter/source/rtftok/rtfvalue.cxx index f637cc2712a5..8685c9d238a3 100644 --- a/writerfilter/source/rtftok/rtfvalue.cxx +++ b/writerfilter/source/rtftok/rtfvalue.cxx @@ -17,7 +17,7 @@ namespace writerfilter { namespace rtftok { -RTFValue::RTFValue(int nValue, OUString sValue, RTFSprms rAttributes, RTFSprms rSprms, +RTFValue::RTFValue(int nValue, OUString sValue, const RTFSprms& rAttributes, const RTFSprms& rSprms, uno::Reference<drawing::XShape> xShape, uno::Reference<io::XInputStream> xStream, uno::Reference<embed::XEmbeddedObject> xObject, bool bForceString, const RTFShape& aShape, const RTFPicture& rPicture) @@ -61,7 +61,7 @@ RTFValue::RTFValue(OUString sValue, bool bForce) { } -RTFValue::RTFValue(RTFSprms rAttributes) +RTFValue::RTFValue(const RTFSprms& rAttributes) : m_pAttributes(new RTFSprms(rAttributes)) , m_pSprms(new RTFSprms()) , m_pShape(new RTFShape()) @@ -69,7 +69,7 @@ RTFValue::RTFValue(RTFSprms rAttributes) { } -RTFValue::RTFValue(RTFSprms rAttributes, RTFSprms rSprms) +RTFValue::RTFValue(const RTFSprms& rAttributes, const RTFSprms& rSprms) : m_pAttributes(new RTFSprms(rAttributes)) , m_pSprms(new RTFSprms(rSprms)) , m_pShape(new RTFShape()) diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/writerfilter/source/rtftok/rtfvalue.hxx index a775c795a716..4913162aea81 100644 --- a/writerfilter/source/rtftok/rtfvalue.hxx +++ b/writerfilter/source/rtftok/rtfvalue.hxx @@ -42,7 +42,7 @@ class RTFValue : public Value { public: using Pointer_t = tools::SvRef<RTFValue>; - RTFValue(int nValue, OUString sValue, RTFSprms rAttributes, RTFSprms rSprms, + RTFValue(int nValue, OUString sValue, const RTFSprms& rAttributes, const RTFSprms& rSprms, css::uno::Reference<css::drawing::XShape> xShape, css::uno::Reference<css::io::XInputStream> xStream, css::uno::Reference<css::embed::XEmbeddedObject> xObject, bool bForceString, @@ -50,8 +50,8 @@ public: RTFValue(); explicit RTFValue(int nValue); RTFValue(OUString sValue, bool bForce = false); - explicit RTFValue(RTFSprms rAttributes); - RTFValue(RTFSprms rAttributes, RTFSprms rSprms); + explicit RTFValue(const RTFSprms& rAttributes); + RTFValue(const RTFSprms& rAttributes, const RTFSprms& rSprms); explicit RTFValue(css::uno::Reference<css::drawing::XShape> xShape); explicit RTFValue(css::uno::Reference<css::io::XInputStream> xStream); explicit RTFValue(css::uno::Reference<css::embed::XEmbeddedObject> xObject); |