summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-16 22:51:15 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-17 17:55:19 +0100
commit05f742d28b3786f44781af5b069c05c16b84decd (patch)
treedacb340f99ad4e47d20557eee04e6f69f5d15721 /forms
parentfaced6b5f72b096800a232749cce6b38a76d5bac (diff)
comphelper: sal_Bool -> bool
Change-Id: I6fc331ae0706f4bb193543011c8d4ae0a385fcc0
Diffstat (limited to 'forms')
-rw-r--r--forms/source/component/Button.cxx2
-rw-r--r--forms/source/component/ComboBox.cxx8
-rw-r--r--forms/source/component/ComboBox.hxx2
-rw-r--r--forms/source/component/DatabaseForm.cxx8
-rw-r--r--forms/source/component/FormComponent.cxx2
-rw-r--r--forms/source/component/Grid.cxx4
-rw-r--r--forms/source/component/ImageControl.cxx2
-rw-r--r--forms/source/component/ListBox.cxx6
-rw-r--r--forms/source/component/clickableimage.hxx2
-rw-r--r--forms/source/component/formcontrolfont.cxx4
10 files changed, 20 insertions, 20 deletions
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index f270295ba272..6d2732b20c31 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -203,7 +203,7 @@ void OButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw
readHelpTextCompatibly(_rxInStream);
// DispatchInternal
- sal_Bool bDispath;
+ bool bDispath;
_rxInStream >> bDispath;
setDispatchUrlInternal(bDispath);
}
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 406433c2e508..285aa146b521 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -132,7 +132,7 @@ OComboBoxModel::OComboBoxModel(const Reference<XComponentContext>& _rxFactory)
,OErrorBroadcaster( OComponentHelper::rBHelper )
,m_aListRowSet()
,m_eListSourceType(ListSourceType_TABLE)
- ,m_bEmptyIsNull(sal_True)
+ ,m_bEmptyIsNull(true)
{
m_nClassId = FormComponentType::COMBOBOX;
initValueProperty( PROPERTY_TEXT, PROPERTY_ID_TEXT );
@@ -353,7 +353,7 @@ void SAL_CALL OComboBoxModel::write(const Reference<stario::XObjectOutputStream>
_rxOutStream << nBoundColumn;
}
- _rxOutStream << (sal_Bool)m_bEmptyIsNull;
+ _rxOutStream << m_bEmptyIsNull;
_rxOutStream << m_aDefaultText;
writeHelpTextCompatibly(_rxOutStream);
@@ -391,7 +391,7 @@ void SAL_CALL OComboBoxModel::read(const Reference<stario::XObjectInputStream>&
m_aBoundColumn <<= (sal_Int16)0;
m_aDefaultText = OUString();
m_eListSourceType = ListSourceType_TABLE;
- m_bEmptyIsNull = sal_True;
+ m_bEmptyIsNull = true;
defaultCommonProperties();
return;
}
@@ -429,7 +429,7 @@ void SAL_CALL OComboBoxModel::read(const Reference<stario::XObjectInputStream>&
if (nVersion > 0x0001)
{
- sal_Bool bNull;
+ bool bNull;
_rxInStream >> bNull;
m_bEmptyIsNull = bNull;
}
diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx
index 1fefa8453686..b6afbd3c140f 100644
--- a/forms/source/component/ComboBox.hxx
+++ b/forms/source/component/ComboBox.hxx
@@ -63,7 +63,7 @@ class OComboBoxModel
::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter> m_xFormatter;
::com::sun::star::form::ListSourceType m_eListSourceType; // ListSource's type
- sal_Bool m_bEmptyIsNull; // Empty string is interpreted as NULL
+ bool m_bEmptyIsNull; // Empty string is interpreted as NULL
::std::auto_ptr< ::dbtools::FormattedColumnValue >
m_pValueFormatter;
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 7b4ac6ad56a3..a8f812cc9b39 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -423,7 +423,7 @@ void ODatabaseForm::impl_construct()
// listen for the properties, important for Parameters
if ( m_xAggregateSet.is() )
{
- m_pAggregatePropertyMultiplexer = new OPropertyChangeMultiplexer(this, m_xAggregateSet, sal_False);
+ m_pAggregatePropertyMultiplexer = new OPropertyChangeMultiplexer(this, m_xAggregateSet, false);
m_pAggregatePropertyMultiplexer->acquire();
m_pAggregatePropertyMultiplexer->addProperty(PROPERTY_COMMAND);
m_pAggregatePropertyMultiplexer->addProperty(PROPERTY_ACTIVE_CONNECTION);
@@ -1511,7 +1511,7 @@ Any SAL_CALL ODatabaseForm::getFastPropertyValue( sal_Int32 nHandle )
throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
if ((nHandle == PROPERTY_ID_ISMODIFIED) && (m_nResetsPending > 0))
- return ::cppu::bool2any((sal_False));
+ return ::cppu::bool2any(false);
// don't allow the aggregate which is currently being reset to return a (temporary) "yes"
else
return OPropertySetAggregationHelper::getFastPropertyValue(nHandle);
@@ -2081,7 +2081,7 @@ void ODatabaseForm::reset_impl(bool _bAproveByListeners)
// (do this _before_ the listeners are notified ! their reaction (maybe asynchronous) may depend
// on the modified state of the row)
if (bInsertRow)
- m_xAggregateSet->setPropertyValue(PROPERTY_ISMODIFIED, ::cppu::bool2any(sal_Bool(sal_False)));
+ m_xAggregateSet->setPropertyValue(PROPERTY_ISMODIFIED, ::cppu::bool2any(false));
aResetGuard.clear();
{
@@ -2092,7 +2092,7 @@ void ODatabaseForm::reset_impl(bool _bAproveByListeners)
// and again : ensure the row isn't modified
// we already did this after we (and maybe our dependents) resetted the values, but the listeners may have changed the row, too
if (bInsertRow)
- m_xAggregateSet->setPropertyValue(PROPERTY_ISMODIFIED, ::cppu::bool2any((sal_False)));
+ m_xAggregateSet->setPropertyValue(PROPERTY_ISMODIFIED, ::cppu::bool2any(false));
--m_nResetsPending;
}
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 996c0fcd5620..e77b677c7e79 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -1360,7 +1360,7 @@ void OBoundControlModel::implInitAggMultiplexer( )
increment( m_refCount );
if ( m_xAggregateSet.is() )
{
- m_pAggPropMultiplexer = new OPropertyChangeMultiplexer( this, m_xAggregateSet, sal_False );
+ m_pAggPropMultiplexer = new OPropertyChangeMultiplexer( this, m_xAggregateSet, false );
m_pAggPropMultiplexer->acquire();
}
decrement( m_refCount );
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index aa0caf59a58f..c524b0118aab 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -736,11 +736,11 @@ Any OGridControlModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
case PROPERTY_ID_DISPLAYSYNCHRON:
case PROPERTY_ID_ENABLED:
case PROPERTY_ID_ENABLEVISIBLE:
- aReturn = makeBoolAny(sal_True);
+ aReturn = makeBoolAny(true);
break;
case PROPERTY_ID_ALWAYSSHOWCURSOR:
- aReturn = makeBoolAny(sal_False);
+ aReturn = makeBoolAny(false);
break;
case PROPERTY_ID_HELPURL:
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 8ec645c141f1..fe648ab9e6b2 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -816,7 +816,7 @@ bool OImageControlControl::implInsertGraphics()
aDialog.SetTitle( sTitle );
Reference< XFilePickerControlAccess > xController( aDialog.GetFilePicker(), UNO_QUERY_THROW );
- xController->setValue(ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0, ::cppu::bool2any(sal_True));
+ xController->setValue(ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0, ::cppu::bool2any(true));
Reference<XPropertySet> xBoundField;
if ( hasProperty( PROPERTY_BOUNDFIELD, xSet ) )
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 8945b999886e..a09406ca411a 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -992,7 +992,7 @@ namespace frm
// - this would be unable to reflect in the db column
if ( hasField() )
{
- setFastPropertyValue( PROPERTY_ID_MULTISELECTION, ::cppu::bool2any( ( sal_False ) ) );
+ setFastPropertyValue( PROPERTY_ID_MULTISELECTION, ::cppu::bool2any( false ) );
}
if ( !hasExternalListSource() )
@@ -1372,7 +1372,7 @@ namespace frm
{
// the indexes where the current string appears in our string items
Sequence< sal_Int16 > aThisEntryIndexes;
- aThisEntryIndexes = findValue( getStringItemList(), *pSelectEntries++, sal_False );
+ aThisEntryIndexes = findValue( getStringItemList(), *pSelectEntries++, false );
// insert all the indexes of this entry into our set
::std::copy(
@@ -1397,7 +1397,7 @@ namespace frm
OUString sStringToSelect;
OSL_VERIFY( _rExternalValue >>= sStringToSelect );
- aSelectIndexes = findValue( getStringItemList(), sStringToSelect, sal_False );
+ aSelectIndexes = findValue( getStringItemList(), sStringToSelect, false );
}
break;
}
diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx
index 1b88d5d0cf1f..ab16ab791245 100644
--- a/forms/source/component/clickableimage.hxx
+++ b/forms/source/component/clickableimage.hxx
@@ -84,7 +84,7 @@ namespace frm
void DownloadDone();
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes();
- inline sal_Bool isDispatchUrlInternal() const { return m_bDispatchUrlInternal; }
+ inline bool isDispatchUrlInternal() const { return m_bDispatchUrlInternal; }
inline void setDispatchUrlInternal(sal_Bool _bDispatch) { m_bDispatchUrlInternal = _bDispatch; }
public:
diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx
index 02c8bdba721b..1a4690fdd6d4 100644
--- a/forms/source/component/formcontrolfont.cxx
+++ b/forms/source/component/formcontrolfont.cxx
@@ -531,7 +531,7 @@ namespace frm
break;
case PROPERTY_ID_FONT_WORDLINEMODE:
- aReturn = makeBoolAny(sal_False);
+ aReturn = makeBoolAny(false);
break;
case PROPERTY_ID_FONT_NAME:
@@ -548,7 +548,7 @@ namespace frm
break;
case PROPERTY_ID_FONT_KERNING:
- aReturn = makeBoolAny(sal_False);
+ aReturn = makeBoolAny(false);
break;
case PROPERTY_ID_FONT_PITCH: