#106019# 'reset languages' menu entry

9 files changed, 439 insertions, 384 deletions

diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc
index 37e71f2bacad..18286e792443 100644
--- a/framework/inc/classes/resource.hrc
+++ b/framework/inc/classes/resource.hrc
@@ -58,6 +58,7 @@
 #define STR_SET_LANGUAGE_FOR_PARAGRAPH          (RID_STR_START+19)
 #define STR_SET_LANGUAGE_FOR_ALL_TEXT           (RID_STR_START+20)
 #define STR_UNTITLED_DOCUMENT                   (RID_STR_START+21)
+#define STR_RESET_TO_DEFAULT_LANGUAGE           (RID_STR_START+22)
 
 #define POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION    (RID_MENU_START+0)
 
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index 435b87a4f248..ff4cf43572fa 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -37,10 +37,56 @@
 

 #include <i18npool/lang.h>

 #include <svtools/languageoptions.hxx>

+#include <rtl/ustring.hxx>

+

+#include <set>

+

+class SvtLanguageTable;

+

+

+// flags for script types in use within selection

+#define LS_SCRIPT_LATIN     0x0001

+#define LS_SCRIPT_ASIAN     0x0002

+#define LS_SCRIPT_COMPLEX   0x0004

+

 

 namespace framework

 {

 

+// menu ids for language status bar control

+enum LangMenuIDs

+{

+    MID_LANG_SEL_1,

+    MID_LANG_SEL_2,

+    MID_LANG_SEL_3,

+    MID_LANG_SEL_4,

+    MID_LANG_SEL_5,

+    MID_LANG_SEL_6,

+    MID_LANG_SEL_7,

+    MID_LANG_SEL_8,

+    MID_LANG_SEL_9,

+    MID_LANG_SEL_NONE,

+    MID_LANG_SEL_RESET,

+    MID_LANG_SEL_MORE,

+

+    MID_LANG_PARA_SEPERATOR,

+    MID_LANG_PARA_STRING,

+

+    MID_LANG_PARA_1,

+    MID_LANG_PARA_2,

+    MID_LANG_PARA_3,

+    MID_LANG_PARA_4,

+    MID_LANG_PARA_5,

+    MID_LANG_PARA_6,

+    MID_LANG_PARA_7,

+    MID_LANG_PARA_8,

+    MID_LANG_PARA_9,

+    MID_LANG_PARA_NONE,

+    MID_LANG_PARA_RESET,

+    MID_LANG_PARA_MORE,

+};

+    

+    

 inline bool IsScriptTypeMatchingToLanguage( sal_Int16 nScriptType, LanguageType nLang )

 {

     return 0 != (nScriptType & SvtLanguageOptions::GetScriptTypeOfLanguage( nLang ));

@@ -66,6 +112,15 @@ public:
             ,sal_Bool& _rIni
             ,const sal_Char* _pName);

 

+void FillLangItems( std::set< ::rtl::OUString > &rLangItems,

+        const SvtLanguageTable &rLanguageTable,

+        const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > &rxFrame,

+        const LanguageGuessingHelper & rLangGuessHelper,

+        sal_Int16               nScriptType,

+        const ::rtl::OUString & rCurLang,

+        const ::rtl::OUString & rKeyboardLang,

+        const ::rtl::OUString & rGuessedTextLang );

+

 } // namespace framework

 

 #endif // __MISC_HELPER_HXX_

diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx
index ff8083ce6714..de0fabccecd4 100644
--- a/framework/inc/uielement/langselectionmenucontroller.hxx
+++ b/framework/inc/uielement/langselectionmenucontroller.hxx
@@ -102,11 +102,10 @@ 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     m_aCurLang;
             sal_Int16           m_nScriptType;
             ::rtl::OUString     m_aKeyboardLang;
-            ::rtl::OUString     m_aGuessedText;
+            ::rtl::OUString     m_aGuessedTextLang;
             LanguageGuessingHelper      m_aLangGuessHelper;
 
             void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const Mode rMode );
diff --git a/framework/inc/uielement/langselectionstatusbarcontroller.hxx b/framework/inc/uielement/langselectionstatusbarcontroller.hxx
index 0b9df06c8877..e74fe9bb729b 100644
--- a/framework/inc/uielement/langselectionstatusbarcontroller.hxx
+++ b/framework/inc/uielement/langselectionstatusbarcontroller.hxx
@@ -38,9 +38,15 @@
 #include <stdtypes.h>
 #include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
 #include <svtools/statusbarcontroller.hxx>
+#include <rtl/ustring.hxx>
 
 #include "helper/mischelper.hxx"
 
+#include <set>
+
+class SvtLanguageTable;
+
+
 // component helper namespace
 namespace framework {
 
@@ -89,12 +95,11 @@ class LangSelectionStatusbarController : public svt::StatusbarController
         void operator =(LangSelectionStatusbarController &); // not defined
 
 
-        sal_Bool            m_bShowMenu;
-        sal_Int16           m_nScriptType;
-        ::rtl::OUString     m_aCurrentLanguage;
-        ::rtl::OUString     m_aCurLang;
-        ::rtl::OUString     m_aKeyboardLang;
-        ::rtl::OUString     m_aGuessedText;
+        sal_Bool            m_bShowMenu;        // if the menu is to be displayed or not (depending on the selected object/text)
+        sal_Int16           m_nScriptType;      // the flags for the different script types available in the selection, LATIN = 0x0001, ASIAN = 0x0002, COMPLEX = 0x0004
+        ::rtl::OUString     m_aCurLang;         // the language of the current selection, "*" if there are more than one languages
+        ::rtl::OUString     m_aKeyboardLang;    // the keyboard language
+        ::rtl::OUString     m_aGuessedTextLang;     // the 'guessed' language for the selection, "" if none could be guessed
         LanguageGuessingHelper      m_aLangGuessHelper;
 
         void LangMenu() throw (::com::sun::star::uno::RuntimeException);
diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src
index 0947abbe9288..3d4a817c85b7 100644
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.src
@@ -330,6 +330,11 @@ String STR_LANGSTATUS_NONE
     Text [ en-US ] = "None (Do not check spelling)" ;
     Text [ x-comment ] = " ";
 };
