diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-11-11 10:02:32 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-11 13:08:19 +0000 |
| commit | 0854e1a6f985b6cc272950dd3d2f3027e2f01080 (patch) | |
| tree | 8a9639cf08230737a9aa9a2ed386e233f86f35d6 /include | |
| parent | a24b7ea97958af10004abb8f209a31031372d7c2 (diff) | |
use std::unique_ptr
Change-Id: I5efcfe9ae2d94b34150127917c07dc920fd0e71a
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/transfer.hxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index 9213e6754db1..49ce84434632 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -159,8 +159,8 @@ private: OUString maLastFormat; mutable css::uno::Reference< css::datatransfer::clipboard::XClipboard > mxClipboard; css::uno::Reference< css::frame::XTerminateListener > mxTerminateListener; - DataFlavorExVector* mpFormats; - TransferableObjectDescriptor* mpObjDesc; + std::unique_ptr<DataFlavorExVector> mxFormats; + std::unique_ptr<TransferableObjectDescriptor> mxObjDesc; protected: inline const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& @@ -212,8 +212,6 @@ private: protected: - virtual ~TransferableHelper() override; - void AddFormat( SotClipboardFormatId nFormat ); void AddFormat( const css::datatransfer::DataFlavor& rFlavor ); void RemoveFormat( SotClipboardFormatId nFormat ); @@ -271,9 +269,9 @@ private: css::uno::Reference< css::datatransfer::XTransferable > mxTransfer; css::uno::Reference< css::datatransfer::clipboard::XClipboard > mxClipboard; - DataFlavorExVector* mpFormats; - TransferableObjectDescriptor* mpObjDesc; - std::unique_ptr<TransferableDataHelper_Impl> mpImpl; + std::unique_ptr<DataFlavorExVector> mxFormats; + std::unique_ptr<TransferableObjectDescriptor> mxObjDesc; + std::unique_ptr<TransferableDataHelper_Impl> mxImpl; protected: void InitFormats(); @@ -301,7 +299,7 @@ public: SotClipboardFormatId GetFormat( sal_uInt32 nFormat ) const; css::datatransfer::DataFlavor GetFormatDataFlavor( sal_uInt32 nFormat ) const; - DataFlavorExVector& GetDataFlavorExVector() const {return *mpFormats; } + DataFlavorExVector& GetDataFlavorExVector() const {return *mxFormats; } bool StartClipboardListening( ); void StopClipboardListening( ); |