diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-04-22 12:47:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-04-22 12:50:19 +0100 |
| commit | 15f4c47f5bd9537979f970ad56b4a75f1a3fc9a3 (patch) | |
| tree | e4c43033eba3dd05c84ad62e4ed654ccb3c872dc /svtools | |
| parent | 5bc1eac4a9f7147b26496e8e46b959bbe72def3f (diff) | |
restore FontNameBox from ResId ctor
removed by ecda52f6b3919950870f3ddb195d34d3baf71168
but we'll need it again soon
Change-Id: I3a038c162beba7147ac7abc8bb4085b41140bf5c
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/inc/svtools/ctrlbox.hxx | 1 | ||||
| -rw-r--r-- | svtools/source/control/ctrlbox.cxx | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx index 81f0cff47255..0a8e566413f2 100644 --- a/svtools/inc/svtools/ctrlbox.hxx +++ b/svtools/inc/svtools/ctrlbox.hxx @@ -435,6 +435,7 @@ protected: public: FontNameBox( Window* pParent, WinBits nWinStyle = WB_SORT ); + FontNameBox( Window* pParent, const ResId& rResId ); virtual ~FontNameBox(); virtual void UserDraw( const UserDrawEvent& rUDEvt ); diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index a51f14eb5d29..684a10d6722d 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -1048,6 +1048,16 @@ FontNameBox::FontNameBox( Window* pParent, WinBits nWinStyle ) : InitFontMRUEntriesFile(); } +// ------------------------------------------------------------------- + +FontNameBox::FontNameBox( Window* pParent, const ResId& rResId ) : + ComboBox( pParent, rResId ) +{ + mpFontList = NULL; + mbWYSIWYG = sal_False; + InitFontMRUEntriesFile(); +} + extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFontNameBox(Window *pParent, VclBuilder::stringmap &rMap) { bool bDropdown = extractDropdown(rMap); |