+String STR_RESET_TO_DEFAULT_LANGUAGE
+{
+    Text [ en-US ] = "Reset to Default Language" ;
+    Text [ x-comment ] = " ";
+};
 String STR_LANGSTATUS_MORE
 {
     Text [ en-US ] = "More..." ;
diff --git a/framework/source/helper/mischelper.cxx b/framework/source/helper/mischelper.cxx
index 8e0f79b2607c..8d85873a92e9 100644
--- a/framework/source/helper/mischelper.cxx
+++ b/framework/source/helper/mischelper.cxx
@@ -32,21 +32,29 @@
 #include "precompiled_framework.hxx"

 

 #include <com/sun/star/lang/XMultiServiceFactory.hpp>

-#include <com/sun/star/frame/XModuleManager.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/document/XDocumentLanguages.hpp>

+#include <com/sun/star/frame/XModuleManager.hpp>

+#include <com/sun/star/beans/PropertyValue.hpp>

 

 #include <tools/debug.hxx>

+#include <vcl/settings.hxx>

+#include <vcl/svapp.hxx>

+#include <i18npool/mslangid.hxx>

+#include <svtools/langtab.hxx>

 #include <comphelper/processfactory.hxx>

 #include <helper/mischelper.hxx>

 #include <services.h>

 

 

 using namespace ::com::sun::star;

-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;

+using namespace ::com::sun::star::frame;

+using namespace ::com::sun::star::beans;

+using namespace ::com::sun::star::container;

+using namespace ::com::sun::star::lang;

+

+using ::rtl::OUString;

+

 

 namespace framework

 {

@@ -71,74 +79,162 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues
     return m_xLanguageGuesser;

 }

 

-::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL
-            ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&    _xServiceFactory
-            ,::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >&        _xUICommandLabels
-            ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame
-            ,::rtl::OUString& _rModuleIdentifier
-            ,sal_Bool& _rIni
-            ,const sal_Char* _pName)
-{
-    ::rtl::OUString aLabel;
-
-    // Retrieve popup menu labels
-    if ( !_xUICommandLabels.is() )
-    {
-        try
-        {
-            if ( !_rIni )
-            {
-                _rIni = sal_True;
-                Reference< XModuleManager > xModuleManager( _xServiceFactory->createInstance( SERVICENAME_MODULEMANAGER ), UNO_QUERY_THROW );
-
-                try
-                {
-                    _rModuleIdentifier = xModuleManager->identify( _xFrame );
-                }
-                catch( Exception& )
-                {
-                }
-            }
-
-            Reference< XNameAccess > xNameAccess( _xServiceFactory->createInstance( SERVICENAME_UICOMMANDDESCRIPTION ), UNO_QUERY );
-            if ( xNameAccess.is() )
-            {
-                xNameAccess->getByName( _rModuleIdentifier ) >>= _xUICommandLabels;
-            }
-        }
-        catch ( Exception& )
-        {
-        }
-    }
-
-    if ( _xUICommandLabels.is() )
-    {
-        try
-        {
-            if ( aCmdURL.getLength() > 0 )
-            {
-                rtl::OUString aStr;
-                Sequence< PropertyValue > aPropSeq;
-                if ( _xUICommandLabels->getByName( aCmdURL ) >>= aPropSeq )
-                {
-                    for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
-                    {
-                        if ( aPropSeq[i].Name.equalsAscii( _pName/*"Label"*/ ))
-                        {
-                            aPropSeq[i].Value >>= aStr;
-                            break;
-                        }
-                    }
-                }
-                aLabel = aStr;
-            }
-        }
-        catch ( com::sun::star::uno::Exception& )
-        {
-        }
-    }
-
-    return aLabel;
+////////////////////////////////////////////////////////////

+

+::rtl::OUString RetrieveLabelFromCommand( 

+    const ::rtl::OUString& aCmdURL,

+    const uno::Reference< lang::XMultiServiceFactory >& _xServiceFactory,

+    uno::Reference< container::XNameAccess >& _xUICommandLabels,

+    const uno::Reference< frame::XFrame >& _xFrame,

+    ::rtl::OUString& _rModuleIdentifier,

+    sal_Bool& _rIni,

+    const sal_Char* _pName)

+{

+    ::rtl::OUString aLabel;

+

+    // Retrieve popup menu labels

+    if ( !_xUICommandLabels.is() )

+    {

+      try

+        {

+            if ( !_rIni )

+            {

+                _rIni = sal_True;

+                Reference< XModuleManager > xModuleManager( _xServiceFactory->createInstance( SERVICENAME_MODULEMANAGER ), UNO_QUERY_THROW );

+

+                try

+                {

+                    _rModuleIdentifier = xModuleManager->identify( _xFrame );

+                }

+                catch( Exception& )

+                {

+                }

+            }

+

+            Reference< XNameAccess > xNameAccess( _xServiceFactory->createInstance( SERVICENAME_UICOMMANDDESCRIPTION ), UNO_QUERY );

+            if ( xNameAccess.is() )

+            {

+                xNameAccess->getByName( _rModuleIdentifier ) >>= _xUICommandLabels;

+            }

+        }

+        catch ( Exception& )

+        {

+        }

+    }

+

+    if ( _xUICommandLabels.is() )

+    {

+        try

+        {

+            if ( aCmdURL.getLength() > 0 )

+            {

+                rtl::OUString aStr;

+                Sequence< PropertyValue > aPropSeq;

+                if ( _xUICommandLabels->getByName( aCmdURL ) >>= aPropSeq )

+                {

+                    for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )

+                    {

+                        if ( aPropSeq[i].Name.equalsAscii( _pName/*"Label"*/ ))

+                        {

+                            aPropSeq[i].Value >>= aStr;

+                            break;

+                        }

+                    }

+                }

+                aLabel = aStr;

+            }

+        }

+        catch ( com::sun::star::uno::Exception& )

+        {

+        }

+    }

+

+    return aLabel;

+}

+    

+////////////////////////////////////////////////////////////

+

+void FillLangItems( std::set< OUString > &rLangItems, 

+        const SvtLanguageTable &    rLanguageTable,

+        const uno::Reference< frame::XFrame > & rxFrame,

+        const LanguageGuessingHelper & rLangGuessHelper,

+        sal_Int16        nScriptType,

+        const OUString & rCurLang,

+        const OUString & rKeyboardLang,

+        const OUString & rGuessedTextLang )

