diff options
| -rw-r--r-- | include/com/sun/star/uno/Sequence.hxx | 4 | ||||
| -rw-r--r-- | store/source/storbase.hxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/com/sun/star/uno/Sequence.hxx b/include/com/sun/star/uno/Sequence.hxx index c31e43141ca3..373d97624cd8 100644 --- a/include/com/sun/star/uno/Sequence.hxx +++ b/include/com/sun/star/uno/Sequence.hxx @@ -55,7 +55,7 @@ inline Sequence< E >::Sequence() const Type & rType = ::cppu::getTypeFavourUnsigned( this ); ::uno_type_sequence_construct( &_pSequence, rType.getTypeLibType(), - 0, 0, cpp_acquire ); + NULL, 0, cpp_acquire ); // no bad_alloc, because empty sequence is statically allocated in cppu } @@ -102,7 +102,7 @@ inline Sequence< E >::Sequence( sal_Int32 len ) bool success = ::uno_type_sequence_construct( &_pSequence, rType.getTypeLibType(), - 0, len, cpp_acquire ); + NULL, len, cpp_acquire ); if (! success) throw ::std::bad_alloc(); } diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx index 0c21acbb3ad3..b9dc53247a8d 100644 --- a/store/source/storbase.hxx +++ b/store/source/storbase.hxx @@ -417,12 +417,12 @@ class PageHolderObject public: bool construct (rtl::Reference< PageData::Allocator > const & rxAllocator) { - if ((m_xPage.get() == 0) && rxAllocator.is()) + if ((m_xPage.get() == nullptr) && rxAllocator.is()) { std::shared_ptr<PageData> tmp (rxAllocator->construct<T>(), PageData::Deallocate(rxAllocator)); m_xPage.swap (tmp); } - return (m_xPage.get() != 0); + return (m_xPage.get() != nullptr); } explicit PageHolderObject (std::shared_ptr<PageData> const & rxPage = std::shared_ptr<PageData>()) @@ -447,7 +447,7 @@ public: bool is() const { - return (m_xPage.get() != 0); + return (m_xPage.get() != nullptr); } std::shared_ptr<PageData> & get() { return m_xPage; } |