From 7f33ed417b2e29e5470724ea76967f64699a2662 Mon Sep 17 00:00:00 2001
From: Carsten Driesner <cd@openoffice.org>
Date: Mon, 17 Jan 2011 15:06:54 +0100
Subject: removetooltypes01: #i112600# Remove tools types from sw

---
 sw/source/ui/inc/optpage.hxx | 56 ++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

(limited to 'sw/source/ui/inc/optpage.hxx')

diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx
index 61b8056aa309..db631fc55757 100644
--- a/sw/source/ui/inc/optpage.hxx
+++ b/sw/source/ui/inc/optpage.hxx
@@ -102,7 +102,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 );
 
 };
@@ -148,8 +148,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 * );
@@ -163,11 +163,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);
 
 };
@@ -219,20 +219,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]
 
@@ -253,7 +253,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;}
@@ -301,7 +301,7 @@ class SwTableOptionsTabPage : public SfxTabPage
     FixedText   aVarFT;
 
     SwWrtShell* pWrtShell;
-    BOOL        bHTMLMode;
+    sal_Bool        bHTMLMode;
 
     DECL_LINK(CheckBoxHdl, CheckBox *pCB);
 
@@ -315,7 +315,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;}
@@ -366,7 +366,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 ) { m_pWrtShell = pSh; }
@@ -391,7 +391,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);
@@ -408,7 +408,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; }
 };
 
 /*-----------------------------------------------------------------------
@@ -464,7 +464,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 );
 };
 
@@ -483,7 +483,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:
@@ -499,7 +499,7 @@ private:
     CheckBox aTest9CBox;
     CheckBox aTest10CBox;
 
-    BOOL        bAttrModified;
+    sal_Bool        bAttrModified;
 
     void        Init();
     DECL_LINK( AutoClickHdl, CheckBox * );
-- 
cgit