diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-12-06 11:54:45 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-12-06 13:29:28 +0000 |
| commit | 43137f06505324b73ff66420c63e40b37a8d0618 (patch) | |
| tree | ea90b74935cc9df6eadfaf842525c78398bab07a /svx | |
| parent | b01fb7736688e287feb9f893657f4fa29a7e26b1 (diff) | |
convert number format page to .ui
Change-Id: Icaae0aa69156ebffab5750a1820a0a7a94a39022
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/svx/fontlb.hxx | 3 | ||||
| -rw-r--r-- | svx/source/dialog/fontlb.cxx | 25 |
2 files changed, 22 insertions, 6 deletions
diff --git a/svx/inc/svx/fontlb.hxx b/svx/inc/svx/fontlb.hxx index 236ba82b05f9..c97df391b12e 100644 --- a/svx/inc/svx/fontlb.hxx +++ b/svx/inc/svx/fontlb.hxx @@ -70,7 +70,8 @@ private: bool mbUseFont; /// true = Use maEntryFont/mpEntryColor in InitEntry(). public: - SvxFontListBox( Window* pParent, const ResId& rResId ); + SvxFontListBox(Window* pParent, const ResId& rResId); + SvxFontListBox(Window* pParent, WinBits nStyle = WB_BORDER); /** Inserts a list entry and sets the font used for this entry. @param pColor The font color. NULL = use default listbox text color. */ diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index fbb39efa8c2c..1ac29f4c75d3 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -18,6 +18,7 @@ */ #include "svx/fontlb.hxx" +#include <vcl/builder.hxx> #include <vcl/svapp.hxx> #include "svtools/treelistentry.hxx" #include "svtools/viewdataentry.hxx" @@ -87,15 +88,29 @@ void SvLBoxFontString::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEnt // ============================================================================ -SvxFontListBox::SvxFontListBox( Window* pParent, const ResId& rResId ) : - SvTabListBox( pParent, rResId ), - maStdFont( GetFont() ), - mbUseFont( false ) +SvxFontListBox::SvxFontListBox(Window* pParent, const ResId& rResId) + : SvTabListBox(pParent, rResId) + , maStdFont(GetFont()) + , mbUseFont(false) { - maStdFont.SetTransparent( sal_True ); + maStdFont.SetTransparent(sal_True); maEntryFont = maStdFont; } +SvxFontListBox::SvxFontListBox(Window* pParent, WinBits nStyle) + : SvTabListBox(pParent, nStyle) + , maStdFont(GetFont()) + , mbUseFont(false) +{ + maStdFont.SetTransparent(sal_True); + maEntryFont = maStdFont; +} + +extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFontListBox(Window *pParent, VclBuilder::stringmap &) +{ + return new SvxFontListBox(pParent, 0); +} + void SvxFontListBox::InsertFontEntry( const String& rString, const Font& rFont, const Color* pColor ) { mbUseFont = true; // InitEntry() will use maEntryFont |