diff options
Diffstat (limited to 'sw/source/ui/inc/optpage.hxx')
| -rw-r--r-- | sw/source/ui/inc/optpage.hxx | 70 |
1 files changed, 39 insertions, 31 deletions
diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx index 2fcf9b3a75..dcdd067a54 100644 --- a/sw/source/ui/inc/optpage.hxx +++ b/sw/source/ui/inc/optpage.hxx @@ -89,7 +89,7 @@ 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 ); }; @@ -120,11 +120,11 @@ class SwAddPrinterTabPage : public SfxTabPage FixedLine aSeparatorRFL; + FixedLine aFL3; RadioButton aNoRB; RadioButton aOnlyRB; RadioButton aEndRB; RadioButton aEndPageRB; - FixedLine aFL3; FixedLine aFL4; CheckBox aPrintEmptyPagesCB; // CheckBox aSingleJobsCB; @@ -133,8 +133,8 @@ class SwAddPrinterTabPage : public SfxTabPage ListBox aFaxLB; String sNone; - BOOL bAttrModified; - BOOL bPreview; + sal_Bool bAttrModified; + sal_Bool bPreview; void Init(); DECL_LINK( AutoClickHdl, CheckBox * ); @@ -148,11 +148,11 @@ 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 SetFax( const SvStringsDtor& ); void SelectFax( const String& ); - void SetPreview(BOOL bPrev); + void SetPreview(sal_Bool bPrev); virtual void PageCreated (SfxAllItemSet aSet); }; @@ -200,20 +200,20 @@ class SwStdFontTabPage : public SfxTabPage SwWrtShell* pWrtShell; LanguageType eLanguage; // waren nur defaults vorhanden? wurden sie mit den Boxen ueberschrieben - BOOL bListDefault :1; - BOOL bSetListDefault :1; - BOOL bLabelDefault :1; - BOOL bSetLabelDefault :1; - BOOL bIdxDefault :1; - BOOL bSetIdxDefault :1; - BOOL bDeletePrinter :1; - - BOOL bListHeightDefault :1; - BOOL bSetListHeightDefault :1; - BOOL bLabelHeightDefault :1; - BOOL bSetLabelHeightDefault :1; - BOOL bIndexHeightDefault :1; - BOOL bSetIndexHeightDefault :1; + sal_Bool bListDefault :1; + sal_Bool bSetListDefault :1; + sal_Bool bLabelDefault :1; + sal_Bool bSetLabelDefault :1; + sal_Bool bIdxDefault :1; + sal_Bool bSetIdxDefault :1; + sal_Bool bDeletePrinter :1; + + sal_Bool bListHeightDefault :1; + sal_Bool bSetListHeightDefault :1; + sal_Bool bLabelHeightDefault :1; + sal_Bool bSetLabelHeightDefault :1; + sal_Bool bIndexHeightDefault :1; + sal_Bool bSetIndexHeightDefault :1; sal_uInt8 nFontGroup; //fontcfg.hxx: FONT_GROUP_[STANDARD|CJK|CTL] @@ -234,7 +234,7 @@ 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 SetFontMode(sal_uInt8 nGroup) {nFontGroup = nGroup;} @@ -278,7 +278,7 @@ class SwTableOptionsTabPage : public SfxTabPage FixedText aVarFT; SwWrtShell* pWrtShell; - BOOL bHTMLMode; + sal_Bool bHTMLMode; DECL_LINK(CheckBoxHdl, CheckBox *pCB); @@ -292,7 +292,7 @@ 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 SetWrtShell(SwWrtShell* pSh) {pWrtShell = pSh;} @@ -331,6 +331,12 @@ class SwShdwCrsrOptionsTabPage : public SfxTabPage FixedLine aCrsrOptFL; CheckBox aCrsrInProtCB; + FixedLine m_aLayoutOptionsFL; + CheckBox m_aMathBaselineAlignmentCB; + + SwWrtShell * m_pWrtShell; + + SwShdwCrsrOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); ~SwShdwCrsrOptionsTabPage(); @@ -338,8 +344,11 @@ 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 SetWrtShell( SwWrtShell * pSh ) { m_pWrtShell = pSh; } + virtual void PageCreated( SfxAllItemSet aSet ); }; /*----------------------------------------------------------------------- @@ -359,7 +368,7 @@ class SwMarkPreview : public Window Rectangle aLeftPagePrtArea; Rectangle aRightPagePrtArea; - USHORT nMarkPos; + sal_uInt16 nMarkPos; using OutputDevice::DrawRect; void DrawRect(const Rectangle &rRect, const Color &rFillColor, const Color &rLineColor); @@ -376,7 +385,7 @@ public: virtual ~SwMarkPreview(); inline void SetColor(const Color& rCol) { m_aMarkCol = rCol; } - inline void SetMarkPos(USHORT nPos) { nMarkPos = nPos; } + inline void SetMarkPos(sal_uInt16 nPos) { nMarkPos = nPos; } }; /*----------------------------------------------------------------------- @@ -431,7 +440,7 @@ 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 ); }; @@ -450,7 +459,7 @@ 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 ); private: @@ -466,7 +475,7 @@ private: CheckBox aTest9CBox; CheckBox aTest10CBox; - BOOL bAttrModified; + sal_Bool bAttrModified; void Init(); DECL_LINK( AutoClickHdl, CheckBox * ); @@ -475,5 +484,4 @@ private: #endif //PRODUCT #endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file |