From 3f3e231738185b7fdb0fa1e4bcbb8deed442e893 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Thu, 17 Apr 2003 12:14:09 +0000 Subject: INTEGRATION: CWS configapi01 (1.3.34); FILE MERGED 2003/04/15 10:25:25 jb 1.3.34.2: #i11893# backend\updatedata.cxx 2003/04/10 15:47:02 jb 1.3.34.1: #1077715# Move configuration backend API out of drafts; adjust to API changes --- configmgr/source/backend/basicupdatemerger.hxx | 48 ++++++++++++++------------ 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/configmgr/source/backend/basicupdatemerger.hxx b/configmgr/source/backend/basicupdatemerger.hxx index 644d60fd1dda..8b9e86a688d6 100644 --- a/configmgr/source/backend/basicupdatemerger.hxx +++ b/configmgr/source/backend/basicupdatemerger.hxx @@ -2,9 +2,9 @@ * * $RCSfile: basicupdatemerger.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: jb $ $Date: 2002-05-30 15:28:35 $ + * last change: $Author: rt $ $Date: 2003-04-17 13:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,8 +66,12 @@ #include #endif -#include -#include +#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYERHANDLER_HPP_ +#include +#endif +#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYER_HPP_ +#include +#endif #ifndef INCLUDED_VECTOR #include @@ -84,9 +88,7 @@ namespace configmgr using rtl::OUString; namespace uno = ::com::sun::star::uno; namespace lang = ::com::sun::star::lang; - namespace beans = ::com::sun::star::beans; - namespace container = ::com::sun::star::container; - namespace backenduno = drafts::com::sun::star::configuration::backend; + namespace backenduno = ::com::sun::star::configuration::backend; using backenduno::MalformedDataException; using backenduno::TemplateIdentifier; // ----------------------------------------------------------------------------- @@ -105,61 +107,61 @@ namespace configmgr protected: virtual void SAL_CALL startLayer( ) - throw (MalformedDataException, uno::RuntimeException); + throw (MalformedDataException, lang::WrappedTargetException, uno::RuntimeException); virtual void SAL_CALL endLayer( ) - throw (MalformedDataException, lang::IllegalAccessException, uno::RuntimeException); + throw (MalformedDataException, lang::WrappedTargetException, uno::RuntimeException); virtual void SAL_CALL - overrideNode( const OUString& aName, sal_Int16 aAttributes ) - throw (MalformedDataException, container::NoSuchElementException, lang::IllegalAccessException, lang::IllegalArgumentException, uno::RuntimeException); + overrideNode( const OUString& aName, sal_Int16 aAttributes, sal_Bool bClear ) + throw (MalformedDataException, lang::WrappedTargetException, uno::RuntimeException); virtual void SAL_CALL addOrReplaceNode( const OUString& aName, sal_Int16 aAttributes ) - throw (MalformedDataException, container::NoSuchElementException, lang::IllegalAccessException, lang::IllegalArgumentException, uno::RuntimeException); + throw (MalformedDataException, lang::WrappedTargetException, uno::RuntimeException); virtual void SAL_CALL addOrReplaceNodeFromTemplate( const OUString& aName, const TemplateIdentifier& aTemplate, sal_Int16 aAttributes ) - throw (MalformedDataException, container::NoSuchElementException, beans::IllegalTypeException, lang::IllegalAccessException, lang::IllegalArgumentException, uno::RuntimeException); + throw (MalformedDataException, lang::WrappedTargetException, uno::RuntimeException); virtual void SAL_CALL endNode( ) - throw (MalformedDataException, uno::RuntimeException); + throw (MalformedDataException, lang::WrappedTargetException, uno::RuntimeException); virtual void SAL_CALL dropNode( const OUString& aName ) - throw (MalformedDataException, container::NoSuchElementException, lang::IllegalAccessException, lang::IllegalArgumentException, uno::RuntimeException); + throw (MalformedDataException, lang::WrappedTargetException, uno::RuntimeException); virtual void SAL_CALL - overrideProperty( const OUString& aName, sal_Int16 aAttributes, const uno::Type& aType ) - throw (MalformedDataException, beans::UnknownPropertyException, beans::IllegalTypeException, lang::IllegalAccessException, lang::IllegalArgumentException, uno::RuntimeException); + overrideProperty( const OUString& aName, sal_Int16 aAttributes, const uno::Type& aType, sal_Bool bClear ) + throw (MalformedDataException, lang::WrappedTargetException, uno::RuntimeException); virtual void SAL_CALL endProperty( ) - throw (MalformedDataException, uno::RuntimeException); + throw (MalformedDataException, lang::WrappedTargetException, uno::RuntimeException); virtual void SAL_CALL setPropertyValue( const uno::Any& aValue ) - throw (MalformedDataException, beans::IllegalTypeException, lang::IllegalArgumentException, uno::RuntimeException); + throw (MalformedDataException, lang::WrappedTargetException, uno::RuntimeException); virtual void SAL_CALL setPropertyValueForLocale( const uno::Any& aValue, const OUString & aLocale ) - throw (MalformedDataException, beans::IllegalTypeException, lang::IllegalArgumentException, uno::RuntimeException); + throw (MalformedDataException, lang::WrappedTargetException, uno::RuntimeException); virtual void SAL_CALL addProperty( const OUString& aName, sal_Int16 aAttributes, const uno::Type& aType ) - throw (MalformedDataException, beans::PropertyExistException, beans::IllegalTypeException, lang::IllegalArgumentException, uno::RuntimeException); + throw (MalformedDataException, lang::WrappedTargetException, uno::RuntimeException); virtual void SAL_CALL addPropertyWithValue( const OUString& aName, sal_Int16 aAttributes, const uno::Any& aValue ) - throw (MalformedDataException, beans::PropertyExistException, beans::IllegalTypeException, lang::IllegalArgumentException, uno::RuntimeException); + throw (MalformedDataException, lang::WrappedTargetException, uno::RuntimeException); // XLayer protected: virtual void SAL_CALL readData( const uno::Reference< backenduno::XLayerHandler >& aHandler ) - throw (uno::RuntimeException); + throw (MalformedDataException, lang::NullPointerException, lang::WrappedTargetException, uno::RuntimeException); // new overrideable private: -- cgit