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 /sw | |
| 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 'sw')
| -rw-r--r-- | sw/source/uibase/dochdl/swdtflvr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/condedit.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 9af2f2b8be3e..938c47c63610 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/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 ) { diff --git a/sw/source/uibase/utlui/condedit.cxx b/sw/source/uibase/utlui/condedit.cxx index 4dffb1b01c02..5b910de5373b 100644 --- a/sw/source/uibase/utlui/condedit.cxx +++ b/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( |