From bfb185c408f6630d17bdcf9243666cc1b0af5bd7 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 20 Apr 2016 17:17:08 +0200
Subject: loplugin:salbool: Automatic rewrite of sal_False/True

Change-Id: I74cf43df85a878ee9af69901b2535f63461cb61e
---
 forms/source/component/CheckBox.cxx          |  4 ++--
 forms/source/component/Columns.cxx           |  2 +-
 forms/source/component/DatabaseForm.cxx      | 26 +++++++++++++-------------
 forms/source/component/Filter.cxx            | 12 ++++++------
 forms/source/component/FormComponent.cxx     | 10 +++++-----
 forms/source/component/FormattedField.cxx    |  2 +-
 forms/source/component/Grid.cxx              |  4 ++--
 forms/source/component/ImageControl.cxx      |  2 +-
 forms/source/component/ListBox.cxx           |  2 +-
 forms/source/component/clickableimage.cxx    |  4 ++--
 forms/source/helper/windowstateguard.cxx     |  2 +-
 forms/source/misc/limitedformats.cxx         |  2 +-
 forms/source/richtext/featuredispatcher.cxx  |  4 ++--
 forms/source/richtext/richtextmodel.cxx      |  2 +-
 forms/source/richtext/specialdispatchers.cxx |  6 +++---
 forms/source/runtime/formoperations.cxx      | 20 ++++++++++----------
 forms/source/runtime/formoperations.hxx      |  2 +-
 forms/source/xforms/binding.cxx              |  2 +-
 forms/source/xforms/datatypes.cxx            |  4 ++--
 forms/source/xforms/model_ui.cxx             |  4 ++--
 forms/source/xforms/propertysetbase.cxx      |  6 +++---
 forms/source/xforms/submission.cxx           |  2 +-
 forms/source/xforms/submission/replace.cxx   |  4 ++--
 23 files changed, 64 insertions(+), 64 deletions(-)

(limited to 'forms')

diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx
index f28a76686367..432899a67a8c 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -246,13 +246,13 @@ bool OCheckBoxModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
                     break;
                 case TRISTATE_TRUE:
                     if (DbUseBool())
-                        m_xColumnUpdate->updateBoolean( sal_True );
+                        m_xColumnUpdate->updateBoolean( true );
                     else
                         m_xColumnUpdate->updateString( getReferenceValue() );
                     break;
                 case TRISTATE_FALSE:
                     if (DbUseBool())
