sfx2: sal_Bool->bool

Change-Id: I1fd02cc148fd9a54d2092dad1e548f51a0813a14

64 files changed, 134 insertions, 134 deletions

diff --git a/sw/source/core/uibase/inc/chrdlg.hxx b/sw/source/core/uibase/inc/chrdlg.hxx
index c01cc2d16357..d233b37a9143 100644
--- a/sw/source/core/uibase/inc/chrdlg.hxx
+++ b/sw/source/core/uibase/inc/chrdlg.hxx
@@ -85,7 +85,7 @@ public:
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 };
 
diff --git a/sw/source/core/uibase/inc/column.hxx b/sw/source/core/uibase/inc/column.hxx
index 2593a35be19c..ca7c55c2e692 100644
--- a/sw/source/core/uibase/inc/column.hxx
+++ b/sw/source/core/uibase/inc/column.hxx
@@ -177,7 +177,7 @@ public:
     static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
     static sal_uInt16* GetRanges();
 
-    virtual sal_Bool    FillItemSet(SfxItemSet &rSet);
+    virtual bool    FillItemSet(SfxItemSet &rSet);
     virtual void    Reset(const SfxItemSet &rSet);
 
     void SetFrmMode(sal_Bool bMod);
diff --git a/sw/source/core/uibase/inc/docstdlg.hxx b/sw/source/core/uibase/inc/docstdlg.hxx
index 60275da16acd..a7c427550942 100644
--- a/sw/source/core/uibase/inc/docstdlg.hxx
+++ b/sw/source/core/uibase/inc/docstdlg.hxx
@@ -38,7 +38,7 @@ public:
     static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
 
 protected:
-    virtual sal_Bool    FillItemSet(      SfxItemSet &rSet);
+    virtual bool    FillItemSet(      SfxItemSet &rSet);
     virtual void    Reset      (const SfxItemSet &rSet);
 
     DECL_LINK(UpdateHdl, void *);
diff --git a/sw/source/core/uibase/inc/drpcps.hxx b/sw/source/core/uibase/inc/drpcps.hxx
index dd4a37377a4b..27714918c05e 100644
--- a/sw/source/core/uibase/inc/drpcps.hxx
+++ b/sw/source/core/uibase/inc/drpcps.hxx
@@ -89,7 +89,7 @@ public:
     static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
     static sal_uInt16* GetRanges();
 
-    virtual sal_Bool FillItemSet(      SfxItemSet &rSet);
+    virtual bool FillItemSet(      SfxItemSet &rSet);
     virtual void Reset      (const SfxItemSet &rSet);
 
     void    SetFormat(sal_Bool bSet){bFormat = bSet;}
diff --git a/sw/source/core/uibase/inc/envlop.hxx b/sw/source/core/uibase/inc/envlop.hxx
index b7b7906ec79e..69ca85d65349 100644
--- a/sw/source/core/uibase/inc/envlop.hxx
+++ b/sw/source/core/uibase/inc/envlop.hxx
@@ -113,7 +113,7 @@ public:
     virtual void ActivatePage(const SfxItemSet& rSet);
     virtual int  DeactivatePage(SfxItemSet* pSet = 0);
             void FillItem(SwEnvItem& rItem);
-    virtual sal_Bool FillItemSet(SfxItemSet& rSet);
+    virtual bool FillItemSet(SfxItemSet& rSet);
     virtual void Reset(const SfxItemSet& rSet);
 };
 
diff --git a/sw/source/core/uibase/inc/frmpage.hxx b/sw/source/core/uibase/inc/frmpage.hxx
index 4f47b2c68067..204d6bbb48e5 100644
--- a/sw/source/core/uibase/inc/frmpage.hxx
+++ b/sw/source/core/uibase/inc/frmpage.hxx
@@ -190,7 +190,7 @@ public:
     static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
     static sal_uInt16* GetRanges();
 
-    virtual sal_Bool FillItemSet(SfxItemSet &rSet);
+    virtual bool FillItemSet(SfxItemSet &rSet);
     virtual void Reset(const SfxItemSet &rSet);
 
     void            SetNewFrame(sal_Bool bNewFrame) { bNew      = bNewFrame; }
@@ -236,7 +236,7 @@ public:
 
     static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
 
-    virtual sal_Bool FillItemSet(SfxItemSet &rSet);
+    virtual bool FillItemSet(SfxItemSet &rSet);
     virtual void Reset(const SfxItemSet &rSet);
     virtual int  DeactivatePage(SfxItemSet *pSet);
 };
@@ -265,7 +265,7 @@ public:
 
     static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
 
-    virtual sal_Bool FillItemSet(SfxItemSet &rSet);
+    virtual bool FillItemSet(SfxItemSet &rSet);
     virtual void Reset(const SfxItemSet &rSet);
 };
 
@@ -313,7 +313,7 @@ public:
     static SfxTabPage*  Create(Window *pParent, const SfxItemSet &rSet);
     static sal_uInt16*      GetRanges();
 
-    virtual sal_Bool FillItemSet(SfxItemSet &rSet);
+    virtual bool FillItemSet(SfxItemSet &rSet);
     virtual void Reset(const SfxItemSet &rSet);
 
     void            SetFormatUsed(sal_Bool bFmt);
diff --git a/sw/source/core/uibase/inc/mailconfigpage.hxx b/sw/source/core/uibase/inc/mailconfigpage.hxx
index 2de39fd89704..bf16067b5646 100644
--- a/sw/source/core/uibase/inc/mailconfigpage.hxx
+++ b/sw/source/core/uibase/inc/mailconfigpage.hxx
@@ -61,7 +61,7 @@ public:
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
 };
diff --git a/sw/source/core/uibase/inc/num.hxx b/sw/source/core/uibase/inc/num.hxx
index 67d107588265..7a59e849f7e4 100644
--- a/sw/source/core/uibase/inc/num.hxx
+++ b/sw/source/core/uibase/inc/num.hxx
@@ -121,7 +121,7 @@ public:
 
     virtual void        ActivatePage(const SfxItemSet& rSet);
     virtual int         DeactivatePage(SfxItemSet *pSet);
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     static SfxTabPage*  Create( Window* pParent,
diff --git a/sw/source/core/uibase/inc/numpara.hxx b/sw/source/core/uibase/inc/numpara.hxx
index 71602d8fc33c..67aba90cb323 100644
--- a/sw/source/core/uibase/inc/numpara.hxx
+++ b/sw/source/core/uibase/inc/numpara.hxx
@@ -71,7 +71,7 @@ public:
                                 const SfxItemSet& rSet );
     static sal_uInt16*      GetRanges();
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     void                EnableNewStart();
diff --git a/sw/source/core/uibase/inc/optcomp.hxx b/sw/source/core/uibase/inc/optcomp.hxx
index afe29931d1d2..e0a1da8ea987 100644
--- a/sw/source/core/uibase/inc/optcomp.hxx
+++ b/sw/source/core/uibase/inc/optcomp.hxx
@@ -66,7 +66,7 @@ public:
 
     static SfxTabPage*      Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual sal_Bool            FillItemSet( SfxItemSet& rSet );
+    virtual bool            FillItemSet( SfxItemSet& rSet );
     virtual void            Reset( const SfxItemSet& rSet );
 };
 
diff --git a/sw/source/core/uibase/inc/optload.hxx b/sw/source/core/uibase/inc/optload.hxx
index 6013d8b8dfc3..7aaf68fb3819 100644
--- a/sw/source/core/uibase/inc/optload.hxx
+++ b/sw/source/core/uibase/inc/optload.hxx
@@ -65,7 +65,7 @@ public:
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
 
-    virtual sal_Bool    FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 };
 
@@ -166,7 +166,7 @@ public:
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 };
 
diff --git a/sw/source/core/uibase/inc/optpage.hxx b/sw/source/core/uibase/inc/optpage.hxx
index 802b06092eed..c8d81879aa37 100644
--- a/sw/source/core/uibase/inc/optpage.hxx
+++ b/sw/source/core/uibase/inc/optpage.hxx
@@ -76,7 +76,7 @@ public:
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
 };
@@ -125,7 +125,7 @@ public:
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet );
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
     void                SetFax( const std::vector<OUString>& );
     void                SelectFax( const OUString& );
@@ -197,7 +197,7 @@ public:
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet );
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     void    SetFontMode(sal_uInt8 nGroup) {nFontGroup = nGroup;}
@@ -239,7 +239,7 @@ public:
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet );
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     void SetWrtShell(SwWrtShell* pSh) {pWrtShell = pSh;}
@@ -285,7 +285,7 @@ public:
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     void    SetWrtShell( SwWrtShell * pSh ) { m_pWrtShell = pSh; }
@@ -369,7 +369,7 @@ public:
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 };
 
@@ -388,7 +388,7 @@ public:
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet );
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
 private:
@@ -431,7 +431,7 @@ public:
 
     static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual sal_Bool FillItemSet( SfxItemSet& rSet );
+    virtual bool FillItemSet( SfxItemSet& rSet );
     virtual void Reset( const SfxItemSet& rSet );
 };
 
diff --git a/sw/source/core/uibase/inc/outline.hxx b/sw/source/core/uibase/inc/outline.hxx
index 6d54f977108d..6903d74d60bf 100644
--- a/sw/source/core/uibase/inc/outline.hxx
+++ b/sw/source/core/uibase/inc/outline.hxx
@@ -127,7 +127,7 @@ public:
     virtual void        ActivatePage(const SfxItemSet& rSet);
     virtual int         DeactivatePage(SfxItemSet *pSet);
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
diff --git a/sw/source/core/uibase/inc/pgfnote.hxx b/sw/source/core/uibase/inc/pgfnote.hxx
index 156607ef105d..270656b7095b 100644
--- a/sw/source/core/uibase/inc/pgfnote.hxx
+++ b/sw/source/core/uibase/inc/pgfnote.hxx
@@ -37,7 +37,7 @@ public:
     static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
     static sal_uInt16* GetRanges();
 
-    virtual sal_Bool FillItemSet(SfxItemSet &rSet);
+    virtual bool FillItemSet(SfxItemSet &rSet);
     virtual void Reset(const SfxItemSet &rSet);
 
 private:
diff --git a/sw/source/core/uibase/inc/pggrid.hxx b/sw/source/core/uibase/inc/pggrid.hxx
index 4dfc5d22748c..8afce35e8fa6 100644
--- a/sw/source/core/uibase/inc/pggrid.hxx
+++ b/sw/source/core/uibase/inc/pggrid.hxx
@@ -89,7 +89,7 @@ public:
     static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
     static sal_uInt16* GetRanges();
 
-    virtual sal_Bool    FillItemSet(SfxItemSet &rSet);
+    virtual bool    FillItemSet(SfxItemSet &rSet);
     virtual void    Reset(const SfxItemSet &rSet);
 
     virtual void    ActivatePage( const SfxItemSet& rSet );
diff --git a/sw/source/core/uibase/inc/regionsw.hxx b/sw/source/core/uibase/inc/regionsw.hxx
index 44a9fa642684..185f60246bcc 100644
--- a/sw/source/core/uibase/inc/regionsw.hxx
+++ b/sw/source/core/uibase/inc/regionsw.hxx
@@ -191,7 +191,7 @@ public:
 
     void    SetWrtShell(SwWrtShell& rSh);
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& );
+    virtual bool        FillItemSet( SfxItemSet& );
     virtual void        Reset( const SfxItemSet& );
 
     static SfxTabPage*  Create( Window* pParent,
@@ -233,7 +233,7 @@ public:
     SwSectionFtnEndTabPage( Window *pParent, const SfxItemSet &rAttrSet );
     virtual ~SwSectionFtnEndTabPage();
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& );
+    virtual bool        FillItemSet( SfxItemSet& );
     virtual void        Reset( const SfxItemSet& );
 
     static SfxTabPage*  Create( Window* pParent,
@@ -251,7 +251,7 @@ public:
     SwSectionIndentTabPage( Window *pParent, const SfxItemSet &rAttrSet );
     virtual ~SwSectionIndentTabPage();
 
-    virtual sal_Bool    FillItemSet( SfxItemSet& );
+    virtual bool        FillItemSet( SfxItemSet& );
     virtual void        Reset( const SfxItemSet& );
 
     static SfxTabPage*  Create( Window* pParent,
diff --git a/sw/source/core/uibase/inc/swuiccoll.hxx b/sw/source/core/uibase/inc/swuiccoll.hxx
index d63d7ee99243..53e2fabaabd1 100644
--- a/sw/source/core/uibase/inc/swuiccoll.hxx
+++ b/sw/source/core/uibase/inc/swuiccoll.hxx
@@ -64,7 +64,7 @@ public:
     static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
     static sal_uInt16* GetRanges();
 
-    virtual sal_Bool FillItemSet(      SfxItemSet &rSet);
+    virtual bool FillItemSet(      SfxItemSet &rSet);
     virtual void Reset      (const SfxItemSet &rSet);
 
     void SetCollection( SwFmt* pFormat, sal_Bool bNew );
diff --git a/sw/source/core/uibase/inc/swuicnttab.hxx b/sw/source/core/uibase/inc/swuicnttab.hxx
index 1986936f86f3..27385112a311 100644
--- a/sw/source/core/uibase/inc/swuicnttab.hxx
+++ b/sw/source/core/uibase/inc/swuicnttab.hxx
@@ -222,7 +222,7 @@ public:
     SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrSet);
     ~SwTOXSelectTabPage();
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& );
+    virtual bool        FillItemSet( SfxItemSet& );
     virtual void        Reset( const SfxItemSet& );
 
     virtual void        ActivatePage( const SfxItemSet& );
