diff options
| author | Olivier Hallot <olivier.hallot@edx.srv.br> | 2013-05-26 22:35:10 -0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-31 10:10:06 +0000 |
| commit | 324141f21bf2280d7613c4056ee8cd997ea345f9 (patch) | |
| tree | 0370cf9d8e1eb6423584cfd264c5e15d29f0e35f /include | |
| parent | 878b09a1a936c2d5bf4461e0123fafd377d948e2 (diff) | |
Convert Paragraph Alignment & Indent to Widget UI
Conver Paragraph Alignment and Indent & Spacing to widget UI.
Change-Id: Ib3b7d76a63bd677d5d94f7385bbf589f18eceeda
Reviewed-on: https://gerrit.libreoffice.org/4047
Reviewed-by: Olivier Hallot <olivier.hallot@edx.srv.br>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/paraprev.hxx | 29 | ||||
| -rw-r--r-- | include/svx/relfld.hxx | 5 |
2 files changed, 18 insertions, 16 deletions
diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx index ebef6399fcac..5f7fdfab36ae 100644 --- a/include/svx/paraprev.hxx +++ b/include/svx/paraprev.hxx @@ -41,7 +41,6 @@ class SVX_DLLPUBLIC SvxParaPrevWindow : public Window { using Window::Draw; private: - Size aWinSize; Size aSize; // indentation @@ -49,48 +48,50 @@ private: long nRightMargin; short nFirstLineOfst; // distances - sal_uInt16 nUpper; - sal_uInt16 nLower; + sal_uInt16 nUpper; + sal_uInt16 nLower; // adjustment SvxAdjust eAdjust; // last line in justification SvxAdjust eLastLine; // line distance SvxPrevLineSpace eLine; - sal_uInt16 nLineVal; + sal_uInt16 nLineVal; - String aText; + OUString aText; Rectangle Lines[9]; protected: virtual void Paint( const Rectangle& rRect ); + virtual Size GetOptimalSize() const; void DrawParagraph( sal_Bool bAll ); public: SvxParaPrevWindow( Window* pParent, const ResId& rId ); + SvxParaPrevWindow( Window* pParent, WinBits nBits); - void SetFirstLineOfst( short nNew ) { nFirstLineOfst = nNew; } - void SetLeftMargin( long nNew ) { nLeftMargin = nNew; } - void SetRightMargin( long nNew ) { nRightMargin = nNew; } - void SetUpper( sal_uInt16 nNew ) { nUpper = nNew; } - void SetLower( sal_uInt16 nNew ) { nLower = nNew; } + void SetFirstLineOfst( short nNew ) { nFirstLineOfst = nNew; } + void SetLeftMargin( long nNew ) { nLeftMargin = nNew; } + void SetRightMargin( long nNew ) { nRightMargin = nNew; } + void SetUpper( sal_uInt16 nNew ) { nUpper = nNew; } + void SetLower( sal_uInt16 nNew ) { nLower = nNew; } void SetAdjust( SvxAdjust eNew ) { eAdjust = eNew; } void SetLastLine( SvxAdjust eNew ) { eLastLine = eNew; } void SetLineSpace( SvxPrevLineSpace eNew, sal_uInt16 nNew = 0 ) { eLine = eNew; nLineVal = nNew; } - void SetText( const OUString& rStr ) { aText = rStr; } + void SetText( const OUString& rStr ) { aText = rStr; } void SetSize( Size aNew ) { aSize = aNew; } short GetFirstLineOfst() const { return nFirstLineOfst; } long GetLeftMargin() const { return nLeftMargin; } long GetRightMargin() const { return nRightMargin; } - sal_uInt16 GetUpper() const { return nUpper; } - sal_uInt16 GetLower() const { return nLower; } + sal_uInt16 GetUpper() const { return nUpper; } + sal_uInt16 GetLower() const { return nLower; } SvxAdjust GetAdjust() const { return eAdjust; } SvxPrevLineSpace GetLineEnum() const { return eLine; } - sal_uInt16 GetLineValue() const { return nLineVal; } + sal_uInt16 GetLineValue() const { return nLineVal; } OUString GetText() const { return aText; } Size GetSize() const { return aSize; } diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx index fa544c2d00a5..88fd8083e715 100644 --- a/include/svx/relfld.hxx +++ b/include/svx/relfld.hxx @@ -40,12 +40,13 @@ protected: public: SvxRelativeField( Window* pParent, const ResId& rResId ); + SvxRelativeField( Window* pParent, WinBits nBits); void EnableRelativeMode( sal_uInt16 nMin = 50, sal_uInt16 nMax = 150, sal_uInt16 nStep = 5 ); - sal_Bool IsRelativeMode() const { return bRelativeMode; } + sal_Bool IsRelativeMode() const { return bRelativeMode; } void SetRelative( sal_Bool bRelative = sal_False ); - sal_Bool IsRelative() const { return bRelative; } + sal_Bool IsRelative() const { return bRelative; } void EnableNegativeMode() {bNegativeEnabled = sal_True;} }; |