diff options
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/ui/browser/dbexchange.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/JoinExchange.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/TableRowExchange.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/dbexchange.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/JoinExchange.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/tabledesign/TableRowExchange.cxx | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx index 32c05ce9608f..47e4d2f31faf 100644 --- a/dbaccess/source/ui/browser/dbexchange.cxx +++ b/dbaccess/source/ui/browser/dbexchange.cxx @@ -159,7 +159,7 @@ namespace dbaui ODataAccessObjectTransferable::AddSupportedFormats(); } - sal_Bool ODataClipboard::GetData( const DataFlavor& rFlavor ) + sal_Bool ODataClipboard::GetData( const DataFlavor& rFlavor, const OUString& rDestDoc ) { const sal_uLong nFormat = SotExchange::GetFormat(rFlavor); switch (nFormat) @@ -175,7 +175,7 @@ namespace dbaui return m_pHtml.is() && SetObject( m_pHtml.get(), SOT_FORMATSTR_ID_HTML, rFlavor ); } - return ODataAccessObjectTransferable::GetData( rFlavor ); + return ODataAccessObjectTransferable::GetData(rFlavor, rDestDoc); } void ODataClipboard::ObjectReleased() diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx b/dbaccess/source/ui/inc/JoinExchange.hxx index 2bf549a507e3..d7053007d796 100644 --- a/dbaccess/source/ui/inc/JoinExchange.hxx +++ b/dbaccess/source/ui/inc/JoinExchange.hxx @@ -61,7 +61,7 @@ namespace dbaui protected: virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ); virtual void DragFinished( sal_Int8 nDropAction ); static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); diff --git a/dbaccess/source/ui/inc/TableRowExchange.hxx b/dbaccess/source/ui/inc/TableRowExchange.hxx index 0f034744115c..a298a5b02ea8 100644 --- a/dbaccess/source/ui/inc/TableRowExchange.hxx +++ b/dbaccess/source/ui/inc/TableRowExchange.hxx @@ -34,7 +34,7 @@ namespace dbaui OTableRowExchange(const ::std::vector< ::boost::shared_ptr<OTableRow> >& _rvTableRow); protected: virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ); virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); virtual void ObjectReleased(); }; diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx index f1942130be10..c8d98522c265 100644 --- a/dbaccess/source/ui/inc/dbexchange.hxx +++ b/dbaccess/source/ui/inc/dbexchange.hxx @@ -73,7 +73,7 @@ namespace dbaui protected: virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ); virtual void ObjectReleased(); virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); }; diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx index 70007d70601a..8efc79660943 100644 --- a/dbaccess/source/ui/querydesign/JoinExchange.cxx +++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx @@ -116,7 +116,7 @@ namespace dbaui AddFormat( SOT_FORMATSTR_ID_SBA_TABID ); } - sal_Bool OJoinExchObj::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) + sal_Bool OJoinExchObj::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, const OUString& /*rDestDoc*/ ) { sal_uInt32 nFormat = SotExchange::GetFormat(rFlavor); if ( SOT_FORMATSTR_ID_SBA_JOIN == nFormat ) diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx index 3a14971d7dc3..a593b0902b3c 100644 --- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx +++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx @@ -52,7 +52,7 @@ namespace dbaui if ( !m_vTableRow.empty() ) AddFormat(SOT_FORMATSTR_ID_SBA_TABED); } - sal_Bool OTableRowExchange::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) + sal_Bool OTableRowExchange::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, const OUString& /*rDestDoc*/ ) { sal_uLong nFormat = SotExchange::GetFormat(rFlavor); if(nFormat == SOT_FORMATSTR_ID_SBA_TABED) |