diff options
| author | Niklas Nebel <nn@openoffice.org> | 2010-06-10 10:33:55 +0200 |
|---|---|---|
| committer | Niklas Nebel <nn@openoffice.org> | 2010-06-10 10:33:55 +0200 |
| commit | 88e530cb0c153655e43a5ee557421dc8dbdf2002 (patch) | |
| tree | 79e1db44b816aa0c5c94de31410ecd64b0f4c686 /framework/inc/uielement/objectmenucontroller.hxx | |
| parent | a8edc64ce0b3e6238a704218b84247a5e63dedbb (diff) | |
| parent | e03596eaf693b9809cffe86c21658a5ce381d6c3 (diff) | |
calc55: merge with DEV300_m81
Diffstat (limited to 'framework/inc/uielement/objectmenucontroller.hxx')
| -rw-r--r-- | framework/inc/uielement/objectmenucontroller.hxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/framework/inc/uielement/objectmenucontroller.hxx b/framework/inc/uielement/objectmenucontroller.hxx index 94c1d849e197..7a03dfd1458e 100644 --- a/framework/inc/uielement/objectmenucontroller.hxx +++ b/framework/inc/uielement/objectmenucontroller.hxx @@ -32,7 +32,7 @@ // my own includes //_________________________________________________________________________________________________________________ -#include <helper/popupmenucontrollerbase.hxx> +#include <macros/xserviceinfo.hxx> #include <stdtypes.h> //_________________________________________________________________________________________________________________ @@ -51,14 +51,17 @@ //_________________________________________________________________________________________________________________ // includes of other projects //_________________________________________________________________________________________________________________ +#include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> #include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> namespace framework { - class ObjectMenuController : public PopupMenuControllerBase + class ObjectMenuController : public svt::PopupMenuControllerBase { + using svt::PopupMenuControllerBase::disposing; + public: ObjectMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); virtual ~ObjectMenuController(); |