diff options
| author | Olivier Hallot <olivier.hallot@alta.org.br> | 2013-03-16 16:35:34 -0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-04-02 12:33:23 +0000 |
| commit | df311b82a3df1576732dcf74a45c47316d31f7ee (patch) | |
| tree | cb983df43c0cfb7500ac77de44a90b6c75012a9c /svx | |
| parent | 299586c998a571029cceb35d7b1528f940f530ad (diff) | |
Widget UI for Calc cell alignment page
Format - cell, alignment tab
Change-Id: I78e4252064671720d41ad3af086b41d2efe06ac1
Reviewed-on: https://gerrit.libreoffice.org/2773
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/svx/dialcontrol.hxx | 2 | ||||
| -rw-r--r-- | svx/inc/svx/wrapfield.hxx | 1 | ||||
| -rw-r--r-- | svx/source/dialog/dialcontrol.cxx | 13 | ||||
| -rw-r--r-- | svx/source/dialog/wrapfield.cxx | 11 |
4 files changed, 27 insertions, 0 deletions
diff --git a/svx/inc/svx/dialcontrol.hxx b/svx/inc/svx/dialcontrol.hxx index 0f37a2ffa9f2..578695dce8df 100644 --- a/svx/inc/svx/dialcontrol.hxx +++ b/svx/inc/svx/dialcontrol.hxx @@ -51,6 +51,8 @@ class SVX_DLLPUBLIC DialControl : public Control { public: explicit DialControl( Window* pParent, const ResId& rResId ); + explicit DialControl( Window* pParent, WinBits nBits ); + virtual ~DialControl(); virtual void Paint( const Rectangle& rRect ); diff --git a/svx/inc/svx/wrapfield.hxx b/svx/inc/svx/wrapfield.hxx index d79185ff12ce..c8fa94ece3ce 100644 --- a/svx/inc/svx/wrapfield.hxx +++ b/svx/inc/svx/wrapfield.hxx @@ -33,6 +33,7 @@ class SVX_DLLPUBLIC WrapField : public NumericField { public: explicit WrapField( Window* pParent, const ResId& rResId ); + explicit WrapField( Window* pParent, WinBits nBits ); protected: /** Up event with wrap-around functionality. */ diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 95f67deb8fef..a5a1eac5011f 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -25,6 +25,7 @@ #include <vcl/bitmap.hxx> #include <vcl/field.hxx> #include <svtools/colorcfg.hxx> +#include <vcl/builder.hxx> namespace svx { @@ -289,10 +290,22 @@ DialControl::DialControl( Window* pParent, const ResId& rResId ) : Init( GetOutputSizePixel() ); } +DialControl::DialControl( Window* pParent, WinBits nBits ) : + Control( pParent, nBits ), + mpImpl( new DialControl_Impl( *this ) ) +{ + Init( GetOutputSizePixel() ); +} + DialControl::~DialControl() { } +extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDialControl(Window *pParent, VclBuilder::stringmap &) +{ + return new DialControl(pParent, WB_BORDER | WB_TABSTOP); +} + void DialControl::Paint( const Rectangle& ) { Point aPos; diff --git a/svx/source/dialog/wrapfield.cxx b/svx/source/dialog/wrapfield.cxx index 0df7da55f977..76302d801ca3 100644 --- a/svx/source/dialog/wrapfield.cxx +++ b/svx/source/dialog/wrapfield.cxx @@ -18,6 +18,7 @@ */ #include "svx/wrapfield.hxx" +#include <vcl/builder.hxx> namespace svx { @@ -26,6 +27,16 @@ WrapField::WrapField( Window* pParent, const ResId& rResId ) : { } +WrapField::WrapField( Window* pParent, WinBits nBits ) : + NumericField( pParent, nBits ) +{ +} + +extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeWrapField(Window *pParent, VclBuilder::stringmap &) +{ + return new WrapField(pParent, WB_SPIN|WB_REPEAT|WB_BORDER|WB_TABSTOP); +} + void WrapField::Up() { SetValue( ((GetValue() + GetSpinSize() - GetMin()) % (GetMax() + 1)) + GetMin() ); |