diff options
Diffstat (limited to 'sw/source/ui/table/tablepg.hxx')
| -rw-r--r-- | sw/source/ui/table/tablepg.hxx | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx index 895cbeb54342..d18f23dcfd74 100644 --- a/sw/source/ui/table/tablepg.hxx +++ b/sw/source/ui/table/tablepg.hxx @@ -29,7 +29,7 @@ #define _SWTABLEPG_HXX #include <sfx2/tabdlg.hxx> #include <vcl/fixed.hxx> -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #include <vcl/lstbox.hxx> #include <actctrl.hxx> #include "prcntfld.hxx" @@ -42,7 +42,7 @@ class SwTableRep; struct TColumn { SwTwips nWidth; - BOOL bVisible; + sal_Bool bVisible; }; class SwFormatTablePage : public SfxTabPage @@ -79,10 +79,10 @@ class SwFormatTablePage : public SfxTabPage SwTableRep* pTblData; SwTwips nSaveWidth; SwTwips nMinTableWidth; - USHORT nOldAlign; - BOOL bModified; - BOOL bFull:1; - BOOL bHtmlMode : 1; + sal_uInt16 nOldAlign; + sal_Bool bModified; + sal_Bool bFull:1; + sal_Bool bHtmlMode : 1; void Init(); void ModifyHdl( Edit* pEdit ); @@ -99,7 +99,7 @@ public: SwFormatTablePage( Window* pParent, const SfxItemSet& rSet ); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); @@ -116,7 +116,7 @@ class SwTableColumnPage : public SfxTabPage CheckBox aProportionalCB; FixedText aSpaceFT; MetricField aSpaceED; - + FixedLine aColFL; ImageButton aUpBtn; FixedText aFT1; PercentField aMF1; @@ -131,31 +131,30 @@ class SwTableColumnPage : public SfxTabPage FixedText aFT6; PercentField aMF6; ImageButton aDownBtn; - FixedLine aColFL; SwTableRep* pTblData; PercentField* pFieldArr[MET_FIELDS]; FixedText* pTextArr[MET_FIELDS]; SwTwips nTableWidth; SwTwips nMinWidth; - USHORT nNoOfCols; - USHORT nNoOfVisibleCols; + sal_uInt16 nNoOfCols; + sal_uInt16 nNoOfVisibleCols; //Breite merken, wenn auf autom. Ausrichtung gestellt wird - USHORT aValueTbl[MET_FIELDS];//primaere Zuordnung der MetricFields - BOOL bModified:1; - BOOL bModifyTbl:1; - BOOL bPercentMode:1; + sal_uInt16 aValueTbl[MET_FIELDS];//primaere Zuordnung der MetricFields + sal_Bool bModified:1; + sal_Bool bModifyTbl:1; + sal_Bool bPercentMode:1; - void Init(BOOL bWeb); + void Init(sal_Bool bWeb); DECL_LINK( AutoClickHdl, CheckBox * ); void ModifyHdl( PercentField* pEdit ); DECL_LINK( UpHdl, PercentField * ); DECL_LINK( DownHdl, PercentField * ); DECL_LINK( LoseFocusHdl, PercentField * ); DECL_LINK( ModeHdl, CheckBox * ); - void UpdateCols( USHORT nAktPos ); - SwTwips GetVisibleWidth(USHORT nPos); - void SetVisibleWidth(USHORT nPos, SwTwips nNewWidth); + void UpdateCols( sal_uInt16 nAktPos ); + SwTwips GetVisibleWidth(sal_uInt16 nPos); + void SetVisibleWidth(sal_uInt16 nPos, SwTwips nNewWidth); using TabPage::ActivatePage; using TabPage::DeactivatePage; @@ -165,7 +164,7 @@ public: ~SwTableColumnPage(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); @@ -205,8 +204,8 @@ class SwTextFlowPage : public SfxTabPage SwWrtShell* pShell; - BOOL bPageBreak; - BOOL bHtmlMode; + sal_Bool bPageBreak; + sal_Bool bHtmlMode; DECL_LINK( PageBreakHdl_Impl, CheckBox* ); @@ -223,7 +222,7 @@ class SwTextFlowPage : public SfxTabPage public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); void SetShell(SwWrtShell* pSh); |