From 0866023fafe4665f488eaea65a32cd1364e21594 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 27 Jan 2015 10:03:01 +0100 Subject: Get rid of std::auto_ptr in stable URE interface ...the deprecation-warning noise is getting ever louder, and eventually auto_ptr will just disappear. Just surrender and use good-old plain pointer and deletion in dtor---it's probably the best to do in this stable interface. The change is backwards compatible. For one, in all relevant standard libraries (libstdc++, even in debug mode; libc++; msvcrt) sizeof(auto_ptr) equals sizeof(T*). And for another, the removed UnoUrlDescriptor ctor was only called from within cppuhelper and had deliberately been left out of cppuhelper/source/gcc3.map (so isn't exported at least on Linux)---marking it SAL_DLLPRIVATE had probably just been forgotten when retrofitting cppuhelper with CPPUHELPER_DLLPUBLIC annotations. Change-Id: Ic8bce29d93938f2b2e0a264baee85132668e1294 --- cppuhelper/source/propshlp.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'cppuhelper/source/propshlp.cxx') diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx index 509019cf043a..0f1239d03b58 100644 --- a/cppuhelper/source/propshlp.cxx +++ b/cppuhelper/source/propshlp.cxx @@ -199,6 +199,7 @@ OPropertySetHelper2::OPropertySetHelper2( */ OPropertySetHelper::~OPropertySetHelper() { + delete m_pReserved; } OPropertySetHelper2::~OPropertySetHelper2() { @@ -631,8 +632,6 @@ void OPropertySetHelper::fire sal_Bool bVetoable ) { - OSL_ENSURE( m_pReserved.get(), "No OPropertySetHelper::Impl" ); - if (! m_pReserved->m_bFireEvents) return; -- cgit