diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 15:41:30 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 15:41:30 +0000 |
| commit | 07b2e5e5c0b5c06877965c07051c3ef472f9ce0d (patch) | |
| tree | a289600f944a08a10d811056242ddd29890aab02 /svx | |
| parent | 61679f6d7a4fe833a72391d12bce356721d87ca1 (diff) | |
INTEGRATION: CWS langstatusbar (1.39.54); FILE MERGED
2007/10/05 14:51:30 tl 1.39.54.5: RESYNC: (1.42-1.45); FILE MERGED
2007/07/20 09:36:44 tl 1.39.54.4: #i77208# new language status bar control
2007/07/11 12:31:03 tl 1.39.54.3: #i77208# new language status bar control
2007/06/25 18:39:52 tl 1.39.54.2: RESYNC: (1.39-1.42); FILE MERGED
2007/06/08 13:55:44 tl 1.39.54.1: #i77208# new language status-bar control
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/optgdlg.cxx | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/svx/source/dialog/optgdlg.cxx b/svx/source/dialog/optgdlg.cxx index 1f5becd3c562..a163e2214c8a 100644 --- a/svx/source/dialog/optgdlg.cxx +++ b/svx/source/dialog/optgdlg.cxx @@ -4,9 +4,9 @@ * * $RCSfile: optgdlg.cxx,v $ * - * $Revision: 1.45 $ + * $Revision: 1.46 $ * - * last change: $Author: kz $ $Date: 2007-09-05 17:43:54 $ + * last change: $Author: ihi $ $Date: 2007-11-23 16:41:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -127,6 +127,8 @@ #include <svtools/ctloptions.hxx> #endif +#include <svtools/langtab.hxx> + #include <unotools/localfilehelper.hxx> #include <unotools/configmgr.hxx> @@ -151,9 +153,6 @@ #ifndef _SVX_TAB_AREA_HXX #include "cuitabarea.hxx" #endif -#ifndef _SVX_LANGTAB_HXX //autogen -#include "langtab.hxx" -#endif #ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> #endif @@ -1249,7 +1248,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe FreeResource(); // initialize user interface language selection - SvxLanguageTable* pLanguageTable = new SvxLanguageTable; + SvtLanguageTable* pLanguageTable = new SvtLanguageTable; String aStr( pLanguageTable->GetString( LANGUAGE_SYSTEM ) ); aUserInterfaceLB.InsertEntry(aStr); aUserInterfaceLB.SetEntryData(0, 0); @@ -1745,6 +1744,8 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) sal_Bool bEnable = !pLangConfig->aLinguConfig.IsReadOnly( C2U("DefaultLocale") ); aWesternLanguageFT.Enable( bEnable ); aWesternLanguageLB.Enable( bEnable ); + + aWesternLanguageFI.Show(!bEnable); // #i15812# controls for CJK/CTL already enabled/disabled from LocaleSettingHdl @@ -1757,6 +1758,17 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) aComplexLanguageFT.Enable( bEnable ); aComplexLanguageLB.Enable( bEnable ); #endif + /*---------------------07-05-07-------------------------- + check the box "For the current document only" + set the focus to the Western Language box + --------------------------------------------------------*/ + const SfxPoolItem* pLang = 0; + if ( SFX_ITEM_SET == rSet.GetItemState(SID_SET_DOCUMENT_LANGUAGE, FALSE, &pLang ) &&( (const SfxBoolItem*)pLang)->GetValue() == TRUE ) + { + aWesternLanguageLB.GrabFocus(); + aCurrentDocCB.Enable(TRUE); + aCurrentDocCB.Check(TRUE); + } } /* -----------------------------20.04.01 15:09-------------------------------- |