diff options
Diffstat (limited to 'sw/source/ui/inc/wrap.hxx')
| -rw-r--r-- | sw/source/ui/inc/wrap.hxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sw/source/ui/inc/wrap.hxx b/sw/source/ui/inc/wrap.hxx index ce0172e553..07ec857cb1 100644 --- a/sw/source/ui/inc/wrap.hxx +++ b/sw/source/ui/inc/wrap.hxx @@ -31,7 +31,7 @@ #include <sfx2/tabdlg.hxx> #include <sfx2/basedlgs.hxx> -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #include <vcl/button.hxx> @@ -48,7 +48,7 @@ class SwWrapDlg : public SfxSingleTabDialog SwWrtShell* pWrtShell; public: - SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, BOOL bDrawMode); + SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode); ~SwWrapDlg(); inline SwWrtShell* GetWrtShell() { return pWrtShell; } @@ -92,22 +92,22 @@ class SwWrapTabPage: public SfxTabPage ImageList aWrapIL; ImageList aWrapILH; - USHORT nOldLeftMargin; - USHORT nOldRightMargin; - USHORT nOldUpperMargin; - USHORT nOldLowerMargin; + sal_uInt16 nOldLeftMargin; + sal_uInt16 nOldRightMargin; + sal_uInt16 nOldUpperMargin; + sal_uInt16 nOldLowerMargin; RndStdIds nAnchorId; - USHORT nHtmlMode; + sal_uInt16 nHtmlMode; Size aFrmSize; SwWrtShell* pWrtSh; - BOOL bFormat; - BOOL bNew; - BOOL bHtmlMode; - BOOL bDrawMode; - BOOL bContourImage; + sal_Bool bFormat; + sal_Bool bNew; + sal_Bool bHtmlMode; + sal_Bool bDrawMode; + sal_Bool bContourImage; SwWrapTabPage(Window *pParent, const SfxItemSet &rSet); ~SwWrapTabPage(); @@ -129,12 +129,12 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - virtual BOOL FillItemSet(SfxItemSet &rSet); + virtual sal_Bool FillItemSet(SfxItemSet &rSet); virtual void Reset(const SfxItemSet &rSet); - static USHORT* GetRanges(); - inline void SetNewFrame(BOOL bNewFrame) { bNew = bNewFrame; } - inline void SetFormatUsed(BOOL bFmt, BOOL bDrw) { bFormat = bFmt; + static sal_uInt16* GetRanges(); + inline void SetNewFrame(sal_Bool bNewFrame) { bNew = bNewFrame; } + inline void SetFormatUsed(sal_Bool bFmt, sal_Bool bDrw) { bFormat = bFmt; bDrawMode = bDrw; } inline void SetShell(SwWrtShell* pSh) { pWrtSh = pSh; } }; |