sal_Bool->bool

Change-Id: Ibd5178f35d735e94065a3fbb6b61de53e53b1b0c

7 files changed, 22 insertions, 22 deletions

diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 3362dbd483f0..6d173978f386 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1644,15 +1644,15 @@ sal_Bool PPTConvertOCXControls::ReadOCXStream( SotStorageRef& rSrc,
     return bRes;
 }
 
-sal_Bool PPTConvertOCXControls::InsertControl(
+bool PPTConvertOCXControls::InsertControl(
         const com::sun::star::uno::Reference<
         com::sun::star::form::XFormComponent > &rFComp,
         const com::sun::star::awt::Size& rSize,
         com::sun::star::uno::Reference<
         com::sun::star::drawing::XShape > *pShape,
-        sal_Bool /*bFloatingCtrl*/)
+        bool /*bFloatingCtrl*/)
 {
-    sal_Bool bRetValue = sal_False;
+    bool bRetValue = false;
     try
     {
         ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >  xShape;
@@ -1687,7 +1687,7 @@ sal_Bool PPTConvertOCXControls::InsertControl(
                         xControlShape->setControl( xControlModel );
                         if (pShape)
                             *pShape = xShape;
-                        bRetValue = sal_True;
+                        bRetValue = true;
                     }
                 }
             }
@@ -1695,7 +1695,7 @@ sal_Bool PPTConvertOCXControls::InsertControl(
     }
     catch( ... )
     {
-        bRetValue = sal_False;
+        bRetValue = false;
     }
     return bRetValue;
 };
diff --git a/include/filter/msfilter/msocximex.hxx b/include/filter/msfilter/msocximex.hxx
index 72362e698d8c..c3877d721d85 100644
--- a/include/filter/msfilter/msocximex.hxx
+++ b/include/filter/msfilter/msocximex.hxx
@@ -66,13 +66,13 @@ public:
     SvxMSConvertOCXControls( const  ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
     virtual ~SvxMSConvertOCXControls();
 
-    virtual sal_Bool InsertControl(
+    virtual bool InsertControl(
         const com::sun::star::uno::Reference<
         com::sun::star::form::XFormComponent >& /*rFComp*/,
         const com::sun::star::awt::Size& /*rSize*/,
         com::sun::star::uno::Reference<
         com::sun::star::drawing::XShape >* /*pShape*/,
-        sal_Bool /*bFloatingCtrl*/ ) {return sal_False;}
+        bool /*bFloatingCtrl*/ ) {return false;}
 
     /*begin: Backwards compatability with office 95 import, modify later*/
     const com::sun::star::uno::Reference<
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 2e9f099cd714..f8eaed47beac 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -1299,11 +1299,11 @@ public :
         com::sun::star::uno::Reference<
         com::sun::star::drawing::XShape > *pShapeRef=0,
         sal_Bool bFloatingCtrl=sal_False );
