summaryrefslogtreecommitdiff
path: root/svx
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 /svx
parentfaced6b5f72b096800a232749cce6b38a76d5bac (diff)
comphelper: sal_Bool -> bool
Change-Id: I6fc331ae0706f4bb193543011c8d4ae0a385fcc0
Diffstat (limited to 'svx')
-rw-r--r--svx/source/accessibility/charmapacc.cxx2
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx2
-rw-r--r--svx/source/fmcomp/gridcell.cxx4
-rw-r--r--svx/source/form/fmshimp.cxx26
-rw-r--r--svx/source/inc/charmapacc.hxx2
-rw-r--r--svx/source/inc/fmshimp.hxx8
-rw-r--r--svx/source/svdraw/svdoole2.cxx2
7 files changed, 23 insertions, 23 deletions
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index 4068de0245fb..44ea57bbfe87 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -317,7 +317,7 @@ void SAL_CALL SvxShowCharSetAcc::disposing()
IMPLEMENT_FORWARD_XINTERFACE2( SvxShowCharSetAcc, OAccessibleSelectionHelper, OAccessibleHelper_Base )
IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetAcc, OAccessibleSelectionHelper, OAccessibleHelper_Base )
// -----------------------------------------------------------------------
-sal_Bool SvxShowCharSetAcc::implIsSelected( sal_Int32 nAccessibleChildIndex ) throw (RuntimeException)
+bool SvxShowCharSetAcc::implIsSelected( sal_Int32 nAccessibleChildIndex ) throw (RuntimeException)
{
return m_pParent && m_pParent->getCharSetControl()->IsSelected(
sal::static_int_cast<sal_uInt16>(nAccessibleChildIndex));
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 2a7f49ddaffb..379ad056d9cc 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -605,7 +605,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
break;
default:
aCommandType <<= (sal_Int32)CommandType::COMMAND;
- xForm->setPropertyValue(FM_PROP_ESCAPE_PROCESSING, bool2any((sal_Bool)(2 == nCommandType)));
+ xForm->setPropertyValue(FM_PROP_ESCAPE_PROCESSING, bool2any(2 == nCommandType));
break;
}
xForm->setPropertyValue(FM_PROP_COMMANDTYPE, aCommandType);
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 6b2adc5eab4f..cabe7220e1f7 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -2680,7 +2680,7 @@ OUString DbListBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColum
sText = _rxField->getString();
if ( m_bBound )
{
- Sequence< sal_Int16 > aPosSeq = ::comphelper::findValue( m_aValueList, sText, sal_True );
+ Sequence< sal_Int16 > aPosSeq = ::comphelper::findValue( m_aValueList, sText, true );
if ( aPosSeq.getLength() )
sText = static_cast<ListBox*>(m_pWindow)->GetEntry(aPosSeq.getConstArray()[0]);
else
@@ -3038,7 +3038,7 @@ void DbFilterField::SetText(const OUString& rText)
} break;
case ::com::sun::star::form::FormComponentType::LISTBOX:
{
- Sequence<sal_Int16> aPosSeq = ::comphelper::findValue(m_aValueList, m_aText, sal_True);
+ Sequence<sal_Int16> aPosSeq = ::comphelper::findValue(m_aValueList, m_aText, true);
if (aPosSeq.getLength())
static_cast<ListBox*>(m_pWindow)->SelectEntryPos(aPosSeq.getConstArray()[0], sal_True);
else
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index d1f59fcb5240..28e52b47eee6 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -523,35 +523,35 @@ sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun
}
//------------------------------------------------------------------------------
-sal_Bool FmXBoundFormFieldIterator::ShouldStepInto(const Reference< XInterface>& _rContainer) const
+bool FmXBoundFormFieldIterator::ShouldStepInto(const Reference< XInterface>& _rContainer) const
{
if (_rContainer == m_xStartingPoint)
// would be quite stupid to step over the root ....
- return sal_True;
+ return true;
return Reference< XControlModel>(_rContainer, UNO_QUERY).is();
}
//------------------------------------------------------------------------------
-sal_Bool FmXBoundFormFieldIterator::ShouldHandleElement(const Reference< XInterface>& _rElement)
+bool FmXBoundFormFieldIterator::ShouldHandleElement(const Reference< XInterface>& _rElement)
{
if (!_rElement.is())
// NULL element
- return sal_False;
+ return false;
if (Reference< XForm>(_rElement, UNO_QUERY).is() || Reference< XGrid>(_rElement, UNO_QUERY).is())
// a forms or a grid
- return sal_False;
+ return false;
Reference< XPropertySet> xSet(_rElement, UNO_QUERY);
if (!xSet.is() || !::comphelper::hasProperty(FM_PROP_BOUNDFIELD, xSet))
// no "BoundField" property
- return sal_False;
+ return false;
Any aVal( xSet->getPropertyValue(FM_PROP_BOUNDFIELD) );
if (aVal.getValueTypeClass() != TypeClass_INTERFACE)
// void or invalid property value
- return sal_False;
+ return false;
return aVal.hasValue();
}
@@ -4031,7 +4031,7 @@ SearchableControlIterator::SearchableControlIterator(Reference< XInterface> xSta
}
//------------------------------------------------------------------------------
-sal_Bool SearchableControlIterator::ShouldHandleElement(const Reference< XInterface>& xElement)
+bool SearchableControlIterator::ShouldHandleElement(const Reference< XInterface>& xElement)
{
// wenn das Ding eine ControlSource und einen BoundField-Property hat
Reference< XPropertySet> xProperties(xElement, UNO_QUERY);
@@ -4044,7 +4044,7 @@ sal_Bool SearchableControlIterator::ShouldHandleElement(const Reference< XInterf
{
// nehmen wir's
m_sCurrentValue = ::comphelper::getString(xProperties->getPropertyValue(FM_PROP_CONTROLSOURCE));
- return sal_True;
+ return true;
}
}
@@ -4055,17 +4055,17 @@ sal_Bool SearchableControlIterator::ShouldHandleElement(const Reference< XInterf
if (::comphelper::getINT16(aClassId) == FormComponentType::GRIDCONTROL)
{
m_sCurrentValue = "";
- return sal_True;
+ return true;
}
}
- return sal_False;
+ return false;
}
//------------------------------------------------------------------------------
-sal_Bool SearchableControlIterator::ShouldStepInto(const Reference< XInterface>& /*xContainer*/) const
+bool SearchableControlIterator::ShouldStepInto(const Reference< XInterface>& /*xContainer*/) const
{
- return sal_True;
+ return true;
}
//==============================================================================
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index 2fc909ca0d37..d1c0962e2ad1 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -189,7 +189,7 @@ namespace svx
// OCommonAccessibleSelection
// return if the specified child is visible => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx)
- virtual sal_Bool
+ virtual bool
implIsSelected( sal_Int32 nAccessibleChildIndex )
throw (::com::sun::star::uno::RuntimeException);
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index bbf13b814db4..53c6a3cb65a4 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -94,8 +94,8 @@ public:
FmXBoundFormFieldIterator(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rStartingPoint) : ::comphelper::IndexAccessIterator(_rStartingPoint) { }
protected:
- virtual sal_Bool ShouldHandleElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rElement);
- virtual sal_Bool ShouldStepInto(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rContainer) const;
+ virtual bool ShouldHandleElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rElement);
+ virtual bool ShouldStepInto(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rContainer) const;
};
class FmFormPage;
@@ -565,8 +565,8 @@ public:
public:
SearchableControlIterator(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> xStartingPoint);
- virtual sal_Bool ShouldHandleElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& rElement);
- virtual sal_Bool ShouldStepInto(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xContainer) const;
+ virtual bool ShouldHandleElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& rElement);
+ virtual bool ShouldStepInto(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xContainer) const;
virtual void Invalidate() { IndexAccessIterator::Invalidate(); m_sCurrentValue = OUString(); }
};
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 854057cccd70..e8349069302f 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -1263,7 +1263,7 @@ void SdrOle2Obj::Disconnect_Impl()
comphelper::EmbeddedObjectContainer* pContainer = xObjRef.GetContainer();
if ( pContainer )
{
- pContainer->RemoveEmbeddedObject( xObjRef.GetObject(), sal_False);
+ pContainer->RemoveEmbeddedObject( xObjRef.GetObject(), false);
// TODO/LATER: mpImpl->aPersistName contains outdated information, to keep it updated
// it should be returned from RemoveEmbeddedObject call. Currently it is no problem,