INTEGRATION: CWS binfilter (1.2.22); FILE MERGED

2004/04/19 09:46:23 aw 1.2.22.1: #110098#
Necessary adaptions to framework after resynching binfilter to SRC680m33

3 files changed, 45 insertions, 13 deletions

diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx
index bbb0e576666c..add917cfda7a 100644
--- a/framework/inc/uielement/menubarwrapper.hxx
+++ b/framework/inc/uielement/menubarwrapper.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: menubarwrapper.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: kz $ $Date: 2004-02-25 17:37:56 $
+ *  last change: $Author: rt $ $Date: 2004-05-03 13:18:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -100,9 +100,14 @@ namespace framework
 class MenuBarWrapper : public UIConfigElementWrapperBase
 {
     public:
-        MenuBarWrapper( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+        // #110897#
+        MenuBarWrapper(
+            const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
         virtual ~MenuBarWrapper();
 
+        // #110897#
+        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory();
+
         MenuBarManager* GetMenuBarManager() const { return static_cast< MenuBarManager* >( m_xMenuBarManager.get() ); }
 
         // XComponent
@@ -119,9 +124,12 @@ class MenuBarWrapper : public UIConfigElementWrapperBase
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException);
 
-    private:
-        com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >    m_xServiceManager;
+private:
+        // #110897# com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >    m_xServiceManager;
         com::sun::star::uno::Reference< com::sun::star::lang::XComponent >              m_xMenuBarManager;
+
+        // #110897#
+        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& mxServiceFactory;
 };
 
 } // namespace framework
diff --git a/framework/inc/xml/eventsconfiguration.hxx b/framework/inc/xml/eventsconfiguration.hxx
index 7c331c32ed76..96377e0e85f3 100644
--- a/framework/inc/xml/eventsconfiguration.hxx
+++ b/framework/inc/xml/eventsconfiguration.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: eventsconfiguration.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: kz $ $Date: 2004-02-25 17:39:26 $
+ *  last change: $Author: rt $ $Date: 2004-05-03 13:18:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,6 +79,11 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #endif
 
+// #110897#
+#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#endif
+
 namespace framework
 {
 
@@ -91,8 +96,15 @@ struct EventsConfig
 class EventsConfiguration
 {
     public:
-        static sal_Bool LoadEventsConfig( SvStream& rInStream, EventsConfig& aItems );
-        static sal_Bool StoreEventsConfig( SvStream& rOutStream, const EventsConfig& aItems );
+        // #110897#
+        static sal_Bool LoadEventsConfig(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
+            SvStream& rInStream, EventsConfig& aItems );
+
+        // #110897#
+        static sal_Bool StoreEventsConfig(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
+            SvStream& rOutStream, const EventsConfig& aItems );
 };
 
 } // namespace framework
diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx
index 598abc2f3877..9ab437d578dc 100644
--- a/framework/inc/xml/imagesconfiguration.hxx
+++ b/framework/inc/xml/imagesconfiguration.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: imagesconfiguration.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: kz $ $Date: 2004-02-25 17:39:46 $
+ *  last change: $Author: rt $ $Date: 2004-05-03 13:18:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,6 +75,11 @@
 #include <tools/color.hxx>
 #endif
 
+// #110897#
+#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#endif
+
 namespace framework
 {
 
@@ -135,8 +140,15 @@ struct ImageListsDescriptor
 class ImagesConfiguration
 {
     public:
-        static sal_Bool LoadImages( SvStream& rInStream, ImageListsDescriptor& aItems );
-        static sal_Bool StoreImages( SvStream& rOutStream, const ImageListsDescriptor& aItems );
+        // #110897#
+        static sal_Bool LoadImages(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
+            SvStream& rInStream, ImageListsDescriptor& aItems );
+
+        // #110897#
+        static sal_Bool StoreImages(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
+            SvStream& rOutStream, const ImageListsDescriptor& aItems );
 };
 
 } // namespace framework