diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-09-25 21:47:16 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-09-25 21:47:16 +0200 |
| commit | 4c8fba36e0b8955ecb49293e6218829ad7cd40a9 (patch) | |
| tree | d24e9d1b546873c85d4f5aaef4b719a315692ca3 /framework/inc/xml/menudocumenthandler.hxx | |
| parent | e3441919174583045e0b7c8110b2a2d4119b66d1 (diff) | |
| parent | 5228b9163b7c889a62b553e543fea51800099f7a (diff) | |
merge commit
Diffstat (limited to 'framework/inc/xml/menudocumenthandler.hxx')
| -rw-r--r-- | framework/inc/xml/menudocumenthandler.hxx | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx index 63e109d2df..b6148ca820 100644 --- a/framework/inc/xml/menudocumenthandler.hxx +++ b/framework/inc/xml/menudocumenthandler.hxx @@ -42,13 +42,14 @@ #include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Sequence.h> +#include <com/sun/star/uno/XComponentContext.hpp> //_________________________________________________________________________________________________________________ // other includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <rtl/ustring.hxx> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase1.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> //_________________________________________________________________________________________________________________ @@ -57,22 +58,13 @@ namespace framework{ -class ReadMenuDocumentHandlerBase : public ::com::sun::star::xml::sax::XDocumentHandler, - public ThreadHelpBase, // Struct for right initalization of mutex member! Must be first of baseclasses. - public ::cppu::OWeakObject +class ReadMenuDocumentHandlerBase : public ThreadHelpBase, // Struct for right initalization of mutex member! Must be first of baseclasses. + public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler > { public: ReadMenuDocumentHandlerBase(); virtual ~ReadMenuDocumentHandlerBase(); - // XInterface - virtual void SAL_CALL acquire() throw() - { OWeakObject::acquire(); } - virtual void SAL_CALL release() throw() - { OWeakObject::release(); } - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException ); - // XDocumentHandler virtual void SAL_CALL startDocument(void) throw ( ::com::sun::star::xml::sax::SAXException, @@ -295,6 +287,7 @@ class OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase sal_Bool m_bMenuMode; com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xMenuContainer; com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory; + com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xComponentContext; NextElementClose m_nNextElementExpected; }; // OReadMenuPopupHandler |