connectivity: sal_Bool->bool

Change-Id: Ia45f9776e0b27720647c664541a41b5f46eedc37

7 files changed, 22 insertions, 22 deletions

diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx
index 055dec7eba02..83fa8e401a39 100644
--- a/connectivity/source/commontools/filtermanager.cxx
+++ b/connectivity/source/commontools/filtermanager.cxx
@@ -86,7 +86,7 @@ namespace dbtools
     }
 
 
-    void FilterManager::setApplyPublicFilter( sal_Bool _bApply )
+    void FilterManager::setApplyPublicFilter( bool _bApply )
     {
         if ( m_bApplyPublicFilter == _bApply )
             return;
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index 03373a9b6762..fc99432f3656 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -76,7 +76,7 @@ namespace dbtools
     //= OPredicateInputController
 
 
-    sal_Bool OPredicateInputController::getSeparatorChars( const Locale& _rLocale, sal_Unicode& _rDecSep, sal_Unicode& _rThdSep ) const
+    bool OPredicateInputController::getSeparatorChars( const Locale& _rLocale, sal_Unicode& _rDecSep, sal_Unicode& _rThdSep ) const
     {
         _rDecSep = '.';
         _rThdSep = ',';
@@ -88,14 +88,14 @@ namespace dbtools
                 aLocaleData = m_xLocaleData->getLocaleItem( _rLocale );
                 _rDecSep = lcl_getSeparatorChar( aLocaleData.decimalSeparator, _rDecSep );
                 _rThdSep = lcl_getSeparatorChar( aLocaleData.decimalSeparator, _rThdSep );
-                return sal_True;
+                return true;
             }
         }
         catch( const Exception& )
         {
             OSL_FAIL( "OPredicateInputController::getSeparatorChars: caught an exception!" );
         }
-        return sal_False;
+        return false;
     }
 
 
@@ -245,13 +245,13 @@ namespace dbtools
     }
 
 
-    sal_Bool OPredicateInputController::normalizePredicateString(
+    bool OPredicateInputController::normalizePredicateString(
         OUString& _rPredicateValue, const Reference< XPropertySet > & _rxField, OUString* _pErrorMessage ) const
     {
         OSL_ENSURE( m_xConnection.is() && m_xFormatter.is() && _rxField.is(),
             "OPredicateInputController::normalizePredicateString: invalid state or params!" );
 
-        sal_Bool bSuccess = sal_False;
+        bool bSuccess = false;
         if ( m_xConnection.is() && m_xFormatter.is() && _rxField.is() )
         {
             // parse the string
@@ -275,7 +275,7 @@ namespace dbtools
                 _rPredicateValue = sTransformedText;
                 delete pParseNode;
 
-                bSuccess = sal_True;
+                bSuccess = true;
             }
         }
 
@@ -285,7 +285,7 @@ namespace dbtools
 
     OUString OPredicateInputController::getPredicateValue(
         const OUString& _rPredicateValue, const Reference< XPropertySet > & _rxField,
-        sal_Bool _bForStatementUse, OUString* _pErrorMessage ) const
+        bool _bForStatementUse, OUString* _pErrorMessage ) const
     {
         OSL_ENSURE( _rxField.is(), "OPredicateInputController::getPredicateValue: invalid params!" );
         OUString sReturn;
@@ -331,7 +331,7 @@ namespace dbtools
     }
 
     OUString OPredicateInputController::getPredicateValue(
-        const OUString& _sField, const OUString& _rPredicateValue, sal_Bool _bForStatementUse, OUString* _pErrorMessage ) const
+        const OUString& _sField, const OUString& _rPredicateValue, bool _bForStatementUse, OUString* _pErrorMessage ) const
     {
         OUString sReturn = _rPredicateValue;
         OUString sError;
@@ -381,7 +381,7 @@ namespace dbtools
         return pParseNode ? implParseNode(pParseNode,_bForStatementUse) : sReturn;
     }
 
-    OUString OPredicateInputController::implParseNode(OSQLParseNode* pParseNode,sal_Bool _bForStatementUse) const
+    OUString OPredicateInputController::implParseNode(OSQLParseNode* pParseNode, bool _bForStatementUse) const
     {
         OUString sReturn;
         if ( pParseNode )
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index be208be92eb1..d91e7adef86d 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -1513,11 +1513,11 @@ namespace
                     if ( i_xSelectColumns.is() && i_xSelectColumns->hasByName(pAndIter->Name) )
                     {
                         Reference<XPropertySet> xColumn(i_xSelectColumns->getByName(pAndIter->Name),UNO_QUERY);
-                        sValue = i_aPredicateInputController.getPredicateValue(sValue,xColumn,sal_True);
+                        sValue = i_aPredicateInputController.getPredicateValue(sValue,xColumn,true);
                     }
                     else
                     {
-                        sValue = i_aPredicateInputController.getPredicateValue(pAndIter->Name,sValue,sal_True);
+                        sValue = i_aPredicateInputController.getPredicateValue(pAndIter->Name,sValue,true);
                     }
                     lcl_addFilterCriteria_throw(pAndIter->Handle,sValue,sRet);
                     ++pAndIter;
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index 94030cd30039..1cc360b06491 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -248,7 +248,7 @@ namespace dbaui
 
                         OUString sValue;
                         pValues->Value >>= sValue;
-                        pValues->Value <<= OUString( m_aPredicateInput.getPredicateValue( sValue, xParamAsSet, sal_False ) );
+                        pValues->Value <<= OUString( m_aPredicateInput.getPredicateValue( sValue, xParamAsSet, false ) );
                     }
                 }
                 catch(Exception&)
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index d6825305ce9f..b5d7f883e8f0 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -346,7 +346,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom
     _rFilter.Handle = GetOSQLPredicateType( _rComp.GetSelectEntry() );
     if ( SQLFilterOperator::SQLNULL != _rFilter.Handle && _rFilter.Handle != SQLFilterOperator::NOT_SQLNULL )
     {
-        OUString sPredicateValue = m_aPredicateInput.getPredicateValue( _rValue.GetText(), getMatchingColumn( _rValue ), sal_False );
+        OUString sPredicateValue = m_aPredicateInput.getPredicateValue( _rValue.GetText(), getMatchingColumn( _rValue ), false );
         if ( _rFilter.Handle == SQLFilterOperator::LIKE ||
              _rFilter.Handle == SQLFilterOperator::NOT_LIKE )
             ::Replace_OS_PlaceHolder( sPredicateValue );
diff --git a/include/connectivity/filtermanager.hxx b/include/connectivity/filtermanager.hxx
index 2753d950eb1f..11101c347d2e 100644
--- a/include/connectivity/filtermanager.hxx
+++ b/include/connectivity/filtermanager.hxx
@@ -72,7 +72,7 @@ namespace dbtools
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
                                             m_xComponentAggregate;
         ::std::vector< OUString >           m_aFilterComponents;
-        sal_Bool                            m_bApplyPublicFilter;
+        bool                                m_bApplyPublicFilter;
 
     public:
         /// ctor
@@ -87,8 +87,8 @@ namespace dbtools
         const OUString&  getFilterComponent( FilterComponent _eWhich ) const;
         void                    setFilterComponent( FilterComponent _eWhich, const OUString& _rComponent );
 
-        inline sal_Bool isApplyPublicFilter( ) const { return m_bApplyPublicFilter; }
-               void     setApplyPublicFilter( sal_Bool _bApply );
+        inline bool     isApplyPublicFilter( ) const { return m_bApplyPublicFilter; }
+               void     setApplyPublicFilter( bool _bApply );
 
     private:
         /** retrieves a filter which is a conjunction of all single filter components
diff --git a/include/connectivity/predicateinput.hxx b/include/connectivity/predicateinput.hxx
index 6c0829915794..45b20987a1f8 100644
--- a/include/connectivity/predicateinput.hxx
+++ b/include/connectivity/predicateinput.hxx
@@ -68,7 +68,7 @@ namespace dbtools
             If not <NULL/>, and a parsing error occurs, the error message will be copied to the string the argument
             points to.
         */
-        sal_Bool        normalizePredicateString(
+        bool        normalizePredicateString(
             OUString& _rPredicateValue,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField,
             OUString* _pErrorMessage = NULL
@@ -90,14 +90,14 @@ namespace dbtools
         OUString getPredicateValue(
             const OUString& _rPredicateValue,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _rxField,
-            sal_Bool _bForStatementUse,
+            bool _bForStatementUse,
             OUString* _pErrorMessage = NULL
         ) const;
 
         OUString getPredicateValue(
             const OUString& _sField
             , const OUString& _rPredicateValue
-            , sal_Bool _bForStatementUse
+            , bool _bForStatementUse
             , OUString* _pErrorMessage = NULL) const;
 
     private:
@@ -107,13 +107,13 @@ namespace dbtools
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _rxField
         ) const;
 
-        sal_Bool getSeparatorChars(
+        bool getSeparatorChars(
             const ::com::sun::star::lang::Locale& _rLocale,
             sal_Unicode& _rDecSep,
             sal_Unicode& _rThdSep
         ) const;
 
-        OUString implParseNode(::connectivity::OSQLParseNode* pParseNode,sal_Bool _bForStatementUse) const;
+        OUString implParseNode(::connectivity::OSQLParseNode* pParseNode, bool _bForStatementUse) const;
     };