From c72fac269626cd4c2c3f62a6eed69e47b59256a4 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Mon, 16 Mar 2015 12:17:44 +0200
Subject: vclwidget: convert lots more sites to use VclPtr
seems there was a lot of shared_ptr usage floating around...
Change-Id: Icd05243170eb8493709275fc36bf986fc194b781
---
include/avmedia/mediawindow.hxx | 3 ++-
include/svx/sidebar/Popup.hxx | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
(limited to 'include')
diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx
index b17ffe4afbc8..3eeb7078552b 100644
--- a/include/avmedia/mediawindow.hxx
+++ b/include/avmedia/mediawindow.hxx
@@ -28,6 +28,7 @@
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/uno/XInterface.hpp>
#include <vcl/bitmapex.hxx>
+#include <vcl/vclptr.hxx>
#include <avmedia/avmediadllapi.h>
#define AVMEDIA_FRAMEGRABBER_DEFAULTFRAME -1.0
@@ -115,7 +116,7 @@ namespace avmedia
MediaWindow& operator =( const MediaWindow& ) SAL_DELETED_FUNCTION;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxIFace;
- std::unique_ptr<priv::MediaWindowImpl> mpImpl;
+ VclPtr<priv::MediaWindowImpl> mpImpl;
};
}
diff --git a/include/svx/sidebar/Popup.hxx b/include/svx/sidebar/Popup.hxx
index 063e8e6f1e84..bcd0bde843a8 100644
--- a/include/svx/sidebar/Popup.hxx
+++ b/include/svx/sidebar/Popup.hxx
@@ -77,7 +77,7 @@ public :
void SetPopupModeEndHandler (const ::boost::function<void(void)>& rCallback);
protected:
- std::unique_ptr<PopupControl> mxControl;
+ VclPtr<PopupControl> mxControl;
/** Make sure that both PopupContainer and PopupControl objects
exist. Calls the maControlCreator functor if necessary.
@@ -94,7 +94,7 @@ private:
::boost::function<PopupControl*(PopupContainer*)> maControlCreator;
::boost::function<void(void)> maPopupModeEndCallback;
const ::rtl::OUString msAccessibleName;
- std::unique_ptr<PopupContainer> mxContainer;
+ VclPtr<PopupContainer> mxContainer;
DECL_LINK(PopupModeEndHandler, void*);
};
--
cgit