-                        m_xColumnUpdate->updateBoolean( sal_False );
+                        m_xColumnUpdate->updateBoolean( false );
                     else
                         m_xColumnUpdate->updateString( getNoCheckReferenceValue() );
                     break;
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index a1fc73b5a6d0..154e7dc41045 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -198,7 +198,7 @@ Any SAL_CALL OGridColumn::queryAggregation( const Type& _rType ) throw (RuntimeE
 OGridColumn::OGridColumn( const Reference<XComponentContext>& _rContext, const OUString& _sModelName )
     :OGridColumn_BASE(m_aMutex)
     ,OPropertySetAggregationHelper(OGridColumn_BASE::rBHelper)
-    ,m_aHidden( makeAny( sal_False ) )
+    ,m_aHidden( makeAny( false ) )
     ,m_aModelName(_sModelName)
 {
 
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 42174033a497..395b2817dee9 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -1191,7 +1191,7 @@ bool ODatabaseForm::executeRowSet(::osl::ResettableMutexGuard& _rClearForNotifie
 
         // switch to "insert only" mode
         saveInsertOnlyState( );
-        m_xAggregateSet->setPropertyValue( PROPERTY_INSERTONLY, makeAny( sal_True ) );
+        m_xAggregateSet->setPropertyValue( PROPERTY_INSERTONLY, makeAny( true ) );
     }
     else if (m_bAllowInsert || m_bAllowUpdate || m_bAllowDelete)
         nConcurrency = ResultSetConcurrency::UPDATABLE;
@@ -1883,7 +1883,7 @@ Any ODatabaseForm::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
     {
         case PROPERTY_ID_INSERTONLY:
         case PROPERTY_ID_DYNAMIC_CONTROL_BORDER:
-            aReturn <<= sal_False;
+            aReturn <<= false;
             break;
 
         case PROPERTY_ID_FILTER:
@@ -1891,7 +1891,7 @@ Any ODatabaseForm::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
             break;
 
         case PROPERTY_ID_APPLYFILTER:
-            aReturn <<= sal_True;
+            aReturn <<= true;
             break;
 
         case PROPERTY_ID_NAVIGATION:
@@ -2420,9 +2420,9 @@ sal_Bool SAL_CALL ODatabaseForm::getGroupControl() throw(css::uno::RuntimeExcept
     }
 
     if (isLoaded() && getConnection().is())
-        return sal_True;
+        return true;
 
-    return sal_False;
+    return false;
 }
 
 
@@ -3105,7 +3105,7 @@ sal_Bool SAL_CALL ODatabaseForm::approveCursorMove(const EventObject& event) thr
             try
             {
                 if ( !xListener->approveCursorMove( event ) )
-                    return sal_False;
+                    return false;
             }
             catch (const DisposedException& e)
             {
@@ -3130,9 +3130,9 @@ sal_Bool SAL_CALL ODatabaseForm::approveCursorMove(const EventObject& event) thr
         // ask our own RowSetChangesListeners, too
         ::osl::ClearableMutexGuard aGuard( m_aMutex );
         if ( !impl_approveRowChange_throw( event, false, aGuard ) )
-            return sal_False;
+            return false;
     }
-    return sal_True;
+    return true;
 }
 
 
@@ -3172,7 +3172,7 @@ sal_Bool SAL_CALL ODatabaseForm::approveRowChange(const RowChangeEvent& event) t
         }
         return true;
     }
-    return sal_True;
+    return true;
 }
 
 
@@ -3183,7 +3183,7 @@ sal_Bool SAL_CALL ODatabaseForm::approveRowSetChange(const EventObject& event) t
         ::osl::ClearableMutexGuard aGuard( m_aMutex );
         bool bWasLoaded = isLoaded();
         if ( !impl_approveRowChange_throw( event, false, aGuard ) )
-            return sal_False;
+            return false;
 
         if ( bWasLoaded )
         {
@@ -3197,9 +3197,9 @@ sal_Bool SAL_CALL ODatabaseForm::approveRowSetChange(const EventObject& event) t
         // ask our own RowSetChangesListeners, too
         ::osl::ClearableMutexGuard aGuard( m_aMutex );
         if ( !impl_approveRowChange_throw( event, false, aGuard ) )
-            return sal_False;
+            return false;
     }
-    return sal_True;
+    return true;
 }
 
 
@@ -3852,7 +3852,7 @@ void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutS
     if (m_xAggregateSet.is())
         _rxOutStream->writeBoolean(getBOOL(m_xAggregateSet->getPropertyValue(PROPERTY_INSERTONLY)));
     else
-        _rxOutStream->writeBoolean(sal_False);
+        _rxOutStream->writeBoolean(false);
 
     _rxOutStream->writeBoolean(m_bAllowInsert);
     _rxOutStream->writeBoolean(m_bAllowUpdate);
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index 1bd9a8632a9b..805edef48a25 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -499,7 +499,7 @@ namespace frm
 #if HAVE_FEATURE_DBCONNECTIVITY
         if ( !ensureInitialized( ) )
             // already asserted in ensureInitialized
-            return sal_True;
+            return true;
 
         OUString aText;
         switch (m_nControlClass)
@@ -512,7 +512,7 @@ namespace frm
                     aText = xText->getText();
             }   break;
             default:
-                return sal_True;
+                return true;
         }
         if (m_aText.compareTo(aText))
         {
@@ -530,7 +530,7 @@ namespace frm
                     aError.Message = FRM_RES_STRING( RID_STR_SYNTAXERROR );
                     aError.Details = sErrorMessage;
                     displayException( aError );
-                    return sal_False;
+                    return false;
                 }
             }
 
@@ -542,7 +542,7 @@ namespace frm
                 static_cast< XTextListener* >( aIt.next() )->textChanged( aEvt );
         }
 #endif
-        return sal_True;
+        return true;
     }
 
     // XTextComponent
@@ -634,12 +634,12 @@ namespace frm
                     {
                         while ( xListBox->getSelectedItemPos() >= 0 )
                         {
-                            xListBox->selectItemPos( xListBox->getSelectedItemPos(), sal_False );
+                            xListBox->selectItemPos( xListBox->getSelectedItemPos(), false );
                         }
                     }
                     else
                     {
-                        xListBox->selectItem( m_aText, sal_True );
+                        xListBox->selectItem( m_aText, true );
                     }
                 }
             }
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index e042c202c382..e33cfb11df08 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -289,7 +289,7 @@ Reference<XWindowPeer> SAL_CALL OControl::getPeer() throw ( RuntimeException, st
 sal_Bool SAL_CALL OControl::setModel(const Reference<XControlModel>& Model) throw ( RuntimeException, std::exception)
 {
     if ( !m_xControl.is() )
-        return sal_False;
+        return false;
 
     bool bSuccess = m_xControl->setModel( Model );
     impl_resetStateGuard_nothrow();
@@ -1111,7 +1111,7 @@ void OControlModel::firePropertyChanges( const Sequence< sal_Int32 >& _rHandles,
         _rNewValues.getConstArray(),
         _rOldValues.getConstArray(),
         _rHandles.getLength(),
-        sal_False
+        false
     );
 }
 
@@ -1123,7 +1123,7 @@ void OControlModel::firePropertyChanges( const std::vector< sal_Int32 >& _rHandl
         _rNewValues.data(),
         _rOldValues.data(),
         _rHandles.size(),
-        sal_False
+        false
     );
 }
 
@@ -1881,13 +1881,13 @@ sal_Bool SAL_CALL OBoundControlModel::commit() throw(RuntimeException, std::exce
             // but for those derivees which did not use this feature, we need an
             // explicit transfer
             transferControlValueToExternal( aLock );
-        return sal_True;
+        return true;
     }
 
     OSL_ENSURE( !hasExternalValueBinding(), "OBoundControlModel::commit: control flow broken!" );
         // we reach this only if we're not working with an external binding
     if ( !hasField() )
-        return sal_True;
+        return true;
     ::comphelper::OInterfaceIteratorHelper2 aIter( m_aUpdateListeners );
     EventObject aEvent;
     aEvent.Source = static_cast< XWeak* >( this );
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index b00f7ceb8d37..d0ac79437f38 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -758,7 +758,7 @@ void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) thr
                 if (xFormats.is())
                 {
                     Locale aDescriptionLanguage( LanguageTag::convertToLocale(eDescriptionLanguage));
-                    nKey = xFormats->queryKey(sFormatDescription, aDescriptionLanguage, sal_False);
+                    nKey = xFormats->queryKey(sFormatDescription, aDescriptionLanguage, false);
                     if (nKey == (sal_Int32)-1)
                     {   // does not yet exist in my formatter...
                         nKey = xFormats->addNew(sFormatDescription, aDescriptionLanguage);
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index ee5a54d25a80..2b3459178877 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -294,9 +294,9 @@ sal_Bool SAL_CALL OGridControlModel::select(const Any& rElement) throw(IllegalAr
         m_xSelection = xSel;
         aGuard.clear();
         m_aSelectListeners.notifyEach( &XSelectionChangeListener::selectionChanged, EventObject( *this ) );
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 Any SAL_CALL OGridControlModel::getSelection() throw(RuntimeException, std::exception)
 {
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 88f79b4aadd6..c6cf462915af 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -895,7 +895,7 @@ void OImageControlControl::mousePressed(const css::awt::MouseEvent& e) throw ( c
 
             // check if the ImageURL is empty
             if ( impl_isEmptyGraphics_nothrow() )
-                xMenu->enableItem( ID_CLEAR_GRAPHICS, sal_False );
+                xMenu->enableItem( ID_CLEAR_GRAPHICS, false );
 
             awt::Rectangle aRect( e.X, e.Y, 0, 0 );
             if ( ( e.X < 0 ) || ( e.Y < 0 ) )
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index b616fb77b412..3275718d48b2 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -2108,7 +2108,7 @@ namespace frm
     {
         if ( m_xAggregateListBox.is() )
             return m_xAggregateListBox->isMutipleMode();
-        return sal_False;
+        return false;
     }
 
 
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index ea71a9f08412..82aafb5aa57e 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -491,7 +491,7 @@ namespace frm
             // simulate a propertyChanged event for the ImageURL
             Any aImageURL;
             getFastPropertyValue( aImageURL, PROPERTY_ID_IMAGE_URL );
-            _propertyChanged( PropertyChangeEvent( *this, PROPERTY_IMAGE_URL, sal_False, PROPERTY_ID_IMAGE_URL, Any( ), aImageURL ) );
+            _propertyChanged( PropertyChangeEvent( *this, PROPERTY_IMAGE_URL, false, PROPERTY_ID_IMAGE_URL, Any( ), aImageURL ) );
         }
         osl_atomic_decrement( &m_refCount );
     }
@@ -848,7 +848,7 @@ namespace frm
             case PROPERTY_ID_BUTTONTYPE             : return makeAny( FormButtonType_PUSH );
             case PROPERTY_ID_TARGET_URL             :
             case PROPERTY_ID_TARGET_FRAME           : return makeAny( OUString() );
-            case PROPERTY_ID_DISPATCHURLINTERNAL    : return makeAny( sal_False );
+            case PROPERTY_ID_DISPATCHURLINTERNAL    : return makeAny( false );
             default:
                 return OControlModel::getPropertyDefaultByHandle(nHandle);
         }
diff --git a/forms/source/helper/windowstateguard.cxx b/forms/source/helper/windowstateguard.cxx
index 330424e9a6e4..e2f17d705d93 100644
--- a/forms/source/helper/windowstateguard.cxx
+++ b/forms/source/helper/windowstateguard.cxx
@@ -131,7 +131,7 @@ namespace frm
                         >>= bShouldBeEnabled );
 
             if ( !bShouldBeEnabled && bEnabled )
-                xWindow->setEnable( sal_False );
+                xWindow->setEnable( false );
         }
         catch( const Exception& )
         {
diff --git a/forms/source/misc/limitedformats.cxx b/forms/source/misc/limitedformats.cxx
index ae27f25a2f34..0e62e5d0cc1d 100644
--- a/forms/source/misc/limitedformats.cxx
+++ b/forms/source/misc/limitedformats.cxx
@@ -167,7 +167,7 @@ namespace frm
                         pLoopFormats->nKey = xStandardFormats->queryKey(
                             OUString::createFromAscii(pLoopFormats->pDescription),
                             getLocale(pLoopFormats->eLocale),
-                            sal_False
+                            false
                         );
 
                         if (-1 == pLoopFormats->nKey)
diff --git a/forms/source/richtext/featuredispatcher.cxx b/forms/source/richtext/featuredispatcher.cxx
index 1e0ec84b57db..30bb442ea414 100644
--- a/forms/source/richtext/featuredispatcher.cxx
+++ b/forms/source/richtext/featuredispatcher.cxx
@@ -96,10 +96,10 @@ namespace frm
     FeatureStateEvent ORichTextFeatureDispatcher::buildStatusEvent() const
     {
         FeatureStateEvent aEvent;
-        aEvent.IsEnabled = sal_False;
+        aEvent.IsEnabled = false;
         aEvent.Source = *const_cast< ORichTextFeatureDispatcher* >( this );
         aEvent.FeatureURL = getFeatureURL();
-        aEvent.Requery = sal_False;
+        aEvent.Requery = false;
         return aEvent;
     }
 
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index c2faf06964e8..6ec032d2e381 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -605,7 +605,7 @@ namespace frm
             sal_Int32 nHandle = PROPERTY_ID_TEXT;
             Any aOldValue; aOldValue <<= m_sLastKnownEngineText;
             Any aNewValue; aNewValue <<= sCurrentEngineText;
-            fire( &nHandle, &aNewValue, &aOldValue, 1, sal_False );
+            fire( &nHandle, &aNewValue, &aOldValue, 1, false );
 
             m_sLastKnownEngineText = sCurrentEngineText;
         }
diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx
index fd9be3973820..a745bb45caf4 100644
--- a/forms/source/richtext/specialdispatchers.cxx
+++ b/forms/source/richtext/specialdispatchers.cxx
@@ -78,7 +78,7 @@ namespace frm
     FeatureStateEvent OSelectAllDispatcher::buildStatusEvent() const
     {
         FeatureStateEvent aEvent( ORichTextFeatureDispatcher::buildStatusEvent() );
-        aEvent.IsEnabled = sal_True;
+        aEvent.IsEnabled = true;
         return aEvent;
     }
 
@@ -96,7 +96,7 @@ namespace frm
         EditEngine* pEngine = getEditView() ? getEditView()->GetEditEngine() : nullptr;
         OSL_ENSURE( pEngine, "OParagraphDirectionDispatcher::dispatch: no edit engine - but not yet disposed?" );
         if ( pEngine && pEngine->IsVertical() )
-            aEvent.IsEnabled = sal_False;
+            aEvent.IsEnabled = false;
 
         return aEvent;
     }
@@ -131,7 +131,7 @@ namespace frm
         EditEngine* pEngine = getEditView() ? getEditView()->GetEditEngine() : nullptr;
         OSL_ENSURE( pEngine, "OTextDirectionDispatcher::dispatch: no edit engine - but not yet disposed?" );
 
-        aEvent.IsEnabled = sal_True;
+        aEvent.IsEnabled = true;
         aEvent.State <<= pEngine && pEngine->IsVertical();
 
         return aEvent;
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index 6bf77db9e54f..96e7a1f7c481 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -217,7 +217,7 @@ namespace frm
         MethodGuard aGuard( *this );
 
         FeatureState aState;
-        aState.Enabled = sal_False;
+        aState.Enabled = false;
 
         try
         {
@@ -248,7 +248,7 @@ namespace frm
             case FormFeature::DeleteRecord:
                 // already deleted ?
                 if ( m_xCursor->rowDeleted() )
-                    aState.Enabled = sal_False;
+                    aState.Enabled = false;
                 else
                 {
                     // allowed to delete the row ?
@@ -344,20 +344,20 @@ namespace frm
                         // can't insert records -> disabled
                         if ( !nCount && !::dbtools::canInsert( m_xCursorProperties ) )
                         {
-                            aState.Enabled = sal_False;
+                            aState.Enabled = false;
                         }
                         else
                         {
                             if ( bIsNew )
                                 nPosition = ++nCount;
                             aState.State <<= (sal_Int32)nPosition;
-                            aState.Enabled = sal_True;
+                            aState.Enabled = true;
                         }
                     }
                     else
                     {
                         aState.State <<= (sal_Int32)nPosition;
-                        aState.Enabled = sal_True;
+                        aState.Enabled = true;
                     }
                 }
             }
@@ -377,7 +377,7 @@ namespace frm
                     sValue += " *";
 
                 aState.State <<= sValue;
-                aState.Enabled = sal_True;
+                aState.Enabled = true;
             }
             break;
 