+{

+    rLangItems.clear();

+

+    //1--add current language

+    if( rCurLang != OUString() &&

+        LANGUAGE_DONTKNOW != rLanguageTable.GetType( rCurLang ))

+        rLangItems.insert( rCurLang );

+

+    //2--System

+    const AllSettings& rAllSettings = Application::GetSettings();

+    LanguageType rSystemLanguage = rAllSettings.GetLanguage();

+    if( rSystemLanguage != LANGUAGE_DONTKNOW )

+    {

+        if ( IsScriptTypeMatchingToLanguage( nScriptType, rSystemLanguage ))

+            rLangItems.insert( OUString( rLanguageTable.GetString( rSystemLanguage )) );

+    }

+

+    //3--UI

+    LanguageType rUILanguage = rAllSettings.GetUILanguage();

+    if( rUILanguage != LANGUAGE_DONTKNOW )

+    {

+        if ( IsScriptTypeMatchingToLanguage( nScriptType, rUILanguage ))

+            rLangItems.insert( OUString( rLanguageTable.GetString( rUILanguage )) );

+    }

+

+    //4--guessed language

+    uno::Reference< linguistic2::XLanguageGuessing > xLangGuesser( rLangGuessHelper.GetGuesser() );

+    if ( xLangGuesser.is() && rGuessedTextLang.getLength() > 0)

+    {

+        ::com::sun::star::lang::Locale aLocale(xLangGuesser->guessPrimaryLanguage( rGuessedTextLang, 0, rGuessedTextLang.getLength()) );

+        LanguageType nLang = MsLangId::convertLocaleToLanguageWithFallback( aLocale );

+        if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_NONE && nLang != LANGUAGE_SYSTEM

+            && IsScriptTypeMatchingToLanguage( nScriptType, nLang ))

+            rLangItems.insert( rLanguageTable.GetString( nLang ));

+    }

+

+    //5--keyboard language

+    if( rKeyboardLang != OUString())

+    {

+        if ( IsScriptTypeMatchingToLanguage( nScriptType, rLanguageTable.GetType( rKeyboardLang )))

+            rLangItems.insert( rKeyboardLang );

+    }

+

+    //6--all languages used in current document

+    Reference< com::sun::star::frame::XModel > xModel;

+    if ( rxFrame.is() )

+    {

+       Reference< com::sun::star::frame::XController > xController( rxFrame->getController(), UNO_QUERY );

+       if ( xController.is() )

+           xModel = xController->getModel();

+    }

+    Reference< document::XDocumentLanguages > xDocumentLanguages( xModel, UNO_QUERY );

+    /*the description of nScriptType

+      LATIN :   0x001

+      ASIAN :   0x002

+      COMPLEX:  0x004

+    */

+    const sal_Int16 nMaxCount = 7;

+    if ( xDocumentLanguages.is() )

+    {

+        Sequence< Locale > rLocales( xDocumentLanguages->getDocumentLanguages( nScriptType, nMaxCount ));

+        if ( rLocales.getLength() > 0 )

+        {

+            for ( USHORT i = 0; i < rLocales.getLength(); ++i )

+            {

+                if ( rLangItems.size() == static_cast< size_t >(nMaxCount) )

+                    break;

+                const Locale& rLocale=rLocales[i];

+                if( IsScriptTypeMatchingToLanguage( nScriptType, rLanguageTable.GetType( rLocale.Language )))

+                    rLangItems.insert( OUString( rLocale.Language ) );

+            }

+        }

+    }

 }

     

 } // namespace framework

diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index 555682677e33..8d5e5b6ddfce 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -30,6 +30,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
+
 #include <uielement/langselectionmenucontroller.hxx>
 
 //_________________________________________________________________________________________________________________
@@ -66,7 +67,7 @@
 #include <com/sun/star/document/XDocumentLanguages.hpp>
 #include <com/sun/star/frame/XPopupMenuController.hpp>
 #include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
-#include <map>
+
 #include <i18npool/mslangid.hxx>
 #include <svtools/languageoptions.hxx>
 #include <com/sun/star/awt/MenuItemStyle.hpp>
@@ -80,6 +81,9 @@
 
 #include "helper/mischelper.hxx"
 
+#include <map>
+#include <set>

+
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
@@ -91,6 +95,7 @@ using namespace com::sun::star::frame;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::util;
 