@@ -435,7 +435,7 @@ public:
     SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet);
     ~SwTOXEntryTabPage();
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& );
+    virtual bool        FillItemSet( SfxItemSet& );
     virtual void        Reset( const SfxItemSet& );
     virtual void        ActivatePage( const SfxItemSet& );
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
@@ -481,7 +481,7 @@ public:
     SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrSet);
     ~SwTOXStylesTabPage();
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& );
+    virtual bool        FillItemSet( SfxItemSet& );
     virtual void        Reset( const SfxItemSet& );
 
     virtual void        ActivatePage( const SfxItemSet& );
diff --git a/sw/source/core/uibase/inc/wrap.hxx b/sw/source/core/uibase/inc/wrap.hxx
index 322b0530a749..7a9aa1fd4bc1 100644
--- a/sw/source/core/uibase/inc/wrap.hxx
+++ b/sw/source/core/uibase/inc/wrap.hxx
@@ -102,7 +102,7 @@ public:
 
     static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
 
-    virtual sal_Bool    FillItemSet(SfxItemSet &rSet);
+    virtual bool    FillItemSet(SfxItemSet &rSet);
     virtual void    Reset(const SfxItemSet &rSet);
 
     static sal_uInt16*  GetRanges();
diff --git a/sw/source/core/uibase/table/tablepg.hxx b/sw/source/core/uibase/table/tablepg.hxx
index 17a708c7b3e3..87b4722b2b19 100644
--- a/sw/source/core/uibase/table/tablepg.hxx
+++ b/sw/source/core/uibase/table/tablepg.hxx
@@ -83,7 +83,7 @@ public:
     SwFormatTablePage( Window* pParent, const SfxItemSet& rSet );
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet);
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
     virtual void        ActivatePage( const SfxItemSet& rSet );
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
@@ -133,7 +133,7 @@ public:
     ~SwTableColumnPage();
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet);
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
     virtual void        ActivatePage( const SfxItemSet& rSet );
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
@@ -182,7 +182,7 @@ class SwTextFlowPage : public SfxTabPage
 
 public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet);
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     void                SetShell(SwWrtShell* pSh);
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 220023a1404b..50012a53572c 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -236,7 +236,7 @@ void SwCharURLPage::Reset(const SfxItemSet& rSet)
     }
 }
 
-sal_Bool SwCharURLPage::FillItemSet(SfxItemSet& rSet)
+bool SwCharURLPage::FillItemSet(SfxItemSet& rSet)
 {
    OUString sURL = m_pURLED->GetText();
    if(!sURL.isEmpty())
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index a525fafe1b36..085759dc0e71 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -603,7 +603,7 @@ SfxTabPage*  SwDropCapsPage::Create(Window *pParent,
 Page: FillItemSet-Overload
 ****************************************************************************/
 
-sal_Bool  SwDropCapsPage::FillItemSet(SfxItemSet &rSet)
+bool  SwDropCapsPage::FillItemSet(SfxItemSet &rSet)
 {
     if(bModified)
         FillSet(rSet);
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index b6c2b8c0ff51..87c7829d341b 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -103,7 +103,7 @@ sal_uInt16* SwParagraphNumTabPage::GetRanges()
     return aPageRg;
 }
 
-sal_Bool    SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet )
+bool    SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet )
 {
     if( m_pOutlineLvLB->GetSelectEntryPos() != m_pOutlineLvLB->GetSavedValue())
     {
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index b391a0f15ecb..6a85aa051dc4 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -154,7 +154,7 @@ SfxTabPage* SwCondCollPage::Create(Window *pParent, const SfxItemSet &rSet)
 Page: FillItemSet-Overload
 ****************************************************************************/
 
-sal_Bool SwCondCollPage::FillItemSet(SfxItemSet &rSet)
+bool SwCondCollPage::FillItemSet(SfxItemSet &rSet)
 {
     sal_Bool bModified = sal_True;
     SwCondCollItem aCondItem;
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index b2aebf9d3a2b..f577bee450b8 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -143,7 +143,7 @@ SfxTabPage*  SwMailConfigPage::Create( Window* pParent, const SfxItemSet& rAttrS
     return new SwMailConfigPage(pParent, rAttrSet);
 }
 
-sal_Bool SwMailConfigPage::FillItemSet( SfxItemSet& /*rSet*/ )
+bool SwMailConfigPage::FillItemSet( SfxItemSet& /*rSet*/ )
 {
     if(m_pDisplayNameED->GetText() != m_pDisplayNameED->GetSavedValue())
         m_pConfigItem->SetMailDisplayName(m_pDisplayNameED->GetText());
@@ -162,7 +162,7 @@ sal_Bool SwMailConfigPage::FillItemSet( SfxItemSet& /*rSet*/ )
     m_pConfigItem->SetSecureConnection(m_pSecureCB->IsChecked());
 
     m_pConfigItem->Commit();
-    return sal_True;
+    return true;
 }
 
 void SwMailConfigPage::Reset( const SfxItemSet& /*rSet*/ )
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index f0cd71a01815..89530ff1626c 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -409,7 +409,7 @@ SfxTabPage* SwCompatibilityOptPage::Create( Window* pParent, const SfxItemSet& r
     return new SwCompatibilityOptPage( pParent, rAttrSet );
 }
 
-sal_Bool SwCompatibilityOptPage::FillItemSet( SfxItemSet&  )
+bool SwCompatibilityOptPage::FillItemSet( SfxItemSet&  )
 {
     sal_Bool bModified = sal_False;
     if ( m_pWrtShell )
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 4abd35c76d8c..3b24335757ee 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -128,7 +128,7 @@ SfxTabPage* SwLoadOptPage::Create( Window* pParent,
     return new SwLoadOptPage(pParent, rAttrSet );
 }
 
-sal_Bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet )
+bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet )
 {
     sal_Bool bRet = sal_False;
     SwModule* pMod = SW_MOD();
@@ -494,7 +494,7 @@ SfxTabPage* SwCaptionOptPage::Create( Window* pParent,
     return new SwCaptionOptPage(pParent, rAttrSet );
 }
 
-sal_Bool SwCaptionOptPage::FillItemSet( SfxItemSet&  )
+bool SwCaptionOptPage::FillItemSet( SfxItemSet&  )
 {
     sal_Bool bRet = sal_False;
     SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 5cf73bcf924f..e57265df7164 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -212,7 +212,7 @@ void SwContentOptPage::Reset(const SfxItemSet& rSet)
     AnyRulerHdl(m_pAnyRulerCB);
 }
 
-sal_Bool SwContentOptPage::FillItemSet(SfxItemSet& rSet)
+bool SwContentOptPage::FillItemSet(SfxItemSet& rSet)
 {
     const SwElemItem*   pOldAttr = (const SwElemItem*)
                         GetOldItem(GetItemSet(), FN_PARAM_ELEM);
@@ -367,7 +367,7 @@ SfxTabPage* SwAddPrinterTabPage::Create( Window* pParent,
     return ( new SwAddPrinterTabPage( pParent, rAttrSet ) );
 }
 
-sal_Bool    SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet )
+bool    SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet )
 {
     if ( bAttrModified )
     {
@@ -612,7 +612,7 @@ static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType,
     pColl->SetFmtAttr(SvxFontHeightItem(nHeight, 100, nFontHeightWhich));
 }
 
-sal_Bool SwStdFontTabPage::FillItemSet( SfxItemSet& )
+bool SwStdFontTabPage::FillItemSet( SfxItemSet& )
 {
     sal_Bool bNotDocOnly = !pDocOnlyCB->IsChecked();
     SW_MOD()->GetModuleConfig()->SetDefaultFontInCurrDocOnly(!bNotDocOnly);
@@ -740,7 +740,7 @@ sal_Bool SwStdFontTabPage::FillItemSet( SfxItemSet& )
             pWrtShell->SetModified();
         pWrtShell->EndAllAction();
     }
-    return sal_False;
+    return false;
 }
 
 void SwStdFontTabPage::Reset( const SfxItemSet& rSet)
@@ -1096,7 +1096,7 @@ SfxTabPage* SwTableOptionsTabPage::Create( Window* pParent,
     return new SwTableOptionsTabPage(pParent, rAttrSet );
 }
 
-sal_Bool SwTableOptionsTabPage::FillItemSet( SfxItemSet& )
+bool SwTableOptionsTabPage::FillItemSet( SfxItemSet& )
 {
     sal_Bool bRet = sal_False;
     SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
@@ -1336,7 +1336,7 @@ void SwShdwCrsrOptionsTabPage::PageCreated( SfxAllItemSet aSet )
         SetWrtShell(pWrtSh->GetValue());
 }
 
-sal_Bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet )
+bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet )
 {
     SwShadowCursorItem aOpt;
     aOpt.SetOn( m_pOnOffCB->IsChecked() );
@@ -1739,7 +1739,7 @@ SfxTabPage* SwRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet&
     return new SwRedlineOptionsTabPage( pParent, rSet );
 }
 
