diff options
Diffstat (limited to 'svx/source/accessibility/AccessibleShape.cxx')
-rw-r--r-- | svx/source/accessibility/AccessibleShape.cxx | 14 |
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 ) |