+using ::rtl::OUString;
 
 namespace framework
 {
@@ -105,8 +110,8 @@ DEFINE_INIT_SERVICE                     (   LanguageSelectionMenuController, {}
 
 LanguageSelectionMenuController::LanguageSelectionMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
     PopupMenuControllerBase( xServiceManager ),
-    m_bShowMenu( sal_True )
-    ,m_aLangGuessHelper(xServiceManager)
+    m_bShowMenu( sal_True ),
+    m_aLangGuessHelper(xServiceManager)
 {
 }
 
@@ -139,25 +144,21 @@ void SAL_CALL LanguageSelectionMenuController::statusChanged( const FeatureState
         return;
 
     m_bShowMenu = sal_True;
-    m_nScriptType=7;//set the default value
+    m_nScriptType = LS_SCRIPT_LATIN | LS_SCRIPT_ASIAN | LS_SCRIPT_COMPLEX;  //set the default value
 
-    rtl::OUString               aStrValue;
-    Sequence< ::rtl::OUString > aSeq;
+    OUString               aStrValue;
+    Sequence< OUString > aSeq;
 
-    if ( Event.State >>= aStrValue )
-    {
-        m_aCurrentLanguage=aStrValue;
-    }
-    else if ( Event.State >>= aSeq )
+    if ( Event.State >>= aSeq )
     {
         if ( aSeq.getLength() == 4 )
         {
             // Retrieve all other values from the sequence and
             // store it members!
-            m_aCurLang=aSeq[0];
-            m_nScriptType= static_cast< sal_Int16 >(aSeq[1].toInt32());
-            m_aKeyboardLang=aSeq[2];
-            m_aGuessedText=aSeq[3];
+            m_aCurLang          = aSeq[0];
+            m_nScriptType       = static_cast< sal_Int16 >(aSeq[1].toInt32());
+            m_aKeyboardLang     = aSeq[2];
+            m_aGuessedTextLang  = aSeq[3];
         }
     }
     else if ( !Event.State.hasValue() )
@@ -188,14 +189,14 @@ void LanguageSelectionMenuController::impl_select(const Reference< XDispatch >&
     {
         Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
         if ( xDispatchProvider.is() )
-            xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+            xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
     }
 
     if ( xDispatch.is() )
     {
         Sequence<PropertyValue>      aArgs;
         if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            UiEventLogHelper(::rtl::OUString::createFromAscii("LanguageSelectionMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
+            UiEventLogHelper( OUString::createFromAscii("LanguageSelectionMenuController")).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs );
         xDispatch->dispatch( aTargetURL, aArgs );
     }
 }
@@ -210,22 +211,22 @@ void LanguageSelectionMenuController::impl_setPopupMenu()
     // Register for language updates
     aTargetURL.Complete = m_aLangStatusCommandURL;
     m_xURLTransformer->parseStrict( aTargetURL );
-    m_xLanguageDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+    m_xLanguageDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
 
     // Register for setting languages and opening language dialog
     aTargetURL.Complete = m_aMenuCommandURL_Lang;
     m_xURLTransformer->parseStrict( aTargetURL );
-    m_xMenuDispatch_Lang = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+    m_xMenuDispatch_Lang = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
 
     // Register for opening character dialog
     aTargetURL.Complete = m_aMenuCommandURL_Font;
     m_xURLTransformer->parseStrict( aTargetURL );
-    m_xMenuDispatch_Font = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+    m_xMenuDispatch_Font = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
 
     // Register for opening character dialog with preselected paragraph
     aTargetURL.Complete = m_aMenuCommandURL_CharDlgForParagraph;
     m_xURLTransformer->parseStrict( aTargetURL );
-    m_xMenuDispatch_CharDlgForParagraph = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+    m_xMenuDispatch_CharDlgForParagraph = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
 }
 
 void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu , const Mode eMode )
@@ -247,137 +248,77 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
     String aCmd_Language;
     if( eMode == MODE_SetLanguageSelectionMenu )
     {
-        aCmd_Dialog+=String::CreateFromAscii(".uno:FontDialog?Language:string=*");
-        aCmd_Language+=String::CreateFromAscii(".uno:LanguageStatus?Language:string=Current_");
+        aCmd_Dialog.AppendAscii(".uno:FontDialog?Language:string=*");
+        aCmd_Language.AppendAscii(".uno:LanguageStatus?Language:string=Current_");
     }
     else if ( eMode == MODE_SetLanguageParagraphMenu )
     {
-        aCmd_Dialog+=String::CreateFromAscii(".uno:FontDialogForParagraph");
-        aCmd_Language+=String::CreateFromAscii(".uno:LanguageStatus?Language:string=Paragraph_");
+        aCmd_Dialog.AppendAscii(".uno:FontDialogForParagraph");
+        aCmd_Language.AppendAscii(".uno:LanguageStatus?Language:string=Paragraph_");
     }
     else if ( eMode == MODE_SetLanguageAllTextMenu )
     {
-        aCmd_Dialog+=String::CreateFromAscii(".uno:LanguageStatus?Language:string=*");
-        aCmd_Language+=String::CreateFromAscii(".uno:LanguageStatus?Language:string=Default_");
+        aCmd_Dialog.AppendAscii(".uno:LanguageStatus?Language:string=*");
+        aCmd_Language.AppendAscii(".uno:LanguageStatus?Language:string=Default_");
     }
 
-    //Reference< awt::XMenuExtended > m_xMenuExtended( m_xPopupMenu, UNO_QUERY );
-    std::map< ::rtl::OUString, ::rtl::OUString > LangItems;
-
-    SvtLanguageTable aLanguageTable;
-    USHORT nItemId = 1;
-
-    //1--add current language
-    if(m_aCurLang.getLength())
+    SvtLanguageTable    aLanguageTable;
+
+    // get languages to be displayed in the menu

+    std::set< OUString > aLangItems;

+    FillLangItems( aLangItems, aLanguageTable, m_xFrame, m_aLangGuessHelper,
+            m_nScriptType, m_aCurLang, m_aKeyboardLang, m_aGuessedTextLang );
+
+    //
+    // now add menu entries
+    // the different menues purpose will be handled by the different string
+    // for aCmd_Dialog and aCmd_Language
+    //
+
+    sal_Int16 nItemId = 1;  // in this control the item id is not important for executing the command
+    const OUString sAsterix(RTL_CONSTASCII_USTRINGPARAM("*"));  // multiple languages in current selection
+    const OUString sEmpty;  // 'no language found' from language guessing
+    std::map< sal_Int16, OUString > aLangMap;
+    std::set< OUString >::const_iterator it;
+    for (it = aLangItems.begin(); it != aLangItems.end(); ++it)
     {
-        LangItems[m_aCurLang]=m_aCurLang;
-    }
-
-    SvtLanguageTable aLangTable;
-    //2--System
-    const AllSettings& rAllSettings=Application::GetSettings();
-    LanguageType rSystemLanguage = rAllSettings.GetLanguage();
-    if(rSystemLanguage!=LANGUAGE_DONTKNOW)
-    {
-        if (IsScriptTypeMatchingToLanguage(m_nScriptType,rSystemLanguage ))
-            LangItems[::rtl::OUString(aLangTable.GetString(rSystemLanguage))]=::rtl::OUString(aLangTable.GetString(rSystemLanguage));
-    }
-
-    //3--UI
-    LanguageType rUILanguage = rAllSettings.GetUILanguage();
-    if(rUILanguage!=LANGUAGE_DONTKNOW)
-    {
-        if (IsScriptTypeMatchingToLanguage(m_nScriptType, rUILanguage ))
-            LangItems[::rtl::OUString(aLangTable.GetString(rUILanguage))]=::rtl::OUString(aLangTable.GetString(rUILanguage));
-    }
-
-    //4--guessed language
-    uno::Reference< linguistic2::XLanguageGuessing > xLangGuesser( m_aLangGuessHelper.GetGuesser() );
-    if (xLangGuesser.is() && m_aGuessedText.getLength() > 0)
-    {
-        ::com::sun::star::lang::Locale aLocale(xLangGuesser->guessPrimaryLanguage( m_aGuessedText, 0, m_aGuessedText.getLength()) );
-        LanguageType nLang = MsLangId::convertLocaleToLanguageWithFallback( aLocale );
-        if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_NONE && nLang != LANGUAGE_SYSTEM
-            && IsScriptTypeMatchingToLanguage( m_nScriptType, nLang ))
-            LangItems[aLangTable.GetString(nLang)]=aLangTable.GetString(nLang);
-    }
-
-    //5--keyboard language
-    if(m_aKeyboardLang!=::rtl::OUString::createFromAscii(""))
-    {
-        if (IsScriptTypeMatchingToLanguage(m_nScriptType, aLanguageTable.GetType(m_aKeyboardLang)))
-            LangItems[m_aKeyboardLang] = m_aKeyboardLang;
-    }
-
-    //6--all languages used in current document
-    Reference< com::sun::star::frame::XModel > xModel;
-    if ( m_xFrame.is() )
-    {
-       Reference< com::sun::star::frame::XController > xController( m_xFrame->getController(), UNO_QUERY );
-       if ( xController.is() )
-           xModel = xController->getModel();
-    }
-    Reference< document::XDocumentLanguages > xDocumentLanguages( xModel, UNO_QUERY );
-    /*the description of m_nScriptType
-      LATIN : 1
-      ASIAN : 2
-      COMPLEX:4
-      LATIN  + ASIAN : 3
-      LATIN  + COMPLEX : 5
-      ASIAN + COMPLEX : 6
-      LATIN + ASIAN + COMPLEX : 7
-    */
-
-    sal_Int16 nCount=7;
-    if(xDocumentLanguages.is())
-    {
-        Sequence< Locale > rLocales(xDocumentLanguages->getDocumentLanguages(m_nScriptType,nCount));
-        if(rLocales.getLength()>0)
-        {
-            for(USHORT i = 0; i<rLocales.getLength();++i)
-            {
-                if (LangItems.size()==7)
-                    break;
-                const Locale& rLocale=rLocales[i];
-                if(IsScriptTypeMatchingToLanguage(m_nScriptType, aLanguageTable.GetType(rLocale.Language)))
-                    LangItems[rLocale.Language] = rLocale.Language;
-            }
-        }
-    }
-    std::map< sal_Int16, ::rtl::OUString > LangTable;
-
-    const ::rtl::OUString sAsterix(RTL_CONSTASCII_USTRINGPARAM("*"));
-    for(std::map< ::rtl::OUString, ::rtl::OUString >::const_iterator it = LangItems.begin(); it != LangItems.end(); ++it)
-    {
-        if(it->first != ::rtl::OUString( aLangTable.GetString( LANGUAGE_NONE ) )&&
-           it->first != sAsterix &&
-           it->first.getLength())
+        const OUString & rStr( *it );
+        if (rStr != OUString( aLanguageTable.GetString( LANGUAGE_NONE ) )&&
+            rStr != sAsterix &&
+            rStr != sEmpty)
         {
-            ++nItemId;
-            pPopupMenu->InsertItem( nItemId,it->first);
-            LangTable[nItemId] = it->first;
-            if(it->first == m_aCurLang && eMode == MODE_SetLanguageSelectionMenu )
+            pPopupMenu->InsertItem( nItemId, rStr );
+            aCmd = aCmd_Language;
+            aCmd += String( rStr );
+            pPopupMenu->SetItemCommand( nItemId, aCmd );
+            if (rStr == m_aCurLang && eMode == MODE_SetLanguageSelectionMenu )
             {
                 //make a sign for the current language
-                pPopupMenu->CheckItem(nItemId,TRUE);
+                pPopupMenu->CheckItem( nItemId, TRUE );
             }
-            aCmd=aCmd_Language;
-            aCmd+=(String)it->first;
-            pPopupMenu->SetItemCommand(nItemId,aCmd);
+            aLangMap[ nItemId ] = rStr;
+            ++nItemId;
         }
     }
 
-    //7--none
-    nItemId++;
+    // entry for LANGUAGE_NONE
+    ++nItemId;
     pPopupMenu->InsertItem( nItemId, String(FwlResId( STR_LANGSTATUS_NONE )) );
     aCmd=aCmd_Language;
-    aCmd+=String::CreateFromAscii("LANGUAGE_NONE");
-    pPopupMenu->SetItemCommand(nItemId,aCmd);
+    aCmd.AppendAscii("LANGUAGE_NONE");
+    pPopupMenu->SetItemCommand( nItemId, aCmd );
+
+    // entry for 'Reset to default language'
+    ++nItemId;
+    pPopupMenu->InsertItem( nItemId, String(FwlResId( STR_RESET_TO_DEFAULT_LANGUAGE )) );
+    aCmd=aCmd_Language;
+    aCmd.AppendAscii("RESET_LANGUAGES");
+    pPopupMenu->SetItemCommand( nItemId, aCmd );
 
-    //More...
-    nItemId++;
+    // entry for opening the Format/Character dialog
+    ++nItemId;
     pPopupMenu->InsertItem( nItemId, String(FwlResId( STR_LANGSTATUS_MORE )));
-    pPopupMenu->SetItemCommand(nItemId,aCmd_Dialog);
+    pPopupMenu->SetItemCommand( nItemId, aCmd_Dialog );
 }
 
 