@@ -868,7 +868,7 @@ namespace frm
     sal_Bool SAL_CALL FormOperations::commitCurrentRecord( sal_Bool& _out_rRecordInserted ) throw (RuntimeException, SQLException, std::exception)
     {
         MethodGuard aGuard( *this );
-        _out_rRecordInserted = sal_False;
+        _out_rRecordInserted = false;
 
         return impl_commitCurrentRecord_throw( &_out_rRecordInserted );
     }
@@ -892,7 +892,7 @@ namespace frm
             {
                 m_xUpdateCursor->insertRow();
                 if ( _pRecordInserted )
-                    *_pRecordInserted = sal_True;
+                    *_pRecordInserted = true;
             }
             else
                 m_xUpdateCursor->updateRow();
@@ -1453,7 +1453,7 @@ namespace frm
         if ( !impl_hasCursor_nothrow() )
             return;
 
-        sal_Bool bRecordInserted = sal_False;
+        sal_Bool bRecordInserted = false;
         bool bSuccess = impl_commitCurrentRecord_throw( &bRecordInserted );
 
         if ( !bSuccess )
@@ -1487,7 +1487,7 @@ namespace frm
         if ( !impl_hasCursor_nothrow() )
             return;
 
-        sal_Bool bRecordInserted = sal_False;
+        sal_Bool bRecordInserted = false;
         bool bSuccess = impl_commitCurrentRecord_throw( &bRecordInserted );
 
         if ( !bSuccess )
diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx
index afde4af11da7..d4c71d4db96a 100644
--- a/forms/source/runtime/formoperations.hxx
+++ b/forms/source/runtime/formoperations.hxx
@@ -333,7 +333,7 @@ namespace frm
                 , m_xField(xField)
             {};
 
-            void operator()() { m_pFO->m_xParser->appendFilterByColumn( m_xField, sal_True, css::sdb::SQLFilterOperator::EQUAL ); }
+            void operator()() { m_pFO->m_xParser->appendFilterByColumn( m_xField, true, css::sdb::SQLFilterOperator::EQUAL ); }
         private:
             const FormOperations *m_pFO;
             css::uno::Reference< css::beans::XPropertySet > m_xField;
diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx
index ee7cd0018eb9..75cd2bb1967b 100644
--- a/forms/source/xforms/binding.cxx
+++ b/forms/source/xforms/binding.cxx
@@ -716,7 +716,7 @@ void Binding::distributeMIP( const css::uno::Reference<css::xml::dom::XNode> & r
 
     OUString sEventName("xforms-generic");
     css::xforms::XFormsEventConcrete *pEvent = new css::xforms::XFormsEventConcrete;
-    pEvent->initXFormsEvent(sEventName, sal_True, sal_False);
+    pEvent->initXFormsEvent(sEventName, true, false);
     Reference<XEvent> xEvent(pEvent);
 
     // naive depth-first traversal
diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx
index 530a160018da..ce993686605c 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -241,7 +241,7 @@ namespace xforms
     {
         // let the base class do the conversion
         if ( !OXSDDataType_PBase::convertFastPropertyValue( _rConvertedValue, _rOldValue, _nHandle, _rValue ) )
-            return sal_False;
+            return false;
 
         // sanity checks
         OUString sErrorMessage;
@@ -253,7 +253,7 @@ namespace xforms
             throw IllegalArgumentException( aException );
         }
 
-        return sal_True;
+        return true;
     }
 
 
diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx
index 90a1ba37f45d..baebd0dc4bf8 100644
--- a/forms/source/xforms/model_ui.cxx
+++ b/forms/source/xforms/model_ui.cxx
@@ -523,7 +523,7 @@ css::uno::Reference<css::xforms::XModel> Model::newModel( const Reference<css::f
         xModel.set( pModel );
 
         pModel->setID( sName );
-        pModel->newInstance( OUString(), OUString(), sal_False );
+        pModel->newInstance( OUString(), OUString(), false );
         pModel->initialize();
         xModels->insertByName( sName, makeAny( xModel ) );
     }
