diff options
author | Kurt Zenker <kz@openoffice.org> | 2005-03-01 18:37:19 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2005-03-01 18:37:19 +0000 |
commit | d2fd6f65e9412b6dd939d6efa72bfc952469e70e (patch) | |
tree | 3596b7ce4d7f44e03f04886ce96d8db8d2d71efe | |
parent | 6863ceda910ae5bdfbd11f92bb020349b445d989 (diff) |
INTEGRATION: CWS removedrafts (1.2.114); FILE MERGED
2005/02/17 12:47:41 cd 1.2.114.1: #i42557# move UNOIDL types from drafts to com
-rw-r--r-- | framework/source/inc/accelerators/acceleratorconfiguration.hxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index df24de669d3a..4d96ed4ab0a5 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -2,9 +2,9 @@ * * $RCSfile: acceleratorconfiguration.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2004-09-20 10:07:04 $ + * last change: $Author: kz $ $Date: 2005-03-01 19:37:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -108,20 +108,20 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_UI_XACCELERATORCONFIGURATION_HPP_ -#include <drafts/com/sun/star/ui/XAcceleratorConfiguration.hpp> +#ifndef _COM_SUN_STAR_UI_XACCELERATORCONFIGURATION_HPP_ +#include <com/sun/star/ui/XAcceleratorConfiguration.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_UI_XUICONFIGURATION_HPP_ -#include <drafts/com/sun/star/ui/XUIConfiguration.hpp> +#ifndef _COM_SUN_STAR_UI_XUICONFIGURATION_HPP_ +#include <com/sun/star/ui/XUIConfiguration.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_UI_XUICONFIGURATIONPERSISTENCE_HPP_ -#include <drafts/com/sun/star/ui/XUIConfigurationPersistence.hpp> +#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONPERSISTENCE_HPP_ +#include <com/sun/star/ui/XUIConfigurationPersistence.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_UI_XUICONFIGURATIONSTORAGE_HDL_ -#include <drafts/com/sun/star/ui/XUIConfigurationStorage.hpp> +#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONSTORAGE_HDL_ +#include <com/sun/star/ui/XUIConfigurationStorage.hpp> #endif #ifndef _COM_SUN_STAR_IO_XSTREAM_HPP_ @@ -171,9 +171,9 @@ class AcceleratorConfiguration : protected ThreadHelpBase , public ::cppu::OWeakObject , public css::lang::XTypeProvider , public css::form::XReset // TODO use XPresetHandler instead if available - , public dcss::ui::XAcceleratorConfiguration // => dcss::ui::XUIConfigurationPersistence - // dcss::ui::XUIConfigurationStorage - // dcss::ui::XUIConfiguration + , public css::ui::XAcceleratorConfiguration // => css::ui::XUIConfigurationPersistence + // css::ui::XUIConfigurationStorage + // css::ui::XUIConfiguration { //______________________________________ // member @@ -276,10 +276,10 @@ class AcceleratorConfiguration : protected ThreadHelpBase throw(css::uno::RuntimeException); // XUIConfiguration - virtual void SAL_CALL addConfigurationListener(const css::uno::Reference< dcss::ui::XUIConfigurationListener >& xListener) + virtual void SAL_CALL addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener) throw(css::uno::RuntimeException); - virtual void SAL_CALL removeConfigurationListener(const css::uno::Reference< dcss::ui::XUIConfigurationListener >& xListener) + virtual void SAL_CALL removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener) throw(css::uno::RuntimeException); // XReset |