-sal_Bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet& )
+bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet& )
 {
     CharAttr *pAttr;
     SwModuleOptions *pOpt = SW_MOD()->GetModuleConfig();
@@ -1863,7 +1863,7 @@ sal_Bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet& )
         }
     }
 
-    return sal_False;
+    return false;
 }
 
 void SwRedlineOptionsTabPage::Reset( const SfxItemSet&  )
@@ -2242,7 +2242,7 @@ SfxTabPage* SwCompareOptionsTabPage::Create( Window* pParent, const SfxItemSet&
     return new SwCompareOptionsTabPage( pParent, rAttrSet );
 }
 
-sal_Bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet& )
+bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet& )
 {
     sal_Bool bRet = sal_False;
     SwModuleOptions *pOpt = SW_MOD()->GetModuleConfig();
@@ -2367,7 +2367,7 @@ SfxTabPage* SwTestTabPage::Create( Window* pParent,
     return new SwTestTabPage(pParent, rAttrSet);
 }
 
-sal_Bool    SwTestTabPage::FillItemSet( SfxItemSet& rCoreSet )
+bool    SwTestTabPage::FillItemSet( SfxItemSet& rCoreSet )
 {
 
     if ( bAttrModified )
diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx
index 28f390506b93..0cb27d61fdd9 100644
--- a/sw/source/ui/dialog/docstdlg.cxx
+++ b/sw/source/ui/dialog/docstdlg.cxx
@@ -76,9 +76,9 @@ SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet)
 }
 
 // Description: fill ItemSet when changed
-sal_Bool  SwDocStatPage::FillItemSet(SfxItemSet & /*rSet*/)
+bool  SwDocStatPage::FillItemSet(SfxItemSet & /*rSet*/)
 {
-    return sal_False;
+    return false;
 }
 
 void  SwDocStatPage::Reset(const SfxItemSet &/*rSet*/)
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 0443390cbf3d..24e563093902 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1611,7 +1611,7 @@ void    SwInsertSectionTabPage::SetWrtShell(SwWrtShell& rSh)
     }
 }
 
-sal_Bool SwInsertSectionTabPage::FillItemSet( SfxItemSet& )
+bool SwInsertSectionTabPage::FillItemSet( SfxItemSet& )
 {
     SwSectionData aSection(CONTENT_SECTION, m_pCurName->GetText());
     aSection.SetCondition(m_pConditionED->GetText());
@@ -1667,7 +1667,7 @@ sal_Bool SwInsertSectionTabPage::FillItemSet( SfxItemSet& )
         }
     }
     ((SwInsertSectionTabDialog*)GetTabDialog())->SetSectionData(aSection);
-    return sal_True;
+    return true;
 }
 
 void SwInsertSectionTabPage::Reset( const SfxItemSet& )
@@ -1892,7 +1892,7 @@ SwSectionFtnEndTabPage::~SwSectionFtnEndTabPage()
 {
 }
 
-sal_Bool SwSectionFtnEndTabPage::FillItemSet( SfxItemSet& rSet )
+bool SwSectionFtnEndTabPage::FillItemSet( SfxItemSet& rSet )
 {
     SwFmtFtnAtTxtEnd aFtn( pFtnNtAtTextEndCB->IsChecked()
                             ? ( pFtnNtNumCB->IsChecked()
@@ -1939,7 +1939,7 @@ sal_Bool SwSectionFtnEndTabPage::FillItemSet( SfxItemSet& rSet )
     rSet.Put( aFtn );
     rSet.Put( aEnd );
 
-    return sal_True;
+    return true;
 }
 
 void SwSectionFtnEndTabPage::ResetState( sal_Bool bFtn,
@@ -2153,7 +2153,7 @@ SwSectionIndentTabPage::~SwSectionIndentTabPage()
 {
 }
 
-sal_Bool SwSectionIndentTabPage::FillItemSet( SfxItemSet& rSet)
+bool SwSectionIndentTabPage::FillItemSet( SfxItemSet& rSet)
 {
     if(m_pBeforeMF->IsValueModified() ||
             m_pAfterMF->IsValueModified())
@@ -2163,7 +2163,7 @@ sal_Bool SwSectionIndentTabPage::FillItemSet( SfxItemSet& rSet)
                 static_cast< long >(m_pAfterMF->Denormalize(m_pAfterMF->GetValue(FUNIT_TWIP))), 0, 0, RES_LR_SPACE);
         rSet.Put(aLRSpace);
     }
-    return sal_True;
+    return true;
 }
 
 void SwSectionIndentTabPage::Reset( const SfxItemSet& rSet)
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 468f273fb14e..e9835754e932 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -493,11 +493,11 @@ void SwEnvFmtPage::FillItem(SwEnvItem& rItem)
     }
 }
 
