diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 15:38:18 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 15:38:18 +0000 |
| commit | 4915633899e6e610a52212260909d3291a3a8e29 (patch) | |
| tree | 0120e1494085bc1664fd7aa3dd6d0548c4ca76f7 /svx/source | |
| parent | 5210533be76cfac65716b738be57e57926806f93 (diff) | |
INTEGRATION: CWS langstatusbar (1.20.302); FILE MERGED
2007/10/09 10:10:21 tl 1.20.302.3: merge problem fixed
2007/10/05 14:51:24 tl 1.20.302.2: RESYNC: (1.20-1.22); FILE MERGED
2007/06/08 13:55:43 tl 1.20.302.1: #i77208# new language status-bar control
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/dialog/langbox.cxx | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 1cbdba08b2fb..21d63a6284d2 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -4,9 +4,9 @@ * * $RCSfile: langbox.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: rt $ $Date: 2007-07-03 14:01:31 $ + * last change: $Author: ihi $ $Date: 2007-11-23 16:38:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -55,6 +55,8 @@ #include <unotools/localedatawrapper.hxx> #endif +#include <svtools/langtab.hxx> + #ifndef _SHL_HXX #include <tools/shl.hxx> #endif @@ -70,14 +72,9 @@ #ifndef _UNO_LINGU_HXX #include <unolingu.hxx> #endif -#ifndef _SVX_LANGTAB_HXX -#include <langtab.hxx> -#endif #include <svx/langbox.hxx> -#include "langtab.hxx" #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -#include "unolingu.hxx" using namespace ::rtl; using namespace ::com::sun::star::util; @@ -160,7 +157,7 @@ SvxLanguageBox::SvxLanguageBox( Window* pParent, const ResId& rResId, BOOL bChec //------------------------------------------------------------------------ void SvxLanguageBox::Init() { - m_pLangTable = new SvxLanguageTable; + m_pLangTable = new SvtLanguageTable; m_aNotCheckedImage = Image( SVX_RES( RID_SVXIMG_NOTCHECKED ) ); m_aCheckedImage = Image( SVX_RES( RID_SVXIMG_CHECKED ) ); m_aCheckedImageHC = Image( SVX_RES( RID_SVXIMG_CHECKED_H ) ); @@ -174,7 +171,7 @@ void SvxLanguageBox::Init() if ( m_bWithCheckmark ) { - SvxLanguageTable aLangTable; + SvtLanguageTable aLangTable; sal_uInt32 nCount = aLangTable.GetEntryCount(); for ( sal_uInt32 i = 0; i < nCount; i++ ) { @@ -280,7 +277,7 @@ void SvxLanguageBox::SetLanguageList( INT16 nLangList, } } - SvxLanguageTable aLangTable; + SvtLanguageTable aLangTable; ::com::sun::star::uno::Sequence< sal_uInt16 > xKnown; const sal_uInt16* pKnown; sal_uInt32 nCount; |