@@ -427,10 +368,10 @@ void SAL_CALL LanguageSelectionMenuController::initialize( const Sequence< Any >
 
         if ( m_bInitialized )
         {
-            m_aLangStatusCommandURL               = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LanguageStatus" ));
+            m_aLangStatusCommandURL               = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LanguageStatus" ));
             m_aMenuCommandURL_Lang                = m_aLangStatusCommandURL;
-            m_aMenuCommandURL_Font                = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontDialog" ));
-            m_aMenuCommandURL_CharDlgForParagraph = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontDialogForParagraph" ));
+            m_aMenuCommandURL_Font                = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontDialog" ));
+            m_aMenuCommandURL_CharDlgForParagraph = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontDialogForParagraph" ));
         }
     }
 }
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index bccd553b57d3..3edc7466942a 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -30,6 +30,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
+
 #include <uielement/langselectionstatusbarcontroller.hxx>
 #include <classes/fwkresid.hxx>
 #include <services.h>
@@ -56,8 +57,6 @@
 #include <com/sun/star/frame/XModule.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 
-#include <map>
-#include <set>
 #include <classes/fwkresid.hxx>
 #ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_
 #include <classes/resource.hrc>
@@ -77,6 +76,9 @@
 
 #include "helper/mischelper.hxx"
 
+#include <map>
+#include <set>
+
 using namespace ::cppu;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -85,9 +87,14 @@ using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::document;
 
