summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-09-29 21:12:57 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-09-29 21:12:57 +0200
commit826530854a776717dd1455913474892932d9b0f5 (patch)
tree2bf89af136ce0644883e5250ffc2f7b55957125b
parent9c88837f0d8e2f679d779ebb5128ac6e15f022b9 (diff)
vcl/osx: std::auto_ptr -> std::unique_ptr
Change-Id: If54aaffc6d88569220c4f1747926aae3199946b8
-rw-r--r--vcl/osx/DataFlavorMapping.hxx2
-rw-r--r--vcl/osx/DragSource.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/osx/DataFlavorMapping.hxx b/vcl/osx/DataFlavorMapping.hxx
index 3bd4118ecb9e..a3cff1ccaaa6 100644
--- a/vcl/osx/DataFlavorMapping.hxx
+++ b/vcl/osx/DataFlavorMapping.hxx
@@ -52,7 +52,7 @@ public:
virtual com::sun::star::uno::Any getOOoData() = 0;
};
-typedef std::auto_ptr<DataProvider> DataProviderPtr_t;
+typedef std::unique_ptr<DataProvider> DataProviderPtr_t;
class DataFlavorMapper
{
diff --git a/vcl/osx/DragSource.cxx b/vcl/osx/DragSource.cxx
index 6435041fe5c7..0231f125a816 100644
--- a/vcl/osx/DragSource.cxx
+++ b/vcl/osx/DragSource.cxx
@@ -234,7 +234,7 @@ void SAL_CALL DragSource::startDrag(const DragGestureEvent& trigger,
m_MouseButton= mMouseEvent.Buttons;
mXDragSrcListener = listener;
mXCurrentContext = static_cast<XDragSourceContext*>(new DragSourceContext);
- auto_ptr<AquaClipboard> clipb(new AquaClipboard(NULL, false));
+ unique_ptr<AquaClipboard> clipb(new AquaClipboard(NULL, false));
g_XTransferable = transferable;
clipb->setContents(g_XTransferable, uno::Reference<XClipboardOwner>());
mDragSourceActions = sourceActions;