diff options
| author | Olivier Hallot <olivier.hallot@alta.org.br> | 2013-02-26 22:09:55 -0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-02-27 12:01:16 +0000 |
| commit | 7ba10e2d317a53763e1aff55a85546bfdac12fc5 (patch) | |
| tree | 633050dc71f488a74406169feb557ab09b098fa2 /svx | |
| parent | 32cb84f3718e96658f24ffc67c2e56386bf3f25f (diff) | |
Convert page format tab page to new widget UI
Notes:
* pageformatpage.ui contains 3 hidden labels to hold strings used in page.cxx
* Paper format (A0,A4,...) left in src file.
Change-Id: If22c62558f1644e5f25baffeb3d04b921ec0fe8b
Reviewed-on: https://gerrit.libreoffice.org/2432
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/svx/frmdirlbox.hxx | 1 | ||||
| -rw-r--r-- | svx/source/dialog/frmdirlbox.cxx | 12 | ||||
| -rw-r--r-- | svx/source/dialog/pagectrl.cxx | 6 |
3 files changed, 19 insertions, 0 deletions
diff --git a/svx/inc/svx/frmdirlbox.hxx b/svx/inc/svx/frmdirlbox.hxx index a16e4b5f4b14..1248e63558a5 100644 --- a/svx/inc/svx/frmdirlbox.hxx +++ b/svx/inc/svx/frmdirlbox.hxx @@ -40,6 +40,7 @@ class SVX_DLLPUBLIC FrameDirectionListBox : public ListBox { public: explicit FrameDirectionListBox( Window* pParent, const ResId& rResId ); + explicit FrameDirectionListBox( Window* pParent, WinBits nBits ); virtual ~FrameDirectionListBox(); /** Inserts a string with corresponding direction enum into the listbox. */ diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx index 97118a65c7e0..7de943787911 100644 --- a/svx/source/dialog/frmdirlbox.cxx +++ b/svx/source/dialog/frmdirlbox.cxx @@ -18,6 +18,7 @@ */ #include <svx/frmdirlbox.hxx> +#include <vcl/builder.hxx> namespace svx { @@ -44,10 +45,21 @@ FrameDirectionListBox::FrameDirectionListBox( Window* pParent, const ResId& rRes { } +FrameDirectionListBox::FrameDirectionListBox( Window* pParent, WinBits nBits ) : + ListBox( pParent, nBits ) +{ +} + FrameDirectionListBox::~FrameDirectionListBox() { } +extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFrameDirectionListBox(Window *pParent, VclBuilder::stringmap &) +{ + return new FrameDirectionListBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP); +} + + void FrameDirectionListBox::InsertEntryValue( const String& rString, SvxFrameDirection eDirection, sal_uInt16 nPos ) { sal_uInt16 nRealPos = InsertEntry( rString, nPos ); diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index 3dba3d404a54..d7aa9f334f3b 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -146,6 +146,12 @@ SvxPageWindow::~SvxPageWindow() delete pFtBorder; } +extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxPageWindow(Window *pParent) +{ + return new SvxPageWindow(pParent); +} + + // ----------------------------------------------------------------------- void SvxPageWindow::Paint( const Rectangle& ) |