diff options
| author | Olivier Hallot <olivier.hallot@alta.org.br> | 2013-03-01 00:44:20 -0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-03-04 11:20:02 +0000 |
| commit | 5c2d43d25b98c05af0f9a7f126101c3b8fd7271f (patch) | |
| tree | 350b95cf29d52b2261671c3358caab0ea8aebaf4 /svx/inc | |
| parent | 35a2f39de795fca22696224d4490224a6cf93d21 (diff) | |
Convert page header/footer to new widget UI
* The widget UI needs further work for better display, but all elements are there
* Fix First page toggle with header/footer on/off
* Calculations for Edit button position in Calc discarded.
* Some comments in German translated
* Need to address helpID's
Change-Id: Iab4eec4fb2497d17c8eb1ab2bab7c31b028af7b0
Reviewed-on: https://gerrit.libreoffice.org/2478
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx/inc')
| -rw-r--r-- | svx/inc/svx/hdft.hxx | 56 |
1 files changed, 31 insertions, 25 deletions
diff --git a/svx/inc/svx/hdft.hxx b/svx/inc/svx/hdft.hxx index 14bd6aec100d..57924c1aedee 100644 --- a/svx/inc/svx/hdft.hxx +++ b/svx/inc/svx/hdft.hxx @@ -57,31 +57,37 @@ protected: virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - SvxHFPage( Window* pParent, sal_uInt16 nResId, const SfxItemSet& rSet, - sal_uInt16 nSetId ); - - FixedLine aFrm; - CheckBox aTurnOnBox; - CheckBox aCntSharedBox; - CheckBox aCntSharedFirstBox; - FixedText aLMLbl; - MetricField aLMEdit; - FixedText aRMLbl; - MetricField aRMEdit; - FixedText aDistFT; - MetricField aDistEdit; - CheckBox aDynSpacingCB; - FixedText aHeightFT; - MetricField aHeightEdit; - CheckBox aHeightDynBtn; - SvxPageWindow aBspWin; - PushButton aBackgroundBtn; - - sal_uInt16 nId; - SfxItemSet* pBBSet; - sal_Bool bDisableQueryBox; - sal_Bool bEnableBackgroundSelector; - bool bInReset; + SvxHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ); + + VclFrame* m_pFrm; + FixedText* m_pPageLbl; + CheckBox* m_pTurnOnBox; + CheckBox* m_pCntSharedBox; + CheckBox* m_pCntSharedFirstBox; + FixedText* m_pLMLbl; + MetricField* m_pLMEdit; + FixedText* m_pRMLbl; + MetricField* m_pRMEdit; + FixedText* m_pDistFT; + MetricField* m_pDistEdit; + CheckBox* m_pDynSpacingCB; + FixedText* m_pHeightFT; + MetricField* m_pHeightEdit; + CheckBox* m_pHeightDynBtn; + SvxPageWindow* m_pBspWin; + PushButton* m_pBackgroundBtn; + + FixedText* m_pFooterOn; + FixedText* m_pFooterLbl; + FixedText* m_pHeaderOn; + FixedText* m_pHeaderLbl; + FixedText* m_pMsg; + + sal_uInt16 nId; + SfxItemSet* pBBSet; + sal_Bool bDisableQueryBox; + sal_Bool bEnableBackgroundSelector; + bool bInReset; void InitHandler(); DECL_LINK( TurnOnHdl, CheckBox*); |