core.git: include/unotools unotools/source

[Noel Grandin (via logerrit)]

 include/unotools/configitem.hxx       |    8 +++++---
 include/unotools/streamwrap.hxx       |    6 +++---
 unotools/source/config/configitem.cxx |    3 +++
 3 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit d4c0bb0ce626fa24eddb886e3bf6444da292df25
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Sep 12 10:19:34 2024 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Sep 12 16:21:59 2024 +0200

    use more concrete UNO classes in unotools
    
    Change-Id: Iaf743ae040a3a7bd808bf3cac033197001c31b18
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173250
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    Tested-by: Jenkins

diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx
index f04f2b057798..649c05fdbe28 100644
--- a/include/unotools/configitem.hxx
+++ b/include/unotools/configitem.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_UNOTOOLS_CONFIGITEM_HXX
 
 #include <sal/types.h>
+#include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/uno/Reference.h>
@@ -57,6 +58,7 @@ namespace o3tl
 
 namespace utl
 {
+class ConfigChangeListener_Impl;
 
     enum class ConfigNameFormat
     {
@@ -72,7 +74,7 @@ namespace utl
             const OUString              sSubTree;
             css::uno::Reference< css::container::XHierarchicalNameAccess>
                                         m_xHierarchyAccess;
-            css::uno::Reference< css::util::XChangesListener >
+            rtl::Reference< ConfigChangeListener_Impl >
                                         xChangeLstnr;
             ConfigItemMode              m_nMode;
             bool                        m_bIsModified;
@@ -144,8 +146,8 @@ namespace utl
         public:
             virtual ~ConfigItem() override;
 
-            ConfigItem(ConfigItem const &) = default;
-            ConfigItem(ConfigItem &&) = default;
+            ConfigItem(ConfigItem const &);
+            ConfigItem(ConfigItem &&);
             ConfigItem & operator =(ConfigItem const &) = delete; // due to 
const sSubTree
             ConfigItem & operator =(ConfigItem &&) = delete; // due to const 
sSubTree
 
diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx
index dfe0134086a0..a21d9e070995 100644
--- a/include/unotools/streamwrap.hxx
+++ b/include/unotools/streamwrap.hxx
@@ -104,14 +104,14 @@ class OOutputStreamWrapper : public 
cppu::WeakImplHelper<css::io::XOutputStream>
 public:
     UNOTOOLS_DLLPUBLIC OOutputStreamWrapper(SvStream& _rStream);
 
-protected:
-    virtual ~OOutputStreamWrapper() override;
-
 // css::io::XOutputStream
     virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& 
aData) override final;
     virtual void SAL_CALL flush() override final;
     virtual void SAL_CALL closeOutput() override final;
 
+protected:
+    virtual ~OOutputStreamWrapper() override;
+
     /// throws an exception according to the error flag of m_pSvStream
     void checkError() const;
 
diff --git a/unotools/source/config/configitem.cxx 
b/unotools/source/config/configitem.cxx
index a8e82ba7602a..b6c0b808dfd9 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -155,6 +155,9 @@ ConfigItem::ConfigItem(OUString aSubTree, ConfigItemMode 
nSetMode ) :
         m_xHierarchyAccess = 
ConfigManager::getConfigManager().addConfigItem(*this);
 }
 
+ConfigItem::ConfigItem(ConfigItem const &) = default;
+ConfigItem::ConfigItem(ConfigItem &&) = default;
+
 ConfigItem::~ConfigItem()
 {
     suppress_fun_call_w_exception(RemoveChangesListener());