diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-05-03 12:17:54 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-05-03 12:17:54 +0000 |
| commit | 472a0590bfd7ba3e64ff87806074dc10a07fe656 (patch) | |
| tree | e5ce8db64afb31c368490d9b25aca4b32626c4ef /framework | |
| parent | 70a9a71efa55b50062a6237f0dbaf64dbb8e6c74 (diff) | |
INTEGRATION: CWS binfilter (1.5.140); FILE MERGED
2004/04/19 09:46:22 aw 1.5.140.1: #110098#
Necessary adaptions to framework after resynching binfilter to SRC680m33
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/services/menudocumenthandler.hxx | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/framework/inc/services/menudocumenthandler.hxx b/framework/inc/services/menudocumenthandler.hxx index b5c154539c24..a07aeac5c5fa 100644 --- a/framework/inc/services/menudocumenthandler.hxx +++ b/framework/inc/services/menudocumenthandler.hxx @@ -2,9 +2,9 @@ * * $RCSfile: menudocumenthandler.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hr $ $Date: 2001-10-09 18:30:49 $ + * last change: $Author: rt $ $Date: 2004-05-03 13:17:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,6 +90,11 @@ #include <cppuhelper/weak.hxx> #endif +// #110897# +#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#endif + //_________________________________________________________________________________________________________________ // namespace //_________________________________________________________________________________________________________________ @@ -160,9 +165,15 @@ class ReadMenuDocumentHandlerBase : public ::com::sun::star::xml::sax::XDocument class OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase { public: - OReadMenuDocumentHandler( MenuBar* pMenuBar ); + // #110897# + OReadMenuDocumentHandler( + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, + MenuBar* pMenuBar ); virtual ~OReadMenuDocumentHandler(); + // #110897# + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory(); + // XDocumentHandler virtual void SAL_CALL startDocument(void) throw ( ::com::sun::star::xml::sax::SAXException, @@ -191,15 +202,24 @@ class OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase int m_nElementDepth; sal_Bool m_bMenuBarMode; MenuBar* m_pMenuBar; + + // #110897# + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& mxServiceFactory; }; // OReadMenuDocumentHandler class OReadMenuBarHandler : public ReadMenuDocumentHandlerBase { public: - OReadMenuBarHandler( MenuBar* pMenuBar, USHORT* pItemId ); + // #110897# + OReadMenuBarHandler( + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, + MenuBar* pMenuBar, USHORT* pItemId ); virtual ~OReadMenuBarHandler(); + // #110897# + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory(); + // XDocumentHandler virtual void SAL_CALL startDocument(void) throw ( ::com::sun::star::xml::sax::SAXException, @@ -228,6 +248,9 @@ class OReadMenuBarHandler : public ReadMenuDocumentHandlerBase int m_nElementDepth; sal_Bool m_bMenuMode; MenuBar* m_pMenuBar; + + // #110897# + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& mxServiceFactory; }; // OReadMenuBarHandler |