-sal_Bool SwEnvFmtPage::FillItemSet(SfxItemSet& rSet)
+bool SwEnvFmtPage::FillItemSet(SfxItemSet& rSet)
 {
     FillItem(GetParentSwEnvDlg()->aEnvItem);
     rSet.Put(GetParentSwEnvDlg()->aEnvItem);
-    return sal_True;
+    return true;
 }
 
 void SwEnvFmtPage::Reset(const SfxItemSet& rSet)
diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx
index 8629d5f8deb7..4f3a78af1feb 100644
--- a/sw/source/ui/envelp/envfmt.hxx
+++ b/sw/source/ui/envelp/envfmt.hxx
@@ -67,7 +67,7 @@ public:
     virtual void ActivatePage(const SfxItemSet& rSet);
     virtual int  DeactivatePage(SfxItemSet* pSet = 0);
             void FillItem(SwEnvItem& rItem);
-    virtual sal_Bool FillItemSet(SfxItemSet& rSet);
+    virtual bool FillItemSet(SfxItemSet& rSet);
     virtual void Reset(const SfxItemSet& rSet);
 };
 
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index f9abd95b55ab..ddf453d5fb74 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -336,11 +336,11 @@ void SwEnvPage::FillItem(SwEnvItem& rItem)
     rItem.aSendText = m_pSenderEdit->GetText();
 }
 
-sal_Bool SwEnvPage::FillItemSet(SfxItemSet& rSet)
+bool SwEnvPage::FillItemSet(SfxItemSet& rSet)
 {
     FillItem(GetParentSwEnvDlg()->aEnvItem);
     rSet.Put(GetParentSwEnvDlg()->aEnvItem);
-    return sal_True;
+    return true;
 }
 
 void SwEnvPage::Reset(const SfxItemSet& rSet)
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index c06c15f77b70..9ec2eb899cbc 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -161,11 +161,11 @@ void SwEnvPrtPage::FillItem(SwEnvItem& rItem)
     rItem.lShiftDown      = static_cast< sal_Int32 >(GetFldVal(*m_pDownField ));
 }
 
-sal_Bool SwEnvPrtPage::FillItemSet(SfxItemSet& rSet)
+bool SwEnvPrtPage::FillItemSet(SfxItemSet& rSet)
 {
     FillItem(GetParentSwEnvDlg()->aEnvItem);
     rSet.Put(GetParentSwEnvDlg()->aEnvItem);
-    return sal_True;
+    return true;
 }
 
 void SwEnvPrtPage::Reset(const SfxItemSet& rSet)
diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index 6134474a7a6c..01d866b620cb 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -66,7 +66,7 @@ public:
     virtual void ActivatePage(const SfxItemSet& rSet);
     virtual int  DeactivatePage(SfxItemSet* pSet = 0);
             void FillItem(SwEnvItem& rItem);
-    virtual sal_Bool FillItemSet(SfxItemSet& rSet);
+    virtual bool FillItemSet(SfxItemSet& rSet);
     virtual void Reset(const SfxItemSet& rSet);
 
     inline void SetPrt(Printer* pPrinter) { pPrt = pPrinter; }
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 90267465de83..e366477248f6 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -494,12 +494,12 @@ void SwLabPage::FillItem(SwLabItem& rItem)
     rItem.aLstType = m_pTypeBox->GetSelectEntry();
 }
 
-sal_Bool SwLabPage::FillItemSet(SfxItemSet& rSet)
+bool SwLabPage::FillItemSet(SfxItemSet& rSet)
 {
     FillItem( aItem );
     rSet.Put( aItem );
 
-    return sal_True;
+    return true;
 }
 
 void SwLabPage::Reset(const SfxItemSet& rSet)
@@ -614,7 +614,7 @@ int  SwVisitingCardPage::DeactivatePage(SfxItemSet* _pSet)
     return LEAVE_PAGE;
 }
 
-sal_Bool SwVisitingCardPage::FillItemSet(SfxItemSet& rSet)
+bool SwVisitingCardPage::FillItemSet(SfxItemSet& rSet)
 {
     const OUString* pGroup = (const OUString*)m_pAutoTextGroupLB->GetEntryData(
                                     m_pAutoTextGroupLB->GetSelectEntryPos());
@@ -627,7 +627,7 @@ sal_Bool SwVisitingCardPage::FillItemSet(SfxItemSet& rSet)
     if(pSelEntry)
         aLabItem.sGlossaryBlockName = *(OUString*)pSelEntry->GetUserData();
     rSet.Put(aLabItem);
-    return sal_True;
+    return true;
 }
 
 static void lcl_SelectBlock(SvTreeListBox& rAutoTextLB, const OUString& rBlockName)
@@ -747,7 +747,7 @@ int  SwPrivateDataPage::DeactivatePage(SfxItemSet* _pSet)
     return LEAVE_PAGE;
 }
 
-sal_Bool SwPrivateDataPage::FillItemSet(SfxItemSet& rSet)
+bool SwPrivateDataPage::FillItemSet(SfxItemSet& rSet)
 {
 
     SwLabItem aItem = (const SwLabItem&) GetTabDialog()->GetExampleSet()->Get(FN_LABEL);
@@ -771,7 +771,7 @@ sal_Bool SwPrivateDataPage::FillItemSet(SfxItemSet& rSet)
     aItem.aPrivMail      = m_pMailED->GetText(  );
 
     rSet.Put(aItem);
-    return sal_True;
+    return true;
 }
 
 void SwPrivateDataPage::Reset(const SfxItemSet& rSet)
@@ -835,7 +835,7 @@ int  SwBusinessDataPage::DeactivatePage(SfxItemSet* _pSet)
     return LEAVE_PAGE;
 }
 
-sal_Bool SwBusinessDataPage::FillItemSet(SfxItemSet& rSet)
+bool SwBusinessDataPage::FillItemSet(SfxItemSet& rSet)
 {
     SwLabItem aItem = (const SwLabItem&) GetTabDialog()->GetExampleSet()->Get(FN_LABEL);
 
@@ -855,7 +855,7 @@ sal_Bool SwBusinessDataPage::FillItemSet(SfxItemSet& rSet)
     aItem.aCompMail      = m_pMailED->GetText();
 
     rSet.Put(aItem);
-    return sal_True;
+    return true;
 }
 
 void SwBusinessDataPage::Reset(const SfxItemSet& rSet)
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index dd5aebffb012..97abd798b15d 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -508,12 +508,12 @@ void SwLabFmtPage::FillItem(SwLabItem& rItem)
     }
 }
 
