summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-09-25 17:35:05 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-09-25 17:35:05 +0200
commita924606810a5d6e9a8e3d23e491d0bea5a5d2477 (patch)
treeb52bc75ea90af5a66aadb6b75faf50f94ab70727 /include
parentscripting: astyle-java.conf -> astyle.options (diff)
downloadcore-a924606810a5d6e9a8e3d23e491d0bea5a5d2477.tar.gz
core-a924606810a5d6e9a8e3d23e491d0bea5a5d2477.zip
editeng: std::auto_ptr -> std::unique_ptr
Change-Id: I25e3599a37d720cbcf70ea13ab30234e54637d53
Diffstat (limited to 'include')
-rw-r--r--include/editeng/AccessibleStaticTextBase.hxx4
-rw-r--r--include/editeng/hangulhanja.hxx4
-rw-r--r--include/editeng/unoedhlp.hxx4
3 files changed, 3 insertions, 9 deletions
diff --git a/include/editeng/AccessibleStaticTextBase.hxx b/include/editeng/AccessibleStaticTextBase.hxx
index e061f841019c..06bd708c869a 100644
--- a/include/editeng/AccessibleStaticTextBase.hxx
+++ b/include/editeng/AccessibleStaticTextBase.hxx
@@ -261,9 +261,7 @@ namespace accessibility
private:
/// @dyn
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- const std::auto_ptr< AccessibleStaticTextBase_Impl > mpImpl;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ const std::unique_ptr< AccessibleStaticTextBase_Impl > mpImpl;
};
diff --git a/include/editeng/hangulhanja.hxx b/include/editeng/hangulhanja.hxx
index 08f8b4e21ebc..ec765dcc4e98 100644
--- a/include/editeng/hangulhanja.hxx
+++ b/include/editeng/hangulhanja.hxx
@@ -95,9 +95,7 @@ namespace editeng
};
private:
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< HangulHanjaConversion_Impl > m_pImpl;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr< HangulHanjaConversion_Impl > m_pImpl;
// used to set initial values of m_pImpl object from saved ones
static bool m_bUseSavedValues; // defines if the followng two values should be used for initialization
diff --git a/include/editeng/unoedhlp.hxx b/include/editeng/unoedhlp.hxx
index d9cb6d830468..c35dbe4931ea 100644
--- a/include/editeng/unoedhlp.hxx
+++ b/include/editeng/unoedhlp.hxx
@@ -73,9 +73,7 @@ public:
@return the translated hint
*/
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- static ::std::auto_ptr<SfxHint> EENotification2Hint( EENotify* aNotify );
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ static ::std::unique_ptr<SfxHint> EENotification2Hint( EENotify* aNotify );
/** Calculate attribute run for EditEngines