From 93449eee17d88532cb8679496a523ded9cd03b0a Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Fri, 21 Apr 2017 12:16:52 +0200
Subject: 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>
---
 sw/source/uibase/inc/unomod.hxx  | 5 ++---
 sw/source/uibase/uno/unomod.cxx  | 8 ++++----
 sw/source/uibase/uno/unotxvw.cxx | 5 ++---
 3 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'sw')

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
-- 
cgit