reportdesign: sal_Bool->bool

Change-Id: I7a269dbf163f4c839b6c553c7b096185fe2f8a01

85 files changed, 510 insertions, 505 deletions

diff --git a/reportdesign/inc/PropertyForward.hxx b/reportdesign/inc/PropertyForward.hxx
index 6ff443b74bc3..2cac870294a8 100644
--- a/reportdesign/inc/PropertyForward.hxx
+++ b/reportdesign/inc/PropertyForward.hxx
@@ -48,7 +48,7 @@ namespace rptui
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo>    m_xSourceInfo;
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>        m_xDest;
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo>    m_xDestInfo;
-        sal_Bool                                                                        m_bInChange;
+        bool                                                                        m_bInChange;
         OPropertyMediator(OPropertyMediator&);
         void operator =(OPropertyMediator&);
     protected:
@@ -61,7 +61,7 @@ namespace rptui
         OPropertyMediator(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xSource
                         ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xDest
                         ,const TPropertyNamePair& _aNameMap
-                        ,sal_Bool _bReverse = sal_False);
+                        ,bool _bReverse = false);
 
         // ::com::sun::star::beans::XPropertyChangeListener
         virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx
index 236d5c91457f..e7848d16f1a0 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -100,7 +100,7 @@ namespace reportdesign
         OReportDefinition& operator=(const OReportDefinition&);
 
         void setSection(     const OUString& _sProperty
-                            ,const sal_Bool& _bOn
+                            ,const bool& _bOn
                             ,const OUString& _sName
                             ,::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _member);
 
@@ -118,7 +118,7 @@ namespace reportdesign
         }
 
         /// write a single XML stream into the package
-        sal_Bool WriteThroughComponent(
+        bool WriteThroughComponent(
             /// the component we export
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::lang::XComponent> & xComponent,
@@ -134,7 +134,7 @@ namespace reportdesign
 
         /// write a single output stream
         /// (to be called either directly or by WriteThroughComponent(...))
-        sal_Bool WriteThroughComponent(
+        bool WriteThroughComponent(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::io::XOutputStream> & xOutputStream,
             const ::com::sun::star::uno::Reference<
diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx
index 40c48c06de9b..005f36a7fe4f 100644
--- a/reportdesign/inc/RptModel.hxx
+++ b/reportdesign/inc/RptModel.hxx
@@ -65,7 +65,7 @@ public:
     virtual SvxNumType  GetPageNumType() const SAL_OVERRIDE;
 
     OXUndoEnvironment&  GetUndoEnv();
-    void                SetModified(sal_Bool _bModified);
+    void                SetModified(bool _bModified);
 
     inline dbaui::DBSubComponentController* getController() const { return m_pController; }
     inline void attachController( dbaui::DBSubComponentController& _rController ) { m_pController = &_rController; }
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 057dfb76d102..76a544f1a72d 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -83,14 +83,14 @@ protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>                       m_xSection;
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >                       m_xKeepShapeAlive;
     OUString m_sComponentName;
-    sal_Bool        m_bIsListening;
+    bool        m_bIsListening;
 
     OObjectBase(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent);
     OObjectBase(const OUString& _sComponentName);
 
     virtual ~OObjectBase();
 
-    inline sal_Bool isListening() const { return m_bIsListening; }
+    inline bool isListening() const { return m_bIsListening; }
 
     void SetPropsFromRect(const Rectangle& _rRect);
 
@@ -109,12 +109,12 @@ private:
 
 public:
     void StartListening();
-    void EndListening(sal_Bool bRemoveListener = sal_True);
+    void EndListening(bool bRemoveListener = true);
     // PropertyChangeListener
     virtual void _propertyChange( const  ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException);
     virtual void initializeOle() {}
 
-    sal_Bool        supportsService( const OUString& _sServiceName ) const;
+    bool        supportsService( const OUString& _sServiceName ) const;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> getReportComponent() const;
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent();
@@ -261,7 +261,7 @@ public:
     /** creates the m_xMediator when it doesn't already exist.
         @param  _bReverse   when set to <TRUE/> then the properties from the uno control will be copied into report control
     */
-    void CreateMediator(sal_Bool _bReverse = sal_False);
+    void CreateMediator(bool _bReverse = false);
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent() SAL_OVERRIDE;
 
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index a2cf40252017..421442b0446d 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -73,8 +73,8 @@ namespace rptui
         inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >   getFooter() { return m_xGroup->getFooter(); }
         inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >     getGroup() { return m_xGroup; }
 
-        inline sal_Bool getHeaderOn() { return m_xGroup->getHeaderOn(); }
-        inline sal_Bool getFooterOn() { return m_xGroup->getFooterOn(); }
+        inline bool getHeaderOn() { return m_xGroup->getHeaderOn(); }
+        inline bool getFooterOn() { return m_xGroup->getFooterOn(); }
 
         static ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OGroupHelper> getMemberFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection);
 
@@ -97,10 +97,10 @@ namespace rptui
         inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getPageFooter()   { return m_xReport->getPageFooter(); }
         inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getDetail()       { return m_xReport->getDetail(); }
 
-        inline sal_Bool getReportHeaderOn() { return m_xReport->getReportHeaderOn(); }
-        inline sal_Bool getReportFooterOn() { return m_xReport->getReportFooterOn(); }
-        inline sal_Bool getPageHeaderOn() { return m_xReport->getPageHeaderOn(); }
-        inline sal_Bool getPageFooterOn() { return m_xReport->getPageFooterOn(); }
+        inline bool getReportHeaderOn() { return m_xReport->getReportHeaderOn(); }
+        inline bool getReportFooterOn() { return m_xReport->getReportFooterOn(); }
+        inline bool getPageHeaderOn() { return m_xReport->getPageHeaderOn(); }
+        inline bool getPageFooterOn() { return m_xReport->getPageFooterOn(); }
 
         static ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OReportHelper> getMemberFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection);
     };
@@ -255,7 +255,7 @@ namespace rptui
          *
          * \param _bOld If set to <TRUE/> than the old value will be set otherwise the new value will be set.
          */
-        void setProperty(sal_Bool _bOld);
+        void setProperty(bool _bOld);
     protected:
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getObject();
 
diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx
index d087b303899f..4c0985053c83 100644
--- a/reportdesign/inc/UndoEnv.hxx
+++ b/reportdesign/inc/UndoEnv.hxx
@@ -48,7 +48,7 @@ namespace rptui
     protected:
         virtual ~OXUndoEnvironment();
 
-        void SetUndoMode(sal_Bool _bUndo);
+        void SetUndoMode(bool _bUndo);
 
     public:
         OXUndoEnvironment(OReportModel& _rModel);
@@ -77,21 +77,21 @@ namespace rptui
                 :m_rUndoEnv(_rUndoEnv)
             {
                 m_rUndoEnv.Lock();
-                m_rUndoEnv.SetUndoMode(sal_True);
+                m_rUndoEnv.SetUndoMode(true);
             }
             ~OUndoMode()
             {
-                m_rUndoEnv.SetUndoMode(sal_False);
+                m_rUndoEnv.SetUndoMode(false);
                 m_rUndoEnv.UnLock();
             }
         };
 
         void Lock();
         void UnLock();
-        sal_Bool IsLocked() const;
+        bool IsLocked() const;
 
         // returns sal_True is we are in UNDO
-        sal_Bool IsUndoMode() const;
+        bool IsUndoMode() const;
 
         // access control
         struct Accessor { friend class OReportModel; private: Accessor() { } };
diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx
index e87716feac57..3a188e510378 100644
--- a/reportdesign/source/core/api/Functions.cxx
+++ b/reportdesign/source/core/api/Functions.cxx
@@ -72,7 +72,7 @@ void SAL_CALL OFunctions::insertByIndex( ::sal_Int32 Index, const uno::Any& aEle
 {
     {
         ::osl::MutexGuard aGuard(m_aMutex);
-        sal_Bool bAdd = (Index == static_cast<sal_Int32>(m_aFunctions.size()));
+        bool bAdd = (Index == static_cast<sal_Int32>(m_aFunctions.size()));
         if ( !bAdd )
             checkIndex(Index);
         uno::Reference< report::XFunction > xFunction(aElement,uno::UNO_QUERY);
diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx
index 57c4006bcb67..9c0c4b0a70e5 100644
--- a/reportdesign/source/core/api/Group.cxx
+++ b/reportdesign/source/core/api/Group.cxx
@@ -311,7 +311,7 @@ void SAL_CALL OGroup::removeVetoableChangeListener( const OUString& PropertyName
 }
 
 void OGroup::setSection(     const OUString& _sProperty
-                            ,const sal_Bool& _bOn
+                            ,const bool& _bOn
                             ,const OUString& _sName
                             ,uno::Reference< report::XSection>& _member)
 {
diff --git a/reportdesign/source/core/api/Groups.cxx b/reportdesign/source/core/api/Groups.cxx
index f4b1904e56b8..bd19c41d208a 100644
--- a/reportdesign/source/core/api/Groups.cxx
+++ b/reportdesign/source/core/api/Groups.cxx
@@ -87,7 +87,7 @@ void SAL_CALL OGroups::insertByIndex( ::sal_Int32 Index, const uno::Any& aElemen
 {
     {
         ::osl::MutexGuard aGuard(m_aMutex);
-        sal_Bool bAdd = (Index == static_cast<sal_Int32>(m_aGroups.size()));
+        bool bAdd = (Index == static_cast<sal_Int32>(m_aGroups.size()));
         if ( !bAdd )
             checkIndex(Index);
         uno::Reference< report::XGroup > xGroup(aElement,uno::UNO_QUERY);
diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx
index ad504ab95014..a580d7e2669e 100644
--- a/reportdesign/source/core/api/ReportComponent.cxx
+++ b/reportdesign/source/core/api/ReportComponent.cxx
@@ -72,13 +72,13 @@ OFormatProperties::OFormatProperties()
     ,nCharCaseMap(0)
     ,nCharKerning(0)
     ,nCharEscapementHeight(100)
-    ,m_bBackgroundTransparent(sal_True)
-    ,bCharFlash(sal_False)
-    ,bCharAutoKerning(sal_False)
-    ,bCharCombineIsOn(sal_False)
-    ,bCharHidden(sal_False)
-    ,bCharShadowed(sal_False)
-    ,bCharContoured(sal_False)
+    ,m_bBackgroundTransparent(true)
+    ,bCharFlash(false)
+    ,bCharAutoKerning(false)
+    ,bCharCombineIsOn(false)
+    ,bCharHidden(false)
+    ,bCharShadowed(false)
+    ,bCharContoured(false)
 {
     try
     {
diff --git a/reportdesign/source/core/api/ReportControlModel.cxx b/reportdesign/source/core/api/ReportControlModel.cxx
index feadf9e03a8f..96c9c5a8e04c 100644
--- a/reportdesign/source/core/api/ReportControlModel.cxx
+++ b/reportdesign/source/core/api/ReportControlModel.cxx
@@ -56,7 +56,7 @@ void OReportControlModel::removeContainerListener( const uno::Reference< contain
     aContainerListeners.removeInterface(xListener);
 }
 
-sal_Bool OReportControlModel::hasElements(  ) throw (uno::RuntimeException)
+bool OReportControlModel::hasElements(  ) throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     return !m_aFormatConditions.empty();
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 300ea9a8396f..09e90129cbf0 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1174,7 +1174,7 @@ uno::Reference< util::XCloneable > SAL_CALL OReportDefinition::createClone(  ) t
 }
 
 void OReportDefinition::setSection(  const OUString& _sProperty
-                            ,const sal_Bool& _bOn
+                            ,const bool& _bOn
                             ,const OUString& _sName
                             ,uno::Reference< report::XSection>& _member)
 {
@@ -1260,7 +1260,7 @@ sal_Bool SAL_CALL OReportDefinition::attachResource( const OUString& /*_rURL*/,
     try
     {
         fillArgs(aDescriptor);
-        m_pImpl->m_pReportModel->SetModified(sal_False);
+        m_pImpl->m_pReportModel->SetModified(false);
     }
     catch (...)
     {
@@ -1638,7 +1638,7 @@ void SAL_CALL OReportDefinition::removeStorageChangeListener( const uno::Referen
     m_pImpl->m_aStorageChangeListeners.removeInterface(xListener);
 }
 
-sal_Bool OReportDefinition::WriteThroughComponent(
+bool OReportDefinition::WriteThroughComponent(
     const uno::Reference<lang::XComponent> & xComponent,
     const sal_Char* pStreamName,
     const sal_Char* pServiceName,
@@ -1655,11 +1655,11 @@ sal_Bool OReportDefinition::WriteThroughComponent(
         OUString sStreamName = OUString::createFromAscii( pStreamName );
         uno::Reference<io::XStream> xStream = xMyStorage->openStreamElement( sStreamName,embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE );
         if ( !xStream.is() )
-            return sal_False;
+            return false;
         uno::Reference<io::XOutputStream> xOutputStream = xStream->getOutputStream();
         OSL_ENSURE(xOutputStream.is(), "Can't create output stream in package!");
         if ( ! xOutputStream.is() )
-            return sal_False;
+            return false;
 
         uno::Reference<beans::XPropertySet> xStreamProp(xOutputStream,uno::UNO_QUERY);
         OSL_ENSURE(xStreamProp.is(),"No valid preoperty set for the output stream!");
@@ -1696,7 +1696,7 @@ sal_Bool OReportDefinition::WriteThroughComponent(
     }
 }
 
-sal_Bool OReportDefinition::WriteThroughComponent(
+bool OReportDefinition::WriteThroughComponent(
     const uno::Reference<io::XOutputStream> & xOutputStream,
     const uno::Reference<lang::XComponent> & xComponent,
     const sal_Char* pServiceName,
@@ -1727,7 +1727,7 @@ sal_Bool OReportDefinition::WriteThroughComponent(
     OSL_ENSURE( xExporter.is(),
             "can't instantiate export filter component" );
     if( !xExporter.is() )
-        return sal_False;
+        return false;
 
     // connect model and filter
     xExporter->setSourceDocument( xComponent );
diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx
index 723757210de9..49f6fab4c3d4 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -118,8 +118,8 @@ OSection::OSection(const uno::Reference< report::XReportDefinition >& xParentDef
 ,m_nForceNewPage(report::ForceNewPage::NONE)
 ,m_nNewRowOrCol(report::ForceNewPage::NONE)
 ,m_bKeepTogether(sal_False)
-,m_bCanGrow(sal_False)
-,m_bCanShrink(sal_False)
+,m_bCanGrow(false)
+,m_bCanShrink(false)
 ,m_bRepeatSection(sal_False)
 ,m_bVisible(sal_True)
 ,m_bBacktransparent(sal_True)
diff --git a/reportdesign/source/core/inc/FormatCondition.hxx b/reportdesign/source/core/inc/FormatCondition.hxx
index fcc9674d076b..d31c03bca277 100644
--- a/reportdesign/source/core/inc/FormatCondition.hxx
+++ b/reportdesign/source/core/inc/FormatCondition.hxx
@@ -42,7 +42,7 @@ namespace reportdesign
                             public FormatConditionPropertySet
     {
         OFormatProperties   m_aFormatProperties;
-        OUString     m_sFormula;
+        OUString            m_sFormula;
         sal_Bool            m_bEnabled;
     private:
         OFormatCondition(const OFormatCondition&);
diff --git a/reportdesign/source/core/inc/Group.hxx b/reportdesign/source/core/inc/Group.hxx
index 5cf5f28458df..1e198405d673 100644
--- a/reportdesign/source/core/inc/Group.hxx
+++ b/reportdesign/source/core/inc/Group.hxx
@@ -70,7 +70,7 @@ namespace reportdesign
             l.notify();
         }
         void setSection(     const OUString& _sProperty
-                            ,const sal_Bool& _bOn
+                            ,const bool& _bOn
                             ,const OUString& _sName
                             ,::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _member);
     protected:
diff --git a/reportdesign/source/core/inc/ImageControl.hxx b/reportdesign/source/core/inc/ImageControl.hxx
index 599905a981aa..4512f527d7c9 100644
--- a/reportdesign/source/core/inc/ImageControl.hxx
+++ b/reportdesign/source/core/inc/ImageControl.hxx
@@ -43,9 +43,9 @@ namespace reportdesign
     {
         friend class OShapeHelper;
         OReportControlModel                 m_aProps;
-        OUString                     m_aImageURL;
+        OUString                            m_aImageURL;
         sal_Int16                           m_nScaleMode;
-        sal_Bool                          m_bPreserveIRI;
+        sal_Bool                            m_bPreserveIRI;
     private:
         OImageControl(const OImageControl&);
         OImageControl& operator=(const OImageControl&);
diff --git a/reportdesign/source/core/inc/ReportComponent.hxx b/reportdesign/source/core/inc/ReportComponent.hxx
index 0c7f96142afd..15693988eeee 100644
--- a/reportdesign/source/core/inc/ReportComponent.hxx
+++ b/reportdesign/source/core/inc/ReportComponent.hxx
@@ -67,7 +67,7 @@ namespace reportdesign
             ,m_nPosY(0)
             ,m_nBorderColor(0)
             ,m_nBorder(2)
-            ,m_bPrintRepeatedValues(sal_True)
+            ,m_bPrintRepeatedValues(true)
         {}
         ~OReportComponentProperties();
 
diff --git a/reportdesign/source/core/inc/ReportControlModel.hxx b/reportdesign/source/core/inc/ReportControlModel.hxx
index a15d0a7164e1..0fecef6ff605 100644
--- a/reportdesign/source/core/inc/ReportControlModel.hxx
+++ b/reportdesign/source/core/inc/ReportControlModel.hxx
@@ -89,8 +89,8 @@ namespace reportdesign
         ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition> >
                                                             m_aFormatConditions;
         osl::Mutex&                                         m_rMutex;
-        OUString                                     aDataField;
-        OUString                                     aConditionalPrintExpression;
+        OUString                                            aDataField;
+        OUString                                            aConditionalPrintExpression;
         sal_Bool                                            bPrintWhenGroupChange;
 
         OReportControlModel(osl::Mutex& _rMutex
@@ -100,7 +100,7 @@ namespace reportdesign
             ,aComponent(_xContext)
             ,m_pOwner(_pOwner)
             ,m_rMutex(_rMutex)
-            ,bPrintWhenGroupChange(sal_True)
+            ,bPrintWhenGroupChange(true)
         {}
 
         // XContainer
@@ -108,7 +108,7 @@ namespace reportdesign
         void removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
 
         // XElementAccess
-        sal_Bool hasElements(  ) throw (::com::sun::star::uno::RuntimeException);
+        bool hasElements(  ) throw (::com::sun::star::uno::RuntimeException);
 
         // XIndexReplace
         void replaceByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx
index 4ca71770ba5b..ffe330c64b1a 100644
--- a/reportdesign/source/core/inc/Section.hxx
+++ b/reportdesign/source/core/inc/Section.hxx
@@ -67,8 +67,8 @@ namespace reportdesign
         ::sal_Int16                                                                         m_nForceNewPage;
         ::sal_Int16                                                                         m_nNewRowOrCol;
         sal_Bool                                                                          m_bKeepTogether;
-        sal_Bool                                                                          m_bCanGrow;
-        sal_Bool                                                                          m_bCanShrink;
+        bool                                                                          m_bCanGrow;
+        bool                                                                          m_bCanShrink;
         sal_Bool                                                                          m_bRepeatSection;
         sal_Bool                                                                          m_bVisible;
         sal_Bool                                                                          m_bBacktransparent;
diff --git a/reportdesign/source/core/inc/Shape.hxx b/reportdesign/source/core/inc/Shape.hxx
index 7bcea42ae494..42a519af920d 100644
--- a/reportdesign/source/core/inc/Shape.hxx
+++ b/reportdesign/source/core/inc/Shape.hxx
@@ -47,7 +47,7 @@ namespace reportdesign
         ::std::auto_ptr< ::comphelper::OPropertyArrayAggregationHelper> m_pAggHelper;
         OReportControlModel                                             m_aProps;
         com::sun::star::drawing::HomogenMatrix3                         m_Transformation;
-        ::sal_Int32                                                     m_nZOrder;
+        sal_Int32                                                     m_nZOrder;
         sal_Bool                                                      m_bOpaque;
 
         OUString                                                 m_sServiceName;
diff --git a/reportdesign/source/core/inc/Tools.hxx b/reportdesign/source/core/inc/Tools.hxx
index 83dba680e5c7..39df3b2e4304 100644
--- a/reportdesign/source/core/inc/Tools.hxx
+++ b/reportdesign/source/core/inc/Tools.hxx
@@ -35,7 +35,7 @@
 
 namespace reportdesign
 {
-    template <class T> void lcl_createSectionIfNeeded(sal_Bool _bOn,const T& _xParent,::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection/*in/out*/,bool _bPageSection = false)
+    template <class T> void lcl_createSectionIfNeeded(bool _bOn,const T& _xParent,::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection/*in/out*/,bool _bPageSection = false)
     {
         if ( _bOn && !_xSection.is() )
             _xSection = OSection::createOSection(_xParent,_xParent->getContext(),_bPageSection);
diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx
index e79e072cf587..4c48427b48fa 100644
--- a/reportdesign/source/core/sdr/PropertyForward.cxx
+++ b/reportdesign/source/core/sdr/PropertyForward.cxx
@@ -36,12 +36,12 @@ namespace rptui
 OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource
                                      ,const Reference< XPropertySet>& _xDest
                                      ,const TPropertyNamePair& _aNameMap
-                                     ,sal_Bool _bReverse)
+                                     ,bool _bReverse)
                                 : OPropertyForward_Base(m_aMutex)
                                 ,m_aNameMap(_aNameMap)
                                 ,m_xSource(_xSource)
                                 ,m_xDest(_xDest)
-                                ,m_bInChange(sal_False)
+                                ,m_bInChange(false)
 {
     osl_atomic_increment(&m_refCount);
     OSL_ENSURE(m_xDest.is(),"Dest is NULL!");
@@ -96,10 +96,10 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt
     ::osl::MutexGuard aGuard(m_aMutex);
     if ( !m_bInChange )
     {
-        m_bInChange = sal_True;
+        m_bInChange = true;
         try
         {
-            sal_Bool bDest = (evt.Source == m_xDest);
+            bool bDest = (evt.Source == m_xDest);
             Reference<XPropertySet> xProp =  bDest ? m_xSource : m_xDest;
             Reference<XPropertySetInfo> xPropInfo = bDest ? m_xSourceInfo : m_xDestInfo;
             if ( xProp.is() )
@@ -153,7 +153,7 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt
         {
             OSL_FAIL("Exception catched!");
         }
-        m_bInChange = sal_False;
+        m_bInChange = false;
     }
 }
 
diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx
index 97914fe00011..f244817dd8a1 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -94,7 +94,7 @@ OXUndoEnvironment&  OReportModel::GetUndoEnv()
     return *m_pUndoEnv;
 }
 
-void OReportModel::SetModified(sal_Bool _bModified)
+void OReportModel::SetModified(bool _bModified)
 {
     if ( m_pController )
         m_pController->setModified(_bModified);
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 96951b5795e5..a32f242b4e8a 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -148,7 +148,7 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon
             pNewObj = OCustomShape::Create( _xComponent );
             try
             {
-                sal_Bool bOpaque = sal_False;
+                bool bOpaque = false;
                 _xComponent->getPropertyValue(PROPERTY_OPAQUE) >>= bOpaque;
                 pNewObj->NbcSetLayer(bOpaque ? RPT_LAYER_FRONT : RPT_LAYER_BACK);
             }
@@ -311,14 +311,14 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId)
 
 
 OObjectBase::OObjectBase(const uno::Reference< report::XReportComponent>& _xComponent)
-:m_bIsListening(sal_False)
+:m_bIsListening(false)
 {
     m_xReportComponent = _xComponent;
 }
 
 OObjectBase::OObjectBase(const OUString& _sComponentName)
 :m_sComponentName(_sComponentName)
-,m_bIsListening(sal_False)
+,m_bIsListening(false)
 {
 }
 
@@ -355,7 +355,7 @@ void OObjectBase::StartListening()
 
     if ( !isListening() && m_xReportComponent.is() )
     {
-        m_bIsListening = sal_True;
+        m_bIsListening = true;
 
         if ( !m_xPropertyChangeListener.is() )
         {
@@ -366,11 +366,11 @@ void OObjectBase::StartListening()
     }
 }
 
-void OObjectBase::EndListening(sal_Bool /*bRemoveListener*/)
+void OObjectBase::EndListening(bool /*bRemoveListener*/)
 {
     OSL_ENSURE(!m_xReportComponent.is() || isListening(), "OUnoObject::EndListening: not listening currently!");
 
-    m_bIsListening = sal_False;
+    m_bIsListening = false;
     if ( isListening() && m_xReportComponent.is() )
     {
         // XPropertyChangeListener
@@ -417,9 +417,9 @@ void OObjectBase::SetObjectItemHelper(const SfxPoolItem& /*rItem*/)
 }
 
 
-sal_Bool OObjectBase::supportsService( const OUString& _sServiceName ) const
+bool OObjectBase::supportsService( const OUString& _sServiceName ) const
 {
-    sal_Bool bSupports = sal_False;
+    bool bSupports = false;
 
     Reference< lang::XServiceInfo > xServiceInfo( m_xReportComponent , UNO_QUERY );
         // TODO: cache xServiceInfo as member?
@@ -475,14 +475,14 @@ OCustomShape::OCustomShape(const uno::Reference< report::XReportComponent>& _xCo
           ,OObjectBase(_xComponent)
 {
     impl_setUnoShape( uno::Reference< uno::XInterface >(_xComponent,uno::UNO_QUERY) );
-    m_bIsListening = sal_True;
+    m_bIsListening = true;
 }
 
 OCustomShape::OCustomShape(const OUString& _sComponentName)
           :SdrObjCustomShape()
           ,OObjectBase(_sComponentName)
 {
-    m_bIsListening = sal_True;
+    m_bIsListening = true;
 }
 
 
@@ -522,7 +522,7 @@ void OCustomShape::NbcMove( const Size& rSize )
 {
     if ( m_bIsListening )
     {
-        m_bIsListening = sal_False;
+        m_bIsListening = false;
 
         if ( m_xReportComponent.is() )
         {
@@ -535,7 +535,7 @@ void OCustomShape::NbcMove( const Size& rSize )
         // set geometry properties
         SetPropsFromRect(GetSnapRect());
 
-        m_bIsListening = sal_True;
+        m_bIsListening = true;
     }
     else
         SdrObjCustomShape::NbcMove( rSize );
@@ -709,7 +709,7 @@ void OUnoObject::NbcMove( const Size& rSize )
     if ( m_bIsListening )
     {
         // stop listening
-        OObjectBase::EndListening(sal_False);
+        OObjectBase::EndListening(false);
 
         bool bPositionFixed = false;
         Size aUndoSize(0,0);
@@ -757,7 +757,7 @@ void OUnoObject::NbcResize(const Point& rRef, const Fraction& xFract, const Frac
     SdrUnoObj::NbcResize( rRef, xFract, yFract );
 
     // stop listening
-    OObjectBase::EndListening(sal_False);
+    OObjectBase::EndListening(false);
 
     // set geometry properties
     SetPropsFromRect(GetLogicRect());
@@ -770,7 +770,7 @@ void OUnoObject::NbcSetLogicRect(const Rectangle& rRect)
 {
     SdrUnoObj::NbcSetLogicRect(rRect);
     // stop listening
-    OObjectBase::EndListening(sal_False);
+    OObjectBase::EndListening(false);
 
     // set geometry properties
     SetPropsFromRect(rRect);
@@ -848,7 +848,7 @@ void OUnoObject::_propertyChange( const  beans::PropertyChangeEvent& evt ) throw
             Reference<XPropertySet> xControlModel(GetUnoControlModel(),uno::UNO_QUERY);
             if ( xControlModel.is() )
             {
-                OObjectBase::EndListening(sal_False);
+                OObjectBase::EndListening(false);
                 try
                 {
                     xControlModel->setPropertyValue(PROPERTY_TEXTCOLOR,evt.NewValue);
@@ -875,7 +875,7 @@ void OUnoObject::_propertyChange( const  beans::PropertyChangeEvent& evt ) throw
                 if ( !aNewName.equals(aOldName) )
                 {
                     // set old name property
-                    OObjectBase::EndListening(sal_False);
+                    OObjectBase::EndListening(false);
                     if ( m_xMediator.is() )
                         m_xMediator.get()->stopListening();
                     try
@@ -894,7 +894,7 @@ void OUnoObject::_propertyChange( const  beans::PropertyChangeEvent& evt ) throw
     }
 }
 
-void OUnoObject::CreateMediator(sal_Bool _bReverse)
+void OUnoObject::CreateMediator(bool _bReverse)
 {
     if ( !m_xMediator.is() )
     {
@@ -954,7 +954,7 @@ OOle2Obj::OOle2Obj(const uno::Reference< report::XReportComponent>& _xComponent,
 {
 
     impl_setUnoShape( uno::Reference< uno::XInterface >( _xComponent, uno::UNO_QUERY ) );
-    m_bIsListening = sal_True;
+    m_bIsListening = true;
 }
 
 OOle2Obj::OOle2Obj(const OUString& _sComponentName,sal_uInt16 _nType)
@@ -963,7 +963,7 @@ OOle2Obj::OOle2Obj(const OUString& _sComponentName,sal_uInt16 _nType)
           ,m_nType(_nType)
           ,m_bOnlyOnce(true)
 {
-    m_bIsListening = sal_True;
+    m_bIsListening = true;
 }
 
 OOle2Obj::~OOle2Obj()
@@ -1005,7 +1005,7 @@ void OOle2Obj::NbcMove( const Size& rSize )
     if ( m_bIsListening )
     {
         // stop listening
-        OObjectBase::EndListening(sal_False);
+        OObjectBase::EndListening(false);
 
         bool bPositionFixed = false;
         Size aUndoSize(0,0);
@@ -1058,7 +1058,7 @@ void OOle2Obj::NbcResize(const Point& rRef, const Fraction& xFract, const Fracti
     SdrOle2Obj::NbcResize( rRef, xFract, yFract );
 
     // stop listening
-    OObjectBase::EndListening(sal_False);
+    OObjectBase::EndListening(false);
 
     // set geometry properties
     SetPropsFromRect(GetLogicRect());
@@ -1071,7 +1071,7 @@ void OOle2Obj::NbcSetLogicRect(const Rectangle& rRect)
 {
     SdrOle2Obj::NbcSetLogicRect(rRect);
     // stop listening
-    OObjectBase::EndListening(sal_False);
+    OObjectBase::EndListening(false);
 
     // set geometry properties
     SetPropsFromRect(rRect);
diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx
index a4ad094f7bbb..6b8300d03c98 100644
--- a/reportdesign/source/core/sdr/RptPage.cxx
+++ b/reportdesign/source/core/sdr/RptPage.cxx
@@ -161,7 +161,7 @@ void OReportPage::removeTempObject(SdrObject *_pToRemoveObj)
 
 void OReportPage::resetSpecialMode()
 {
-    const sal_Bool bChanged = rModel.IsChanged();
+    const bool bChanged = rModel.IsChanged();
     ::std::vector<SdrObject*>::iterator aIter = m_aTemporaryObjectList.begin();
     ::std::vector<SdrObject*>::iterator aEnd = m_aTemporaryObjectList.end();
 
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx
index 2c4420882be4..8d1fce6f1c65 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -353,13 +353,13 @@ ORptUndoPropertyAction::ORptUndoPropertyAction(SdrModel& rNewMod, const Property
 
 void ORptUndoPropertyAction::Undo()
 {
-    setProperty(sal_True);
+    setProperty(true);
 }
 
 
 void ORptUndoPropertyAction::Redo()
 {
-    setProperty(sal_False);
+    setProperty(false);
 }
 
 Reference< XPropertySet> ORptUndoPropertyAction::getObject()
@@ -367,7 +367,7 @@ Reference< XPropertySet> ORptUndoPropertyAction::getObject()
     return m_xObj;
 }
 
-void ORptUndoPropertyAction::setProperty(sal_Bool _bOld)
+void ORptUndoPropertyAction::setProperty(bool _bOld)
 {
     Reference< XPropertySet> xObj = getObject();
 
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx
index e39bd243d607..558b7daba9cd 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -101,8 +101,8 @@ public:
     ::std::vector< uno::Reference< container::XChild> > m_aSections;
     Reference< XIntrospection >                         m_xIntrospection;
     oslInterlockedCount                                 m_nLocks;
-    sal_Bool                                            m_bReadOnly;
-    sal_Bool                                            m_bIsUndo;
+    bool                                            m_bReadOnly;
+    bool                                            m_bIsUndo;
 
     OXUndoEnvironmentImpl(OReportModel& _rModel);
 };
@@ -111,8 +111,8 @@ OXUndoEnvironmentImpl::OXUndoEnvironmentImpl(OReportModel& _rModel) : m_rModel(_
         ,m_aFormatNormalizer( _rModel )
         ,m_aConditionUpdater()
         ,m_nLocks(0)
-        ,m_bReadOnly(sal_False)
-        ,m_bIsUndo(sal_False)
+        ,m_bReadOnly(false)
+        ,m_bIsUndo(false)
 {
 }
 
@@ -140,7 +140,7 @@ void OXUndoEnvironment::UnLock()
 
     osl_atomic_decrement( &m_pImpl->m_nLocks );
 }
-sal_Bool OXUndoEnvironment::IsLocked() const { return m_pImpl->m_nLocks != 0; }
+bool OXUndoEnvironment::IsLocked() const { return m_pImpl->m_nLocks != 0; }
 
 void OXUndoEnvironment::RemoveSection(OReportPage* _pPage)
 {
@@ -411,7 +411,7 @@ void SAL_CALL OXUndoEnvironment::elementInserted(const ContainerEvent& evt) thro
 
 void OXUndoEnvironment::implSetModified()
 {
-    m_pImpl->m_rModel.SetModified( sal_True );
+    m_pImpl->m_rModel.SetModified( true );
 }
 
 
@@ -638,12 +638,12 @@ void OXUndoEnvironment::RemoveElement(const Reference< XInterface >& _rxElement)
         switchListening( xContainer, false );
 }
 
-void OXUndoEnvironment::SetUndoMode(sal_Bool _bUndo)
+void OXUndoEnvironment::SetUndoMode(bool _bUndo)
 {
     m_pImpl->m_bIsUndo = _bUndo;
 }
 
-sal_Bool OXUndoEnvironment::IsUndoMode() const
+bool OXUndoEnvironment::IsUndoMode() const
 {
     return m_pImpl->m_bIsUndo;
 }
diff --git a/reportdesign/source/core/sdr/formatnormalizer.hxx b/reportdesign/source/core/sdr/formatnormalizer.hxx
index 8aed52415420..d85ce5925f5c 100644
--- a/reportdesign/source/core/sdr/formatnormalizer.hxx
+++ b/reportdesign/source/core/sdr/formatnormalizer.hxx
@@ -45,9 +45,9 @@ namespace rptui
             OUString sName;
             sal_Int32       nDataType;
             sal_Int32       nScale;
-            sal_Bool        bIsCurrency;
+            bool        bIsCurrency;
 
-            Field() : sName(), nDataType( 0 ), nScale( 0 ), bIsCurrency( 0 ) { }
+            Field() : sName(), nDataType( 0 ), nScale( 0 ), bIsCurrency( false ) { }
         };
         typedef ::std::vector< Field >  FieldList;
 
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index 4784722aa80b..f44d552407cc 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -55,7 +55,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport
     SvXMLImportContext( rImport, nPrfx, _sLocalName )
     ,m_xControl(_xControl)
     ,m_pContainer(_pContainer)
-    ,m_bIsList(sal_False)
+    ,m_bIsList(false)
 {
     m_aPropType = ::getVoidCppuType();
 
@@ -198,7 +198,7 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe
         {
             bool bValue(false);
         #if OSL_DEBUG_LEVEL > 0
-            sal_Bool bSuccess =
+            bool bSuccess =
         #endif
                 ::sax::Converter::convertBool(bValue, _rReadCharacters);
             OSL_ENSURE(bSuccess,
@@ -213,7 +213,7 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe
             {   // it's a real int32/16 property
                 sal_Int32 nValue(0);
         #if OSL_DEBUG_LEVEL > 0
-                sal_Bool bSuccess =
+                bool bSuccess =
         #endif
                     ::sax::Converter::convertNumber(nValue, _rReadCharacters);
                 OSL_ENSURE(bSuccess,
@@ -235,7 +235,7 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe
         {
             double nValue = 0.0;
         #if OSL_DEBUG_LEVEL > 0
-            sal_Bool bSuccess =
+            bool bSuccess =
         #endif
                 ::sax::Converter::convertDouble(nValue, _rReadCharacters);
             OSL_ENSURE(bSuccess,
@@ -266,7 +266,7 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe
                     // first extract the double
                     double nValue = 0;
                 #if OSL_DEBUG_LEVEL > 0
-                    sal_Bool bSuccess =
+                    bool bSuccess =
                 #endif
                     ::sax::Converter::convertDouble(nValue, _rReadCharacters);
                     OSL_ENSURE(bSuccess,
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.hxx b/reportdesign/source/filter/xml/xmlControlProperty.hxx
index a280923c036a..1030d02f12b1 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.hxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.hxx
@@ -36,7 +36,7 @@ namespace rptxml
         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> m_aSequence;
         OXMLControlProperty* m_pContainer;
         ::com::sun::star::uno::Type m_aPropType;            // the type of the property the instance imports currently
-        sal_Bool m_bIsList;
+        bool m_bIsList;
 
         ORptFilter& GetOwnImport();
         ::com::sun::star::uno::Any convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters);
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 7944be61f6fa..a43e13fc92ee 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -214,7 +214,7 @@ void lcl_adjustColumnSpanOverRows(ORptExport::TSectionsGrid& _rGrid)
 
 ORptExport::ORptExport(const Reference< XComponentContext >& _rxContext, OUString const & implementationName, sal_uInt16 nExportFlag)
 : SvXMLExport( util::MeasureUnit::MM_100TH, _rxContext, implementationName, XML_REPORT, EXPORT_OASIS)
-,m_bAllreadyFilled(sal_False)
+,m_bAllreadyFilled(false)
 {
     setExportFlags( EXPORT_OASIS | nExportFlag);
     GetMM100UnitConverter().SetCoreMeasureUnit(MAP_100TH_MM);
@@ -787,7 +787,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
             nEmptyCellColSpan = 0;
             for (; aColIter != aColEnd; ++aColIter)
             {
-                sal_Bool bCoveredCell = sal_False;
+                bool bCoveredCell = false;
                 sal_Int32 nColSpan = 0;
                 sal_Int32 nColIndex = aColIter - aRowIter->second.begin();
                 ::std::map<sal_Int32,sal_Int32>::iterator aRowSpanFind = aRowSpan.find(nColIndex);
@@ -800,7 +800,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
                     if ( aColIter->nColSpan > 1 )
                         nColSpan += aColIter->nColSpan - 1;
 
-                    bCoveredCell = sal_True;
+                    bCoveredCell = true;
                     aColIter = aColIter + (aColIter->nColSpan - 1);
                 }
                 else if ( aColIter->bSet )
@@ -808,7 +808,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
                     if ( nEmptyCellColSpan > 0 )
                     {
                         AddAttribute( XML_NAMESPACE_TABLE,XML_NUMBER_COLUMNS_SPANNED,implConvertNumber(nEmptyCellColSpan) );
-                        bCoveredCell = sal_True;
+                        bCoveredCell = true;
                         nColSpan = nEmptyCellColSpan - 1;
                         nEmptyCellColSpan = 0;
                     }
@@ -817,7 +817,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
                     {
                         AddAttribute( XML_NAMESPACE_TABLE,XML_NUMBER_COLUMNS_SPANNED,implConvertNumber(nSpan) );
                         nColSpan = nSpan - 1;
-                        bCoveredCell = sal_True;
+                        bCoveredCell = true;
                     }
                     nSpan = aColIter->nRowSpan;
                     if ( nSpan > 1 )
@@ -872,7 +872,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
                             Reference<XSection> xSection(xElement,uno::UNO_QUERY);
 
                             XMLTokenEnum eToken = XML_SECTION;
-                            sal_Bool bExportData = sal_False;
+                            bool bExportData = false;
                             if ( xElement->supportsService(SERVICE_FIXEDTEXT) )
                             {
                                 eToken = XML_FIXED_CONTENT;
@@ -880,7 +880,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
                             else if ( xElement->supportsService(SERVICE_FORMATTEDFIELD) )
                             {
                                 eToken = XML_FORMATTED_TEXT;
-                                bExportData = sal_True;
+                                bExportData = true;
                             }
                             else if ( xElement->supportsService(SERVICE_IMAGECONTROL) )
                             {
@@ -891,7 +891,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
                                     sTargetLocation = GetRelativeReference(sTargetLocation);
                                     AddAttribute(XML_NAMESPACE_FORM, XML_IMAGE_DATA,sTargetLocation);
                                 }
-                                bExportData = sal_True;
+                                bExportData = true;
                                 OUStringBuffer sValue;
                                 const SvXMLEnumMapEntry* aXML_ImageScaleEnumMap = OXMLHelper::GetImageScaleOptions();
                                 if ( SvXMLUnitConverter::convertEnum( sValue, xImage->getScaleMode(),aXML_ImageScaleEnumMap ) )
@@ -1035,9 +1035,9 @@ void ORptExport::exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,
     }
 }
 
-sal_Bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDefinition,sal_Int32 _nPos,sal_Bool _bExportAutoStyle)
+bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDefinition,sal_Int32 _nPos,bool _bExportAutoStyle)
 {
-    sal_Bool bGroupExported = sal_False;
+    bool bGroupExported = false;
     if ( _xReportDefinition.is() )
     {
         Reference< XGroups > xGroups = _xReportDefinition->getGroups();
@@ -1046,7 +1046,7 @@ sal_Bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDef
             sal_Int32 nCount = xGroups->getCount();
             if ( _nPos >= 0 && _nPos < nCount )
             {
-                bGroupExported = sal_True;
+                bGroupExported = true;
                 Reference<XGroup> xGroup(xGroups->getByIndex(_nPos),uno::UNO_QUERY);
                 OSL_ENSURE(xGroup.is(),"No Group prepare for GPF");
                 if ( _bExportAutoStyle )
@@ -1272,7 +1272,7 @@ void ORptExport::exportReportAttributes(const Reference<XReportDefinition>& _xRe
 
         AddAttribute(XML_NAMESPACE_OFFICE, XML_MIMETYPE,_xReport->getMimeType());
 
-        sal_Bool bEscapeProcessing( _xReport->getEscapeProcessing() );
+        bool bEscapeProcessing( _xReport->getEscapeProcessing() );
         if ( !bEscapeProcessing )
             AddAttribute( XML_NAMESPACE_REPORT, XML_ESCAPE_PROCESSING, ::xmloff::token::GetXMLToken( XML_FALSE ) );
 
@@ -1300,7 +1300,7 @@ void ORptExport::collectComponentStyles()
     if ( m_bAllreadyFilled )
         return;
 
-    m_bAllreadyFilled = sal_True;
+    m_bAllreadyFilled = true;
     Reference<XReportDefinition> xProp(getReportDefinition());
     if ( xProp.is() )
     {
@@ -1313,7 +1313,7 @@ void ORptExport::collectComponentStyles()
         if ( xProp->getPageHeaderOn() )
             exportSectionAutoStyle(xProp->getPageHeader());
 
-        exportGroup(xProp,0,sal_True);
+        exportGroup(xProp,0,true);
 
         if ( xProp->getPageFooterOn() )
             exportSectionAutoStyle(xProp->getPageFooter());
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx
index 2c981ad0125d..7828eecbb523 100644
--- a/reportdesign/source/filter/xml/xmlExport.hxx
+++ b/reportdesign/source/filter/xml/xmlExport.hxx
@@ -138,7 +138,7 @@ private:
     mutable UniReference < XMLPropertySetMapper >   m_xColumnStylesPropertySetMapper;
     mutable UniReference < XMLPropertySetMapper >   m_xCellStylesPropertySetMapper;
     Reference<XReportDefinition>                    m_xReportDefinition;
-    sal_Bool                                        m_bAllreadyFilled;
+    bool                                        m_bAllreadyFilled;
 
     void                    exportReport(const Reference<XReportDefinition>& _xReportDefinition); /// <element name="office:report">
     void                    exportReportAttributes(const Reference<XReportDefinition>& _xReport);
@@ -146,7 +146,7 @@ private:
     void                    exportFunction(const Reference< XFunction>& _xFunction);
     void                    exportMasterDetailFields(const Reference<XReportComponent>& _xReportComponet);
     void                    exportComponent(const Reference<XReportComponent>& _xReportComponent);
-    sal_Bool                exportGroup(const Reference<XReportDefinition>& _xReportDefinition,sal_Int32 _nPos,sal_Bool _bExportAutoStyle = sal_False);
+    bool                exportGroup(const Reference<XReportDefinition>& _xReportDefinition,sal_Int32 _nPos,bool _bExportAutoStyle = false);
     void                    exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,const OUString& _sName);
     void                    exportSection(const Reference<XSection>& _xProp,bool bHeader = false);
     void                    exportContainer(const Reference< XSection>& _xSection);
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index 27d46202ad13..7973b073286c 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -166,7 +166,7 @@ void SAL_CALL ExportDocumentHandler::startElement(const OUString & _sName, const
         if ( !sFilter.isEmpty() )
             pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_FILTER),sFilter);
 
-        const sal_Bool bEscapeProcessing( m_xDatabaseDataProvider->getEscapeProcessing() );
+        const bool bEscapeProcessing( m_xDatabaseDataProvider->getEscapeProcessing() );
         if ( !bEscapeProcessing )
             pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_ESCAPE_PROCESSING),::xmloff::token::GetXMLToken( XML_FALSE ));
 
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index 8f77b44563d8..34bd41f2abec 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -50,7 +50,7 @@ public:
             const OUString& rLName,
             const uno::Reference< xml::sax::XAttributeList > & xAttrList,
             sal_Unicode c,
-            sal_Bool bCount );
+            bool bCount );
     OXMLCharContent(
             SvXMLImport& rImport,
             OXMLFixedContent* _pFixedContent,
@@ -69,7 +69,7 @@ OXMLCharContent::OXMLCharContent(
         const OUString& rLName,
         const uno::Reference< xml::sax::XAttributeList > & xAttrList,
         sal_Unicode c,
-        sal_Bool bCount )
+        bool bCount )
     : XMLCharContext(rImport,nPrfx,rLName,xAttrList,c,bCount)
     ,m_pFixedContent(_pFixedContent)
 {
@@ -149,7 +149,7 @@ SvXMLImportContext* OXMLFixedContent::_CreateChildContext(
         case XML_TOK_TEXT_TAB_STOP:
             pContext = new OXMLCharContent( m_rImport, this,nPrefix,
                                                 rLocalName, xAttrList,
-                                                0x0009, sal_False );
+                                                0x0009, false );
             break;
 
         case XML_TOK_TEXT_LINE_BREAK:
@@ -161,7 +161,7 @@ SvXMLImportContext* OXMLFixedContent::_CreateChildContext(
         case XML_TOK_TEXT_S:
             pContext = new OXMLCharContent( m_rImport, this,nPrefix,
                                                 rLocalName, xAttrList,
-                                                0x0020, sal_True );
+                                                0x0020, true );
             break;
         case XML_TOK_PAGE_NUMBER:
             m_sPageText += s_sStringConcat + " PageNumber()";
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index e3b5e1e9b19b..4d41b653f133 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -118,7 +118,7 @@ void SAL_CALL ImportDocumentHandler::endDocument() throw (uno::RuntimeException,
         aArgs.put( "FirstCellAsLabel", uno::makeAny( sal_True ) );
         aArgs.put( "DataRowSource", uno::makeAny( chart::ChartDataRowSource_COLUMNS ) );
 
-        sal_Bool bHasCategories = sal_False;
+        bool bHasCategories = false;
 
         uno::Reference< chart2::data::XDataSource > xDataSource(m_xModel, uno::UNO_QUERY);
         if( xDataSource.is())
@@ -136,7 +136,7 @@ void SAL_CALL ImportDocumentHandler::endDocument() throw (uno::RuntimeException,
                         &&  aRole == "categories"
                         )
                     {
-                        bHasCategories = sal_True;
+                        bHasCategories = true;
                         break;
                     }
                 }
@@ -257,7 +257,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const OUString & _sName, const
         bExport = false;
     else if ( _sName == "chart:plot-area" )
     {
-        sal_Bool bHasCategories = sal_True;
+        bool bHasCategories = true;
         const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
         SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr<SvXMLTokenMap> pMasterElemTokenMap( OXMLHelper::GetSubDocumentElemTokenMap());
diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx
index 0dee143809f1..36d8fdf3658b 100644
--- a/reportdesign/source/filter/xml/xmlReport.cxx
+++ b/reportdesign/source/filter/xml/xmlReport.cxx
@@ -178,7 +178,7 @@ SvXMLImportContext* OXMLReport::CreateChildContext(
             {
                 m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
                 m_xComponent->setPageFooterOn(sal_True);
-                pContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList ,m_xComponent->getPageFooter(),sal_False);
+                pContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList ,m_xComponent->getPageFooter(),false);
             }
             break;
         case XML_TOK_REPORT_FOOTER:
diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx
index 3a979645193b..909445796b94 100644
--- a/reportdesign/source/filter/xml/xmlSection.cxx
+++ b/reportdesign/source/filter/xml/xmlSection.cxx
@@ -55,7 +55,7 @@ OXMLSection::OXMLSection( ORptFilter& rImport,
                 sal_uInt16 nPrfx, const OUString& _sLocalName,
                 const uno::Reference< xml::sax::XAttributeList > & _xAttrList
                 ,const uno::Reference< report::XSection >& _xSection
-                ,sal_Bool _bPageHeader)
+                ,bool _bPageHeader)
 :SvXMLImportContext( rImport, nPrfx, _sLocalName )
 ,m_xSection(_xSection)
 ,m_bPageHeader(_bPageHeader)
diff --git a/reportdesign/source/filter/xml/xmlSection.hxx b/reportdesign/source/filter/xml/xmlSection.hxx
index 611e1e9075ca..9f2107df70e4 100644
--- a/reportdesign/source/filter/xml/xmlSection.hxx
+++ b/reportdesign/source/filter/xml/xmlSection.hxx
@@ -30,7 +30,7 @@ namespace rptxml
     {
     private:
         ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >              m_xSection;
-        sal_Bool                                                                            m_bPageHeader;
+        bool                                                                            m_bPageHeader;
         ORptFilter& GetOwnImport();
 
         OXMLSection(const OXMLSection&);
@@ -42,7 +42,7 @@ namespace rptxml
                     ,const OUString& rLName
                     ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList
                     ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection
-                    ,sal_Bool _bPageHeader = sal_True);
+                    ,bool _bPageHeader = true);
         virtual ~OXMLSection();
 
         virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index 9138c7c73717..8e7ca2f4cb4b 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -74,14 +74,14 @@ TYPEINIT1( OReportStylesContext, SvXMLStylesContext );
 OControlStyleContext::OControlStyleContext( ORptFilter& rImport,
         sal_uInt16 nPrfx, const OUString& rLName,
         const Reference< XAttributeList > & xAttrList,
-        SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool bDefaultStyle ) :
+        SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle ) :
     XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, bDefaultStyle ),
     sNumberFormat(OUString("NumberFormat")),
     pStyles(&rStyles),
     m_nNumberFormat(-1),
     m_rImport(rImport),
-    bConditionalFormatCreated(sal_False),
-    bParentSet(sal_False)
+    bConditionalFormatCreated(false),
+    bParentSet(false)
 {
 
 }
@@ -160,7 +160,7 @@ OReportStylesContext::OReportStylesContext( ORptFilter& rImport,
         sal_uInt16 nPrfx ,
         const OUString& rLName ,
         const Reference< XAttributeList > & xAttrList,
-        const sal_Bool bTempAutoStyles ) :
+        const bool bTempAutoStyles ) :
     SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ),
     m_sTableStyleFamilyName( OUString( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME )),
     m_sColumnStyleFamilyName( OUString( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME )),
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx
index 76bc19800e44..ce32875f06ef 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.hxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx
@@ -46,8 +46,8 @@ namespace rptxml
         com::sun::star::uno::Any    aConditionalFormat;
         sal_Int32                   m_nNumberFormat;
         ORptFilter&                 m_rImport;
-        sal_Bool                    bConditionalFormatCreated : 1;
-        sal_Bool                    bParentSet : 1;
+        bool                    bConditionalFormatCreated : 1;
+        bool                    bParentSet : 1;
 
         ORptFilter& GetOwnImport() const;
 
@@ -66,7 +66,7 @@ namespace rptxml
         OControlStyleContext( ORptFilter& rImport, sal_uInt16 nPrfx,
                 const OUString& rLName,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
-                SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool bDefaultStyle = sal_False );
+                SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle = false );
 
         virtual ~OControlStyleContext();
 
@@ -89,7 +89,7 @@ namespace rptxml
         const OUString m_sCellStyleFamilyName;
         ORptFilter&           m_rImport;
         sal_Int32 m_nNumberFormatIndex;
-        sal_Bool bAutoStyles : 1;
+        bool bAutoStyles : 1;
 
         //mutable UniReference < SvXMLImportPropertyMapper > m_xControlImpPropMapper;
         mutable UniReference < SvXMLImportPropertyMapper > m_xCellImpPropMapper;
@@ -132,7 +132,7 @@ namespace rptxml
         OReportStylesContext( ORptFilter& rImport, sal_uInt16 nPrfx ,
                 const OUString& rLName ,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
-                const sal_Bool bAutoStyles );
+                const bool bAutoStyles );
         virtual ~OReportStylesContext();
 
         virtual void EndElement() SAL_OVERRIDE;
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 908fd7efeef7..106c9d29ad85 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -125,7 +125,7 @@ sal_Int32 ReadThroughComponent(
     const sal_Char* /*pStreamName*/,
     const uno::Reference<XComponentContext> & rContext,
     const uno::Reference< XDocumentHandler >& _xFilter,
-    sal_Bool /*bEncrypted*/ )
+    bool /*bEncrypted*/ )
 {
     OSL_ENSURE(xInputStream.is(), "input stream missing");
     OSL_ENSURE(xModelComponent.is(), "document missing");
@@ -209,7 +209,7 @@ sal_Int32 ReadThroughComponent(
     if ( xStorage.is() )
     {
         uno::Reference< io::XStream > xDocStream;
-        sal_Bool bEncrypted = sal_False;
+        bool bEncrypted = false;
 
         try
         {
@@ -407,7 +407,7 @@ sal_Bool SAL_CALL ORptFilter::filter( const Sequence< PropertyValue >& rDescript
     throw (RuntimeException, std::exception)
 {
     Window*     pFocusWindow = Application::GetFocusWindow();
-    sal_Bool    bRet = sal_False;
+    bool    bRet = false;
 
     if( pFocusWindow )
         pFocusWindow->EnterWait();
@@ -421,7 +421,7 @@ sal_Bool SAL_CALL ORptFilter::filter( const Sequence< PropertyValue >& rDescript
     return bRet;
 }
 
-sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
+bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
     throw (RuntimeException)
 {
     OUString                     sFileName;
@@ -472,13 +472,13 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
             }
         }
     }
-    sal_Bool bRet = xStorage.is();
+    bool bRet = xStorage.is();
     if ( bRet )
     {
         m_xReportDefinition.set(GetModel(),UNO_QUERY_THROW);
         OSL_ENSURE(m_xReportDefinition.is(),"ReportDefinition is NULL!");
         if ( !m_xReportDefinition.is() )
-            return sal_False;
+            return false;
 
 #if OSL_DEBUG_LEVEL > 1
         uno::Reference < container::XNameAccess > xAccess( xStorage, uno::UNO_QUERY );
@@ -613,7 +613,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
                         // TODO/LATER: this is completely wrong! Filter code should never call ErrorHandler directly! But for now this is the only way!
                         ErrorHandler::HandleError( nRet );
                         if( nRet & ERRCODE_WARNING_MASK )
-                            bRet = sal_True;
+                            bRet = true;
                     }
             }
         }
@@ -652,13 +652,13 @@ SvXMLImportContext* ORptFilter::CreateContext( sal_uInt16 nPrefix,
             break;
         case XML_TOK_DOC_STYLES:
             GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
-            pContext = CreateStylesContext( rLocalName, xAttrList, sal_False);
+            pContext = CreateStylesContext( rLocalName, xAttrList, false);
             break;
         case XML_TOK_DOC_AUTOSTYLES:
             // don't use the autostyles from the styles-document for the progress
             if ( ! IsXMLToken( rLocalName, XML_DOCUMENT_STYLES ) )
                 GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
-            pContext = CreateStylesContext( rLocalName, xAttrList, sal_True);
+            pContext = CreateStylesContext( rLocalName, xAttrList, true);
             break;
         case XML_TOK_DOC_FONTDECLS:
             GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
@@ -931,7 +931,7 @@ const SvXMLTokenMap& ORptFilter::GetCellElemTokenMap() const
 }
 
 SvXMLImportContext* ORptFilter::CreateStylesContext(const OUString& rLocalName,
-                                     const uno::Reference< XAttributeList>& xAttrList, sal_Bool bIsAutoStyle )
+                                     const uno::Reference< XAttributeList>& xAttrList, bool bIsAutoStyle )
 {
     SvXMLImportContext* pContext = bIsAutoStyle ? GetAutoStyles() : GetStyles();
     if ( !pContext )
@@ -1041,9 +1041,9 @@ SvXMLImportContext* ORptFilter::CreateMetaContext(const OUString& rLocalName,con
     return pContext;
 }
 
-sal_Bool ORptFilter::isOldFormat() const
+bool ORptFilter::isOldFormat() const
 {
-    sal_Bool bOldFormat = sal_True;
+    bool bOldFormat = true;
     uno::Reference<beans::XPropertySet> xProp = getImportInfo();
     if ( xProp.is() )
     {
diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx
index f49d66deecb0..cf23bdb04b20 100644
--- a/reportdesign/source/filter/xml/xmlfilter.hxx
+++ b/reportdesign/source/filter/xml/xmlfilter.hxx
@@ -101,10 +101,10 @@ private:
     Reference<XReportDefinition>                    m_xReportDefinition;
     ::boost::shared_ptr<rptui::OReportModel>        m_pReportModel;
 
-    sal_Bool                            implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException);
+    bool                            implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException);
 
     SvXMLImportContext* CreateStylesContext(const OUString& rLocalName,
-                                     const Reference< XAttributeList>& xAttrList, sal_Bool bIsAutoStyle );
+                                     const Reference< XAttributeList>& xAttrList, bool bIsAutoStyle );
     SvXMLImportContext* CreateMetaContext(const OUString& rLocalName,
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
     SvXMLImportContext* CreateFontDeclsContext(const OUString& rLocalName,
@@ -176,7 +176,7 @@ public:
     virtual void                        enterEventContext();
     virtual void                        leaveEventContext();
 
-    sal_Bool                            isOldFormat() const;
+    bool                            isOldFormat() const;
 };
 
 /** Imports only settings
diff --git a/reportdesign/source/inc/GroupProperties.hxx b/reportdesign/source/inc/GroupProperties.hxx
index d2ec0ac1c78b..2dd5a2647564 100644
--- a/reportdesign/source/inc/GroupProperties.hxx
+++ b/reportdesign/source/inc/GroupProperties.hxx
@@ -25,10 +25,10 @@ namespace rptshared
     */
     struct GroupProperties
     {
-        ::sal_Int32                                                                 m_nGroupInterval;
-        OUString                                                             m_sExpression;
-        ::sal_Int16                                                                 m_nGroupOn;
-        ::sal_Int16                                                                 m_nKeepTogether;
+        sal_Int32                                                                 m_nGroupInterval;
+        OUString                                                                  m_sExpression;
+        sal_Int16                                                                 m_nGroupOn;
+        sal_Int16                                                                 m_nKeepTogether;
         sal_Bool                                                                  m_eSortAscending;
         sal_Bool                                                                  m_bStartNewColumn;
         sal_Bool                                                                  m_bResetPageNumber;
@@ -37,9 +37,9 @@ namespace rptshared
         :m_nGroupInterval(1)
         ,m_nGroupOn(0)
         ,m_nKeepTogether(0)
-        ,m_eSortAscending(sal_True)
-        ,m_bStartNewColumn(sal_False)
-        ,m_bResetPageNumber(sal_False)
+        ,m_eSortAscending(true)
+        ,m_bStartNewColumn(false)
+        ,m_bResetPageNumber(false)
         {}
     };
 }
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index 7031fcc9e43f..2d8f15245f2c 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -157,7 +157,7 @@ OAddFieldWindow::OAddFieldWindow(Window* pParent
             ,m_aHelpText(this, ModuleRes(ADDFIELD_HELP_FIELD) )
             ,m_aInsertButton(this, WB_TABSTOP|WB_CENTER)
             ,m_nCommandType(0)
-            ,m_bEscapeProcessing(sal_False)
+            ,m_bEscapeProcessing(false)
             ,m_pChangeListener(NULL)
             ,m_pContainerListener(NULL)
 {
@@ -319,7 +319,7 @@ void OAddFieldWindow::Update()
         {
             OUString sCommand( m_aCommandName );
             sal_Int32       nCommandType( m_nCommandType );
-            sal_Bool        bEscapeProcessing( m_bEscapeProcessing );
+            bool        bEscapeProcessing( m_bEscapeProcessing );
             OUString sFilter( m_sFilter );
 
             OSL_VERIFY( m_xRowSet->getPropertyValue( PROPERTY_COMMAND ) >>= sCommand );
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index d16d802ea782..706f2d65f349 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -464,7 +464,7 @@ namespace rptui
                         continue;
 
                     Reference< XFormatCondition > xNewCond;
-                    sal_Bool bAppend = j >= m_xFormatConditions->getCount();
+                    bool bAppend = j >= m_xFormatConditions->getCount();
                     if ( bAppend )
                     {
                         xNewCond = m_xFormatConditions->createFormatCondition();
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx
index 7e66030c1b4c..54e3ef47e621 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -134,10 +134,10 @@ short ODateTimeDialog::Execute()
             aValues[nLength++].Value <<= m_pDate->IsChecked();
 
             aValues[nLength].Name = PROPERTY_FORMATKEYDATE;
-            aValues[nLength++].Value <<= getFormatKey(sal_True);
+            aValues[nLength++].Value <<= getFormatKey(true);
 
             aValues[nLength].Name = PROPERTY_FORMATKEYTIME;
-            aValues[nLength++].Value <<= getFormatKey(sal_False);
+            aValues[nLength++].Value <<= getFormatKey(false);
 
             sal_Int32 nWidth = 0;
             if ( m_pDate->IsChecked() )
@@ -198,8 +198,8 @@ IMPL_LINK( ODateTimeDialog, CBClickHdl, CheckBox*, _pBox )
 
      if ( _pBox == m_pDate || _pBox == m_pTime)
      {
-         sal_Bool bDate = m_pDate->IsChecked();
-        sal_Bool bTime = m_pTime->IsChecked();
+         bool bDate = m_pDate->IsChecked();
+        bool bTime = m_pTime->IsChecked();
         if (!bDate && !bTime)
         {
             m_pPB_OK->Disable();
@@ -212,7 +212,7 @@ IMPL_LINK( ODateTimeDialog, CBClickHdl, CheckBox*, _pBox )
     return 1L;
 }
 
-sal_Int32 ODateTimeDialog::getFormatKey(sal_Bool _bDate) const
+sal_Int32 ODateTimeDialog::getFormatKey(bool _bDate) const
 {
     sal_Int32 nFormatKey;
     if ( _bDate )
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index c39ac44ab14a..ebaa44c3e149 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -95,7 +95,7 @@ class OFieldExpressionControl : public TContainerListenerBase
     OGroupsSortingDialog*           m_pParent;
     bool                            m_bIgnoreEvent;
 
-    sal_Bool SaveModified(bool _bAppend);
+    bool SaveModified(bool _bAppend);
 
 public:
     OFieldExpressionControl( OGroupsSortingDialog* _pParent,const ResId& _rResId);
@@ -110,7 +110,7 @@ public:
 
     void        fillColumns(const uno::Reference< container::XNameAccess>& _xColumns);
     void        lateInit();
-    sal_Bool    IsDeleteAllowed( );
+    bool    IsDeleteAllowed( );
     void        DeleteRows();
     void        cut();
     void        copy();
@@ -126,7 +126,7 @@ public:
 
     /** move groups given by _aGroups
     */
-    void moveGroups(const uno::Sequence<uno::Any>& _aGroups,sal_Int32 _nRow,sal_Bool _bSelect = sal_True);
+    void moveGroups(const uno::Sequence<uno::Any>& _aGroups,sal_Int32 _nRow,bool _bSelect = true);
 
     virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol) SAL_OVERRIDE;
     using OFieldExpressionControl_Base::GetRowCount;
@@ -284,7 +284,7 @@ sal_Int8 OFieldExpressionControl::ExecuteDrop( const BrowserExecuteDropEvent& rE
     return nAction;
 }
 
-void OFieldExpressionControl::moveGroups(const uno::Sequence<uno::Any>& _aGroups,sal_Int32 _nRow,sal_Bool _bSelect)
+void OFieldExpressionControl::moveGroups(const uno::Sequence<uno::Any>& _aGroups,sal_Int32 _nRow,bool _bSelect)
 {
     if ( _aGroups.getLength() )
     {
@@ -401,18 +401,18 @@ bool OFieldExpressionControl::SaveModified()
     return SaveModified(true);
 }
 
-sal_Bool OFieldExpressionControl::SaveModified(bool _bAppendRow)
+bool OFieldExpressionControl::SaveModified(bool _bAppendRow)
 {
     sal_Int32 nRow = GetCurRow();
     if ( nRow != BROWSER_ENDOFSELECTION )
     {
-        sal_Bool bAppend = sal_False;
+        bool bAppend = false;
         try
         {
             uno::Reference< report::XGroup> xGroup;
             if ( m_aGroupPositions[nRow] == NO_GROUP )
             {
-                bAppend = sal_True;
+                bAppend = true;
                 OUString sUndoAction(ModuleRes(RID_STR_UNDO_APPEND_GROUP));
                 m_pParent->m_pController->getUndoManager().EnterListAction( sUndoAction, OUString() );
                 xGroup = m_pParent->getGroups()->createGroup();
@@ -478,7 +478,7 @@ sal_Bool OFieldExpressionControl::SaveModified(bool _bAppendRow)
         }
     }
 
-    return sal_True;
+    return true;
 }
 
 OUString OFieldExpressionControl::GetCellText( long nRow, sal_uInt16 /*nColId*/ ) const
@@ -660,7 +660,7 @@ void SAL_CALL OFieldExpressionControl::elementRemoved(const container::Container
     }
 }
 
-sal_Bool OFieldExpressionControl::IsDeleteAllowed( )
+bool OFieldExpressionControl::IsDeleteAllowed( )
 {
     return !m_pParent->isReadOnly() && GetSelectRowCount() > 0;
 }
@@ -697,12 +697,12 @@ void OFieldExpressionControl::Command(const CommandEvent& rEvt)
             if ( nColId == HANDLE_ID )
             {
                 PopupMenu aContextMenu(ModuleRes(RID_GROUPSROWPOPUPMENU));
-                sal_Bool bEnable = sal_False;
+                bool bEnable = false;
                 long nIndex = FirstSelectedRow();
                 while( nIndex >= 0 && !bEnable )
                 {
                     if ( m_aGroupPositions[nIndex] != NO_GROUP )
-                        bEnable = sal_True;
+                        bEnable = true;
                     nIndex = NextSelectedRow();
                 }
                 aContextMenu.EnableItem( SID_DELETE, IsDeleteAllowed() && bEnable );
@@ -738,7 +738,7 @@ void OFieldExpressionControl::Command(const CommandEvent& rEvt)
 void OFieldExpressionControl::DeleteRows()
 {
 
-    sal_Bool bIsEditing = IsEditing();
+    bool bIsEditing = IsEditing();
     if (bIsEditing)
     {
         DeactivateCell();
@@ -915,7 +915,7 @@ void OFieldExpressionControl::InsertRows( long nRow )
 // class OGroupsSortingDialog
 
 OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent
-                                           ,sal_Bool _bReadOnly
+                                           ,bool _bReadOnly
                                            ,OReportController* _pController)
     : FloatingWindow( _pParent, ModuleRes(RID_GROUPS_SORTING) )
     ,OPropertyChangeListener(m_aMutex)
@@ -1014,7 +1014,7 @@ OGroupsSortingDialog::~OGroupsSortingDialog()
         m_pCurrentGroupListener->dispose();
 }
 
-sal_Bool OGroupsSortingDialog::isReadOnly( ) const
+bool OGroupsSortingDialog::isReadOnly( ) const
 {
     return m_bReadOnly;
 }
@@ -1031,7 +1031,7 @@ void OGroupsSortingDialog::UpdateData( )
 void OGroupsSortingDialog::DisplayData( sal_Int32 _nRow )
 {
     sal_Int32 nGroupPos = m_pFieldExpression->getGroupPosition(_nRow);
-    sal_Bool bEmpty = nGroupPos == NO_GROUP;
+    bool bEmpty = nGroupPos == NO_GROUP;
     m_aHeaderLst.Enable(!bEmpty);
     m_aFooterLst.Enable(!bEmpty);
     m_aGroupOnLst.Enable(!bEmpty);
@@ -1183,7 +1183,7 @@ IMPL_LINK( OGroupsSortingDialog, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ )
             if ( nIndex >= 0 && aClipboardList.getLength() )
             {
                 m_pFieldExpression->SetNoSelection();
-                m_pFieldExpression->moveGroups(aClipboardList,nIndex,sal_False);
+                m_pFieldExpression->moveGroups(aClipboardList,nIndex,false);
                 m_pFieldExpression->DeactivateCell();
                 m_pFieldExpression->GoToRow(nIndex);
                 m_pFieldExpression->ActivateCell(nIndex, m_pFieldExpression->GetCurColumnId());
@@ -1332,7 +1332,7 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x
         pControls[i]->SaveValue();
 
     ListBox* pControlsLst2[] = { &m_aHeaderLst, &m_aFooterLst,  &m_aGroupOnLst, &m_aKeepTogetherLst,&m_aOrderLst};
-    sal_Bool bReadOnly = !m_pController->isEditable();
+    bool bReadOnly = !m_pController->isEditable();
     for (size_t i = 0; i < sizeof(pControlsLst2)/sizeof(pControlsLst2[0]); ++i)
         pControlsLst2[i]->SetReadOnly(bReadOnly);
     m_aGroupIntervalEd.SetReadOnly(bReadOnly);
@@ -1377,7 +1377,7 @@ void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow)
 {
     sal_Int32 nGroupCount = m_xGroups->getCount();
     sal_Int32 nRowCount = m_pFieldExpression->GetRowCount();
-    sal_Bool bEnabled = nGroupCount > 1;
+    bool bEnabled = nGroupCount > 1;
 
     if (bEnabled && _nRow > 0 )
     {
@@ -1399,7 +1399,7 @@ void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow)
     sal_Int32 nGroupPos = m_pFieldExpression->getGroupPosition(_nRow);
     if ( nGroupPos != NO_GROUP )
     {
-        sal_Bool bEnableDelete = nGroupCount > 0;
+        bool bEnableDelete = nGroupCount > 0;
         m_aToolBox.EnableItem(SID_RPT_GROUPSORT_DELETE, bEnableDelete);
     }
     else
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 359c0109d7ef..fd2fbbf03152 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -807,7 +807,7 @@ void NavigatorTree::UserData::_propertyChanged(const beans::PropertyChangeEvent&
         {
             sal_Int32 nPos = 1;
             uno::Reference< report::XGroup> xGroup(_rEvent.Source,uno::UNO_QUERY);
-            ::std::mem_fun_t< sal_Bool,OGroupHelper> pIsOn = ::std::mem_fun(&OGroupHelper::getHeaderOn);
+            ::std::mem_fun_t< bool,OGroupHelper> pIsOn = ::std::mem_fun(&OGroupHelper::getHeaderOn);
             ::std::mem_fun_t< uno::Reference<report::XSection> ,OGroupHelper> pMemFunSection = ::std::mem_fun(&OGroupHelper::getHeader);
             if ( bFooterOn )
             {
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index a73c00934324..304d9f3cf936 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -65,7 +65,7 @@ class  OAddFieldWindow  :public FloatingWindow
     OUString                                                             m_aCommandName;
     OUString                                                             m_sFilter;
     sal_Int32                                                                   m_nCommandType;
-    sal_Bool                                                                    m_bEscapeProcessing;
+    bool                                                                    m_bEscapeProcessing;
     ::rtl::Reference< comphelper::OPropertyChangeMultiplexer>                   m_pChangeListener;
     ::rtl::Reference< comphelper::OContainerListenerAdapter>                    m_pContainerListener;
 
@@ -86,7 +86,7 @@ public:
 
     inline const OUString&       GetCommand()            const { return m_aCommandName; }
     inline sal_Int32                    GetCommandType()        const { return m_nCommandType; }
-    inline sal_Bool                     GetEscapeProcessing()   const { return m_bEscapeProcessing; }
+    inline bool                     GetEscapeProcessing()   const { return m_bEscapeProcessing; }
     inline void SetCreateHdl(const Link& _aCreateLink) { m_aCreateLink = _aCreateLink; }
 
     inline ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>  getColumns() const { return m_xColumns; }
diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx
index 351b702b7b85..9a2e7a16d5e2 100644
--- a/reportdesign/source/ui/inc/ColorListener.hxx
+++ b/reportdesign/source/ui/inc/ColorListener.hxx
@@ -39,8 +39,8 @@ namespace rptui
         OUString                     m_sColorEntry;
         sal_Int32                           m_nColor;
         sal_Int32                           m_nTextBoundaries;
-        sal_Bool                            m_bCollapsed;
-        sal_Bool                            m_bMarked;
+        bool                            m_bCollapsed;
+        bool                            m_bMarked;
 
         virtual void ImplInitSettings() = 0;
     protected:
@@ -56,14 +56,14 @@ namespace rptui
         /** set the marker as marked or not marked
             @param  _bMark  set the new state of the marker
         */
-        void    setMarked(sal_Bool _bMark);
+        void    setMarked(bool _bMark);
 
         /** returns if the section is marked
         */
-        inline sal_Bool isMarked() const { return m_bMarked; }
+        inline bool isMarked() const { return m_bMarked; }
 
         inline void     setCollapsedHdl(const Link& _aLink ){ m_aCollapsedLink = _aLink; }
-        inline sal_Bool isCollapsed() const { return m_bCollapsed; }
+        inline bool isCollapsed() const { return m_bCollapsed; }
 
         /** collapse or expand
          *
diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx
index 759b09156297..c4ae66d6d778 100644
--- a/reportdesign/source/ui/inc/DateTime.hxx
+++ b/reportdesign/source/ui/inc/DateTime.hxx
@@ -68,7 +68,7 @@ class ODateTimeDialog : public ModalDialog
     /** returns the number format key
         @param  _nNumberFormatIndex the number format index @see com::sun::star::i18n::NumberFormatIndex
     */
-    sal_Int32 getFormatKey(sal_Bool _bDate) const;
+    sal_Int32 getFormatKey(bool _bDate) const;
 
     DECL_LINK( CBClickHdl, CheckBox* );
     ODateTimeDialog(const ODateTimeDialog&);
diff --git a/reportdesign/source/ui/inc/DefaultInspection.hxx b/reportdesign/source/ui/inc/DefaultInspection.hxx
index 21807cf5db8c..234c338a4488 100644
--- a/reportdesign/source/ui/inc/DefaultInspection.hxx
+++ b/reportdesign/source/ui/inc/DefaultInspection.hxx
@@ -47,7 +47,7 @@ namespace rptui
         ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorModel > m_xComponent; /// delegatee
         bool                                                                                    m_bConstructed;
         bool                                                                                    m_bHasHelpSection;
-        sal_Bool                                                                                m_bIsReadOnly;
+        bool                                                                                m_bIsReadOnly;
         sal_Int32                                                                               m_nMinHelpTextLines;
         sal_Int32                                                                               m_nMaxHelpTextLines;
         /// access to property meta data
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index 4b2feec22f1c..61c4bc65d5bf 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -73,12 +73,12 @@ namespace rptui
         DlgEdMode                           m_eMode;
         sal_uInt16                              m_nCurrentPosition;
         sal_uInt16                              m_eActObj;
-        sal_Bool                                m_bFirstDraw;
+        bool                                m_bFirstDraw;
         Size                                m_aGridSizeCoarse;
         Size                                m_aGridSizeFine;
-        sal_Bool                                m_bGridVisible;
-        sal_Bool                                m_bGridSnap;
-        sal_Bool                                m_bDeleted;
+        bool                                m_bGridVisible;
+        bool                                m_bGridSnap;
+        bool                                m_bDeleted;
 
 
         DECL_LINK(MarkTimeout, void *);
@@ -130,7 +130,7 @@ namespace rptui
         *
         * \return <TRUE/> if paste is allowed
         */
-        sal_Bool IsPasteAllowed() const;
+        bool IsPasteAllowed() const;
 
         /** paste a new control in this section
         */
@@ -150,7 +150,7 @@ namespace rptui
         void            SelectAll(const sal_uInt16 _nObjectType);
 
         /// checks if a selection exists
-        sal_Bool            HasSelection() const;
+        bool            HasSelection() const;
 
         void            UpdatePropertyBrowserDelayed(OSectionView& _rView);
 
@@ -172,26 +172,26 @@ namespace rptui
 
         inline Size     getGridSizeCoarse() const { return m_aGridSizeCoarse; }
         inline Size     getGridSizeFine() const { return m_aGridSizeFine; }
-        inline sal_Bool     isGridSnap() const { return m_bGridSnap; }
-        void            setGridSnap(sal_Bool bOn);
-        void            setDragStripes(sal_Bool bOn);
+        inline bool     isGridSnap() const { return m_bGridSnap; }
+        void            setGridSnap(bool bOn);
+        void            setDragStripes(bool bOn);
         /** turns the grid on or off
         *
         * \param _bGridVisible
         */
-        void            toggleGrid(sal_Bool _bGridVisible);
+        void            toggleGrid(bool _bGridVisible);
 
         void            togglePropertyBrowser(bool _bToogleOn);
 
-        sal_Bool            isAddFieldVisible() const;
+        bool            isAddFieldVisible() const;
         void            toggleAddField();
 
-        sal_Bool            isReportExplorerVisible() const;
+        bool            isReportExplorerVisible() const;
         void            toggleReportExplorer();
 
         /** shows or hides the ruler.
         */
-        void            showRuler(sal_Bool _bShow);
+        void            showRuler(bool _bShow);
 
         /** unmark all objects on the views without the given one.
         *
@@ -237,21 +237,21 @@ namespace rptui
             @param  _rCode  the keycode
             @return <TRUE/> if the keycode is handled otherwise <FALSE/>
         */
-        sal_Bool         handleKeyEvent(const KeyEvent& _rEvent);
+        bool         handleKeyEvent(const KeyEvent& _rEvent);
 
         /** set the section as marked or not marked
             @param  _pSectionView   the section where to set the marked flag
             @param  _bMark  the marked flag
         */
-        void            setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,sal_Bool _bMark);
-        void            setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,sal_Bool _bMark);
+        void            setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,bool _bMark);
+        void            setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,bool _bMark);
 
         /** returns if the view handles the event by itself
         *
         * \param _nId the command id
         * \return  <FALSE/> is the event is not handled by the view otherwise <TRUE/>
         */
-        sal_Bool        isHandleEvent(sal_uInt16 _nId) const;
+        bool        isHandleEvent(sal_uInt16 _nId) const;
 
         sal_uInt32      getMarkedObjectCount() const;
 
diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx
index b176f1cdcd90..9a429b55b4ca 100644
--- a/reportdesign/source/ui/inc/GeometryHandler.hxx
+++ b/reportdesign/source/ui/inc/GeometryHandler.hxx
@@ -48,8 +48,8 @@ namespace rptui
         OUString                                     m_sName;
         OUString                                     m_sSearchString;
         OUString                                     m_sFormula;
-        sal_Bool                                          m_bPreEvaluated;
-        sal_Bool                                          m_bDeepTraversing;
+        bool                                          m_bPreEvaluated;
+        bool                                          m_bDeepTraversing;
 
         inline OUString getName() const { return m_sName; }
     } ;
@@ -90,21 +90,21 @@ namespace rptui
         */
         sal_uInt32 impl_getDataFieldType_throw(const OUString& _sDataField = OUString()) const;
 
-        ::com::sun::star::uno::Any getConstantValue(sal_Bool bToControlValue,sal_uInt16 nResId,const ::com::sun::star::uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName );
+        ::com::sun::star::uno::Any getConstantValue(bool bToControlValue,sal_uInt16 nResId,const ::com::sun::star::uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName );
         ::com::sun::star::beans::Property getProperty(const OUString & PropertyName);
         void implCreateListLikeControl(
                 const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory
                 ,::com::sun::star::inspection::LineDescriptor & out_Descriptor
                 ,sal_uInt16 _nResId
-                ,sal_Bool _bReadOnlyControl
-                ,sal_Bool _bTrueIfListBoxFalseIfComboBox
+                ,bool _bReadOnlyControl
+                ,bool _bTrueIfListBoxFalseIfComboBox
             );
         void implCreateListLikeControl(
                 const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory
                 ,::com::sun::star::inspection::LineDescriptor & out_Descriptor
                 ,const ::std::vector< OUString>& _aEntries
-                ,sal_Bool _bReadOnlyControl
-                ,sal_Bool _bTrueIfListBoxFalseIfComboBox
+                ,bool _bReadOnlyControl
+                ,bool _bTrueIfListBoxFalseIfComboBox
             );
         void checkPosAndSize(   const ::com::sun::star::awt::Point& _aNewPos,
                                 const ::com::sun::star::awt::Size& _aSize);
@@ -190,7 +190,7 @@ namespace rptui
         * \param _bSet If set to sal_True than the m_sDefaultFunction and m_sScope vars will be set if successful.
         * \return sal_True with known otherwise sal_False
         */
-        sal_Bool isDefaultFunction(const OUString& _sQuotedFunction
+        bool isDefaultFunction(const OUString& _sQuotedFunction
                                     ,OUString& _Out_rDataField
                                     ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier>& _xFunctionsSupplier = ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier>()
                                     ,bool _bSet = false) const;
@@ -202,7 +202,7 @@ namespace rptui
         * \param _rsDefaultFunctionName
         * \return
         */
-        sal_Bool impl_isDefaultFunction_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction>& _xFunction
+        bool impl_isDefaultFunction_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction>& _xFunction
                                             ,OUString& _rDataField
                                             ,OUString& _rsDefaultFunctionName) const;
 
diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx
index 66e434ae7984..36d94bdcd1d7 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.hxx
@@ -89,7 +89,7 @@ class OGroupsSortingDialog :    public FloatingWindow
     ::rtl::Reference< comphelper::OPropertyChangeMultiplexer>                       m_pReportListener;
     ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups>            m_xGroups;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >    m_xColumns;
-    sal_Bool                                m_bReadOnly;
+    bool                                m_bReadOnly;
 private:
     DECL_LINK( OnControlFocusLost, Control* );
     DECL_LINK( OnControlFocusGot, Control* );
@@ -119,7 +119,7 @@ private:
 
     /** returns <TRUE/> when the dialog should be read only
     */
-    sal_Bool isReadOnly( ) const;
+    bool isReadOnly( ) const;
 
     /** returns the data type for the given column name
         @param _sColumnName
@@ -153,7 +153,7 @@ protected:
     virtual void    _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
 public:
     OGroupsSortingDialog( Window* pParent
-                        ,sal_Bool _bReadOnly
+                        ,bool _bReadOnly
                         ,::rptui::OReportController* _pController);
     virtual ~OGroupsSortingDialog();
 
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index 95e5eff51cce..56fdfe41a772 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -121,12 +121,12 @@ namespace rptui
         ::sal_Int64             m_nAspect;
         sal_Int16               m_nZoomValue;
         SvxZoomType             m_eZoomType;
-        sal_Bool                m_bShowRuler;
-        sal_Bool                m_bGridVisible;
-        sal_Bool                m_bGridUse;
-        sal_Bool                m_bShowProperties;
-        sal_Bool                m_bGroupFloaterWasVisible;
-        sal_Bool                m_bHelplinesMove;
+        bool                m_bShowRuler;
+        bool                m_bGridVisible;
+        bool                m_bGridUse;
+        bool                m_bShowProperties;
+        bool                m_bGroupFloaterWasVisible;
+        bool                m_bHelplinesMove;
         bool                    m_bChartEnabled;
         bool                    m_bChartEnabledAsked;
         bool                    m_bInGeneratePreview;
@@ -349,7 +349,7 @@ namespace rptui
             @param  _nCommand   the command id
             @param  _xControlFormat the report control format
         */
-        sal_Bool                            isFormatCommandEnabled(sal_uInt16 _nCommand
+        bool                                isFormatCommandEnabled(sal_uInt16 _nCommand
                                                 ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlFormat>& _xControlFormat) const;
 
         virtual bool                        Construct(Window* pParent) SAL_OVERRIDE;
diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
index 125f4fabb60d..a98790b23ad5 100644
--- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx
+++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
@@ -94,7 +94,7 @@ namespace rptui
 
         void Lock();
         void UnLock();
-        sal_Bool IsLocked() const;
+        bool IsLocked() const;
 
         void Clear();
     private:
diff --git a/reportdesign/source/ui/inc/ReportRuler.hxx b/reportdesign/source/ui/inc/ReportRuler.hxx
index 75519ca181db..dc3c394f4d6c 100644
--- a/reportdesign/source/ui/inc/ReportRuler.hxx
+++ b/reportdesign/source/ui/inc/ReportRuler.hxx
@@ -30,7 +30,7 @@ namespace rptui
     {
         OReportSection*     m_pSection;
         OReportWindow*      m_pParent;
-        sal_Bool            m_bShow;
+        bool            m_bShow;
         OReportRuler(OReportRuler&);
         void operator =(OReportRuler&);
     public:
diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx
index e282695c9734..08e939b5956e 100644
--- a/reportdesign/source/ui/inc/ReportSection.hxx
+++ b/reportdesign/source/ui/inc/ReportSection.hxx
@@ -54,8 +54,8 @@ namespace rptui
         sal_Int32                   m_nPaintEntranceCount;
 
         DlgEdMode                   m_eMode;
-        sal_Bool                        m_bDialogModelChanged;
-        sal_Bool                    m_bInDrag;
+        bool                        m_bDialogModelChanged;
+        bool                    m_bInDrag;
 
         /** fills the section with all control from the report section
         */
@@ -113,15 +113,15 @@ namespace rptui
         *
         * \param _bVisible when <TRUE/> the grid is made visible
         */
-        void SetGridVisible(sal_Bool _bVisible);
+        void SetGridVisible(bool _bVisible);
 
         inline OSectionWindow*      getSectionWindow() const { return m_pParent; }
         inline OSectionView&        getSectionView() const { return *m_pView; }
         inline OReportPage*         getPage() const { return m_pPage; }
         inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getSection() const { return m_xSection; }
 
-        void            SetDialogModelChanged( sal_Bool bChanged = sal_True ) { m_bDialogModelChanged = bChanged; }
-        sal_Bool            IsDialogModelChanged() const { return m_bDialogModelChanged; }
+        void            SetDialogModelChanged( bool bChanged = true ) { m_bDialogModelChanged = bChanged; }
+        bool            IsDialogModelChanged() const { return m_bDialogModelChanged; }
         DlgEdMode       GetMode() const { return m_eMode; }
         void            SetMode( DlgEdMode m_eMode );
 
@@ -129,7 +129,7 @@ namespace rptui
             @param  _rCode  the keycode
             @return <TRUE/> if the keycode is handled otherwise <FALSE/>
         */
-        sal_Bool        handleKeyEvent(const KeyEvent& _rEvent);
+        bool            handleKeyEvent(const KeyEvent& _rEvent);
 
         /** returns the current control report model or <NULL/>
         */
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx
index 7dcb6453c80a..e50795684109 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.hxx
@@ -79,9 +79,9 @@ namespace rptui
 
         void            SetMode( DlgEdMode m_eMode );
         void            SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType = OUString());
-        OUString   GetInsertObjString() const;
-        void            setGridSnap(sal_Bool bOn);
-        void            setDragStripes(sal_Bool bOn);
+        OUString        GetInsertObjString() const;
+        void            setGridSnap(bool bOn);
+        void            setDragStripes(bool bOn);
 
         /** copies the current selection in this section
         */
@@ -91,7 +91,7 @@ namespace rptui
         *
         * \return <TRUE/> if paste is allowed
         */
-        sal_Bool IsPasteAllowed() const;
+        bool IsPasteAllowed() const;
 
         /** paste a new control in this section
         */
@@ -108,7 +108,7 @@ namespace rptui
 
         /** returns <TRUE/> when a object is marked
         */
-        sal_Bool HasSelection() const;
+        bool HasSelection() const;
 
         Point           getThumbPos() const;
 
@@ -132,12 +132,12 @@ namespace rptui
         *
         * \param _bVisible
         */
-        void            toggleGrid(sal_Bool _bVisible);
+        void            toggleGrid(bool _bVisible);
 
 
         /** shows the ruler
         */
-        void            showRuler(sal_Bool _bShow);
+        void            showRuler(bool _bShow);
 
         inline sal_Int32 getRulerHeight() const { return m_aHRuler.GetSizePixel().Height(); }
 
@@ -150,7 +150,7 @@ namespace rptui
         * @param _bWithEnd  if <TRUE/> the end marker will be used for calculation as well otherwise not.
         * \return the max width
         */
-        sal_Int32       getMaxMarkerWidth(sal_Bool _bWithEnd) const;
+        sal_Int32       getMaxMarkerWidth(bool _bWithEnd) const;
 
         void            ScrollChildren(const Point& _aThumbPos);
 
@@ -171,15 +171,15 @@ namespace rptui
             @param  _rCode  the keycode
             @return <TRUE/> if the keycode is handled otherwise <FALSE/>
         */
-        sal_Bool        handleKeyEvent(const KeyEvent& _rEvent);
+        bool            handleKeyEvent(const KeyEvent& _rEvent);
 
         /** the section as marked or not marked
             @param  _pSectionView   the section where to set the marked flag
             @param  _bMark  the marked flag
         */
-        void            setMarked(OSectionView* _pSectionView,sal_Bool _bMark);
-        void            setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,sal_Bool _bMark);
-        void            setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,sal_Bool _bMark);
+        void            setMarked(OSectionView* _pSectionView, bool _bMark);
+        void            setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection, bool _bMark);
+        void            setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape, bool _bMark);
 
         // IMarkedSection
         ::boost::shared_ptr<OSectionWindow> getMarkedSection(NearSectionAccess nsa = CURRENT) const SAL_OVERRIDE;
diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index 374370d9474f..973dbac1c978 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -89,9 +89,9 @@ namespace rptui
         // forwards
         void                    SetMode( DlgEdMode _eMode );
         void                    SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType = OUString());
-        OUString           GetInsertObjString() const;
-        void                    setGridSnap(sal_Bool bOn);
-        void                    setDragStripes(sal_Bool bOn);
+        OUString                GetInsertObjString() const;
+        void                    setGridSnap(bool bOn);
+        void                    setDragStripes(bool bOn);
         /** copies the current selection in this section
         */
         void Copy();
@@ -100,7 +100,7 @@ namespace rptui
         *
         * \return <TRUE/> if paste is allowed
         */
-        sal_Bool IsPasteAllowed() const;
+        bool IsPasteAllowed() const;
 
         /** paste a new control in this section
         */
@@ -117,7 +117,7 @@ namespace rptui
 
         /** returns <TRUE/> when a object is marked
         */
-        sal_Bool HasSelection() const;
+        bool HasSelection() const;
 
         /** removes the section at the given position.
         *
@@ -139,7 +139,7 @@ namespace rptui
         *
         * \param _bVisible
         */
-        void                    toggleGrid(sal_Bool _bVisible);
+        void                    toggleGrid(bool _bVisible);
 
         /** unmark all objects on the views without the given one.
         *
@@ -149,28 +149,28 @@ namespace rptui
 
         /** shows or hides the ruler.
         */
-        void                    showRuler(sal_Bool _bShow);
+        void                    showRuler(bool _bShow);
 
         /** calculate the max width of the markers
         *
         * @param _bWithEnd  if <TRUE/> the end marker will be used for calculation as well otherwise not.
         * \return the max width
         */
-        sal_Int32               getMaxMarkerWidth(sal_Bool _bWithEnd) const;
+        sal_Int32               getMaxMarkerWidth(bool _bWithEnd) const;
 
         /** checks if the keycode is known by the child windows
             @param  _rCode  the keycode
             @return <TRUE/> if the keycode is handled otherwise <FALSE/>
         */
-        sal_Bool                handleKeyEvent(const KeyEvent& _rEvent);
+        bool                    handleKeyEvent(const KeyEvent& _rEvent);
 
         /** the section as marked or not marked
             @param  _pSectionView   the section where to set the marked flag
             @param  _bMark  the marked flag
         */
-        void                    setMarked(OSectionView* _pSectionView,sal_Bool _bMark);
-        void                    setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,sal_Bool _bMark);
-        void                    setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,sal_Bool _bMark);
+        void                    setMarked(OSectionView* _pSectionView, bool _bMark);
+        void                    setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection, bool _bMark);
+        void                    setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape, bool _bMark);
 
         // IMarkedSection
         ::boost::shared_ptr<OSectionWindow> getMarkedSection(NearSectionAccess nsa = CURRENT) const SAL_OVERRIDE;
diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx
index 8db95362e304..14f1a6bf72d4 100644
--- a/reportdesign/source/ui/inc/SectionWindow.hxx
+++ b/reportdesign/source/ui/inc/SectionWindow.hxx
@@ -67,7 +67,7 @@ namespace rptui
         * \param _pIsSectionOn
         * @return sal_True when title was set otherwise FALSE
         */
-        bool setGroupSectionTitle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup,sal_uInt16 _nResId,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OGroupHelper> _pGetSection,::std::mem_fun_t<sal_Bool, OGroupHelper> _pIsSectionOn);
+        bool setGroupSectionTitle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup,sal_uInt16 _nResId,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OGroupHelper> _pGetSection,::std::mem_fun_t<bool, OGroupHelper> _pIsSectionOn);
 
         /** set the title of the (report/page) header or footer
         *
@@ -77,7 +77,7 @@ namespace rptui
         * \param _pIsSectionOn
         * @return sal_True when title was set otherwise FALSE
         */
-        bool setReportSectionTitle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,sal_uInt16 _nResId,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OReportHelper> _pGetSection,::std::mem_fun_t<sal_Bool, OReportHelper> _pIsSectionOn);
+        bool setReportSectionTitle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,sal_uInt16 _nResId,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OReportHelper> _pGetSection,::std::mem_fun_t<bool, OReportHelper> _pIsSectionOn);
         void ImplInitSettings();
 
         DECL_LINK(Collapsed,OColorListener*);
@@ -103,17 +103,17 @@ namespace rptui
         inline OEndMarker&      getEndMarker()      { return m_aEndMarker;       }
         inline OViewsWindow*    getViewsWindow()    { return m_pParent;          }
 
-        void    setCollapsed(sal_Bool _bCollapsed);
+        void    setCollapsed(bool _bCollapsed);
 
         /** triggers the property browser with the section
             @param  _pStartMarker
         */
-        void            showProperties();
+        void    showProperties();
 
         /** set the marker as marked or not marked
             @param  _bMark  set the new state of the marker
         */
-        void    setMarked(sal_Bool _bMark);
+        void    setMarked(bool _bMark);
 
         OViewsWindow* getViewsWindow() const { return m_pParent; }
 
diff --git a/reportdesign/source/ui/inc/StartMarker.hxx b/reportdesign/source/ui/inc/StartMarker.hxx
index 2ae119348a87..361f72a809b1 100644
--- a/reportdesign/source/ui/inc/StartMarker.hxx
+++ b/reportdesign/source/ui/inc/StartMarker.hxx
@@ -39,7 +39,7 @@ namespace rptui
         static Image*               s_pDefExpanded;
         static oslInterlockedCount  s_nImageRefCount; /// When 0 all static images will be destroyed
 
-        sal_Bool                    m_bShowRuler;
+        bool                    m_bShowRuler;
 
         void changeImage();
         void initDefaultNodeImages();
@@ -65,7 +65,7 @@ namespace rptui
 
         /** shows or hides the ruler.
         */
-        void            showRuler(sal_Bool _bShow);
+        void            showRuler(bool _bShow);
 
         virtual void    setCollapsed(sal_Bool _bCollapsed) SAL_OVERRIDE;
 
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index e074cadeb146..02d7fbe4fd69 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -129,7 +129,7 @@ namespace rptui
         svtools::ColorConfig                    m_aColorConfig;
         OReportWindow*                          m_pParent;
         OUString                         m_sShapeType;
-        sal_Bool                                m_bInUnmark;
+        bool                                m_bInUnmark;
 
         void ImplInitSettings();
         /** returns the iterator at pos _nPos or the end()
@@ -191,9 +191,9 @@ namespace rptui
         *
         * \param _bVisible
         */
-        void            toggleGrid(sal_Bool _bVisible);
-        void            setGridSnap(sal_Bool bOn);
-        void            setDragStripes(sal_Bool bOn);
+        void            toggleGrid(bool _bVisible);
+        void            setGridSnap(bool bOn);
+        void            setDragStripes(bool bOn);
 
         /** returns the total accumulated height of all sections until _pSection is reached
         */
@@ -211,7 +211,7 @@ namespace rptui
         *
         * \return <TRUE/> if paste is allowed
         */
-        sal_Bool IsPasteAllowed() const;
+        bool IsPasteAllowed() const;
 
         /** paste a new control in this section
         */
@@ -228,7 +228,7 @@ namespace rptui
 
         /** returns <TRUE/> when a object is marked
         */
-        sal_Bool HasSelection() const;
+        bool HasSelection() const;
 
         /** unmark all objects on the views without the given one.
         *
@@ -245,15 +245,15 @@ namespace rptui
             @param  _rCode  the keycode
             @return <TRUE/> if the keycode is handled otherwise <FALSE/>
         */
-        sal_Bool        handleKeyEvent(const KeyEvent& _rEvent);
+        bool            handleKeyEvent(const KeyEvent& _rEvent);
 
         /** the section as marked or not marked
             @param  _pSectionView   the section where to set the marked flag
             @param  _bMark  the marked flag
         */
-        void            setMarked(OSectionView* _pSectionView,sal_Bool _bMark);
-        void            setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,sal_Bool _bMark);
-        void            setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,sal_Bool _bMark);
+        void            setMarked(OSectionView* _pSectionView, bool _bMark);
+        void            setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection, bool _bMark);
+        void            setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape, bool _bMark);
 
         // IMarkedSection
         ::boost::shared_ptr<OSectionWindow> getMarkedSection(NearSectionAccess nsa = CURRENT) const SAL_OVERRIDE;
@@ -270,7 +270,7 @@ namespace rptui
 
         /** shows or hides the ruler.
         */
-        void showRuler(sal_Bool _bShow);
+        void showRuler(bool _bShow);
 
         /** returns the currently set shape type.
         *
@@ -296,12 +296,12 @@ namespace rptui
         bool isObjectInMyTempList(SdrObject *);
     public:
         void BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionView* _pSection);
-        void EndDragObj(sal_Bool _bDragIntoNewSection,const OSectionView* _pSection,const Point& _aPnt);
+        void EndDragObj(bool _bDragIntoNewSection,const OSectionView* _pSection,const Point& _aPnt);
 
         void EndAction();
         void ForceMarkedToAnotherPage();
-        sal_Bool IsAction() const;
-        sal_Bool IsDragObj() const;
+        bool IsAction() const;
+        bool IsDragObj() const;
         void handleKey(const KeyCode& _rCode);
         void stopScrollTimer();
 
diff --git a/reportdesign/source/ui/inc/dlgedclip.hxx b/reportdesign/source/ui/inc/dlgedclip.hxx
index 9c448a29fc7b..4ac25e4bf888 100644
--- a/reportdesign/source/ui/inc/dlgedclip.hxx
+++ b/reportdesign/source/ui/inc/dlgedclip.hxx
@@ -52,7 +52,7 @@ public:
             available flavors
     * \return
     */
-    static sal_Bool         canExtract(const DataFlavorExVector& _rFlavors);
+    static bool         canExtract(const DataFlavorExVector& _rFlavors);
 
     /** extract the section elements
     *
diff --git a/reportdesign/source/ui/inc/dlgedfunc.hxx b/reportdesign/source/ui/inc/dlgedfunc.hxx
index 3b22777b5637..dc01897f1e74 100644
--- a/reportdesign/source/ui/inc/dlgedfunc.hxx
+++ b/reportdesign/source/ui/inc/dlgedfunc.hxx
@@ -85,15 +85,15 @@ public:
     DlgEdFunc( OReportSection* pParent );
     virtual ~DlgEdFunc();
 
-    virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt );
-    virtual sal_Bool MouseButtonUp( const MouseEvent& rMEvt );
-    virtual sal_Bool MouseMove( const MouseEvent& rMEvt );
+    virtual bool MouseButtonDown( const MouseEvent& rMEvt );
+    virtual bool MouseButtonUp( const MouseEvent& rMEvt );
+    virtual bool MouseMove( const MouseEvent& rMEvt );
 
     /** checks if the keycode is known by the child windows
         @param  _rCode  the keycode
         @return <TRUE/> if the keycode is handled otherwise <FALSE/>
     */
-    virtual sal_Bool    handleKeyEvent(const KeyEvent& _rEvent);
+    virtual bool    handleKeyEvent(const KeyEvent& _rEvent);
 
     /** returns <TRUE/> if the mouse event is over an existing object
     *
@@ -126,9 +126,9 @@ public:
     DlgEdFuncInsert( OReportSection* pParent );
     virtual ~DlgEdFuncInsert();
 
-    virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-    virtual sal_Bool MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-    virtual sal_Bool MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual bool MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual bool MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual bool MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
 };
 
 
@@ -141,11 +141,11 @@ public:
     DlgEdFuncSelect( OReportSection* pParent );
     virtual ~DlgEdFuncSelect();
 
-    virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-    virtual sal_Bool MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-    virtual sal_Bool MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual bool MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual bool MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual bool MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
 
-    void SetInEditMode(SdrTextObj* _pTextObj,const MouseEvent& rMEvt, sal_Bool bQuickDrag);
+    void SetInEditMode(SdrTextObj* _pTextObj,const MouseEvent& rMEvt, bool bQuickDrag);
 };
 
 }
diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx
index 051fc9a98c3b..360cb4c58355 100644
--- a/reportdesign/source/ui/inc/propbrw.hxx
+++ b/reportdesign/source/ui/inc/propbrw.hxx
@@ -60,7 +60,7 @@ private:
     OUString     m_sLastActivePage;
     ODesignView*        m_pDesignView;
     OSectionView*       m_pView;
-    sal_Bool            m_bInitialStateChange;
+    bool            m_bInitialStateChange;
 
     PropBrw(PropBrw&);
     void operator =(PropBrw&);
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index 7e44d3d8a23d..0757d8859775 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -152,7 +152,7 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface
             aPropertyMediation.insert( TPropertyNamePair::value_type( PROPERTY_MASTERFIELDS, TPropertyConverter(PROPERTY_MASTERFIELDS,aNoConverter) ) );
             aPropertyMediation.insert( TPropertyNamePair::value_type( PROPERTY_DETAILFIELDS, TPropertyConverter(PROPERTY_DETAILFIELDS,aNoConverter) ) );
 
-            m_xMasterDetails = new OPropertyMediator( m_xDataProvider.get(), m_xReportComponent.get(), aPropertyMediation,sal_True );
+            m_xMasterDetails = new OPropertyMediator( m_xDataProvider.get(), m_xReportComponent.get(), aPropertyMediation,true );
         }
     }
     catch(const uno::Exception &)
@@ -445,7 +445,7 @@ void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const OUString & Act
             InspectorUI->enablePropertyUIElements( PROPERTY_DETAILFIELDS, inspection::PropertyLineElement::PrimaryButton, bDoEnableMasterDetailFields );
             InspectorUI->enablePropertyUIElements( PROPERTY_MASTERFIELDS, inspection::PropertyLineElement::PrimaryButton, bDoEnableMasterDetailFields );
 
-            sal_Bool bModified = xReport->isModified();
+            bool bModified = xReport->isModified();
             // this fills the chart again
             ::comphelper::NamedValueCollection aArgs;
             aArgs.put( "CellRangeRepresentation", uno::makeAny( OUString( "all" ) ) );
diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx
index 27ca99d89860..792b64c21c6e 100644
--- a/reportdesign/source/ui/inspection/DefaultInspection.cxx
+++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx
@@ -55,7 +55,7 @@ namespace rptui
         :m_xContext( _rxContext )
         ,m_bConstructed( false )
         ,m_bHasHelpSection( false )
-        ,m_bIsReadOnly(sal_False)
+        ,m_bIsReadOnly(false)
         ,m_nMinHelpTextLines( 3 )
         ,m_nMaxHelpTextLines( 8 )
         ,m_pInfoService(new OPropertyInfoService())
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index b255925d7f4e..2332cb028747 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -679,8 +679,8 @@ void GeometryHandler::implCreateListLikeControl(
         const uno::Reference< inspection::XPropertyControlFactory >& _rxControlFactory
         ,inspection::LineDescriptor & out_Descriptor
         ,sal_uInt16 _nResId
-        ,sal_Bool _bReadOnlyControl
-        ,sal_Bool _bTrueIfListBoxFalseIfComboBox
+        ,bool _bReadOnlyControl
+        ,bool _bTrueIfListBoxFalseIfComboBox
     )
 {
     ::std::vector< OUString > aList;
@@ -693,8 +693,8 @@ void GeometryHandler::implCreateListLikeControl(
         const uno::Reference< inspection::XPropertyControlFactory >& _rxControlFactory
         ,inspection::LineDescriptor & out_Descriptor
         ,const ::std::vector< OUString>& _aEntries
-        ,sal_Bool _bReadOnlyControl
-        ,sal_Bool _bTrueIfListBoxFalseIfComboBox
+        ,bool _bReadOnlyControl
+        ,bool _bTrueIfListBoxFalseIfComboBox
     )
 {
     const uno::Reference< inspection::XStringListControl > xListControl(
@@ -717,38 +717,38 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
     {
         case PROPERTY_ID_FORCENEWPAGE:
         case PROPERTY_ID_NEWROWORCOL:
-            implCreateListLikeControl(_xControlFactory,aOut,RID_STR_FORCENEWPAGE_CONST,sal_False,sal_True);
+            implCreateListLikeControl(_xControlFactory,aOut,RID_STR_FORCENEWPAGE_CONST,false,true);
             break;
         case PROPERTY_ID_GROUPKEEPTOGETHER:
-            implCreateListLikeControl(_xControlFactory,aOut,RID_STR_GROUPKEEPTOGETHER_CONST,sal_False,sal_True);
+            implCreateListLikeControl(_xControlFactory,aOut,RID_STR_GROUPKEEPTOGETHER_CONST,false,true);
             break;
         case PROPERTY_ID_PAGEHEADEROPTION:
         case PROPERTY_ID_PAGEFOOTEROPTION:
-            implCreateListLikeControl(_xControlFactory,aOut,RID_STR_REPORTPRINTOPTION_CONST,sal_False,sal_True);
+            implCreateListLikeControl(_xControlFactory,aOut,RID_STR_REPORTPRINTOPTION_CONST,false,true);
             break;
         case PROPERTY_ID_FORMULALIST:
             {
                 ::std::vector< OUString > aList;
                 impl_fillFormulaList_nothrow(aList);
-                implCreateListLikeControl(_xControlFactory,aOut,aList,sal_False,sal_True);
+                implCreateListLikeControl(_xControlFactory,aOut,aList,false,true);
             }
             break;
         case PROPERTY_ID_SCOPE:
             {
                 ::std::vector< OUString > aList;
                 impl_fillScopeList_nothrow(aList);
-                implCreateListLikeControl(_xControlFactory,aOut,aList,sal_False,sal_True);
+                implCreateListLikeControl(_xControlFactory,aOut,aList,false,true);
             }
             break;
         case PROPERTY_ID_MIMETYPE:
             {
                 ::std::vector< OUString > aList;
                 impl_fillMimeTypes_nothrow(aList);
-                implCreateListLikeControl(_xControlFactory,aOut,aList,sal_False,sal_True);
+                implCreateListLikeControl(_xControlFactory,aOut,aList,false,true);
             }
             break;
         case PROPERTY_ID_TYPE:
-            implCreateListLikeControl(_xControlFactory,aOut,RID_STR_TYPE_CONST,sal_False,sal_True);
+            implCreateListLikeControl(_xControlFactory,aOut,RID_STR_TYPE_CONST,false,true);
             break;
         case PROPERTY_ID_VISIBLE:
         case PROPERTY_ID_CANGROW:
@@ -768,7 +768,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
                 sal_uInt16 nResId = RID_STR_BOOL;
                 if ( PROPERTY_ID_KEEPTOGETHER == nId && uno::Reference< report::XGroup>(m_xReportComponent,uno::UNO_QUERY).is())
                     nResId = RID_STR_KEEPTOGETHER_CONST;
-                implCreateListLikeControl(_xControlFactory,aOut,nResId,sal_False,sal_True);
+                implCreateListLikeControl(_xControlFactory,aOut,nResId,false,true);
             }
             break;
         case PROPERTY_ID_INITIALFORMULA:
@@ -830,10 +830,10 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
             aOut.HasPrimaryButton = sal_True;
             break;
         case PROPERTY_ID_VERTICALALIGN:
-            implCreateListLikeControl(_xControlFactory,aOut,RID_STR_VERTICAL_ALIGN_CONST,sal_False,sal_True);
+            implCreateListLikeControl(_xControlFactory,aOut,RID_STR_VERTICAL_ALIGN_CONST,false,true);
             break;
         case PROPERTY_ID_PARAADJUST:
-            implCreateListLikeControl(_xControlFactory,aOut,RID_STR_PARAADJUST_CONST,sal_False,sal_True);
+            implCreateListLikeControl(_xControlFactory,aOut,RID_STR_PARAADJUST_CONST,false,true);
             break;
         default:
             {
@@ -927,7 +927,7 @@ beans::Property GeometryHandler::getProperty(const OUString & PropertyName)
         return beans::Property();
     return *pFind;
 }
-uno::Any GeometryHandler::getConstantValue(sal_Bool _bToControlValue,sal_uInt16 _nResId,const uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName )
+uno::Any GeometryHandler::getConstantValue(bool _bToControlValue,sal_uInt16 _nResId,const uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName )
 {
     ::std::vector< OUString > aList;
     tools::StringListResource aRes(ModuleRes(_nResId),aList);
@@ -957,14 +957,14 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope
     {
         case PROPERTY_ID_FORCENEWPAGE:
         case PROPERTY_ID_NEWROWORCOL:
-            aPropertyValue = getConstantValue(sal_False,RID_STR_FORCENEWPAGE_CONST,_rControlValue,OUString("com.sun.star.report.ForceNewPage"),PropertyName);
+            aPropertyValue = getConstantValue(false,RID_STR_FORCENEWPAGE_CONST,_rControlValue,OUString("com.sun.star.report.ForceNewPage"),PropertyName);
             break;
         case PROPERTY_ID_GROUPKEEPTOGETHER:
-            aPropertyValue = getConstantValue(sal_False,RID_STR_GROUPKEEPTOGETHER_CONST,_rControlValue,OUString("com.sun.star.report.GroupKeepTogether"),PropertyName);
+            aPropertyValue = getConstantValue(false,RID_STR_GROUPKEEPTOGETHER_CONST,_rControlValue,OUString("com.sun.star.report.GroupKeepTogether"),PropertyName);
             break;
         case PROPERTY_ID_PAGEHEADEROPTION:
         case PROPERTY_ID_PAGEFOOTEROPTION:
-            aPropertyValue = getConstantValue(sal_False,RID_STR_REPORTPRINTOPTION_CONST,_rControlValue,OUString("com.sun.star.report.ReportPrintOption"),PropertyName);
+            aPropertyValue = getConstantValue(false,RID_STR_REPORTPRINTOPTION_CONST,_rControlValue,OUString("com.sun.star.report.ReportPrintOption"),PropertyName);
             break;
         case PROPERTY_ID_BACKCOLOR:
         case PROPERTY_ID_CONTROLBACKGROUND:
@@ -978,7 +978,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope
         case PROPERTY_ID_KEEPTOGETHER:
             if ( uno::Reference< report::XGroup>(m_xReportComponent,uno::UNO_QUERY).is())
             {
-                aPropertyValue = getConstantValue(sal_False,RID_STR_KEEPTOGETHER_CONST,_rControlValue,OUString("com.sun.star.report.KeepTogether"),PropertyName);
+                aPropertyValue = getConstantValue(false,RID_STR_KEEPTOGETHER_CONST,_rControlValue,OUString("com.sun.star.report.KeepTogether"),PropertyName);
                 break;
             }
             // run through
@@ -1122,19 +1122,19 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const OUString & Proper
             break;
         case PROPERTY_ID_FORCENEWPAGE:
         case PROPERTY_ID_NEWROWORCOL:
-            aControlValue = getConstantValue(sal_True,RID_STR_FORCENEWPAGE_CONST,aPropertyValue,OUString("com.sun.star.report.ForceNewPage"),PropertyName);
+            aControlValue = getConstantValue(true,RID_STR_FORCENEWPAGE_CONST,aPropertyValue,OUString("com.sun.star.report.ForceNewPage"),PropertyName);
             break;
         case PROPERTY_ID_GROUPKEEPTOGETHER:
-            aControlValue = getConstantValue(sal_True,RID_STR_GROUPKEEPTOGETHER_CONST,aPropertyValue,OUString("com.sun.star.report.GroupKeepTogether"),PropertyName);
+            aControlValue = getConstantValue(true,RID_STR_GROUPKEEPTOGETHER_CONST,aPropertyValue,OUString("com.sun.star.report.GroupKeepTogether"),PropertyName);
             break;
         case PROPERTY_ID_PAGEHEADEROPTION:
         case PROPERTY_ID_PAGEFOOTEROPTION:
-            aControlValue = getConstantValue(sal_True,RID_STR_REPORTPRINTOPTION_CONST,aPropertyValue,OUString("com.sun.star.report.ReportPrintOption"),PropertyName);
+            aControlValue = getConstantValue(true,RID_STR_REPORTPRINTOPTION_CONST,aPropertyValue,OUString("com.sun.star.report.ReportPrintOption"),PropertyName);
             break;
         case PROPERTY_ID_KEEPTOGETHER:
             if ( uno::Reference< report::XGroup>(m_xReportComponent,uno::UNO_QUERY).is())
             {
-                aControlValue = getConstantValue(sal_True,RID_STR_KEEPTOGETHER_CONST,aPropertyValue,OUString("com.sun.star.report.KeepTogether"),PropertyName);
+                aControlValue = getConstantValue(true,RID_STR_KEEPTOGETHER_CONST,aPropertyValue,OUString("com.sun.star.report.KeepTogether"),PropertyName);
                 break;
             }
             // run through
@@ -1505,7 +1505,7 @@ void SAL_CALL GeometryHandler::actuatingPropertyChanged(const OUString & Actuati
             break;
         case PROPERTY_ID_DATAFIELD:
             {
-                sal_Bool bEnable = (m_nDataFieldType != DATA_OR_FORMULA && m_nDataFieldType != COUNTER );
+                bool bEnable = (m_nDataFieldType != DATA_OR_FORMULA && m_nDataFieldType != COUNTER );
                 if ( bEnable )
                 {
                     OUString sValue;
@@ -1529,7 +1529,7 @@ void SAL_CALL GeometryHandler::actuatingPropertyChanged(const OUString & Actuati
         case PROPERTY_ID_BACKTRANSPARENT:
         case PROPERTY_ID_CONTROLBACKGROUNDTRANSPARENT:
             {
-                sal_Bool bValue = sal_False;
+                bool bValue = false;
                 NewValue >>= bValue;
                 bValue = !bValue;
                 _rxInspectorUI->enablePropertyUI(PROPERTY_BACKCOLOR,bValue);
@@ -1789,12 +1789,12 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(OUS
     return xReturn;
 }
 
-sal_Bool GeometryHandler::isDefaultFunction( const OUString& _sQuotedFunction
+bool GeometryHandler::isDefaultFunction( const OUString& _sQuotedFunction
                                             ,OUString& _rDataField
                                             ,const uno::Reference< report::XFunctionsSupplier>& _xFunctionsSupplier
                                             ,bool _bSet) const
 {
-    sal_Bool bDefaultFunction = sal_False;
+    bool bDefaultFunction = false;
     try
     {
         const uno::Reference< report::XReportComponent> xSourceReportComponent(m_xReportComponent,uno::UNO_QUERY_THROW);
@@ -1840,11 +1840,11 @@ sal_Bool GeometryHandler::isDefaultFunction( const OUString& _sQuotedFunction
     return bDefaultFunction;
 }
 
-sal_Bool GeometryHandler::impl_isDefaultFunction_nothrow( const uno::Reference< report::XFunction>& _xFunction
+bool GeometryHandler::impl_isDefaultFunction_nothrow( const uno::Reference< report::XFunction>& _xFunction
                                             ,OUString& _rDataField
                                             ,OUString& _rsDefaultFunctionName) const
 {
-    sal_Bool bDefaultFunction = sal_False;
+    bool bDefaultFunction = false;
     try
     {
         const OUString sFormula( _xFunction->getFormula() );
@@ -1884,8 +1884,8 @@ void GeometryHandler::loadDefaultFunctions()
 {
     if ( m_aDefaultFunctions.empty() )
     {
-        m_aCounterFunction.m_bPreEvaluated = sal_False;
-        m_aCounterFunction.m_bDeepTraversing = sal_False;
+        m_aCounterFunction.m_bPreEvaluated = false;
+        m_aCounterFunction.m_bDeepTraversing = false;
         m_aCounterFunction.m_sName = ModuleRes(RID_STR_F_COUNTER);
         m_aCounterFunction.m_sFormula = "rpt:[%FunctionName] + 1";
         m_aCounterFunction.m_sSearchString = "rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*[:digit:]*";
@@ -1893,9 +1893,9 @@ void GeometryHandler::loadDefaultFunctions()
         m_aCounterFunction.m_sInitialFormula.Value = OUString("rpt:1");
 
         DefaultFunction aDefault;
-        aDefault.m_bDeepTraversing = sal_False;
+        aDefault.m_bDeepTraversing = false;
 
-        aDefault.m_bPreEvaluated = sal_True;
+        aDefault.m_bPreEvaluated = true;
 
         aDefault.m_sName = ModuleRes(RID_STR_F_ACCUMULATION);
         aDefault.m_sFormula = "rpt:[%Column] + [%FunctionName]";
diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx
index 33b42d92fd6a..2702a32fde1c 100644
--- a/reportdesign/source/ui/misc/ColorListener.cxx
+++ b/reportdesign/source/ui/misc/ColorListener.cxx
@@ -30,8 +30,8 @@ OColorListener::OColorListener(Window* _pParent ,const OUString& _sColorEntry)
 : Window(_pParent)
 ,m_sColorEntry(_sColorEntry)
 ,m_nColor(COL_LIGHTBLUE)
-,m_bCollapsed(sal_False)
-,m_bMarked(sal_False)
+,m_bCollapsed(false)
+,m_bMarked(false)
 {
     StartListening(m_aExtendedColorConfig);
     m_nColor = m_aExtendedColorConfig.GetColorValue(CFG_REPORTDESIGNER,m_sColorEntry).getColor();
@@ -69,7 +69,7 @@ void OColorListener::DataChanged( const DataChangedEvent& rDCEvt )
 
 void OColorListener::setCollapsed(sal_Bool _bCollapsed)
 {
-    if ( m_bCollapsed != _bCollapsed )
+    if ( (m_bCollapsed ? 1 : 0) != _bCollapsed )
     {
         m_bCollapsed = _bCollapsed;
         if ( m_aCollapsedLink.IsSet() )
@@ -77,7 +77,7 @@ void OColorListener::setCollapsed(sal_Bool _bCollapsed)
     }
 }
 
-void OColorListener::setMarked(sal_Bool _bMark)
+void OColorListener::setMarked(bool _bMark)
 {
     if ( m_bMarked != _bMark)
     {
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index b0e312bd82e0..ae10756972c5 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -208,8 +208,8 @@ void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event
         if ( m_pToolbarController.is() )
         {
             // All other status events will be processed here
-            sal_Bool bSetCheckmark      = sal_False;
-            sal_Bool bCheckmark         = sal_False;
+            bool bSetCheckmark      = false;
+            bool bCheckmark         = false;
             //m_pToolbarController->GetToolBox().Enable(Event.IsEnabled);
             ToolBox& rTb = m_pToolbarController->GetToolBox();
             for ( sal_uInt16 i = 0; i < rTb.GetItemCount(); i++ )
@@ -226,7 +226,7 @@ void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event
 
                     // Checkmark
                     if ( Event.State >>= bCheckmark )
-                        bSetCheckmark = sal_True;
+                        bSetCheckmark = true;
 
                     if ( bSetCheckmark )
                         rTb.CheckItem( nId, bCheckmark );
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 17f87778d60e..d05f59dca808 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -94,12 +94,12 @@ ODesignView::ODesignView(   Window* pParent,
     ,m_eMode( RPTUI_SELECT )
     ,m_nCurrentPosition(USHRT_MAX)
     ,m_eActObj( OBJ_NONE )
-    ,m_bFirstDraw(sal_False)
+    ,m_bFirstDraw(false)
     ,m_aGridSizeCoarse( 1000, 1000 )    // #i93595# 100TH_MM changed to grid using coarse 1 cm grid
     ,m_aGridSizeFine( 250, 250 )        // and a 0,25 cm subdivision for better visualisation
-    ,m_bGridVisible(sal_True)
-    ,m_bGridSnap(sal_True)
-    ,m_bDeleted( sal_False )
+    ,m_bGridVisible(true)
+    ,m_bGridSnap(true)
+    ,m_bDeleted( false )
 {
     SetHelpId(UID_RPT_RPT_APP_VIEW);
     ImplInitSettings();
@@ -125,7 +125,7 @@ ODesignView::ODesignView(   Window* pParent,
 
 ODesignView::~ODesignView()
 {
-    m_bDeleted = sal_True;
+    m_bDeleted = true;
     Hide();
     m_aScrollWindow.Hide();
     m_aMarkTimer.Stop();
@@ -347,13 +347,13 @@ void ODesignView::Delete()
     m_aScrollWindow.Delete();
 }
 
-sal_Bool ODesignView::HasSelection() const
+bool ODesignView::HasSelection() const
 {
     return m_aScrollWindow.HasSelection();
 }
 
 
-sal_Bool ODesignView::IsPasteAllowed() const
+bool ODesignView::IsPasteAllowed() const
 {
     return m_aScrollWindow.IsPasteAllowed();
 }
@@ -364,10 +364,10 @@ void ODesignView::UpdatePropertyBrowserDelayed(OSectionView& _rView)
     if ( m_pCurrentView != &_rView )
     {
         if ( m_pCurrentView )
-            m_aScrollWindow.setMarked(m_pCurrentView,sal_False);
+            m_aScrollWindow.setMarked(m_pCurrentView,false);
         m_pCurrentView = &_rView;
         if ( m_pCurrentView )
-            m_aScrollWindow.setMarked(m_pCurrentView,sal_True);
+            m_aScrollWindow.setMarked(m_pCurrentView,true);
         m_xReportComponent.clear();
         DlgEdHint aHint( RPTUI_HINT_SELECTIONCHANGED );
         Broadcast( aHint );
@@ -376,7 +376,7 @@ void ODesignView::UpdatePropertyBrowserDelayed(OSectionView& _rView)
 }
 
 
-void ODesignView::toggleGrid(sal_Bool _bGridVisible)
+void ODesignView::toggleGrid(bool _bGridVisible)
 {
      m_aScrollWindow.toggleGrid(_bGridVisible);
 }
@@ -386,7 +386,7 @@ sal_uInt16 ODesignView::getSectionCount() const
     return m_aScrollWindow.getSectionCount();
 }
 
-void ODesignView::showRuler(sal_Bool _bShow)
+void ODesignView::showRuler(bool _bShow)
 {
      m_aScrollWindow.showRuler(_bShow);
 }
@@ -428,7 +428,7 @@ IMPL_LINK( ODesignView, SplitHdl, void*,  )
     if ( m_pPropWin && m_pPropWin->IsVisible() )
         nMinWidth = m_pPropWin->GetMinOutputSizePixel().Width();
 
-    if ( (aOutputSize.Width() - nTest) >= nMinWidth && nTest > m_aScrollWindow.getMaxMarkerWidth(sal_False) )
+    if ( (aOutputSize.Width() - nTest) >= nMinWidth && nTest > m_aScrollWindow.getMaxMarkerWidth(false) )
     {
         long nOldSplitPos = getController().getSplitPos();
         (void)nOldSplitPos;
@@ -462,7 +462,7 @@ void ODesignView::togglePropertyBrowser(bool _bToogleOn)
         if ( !m_pCurrentView && !m_xReportComponent.is() )
             m_xReportComponent = getController().getReportDefinition();
 
-        const sal_Bool bWillBeVisible = _bToogleOn;
+        const bool bWillBeVisible = _bToogleOn;
         m_pPropWin->Show(bWillBeVisible);
         m_pTaskPane->Show(bWillBeVisible);
         m_pTaskPane->Invalidate();
@@ -483,13 +483,13 @@ void ODesignView::showProperties(const uno::Reference< uno::XInterface>& _xRepor
     {
         m_xReportComponent = _xReportComponent;
         if ( m_pCurrentView )
-            m_aScrollWindow.setMarked(m_pCurrentView,sal_False);
+            m_aScrollWindow.setMarked(m_pCurrentView,false);
         m_pCurrentView = NULL;
         m_aMarkTimer.Start();
     }
 }
 
-sal_Bool ODesignView::isReportExplorerVisible() const
+bool ODesignView::isReportExplorerVisible() const
 {
     return m_pReportExplorer && m_pReportExplorer->IsVisible();
 }
@@ -510,7 +510,7 @@ void ODesignView::toggleReportExplorer()
         m_pReportExplorer->Show(!m_pReportExplorer->IsVisible());
 }
 
-sal_Bool ODesignView::isAddFieldVisible() const
+bool ODesignView::isAddFieldVisible() const
 {
     return m_pAddField && m_pAddField->IsVisible();
 }
@@ -609,18 +609,18 @@ void ODesignView::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlig
     m_aScrollWindow.alignMarkedObjects(_nControlModification, _bAlignAtSection,bBoundRects);
 }
 
-sal_Bool ODesignView::handleKeyEvent(const KeyEvent& _rEvent)
+bool ODesignView::handleKeyEvent(const KeyEvent& _rEvent)
 {
     if ( (m_pPropWin && m_pPropWin->HasChildPathFocus()) )
-        return sal_False;
+        return false;
     if ( (m_pAddField && m_pAddField->HasChildPathFocus()) )
-        return sal_False;
+        return false;
     if ( (m_pReportExplorer && m_pReportExplorer->HasChildPathFocus()) )
-        return sal_False;
+        return false;
     return m_aScrollWindow.handleKeyEvent(_rEvent);
 }
 
-void ODesignView::setMarked(const uno::Reference< report::XSection>& _xSection,sal_Bool _bMark)
+void ODesignView::setMarked(const uno::Reference< report::XSection>& _xSection,bool _bMark)
 {
     m_aScrollWindow.setMarked(_xSection,_bMark);
     if ( _bMark )
@@ -629,7 +629,7 @@ void ODesignView::setMarked(const uno::Reference< report::XSection>& _xSection,s
         m_pCurrentView = NULL;
 }
 
-void ODesignView::setMarked(const uno::Sequence< uno::Reference< report::XReportComponent> >& _aShapes,sal_Bool _bMark)
+void ODesignView::setMarked(const uno::Sequence< uno::Reference< report::XReportComponent> >& _aShapes,bool _bMark)
 {
     m_aScrollWindow.setMarked(_aShapes,_bMark);
     if ( _aShapes.hasElements() && _bMark )
@@ -675,18 +675,18 @@ void ODesignView::fillControlModelSelection(::std::vector< uno::Reference< uno::
     m_aScrollWindow.fillControlModelSelection(_rSelection);
 }
 
-void ODesignView::setGridSnap(sal_Bool bOn)
+void ODesignView::setGridSnap(bool bOn)
 {
     m_aScrollWindow.setGridSnap(bOn);
 
 }
 
-void ODesignView::setDragStripes(sal_Bool bOn)
+void ODesignView::setDragStripes(bool bOn)
 {
     m_aScrollWindow.setDragStripes(bOn);
 }
 
-sal_Bool ODesignView::isHandleEvent(sal_uInt16 /*_nId*/) const
+bool ODesignView::isHandleEvent(sal_uInt16 /*_nId*/) const
 {
     return m_pPropWin && m_pPropWin->HasChildPathFocus();
 }
diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx
index 9ee741795d13..6b1346a88d2d 100644
--- a/reportdesign/source/ui/report/FixedTextColor.cxx
+++ b/reportdesign/source/ui/report/FixedTextColor.cxx
@@ -103,13 +103,13 @@ namespace rptui
 
         try
         {
-            sal_Bool bIsDark = sal_False;
+            bool bIsDark = false;
             const sal_Int32 nBackColor( xFixedText->getControlBackground() );
             if ((sal_uInt32)nBackColor == COL_TRANSPARENT)
             {
                 uno::Reference <report::XSection> xSection(xFixedText->getParent(), uno::UNO_QUERY_THROW);
 
-                sal_Bool bSectionBackColorIsTransparent = xSection->getBackTransparent();
+                bool bSectionBackColorIsTransparent = xSection->getBackTransparent();
                 if (bSectionBackColorIsTransparent)
                 {
                     // Label Transparent, Section Transparent set LabelTextColor
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 4d8707ae6a16..d96652fd9777 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -289,12 +289,12 @@ OReportController::OReportController(Reference< XComponentContext > const & xCon
     ,m_nAspect(0)
     ,m_nZoomValue(100)
     ,m_eZoomType(SVX_ZOOM_PERCENT)
-    ,m_bShowRuler(sal_True)
-    ,m_bGridVisible(sal_True)
-    ,m_bGridUse(sal_True)
-    ,m_bShowProperties(sal_True)
-    ,m_bGroupFloaterWasVisible(sal_False)
-    ,m_bHelplinesMove(sal_True)
+    ,m_bShowRuler(true)
+    ,m_bGridVisible(true)
+    ,m_bGridUse(true)
+    ,m_bShowProperties(true)
+    ,m_bGroupFloaterWasVisible(false)
+    ,m_bHelplinesMove(true)
     ,m_bChartEnabled(false)
     ,m_bChartEnabledAsked(false)
     ,m_bInGeneratePreview(false)
@@ -2290,7 +2290,7 @@ void SAL_CALL OReportController::disposing( const lang::EventObject& Source ) th
 
 static sal_uInt16 lcl_getNonVisbleGroupsBefore( const uno::Reference< report::XGroups>& _xGroups
                           ,sal_Int32 _nGroupPos
-                          ,::std::mem_fun_t<sal_Bool,OGroupHelper>&_pGroupMemberFunction)
+                          ,::std::mem_fun_t<bool,OGroupHelper>&_pGroupMemberFunction)
 {
     uno::Reference< report::XGroup> xGroup;
     sal_uInt16 nNonVisibleGroups = 0;
@@ -2308,7 +2308,7 @@ static sal_uInt16 lcl_getNonVisbleGroupsBefore( const uno::Reference< report::XG
 
 void OReportController::groupChange( const uno::Reference< report::XGroup>& _xGroup,const OUString& _sPropName,sal_Int32 _nGroupPos,bool _bShow)
 {
-    ::std::mem_fun_t<sal_Bool,OGroupHelper> pMemFun = ::std::mem_fun(&OGroupHelper::getHeaderOn);
+    ::std::mem_fun_t<bool,OGroupHelper> pMemFun = ::std::mem_fun(&OGroupHelper::getHeaderOn);
     ::std::mem_fun_t<uno::Reference<report::XSection> , OGroupHelper> pMemFunSection = ::std::mem_fun(&OGroupHelper::getHeader);
     OUString sColor(DBGROUPHEADER);
     sal_uInt16 nPosition = 0;
@@ -3053,7 +3053,7 @@ sal_Bool SAL_CALL OReportController::select( const Any& aSelection ) throw (Ille
         {
             if ( aElements.getLength() > 0 )
                 getDesignView()->showProperties(uno::Reference<uno::XInterface>(aElements[0],uno::UNO_QUERY));
-            getDesignView()->setMarked(aElements,sal_True);
+            getDesignView()->setMarked(aElements, true);
         }
         else
         {
@@ -3064,7 +3064,7 @@ sal_Bool SAL_CALL OReportController::select( const Any& aSelection ) throw (Ille
                 getDesignView()->showProperties(xObject);
                 aElements.realloc(1);
                 aElements[0] = xProp;
-                getDesignView()->setMarked(aElements,sal_True);
+                getDesignView()->setMarked(aElements, true);
             }
             else
             {
@@ -3121,7 +3121,7 @@ IMPL_LINK( OReportController, OnExecuteReport, void* ,/*_pMemfun*/)
 void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,const uno::Reference< report::XSection>& _xSection,const OUString& _sFunction,sal_uInt16 _nObjectId)
 {
     SequenceAsHashMap aMap(_aArgs);
-    getDesignView()->setMarked(_xSection ,sal_True);
+    getDesignView()->setMarked(_xSection, true);
     ::boost::shared_ptr<OSectionWindow> pSectionWindow = getDesignView()->getMarkedSection();
     if ( !pSectionWindow )
         return;
@@ -3213,7 +3213,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co
             if ( !sUrl.isEmpty() && xInfo->hasPropertyByName(PROPERTY_IMAGEURL) )
                 xUnoProp->setPropertyValue( PROPERTY_IMAGEURL, uno::makeAny( sUrl ) );
 
-            pObj->CreateMediator(sal_True);
+            pObj->CreateMediator(true);
 
             if ( _nObjectId == OBJ_DLG_FIXEDTEXT ) // special case for fixed text
                 xUnoProp->setPropertyValue(PROPERTY_LABEL,uno::makeAny(OUnoObject::GetDefaultName(pObj)));
@@ -3332,7 +3332,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
             uno::Reference<report::XSection> xSection = aMap.getUnpackedValueOrDefault("Section",xCurrentSection);
             uno::Reference<report::XReportDefinition> xReportDefinition = xSection->getReportDefinition();
 
-            getDesignView()->setMarked(xSection,sal_True);
+            getDesignView()->setMarked(xSection, true);
             pSectionWindow[0] = getDesignView()->getMarkedSection();
 
             sal_Int32 nLeftMargin = getStyleProperty<sal_Int32>(m_xReportDefinition,PROPERTY_LEFTMARGIN);
@@ -3507,7 +3507,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
                         if ( xInfo->hasPropertyByName(PROPERTY_BORDER) && xShapeInfo->hasPropertyByName(PROPERTY_CONTROLBORDER) )
                             xUnoProp->setPropertyValue(PROPERTY_BORDER,xShapeProp->getPropertyValue(PROPERTY_CONTROLBORDER));
 
-                        pObjs[i]->CreateMediator(sal_True);
+                        pObjs[i]->CreateMediator(true);
 
                         const sal_Int32 nShapeWidth = xShapeProp->getWidth();
                         const bool bChangedPos = (aPos.X + nShapeWidth) > nPaperWidth;
@@ -4128,9 +4128,9 @@ void OReportController::impl_zoom_nothrow()
     InvalidateFeature(SID_ATTR_ZOOMSLIDER,Reference< XStatusListener >(), true);
 }
 
-sal_Bool OReportController::isFormatCommandEnabled(sal_uInt16 _nCommand,const uno::Reference< report::XReportControlFormat>& _xReportControlFormat) const
+bool OReportController::isFormatCommandEnabled(sal_uInt16 _nCommand,const uno::Reference< report::XReportControlFormat>& _xReportControlFormat) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if ( _xReportControlFormat.is() && !uno::Reference< report::XFixedLine>(_xReportControlFormat,uno::UNO_QUERY).is() ) // this command is really often called so we nedd a short cut here
     {
         try
diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx
index 2f0629f26788..58abafba5c06 100644
--- a/reportdesign/source/ui/report/ReportControllerObserver.cxx
+++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx
@@ -183,13 +183,18 @@ void OXReportControllerObserver::Lock()
     OSL_ENSURE(m_refCount,"Illegal call to dead object!");
     osl_atomic_increment( &m_pImpl->m_nLocks );
 }
+
 void OXReportControllerObserver::UnLock()
 {
     OSL_ENSURE(m_refCount,"Illegal call to dead object!");
 
     osl_atomic_decrement( &m_pImpl->m_nLocks );
 }
-sal_Bool OXReportControllerObserver::IsLocked() const { return m_pImpl->m_nLocks != 0; }
+
+bool OXReportControllerObserver::IsLocked() const
+{
+    return m_pImpl->m_nLocks != 0;
+}
 
 
 void OXReportControllerObserver::AddSection(const uno::Reference< report::XSection > & _xSection)
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index e3c45673a4fc..5eb799853347 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -88,8 +88,8 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re
 ,m_xSection(_xSection)
 ,m_nPaintEntranceCount(0)
 ,m_eMode(RPTUI_SELECT)
-,m_bDialogModelChanged(sal_False)
-,m_bInDrag(sal_False)
+,m_bDialogModelChanged(false)
+,m_bInDrag(false)
 {
     //EnableChildTransparentMode();
     SetHelpId(HID_REPORTSECTION);
@@ -386,7 +386,7 @@ void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedOb
 
 void OReportSection::MouseButtonDown( const MouseEvent& rMEvt )
 {
-    m_pParent->getViewsWindow()->getView()->setMarked(m_pView,sal_True); // mark the section in which is clicked
+    m_pParent->getViewsWindow()->getView()->setMarked(m_pView, true); // mark the section in which is clicked
     m_pFunc->MouseButtonDown( rMEvt );
     Window::MouseButtonDown(rMEvt);
 }
@@ -405,7 +405,7 @@ void OReportSection::MouseMove( const MouseEvent& rMEvt )
 
 }
 
-void OReportSection::SetGridVisible(sal_Bool _bVisible)
+void OReportSection::SetGridVisible(bool _bVisible)
 {
     m_pView->SetGridVisible( _bVisible );
 }
@@ -557,7 +557,7 @@ void OReportSection::impl_adjustObjectSizePosition(sal_Int32 i_nPaperWidth,sal_I
             if ( pObject )
             {
                 OObjectBase* pBase = dynamic_cast<OObjectBase*>(pObject);
-                pBase->EndListening(sal_False);
+                pBase->EndListening(false);
                 if ( aPos.X < i_nLeftMargin )
                 {
                     aPos.X  = i_nLeftMargin;
@@ -573,7 +573,7 @@ void OReportSection::impl_adjustObjectSizePosition(sal_Int32 i_nPaperWidth,sal_I
                         // add listener around
                         pBase->StartListening();
                         xReportComponent->setSize(aSize);
-                        pBase->EndListening(sal_False);
+                        pBase->EndListening(false);
                     }
                     bChanged = true;
                 }
@@ -601,9 +601,9 @@ void OReportSection::impl_adjustObjectSizePosition(sal_Int32 i_nPaperWidth,sal_I
     }
 }
 
-sal_Bool OReportSection::handleKeyEvent(const KeyEvent& _rEvent)
+bool OReportSection::handleKeyEvent(const KeyEvent& _rEvent)
 {
-    return m_pFunc.get() ? m_pFunc->handleKeyEvent(_rEvent) : sal_False;
+    return m_pFunc.get() && m_pFunc->handleKeyEvent(_rEvent);
 }
 
 void OReportSection::deactivateOle()
@@ -796,7 +796,7 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt )
     else if ( bMultipleFormat
         || ::svx::OColumnTransferable::canExtractColumnDescriptor(rFlavors, CTF_FIELD_DESCRIPTOR | CTF_CONTROL_EXCHANGE | CTF_COLUMN_DESCRIPTOR) )
     {
-        m_pParent->getViewsWindow()->getView()->setMarked(m_pView,sal_True);
+        m_pParent->getViewsWindow()->getView()->setMarked(m_pView, true);
         m_pView->UnmarkAll();
         const Rectangle& rRect = m_pView->GetWorkArea();
         if ( aDropPos.X() < rRect.Left() )
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx
index e429c28e8551..5f3c46847414 100644
--- a/reportdesign/source/ui/report/ReportWindow.cxx
+++ b/reportdesign/source/ui/report/ReportWindow.cxx
@@ -128,19 +128,19 @@ void OReportWindow::addSection(const uno::Reference< report::XSection >& _xSecti
     m_pParent->setTotalSize(GetTotalWidth(),GetTotalHeight());
 }
 
-void OReportWindow::toggleGrid(sal_Bool _bVisible)
+void OReportWindow::toggleGrid(bool _bVisible)
 {
     m_aViewsWindow.toggleGrid(_bVisible);
 }
 
-void OReportWindow::showRuler(sal_Bool _bShow)
+void OReportWindow::showRuler(bool _bShow)
 {
     m_aHRuler.Show(_bShow);
 
     m_aViewsWindow.showRuler(_bShow);
 }
 
-sal_Int32 OReportWindow::getMaxMarkerWidth(sal_Bool _bWithEnd) const
+sal_Int32 OReportWindow::getMaxMarkerWidth(bool _bWithEnd) const
 {
     Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH));
     aStartWidth *= m_aViewsWindow.GetMapMode().GetScaleX();
@@ -254,7 +254,7 @@ void OReportWindow::notifySizeChanged()
     m_pParent->setTotalSize(GetTotalWidth(),GetTotalHeight());
 }
 
-sal_Bool OReportWindow::HasSelection() const
+bool OReportWindow::HasSelection() const
 {
     return m_aViewsWindow.HasSelection();
 }
@@ -277,7 +277,7 @@ void OReportWindow::Paste()
     m_aViewsWindow.Paste();
 }
 
-sal_Bool OReportWindow::IsPasteAllowed() const
+bool OReportWindow::IsPasteAllowed() const
 {
     return m_aViewsWindow.IsPasteAllowed();
 }
@@ -300,24 +300,24 @@ void OReportWindow::showProperties(const uno::Reference< report::XSection>& _xRe
     m_pView->UpdatePropertyBrowserDelayed(pSectionWindow->getReportSection().getSectionView());
 }
 
-sal_Bool OReportWindow::handleKeyEvent(const KeyEvent& _rEvent)
+bool OReportWindow::handleKeyEvent(const KeyEvent& _rEvent)
 {
     return m_aViewsWindow.handleKeyEvent(_rEvent);
 }
 
-void OReportWindow::setMarked(OSectionView* _pSectionView,sal_Bool _bMark)
+void OReportWindow::setMarked(OSectionView* _pSectionView, bool _bMark)
 {
     if ( _pSectionView )
         m_aViewsWindow.setMarked(_pSectionView,_bMark);
 }
 
-void OReportWindow::setMarked(const uno::Reference< report::XSection>& _xSection,sal_Bool _bMark)
+void OReportWindow::setMarked(const uno::Reference< report::XSection>& _xSection, bool _bMark)
 {
 
     m_aViewsWindow.setMarked(_xSection,_bMark);
 }
 
-void OReportWindow::setMarked(const uno::Sequence< uno::Reference< report::XReportComponent> >& _xShape,sal_Bool _bMark)
+void OReportWindow::setMarked(const uno::Sequence< uno::Reference< report::XReportComponent> >& _xShape, bool _bMark)
 {
 
     m_aViewsWindow.setMarked(_xShape,_bMark);
@@ -357,13 +357,13 @@ void OReportWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAl
     m_aViewsWindow.alignMarkedObjects(_nControlModification, _bAlignAtSection, bBoundRects);
 }
 
-void OReportWindow::setGridSnap(sal_Bool bOn)
+void OReportWindow::setGridSnap(bool bOn)
 {
 
     m_aViewsWindow.setGridSnap(bOn);
 }
 
-void OReportWindow::setDragStripes(sal_Bool bOn)
+void OReportWindow::setDragStripes(bool bOn)
 {
     m_aViewsWindow.setDragStripes(bOn);
 }
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index 33dbb8b6f8a9..2cbfa2278eec 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -201,7 +201,7 @@ void OScrollWindowHelper::removeSection(sal_uInt16 _nPosition)
     m_aReportWindow.removeSection(_nPosition);
 }
 
-void OScrollWindowHelper::toggleGrid(sal_Bool _bVisible)
+void OScrollWindowHelper::toggleGrid(bool _bVisible)
 {
     m_aReportWindow.toggleGrid(_bVisible);
 }
@@ -226,7 +226,7 @@ void OScrollWindowHelper::SetMode( DlgEdMode _eNewMode )
     m_aReportWindow.SetMode(_eNewMode);
 }
 
-sal_Bool OScrollWindowHelper::HasSelection() const
+bool OScrollWindowHelper::HasSelection() const
 {
     return m_aReportWindow.HasSelection();
 }
@@ -246,7 +246,7 @@ void OScrollWindowHelper::Paste()
     m_aReportWindow.Paste();
 }
 
-sal_Bool OScrollWindowHelper::IsPasteAllowed() const
+bool OScrollWindowHelper::IsPasteAllowed() const
 {
     return m_aReportWindow.IsPasteAllowed();
 }
@@ -261,32 +261,32 @@ void OScrollWindowHelper::unmarkAllObjects(OSectionView* _pSectionView)
     m_aReportWindow.unmarkAllObjects(_pSectionView);
 }
 
-sal_Int32 OScrollWindowHelper::getMaxMarkerWidth(sal_Bool _bWithEnd) const
+sal_Int32 OScrollWindowHelper::getMaxMarkerWidth(bool _bWithEnd) const
 {
     return m_aReportWindow.getMaxMarkerWidth(_bWithEnd);
 }
 
-void OScrollWindowHelper::showRuler(sal_Bool _bShow)
+void OScrollWindowHelper::showRuler(bool _bShow)
 {
     m_aReportWindow.showRuler(_bShow);
 }
 
-sal_Bool OScrollWindowHelper::handleKeyEvent(const KeyEvent& _rEvent)
+bool OScrollWindowHelper::handleKeyEvent(const KeyEvent& _rEvent)
 {
     return m_aReportWindow.handleKeyEvent(_rEvent);
 }
 
-void OScrollWindowHelper::setMarked(OSectionView* _pSectionView,sal_Bool _bMark)
+void OScrollWindowHelper::setMarked(OSectionView* _pSectionView, bool _bMark)
 {
     m_aReportWindow.setMarked(_pSectionView,_bMark);
 }
 
-void OScrollWindowHelper::setMarked(const uno::Reference< report::XSection>& _xSection,sal_Bool _bMark)
+void OScrollWindowHelper::setMarked(const uno::Reference< report::XSection>& _xSection, bool _bMark)
 {
     m_aReportWindow.setMarked(_xSection,_bMark);
 }
 
-void OScrollWindowHelper::setMarked(const uno::Sequence< uno::Reference< report::XReportComponent> >& _xShape,sal_Bool _bMark)
+void OScrollWindowHelper::setMarked(const uno::Sequence< uno::Reference< report::XReportComponent> >& _xShape, bool _bMark)
 {
     m_aReportWindow.setMarked(_xShape,_bMark);
 }
@@ -367,12 +367,12 @@ void OScrollWindowHelper::_propertyChanged(const beans::PropertyChangeEvent& /*_
     m_aReportWindow.notifySizeChanged();
 }
 
-void OScrollWindowHelper::setGridSnap(sal_Bool bOn)
+void OScrollWindowHelper::setGridSnap(bool bOn)
 {
     m_aReportWindow.setGridSnap(bOn);
 }
 
-void OScrollWindowHelper::setDragStripes(sal_Bool bOn)
+void OScrollWindowHelper::setDragStripes(bool bOn)
 {
     m_aReportWindow.setDragStripes(bOn);
 }
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx
index 47ec56b4da20..1773d85f3ae0 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -157,7 +157,7 @@ void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
     }
 }
 
-bool OSectionWindow::setReportSectionTitle(const uno::Reference< report::XReportDefinition>& _xReport,sal_uInt16 _nResId,::std::mem_fun_t<uno::Reference<report::XSection> , OReportHelper> _pGetSection,::std::mem_fun_t<sal_Bool,OReportHelper> _pIsSectionOn)
+bool OSectionWindow::setReportSectionTitle(const uno::Reference< report::XReportDefinition>& _xReport,sal_uInt16 _nResId,::std::mem_fun_t<uno::Reference<report::XSection> , OReportHelper> _pGetSection,::std::mem_fun_t<bool,OReportHelper> _pIsSectionOn)
 {
     OReportHelper aReportHelper(_xReport);
     const bool bRet = _pIsSectionOn(&aReportHelper) && _pGetSection(&aReportHelper) == m_aReportSection.getSection();
@@ -170,7 +170,7 @@ bool OSectionWindow::setReportSectionTitle(const uno::Reference< report::XReport
     return bRet;
 }
 
-bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>& _xGroup,sal_uInt16 _nResId,::std::mem_fun_t<uno::Reference<report::XSection> , OGroupHelper> _pGetSection,::std::mem_fun_t<sal_Bool,OGroupHelper> _pIsSectionOn)
+bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>& _xGroup,sal_uInt16 _nResId,::std::mem_fun_t<uno::Reference<report::XSection> , OGroupHelper> _pGetSection,::std::mem_fun_t<bool,OGroupHelper> _pIsSectionOn)
 {
     OGroupHelper aGroupHelper(_xGroup);
     const bool bRet = _pIsSectionOn(&aGroupHelper) && _pGetSection(&aGroupHelper) == m_aReportSection.getSection() ;
@@ -266,7 +266,7 @@ void OSectionWindow::Resize()
     }
 }
 
-void OSectionWindow::setCollapsed(sal_Bool _bCollapsed)
+void OSectionWindow::setCollapsed(bool _bCollapsed)
 {
     if ( m_aStartMarker.isCollapsed() != _bCollapsed )
     {
@@ -279,7 +279,7 @@ void OSectionWindow::showProperties()
     m_pParent->getView()->showProperties( m_aReportSection.getSection().get() );
 }
 
-void OSectionWindow::setMarked(sal_Bool _bMark)
+void OSectionWindow::setMarked(bool _bMark)
 {
     m_aStartMarker.setMarked(_bMark);
     m_aEndMarker.setMarked(_bMark);
diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx
index 27dc3e04604c..357859988a65 100644
--- a/reportdesign/source/ui/report/StartMarker.cxx
+++ b/reportdesign/source/ui/report/StartMarker.cxx
@@ -52,7 +52,7 @@ OStartMarker::OStartMarker(OSectionWindow* _pParent,const OUString& _sColorEntry
 ,m_aText(this,WB_HYPHENATION)
 ,m_aImage(this,WB_LEFT|WB_TOP|WB_SCALE)
 ,m_pParent(_pParent)
-,m_bShowRuler(sal_True)
+,m_bShowRuler(true)
 {
     SetUniqueId(HID_RPT_STARTMARKER);
 
@@ -250,7 +250,7 @@ void OStartMarker::Notify(SfxBroadcaster & rBc, SfxHint const & rHint)
     }
 }
 
-void OStartMarker::showRuler(sal_Bool _bShow)
+void OStartMarker::showRuler(bool _bShow)
 {
     m_bShowRuler = _bShow;
     m_aVRuler.Show(!m_bCollapsed && m_bShowRuler);
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 5f03f88d1364..617dc14535b9 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -174,7 +174,7 @@ bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,Sd
 OViewsWindow::OViewsWindow( OReportWindow* _pReportWindow)
 : Window( _pReportWindow,WB_DIALOGCONTROL)
 ,m_pParent(_pReportWindow)
-,m_bInUnmark(sal_False)
+,m_bInUnmark(false)
 {
     SetPaintTransparent(true);
     SetUniqueId(UID_RPT_VIEWSWINDOW);
@@ -316,7 +316,7 @@ void OViewsWindow::removeSection(sal_uInt16 _nPosition)
     }
 }
 
-void OViewsWindow::toggleGrid(sal_Bool _bVisible)
+void OViewsWindow::toggleGrid(bool _bVisible)
 {
     ::std::for_each(m_aSections.begin(),m_aSections.end(),
         ::o3tl::compose1(::boost::bind(&OReportSection::SetGridVisible,_1,_bVisible),TReportPairHelper()));
@@ -363,7 +363,7 @@ void OViewsWindow::SetMode( DlgEdMode eNewMode )
         ::o3tl::compose1(::boost::bind(&OReportSection::SetMode,_1,eNewMode),TReportPairHelper()));
 }
 
-sal_Bool OViewsWindow::HasSelection() const
+bool OViewsWindow::HasSelection() const
 {
     TSectionsMap::const_iterator aIter = m_aSections.begin();
     TSectionsMap::const_iterator aEnd = m_aSections.end();
@@ -374,10 +374,10 @@ sal_Bool OViewsWindow::HasSelection() const
 
 void OViewsWindow::Delete()
 {
-    m_bInUnmark = sal_True;
+    m_bInUnmark = true;
     ::std::for_each(m_aSections.begin(),m_aSections.end(),
         ::o3tl::compose1(::boost::mem_fn(&OReportSection::Delete),TReportPairHelper()));
-    m_bInUnmark = sal_False;
+    m_bInUnmark = false;
 }
 
 void OViewsWindow::Copy()
@@ -486,10 +486,10 @@ void OViewsWindow::Paste()
 void OViewsWindow::markSection(const sal_uInt16 _nPos)
 {
     if ( _nPos < m_aSections.size() )
-        m_pParent->setMarked(m_aSections[_nPos]->getReportSection().getSection(),sal_True);
+        m_pParent->setMarked(m_aSections[_nPos]->getReportSection().getSection(),true);
 }
 
-sal_Bool OViewsWindow::IsPasteAllowed() const
+bool OViewsWindow::IsPasteAllowed() const
 {
     TransferableDataHelper aTransferData( TransferableDataHelper::CreateFromSystemClipboard( const_cast< OViewsWindow* >( this ) ) );
     return aTransferData.HasFormat(OReportExchange::getDescriptorFormatId());
@@ -497,17 +497,17 @@ sal_Bool OViewsWindow::IsPasteAllowed() const
 
 void OViewsWindow::SelectAll(const sal_uInt16 _nObjectType)
 {
-    m_bInUnmark = sal_True;
+    m_bInUnmark = true;
     ::std::for_each(m_aSections.begin(),m_aSections.end(),
         ::o3tl::compose1(::boost::bind(::boost::mem_fn(&OReportSection::SelectAll),_1,_nObjectType),TReportPairHelper()));
-    m_bInUnmark = sal_False;
+    m_bInUnmark = false;
 }
 
 void OViewsWindow::unmarkAllObjects(OSectionView* _pSectionView)
 {
     if ( !m_bInUnmark )
     {
-        m_bInUnmark = sal_True;
+        m_bInUnmark = true;
         TSectionsMap::iterator aIter = m_aSections.begin();
         TSectionsMap::iterator aEnd = m_aSections.end();
         for (; aIter != aEnd ; ++aIter)
@@ -518,7 +518,7 @@ void OViewsWindow::unmarkAllObjects(OSectionView* _pSectionView)
                 (*aIter)->getReportSection().getSectionView().UnmarkAllObj();
             }
         }
-        m_bInUnmark = sal_False;
+        m_bInUnmark = false;
     }
 }
 
@@ -539,7 +539,7 @@ void OViewsWindow::MouseButtonDown( const MouseEvent& rMEvt )
     Window::MouseButtonDown(rMEvt);
 }
 
-void OViewsWindow::showRuler(sal_Bool _bShow)
+void OViewsWindow::showRuler(bool _bShow)
 {
     ::std::for_each(m_aSections.begin(),m_aSections.end(),
         ::o3tl::compose1(::boost::bind(&OStartMarker::showRuler,_1,_bShow),TStartMarkerHelper()));
@@ -570,9 +570,9 @@ void OViewsWindow::MouseButtonUp( const MouseEvent& rMEvt )
     }
 }
 
-sal_Bool OViewsWindow::handleKeyEvent(const KeyEvent& _rEvent)
+bool OViewsWindow::handleKeyEvent(const KeyEvent& _rEvent)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     TSectionsMap::iterator aIter = m_aSections.begin();
     TSectionsMap::iterator aEnd = m_aSections.end();
     for (;aIter != aEnd ; ++aIter)
@@ -593,14 +593,14 @@ OViewsWindow::TSectionsMap::iterator OViewsWindow::getIteratorAtPos(sal_uInt16 _
     return aRet;
 }
 
-void OViewsWindow::setMarked(OSectionView* _pSectionView,sal_Bool _bMark)
+void OViewsWindow::setMarked(OSectionView* _pSectionView, bool _bMark)
 {
     OSL_ENSURE(_pSectionView != NULL,"SectionView is NULL!");
     if ( _pSectionView )
         setMarked(_pSectionView->getReportSection()->getSection(),_bMark);
 }
 
-void OViewsWindow::setMarked(const uno::Reference< report::XSection>& _xSection,sal_Bool _bMark)
+void OViewsWindow::setMarked(const uno::Reference< report::XSection>& _xSection, bool _bMark)
 {
     TSectionsMap::iterator aIter = m_aSections.begin();
     TSectionsMap::iterator aEnd = m_aSections.end();
@@ -608,7 +608,7 @@ void OViewsWindow::setMarked(const uno::Reference< report::XSection>& _xSection,
     {
         if ( (*aIter)->getReportSection().getSection() != _xSection )
         {
-            (*aIter)->setMarked(sal_False);
+            (*aIter)->setMarked(false);
         }
         else if ( (*aIter)->getStartMarker().isMarked() != _bMark )
         {
@@ -617,7 +617,7 @@ void OViewsWindow::setMarked(const uno::Reference< report::XSection>& _xSection,
     }
 }
 
-void OViewsWindow::setMarked(const uno::Sequence< uno::Reference< report::XReportComponent> >& _aShapes,sal_Bool _bMark)
+void OViewsWindow::setMarked(const uno::Sequence< uno::Reference< report::XReportComponent> >& _aShapes, bool _bMark)
 {
     bool bFirst = true;
     const uno::Reference< report::XReportComponent>* pIter = _aShapes.getConstArray();
@@ -700,7 +700,7 @@ void OViewsWindow::collectBoundResizeRect(const TRectangleMap& _rSortRectangles,
         SdrObjTransformInfoRec aInfo;
         const SdrObject* pObj =  aRectIter->second.first;
         pObj->TakeObjInfo(aInfo);
-        sal_Bool bHasFixed = !aInfo.bMoveAllowed || pObj->IsMoveProtect();
+        bool bHasFixed = !aInfo.bMoveAllowed || pObj->IsMoveProtect();
         if ( bHasFixed )
             _rBound.Union(aObjRect);
         else
@@ -894,7 +894,7 @@ void OViewsWindow::createDefault()
         pMarkedSection->getReportSection().createDefault(m_sShapeType);
 }
 
-void OViewsWindow::setGridSnap(sal_Bool bOn)
+void OViewsWindow::setGridSnap(bool bOn)
 {
     TSectionsMap::iterator aIter = m_aSections.begin();
     TSectionsMap::iterator aEnd = m_aSections.end();
@@ -906,7 +906,7 @@ void OViewsWindow::setGridSnap(sal_Bool bOn)
     }
 }
 
-void OViewsWindow::setDragStripes(sal_Bool bOn)
+void OViewsWindow::setDragStripes(bool bOn)
 {
     TSectionsMap::iterator aIter = m_aSections.begin();
     TSectionsMap::iterator aEnd = m_aSections.end();
@@ -953,10 +953,10 @@ namespace
     {
     private:
         SectionViewAction   m_eAction;
-        sal_Bool            m_bCopy;
+        bool                m_bCopy;
 
     public:
-        ApplySectionViewAction(sal_Bool _bCopy)
+        ApplySectionViewAction(bool _bCopy)
             : m_eAction(eEndDragObj)
             , m_bCopy(_bCopy)
         {
@@ -1020,7 +1020,7 @@ void OViewsWindow::BegDragObj_createInvisibleObjectAtPosition(const Rectangle& _
                 pNewObj->SetLogicRect(_aRect);
 
                 pNewObj->Move(Size(0, aNewPos.Y()));
-                sal_Bool bChanged = rView.GetModel()->IsChanged();
+                bool bChanged = rView.GetModel()->IsChanged();
                 rReportSection.getPage()->InsertObject(pNewObj);
                 rView.GetModel()->SetChanged(bChanged);
                 m_aBegDragTempList.push_back(pNewObj);
@@ -1233,7 +1233,7 @@ void OViewsWindow::EndDragObj_removeInvisibleObjects()
     }
 }
 
-void OViewsWindow::EndDragObj(sal_Bool _bControlKeyPressed, const OSectionView* _pSection,const Point& _aPnt)
+void OViewsWindow::EndDragObj(bool _bControlKeyPressed, const OSectionView* _pSection, const Point& _aPnt)
 {
     const OUString sUndoAction = ModuleRes(RID_STR_UNDO_CHANGEPOSITION);
     const UndoContext aUndoContext( getView()->getReportView()->getController().getUndoManager(), sUndoAction );
@@ -1332,7 +1332,7 @@ void OViewsWindow::EndDragObj(sal_Bool _bControlKeyPressed, const OSectionView*
     }
     else
     {
-        ::std::for_each( m_aSections.begin(), m_aSections.end(), ApplySectionViewAction( sal_False ) );
+        ::std::for_each( m_aSections.begin(), m_aSections.end(), ApplySectionViewAction( false ) );
         EndDragObj_removeInvisibleObjects();
     }
     m_aDragDelta = Point(SAL_MAX_INT32, SAL_MAX_INT32);
@@ -1411,9 +1411,9 @@ void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bo
     }
 }
 
-sal_Bool OViewsWindow::IsAction() const
+bool OViewsWindow::IsAction() const
 {
-    sal_Bool bAction = sal_False;
+    bool bAction = false;
     TSectionsMap::const_iterator aIter = m_aSections.begin();
     TSectionsMap::const_iterator aEnd = m_aSections.end();
     for (; !bAction && aIter != aEnd; ++aIter)
@@ -1421,9 +1421,9 @@ sal_Bool OViewsWindow::IsAction() const
     return bAction;
 }
 
-sal_Bool OViewsWindow::IsDragObj() const
+bool OViewsWindow::IsDragObj() const
 {
-    sal_Bool bAction = sal_False;
+    bool bAction = false;
     TSectionsMap::const_iterator aIter = m_aSections.begin();
     TSectionsMap::const_iterator aEnd = m_aSections.end();
     for (; !bAction && aIter != aEnd; ++aIter)
@@ -1599,7 +1599,7 @@ void OViewsWindow::handleKey(const KeyCode& _rCode)
                     if ( rView.IsDragObj() )
                     {
                         const bool bWasNoSnap = rDragStat.IsNoSnap();
-                        const sal_Bool bWasSnapEnabled = rView.IsSnapEnabled();
+                        const bool bWasSnapEnabled = rView.IsSnapEnabled();
 
                         // switch snapping off
                         if ( !bWasNoSnap )
@@ -1684,7 +1684,7 @@ void OViewsWindow::collapseSections(const uno::Sequence< beans::PropertyValue>&
         sal_uInt16 nPos = sal_uInt16(-1);
         if ( (pIter->Value >>= nPos) && nPos < m_aSections.size() )
         {
-            m_aSections[nPos]->setCollapsed(sal_True);
+            m_aSections[nPos]->setCollapsed(true);
         }
     }
 }
diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx
index cd217f9d0440..a605094e39b4 100644
--- a/reportdesign/source/ui/report/dlgedclip.cxx
+++ b/reportdesign/source/ui/report/dlgedclip.cxx
@@ -58,7 +58,7 @@ bool OReportExchange::GetData( const datatransfer::DataFlavor& _rFlavor )
     return (nFormatId == getDescriptorFormatId()) && SetAny( uno::Any(m_aCopyElements), _rFlavor );
 }
 
-sal_Bool OReportExchange::canExtract(const DataFlavorExVector& _rFlavor)
+bool OReportExchange::canExtract(const DataFlavorExVector& _rFlavor)
 {
     return IsFormatSupported(_rFlavor,getDescriptorFormatId());
 }
@@ -71,7 +71,7 @@ OReportExchange::TSectionElements OReportExchange::extractCopies(const Transfera
         // extract the any from the transferable
         datatransfer::DataFlavor aFlavor;
 #if OSL_DEBUG_LEVEL > 0
-        sal_Bool bSuccess =
+        bool bSuccess =
 #endif
         SotExchange::GetFormatDataFlavor(nKnownFormatId, aFlavor);
         OSL_ENSURE(bSuccess, "OReportExchange::extractCopies: invalid data format (no flavor)!");
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index 860da4b03c3a..543780841984 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -167,11 +167,11 @@ DlgEdFunc::~DlgEdFunc()
 
 
 
-sal_Bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt )
+bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt )
 {
     m_aMDPos = m_pParent->PixelToLogic( rMEvt.GetPosPixel() );
     m_pParent->GrabFocus();
-    sal_Bool bHandled = sal_False;
+    bool bHandled = false;
     if ( rMEvt.IsLeft() )
     {
         if ( rMEvt.GetClicks() > 1 )
@@ -189,7 +189,7 @@ sal_Bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt )
                 // m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
                 //    if ( aVEvt.pRootObj && aVEvt.pRootObj->ISA(SdrTextObj) )
                 //        SetInEditMode(static_cast<SdrTextObj *>(aVEvt.pRootObj),rMEvt, sal_False);
-                bHandled = sal_True;
+                bHandled = true;
             }
         }
         else
@@ -199,7 +199,7 @@ sal_Bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt )
             // if selected object was hit, drag object
             if ( pHdl!=NULL || m_rView.IsMarkedHit(m_aMDPos) )
             {
-                bHandled = sal_True;
+                bHandled = true;
                 m_pParent->CaptureMouse();
                 m_pParent->getSectionWindow()->getViewsWindow()->BegDragObj(m_aMDPos, pHdl,&m_rView);
             }
@@ -216,10 +216,10 @@ sal_Bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt )
         else
             m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL);
 
-        bHandled = sal_True;
+        bHandled = true;
     }
     else if( !rMEvt.IsLeft() )
-        bHandled = sal_True;
+        bHandled = true;
     if ( !bHandled )
         m_pParent->CaptureMouse();
     return bHandled;
@@ -227,9 +227,9 @@ sal_Bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt )
 
 
 
-sal_Bool DlgEdFunc::MouseButtonUp( const MouseEvent& /*rMEvt*/ )
+bool DlgEdFunc::MouseButtonUp( const MouseEvent& /*rMEvt*/ )
 {
-    sal_Bool bHandled = sal_False;
+    bool bHandled = false;
     m_pParent->getSectionWindow()->getViewsWindow()->stopScrollTimer();
     return bHandled;
 }
@@ -263,14 +263,14 @@ void DlgEdFunc::stopScrollTimer()
 }
 
 
-sal_Bool DlgEdFunc::MouseMove( const MouseEvent& /*rMEvt*/ )
+bool DlgEdFunc::MouseMove( const MouseEvent& /*rMEvt*/ )
 {
-    return sal_False;
+    return false;
 }
 
-sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent)
+bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent)
 {
-    sal_Bool bReturn = sal_False;
+    bool bReturn = false;
 
     if ( !m_bUiActive )
     {
@@ -284,12 +284,12 @@ sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent)
                 if ( m_pParent->getSectionWindow()->getViewsWindow()->IsAction() )
                 {
                     m_pParent->getSectionWindow()->getViewsWindow()->BrkAction();
-                    bReturn = sal_True;
+                    bReturn = true;
                 }
                 else if ( m_rView.IsTextEdit() )
                 {
                     m_rView.SdrEndTextEdit();
-                    bReturn = sal_True;
+                    bReturn = true;
                 }
                 else if ( m_rView.AreObjectsMarked() )
                 {
@@ -301,7 +301,7 @@ sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent)
                         m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL);
 
                     deactivateOle(true);
-                    bReturn = sal_False;
+                    bReturn = false;
                 }
                 else
                 {
@@ -324,7 +324,7 @@ sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent)
                     if ( m_rView.AreObjectsMarked() )
                         m_rView.MakeVisible( m_rView.GetAllMarkedRect(), *m_pParent);
 
-                    bReturn = sal_True;
+                    bReturn = true;
                 }
                 else if ( rCode.IsMod1() && rCode.IsMod2())
                 {
@@ -341,7 +341,7 @@ sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent)
                         m_rView.MakeVisible( aVisRect, *m_pParent);
                     }
 
-                    bReturn = sal_True;
+                    bReturn = true;
                 }
             }
             break;
@@ -351,7 +351,7 @@ sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent)
             case KEY_RIGHT:
             {
                 m_pParent->getSectionWindow()->getViewsWindow()->handleKey(rCode);
-                bReturn = sal_True;
+                bReturn = true;
             }
             break;
             case KEY_RETURN:
@@ -368,7 +368,7 @@ sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent)
             case KEY_DELETE:
                 if ( !rCode.IsMod1() && !rCode.IsMod2() )
                 {
-                    bReturn = sal_True;
+                    bReturn = true;
                     break;
                 }
                 // run through
@@ -664,10 +664,10 @@ DlgEdFuncInsert::~DlgEdFuncInsert()
 
 
 
-sal_Bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt )
+bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt )
 {
     if ( DlgEdFunc::MouseButtonDown(rMEvt) )
-        return sal_True;
+        return true;
 
     SdrViewEvent aVEvt;
     sal_Int16 nId = m_rView.GetCurrentObjIdentifier();
@@ -679,7 +679,7 @@ sal_Bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt )
     {
         // there is an object under the mouse cursor, but not a customshape
         m_pParent->getSectionWindow()->getViewsWindow()->BrkAction();
-        return sal_False;
+        return false;
     }
 
     if( eHit != SDRHIT_UNMARKEDOBJECT || nId == OBJ_CUSTOMSHAPE)
@@ -704,19 +704,19 @@ sal_Bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt )
         m_pParent->getSectionWindow()->getViewsWindow()->BegMarkObj( m_aMDPos,&m_rView );
     }
 
-    return sal_True;
+    return true;
 }
 
 
-sal_Bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
+bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
 {
     if ( DlgEdFunc::MouseButtonUp( rMEvt ) )
-        return sal_True;
+        return true;
 
     const Point aPos( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) );
     const sal_uInt16 nHitLog = sal_uInt16 ( m_pParent->PixelToLogic(Size(3,0)).Width() );
 
-    sal_Bool bReturn = sal_True;
+    bool bReturn = true;
     // object creation active?
     if ( m_rView.IsCreateObj() )
     {
@@ -725,7 +725,7 @@ sal_Bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
             m_pParent->getSectionWindow()->getViewsWindow()->BrkAction();
             // BrkAction disables the create mode
             m_rView.SetCreateMode( true );
-            return sal_True;
+            return true;
         }
 
         m_rView.EndCreateObj(SDRCREATE_FORCEEND);
@@ -771,10 +771,10 @@ sal_Bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
 
 
 
-sal_Bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt )
+bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt )
 {
     if ( DlgEdFunc::MouseMove(rMEvt ) )
-        return sal_True;
+        return true;
     Point   aPos( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) );
 
     if ( m_rView.IsCreateObj() )
@@ -802,7 +802,7 @@ sal_Bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt )
     if ( !bIsSetPoint )
         m_pParent->SetPointer( m_rView.GetPreferredPointer( aPos, m_pParent) );
 
-    return sal_True;
+    return true;
 }
 
 
@@ -820,11 +820,11 @@ DlgEdFuncSelect::~DlgEdFuncSelect()
 
 
 
-sal_Bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt )
+bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt )
 {
     m_bSelectionMode = false;
     if ( DlgEdFunc::MouseButtonDown(rMEvt) )
-        return sal_True;
+        return true;
 
     SdrViewEvent aVEvt;
     const SdrHitKind eHit = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
@@ -861,15 +861,15 @@ sal_Bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt )
         }
     }
 
