summaryrefslogtreecommitdiff
path: root/framework/inc/uielement/langselectionmenucontroller.hxx
diff options
context:
space:
mode:
authorThomas Lange [tl] <tl@openoffice.org>2010-06-09 14:50:43 +0200
committerThomas Lange [tl] <tl@openoffice.org>2010-06-09 14:50:43 +0200
commitb8c5868b31b52c0ccdcc401342b55c947b19e89d (patch)
tree9cf9d5b464ec7587bcc76f08932665fa2703849f /framework/inc/uielement/langselectionmenucontroller.hxx
parent79333b34480c401e3a43e3add609db5874d0b1a7 (diff)
parente03596eaf693b9809cffe86c21658a5ce381d6c3 (diff)
cws tl74: merge with DEV300_m81
Diffstat (limited to 'framework/inc/uielement/langselectionmenucontroller.hxx')
-rw-r--r--framework/inc/uielement/langselectionmenucontroller.hxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx
index 65f6d6cd5e99..257638ecd77f 100644
--- a/framework/inc/uielement/langselectionmenucontroller.hxx
+++ b/framework/inc/uielement/langselectionmenucontroller.hxx
@@ -32,7 +32,7 @@
// my own includes
//_________________________________________________________________________________________________________________
-#include <helper/popupmenucontrollerbase.hxx>
+#include <macros/xserviceinfo.hxx>
#include <stdtypes.h>
//_________________________________________________________________________________________________________________
@@ -51,6 +51,7 @@
//_________________________________________________________________________________________________________________
// includes of other projects
//_________________________________________________________________________________________________________________
+#include <svtools/popupmenucontrollerbase.hxx>
#include <toolkit/awt/vclxmenu.hxx>
#include <cppuhelper/weak.hxx>
#include <rtl/ustring.hxx>
@@ -59,8 +60,10 @@
namespace framework
{
- class LanguageSelectionMenuController : public PopupMenuControllerBase
+ class LanguageSelectionMenuController : public svt::PopupMenuControllerBase
{
+ using svt::PopupMenuControllerBase::disposing;
+
public:
LanguageSelectionMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
virtual ~LanguageSelectionMenuController();