+using ::rtl::OUString;
+
+
 namespace framework
 {
 
+////////////////////////////////////////////////////////////
+
 DEFINE_XSERVICEINFO_MULTISERVICE        (   LangSelectionStatusbarController            ,
                                             OWeakObject                             ,
                                             SERVICENAME_STATUSBARCONTROLLER         ,
@@ -97,10 +104,10 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   LangSelectionStatusbarController
 DEFINE_INIT_SERVICE                     (   LangSelectionStatusbarController, {} )
 
 LangSelectionStatusbarController::LangSelectionStatusbarController( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) :
-    svt::StatusbarController( xServiceManager, uno::Reference< frame::XFrame >(), rtl::OUString(), 0 ),
+    svt::StatusbarController( xServiceManager, uno::Reference< frame::XFrame >(), OUString(), 0 ),
     m_bShowMenu( sal_True ),
-    m_nScriptType( 7 )
-    ,m_aLangGuessHelper(xServiceManager)
+    m_nScriptType( LS_SCRIPT_LATIN | LS_SCRIPT_ASIAN | LS_SCRIPT_COMPLEX ),
+    m_aLangGuessHelper( xServiceManager )
 {
 }
 
@@ -181,216 +188,157 @@ throw (::com::sun::star::uno::RuntimeException)
     return sal_False;
 }
 
-void LangSelectionStatusbarController::LangMenu()throw (::com::sun::star::uno::RuntimeException)
+void LangSelectionStatusbarController::LangMenu()
+throw (::com::sun::star::uno::RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "LangSelectionStatusbarController::LangMenu" );
     if (!m_bShowMenu)
         return;
 
     //add context menu
-    const static ::rtl::OUString s_sPopupMenu(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.PopupMenu"));
+    const static OUString s_sPopupMenu(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.PopupMenu"));
     Reference< awt::XPopupMenu > xPopupMenu( m_xServiceManager->createInstance( s_sPopupMenu ), UNO_QUERY );
     //sub menu that contains all items except the last two items: Separator + Set Language for Paragraph
     Reference< awt::XPopupMenu > subPopupMenu(m_xServiceManager->createInstance( s_sPopupMenu ), UNO_QUERY );
 
-    std::set< ::rtl::OUString > LangItems;
-
-    SvtLanguageTable aLanguageTable;
-    USHORT nItemId=1;
-
-    //1--add current language
-    if( m_aCurLang != ::rtl::OUString( ) &&
-        LANGUAGE_DONTKNOW != aLanguageTable.GetType( m_aCurLang ))
-        LangItems.insert( m_aCurLang );
-
-    //2--System
-    SvtLanguageTable aLangTable;
-    const AllSettings& rAllSettings = Application::GetSettings();
-    LanguageType rSystemLanguage = rAllSettings.GetLanguage();
-    if( rSystemLanguage != LANGUAGE_DONTKNOW )
-    {
-        if ( IsScriptTypeMatchingToLanguage( m_nScriptType, rSystemLanguage ))
-            LangItems.insert( ::rtl::OUString( aLangTable.GetString( rSystemLanguage )) );
-    }
-
-    //3--UI
-    LanguageType rUILanguage = rAllSettings.GetUILanguage();
-    if( rUILanguage != LANGUAGE_DONTKNOW )
-    {
-        if ( IsScriptTypeMatchingToLanguage( m_nScriptType, rUILanguage ))
-            LangItems.insert( ::rtl::OUString( aLangTable.GetString( rUILanguage )) );
-    }
-
-    //4--guessed language
-    uno::Reference< linguistic2::XLanguageGuessing > xLangGuesser( m_aLangGuessHelper.GetGuesser() );
-    if ( xLangGuesser.is() && m_aGuessedText.getLength() > 0)
-    {
-        ::com::sun::star::lang::Locale aLocale(xLangGuesser->guessPrimaryLanguage( m_aGuessedText, 0, m_aGuessedText.getLength()) );
-        LanguageType nLang = MsLangId::convertLocaleToLanguageWithFallback( aLocale );
-        if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_NONE && nLang != LANGUAGE_SYSTEM
-            && IsScriptTypeMatchingToLanguage( m_nScriptType, nLang ))
-            LangItems.insert( aLangTable.GetString( nLang ));
-    }
-
-    //5--keyboard language
-    if( m_aKeyboardLang != ::rtl::OUString::createFromAscii( "" ))
+    SvtLanguageTable    aLanguageTable;
+
+    // get languages to be displayed in the menu
+    std::set< OUString > aLangItems;
+    FillLangItems( aLangItems, aLanguageTable, m_xFrame, m_aLangGuessHelper,
+            m_nScriptType, m_aCurLang, m_aKeyboardLang, m_aGuessedTextLang );
+
+    //
+    // add first few entries to main menu
+    //
+    sal_Int16 nItemId = static_cast< sal_Int16 >(MID_LANG_SEL_1);
+    const OUString sAsterix(RTL_CONSTASCII_USTRINGPARAM("*"));  // multiple languages in current selection
+    const OUString sEmpty;  // 'no language found' from language guessing
+    std::map< sal_Int16, OUString > aLangMap;
+    std::set< OUString >::const_iterator it;
+    for (it = aLangItems.begin(); it != aLangItems.end(); ++it)
     {
-        if ( IsScriptTypeMatchingToLanguage( m_nScriptType, aLanguageTable.GetType( m_aKeyboardLang )))
-            LangItems.insert( m_aKeyboardLang );
-    }
-
-    //6--all languages used in current document
-    Reference< com::sun::star::frame::XModel > xModel;
-    if ( m_xFrame.is() )
-    {
-       Reference< com::sun::star::frame::XController > xController( m_xFrame->getController(), UNO_QUERY );
-       if ( xController.is() )
-           xModel = xController->getModel();
-    }
-    Reference< document::XDocumentLanguages > xDocumentLanguages( xModel, UNO_QUERY );
-    /*the description of m_nScriptType
-      LATIN : 1
-      ASIAN : 2
-      COMPLEX:4
-      LATIN  + ASIAN : 3
-      LATIN  + COMPLEX : 5
-      ASIAN + COMPLEX : 6
-      LATIN + ASIAN + COMPLEX : 7
-    */
-
-    sal_Int16 nCount=7;
-    if ( xDocumentLanguages.is() )
-    {
-        Sequence< Locale > rLocales( xDocumentLanguages->getDocumentLanguages( m_nScriptType, nCount ));
-        if ( rLocales.getLength() > 0 )
-        {
-            for ( USHORT i = 0; i<rLocales.getLength();++i )
-            {
-                if ( LangItems.size() == 7 )
-                    break;
-                const Locale& rLocale=rLocales[i];
-                if( IsScriptTypeMatchingToLanguage( m_nScriptType, aLangTable.GetType( rLocale.Language )))
-                    LangItems.insert( ::rtl::OUString( rLocale.Language ) );
-            }
-        }
-    }
-    std::map< sal_Int16, ::rtl::OUString > LangTable;
-
-    for( std::set< ::rtl::OUString >::const_iterator it = LangItems.begin(); it != LangItems.end(); ++it )
-    {
-        if ( *it != ::rtl::OUString( aLangTable.GetString( LANGUAGE_NONE ) )&&
-             *it != ::rtl::OUString::createFromAscii( "*" ) &&
-             *it != ::rtl::OUString::createFromAscii( ""  ))
+        const OUString & rStr( *it );
+        if ( rStr != OUString( aLanguageTable.GetString( LANGUAGE_NONE ) ) &&
+             rStr != sAsterix &&
+             rStr != sEmpty)
         {
-            //nItemId = xPopupMenu->getItemCount()+1;
-            nItemId++;
-            xPopupMenu->insertItem( nItemId, *it, css::awt::MenuItemStyle::RADIOCHECK, nItemId );
-            LangTable[nItemId]=*it;
-            if( *it == m_aCurLang )
+            DBG_ASSERT( MID_LANG_SEL_1 <= nItemId && nItemId <= MID_LANG_SEL_9,
+                    "nItemId outside of expected range!" );
+            xPopupMenu->insertItem( nItemId, rStr, css::awt::MenuItemStyle::RADIOCHECK, nItemId );
+            if ( rStr == m_aCurLang )
             {
                 //make a sign for the current language
                 xPopupMenu->checkItem( nItemId, TRUE );
             }
+            aLangMap[ nItemId ] = rStr;
+            ++nItemId;
         }
     }
-
-    //7--none
-    nItemId++;
-    xPopupMenu->insertItem( nItemId, String( FwkResId( STR_LANGSTATUS_NONE )), css::awt::MenuItemStyle::RADIOCHECK, nItemId );
-    //More...
-    nItemId++;
-    xPopupMenu->insertItem( nItemId, String( FwkResId( STR_LANGSTATUS_MORE )), css::awt::MenuItemStyle::RADIOCHECK, nItemId );
-
-    for( ::std::set< ::rtl::OUString >::const_iterator it = LangItems.begin(); it != LangItems.end(); ++it )
+    xPopupMenu->insertItem( MID_LANG_SEL_NONE,  String( FwkResId( STR_LANGSTATUS_NONE )), css::awt::MenuItemStyle::RADIOCHECK, MID_LANG_SEL_NONE );
+    xPopupMenu->insertItem( MID_LANG_SEL_RESET, String( FwkResId( STR_RESET_TO_DEFAULT_LANGUAGE )), css::awt::MenuItemStyle::RADIOCHECK, MID_LANG_SEL_RESET );
+    xPopupMenu->insertItem( MID_LANG_SEL_MORE,  String( FwkResId( STR_LANGSTATUS_MORE )), css::awt::MenuItemStyle::RADIOCHECK, MID_LANG_SEL_MORE );
+
+    //
+    // add entries to submenu ('set language for paragraph')
+    //
+    nItemId = static_cast< sal_Int16 >(MID_LANG_PARA_1);
+    for (it = aLangItems.begin(); it != aLangItems.end(); ++it)
     {
-        if( *it != ::rtl::OUString( aLangTable.GetString( LANGUAGE_NONE ) )&&
-            *it != ::rtl::OUString::createFromAscii( "*" ) &&
-            *it != ::rtl::OUString::createFromAscii( ""  ))
+        const OUString & rStr( *it );
+        if( rStr != OUString( aLanguageTable.GetString( LANGUAGE_NONE ) )&&
+            rStr != OUString::createFromAscii( "*" ) &&
+            rStr != OUString::createFromAscii( ""  ))
         {
-            nItemId++;
-            subPopupMenu->insertItem( nItemId, *it, css::awt::MenuItemStyle::RADIOCHECK, nItemId );
-            LangTable[nItemId]=*it;
+            DBG_ASSERT( MID_LANG_PARA_1 <= nItemId && nItemId <= MID_LANG_PARA_9,
+                    "nItemId outside of expected range!" );
+            subPopupMenu->insertItem( nItemId, rStr, css::awt::MenuItemStyle::RADIOCHECK, nItemId );
+            aLangMap[nItemId] = rStr;
+            ++nItemId;
         }
     }
-    //7--none
-    nItemId++;
-    subPopupMenu->insertItem( nItemId, String( FwkResId( STR_LANGSTATUS_NONE )), css::awt::MenuItemStyle::RADIOCHECK, nItemId );
-    //More
-    nItemId++;
-    subPopupMenu->insertItem( nItemId, String( FwkResId( STR_LANGSTATUS_MORE )), css::awt::MenuItemStyle::RADIOCHECK, nItemId );
+    subPopupMenu->insertItem( MID_LANG_PARA_NONE,  String( FwkResId( STR_LANGSTATUS_NONE )), css::awt::MenuItemStyle::RADIOCHECK, MID_LANG_PARA_NONE );
+    subPopupMenu->insertItem( MID_LANG_PARA_RESET, String( FwkResId( STR_RESET_TO_DEFAULT_LANGUAGE )), css::awt::MenuItemStyle::RADIOCHECK, MID_LANG_PARA_RESET );
+    subPopupMenu->insertItem( MID_LANG_PARA_MORE,  String( FwkResId( STR_LANGSTATUS_MORE )), css::awt::MenuItemStyle::RADIOCHECK, MID_LANG_PARA_MORE );
 
-    nItemId++;
-    xPopupMenu->insertSeparator(nItemId);
+    //
+    // add last two entries to main menu
+    //
+    xPopupMenu->insertSeparator( MID_LANG_PARA_SEPERATOR );
+    xPopupMenu->insertItem( MID_LANG_PARA_STRING, String( FwkResId( STR_SET_LANGUAGE_FOR_PARAGRAPH )), css::awt::MenuItemStyle::RADIOCHECK, MID_LANG_PARA_STRING );
+    xPopupMenu->setPopupMenu( MID_LANG_PARA_STRING, subPopupMenu );
 
-    nItemId++;
-    xPopupMenu->insertItem( nItemId, String( FwkResId( STR_SET_LANGUAGE_FOR_PARAGRAPH )), css::awt::MenuItemStyle::RADIOCHECK, nItemId );
-    xPopupMenu->setPopupMenu( nItemId, subPopupMenu );
 
-    //display the popup menu and execute every command
+    //
+    // now display the popup menu and execute every command ...
+    //
 
     Reference< awt::XWindowPeer > xParent( m_xParentWindow, UNO_QUERY );
 
-    com::sun::star::awt::Rectangle mRectangle;
+    com::sun::star::awt::Rectangle aRectangle;
     Window* pWindow = VCLUnoHelper::GetWindow( m_xParentWindow );
-    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..."
+    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() )
     {
         uno::Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
         util::URL aURL;
 
-        if ( nId < nItemId-3-subPopupMenu->getItemCount() )
+        if (MID_LANG_SEL_1 <= nId && nId <= MID_LANG_SEL_9)
         {
-            //1..7
             //set selected language as current language for selection
-            String SelectedLang = LangTable[nId];
-            aURL.Complete+=String::CreateFromAscii(".uno:LanguageStatus?Language:string=Current_");
-            aURL.Complete+=SelectedLang;
+            String aSelectedLang = aLangMap[nId];
+            aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Current_");
+            aURL.Complete += aSelectedLang;
         }
-        else if ( nId == nItemId-3-subPopupMenu->getItemCount() )
+        else if (nId == MID_LANG_SEL_NONE)
         {
-            //8
             //set None as current language for selection
-            aURL.Complete+=String::CreateFromAscii(".uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE");
+            aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE");
+        }
+        else if (nId == MID_LANG_SEL_RESET)
+        {
+            // reset language attributes for selection
+            aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Current_RESET_LANGUAGES");
         }
-        else if ( nId == nItemId-2-subPopupMenu->getItemCount() )
+        else if (nId == MID_LANG_SEL_MORE)
         {
-            //9 (more)...
             //open the dialog "format/character" for current selection
-            aURL.Complete+=String::CreateFromAscii(".uno:FontDialog?Language:string=*");
+            aURL.Complete += OUString::createFromAscii(".uno:FontDialog?Language:string=*");
         }
-        else if ( nId < nItemId-3 && nId>nItemId-2-subPopupMenu->getItemCount() )
+        else if (MID_LANG_PARA_1 <= nId && nId <= MID_LANG_PARA_9)
         {
-            //1..7 para
             //set selected language for current paragraph
-            String SelectedLang = LangTable[nId];
-            aURL.Complete+=String::CreateFromAscii(".uno:LanguageStatus?Language:string=Paragraph_");
-            aURL.Complete+=SelectedLang;
+            String aSelectedLang = aLangMap[nId];
+            aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Paragraph_");
+            aURL.Complete += aSelectedLang;
         }
-        else if ( nId==nItemId-3 )
+        else if (nId == MID_LANG_PARA_NONE)
         {
-            //8 para
             //set None as language for current paragraph
-            aURL.Complete+=String::CreateFromAscii(".uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE");
+            aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE");
         }
-        else if ( nId==nItemId-2 )
+        else if (nId == MID_LANG_PARA_RESET)
+        {
+            // reset language attributes for paragraph
+            aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Paragraph_RESET_LANGUAGES");
+        }
+        else if (nId == MID_LANG_PARA_MORE)
         {
-            //9 (more) para...
             //open the dialog "format/character" for current paragraph
-            aURL.Complete+=String::CreateFromAscii(".uno:FontDialogForParagraph");
+            aURL.Complete += OUString::createFromAscii(".uno:FontDialogForParagraph");
         }
 
-        uno::Reference< util::XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), uno::UNO_QUERY );
+        uno::Reference< util::XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( OUString::createFromAscii("com.sun.star.util.URLTransformer" )), uno::UNO_QUERY );
         xURLTransformer->parseStrict( aURL );
