diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 10:22:27 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 10:22:27 +0000 |
| commit | 0780895f3b70077210d6c34886ea33124240b22a (patch) | |
| tree | b48bef4711a739859d4fde0aca512b7b41889ca3 /framework/source/inc | |
| parent | ff93cc0bda5ac1363b335ccd18564173a29b252b (diff) | |
INTEGRATION: CWS warnings01 (1.3.32); FILE MERGED
2005/10/28 14:48:35 cd 1.3.32.1: #i55991# Warning free code changes for gcc
Diffstat (limited to 'framework/source/inc')
4 files changed, 16 insertions, 16 deletions
diff --git a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx index b2c1367e02..70a0ba06e5 100644 --- a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx @@ -4,9 +4,9 @@ * * $RCSfile: globalacceleratorconfiguration.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-09 01:29:20 $ + * last change: $Author: hr $ $Date: 2006-06-19 11:21:31 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -97,8 +97,8 @@ class GlobalAcceleratorConfiguration : public AcceleratorConfiguration virtual ~GlobalAcceleratorConfiguration(); // XInterface, XTypeProvider, XServiceInfo - DECLARE_XINTERFACE - DECLARE_XTYPEPROVIDER + FWK_DECLARE_XINTERFACE + FWK_DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO //______________________________________ diff --git a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx index 660c4a5aa3..c2973ac552 100644 --- a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx @@ -4,9 +4,9 @@ * * $RCSfile: moduleacceleratorconfiguration.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-09 01:30:06 $ + * last change: $Author: hr $ $Date: 2006-06-19 11:21:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -112,8 +112,8 @@ class ModuleAcceleratorConfiguration : public AcceleratorConfiguration virtual ~ModuleAcceleratorConfiguration(); // XInterface, XTypeProvider, XServiceInfo - DECLARE_XINTERFACE - DECLARE_XTYPEPROVIDER + FWK_DECLARE_XINTERFACE + FWK_DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO // XInitialization diff --git a/framework/source/inc/loadenv/loaddispatchlistener.hxx b/framework/source/inc/loadenv/loaddispatchlistener.hxx index 0a9e53396f..4c8d38f8e2 100644 --- a/framework/source/inc/loadenv/loaddispatchlistener.hxx +++ b/framework/source/inc/loadenv/loaddispatchlistener.hxx @@ -4,9 +4,9 @@ * * $RCSfile: loaddispatchlistener.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-09 01:32:08 $ + * last change: $Author: hr $ $Date: 2006-06-19 11:22:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -171,7 +171,7 @@ class LoadDispatchListener : public css::frame::XDispatchResultListener // => c //_______________________________________ // css.uno.XInterface - DECLARE_XINTERFACE + FWK_DECLARE_XINTERFACE //_______________________________________ // css.frame.XDispatchResultListener diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx index 603879a1d0..7fe34771f7 100644 --- a/framework/source/inc/loadenv/targethelper.hxx +++ b/framework/source/inc/loadenv/targethelper.hxx @@ -4,9 +4,9 @@ * * $RCSfile: targethelper.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-09 01:32:49 $ + * last change: $Author: hr $ $Date: 2006-06-19 11:22:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -41,7 +41,7 @@ #include <sal/types.h> #include <rtl/ustring.hxx> - +#include <targets.h> //_______________________________________________ // namespace @@ -50,7 +50,7 @@ namespace framework{ //_______________________________________________ // const - +/* see definitions in targets.h #define SPECIALTARGET_SELF ::rtl::OUString::createFromAscii("_self" ) #define SPECIALTARGET_PARENT ::rtl::OUString::createFromAscii("_parent" ) #define SPECIALTARGET_TOP ::rtl::OUString::createFromAscii("_top" ) @@ -60,7 +60,7 @@ namespace framework{ #define SPECIALTARGET_MENUBAR ::rtl::OUString::createFromAscii("_menubar" ) #define SPECIALTARGET_HELPAGENT ::rtl::OUString::createFromAscii("_helpagent" ) #define SPECIALTARGET_HELPTASK ::rtl::OUString::createFromAscii("OFFICE_HELP_TASK") - +*/ //_______________________________________________ // definitions |