merge comphelper::ChainablePropertySet with comphelper::ChainableHelperNoState

Change-Id: I8fb93665b2a2f46019306f473882a7f3d7aece87
Reviewed-on: https://gerrit.libreoffice.org/36787
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

6 files changed, 27 insertions, 100 deletions

diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results
index 59bf4effa157..e12911791dbb 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -190,7 +190,6 @@ merge chart::ExplicitValueProvider with chart::ChartView
 merge chart::LegendEntryProvider with chart::VSeriesPlotter
 merge chart::MarkHandleProvider with chart::SelectionHelper
 merge chart::ResourceChangeListener with chart::ChartTypeTabPage
-merge comphelper::ChainablePropertySet with comphelper::ChainableHelperNoState
 merge comphelper::OAccessibleContextHelper with comphelper::OCommonAccessibleComponent
 merge comphelper::OAnyEnumeration_BASE with comphelper::OAnyEnumeration
 merge comphelper::OComponentProxyAggregation with comphelper::OAccessibleWrapper
diff --git a/include/comphelper/ChainablePropertySet.hxx b/include/comphelper/ChainablePropertySet.hxx
index bef7efaf5ae2..6926f6b902e2 100644
--- a/include/comphelper/ChainablePropertySet.hxx
+++ b/include/comphelper/ChainablePropertySet.hxx
@@ -23,9 +23,11 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <comphelper/PropertyInfoHash.hxx>
 #include <comphelper/comphelperdllapi.h>
 #include <comphelper/solarmutex.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 
 namespace comphelper