-        uno::Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL,::rtl::OUString(),0);
+        uno::Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL, OUString(), 0);
         if( xDispatch.is() )
         {
             uno::Sequence< beans::PropertyValue > aPV;
             if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-                UiEventLogHelper(::rtl::OUString::createFromAscii("ButtonToolbarController")).log(m_xServiceManager, m_xFrame, aURL, aPV);
+                UiEventLogHelper( OUString::createFromAscii("ButtonToolbarController")).log(m_xServiceManager, m_xFrame, aURL, aPV);
             xDispatch->dispatch( aURL, aPV);
         }
     }
@@ -439,6 +387,13 @@ throw (::com::sun::star::uno::RuntimeException)
 void SAL_CALL LangSelectionStatusbarController::statusChanged( const FeatureStateEvent& Event )
 throw ( RuntimeException )
 {
+    // This function will be called when observed data changes,
+    // for example the selection or keyboard language.
+    // - 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

+
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "LangSelectionStatusbarController::statusChanged" );
     vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
 
@@ -447,25 +402,22 @@ throw ( RuntimeException )
 
     m_bShowMenu = sal_True;
 
-    m_nScriptType=7;//set the default value
+    m_nScriptType = LS_SCRIPT_LATIN | LS_SCRIPT_ASIAN | LS_SCRIPT_COMPLEX;  //set the default value
     Window* pWindow = VCLUnoHelper::GetWindow( m_xParentWindow );
     if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR && m_nID != 0 )
     {
-        rtl::OUString               aStrValue;
-        Sequence< ::rtl::OUString > aSeq;
+        OUString               aStrValue;
+        Sequence< OUString > aSeq;
 
         StatusBar*    pStatusBar = (StatusBar *)pWindow;
         if ( Event.State >>= aStrValue )
-        {
             pStatusBar->SetItemText( m_nID, aStrValue );
-            m_aCurrentLanguage = aStrValue;
-        }
         else if ( Event.State >>= aSeq )
         {
             if ( aSeq.getLength() == 4 )
             {
                 const String aMultipleLangText( FwkResId( STR_LANGSTATUS_MULTIPLE_LANGUAGES ) );
-                ::rtl::OUString aStatusText = aSeq[0];
+                OUString aStatusText = aSeq[0];
                 if ( 0 == aStatusText.compareToAscii( "*" ))
                     aStatusText = aMultipleLangText;
                 pStatusBar->SetItemText( m_nID, aStatusText );
@@ -475,7 +427,7 @@ throw ( RuntimeException )
                 m_aCurLang      = aSeq[0];
                 m_nScriptType   = static_cast< sal_Int16 >( aSeq[1].toInt32() );
                 m_aKeyboardLang = aSeq[2];
-                m_aGuessedText  = aSeq[3];
+                m_aGuessedTextLang  = aSeq[3];
             }
         }
         else if ( !Event.State.hasValue() )
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk
index 60a44dba706f..a508f5d29a92 100644
--- a/framework/util/makefile.mk
+++ b/framework/util/makefile.mk
@@ -119,6 +119,8 @@ SHL1STDLIBS=    \
                 $(UNOTOOLSLIB)      \
                 $(CPPUHELPERLIB)    \
                 $(TOOLSLIB)         \
+                $(SVTOOLLIB)        \
+                $(I18NISOLANGLIB)   \
                 $(VOSLIB)           \
                 $(VCLLIB)           \
                 $(TKLIB)            \
@@ -210,7 +212,6 @@ SHL3STDLIBS=    \
                 $(SVTOOLLIB)                        \
                 $(UNOTOOLSLIB)                      \
                 $(TOOLSLIB)                         \
-                $(I18NISOLANGLIB)                   \
                 $(COMPHELPERLIB)                    \
                 $(CPPUHELPERLIB)                    \
                 $(COMPHELPERLIB)                    \