INTEGRATION: CWS langstatusbar (1.4.10); FILE MERGED

2007/06/25 19:33:44 tl 1.4.10.2: RESYNC: (1.4-1.5); FILE MERGED
2007/06/08 14:20:40 tl 1.4.10.1: #i77208# new language status-bar control
This commit is contained in:
Ivo Hinkelmann 2007-11-23 15:44:49 +00:00
parent fc64253f23
commit 4bc3058bc0

View file

@ -4,9 +4,9 @@
* *
* $RCSfile: managelang.cxx,v $ * $RCSfile: managelang.cxx,v $
* *
* $Revision: 1.5 $ * $Revision: 1.6 $
* *
* last change: $Author: rt $ $Date: 2007-04-26 09:33:59 $ * last change: $Author: ihi $ $Date: 2007-11-23 16:44:49 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -80,9 +80,9 @@
#ifndef _UNO_LINGU_HXX #ifndef _UNO_LINGU_HXX
#include <svx/unolingu.hxx> #include <svx/unolingu.hxx>
#endif #endif
#ifndef _SVX_LANGTAB_HXX
#include <svx/langtab.hxx> #include <svtools/langtab.hxx>
#endif
#include <sfx2/bindings.hxx> #include <sfx2/bindings.hxx>
using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::i18n;
@ -210,7 +210,7 @@ void ManageLanguageDialog::FillLanguageBox()
if ( m_pLocalizationMgr->isLibraryLocalized() ) if ( m_pLocalizationMgr->isLibraryLocalized() )
{ {
SvxLanguageTable aLangTable; SvtLanguageTable aLangTable;
Locale aDefaultLocale = m_pLocalizationMgr->getStringResourceManager()->getDefaultLocale(); Locale aDefaultLocale = m_pLocalizationMgr->getStringResourceManager()->getDefaultLocale();
Sequence< Locale > aLocaleSeq = m_pLocalizationMgr->getStringResourceManager()->getLocales(); Sequence< Locale > aLocaleSeq = m_pLocalizationMgr->getStringResourceManager()->getLocales();
const Locale* pLocale = aLocaleSeq.getConstArray(); const Locale* pLocale = aLocaleSeq.getConstArray();