summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-09-30 12:27:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-09-30 12:28:52 +0200
commit00061554c5df8034e2dc4803bb1433b8eb074f8f (patch)
tree43ebd3608c36c7e352d105b9c8a61c6caf9f379c /framework
parent3b206d4818270997166421e332ecfe2578c56f70 (diff)
framework: std::auto_ptr -> std::unique_ptr
Change-Id: I6ef5e9018d1e33c205eae934c404d3391a4693f2
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/uiconfiguration/imagemanager.hxx2
-rw-r--r--framework/inc/uiconfiguration/moduleimagemanager.hxx4
2 files changed, 2 insertions, 4 deletions
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx
index 1a1883988589..bb0f52495b87 100644
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
@@ -110,7 +110,7 @@ namespace framework
void setStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage ) throw (::com::sun::star::uno::RuntimeException);
private:
- ::std::auto_ptr<ImageManagerImpl> m_pImpl;
+ ::std::unique_ptr<ImageManagerImpl> m_pImpl;
};
}
diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index 0775d1deac7f..7cd3c13d3f9a 100644
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -95,9 +95,7 @@ namespace framework
virtual sal_Bool SAL_CALL isReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<ImageManagerImpl> m_pImpl;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr<ImageManagerImpl> m_pImpl;
};
}