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

[Miklos Vajna]

 writerfilter/source/rtftok/rtfsprm.cxx           |    4 ++--
 writerfilter/source/rtftok/rtfsprm.hxx           |    2 +-
 writerperfect/source/writer/EPUBExportDialog.cxx |    2 +-
 writerperfect/source/writer/exp/txtparai.cxx     |    1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 7e0f06f412bce0f2dd896cb4159e99a150778c40
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu May 10 09:31:46 2018 +0200

    writerfilter, writerperfect: various small cleanups
    
    Change-Id: Iea26b73bd91ed178cc4f2279c23246d79f48a6be
    Reviewed-on: https://gerrit.libreoffice.org/54063
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx
index 89d520c391bb..f768785a5cba 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -242,7 +242,7 @@ static void cloneAndDeduplicateSprm(std::pair<Id, RTFValue::Pointer_t> const& rS
 }
 
 /// Extracts the list level matching nLevel from pAbstract.
-static RTFValue::Pointer_t getListLevel(RTFValue::Pointer_t pAbstract, int nLevel)
+static RTFValue::Pointer_t getListLevel(const RTFValue::Pointer_t& pAbstract, int nLevel)
 {
     for (const auto& rPair : pAbstract->getSprms())
     {
@@ -287,7 +287,7 @@ void RTFSprms::deduplicateList(const std::map<int, int>& rInvalidListLevelFirstI
         eraseNestedAttribute(*this, NS_ooxml::LN_CT_PPrBase_ind, NS_ooxml::LN_CT_Ind_firstLine);
 }
 
-void RTFSprms::duplicateList(RTFValue::Pointer_t pAbstract)
+void RTFSprms::duplicateList(const RTFValue::Pointer_t& pAbstract)
 {
     int nLevel = 0;
     RTFValue::Pointer_t pLevelId
diff --git a/writerfilter/source/rtftok/rtfsprm.hxx b/writerfilter/source/rtftok/rtfsprm.hxx
index 79694e5864bd..2c4247925f8b 100644
--- a/writerfilter/source/rtftok/rtfsprm.hxx
+++ b/writerfilter/source/rtftok/rtfsprm.hxx
@@ -58,7 +58,7 @@ public:
     /// (yes, really; that's what Word does).
     RTFSprms cloneAndDeduplicate(RTFSprms& rReference) const;
     /// Inserts default values to override attributes of pAbstract.
-    void duplicateList(RTFValue::Pointer_t pAbstract);
+    void duplicateList(const RTFValue::Pointer_t& pAbstract);
     /// Removes duplicated values based on in-list properties.
     void deduplicateList(const std::map<int, int>& rInvalidListLevelFirstIndents);
     std::size_t size() const { return m_pSprms->size(); }
diff --git a/writerperfect/source/writer/EPUBExportDialog.cxx b/writerperfect/source/writer/EPUBExportDialog.cxx
index fa9bc9193992..935858dfd27d 100644
--- a/writerperfect/source/writer/EPUBExportDialog.cxx
+++ b/writerperfect/source/writer/EPUBExportDialog.cxx
@@ -221,7 +221,7 @@ IMPL_LINK_NOARG(EPUBExportDialog, OKClickHdl, weld::Button&, void)
     m_xDialog->response(RET_OK);
 }
 
-EPUBExportDialog::~EPUBExportDialog() {}
+EPUBExportDialog::~EPUBExportDialog() = default;
 
 } // namespace writerperfect
 
diff --git a/writerperfect/source/writer/exp/txtparai.cxx b/writerperfect/source/writer/exp/txtparai.cxx
index 297c5824ccf8..3a5d6bf44d46 100644
--- a/writerperfect/source/writer/exp/txtparai.cxx
+++ b/writerperfect/source/writer/exp/txtparai.cxx
@@ -202,7 +202,6 @@ private:
 XMLRubyContext::XMLRubyContext(XMLImport& rImport,
                                const librevenge::RVNGPropertyList& rPropertyList)
     : XMLImportContext(rImport)
-    , m_sRubyText()
 {
     // Inherit properties from parent.
     librevenge::RVNGPropertyList::Iter itProp(rPropertyList);