INTEGRATION: CWS warnings01 (1.4.32); FILE MERGED

2005/10/28 14:48:23 cd 1.4.32.1: #i55991# Warning free code changes for gcc

3 files changed, 12 insertions, 12 deletions

diff --git a/framework/inc/uifactory/addonstoolboxfactory.hxx b/framework/inc/uifactory/addonstoolboxfactory.hxx
index 0a5624f1518d..4bedfde03493 100644
--- a/framework/inc/uifactory/addonstoolboxfactory.hxx
+++ b/framework/inc/uifactory/addonstoolboxfactory.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: addonstoolboxfactory.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 00:49:05 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 11:06:44 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -130,9 +130,9 @@ class AddonsToolBoxFactory :  public com::sun::star::lang::XTypeProvider
         virtual ~AddonsToolBoxFactory();
 
         //  XInterface, XTypeProvider, XServiceInfo
-        DECLARE_XINTERFACE
+        FWK_DECLARE_XINTERFACE
         DECLARE_XSERVICEINFO
-        DECLARE_XTYPEPROVIDER
+        FWK_DECLARE_XTYPEPROVIDER
 
         // XUIElementFactory
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
diff --git a/framework/inc/uifactory/menubarfactory.hxx b/framework/inc/uifactory/menubarfactory.hxx
index ab46cf43b6c0..830fad93c14b 100644
--- a/framework/inc/uifactory/menubarfactory.hxx
+++ b/framework/inc/uifactory/menubarfactory.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: menubarfactory.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 00:49:19 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 11:06:56 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -121,9 +121,9 @@ namespace framework
             virtual ~MenuBarFactory();
 
             //  XInterface, XTypeProvider, XServiceInfo
-            DECLARE_XINTERFACE
+            FWK_DECLARE_XINTERFACE
             DECLARE_XSERVICEINFO
-            DECLARE_XTYPEPROVIDER
+            FWK_DECLARE_XTYPEPROVIDER
 
             // XUIElementFactory
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
diff --git a/framework/inc/uifactory/statusbarcontrollerfactory.hxx b/framework/inc/uifactory/statusbarcontrollerfactory.hxx
index e98a3f48d10b..8d2202491441 100644
--- a/framework/inc/uifactory/statusbarcontrollerfactory.hxx
+++ b/framework/inc/uifactory/statusbarcontrollerfactory.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: statusbarcontrollerfactory.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 00:49:50 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 11:07:22 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -119,8 +119,8 @@ class StatusbarControllerFactory :  public com::sun::star::lang::XTypeProvider
         virtual ~StatusbarControllerFactory();
 
         //  XInterface, XTypeProvider, XServiceInfo
-        DECLARE_XINTERFACE
-        DECLARE_XTYPEPROVIDER
+        FWK_DECLARE_XINTERFACE
+        FWK_DECLARE_XTYPEPROVIDER
         DECLARE_XSERVICEINFO
 
         // XMultiComponentFactory