summaryrefslogtreecommitdiff
path: root/framework/inc/uielement/langselectionmenucontroller.hxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2009-12-16 14:13:32 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2009-12-16 14:13:32 +0000
commita49dd6e1a4ff5e931c0e062958829442d864db72 (patch)
tree53c84fe6805b0ef57e7cea0b95fe645519bf1fb3 /framework/inc/uielement/langselectionmenucontroller.hxx
parente640bf3c6d47ead0b1249c87ed828d0730533c94 (diff)
parentab33e14647ada2a32624fa39ec0ddbbbdc694df5 (diff)
tl74: merge with DEV300 m60
Diffstat (limited to 'framework/inc/uielement/langselectionmenucontroller.hxx')
-rw-r--r--framework/inc/uielement/langselectionmenucontroller.hxx9
1 files changed, 2 insertions, 7 deletions
diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx
index f9cec2dfb814..ff8083ce6714 100644
--- a/framework/inc/uielement/langselectionmenucontroller.hxx
+++ b/framework/inc/uielement/langselectionmenucontroller.hxx
@@ -72,7 +72,6 @@ namespace framework
DECLARE_XSERVICEINFO
// XPopupMenuController
- virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException);
// XInitialization
@@ -81,16 +80,12 @@ namespace framework
// XStatusListener
virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
- // XMenuListener
- virtual void SAL_CALL highlight( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL deactivate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-
// XEventListener
virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
private:
+ virtual void impl_setPopupMenu();
+ virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL);
enum Mode
{
MODE_SetLanguageSelectionMenu,