diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-22 18:24:10 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-24 08:08:00 +0100 |
| commit | b7259532d83ea1263f6944974d71162c47203939 (patch) | |
| tree | 19d6a840d86070831573a583dd45a2b828218323 /forms | |
| parent | ad73967e99235a2ba9b5a2106c5d6d0f8efaa1ca (diff) | |
Remove unnecessary bool2any
Change-Id: Ie2caee1d5a7912011d76172539c2f8f37eaee5cf
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/DatabaseForm.cxx | 6 | ||||
| -rw-r--r-- | forms/source/component/ImageControl.cxx | 2 | ||||
| -rw-r--r-- | forms/source/component/ListBox.cxx | 2 | ||||
| -rw-r--r-- | forms/source/component/RadioButton.cxx | 1 |
4 files changed, 5 insertions, 6 deletions
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index aed7bb88386c..f49ca913c73b 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -1510,7 +1510,7 @@ Any SAL_CALL ODatabaseForm::getFastPropertyValue( sal_Int32 nHandle ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { if ((nHandle == PROPERTY_ID_ISMODIFIED) && (m_nResetsPending > 0)) - return ::cppu::bool2any(false); + return css::uno::Any(false); // don't allow the aggregate which is currently being reset to return a (temporary) "yes" else return OPropertySetAggregationHelper::getFastPropertyValue(nHandle); @@ -2080,7 +2080,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(false)); + m_xAggregateSet->setPropertyValue(PROPERTY_ISMODIFIED, css::uno::Any(false)); aResetGuard.clear(); { @@ -2091,7 +2091,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(false)); + m_xAggregateSet->setPropertyValue(PROPERTY_ISMODIFIED, css::uno::Any(false)); --m_nResetsPending; } diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index d2f1be6f86c2..3df259e1dc76 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -815,7 +815,7 @@ bool OImageControlControl::implInsertGraphics() aDialog.SetTitle( sTitle ); Reference< XFilePickerControlAccess > xController( aDialog.GetFilePicker(), UNO_QUERY_THROW ); - xController->setValue(ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0, ::cppu::bool2any(true)); + xController->setValue(ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0, css::uno::Any(true)); Reference<XPropertySet> xBoundField; if ( hasProperty( PROPERTY_BOUNDFIELD, xSet ) ) diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index aa3423300dcc..45193db61d17 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -994,7 +994,7 @@ namespace frm // - this would be unable to reflect in the db column if ( hasField() ) { - setFastPropertyValue( PROPERTY_ID_MULTISELECTION, ::cppu::bool2any( false ) ); + setFastPropertyValue( PROPERTY_ID_MULTISELECTION, css::uno::Any(false) ); } if ( !hasExternalListSource() ) diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx index 3e121a714e66..991df45662b8 100644 --- a/forms/source/component/RadioButton.cxx +++ b/forms/source/component/RadioButton.cxx @@ -23,7 +23,6 @@ #include "property.hrc" #include "services.hxx" #include <tools/debug.hxx> -#include <comphelper/extract.hxx> #include <comphelper/basicio.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/container/XIndexAccess.hpp> |