-sal_Bool SwLabFmtPage::FillItemSet(SfxItemSet& rSet)
+bool SwLabFmtPage::FillItemSet(SfxItemSet& rSet)
 {
     FillItem(aItem);
     rSet.Put(aItem);
 
-    return sal_True;
+    return true;
 }
 
 void SwLabFmtPage::Reset(const SfxItemSet& )
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index eb6f3eb7304b..59201444817f 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -112,7 +112,7 @@ public:
     virtual void ActivatePage(const SfxItemSet& rSet);
     virtual int  DeactivatePage(SfxItemSet* pSet = 0);
             void FillItem(SwLabItem& rItem);
-    virtual sal_Bool FillItemSet(SfxItemSet& rSet);
+    virtual bool FillItemSet(SfxItemSet& rSet);
     virtual void Reset(const SfxItemSet& rSet);
 
     SwLabDlg* GetParentSwLabDlg() {return (SwLabDlg*)GetParentDialog();}
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index c59b3593fa38..09124698c698 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -119,14 +119,14 @@ void SwLabPrtPage::FillItem(SwLabItem& rItem)
     rItem.bSynchron = m_pSynchronCB->IsChecked() && m_pSynchronCB->IsEnabled();
 }
 
-sal_Bool SwLabPrtPage::FillItemSet(SfxItemSet& rSet)
+bool SwLabPrtPage::FillItemSet(SfxItemSet& rSet)
 {
     SwLabItem aItem;
     GetParentSwLabDlg()->GetLabItem(aItem);
     FillItem(aItem);
     rSet.Put(aItem);
 
-    return sal_True;
+    return true;
 }
 
 void SwLabPrtPage::Reset(const SfxItemSet& )
diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx
index 1821a2877ebc..d07a309c1676 100644
--- a/sw/source/ui/envelp/labprt.hxx
+++ b/sw/source/ui/envelp/labprt.hxx
@@ -63,7 +63,7 @@ public:
     virtual void ActivatePage(const SfxItemSet& rSet);
     virtual int  DeactivatePage(SfxItemSet* pSet = 0);
             void FillItem(SwLabItem& rItem);
-    virtual sal_Bool FillItemSet(SfxItemSet& rSet);
+    virtual bool FillItemSet(SfxItemSet& rSet);
     virtual void Reset(const SfxItemSet& rSet);
     inline Printer* GetPrt() { return (pPrinter); }
 };
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index 7e6590251ab1..57b5959e9af5 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -68,7 +68,7 @@ public:
     virtual void ActivatePage(const SfxItemSet& rSet);
     virtual int  DeactivatePage(SfxItemSet* pSet = 0);
             void FillItem(SwLabItem& rItem);
-    virtual sal_Bool FillItemSet(SfxItemSet& rSet);
+    virtual bool FillItemSet(SfxItemSet& rSet);
     virtual void Reset(const SfxItemSet& rSet);
 
     SwLabDlg* GetParentSwLabDlg() {return (SwLabDlg*) GetParentDialog();}
@@ -119,7 +119,7 @@ public:
 
     virtual void ActivatePage(const SfxItemSet& rSet);
     virtual int  DeactivatePage(SfxItemSet* pSet = 0);
-    virtual sal_Bool FillItemSet(SfxItemSet& rSet);
+    virtual bool FillItemSet(SfxItemSet& rSet);
     virtual void Reset(const SfxItemSet& rSet);
 };
 
@@ -157,7 +157,7 @@ public:
 
     virtual void ActivatePage(const SfxItemSet& rSet);
     virtual int  DeactivatePage(SfxItemSet* pSet = 0);
-    virtual sal_Bool FillItemSet(SfxItemSet& rSet);
+    virtual bool FillItemSet(SfxItemSet& rSet);
     virtual void Reset(const SfxItemSet& rSet);
 };
 
@@ -193,7 +193,7 @@ public:
 
     virtual void ActivatePage(const SfxItemSet& rSet);
     virtual int  DeactivatePage(SfxItemSet* pSet = 0);
-    virtual sal_Bool FillItemSet(SfxItemSet& rSet);
+    virtual bool FillItemSet(SfxItemSet& rSet);
     virtual void Reset(const SfxItemSet& rSet);
 };
 
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index f239e8ecac4d..2f775366289e 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -181,7 +181,7 @@ void SwFldDBPage::Reset(const SfxItemSet&)
     }
 }
 
-sal_Bool SwFldDBPage::FillItemSet(SfxItemSet& )
+bool SwFldDBPage::FillItemSet(SfxItemSet& )
 {
     OUString sTableName;
     OUString sColumnName;
@@ -246,7 +246,7 @@ sal_Bool SwFldDBPage::FillItemSet(SfxItemSet& )
         }
     }
 
-    return sal_False;
+    return false;
 }
 
 SfxTabPage* SwFldDBPage::Create(    Window* pParent,
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index 2874f4e65697..a446ae3a0bd1 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -74,7 +74,7 @@ public:
 
     static SfxTabPage*  Create(Window* pParent, const SfxItemSet& rAttrSet);
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     virtual void        FillUserData();
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 372c6794ac63..18e2393cd6c1 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -414,10 +414,10 @@ sal_Int32 SwFldDokInfPage::FillSelectionLB(sal_uInt16 nSubType)
     return nSize;
 }
 
-sal_Bool SwFldDokInfPage::FillItemSet(SfxItemSet& )
+bool SwFldDokInfPage::FillItemSet(SfxItemSet& )
 {
     if (!pSelEntry || (sal_uInt16)(sal_uLong)pSelEntry->GetUserData() == USHRT_MAX)
-        return sal_False;
+        return false;
 
     sal_uInt16 nTypeId = TYP_DOCINFOFLD;
     sal_uInt16 nSubType = (sal_uInt16)(sal_uLong)pSelEntry->GetUserData();
@@ -448,7 +448,7 @@ sal_Bool SwFldDokInfPage::FillItemSet(SfxItemSet& )
                 ' ', m_pFormatLB->IsAutomaticLanguage());
     }
 
-    return sal_False;
+    return false;
 }
 
 SfxTabPage* SwFldDokInfPage::Create(    Window* pParent,
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index e58361967468..464e1ecbf053 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -65,7 +65,7 @@ public:
 
     static SfxTabPage*  Create(Window* pParent, const SfxItemSet& rAttrSet);
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     virtual void        FillUserData();
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index ec6bc4f119df..7753fcc98894 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -539,7 +539,7 @@ IMPL_LINK_NOARG(SwFldDokPage, FormatHdl)
     return 0;
 }
 
-sal_Bool SwFldDokPage::FillItemSet(SfxItemSet& )
+bool SwFldDokPage::FillItemSet(SfxItemSet& )
 {
     sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel());
 
@@ -628,7 +628,7 @@ sal_Bool SwFldDokPage::FillItemSet(SfxItemSet& )
         InsertFld( nTypeId, nSubType, aEmptyOUStr, aVal, nFormat, ' ', m_pNumFormatLB->IsAutomaticLanguage() );
     }
 
-    return sal_False;
+    return false;
 }
 
 SfxTabPage* SwFldDokPage::Create(   Window* pParent,
diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx
index 25149e51b401..ec6ec8179dcd 100644
--- a/sw/source/ui/fldui/flddok.hxx
+++ b/sw/source/ui/fldui/flddok.hxx
@@ -67,7 +67,7 @@ public:
 
     static SfxTabPage*  Create(Window* pParent, const SfxItemSet& rAttrSet);
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     virtual void        FillUserData();
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index b16075f4beb6..8ab5f5ea1d11 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -519,7 +519,7 @@ IMPL_LINK( SwFldFuncPage, MacroHdl, Button *, pBtn )
     return 0;
 }
 
-sal_Bool SwFldFuncPage::FillItemSet(SfxItemSet& )
+bool SwFldFuncPage::FillItemSet(SfxItemSet& )
 {
     sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel());
 
@@ -582,7 +582,7 @@ sal_Bool SwFldFuncPage::FillItemSet(SfxItemSet& )
 
     ModifyHdl();    // enable/disable Insert if applicable
 
-    return sal_False;
+    return false;
 }
 
 OUString SwFldFuncPage::TurnMacroString(const OUString &rMacro)
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index 2923fd2c7fd6..032fb4c94710 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -89,7 +89,7 @@ public:
 
     static SfxTabPage*  Create(Window* pParent, const SfxItemSet& rAttrSet);
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     virtual void        FillUserData();
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 0eb5cf156fb3..8820f866fb04 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -776,7 +776,7 @@ IMPL_LINK_NOARG(SwFldRefPage, ModifyHdl)
     return 0;
 }
 
-sal_Bool SwFldRefPage::FillItemSet(SfxItemSet& )
+bool SwFldRefPage::FillItemSet(SfxItemSet& )
 {
     sal_Bool bModified = sal_False;
     sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel());
@@ -957,7 +957,7 @@ sal_Bool SwFldRefPage::FillItemSet(SfxItemSet& )
 
     ModifyHdl();    // enable/disable insert if applicable
 
-    return sal_False;
+    return false;
 }
 
 SfxTabPage* SwFldRefPage::Create(   Window* pParent,
diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx
index 47dde6c62542..99414d70f9c9 100644
--- a/sw/source/ui/fldui/fldref.hxx
+++ b/sw/source/ui/fldui/fldref.hxx
@@ -83,7 +83,7 @@ public:
 
     static SfxTabPage*  Create(Window* pParent, const SfxItemSet& rAttrSet);
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     virtual void        FillUserData();
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 2f844a358650..460ef90d8852 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -1093,7 +1093,7 @@ IMPL_LINK_NOARG(SwFldVarPage, SeparatorHdl)
     return 0;
 }
 
-sal_Bool SwFldVarPage::FillItemSet(SfxItemSet& )
+bool SwFldVarPage::FillItemSet(SfxItemSet& )
 {
     sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel());
 
@@ -1217,7 +1217,7 @@ sal_Bool SwFldVarPage::FillItemSet(SfxItemSet& )
 
     UpdateSubType();
 
-    return sal_False;
+    return false;
 }
 
 SfxTabPage* SwFldVarPage::Create(   Window* pParent,
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index 7165117a6e8b..ec335bae5106 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -96,7 +96,7 @@ public:
 
     static SfxTabPage*  Create(Window* pParent, const SfxItemSet& rAttrSet);
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     virtual void        FillUserData();
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 53d4cb0da98e..43fb6a709af1 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -638,7 +638,7 @@ SfxTabPage* SwColumnPage::Create(Window *pParent, const SfxItemSet &rSet)
 /*--------------------------------------------------------------------
     Description:    stuff attributes into the Set when OK
  --------------------------------------------------------------------*/
-sal_Bool SwColumnPage::FillItemSet(SfxItemSet &rSet)
+bool SwColumnPage::FillItemSet(SfxItemSet &rSet)
 {
     if(m_pCLNrEdt->HasChildPathFocus())
         m_pCLNrEdt->GetDownHdl().Call(m_pCLNrEdt);
@@ -663,7 +663,7 @@ sal_Bool SwColumnPage::FillItemSet(SfxItemSet &rSet)
         sal_uInt32 nDirection = (sal_uInt32)(sal_IntPtr)m_pTextDirectionLB->GetEntryData( nPos );
         rSet.Put( SvxFrameDirectionItem( (SvxFrameDirection)nDirection, RES_FRAMEDIR));
     }
-    return sal_True;
+    return true;
 }
 
 /*--------------------------------------------------------------------
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 7c3732452cf0..8b04a71f7588 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -1039,7 +1039,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
 /*--------------------------------------------------------------------
     Description:    stuff attributes into the set when OK
  --------------------------------------------------------------------*/
-sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet)
+bool SwFrmPage::FillItemSet(SfxItemSet &rSet)
 {
     bool bRet = false;
     SwWrtShell* pSh = bFormat ? ::GetActiveWrtShell()
@@ -2523,7 +2523,7 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet)
     m_pBmpWin->Invalidate();
 }
 
-sal_Bool SwGrfExtPage::FillItemSet( SfxItemSet &rSet )
+bool SwGrfExtPage::FillItemSet( SfxItemSet &rSet )
 {
     sal_Bool bModified = sal_False;
     if ( m_pMirrorHorzBox->GetSavedValue() != TriState(m_pMirrorHorzBox->IsChecked()) ||
@@ -2795,7 +2795,7 @@ void SwFrmURLPage::Reset( const SfxItemSet &rSet )
     pClientCB->SaveValue();
 }
 
-sal_Bool SwFrmURLPage::FillItemSet(SfxItemSet &rSet)
+bool SwFrmURLPage::FillItemSet(SfxItemSet &rSet)
 {
     sal_Bool bModified = sal_False;
     const SwFmtURL* pOldURL = (SwFmtURL*)GetOldItem(rSet, RES_URL);
@@ -3087,7 +3087,7 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet )
     m_pVertAlignLB->SaveValue();
 }
 