@@ -54,9 +56,15 @@ namespace comphelper
 
 namespace comphelper
 {
-    class COMPHELPER_DLLPUBLIC ChainablePropertySet : public css::beans::XPropertySet,
-                                 public css::beans::XPropertyState,
-                                 public css::beans::XMultiPropertySet
+    typedef cppu::WeakImplHelper
+    <
+        css::beans::XPropertySet,
+        css::beans::XMultiPropertySet,
+        css::lang::XServiceInfo
+    >
+    ChainablePropertySetBase;
+    class COMPHELPER_DLLPUBLIC ChainablePropertySet : public ChainablePropertySetBase,
+                                 public css::beans::XPropertyState
     {
         friend class MasterPropertySet;
     protected:
@@ -102,7 +110,14 @@ namespace comphelper
         ChainablePropertySet( comphelper::ChainablePropertySetInfo* pInfo, SolarMutex* pMutex = nullptr )
             throw();
         virtual ~ChainablePropertySet()
-            throw();
+            throw() override;
+
+        css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override
+        { return ChainablePropertySetBase::queryInterface( aType ); }
+        void SAL_CALL acquire(  ) throw () override
+        { ChainablePropertySetBase::acquire( ); }
+        void SAL_CALL release(  ) throw () override
+        { ChainablePropertySetBase::release( ); }
 
         // XPropertySet
         virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
diff --git a/include/comphelper/SettingsHelper.hxx b/include/comphelper/SettingsHelper.hxx
deleted file mode 100644
index bd6103bdf9cb..000000000000
--- a/include/comphelper/SettingsHelper.hxx
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_COMPHELPER_SETTINGSHELPER_HXX
-#define INCLUDED_COMPHELPER_SETTINGSHELPER_HXX
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <comphelper/ChainablePropertySet.hxx>
-#include <comphelper/solarmutex.hxx>
-#include <cppuhelper/implbase.hxx>
-
-namespace comphelper
-{
-    typedef  cppu::WeakImplHelper
-    <
-        css::beans::XPropertySet,
-        css::beans::XMultiPropertySet,
-        css::lang::XServiceInfo
-    >
-    HelperBaseNoState;
-    class ChainableHelperNoState :
-        public HelperBaseNoState,
-        public ChainablePropertySet
-    {
-    public:
-        ChainableHelperNoState ( ChainablePropertySetInfo *pInfo, SolarMutex* pMutex = nullptr)
-        : ChainablePropertySet ( pInfo, pMutex )
-        {}
-        css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override
-        { return HelperBaseNoState::queryInterface( aType ); }
-        void SAL_CALL acquire(  ) throw () override
-        { HelperBaseNoState::acquire( ); }
-        void SAL_CALL release(  ) throw () override
-        { HelperBaseNoState::release( ); }
-
-        // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override
-        { return ChainablePropertySet::getPropertySetInfo(); }
-        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override
-        { ChainablePropertySet::setPropertyValue ( aPropertyName, aValue ); }
-        virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override
-        { return ChainablePropertySet::getPropertyValue ( PropertyName ); }
-        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override
-        { ChainablePropertySet::addPropertyChangeListener ( aPropertyName, xListener ); }
-        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override
-        { ChainablePropertySet::removePropertyChangeListener ( aPropertyName, aListener ); }
-        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override
-        { ChainablePropertySet::addVetoableChangeListener ( PropertyName, aListener ); }
-        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override
-        { ChainablePropertySet::removeVetoableChangeListener ( PropertyName, aListener ); }
-
-        // XMultiPropertySet
-        virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override
-        { ChainablePropertySet::setPropertyValues ( aPropertyNames, aValues ); }
-        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override
-        { return ChainablePropertySet::getPropertyValues ( aPropertyNames ); }
-        virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override
-        { ChainablePropertySet::addPropertiesChangeListener ( aPropertyNames, xListener ); }
-        virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override
-        { ChainablePropertySet::removePropertiesChangeListener ( xListener ); }
-        virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override
-        { ChainablePropertySet::firePropertiesChangeEvent ( aPropertyNames, xListener ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx
index c3ef5a5de79e..81f6350e010d 100644
--- a/sw/source/uibase/inc/unomod.hxx
+++ b/sw/source/uibase/inc/unomod.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/ChainablePropertySet.hxx>
-#include <comphelper/SettingsHelper.hxx>
 #include <usrpref.hxx>
 
 class SwView;
@@ -70,7 +69,7 @@ enum class SwXPrintSettingsType
     Document
 };
 
-class SwXPrintSettings : public comphelper::ChainableHelperNoState
+class SwXPrintSettings : public comphelper::ChainablePropertySet
 {
     friend class SwXDocumentSettings;
 protected:
@@ -98,7 +97,7 @@ public:
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
-class SwXViewSettings : public comphelper::ChainableHelperNoState
+class SwXViewSettings : public comphelper::ChainablePropertySet
 {
 
     friend class SwXDocumentSettings;
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index 0a54ad6f9843..a83faf7ec865 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -209,7 +209,7 @@ Reference< XPropertySet >  SwXModule::getViewSettings()
     if(!mxViewSettings.is())
     {
         OSL_FAIL("Web or Text?");
-        mxViewSettings = static_cast < HelperBaseNoState * > ( new SwXViewSettings( nullptr ) );
+        mxViewSettings = new SwXViewSettings( nullptr );
     }
     return mxViewSettings;
 }
@@ -220,7 +220,7 @@ Reference< XPropertySet >  SwXModule::getPrintSettings()
     if(!mxPrintSettings.is())
     {
         OSL_FAIL("Web or Text?");
-        mxPrintSettings = static_cast < HelperBaseNoState * > ( new SwXPrintSettings ( SwXPrintSettingsType::Module ) );
+        mxPrintSettings = new SwXPrintSettings( SwXPrintSettingsType::Module );
     }
     return mxPrintSettings;
 }
@@ -243,7 +243,7 @@ Sequence< OUString > SwXModule::getSupportedServiceNames()
 }
 
 SwXPrintSettings::SwXPrintSettings(SwXPrintSettingsType eType, SwDoc* pDoc)
-: ChainableHelperNoState ( lcl_createPrintSettingsInfo (), &Application::GetSolarMutex() )
+: ChainablePropertySet ( lcl_createPrintSettingsInfo (), &Application::GetSolarMutex() )
 , meType(eType)
 , mpPrtOpt ( nullptr )
 , mpDoc ( pDoc )
@@ -516,7 +516,7 @@ Sequence< OUString > SwXPrintSettings::getSupportedServiceNames()
 }
 
 SwXViewSettings::SwXViewSettings(SwView* pVw)
-    : ChainableHelperNoState( lcl_createViewSettingsInfo (), &Application::GetSolarMutex() )
+    : ChainablePropertySet( lcl_createViewSettingsInfo (), &Application::GetSolarMutex() )
     , pView(pVw)
     , mpViewOption(nullptr)
     , mpConstViewOption(nullptr)
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index ef383b94c874..040e883ad877 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -85,7 +85,6 @@ using namespace ::com::sun::star::view;
 using namespace ::com::sun::star::frame;
 
 using ::com::sun::star::util::URL;
-using comphelper::HelperBaseNoState;
 
 SwXTextView::SwXTextView(SwView* pSwView) :
     SfxBaseController(pSwView),
@@ -107,7 +106,7 @@ void SwXTextView::Invalidate()
 {
     if(mxViewSettings.is())
     {
-        HelperBaseNoState *pSettings = static_cast < HelperBaseNoState * > ( mxViewSettings.get() );
+        comphelper::ChainablePropertySet *pSettings = static_cast < comphelper::ChainablePropertySet * > ( mxViewSettings.get() );
         static_cast < SwXViewSettings* > ( pSettings )->Invalidate();
         mxViewSettings.clear();
     }
@@ -504,7 +503,7 @@ uno::Reference< beans::XPropertySet >  SwXTextView::getViewSettings()
     {
         if(!mxViewSettings.is())
         {
-            mxViewSettings = static_cast < HelperBaseNoState * > ( new SwXViewSettings( m_pView ) );
+            mxViewSettings = new SwXViewSettings( m_pView );
         }
     }
     else