diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/com/sun/star/uno/Any.h | 12 | ||||
| -rw-r--r-- | include/comphelper/property.hxx | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/include/com/sun/star/uno/Any.h b/include/com/sun/star/uno/Any.h index c46a59e2f0cc..90107d5cbb4b 100644 --- a/include/com/sun/star/uno/Any.h +++ b/include/com/sun/star/uno/Any.h @@ -213,6 +213,18 @@ public: */ inline void SAL_CALL setValue( const void * pData_, typelib_TypeDescription * pTypeDescr ); +#if defined LIBO_INTERNAL_ONLY + void setValue(bool const *, Type const &) = delete; + void setValue(bool const *, typelib_TypeDescriptionReference *) = delete; + void setValue(bool const *, typelib_TypeDescription *) = delete; + void setValue(std::nullptr_t, Type const & type) + { setValue(static_cast<void *>(nullptr), type); } + void setValue(std::nullptr_t, typelib_TypeDescriptionReference * type) + { setValue(static_cast<void *>(nullptr), type); } + void setValue(std::nullptr_t, typelib_TypeDescription * type) + { setValue(static_cast<void *>(nullptr), type); } +#endif + /** Clears this any. If the any already contains a value, that value will be destructed and its memory freed. After this has been called, the any does not contain a value. */ diff --git a/include/comphelper/property.hxx b/include/comphelper/property.hxx index 1b79ccb8aec6..bc13cd0bc42d 100644 --- a/include/comphelper/property.hxx +++ b/include/comphelper/property.hxx @@ -132,7 +132,7 @@ inline bool tryPropertyValue(css::uno::Any& /*out*/_rConvertedValue, css::uno::A if (bool(bNewValue) != _bCurrentValue) { _rConvertedValue.setValue(&bNewValue, cppu::UnoType<bool>::get()); - _rOldValue.setValue(&_bCurrentValue, cppu::UnoType<bool>::get()); + _rOldValue <<= _bCurrentValue; bModified = true; } return bModified; |