#95145# make SwXPrintSettings and SwXViewSettings use new template base class from comphelper

1 files changed, 8 insertions, 69 deletions

diff --git a/sw/inc/unomod.hxx b/sw/inc/unomod.hxx
index 171d1bbb0470..1f6548fcaff0 100644
--- a/sw/inc/unomod.hxx
+++ b/sw/inc/unomod.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unomod.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: mtg $ $Date: 2001-11-26 16:17:03 $
+ *  last change: $Author: mtg $ $Date: 2001-11-27 18:42:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -91,6 +91,9 @@
 #ifndef _COMPHELPER_CHAINABLEPROPERTYSET_HXX_
 #include <comphelper/ChainablePropertySet.hxx>
 #endif
+#ifndef _COMPHELPER_SETTINGSHELPER_HXX_
+#include <comphelper/SettingsHelper.hxx>
+#endif
 
 class SwView;
 class SwViewOption;
@@ -145,73 +148,8 @@ enum SwXPrintSettingsType
     PRINT_SETTINGS_WEB,
     PRINT_SETTINGS_DOCUMENT
 };
-typedef  cppu::WeakImplHelper3
-<
-    ::com::sun::star::beans::XPropertySet,
-    ::com::sun::star::beans::XMultiPropertySet,
-    ::com::sun::star::lang::XServiceInfo
->
-SwXSettingsVeryBaseClass;
-
-class SwXSettingsBaseClass : public SwXSettingsVeryBaseClass, public comphelper::ChainablePropertySet
-{
-public:
-    SwXSettingsBaseClass ( comphelper::ChainablePropertySetInfo* pInfo, vos::IMutex *pMutex = NULL )
-    : comphelper::ChainablePropertySet ( pInfo, pMutex )
-    {
-    }
-    virtual ~SwXSettingsBaseClass () {}
-
-    // XInterface
-    com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) throw (com::sun::star::uno::RuntimeException)
-    { return SwXSettingsVeryBaseClass::queryInterface( aType ); }
-    void SAL_CALL acquire(  ) throw ()
-    { SwXSettingsVeryBaseClass::acquire( ); }
-    void SAL_CALL release(  ) throw ()
-    { SwXSettingsVeryBaseClass::release( ); }
-
-    // XPropertySet
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
-        throw(::com::sun::star::uno::RuntimeException)
-    { return ChainablePropertySet::getPropertySetInfo(); }
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
-    { ChainablePropertySet::setPropertyValue ( aPropertyName, aValue ); }
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName )
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
-    { return ChainablePropertySet::getPropertyValue ( PropertyName ); }
-    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
-    { ChainablePropertySet::addPropertyChangeListener ( aPropertyName, xListener ); }
-    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
-    { ChainablePropertySet::removePropertyChangeListener ( aPropertyName, aListener ); }
-    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
-    { ChainablePropertySet::addVetoableChangeListener ( PropertyName, aListener ); }
-    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
-    { ChainablePropertySet::removeVetoableChangeListener ( PropertyName, aListener ); }
-
-    // XMultiPropertySet
-    virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues )
-        throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
-    { ChainablePropertySet::setPropertyValues ( aPropertyNames, aValues ); }
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames )
-        throw(::com::sun::star::uno::RuntimeException)
-    { return ChainablePropertySet::getPropertyValues ( aPropertyNames ); }
-    virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
-        throw(::com::sun::star::uno::RuntimeException)
-    { ChainablePropertySet::addPropertiesChangeListener ( aPropertyNames, xListener ); }
-    virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
-        throw(::com::sun::star::uno::RuntimeException)
-    { ChainablePropertySet::removePropertiesChangeListener ( xListener ); }
-    virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
-        throw(::com::sun::star::uno::RuntimeException)
-    { ChainablePropertySet::firePropertiesChangeEvent ( aPropertyNames, xListener ); }
-};
 
-class SwXPrintSettings : public SwXSettingsBaseClass
+class SwXPrintSettings : public comphelper::ChainableHelperNoState
 {
     friend class SwXDocumentSettings;
 protected:
@@ -248,8 +186,9 @@ public:
 /*-----------------15.03.98 13:21-------------------
 
 --------------------------------------------------*/
-class SwXViewSettings : public SwXSettingsBaseClass
+class SwXViewSettings : public comphelper::ChainableHelperNoState
 {
+
     friend class SwXDocumentSettings;
 protected:
     SwView*                     pView;