-    return sal_True;
+    return true;
 }
 
 
 
-sal_Bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt )
+bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt )
 {
     if ( DlgEdFunc::MouseButtonUp( rMEvt ) )
-        return sal_True;
+        return true;
 
     // get view from parent
     const Point aPnt( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) );
@@ -885,15 +885,15 @@ sal_Bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt )
     if ( !m_bUiActive )
         m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->UpdatePropertyBrowserDelayed(m_rView);
     m_bSelectionMode = false;
-    return sal_True;
+    return true;
 }
 
 
 
-sal_Bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt )
+bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt )
 {
     if ( DlgEdFunc::MouseMove(rMEvt ) )
-        return sal_True;
+        return true;
 
     Point aPnt( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) );
     bool bIsSetPoint = false;
@@ -931,7 +931,7 @@ sal_Bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt )
         unColorizeOverlappedObj();
     }
 
-    return sal_True;
+    return true;
 }
 
 
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index 9bb9fc6d62b6..ec347b649def 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -97,7 +97,7 @@ PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, Window* pParent, O
           ,m_xORB(_xORB)
           ,m_pDesignView(_pDesignView)
           ,m_pView( NULL )
-          ,m_bInitialStateChange(sal_True)
+          ,m_bInitialStateChange(true)
 {
 
     Size aPropWinSize(STD_WIN_SIZE_X,STD_WIN_SIZE_Y);
@@ -444,16 +444,16 @@ void PropBrw::Resize()
         ::Size aMinSize = getMinimumSize();
         SetMinOutputSizePixel( aMinSize );
         ::Size aSize = GetOutputSizePixel();
-        sal_Bool bResize = sal_False;
+        bool bResize = false;
         if( aSize.Width() < aMinSize.Width() )
         {
             aSize.setWidth( aMinSize.Width() );
-            bResize = sal_True;
+            bResize = true;
         }
         if( aSize.Height() < aMinSize.Height() )
         {
             aSize.setHeight( aMinSize.Height() );
-            bResize = sal_True;
+            bResize = true;
         }
         if( bResize )
             SetOutputSizePixel( aSize );
@@ -482,7 +482,7 @@ void PropBrw::Update( OSectionView* pNewView )
         {
             // if we're just newly created, we want to have the focus
             PostUserEvent( LINK( this, PropBrw, OnAsyncGetFocus ) );
-            m_bInitialStateChange = sal_False;
+            m_bInitialStateChange = false;
             // and additionally, we want to show the page which was active during
             // our previous incarnation
             if ( !m_sLastActivePage.isEmpty() && m_xBrowserController.is() )