diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-02-28 23:48:06 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-02 06:33:48 +0000 |
| commit | 5ee57cabb40fefbba401cbcf8b181e02ad4f1f5d (patch) | |
| tree | 00b9be8cbf04c302af2f0702b03d104aa1828e9e /include | |
| parent | a5c947579253a7f4e784004e18929af5ab22fa28 (diff) | |
no need to use smart pointers for DataFlavorExVector
DataFlavorExVector is a std::vector<..> typedef.
remove odd void pointer in BrowseBox.
return const references to keep getter const qualified.
Change-Id: Iafd529a46b7511941c1dffc86d2066fdc4f07e28
Reviewed-on: https://gerrit.libreoffice.org/34767
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/brwbox.hxx | 4 | ||||
| -rw-r--r-- | include/svtools/transfer.hxx | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index ae950f5400a6..266491a5ae70 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -378,7 +378,7 @@ protected: bool IsDropFormatSupported( SotClipboardFormatId nFormat ); // need this because the base class' IsDropFormatSupported is not const ... private: - void* implGetDataFlavors() const; + const DataFlavorExVector& implGetDataFlavors() const; // with this we can make GetDataFlavors() inline, which is strongly needed as SVTOOLS does not export // any sysmbol containing an "_STL", so a non-inlined method would not be exported .... @@ -787,7 +787,7 @@ private: inline const DataFlavorExVector& BrowseBox::GetDataFlavors() const { - return *static_cast<DataFlavorExVector*>(implGetDataFlavors()); + return implGetDataFlavors(); } #endif // INCLUDED_SVTOOLS_BRWBOX_HXX diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index 4cfa47510020..8cf82f4e29a5 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -158,7 +158,7 @@ private: OUString maLastFormat; mutable css::uno::Reference< css::datatransfer::clipboard::XClipboard > mxClipboard; css::uno::Reference< css::frame::XTerminateListener > mxTerminateListener; - std::unique_ptr<DataFlavorExVector> mxFormats; + DataFlavorExVector maFormats; std::unique_ptr<TransferableObjectDescriptor> mxObjDesc; protected: @@ -238,8 +238,6 @@ protected: public: - TransferableHelper(); - void PrepareOLE( const TransferableObjectDescriptor& rObjDesc ); void CopyToClipboard( vcl::Window *pWindow ) const; @@ -267,7 +265,7 @@ private: css::uno::Reference< css::datatransfer::XTransferable > mxTransfer; css::uno::Reference< css::datatransfer::clipboard::XClipboard > mxClipboard; - std::unique_ptr<DataFlavorExVector> mxFormats; + DataFlavorExVector maFormats; std::unique_ptr<TransferableObjectDescriptor> mxObjDesc; std::unique_ptr<TransferableDataHelper_Impl> mxImpl; @@ -299,7 +297,7 @@ public: SotClipboardFormatId GetFormat( sal_uInt32 nFormat ) const; css::datatransfer::DataFlavor GetFormatDataFlavor( sal_uInt32 nFormat ) const; - DataFlavorExVector& GetDataFlavorExVector() const {return *mxFormats; } + const DataFlavorExVector& GetDataFlavorExVector() const {return maFormats; } bool StartClipboardListening( ); void StopClipboardListening( ); @@ -444,7 +442,7 @@ private: css::uno::Reference< css::datatransfer::dnd::XDropTarget > mxDropTarget; css::uno::Reference< css::datatransfer::dnd::XDropTargetListener > mxDropTargetListener; - DataFlavorExVector* mpFormats; + DataFlavorExVector maFormats; DropTargetHelper() = delete; DropTargetHelper& operator=( const DropTargetHelper& rDropTargetHelper ) = delete; @@ -471,7 +469,7 @@ public: // typically called by the application in ::AcceptDrop and ::ExecuteDrop and (see above) bool IsDropFormatSupported( SotClipboardFormatId nFormat ); - DataFlavorExVector& GetDataFlavorExVector() const {return *mpFormats; } + const DataFlavorExVector& GetDataFlavorExVector() const {return maFormats; } }; |