diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-09-19 22:01:49 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-09-28 08:48:49 +0100 |
commit | adda1a25f248586b46682bb9e19cd7a6b2c9debc (patch) | |
tree | 30d29d5107bcf9b37c35ca8032a677cb3bdf46c6 /svx | |
parent | 29d6cfdca55c56a61c5a22c42f764697b5dc03b4 (diff) |
convert hard-coded layout of char name tabpage to .ui
Change-Id: I20829b6a0835bf96489d67b6f7effcfa84650328
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/svx/langbox.hxx | 3 | ||||
-rw-r--r-- | svx/source/dialog/fntctrl.cxx | 3 | ||||
-rw-r--r-- | svx/source/dialog/langbox.cxx | 17 |
3 files changed, 21 insertions, 2 deletions
diff --git a/svx/inc/svx/langbox.hxx b/svx/inc/svx/langbox.hxx index 03f1839b0c72..ccf7dc406f39 100644 --- a/svx/inc/svx/langbox.hxx +++ b/svx/inc/svx/langbox.hxx @@ -78,7 +78,8 @@ private: SVX_DLLPRIVATE sal_uInt16 ImplInsertLanguage(LanguageType, sal_uInt16, sal_Int16 ); public: - SvxLanguageBox( Window* pParent, const ResId& rResId, sal_Bool bCheck = sal_False); + SvxLanguageBox(Window* pParent, const ResId& rResId, sal_Bool bCheck = sal_False); + SvxLanguageBox(Window* pParent, WinBits nBits, sal_Bool bCheck = sal_False); ~SvxLanguageBox(); void SetLanguageList( sal_Int16 nLangList, diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index fb6f0e638d99..c09f3bfc3fac 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -28,6 +28,7 @@ #include <sfx2/viewsh.hxx> // SfxViewShell #include <sfx2/printer.hxx> // Printer +#include <vcl/builder.hxx> #include <vcl/metric.hxx> #include <vcl/svapp.hxx> #include <unicode/uchar.h> @@ -526,7 +527,7 @@ SvxFontPrevWindow::SvxFontPrevWindow(Window* pParent) : Init(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFontPrevWindow(Window *pParent) +extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFontPrevWindow(Window *pParent, VclBuilder::stringmap &) { SvxFontPrevWindow *pWindow = new SvxFontPrevWindow(pParent); return pWindow; diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 09f8163bf01b..72e385aa2fef 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -42,6 +42,7 @@ #include <svx/langbox.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> +#include <vcl/builder.hxx> using namespace ::com::sun::star::util; using namespace ::com::sun::star::lang; @@ -137,6 +138,22 @@ SvxLanguageBox::SvxLanguageBox( Window* pParent, const ResId& rResId, sal_Bool b { Init(); } + +SvxLanguageBox::SvxLanguageBox( Window* pParent, WinBits nBits, sal_Bool bCheck ) + : ListBox( pParent, nBits ) + , m_pSpellUsedLang( NULL ) + , m_bWithCheckmark( bCheck ) +{ + Init(); +} + +extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxLanguageBox(Window *pParent, VclBuilder::stringmap &) +{ + SvxLanguageBox *pListBox = new SvxLanguageBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK); + pListBox->SetBestDropDownLineCount(); + return pListBox; +} + //------------------------------------------------------------------------ void SvxLanguageBox::Init() { |