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

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
 
     //______________________________________

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

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

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