diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-27 10:03:01 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-27 10:03:01 +0100 |
| commit | 0866023fafe4665f488eaea65a32cd1364e21594 (patch) | |
| tree | 72ce1044f1b3bafc2fc2e15978985dfbc0126c73 /cppuhelper/source/propshlp.cxx | |
| parent | 779581feed4886313746a71e9e738d736977be1b (diff) | |
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<T>) 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
Diffstat (limited to 'cppuhelper/source/propshlp.cxx')
| -rw-r--r-- | cppuhelper/source/propshlp.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
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; |