-    virtual sal_Bool InsertControl(
+    virtual bool InsertControl(
         const com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > &rFComp,
         const com::sun::star::awt::Size& rSize,
         com::sun::star::uno::Reference< com::sun::star::drawing::XShape > *pShape,
-        sal_Bool bFloatingCtrl
+        bool bFloatingCtrl
     );
 };
 
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index b1ad9b3710f3..63ad0de6446d 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -3399,7 +3399,7 @@ SdrObject* XclImpDffConverter::CreateSdrObject( const XclImpTbxObjBase& rTbxObj,
         ::com::sun::star::awt::Size aDummySize;
         Reference< XShape > xShape;
         XclImpDffConvData& rConvData = GetConvData();
-        if( rConvData.mxCtrlForm.is() && InsertControl( xFormComp, aDummySize, &xShape, sal_True ) )
+        if( rConvData.mxCtrlForm.is() && InsertControl( xFormComp, aDummySize, &xShape, true ) )
         {
             xSdrObj.reset( rTbxObj.CreateSdrObjectFromShape( xShape, rAnchorRect ) );
             // try to attach a macro to the control
@@ -3626,9 +3626,9 @@ sal_uLong XclImpDffConverter::Calc_nBLIPPos( sal_uLong /*nOrgVal*/, sal_uLong nS
     return nStreamPos + 4;
 }
 
-sal_Bool XclImpDffConverter::InsertControl( const Reference< XFormComponent >& rxFormComp,
+bool XclImpDffConverter::InsertControl( const Reference< XFormComponent >& rxFormComp,
         const ::com::sun::star::awt::Size& /*rSize*/, Reference< XShape >* pxShape,
-        sal_Bool /*bFloatingCtrl*/ )
+        bool /*bFloatingCtrl*/ )
 {
     if( GetDocShell() ) try
     {
@@ -3649,7 +3649,7 @@ sal_Bool XclImpDffConverter::InsertControl( const Reference< XFormComponent >& r
         // set control model at control shape and pass back shape to caller
         xCtrlShape->setControl( xCtrlModel );
         if( pxShape ) *pxShape = xShape;
-        return sal_True;
+        return true;
     }
     catch( const Exception& )
     {
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index 42b188267e6a..21317a2ef97f 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -1035,13 +1035,13 @@ private:
     // virtual functions of SvxMSConvertOCXControls
 
     /** Inserts the passed control rxFComp into the form. Needs call to SetCurrentForm() before. */
-    virtual sal_Bool    InsertControl(
+    virtual bool    InsertControl(
                             const ::com::sun::star::uno::Reference<
                                 ::com::sun::star::form::XFormComponent >& rxFormComp,
                             const ::com::sun::star::awt::Size& rSize,
                             ::com::sun::star::uno::Reference<
                                 ::com::sun::star::drawing::XShape >* pxShape,
-                            sal_Bool bFloatingCtrl );
+                            bool bFloatingCtrl );
 
 private:
     /** Data per registered drawing manager, will be stacked for recursive calls. */
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 61fe885c2e1f..d98eb0a1da38 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -713,11 +713,11 @@ class SwMSConvertControls: public oox::ole::MSConvertOCXControls
 public:
     SwMSConvertControls( SfxObjectShell *pDSh,SwPaM *pP );
     virtual sal_Bool InsertFormula( WW8FormulaControl &rFormula);
-    virtual sal_Bool InsertControl(const com::sun::star::uno::Reference<
+    virtual bool InsertControl(const com::sun::star::uno::Reference<
         com::sun::star::form::XFormComponent >& rFComp,
         const ::com::sun::star::awt::Size& rSize,
         com::sun::star::uno::Reference <
-        com::sun::star::drawing::XShape > *pShape,sal_Bool bFloatingCtrl);
+        com::sun::star::drawing::XShape > *pShape, bool bFloatingCtrl);
     bool ExportControl(WW8Export &rWrt, const SdrObject *pObj);
     virtual sal_Bool ReadOCXStream( SotStorageRef& rSrc1,
         com::sun::star::uno::Reference<
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 724e91df1a48..694345e9bf8e 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -2552,10 +2552,10 @@ WW8FormulaEditBox::WW8FormulaEditBox(SwWW8ImplReader &rR)
 {
 }
 
-sal_Bool SwMSConvertControls::InsertControl(
+bool SwMSConvertControls::InsertControl(
     const uno::Reference< form::XFormComponent > & rFComp,
     const awt::Size& rSize, uno::Reference< drawing::XShape > *pShape,
-    sal_Bool bFloatingCtrl)
+    bool bFloatingCtrl)
 {
     const uno::Reference< container::XIndexContainer > &rComps = GetFormComps();
     uno::Any aTmp( &rFComp, ::getCppuType((const uno::Reference<
@@ -2565,12 +2565,12 @@ sal_Bool SwMSConvertControls::InsertControl(
     const uno::Reference< lang::XMultiServiceFactory > &rServiceFactory =
         GetServiceFactory();
     if( !rServiceFactory.is() )
-        return sal_False;
+        return false;
 
     uno::Reference< uno::XInterface > xCreate = rServiceFactory->createInstance(
         "com.sun.star.drawing.ControlShape");
     if( !xCreate.is() )
-        return sal_False;
+        return false;
 
     uno::Reference< drawing::XShape > xShape =
         uno::Reference< drawing::XShape >(xCreate, uno::UNO_QUERY);
@@ -2614,7 +2614,7 @@ sal_Bool SwMSConvertControls::InsertControl(
     if (pShape)
         *pShape = xShape;
 
-    return sal_True;
+    return true;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */