sfx2: sal_Bool->bool

Change-Id: I1fd02cc148fd9a54d2092dad1e548f51a0813a14

7 files changed, 28 insertions, 28 deletions

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 1ac853370f53..8b3a9365b7fd 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -650,7 +650,7 @@ SfxTabPage *SfxDocumentDescPage::Create(Window *pParent, const SfxItemSet &rItem
 }
 
 
-sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
+bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
 {
     // Test whether a change is present
     const sal_Bool bTitleMod = m_pTitleEd->IsModified();
@@ -659,7 +659,7 @@ sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
     const sal_Bool bCommentMod = m_pCommentEd->IsModified();
     if ( !( bTitleMod || bThemeMod || bKeywordsMod || bCommentMod ) )
     {
-        return sal_False;
+        return false;
     }
 
     // Generating the output data
@@ -679,7 +679,7 @@ sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
     if ( !pInfo )
     {
         SAL_WARN( "sfx.dialog", "SfxDocumentDescPage::FillItemSet(): no item found" );
-        return sal_False;
+        return false;
     }
 
     if ( bTitleMod )
@@ -704,7 +704,7 @@ sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
         delete pInfo;
     }
 
-    return sal_True;
+    return true;
 }
 
 
@@ -941,9 +941,9 @@ void SfxDocumentPage::EnableUseUserData()
 
 
 
-sal_Bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet )
+bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     if ( !bHandleDelete && bEnableUseUserData &&
          m_pUseUserDataCB->GetState() != m_pUseUserDataCB->GetSavedValue() &&
@@ -958,7 +958,7 @@ sal_Bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet )
             sal_Bool bUseData = ( TRISTATE_TRUE == m_pUseUserDataCB->GetState() );
             m_pInfoItem->SetUseUserData( bUseData );
             rSet.Put( SfxDocumentInfoItem( *m_pInfoItem ) );
-            bRet = sal_True;
+            bRet = true;
         }
     }
 
@@ -979,20 +979,20 @@ sal_Bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet )
 
             newItem.SetDeleteUserData( true );
             rSet.Put( newItem );
-            bRet = sal_True;
+            bRet = true;
         }
     }
 
     if ( m_pNameED->IsModified() && !m_pNameED->GetText().isEmpty() )
     {
         rSet.Put( SfxStringItem( ID_FILETP_TITLE, m_pNameED->GetText() ) );
-        bRet = sal_True;
+        bRet = true;
     }
 
     if ( /* m_pReadOnlyCB->IsModified() */ true )
     {
         rSet.Put( SfxBoolItem( ID_FILETP_READONLY, m_pReadOnlyCB->IsChecked() ) );
-        bRet = sal_True;
+        bRet = true;
     }
 
     return bRet;
@@ -2057,9 +2057,9 @@ IMPL_LINK_NOARG(SfxCustomPropertiesPage, AddHdl)
     return 0;
 }
 
-sal_Bool SfxCustomPropertiesPage::FillItemSet( SfxItemSet& rSet )
+bool SfxCustomPropertiesPage::FillItemSet( SfxItemSet& rSet )
 {
-    sal_Bool bModified = sal_False;
+    bool bModified = false;
     const SfxPoolItem* pItem = NULL;
     SfxDocumentInfoItem* pInfo = NULL;
     bool bMustDelete = false;
@@ -2083,7 +2083,7 @@ sal_Bool SfxCustomPropertiesPage::FillItemSet( SfxItemSet& rSet )
         {
             if ( bMustDelete )
                 delete pInfo;
-            return sal_False;
+            return false;
         }
 
         pInfo->ClearCustomProperties();
@@ -2096,7 +2096,7 @@ sal_Bool SfxCustomPropertiesPage::FillItemSet( SfxItemSet& rSet )
         }
     }
 
-    bModified = sal_True; //!!!
+    bModified = true; //!!!
     if ( bModified )
         rSet.Put( *pInfo );
     if ( bMustDelete )
@@ -2523,7 +2523,7 @@ SfxCmisPropertiesPage::SfxCmisPropertiesPage( Window* pParent, const SfxItemSet&
 {
 }
 
-sal_Bool SfxCmisPropertiesPage::FillItemSet( SfxItemSet& rSet )
+bool SfxCmisPropertiesPage::FillItemSet( SfxItemSet& rSet )
 {
     const SfxPoolItem* pItem = NULL;
     SfxDocumentInfoItem* pInfo = NULL;
diff --git a/sfx2/source/dialog/documentfontsdialog.cxx b/sfx2/source/dialog/documentfontsdialog.cxx
index 3320121ce64a..fa41757001e4 100644
--- a/sfx2/source/dialog/documentfontsdialog.cxx
+++ b/sfx2/source/dialog/documentfontsdialog.cxx
@@ -53,7 +53,7 @@ void SfxDocumentFontsPage::Reset( const SfxItemSet& )
     embedFontsCheckbox->Check( bVal );
 }
 
-sal_Bool SfxDocumentFontsPage::FillItemSet( SfxItemSet& )
+bool SfxDocumentFontsPage::FillItemSet( SfxItemSet& )
 {
     bool bVal = embedFontsCheckbox->IsChecked();
     SfxObjectShell* pDocSh = SfxObjectShell::Current();
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 33c60e30be73..a8a94f88df4e 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -352,7 +352,7 @@ IMPL_LINK_INLINE_END( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit )
 
 
 
-sal_Bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
+bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
 
 /*  [Description]
 
diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx
index 8a01e66b2505..9e166abdd8f9 100644
--- a/sfx2/source/dialog/printopt.cxx
+++ b/sfx2/source/dialog/printopt.cxx
@@ -114,12 +114,12 @@ Window* SfxCommonPrintOptionsTabPage::GetParentLabelFor( const Window* pWindow )
         return SfxTabPage::GetParentLabelFor( pWindow );
 }
 
-sal_Bool SfxCommonPrintOptionsTabPage::FillItemSet( SfxItemSet& /*rSet*/ )
+bool SfxCommonPrintOptionsTabPage::FillItemSet( SfxItemSet& /*rSet*/ )
 {
     SvtPrintWarningOptions  aWarnOptions;
     SvtPrinterOptions       aPrinterOptions;
     SvtPrintFileOptions     aPrintFileOptions;
-    sal_Bool                    bModified = sal_False;
+    bool                    bModified = false;
 
 
     if( TriState(m_pPaperSizeCB->IsChecked()) != m_pPaperSizeCB->GetSavedValue())
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index 1b97be80d10c..9fb9fb25b60b 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -155,7 +155,7 @@ struct SfxSecurityPage_Impl
     SfxSecurityPage_Impl( SfxSecurityPage &rDlg, const SfxItemSet &rItemSet );
     ~SfxSecurityPage_Impl();
 
-    sal_Bool    FillItemSet_Impl( SfxItemSet & );
+    bool    FillItemSet_Impl( SfxItemSet & );
     void    Reset_Impl( const SfxItemSet & );
 };
 
@@ -188,7 +188,7 @@ SfxSecurityPage_Impl::~SfxSecurityPage_Impl()
 }
 
 
-sal_Bool SfxSecurityPage_Impl::FillItemSet_Impl( SfxItemSet & )
+bool SfxSecurityPage_Impl::FillItemSet_Impl( SfxItemSet & )
 {
     bool bModified = false;
 
@@ -439,7 +439,7 @@ SfxSecurityPage::~SfxSecurityPage()
 }
 
 
-sal_Bool SfxSecurityPage::FillItemSet( SfxItemSet & rItemSet )
+bool SfxSecurityPage::FillItemSet( SfxItemSet & rItemSet )
 {
     bool bModified = false;
     DBG_ASSERT( m_pImpl.get(), "implementation pointer is 0. Still in c-tor?" );
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index b06a65b5fec7..a87ac228be4b 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -254,7 +254,7 @@ SfxTabPage::~SfxTabPage()
 
 
 
-sal_Bool SfxTabPage::FillItemSet( SfxItemSet& rSet )
+bool SfxTabPage::FillItemSet( SfxItemSet& rSet )
 {
     return pImpl->maItemConn.DoFillItemSet( rSet, GetItemSet() );
 }
@@ -918,7 +918,7 @@ short SfxTabDialog::Ok()
         else if ( pExampleSet )
             pOutSet = new SfxItemSet( *pExampleSet );
     }
-    sal_Bool bModified = sal_False;
+    bool bModified = false;
 
     for ( SfxTabDlgData_Impl::const_iterator it = pImpl->aData.begin(); it != pImpl->aData.end(); ++it )
     {
@@ -939,7 +939,7 @@ short SfxTabDialog::Ok()
 
                 if ( pTabPage->FillItemSet( aTmp ) )
                 {
-                    bModified |= sal_True;
+                    bModified |= true;
                     if (pExampleSet)
                         pExampleSet->Put( aTmp );
                     pOutSet->Put( aTmp );
@@ -949,10 +949,10 @@ short SfxTabDialog::Ok()
     }
 
     if ( pImpl->bModified || ( pOutSet && pOutSet->Count() > 0 ) )
-        bModified |= sal_True;
+        bModified |= true;
 
     if ( bFmt == 2 )
-        bModified |= sal_True;
+        bModified |= true;
     return bModified ? RET_OK : RET_CANCEL;
 }
 
diff --git a/sfx2/source/inc/documentfontsdialog.hxx b/sfx2/source/inc/documentfontsdialog.hxx
index a5f606a48246..47f72cecf26a 100644
--- a/sfx2/source/inc/documentfontsdialog.hxx
+++ b/sfx2/source/inc/documentfontsdialog.hxx
@@ -33,7 +33,7 @@ public:
     SfxDocumentFontsPage( Window* parent, const SfxItemSet& set );
     static SfxTabPage* Create( Window* parent, const SfxItemSet& set );
 protected:
-    virtual sal_Bool FillItemSet( SfxItemSet& set );
+    virtual bool FillItemSet( SfxItemSet& set );
     virtual void Reset( const SfxItemSet& set );
 private:
     CheckBox* embedFontsCheckbox;