[Libreoffice-commits] core.git: include/xmloff sw/source xmloff/source

[Noel Grandin]

 include/xmloff/xmlictxt.hxx                        |    4 ----
 sw/source/uibase/config/StoredChapterNumbering.cxx |    2 +-
 xmloff/source/core/xmlictxt.cxx                    |   15 ---------------
 xmloff/source/forms/elementimport.hxx              |    2 +-
 xmloff/source/forms/propertyimport.hxx             |    2 +-
 5 files changed, 3 insertions(+), 22 deletions(-)

New commits:
commit e054b898e7510388d613e4f918afce53aa5444c7
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Fri Oct 6 15:58:13 2017 +0200

    drop use of tools::SvRef in xmloff
    
    instead of mixing and matching rtl::Reference and tools::SvRef, lets
    just use rtl::Reference
    
    Change-Id: I5d77c8a662e1455f97935e5f4a99e484e8cad332
    Reviewed-on: https://gerrit.libreoffice.org/43205
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx
index d22a72394504..77f701795f32 100644
--- a/include/xmloff/xmlictxt.hxx
+++ b/include/xmloff/xmlictxt.hxx
@@ -116,10 +116,6 @@ public:
         const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
 
     virtual void SAL_CALL characters(const OUString & aChars) override;
-
-    void AddFirstRef();
-    void AddNextRef();
-    void ReleaseRef();
 };
 
 #endif // INCLUDED_XMLOFF_XMLICTXT_HXX
diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx
index 271602493317..c575863f00e7 100644
--- a/sw/source/uibase/config/StoredChapterNumbering.cxx
+++ b/sw/source/uibase/config/StoredChapterNumbering.cxx
@@ -317,7 +317,7 @@ class StoredChapterNumberingRootContext
 private:
     SwChapterNumRules & m_rNumRules;
     size_t m_nCounter;
-    std::vector<tools::SvRef<SvxXMLListStyleContext>> m_Contexts;
+    std::vector<rtl::Reference<SvxXMLListStyleContext>> m_Contexts;
 
 public:
     StoredChapterNumberingRootContext(
diff --git a/xmloff/source/core/xmlictxt.cxx b/xmloff/source/core/xmlictxt.cxx
index f2242af256de..e1805057dcdd 100644
--- a/xmloff/source/core/xmlictxt.cxx
+++ b/xmloff/source/core/xmlictxt.cxx
@@ -162,19 +162,4 @@ void SAL_CALL SvXMLImportContext::characters(const OUString &rChars)
     mrImport.Characters( rChars );
 }
 
-void SvXMLImportContext::AddFirstRef()
-{
-    acquire();
-}
-
-void SvXMLImportContext::AddNextRef()
-{
-    acquire();
-}
-
-void SvXMLImportContext::ReleaseRef()
-{
-    release();
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx
index 79d223948391..c2cfc36f5b03 100644
--- a/xmloff/source/forms/elementimport.hxx
+++ b/xmloff/source/forms/elementimport.hxx
@@ -512,7 +512,7 @@ namespace xmloff
         void implSelectCurrentItem();
         void implDefaultSelectCurrentItem();
     };
-    typedef tools::SvRef<OListAndComboImport> OListAndComboImportRef;
+    typedef rtl::Reference<OListAndComboImport> OListAndComboImportRef;
 
     //= OListOptionImport
     /** helper class for importing a single <form:option> element.
diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx
index c0ee5be0f4b2..30e57fac4904 100644
--- a/xmloff/source/forms/propertyimport.hxx
+++ b/xmloff/source/forms/propertyimport.hxx
@@ -150,7 +150,7 @@ namespace xmloff
             m_aGenericValues.push_back(_rProp);
         }
     };
-    typedef tools::SvRef<OPropertyImport> OPropertyImportRef;
+    typedef rtl::Reference<OPropertyImport> OPropertyImportRef;
 
     //= OPropertyElementsContext
     /** helper class for importing the <form:properties> element