@@ -804,7 +804,7 @@ static OUString lcl_serializeForDisplay( const Reference<XNodeList>& xNodes )
         }
 
         // append node
-        xFragment->appendChild( xDocument->importNode( xCurrent, sal_True ) );
+        xFragment->appendChild( xDocument->importNode( xCurrent, true ) );
     }
     OSL_ENSURE( ( nAttributeNodes == 0 ) || ( nAttributeNodes == nLength ),
         "lcl_serializeForDisplay: mixed attribute and non-attribute nodes?" );
diff --git a/forms/source/xforms/propertysetbase.cxx b/forms/source/xforms/propertysetbase.cxx
index 903b73f25036..db3c36cf1d22 100644
--- a/forms/source/xforms/propertysetbase.cxx
+++ b/forms/source/xforms/propertysetbase.cxx
@@ -58,7 +58,7 @@ cppu::IPropertyArrayHelper& SAL_CALL PropertySetBase::getInfoHelper()
     if ( !m_pProperties )
     {
         OSL_ENSURE( !m_aProperties.empty(), "PropertySetBase::getInfoHelper: no registered properties!" );
-        m_pProperties = new cppu::OPropertyArrayHelper( &m_aProperties[0], m_aProperties.size(), sal_False );
+        m_pProperties = new cppu::OPropertyArrayHelper( &m_aProperties[0], m_aProperties.size(), false );
     }
     return *m_pProperties;
 }
@@ -149,9 +149,9 @@ sal_Bool SAL_CALL PropertySetBase::convertFastPropertyValue( Any& rConvertedValu
     if ( rOldValue != rValue )
     {
         rConvertedValue = rValue;   // no conversion at all
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 void SAL_CALL PropertySetBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue )
diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx
index 4e6182090717..ec9360ceafef 100644
--- a/forms/source/xforms/submission.cxx
+++ b/forms/source/xforms/submission.cxx
@@ -541,7 +541,7 @@ static void _cloneNodes(Model& aModel, const Reference< XNode >& dstParent, cons
         MIP mip = aModel.queryMIP(cur);
         if(mip.isRelevant() && !(bRemoveWSNodes && _isIgnorable(cur)))
         {
-            imported = dstDoc->importNode(cur, sal_False);
+            imported = dstDoc->importNode(cur, false);
             imported = dstParent->appendChild(imported);
             // append source children to new imported parent
             for( cur = cur->getFirstChild(); cur.is(); cur = cur->getNextSibling() )
diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx
index 93861082c9ee..5b568480c2c4 100644
--- a/forms/source/xforms/submission/replace.cxx
+++ b/forms/source/xforms/submission/replace.cxx
@@ -67,7 +67,7 @@ CSubmission::SubmissionResult CSubmission::replace(const OUString& aReplace, con
             descriptor[0] = PropertyValue(OUString("InputStream"),
                 -1, makeAny(m_aResultStream), PropertyState_DIRECT_VALUE);
             descriptor[1] = PropertyValue(OUString("ReadOnly"),
-                -1, makeAny(sal_True), PropertyState_DIRECT_VALUE);
+                -1, makeAny(true), PropertyState_DIRECT_VALUE);
 
             OUString aURL = m_aURLObj.GetMainURL(INetURLObject::NO_DECODE);
             OUString aTarget = "_default";
@@ -86,7 +86,7 @@ CSubmission::SubmissionResult CSubmission::replace(const OUString& aReplace, con
                     Reference< XElement > oldRoot = aDocument->getDocumentElement();
                     Reference< XElement > newRoot = aNewDocument->getDocumentElement();
 
-                    Reference< XNode > aImportedNode = aDocument->importNode(newRoot, sal_True);
+                    Reference< XNode > aImportedNode = aDocument->importNode(newRoot, true);
                     aDocument->replaceChild(aImportedNode, oldRoot);
                     return CSubmission::SUCCESS;
                 } else {
-- 
cgit