summaryrefslogtreecommitdiff
path: root/framework/source/uielement/langselectionstatusbarcontroller.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'framework/source/uielement/langselectionstatusbarcontroller.cxx')
-rw-r--r--framework/source/uielement/langselectionstatusbarcontroller.cxx15
1 files changed, 8 insertions, 7 deletions
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 3edc7466942a..a2a3a02877ca 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -70,7 +70,7 @@
#include <toolkit/unohlp.hxx>
#include <tools/gen.hxx>
#include <com/sun/star/awt/Command.hpp>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
#include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
#include <dispatch/uieventloghelper.hxx>
@@ -277,11 +277,12 @@ throw (::com::sun::star::uno::RuntimeException)
com::sun::star::awt::Rectangle aRectangle;
Window* pWindow = VCLUnoHelper::GetWindow( m_xParentWindow );
- const Point aMousePos = pWindow->GetPointerPosPixel();
- aRectangle.X = aMousePos.X();
- aRectangle.Y = aMousePos.Y();
- sal_Int16 nId = xPopupMenu->execute( xParent, aRectangle, com::sun::star::awt::PopupMenuDirection::EXECUTE_UP+16 );
- if ( m_xFrame.is() )
+ const Point mMousePos = pWindow->GetPointerPosPixel();
+ mRectangle.X = mMousePos.X();
+ mRectangle.Y = mMousePos.Y();
+ sal_Int16 nId = xPopupMenu->execute( xParent, mRectangle, com::sun::star::awt::PopupMenuDirection::EXECUTE_UP+16 );
+ //click "More..."
+ if ( nId && m_xFrame.is() )
{
uno::Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
util::URL aURL;
@@ -392,7 +393,7 @@ throw ( RuntimeException )
// - It displays the language in use in the status bar
// - and it stores the relevant data for creating the menu
// at some later point in the member variables
- // m_nScriptType, m_aCurLang, m_aKeyboardLang, m_aGuessedText
+ // m_nScriptType, m_aCurLang, m_aKeyboardLang, m_aGuessedText
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "LangSelectionStatusbarController::statusChanged" );
vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );