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/34767Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

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

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; }
 
 };
 

reportdesign/source/ui/report/ReportSection.cxx

@@ -742,7 +742,7 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt )
 
     sal_Int8 nDropOption = DND_ACTION_NONE;
     const TransferableDataHelper aDropped(_rEvt.maDropEvent.Transferable);
-    DataFlavorExVector& rFlavors = aDropped.GetDataFlavorExVector();
+    const DataFlavorExVector& rFlavors = aDropped.GetDataFlavorExVector();
     bool bMultipleFormat = svx::OMultiColumnTransferable::canExtractDescriptor(rFlavors);
     if ( OReportExchange::canExtract(rFlavors) )
     {

svtools/source/brwbox/brwbox2.cxx

@@ -67,11 +67,11 @@ sal_Int8 BrowseBox::ExecuteDrop( const BrowserExecuteDropEvent& )
 }
 
 
-void* BrowseBox::implGetDataFlavors() const
+const DataFlavorExVector& BrowseBox::implGetDataFlavors() const
 {
     if (pDataWin->bCallingDropCallback)
-        return &pDataWin->GetDataFlavorExVector();
-    return &GetDataFlavorExVector();
+        return pDataWin->GetDataFlavorExVector();
+    return GetDataFlavorExVector();
 }
 
 

svtools/source/misc/transfer2.cxx

@@ -228,16 +228,14 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dropActionChanged( const Dro
 
 
 DropTargetHelper::DropTargetHelper( vcl::Window* pWindow ) :
-    mxDropTarget( pWindow->GetDropTarget() ),
-    mpFormats( new DataFlavorExVector )
+    mxDropTarget( pWindow->GetDropTarget() )
 {
     ImplConstruct();
 }
 
 
 DropTargetHelper::DropTargetHelper( const Reference< XDropTarget >& rxDropTarget ) :
-    mxDropTarget( rxDropTarget ),
-    mpFormats( new DataFlavorExVector )
+    mxDropTarget( rxDropTarget )
 {
     ImplConstruct();
 }
@@ -258,7 +256,6 @@ void DropTargetHelper::dispose()
 DropTargetHelper::~DropTargetHelper()
 {
     dispose();
-    delete mpFormats;
 }
 
 
@@ -275,14 +272,14 @@ void DropTargetHelper::ImplConstruct()
 
 void DropTargetHelper::ImplBeginDrag( const Sequence< DataFlavor >& rSupportedDataFlavors )
 {
-    mpFormats->clear();
-    TransferableDataHelper::FillDataFlavorExVector( rSupportedDataFlavors, *mpFormats );
+    maFormats.clear();
+    TransferableDataHelper::FillDataFlavorExVector( rSupportedDataFlavors, maFormats );
 }
 
 
 void DropTargetHelper::ImplEndDrag()
 {
-    mpFormats->clear();
+    maFormats.clear();
 }
 
 
@@ -300,7 +297,7 @@ sal_Int8 DropTargetHelper::ExecuteDrop( const ExecuteDropEvent& )
 
 bool DropTargetHelper::IsDropFormatSupported( SotClipboardFormatId nFormat )
 {
-    DataFlavorExVector::iterator    aIter( mpFormats->begin() ), aEnd( mpFormats->end() );
+    DataFlavorExVector::iterator    aIter( maFormats.begin() ), aEnd( maFormats.end() );
     bool                            bRet = false;
 
     while( aIter != aEnd )

sw/source/uibase/dochdl/swdtflvr.cxx

@@ -2643,7 +2643,7 @@ bool SwTransferable::PasteDBData( TransferableDataHelper& rData,
                                 : (bLink
                                     ? 0
                                     : FN_QRY_INSERT_FIELD );
-        DataFlavorExVector& rVector = rData.GetDataFlavorExVector();
+        const DataFlavorExVector& rVector = rData.GetDataFlavorExVector();
         bool bHaveColumnDescriptor = OColumnTransferable::canExtractColumnDescriptor(rVector, ColumnTransferFormatFlags::COLUMN_DESCRIPTOR | ColumnTransferFormatFlags::CONTROL_EXCHANGE);
         if ( SotClipboardFormatId::XFORMS == nFormat )
         {

sw/source/uibase/utlui/condedit.cxx

@@ -58,7 +58,7 @@ sal_Int8 ConditionEdit::ExecuteDrop( const ExecuteDropEvent& rEvt )
     {
         TransferableDataHelper aData( rEvt.maDropEvent.Transferable );
 
-            DataFlavorExVector& rVector = aData.GetDataFlavorExVector();
+            const DataFlavorExVector& rVector = aData.GetDataFlavorExVector();
             if(OColumnTransferable::canExtractColumnDescriptor(rVector, ColumnTransferFormatFlags::COLUMN_DESCRIPTOR))
             {
                 ODataAccessDescriptor aColDesc = OColumnTransferable::extractColumnDescriptor(