-sal_Bool SwFrmAddPage::FillItemSet(SfxItemSet &rSet)
+bool SwFrmAddPage::FillItemSet(SfxItemSet &rSet)
 {
     bool bRet = false;
     if (pNameED->GetText() != pNameED->GetSavedValue())
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 741b4526e73c..bd8364d4eba1 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -269,7 +269,7 @@ void SwWrapTabPage::Reset(const SfxItemSet &rSet)
 /*--------------------------------------------------------------------
     Description:    stuff attributes into the set when OK
  --------------------------------------------------------------------*/
-sal_Bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet)
+bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet)
 {
     bool bModified = false;
     const SfxPoolItem* pOldItem;
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 658b00425f20..00872409616f 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -931,9 +931,9 @@ void SwTOXSelectTabPage::SetWrtShell(SwWrtShell& rSh)
     }
 }
 
-sal_Bool SwTOXSelectTabPage::FillItemSet( SfxItemSet& )
+bool SwTOXSelectTabPage::FillItemSet( SfxItemSet& )
 {
-    return sal_True;
+    return true;
 }
 
 static long lcl_TOXTypesToUserData(CurTOXType eType)
@@ -1927,10 +1927,10 @@ SwTOXEntryTabPage::~SwTOXEntryTabPage()
 {
 }
 
-sal_Bool SwTOXEntryTabPage::FillItemSet( SfxItemSet& )
+bool SwTOXEntryTabPage::FillItemSet( SfxItemSet& )
 {
     // nothing to do
-    return sal_True;
+    return true;
 }
 
 void SwTOXEntryTabPage::Reset( const SfxItemSet& )
@@ -3585,9 +3585,9 @@ SwTOXStylesTabPage::~SwTOXStylesTabPage()
     delete m_pCurrentForm;
 }
 
-sal_Bool SwTOXStylesTabPage::FillItemSet( SfxItemSet& )
+bool SwTOXStylesTabPage::FillItemSet( SfxItemSet& )
 {
-    return sal_True;
+    return true;
 }
 
 void SwTOXStylesTabPage::Reset( const SfxItemSet& rSet )
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index ff4e2becf734..adb22ef57be7 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -348,7 +348,7 @@ static SwCharFmt* lcl_GetCharFormat( SwWrtShell* pSh, const OUString& rCharFmtNa
     return pFmt;
 }
 
-sal_Bool SwEndNoteOptionPage::FillItemSet( SfxItemSet & )
+bool SwEndNoteOptionPage::FillItemSet( SfxItemSet & )
 {
     SwEndNoteInfo *pInf = bEndNote ? new SwEndNoteInfo() : new SwFtnInfo();
 
@@ -392,7 +392,7 @@ sal_Bool SwEndNoteOptionPage::FillItemSet( SfxItemSet & )
             pSh->SetFtnInfo( *pI );
     }
     delete pInf;
-    return sal_True;
+    return true;
 }
 
 SwFootNoteOptionPage::SwFootNoteOptionPage( Window *pParent, const SfxItemSet &rSet ) :
diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx
index fab6f1749104..88dc169e13d0 100644
--- a/sw/source/ui/misc/impfnote.hxx
+++ b/sw/source/ui/misc/impfnote.hxx
@@ -72,7 +72,7 @@ public:
     ~SwEndNoteOptionPage();
 
     static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
-    virtual sal_Bool FillItemSet(SfxItemSet &rSet);
+    virtual bool FillItemSet(SfxItemSet &rSet);
     virtual void Reset( const SfxItemSet& );
 
     void SetShell( SwWrtShell &rShell );
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 5079ed9140ce..011ac07f8b9c 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -405,7 +405,7 @@ int  SwNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet)
 
 }
 
-sal_Bool SwNumPositionTabPage::FillItemSet( SfxItemSet& rSet )
+bool SwNumPositionTabPage::FillItemSet( SfxItemSet& rSet )
 {
     if(pOutlineDlg)
         *pOutlineDlg->GetNumRule() = *pActNum;
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index b532e69c0fd4..71e7635f63c3 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -818,9 +818,9 @@ int SwOutlineSettingsTabPage::DeactivatePage(SfxItemSet*)
     return LEAVE_PAGE;
 }
 
-sal_Bool SwOutlineSettingsTabPage::FillItemSet( SfxItemSet&  )
+bool SwOutlineSettingsTabPage::FillItemSet( SfxItemSet&  )
 {
-    return sal_True;
+    return true;
 }
 
 void SwOutlineSettingsTabPage::Reset( const SfxItemSet& rSet )
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 3e356866548f..711a0d469b3c 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -259,7 +259,7 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet)
 /*--------------------------------------------------------------------
     Description:    stuff attributes into the set, when OK
  --------------------------------------------------------------------*/
-sal_Bool SwFootNotePage::FillItemSet(SfxItemSet &rSet)
+bool SwFootNotePage::FillItemSet(SfxItemSet &rSet)
 {
     SwPageFtnInfoItem aItem((const SwPageFtnInfoItem&)GetItemSet().Get(FN_PARAM_FTN_INFO));
 
@@ -303,7 +303,7 @@ sal_Bool SwFootNotePage::FillItemSet(SfxItemSet &rSet)
                 aItem != *pOldItem )
         rSet.Put(aItem);
 
-    return sal_True;
+    return true;
 }
 
 void SwFootNotePage::ActivatePage(const SfxItemSet& rSet)
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 3fb9dd182372..c83e4201ffad 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -158,7 +158,7 @@ SfxTabPage *SwTextGridPage::Create(Window *pParent, const SfxItemSet &rSet)
     return new SwTextGridPage(pParent, rSet);
 }
 
-sal_Bool    SwTextGridPage::FillItemSet(SfxItemSet &rSet)
+bool    SwTextGridPage::FillItemSet(SfxItemSet &rSet)
 {
     sal_Bool bRet = sal_False;
     if(m_pNoGridRB->GetSavedValue() != m_pNoGridRB->IsChecked()||
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 396448cef1b0..1168d3f3e7a1 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -373,7 +373,7 @@ SfxTabPage*  SwFormatTablePage::Create( Window* pParent,
     return new SwFormatTablePage( pParent, rAttrSet );
 }
 
-sal_Bool  SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet )
+bool  SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet )
 {
     //Test if one of the controls still has the focus
     if (m_aWidthMF.HasFocus())
@@ -904,7 +904,7 @@ IMPL_LINK( SwTableColumnPage, ModeHdl, CheckBox*, pBox )
     return 0;
 };
 
-sal_Bool  SwTableColumnPage::FillItemSet( SfxItemSet& )
+bool  SwTableColumnPage::FillItemSet( SfxItemSet& )
 {
     for( sal_uInt16 i = 0; i < MET_FIELDS; i++ )
     {
@@ -1319,7 +1319,7 @@ SfxTabPage*   SwTextFlowPage::Create( Window* pParent,
     return new SwTextFlowPage(pParent, rAttrSet);
 }
 
-sal_Bool  SwTextFlowPage::FillItemSet( SfxItemSet& rSet )
+bool  SwTextFlowPage::FillItemSet( SfxItemSet& rSet )
 {
     bool bModified = false;