INTEGRATION: CWS fwk82_SRC680 (1.2.24); FILE MERGED

2008/01/15 08:33:17 tl 1.2.24.1: #i85162#, #i84940#, #i84939# fix language guessing and disbale menus for non-text content

1 files changed, 14 insertions, 7 deletions

diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx
index 5606845e4485..b1f7954b3e23 100644
--- a/framework/inc/uielement/langselectionmenucontroller.hxx
+++ b/framework/inc/uielement/langselectionmenucontroller.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: langselectionmenucontroller.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: ihi $ $Date: 2007-11-23 16:46:07 $
+ *  last change: $Author: rt $ $Date: 2008-01-29 16:08:53 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -84,6 +84,10 @@
 #include <com/sun/star/frame/XPopupMenuController.hpp>
 #endif
 
+#ifndef _COM_SUN_STAR_LINGUISTIC2_XLANGUAGEGUESSING_HPP_
+#include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
+#endif
+
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
@@ -138,6 +142,8 @@ namespace framework
                 MODE_SetLanguageAllTextMenu
             };
 
+            sal_Bool                                                               m_bShowMenu;
+            ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing >    m_xLanguageGuesser;
             ::rtl::OUString                                                        m_aLangStatusCommandURL;
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xLanguageDispatch;
             ::rtl::OUString                                                        m_aMenuCommandURL_Lang;
@@ -146,11 +152,12 @@ namespace framework
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xMenuDispatch_Font;
             ::rtl::OUString                                                        m_aMenuCommandURL_CharDlgForParagraph;
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xMenuDispatch_CharDlgForParagraph;
-            ::rtl::OUString m_aCurrentLanguage;
-            ::rtl::OUString curLang;
-            sal_Int16 nScriptType;
-            ::rtl::OUString keyboardLang;
-            ::rtl::OUString guessedText;
+            ::rtl::OUString     m_aCurrentLanguage;
+            ::rtl::OUString     m_aCurLang;
+            sal_Int16           m_nScriptType;
+            ::rtl::OUString     m_aKeyboardLang;
+            ::rtl::OUString     m_aGuessedText;
+
             void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const Mode rMode );
     };
 }