summaryrefslogtreecommitdiff
path: root/svx/source/accessibility/AccessibleShape.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-09-24 16:03:36 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-09-24 16:06:52 +0200
commit4e820251892917a92996f1aa6978ad609112001c (patch)
tree8459a52aec67f0950aa9c12cd12b98b9eb02c89f /svx/source/accessibility/AccessibleShape.cxx
parent8bf8c9ba4f031fa8c838321b0cf4c7bb8dd44753 (diff)
Replace some std::auto_ptr function parameters with std::unique_ptr
Change-Id: Ic66d325fd9559c6dde9556c26e5b2a7e60376c49
Diffstat (limited to 'svx/source/accessibility/AccessibleShape.cxx')
-rw-r--r--svx/source/accessibility/AccessibleShape.cxx14
1 files changed, 6 insertions, 8 deletions
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index ad4104295e72..a3d18ea32ce2 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -55,6 +55,8 @@
#include "AccessibleEmptyEditSource.hxx"
#include <algorithm>
+#include <memory>
+#include <utility>
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
@@ -169,18 +171,14 @@ void AccessibleShape::Init (void)
if( !pOutlinerParaObject )
{
// empty text -> use proxy edit source to delay creation of EditEngine
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<SvxEditSource> pEditSource( new AccessibleEmptyEditSource ( *pSdrObject, *pView, *pWindow) );
- SAL_WNODEPRECATED_DECLARATIONS_POP
- mpText = new AccessibleTextHelper( pEditSource );
+ ::std::unique_ptr<SvxEditSource> pEditSource( new AccessibleEmptyEditSource ( *pSdrObject, *pView, *pWindow) );
+ mpText = new AccessibleTextHelper( std::move(pEditSource) );
}
else
{
// non-empty text -> use full-fledged edit source right away
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<SvxEditSource> pEditSource( new SvxTextEditSource ( *pSdrObject, 0, *pView, *pWindow) );
- SAL_WNODEPRECATED_DECLARATIONS_POP
- mpText = new AccessibleTextHelper( pEditSource );
+ ::std::unique_ptr<SvxEditSource> pEditSource( new SvxTextEditSource ( *pSdrObject, 0, *pView, *pWindow) );
+ mpText = new AccessibleTextHelper( std::move(pEditSource) );
}
if( bOwnParaObj )