TransferableHelper::GetData() to take additional argument.

And adjust all derived classes that overwrite this virtual method.

Change-Id: Iab30e55be2d7bb696563f8a86d1d1f8fb40ce485

46 files changed, 69 insertions, 67 deletions

diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx
index 20f46ac7d2ca..e46796e65053 100644
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.cxx
@@ -73,7 +73,7 @@ void ChartTransferable::AddSupportedFormats()
     AddFormat( SOT_FORMAT_BITMAP );
 }
 
-bool ChartTransferable::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
+bool ChartTransferable::GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& /*rDestDoc*/ )
 {
     sal_uInt32  nFormat = SotExchange::GetFormat( rFlavor );
     bool        bResult = false;
diff --git a/chart2/source/controller/main/ChartTransferable.hxx b/chart2/source/controller/main/ChartTransferable.hxx
index b3c3815e4f34..3c54689a07db 100644
--- a/chart2/source/controller/main/ChartTransferable.hxx
+++ b/chart2/source/controller/main/ChartTransferable.hxx
@@ -43,7 +43,7 @@ protected:
 
     // implementation of TransferableHelper methods
     virtual void        AddSupportedFormats() SAL_OVERRIDE;
-    virtual bool        GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+    virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
     virtual bool        WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId,
                                         const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
 
diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx
index e2cdbbba4395..616f504f6538 100644
--- a/dbaccess/source/ui/browser/dbexchange.cxx
+++ b/dbaccess/source/ui/browser/dbexchange.cxx
@@ -159,7 +159,7 @@ namespace dbaui
         ODataAccessObjectTransferable::AddSupportedFormats();
     }
 
-    bool ODataClipboard::GetData( const DataFlavor& rFlavor )
+    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 c3434420db20..448a8c7820f3 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() SAL_OVERRIDE;
-        virtual bool                GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+        virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
         virtual void                DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE;
 
         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 4e6c0f7b01f3..0f49ee4515db 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() SAL_OVERRIDE;
-        virtual bool        GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+        virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
         virtual bool        WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
         virtual void        ObjectReleased() SAL_OVERRIDE;
     };
diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx
index f2dab76f9a65..fa2d9be451c6 100644
--- a/dbaccess/source/ui/inc/dbexchange.hxx
+++ b/dbaccess/source/ui/inc/dbexchange.hxx
@@ -77,7 +77,7 @@ namespace dbaui
 
     protected:
         virtual void        AddSupportedFormats() SAL_OVERRIDE;
-        virtual bool        GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+        virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
         virtual void        ObjectReleased() SAL_OVERRIDE;
         virtual bool        WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
     };
diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx
index 12b5dcdaa01a..e2531a5dce60 100644
--- a/dbaccess/source/ui/querydesign/JoinExchange.cxx
+++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx
@@ -113,7 +113,7 @@ namespace dbaui
             AddFormat( SOT_FORMATSTR_ID_SBA_TABID );
     }
 
-    bool OJoinExchObj::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
+    bool OJoinExchObj::GetData( const css::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 5c3d1c6a5dbc..e2acae64a14f 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);
     }
-    bool OTableRowExchange::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
+    bool OTableRowExchange::GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& /*rDestDoc*/ )
     {
         sal_uLong nFormat = SotExchange::GetFormat(rFlavor);
         if(nFormat == SOT_FORMATSTR_ID_SBA_TABED)
diff --git a/include/svtools/embedtransfer.hxx b/include/svtools/embedtransfer.hxx
index 61622e9098b9..10625eaadf2a 100644
--- a/include/svtools/embedtransfer.hxx
+++ b/include/svtools/embedtransfer.hxx
@@ -36,7 +36,7 @@ private:
 protected:
 
     virtual void        AddSupportedFormats() SAL_OVERRIDE;
-    virtual bool        GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+    virtual bool        GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
     virtual void        ObjectReleased() SAL_OVERRIDE;
 
 public:
diff --git a/include/svtools/stringtransfer.hxx b/include/svtools/stringtransfer.hxx
index 67197be94add..9f3869af6dd2 100644
--- a/include/svtools/stringtransfer.hxx
+++ b/include/svtools/stringtransfer.hxx
@@ -41,8 +41,8 @@ namespace svt
 
     protected:
         // TransferableHelper overridables
-        virtual void                AddSupportedFormats() SAL_OVERRIDE;
-        virtual bool                GetData( const ::com::sun::star::datatransfer::DataFlavor& _rFlavor ) SAL_OVERRIDE;
+        virtual void AddSupportedFormats() SAL_OVERRIDE;
+        virtual bool GetData( const css::datatransfer::DataFlavor& _rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
     };
 
 
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index 4a79cf02797f..03932c561600 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -240,7 +240,7 @@ protected:
 protected:
 
     virtual void        AddSupportedFormats() = 0;
-    virtual bool        GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) = 0;
+    virtual bool        GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) = 0;
     virtual bool        WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
     virtual void        DragFinished( sal_Int8 nDropAction );
     virtual void        ObjectReleased();
@@ -497,7 +497,7 @@ class SVT_DLLPUBLIC TransferDataContainer : public TransferableHelper
 protected:
 
     virtual void        AddSupportedFormats() SAL_OVERRIDE;
-    virtual bool        GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+    virtual bool        GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
     virtual void        DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE;
 
 public:
diff --git a/include/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx
index b04335d9d0be..801f3eccc3a6 100644
--- a/include/svx/dbaexchange.hxx
+++ b/include/svx/dbaexchange.hxx
@@ -147,7 +147,7 @@ namespace svx
     protected:
         // TransferableHelper overridables
         virtual void        AddSupportedFormats() SAL_OVERRIDE;
-        virtual bool        GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+        virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
 
         static sal_uInt32   getDescriptorFormatId();
 
@@ -225,7 +225,7 @@ namespace svx
 
     protected:
         virtual void        AddSupportedFormats() SAL_OVERRIDE;
-        virtual bool        GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+        virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
         virtual void        ObjectReleased() SAL_OVERRIDE;
 
     protected:
@@ -275,7 +275,7 @@ namespace svx
 
     protected:
         virtual void        AddSupportedFormats() SAL_OVERRIDE;
-        virtual bool        GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+        virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
         virtual void        ObjectReleased() SAL_OVERRIDE;
         static sal_uInt32   getDescriptorFormatId();
     };
diff --git a/include/svx/dbaobjectex.hxx b/include/svx/dbaobjectex.hxx
index a5b9c11730da..a7676209770a 100644
--- a/include/svx/dbaobjectex.hxx
+++ b/include/svx/dbaobjectex.hxx
@@ -63,7 +63,7 @@ namespace svx
     protected:
         // TransferableHelper overridables
         virtual void        AddSupportedFormats() SAL_OVERRIDE;
-        virtual bool        GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+        virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
 
         static sal_uInt32   getDescriptorFormatId(bool _bExtractForm);
     };
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index 8c19c4add446..def4f9b01c17 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -176,7 +176,7 @@ protected:
 
     // TransferableHelper
     virtual void                    AddSupportedFormats() SAL_OVERRIDE;
-    virtual bool                    GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+    virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
     virtual bool                    WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
     virtual void                    DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE;
     virtual void                    ObjectReleased() SAL_OVERRIDE;
diff --git a/include/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx
index 2c7f30d2a7d2..7de6e3ab923c 100644
--- a/include/svx/xmlexchg.hxx
+++ b/include/svx/xmlexchg.hxx
@@ -69,7 +69,7 @@ namespace svx
 
             // TransferableHelper overridables
             virtual void        AddSupportedFormats() SAL_OVERRIDE;
-            virtual bool        GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+            virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
 
             OXFormsDescriptor m_aDescriptor;
 
diff --git a/reportdesign/source/ui/dlg/GroupExchange.cxx b/reportdesign/source/ui/dlg/GroupExchange.cxx
index 979dd5c65cde..75ab80ea094d 100644
--- a/reportdesign/source/ui/dlg/GroupExchange.cxx
+++ b/reportdesign/source/ui/dlg/GroupExchange.cxx
@@ -49,7 +49,7 @@ namespace rptui
         }
     }
 
-    bool OGroupExchange::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
+    bool OGroupExchange::GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& /*rDestDoc*/ )
     {
         sal_uLong nFormat = SotExchange::GetFormat(rFlavor);
         if(nFormat == OGroupExchange::getReportGroupId() )
diff --git a/reportdesign/source/ui/dlg/GroupExchange.hxx b/reportdesign/source/ui/dlg/GroupExchange.hxx
index 57259b504684..39c206be49c6 100644
--- a/reportdesign/source/ui/dlg/GroupExchange.hxx
+++ b/reportdesign/source/ui/dlg/GroupExchange.hxx
@@ -37,7 +37,7 @@ namespace rptui
         static sal_uInt32   getReportGroupId();
     protected:
         virtual void        AddSupportedFormats() SAL_OVERRIDE;
-        virtual bool        GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+        virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
         virtual void        ObjectReleased() SAL_OVERRIDE;
     };
 }
diff --git a/reportdesign/source/ui/inc/dlgedclip.hxx b/reportdesign/source/ui/inc/dlgedclip.hxx
index 4ac25e4bf888..39609c053fc1 100644
--- a/reportdesign/source/ui/inc/dlgedclip.hxx
+++ b/reportdesign/source/ui/inc/dlgedclip.hxx
@@ -70,7 +70,7 @@ public:
 protected:
     // TransferableHelper overridables
     virtual void        AddSupportedFormats() SAL_OVERRIDE;
-    virtual bool        GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+    virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
 private:
     TSectionElements    m_aCopyElements;
 };
diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx
index ce45d33d5af2..5d95b0dbea35 100644
--- a/reportdesign/source/ui/report/dlgedclip.cxx
+++ b/reportdesign/source/ui/report/dlgedclip.cxx
@@ -52,7 +52,7 @@ void OReportExchange::AddSupportedFormats()
     AddFormat(getDescriptorFormatId());
 }
 
-bool OReportExchange::GetData( const datatransfer::DataFlavor& _rFlavor )
+bool OReportExchange::GetData( const datatransfer::DataFlavor& _rFlavor, const OUString& /*rDestDoc*/ )
 {
     const sal_uInt32 nFormatId = SotExchange::GetFormat(_rFlavor);
     return (nFormatId == getDescriptorFormatId()) && SetAny( uno::Any(m_aCopyElements), _rFlavor );
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index ae380e3e8361..1396857c10e4 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -372,7 +372,7 @@ void ScDrawTransferObj::AddSupportedFormats()
 //      AddFormat( SOT_FORMATSTR_ID_SVIM );
 }
 
-bool ScDrawTransferObj::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
+bool ScDrawTransferObj::GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc )
 {
     bool bOK = false;
     sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor );
@@ -396,7 +396,7 @@ bool ScDrawTransferObj::GetData( const ::com::sun::star::datatransfer::DataFlavo
                 pModel->SetSwapGraphicsMode( SDR_SWAPGRAPHICSMODE_PURGE );
             }
 
-            bOK = SetAny( aOleData.GetAny(rFlavor, OUString()), rFlavor );
+            bOK = SetAny( aOleData.GetAny(rFlavor, rDestDoc), rFlavor );
 
             if( pModel )
                 pModel->SetSwapGraphicsMode( nOldSwapMode );
diff --git a/sc/source/ui/app/lnktrans.cxx b/sc/source/ui/app/lnktrans.cxx
index 734d9b718a5c..69a5cbe1d4a8 100644
--- a/sc/source/ui/app/lnktrans.cxx
+++ b/sc/source/ui/app/lnktrans.cxx
@@ -53,7 +53,8 @@ void ScLinkTransferObj::AddSupportedFormats()
     }
 }
 
-bool ScLinkTransferObj::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
+bool ScLinkTransferObj::GetData(
+    const css::datatransfer::DataFlavor& rFlavor, const OUString& /*rDestDoc*/ )
 {
     bool bOK = false;
     if ( !aLinkURL.isEmpty() )
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index e4204da40313..2008695ecf53 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -389,7 +389,8 @@ ScDrawTransferObj* ScSelectionTransferObj::GetDrawData()
     return pDrawData;
 }
 
-bool ScSelectionTransferObj::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
+bool ScSelectionTransferObj::GetData(
+    const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc )
 {
     bool bOK = false;
 
@@ -416,7 +417,7 @@ bool ScSelectionTransferObj::GetData( const ::com::sun::star::datatransfer::Data
     if ( xSource.is() )
     {
         TransferableDataHelper aHelper( xSource );
-        uno::Any aAny = aHelper.GetAny(rFlavor, OUString());
+        uno::Any aAny = aHelper.GetAny(rFlavor, rDestDoc);
         bOK = SetAny( aAny, rFlavor );
     }
 
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index a538cd30afed..1d3bb94e2906 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -241,7 +241,7 @@ void ScTransferObj::AddSupportedFormats()
         AddFormat( SOT_FORMATSTR_ID_EDITENGINE );
 }
 
-bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor )
+bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor, const OUString& /*rDestDoc*/ )
 {
     sal_uInt32  nFormat = SotExchange::GetFormat( rFlavor );
     bool        bOK = false;
diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx
index 5b71558c655a..8893b19787d4 100644
--- a/sc/source/ui/inc/drwtrans.hxx
+++ b/sc/source/ui/inc/drwtrans.hxx
@@ -73,7 +73,7 @@ public:
     virtual ~ScDrawTransferObj();
 
     virtual void        AddSupportedFormats() SAL_OVERRIDE;
-    virtual bool        GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+    virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
     virtual bool        WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId,
                                         const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
     virtual void        ObjectReleased() SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/lnktrans.hxx b/sc/source/ui/inc/lnktrans.hxx
index 2e47e41649e8..033da1b9ebbe 100644
--- a/sc/source/ui/inc/lnktrans.hxx
+++ b/sc/source/ui/inc/lnktrans.hxx
@@ -36,7 +36,7 @@ public:
     void                SetLinkURL( const OUString& rURL, const OUString& rText );
 
     virtual void        AddSupportedFormats() SAL_OVERRIDE;
-    virtual bool        GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+    virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
     virtual void        ObjectReleased() SAL_OVERRIDE;
     virtual void        DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE;
 };
diff --git a/sc/source/ui/inc/seltrans.hxx b/sc/source/ui/inc/seltrans.hxx
index e7eb1ed92bee..3abfd11a8873 100644
--- a/sc/source/ui/inc/seltrans.hxx
+++ b/sc/source/ui/inc/seltrans.hxx
@@ -65,7 +65,7 @@ public:
     ScDrawTransferObj*  GetDrawData();
 
     virtual void        AddSupportedFormats() SAL_OVERRIDE;
-    virtual bool        GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+    virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
     virtual void        ObjectReleased() SAL_OVERRIDE;
 };
 
diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx
index debff33d5b93..6ee2855b7d0c 100644
--- a/sc/source/ui/inc/transobj.hxx
+++ b/sc/source/ui/inc/transobj.hxx
@@ -72,7 +72,7 @@ public:
     virtual ~ScTransferObj();
 
     virtual void        AddSupportedFormats() SAL_OVERRIDE;
-    virtual bool        GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+    virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
     virtual bool        WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId,
                                         const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
     virtual void        ObjectReleased() SAL_OVERRIDE;
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index c65552b9cc11..08acf398b9e6 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -448,7 +448,7 @@ void SdTransferable::AddSupportedFormats()
     }
 }
 
-bool SdTransferable::GetData( const DataFlavor& rFlavor )
+bool SdTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDoc )
 {
     if (SD_MOD()==NULL)
         return false;
@@ -476,7 +476,7 @@ bool SdTransferable::GetData( const DataFlavor& rFlavor )
         if( nFormat == FORMAT_GDIMETAFILE && mpGraphic )
             bOK = SetGDIMetaFile( mpGraphic->GetGDIMetaFile(), rFlavor );
         else
-            bOK = SetAny( mpOLEDataHelper->GetAny(rFlavor, OUString()), rFlavor );
+            bOK = SetAny( mpOLEDataHelper->GetAny(rFlavor, rDestDoc), rFlavor );
 
         if( mpSdDrawDocumentIntern )
             mpSdDrawDocumentIntern->SetSwapGraphicsMode( nOldSwapMode );
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 83978f8f0540..370c0da71fc9 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -125,7 +125,7 @@ void SdPageObjsTLB::SdPageObjsTransferable::AddSupportedFormats()
 
 
 
-bool SdPageObjsTLB::SdPageObjsTransferable::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
+bool SdPageObjsTLB::SdPageObjsTransferable::GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& /*rDestDoc*/ )
 {
     sal_uLong nFormatId = SotExchange::GetFormat( rFlavor );
     switch (nFormatId)
diff --git a/sd/source/ui/inc/TabControl.hxx b/sd/source/ui/inc/TabControl.hxx
index 2ec16b904d42..1700921dfee5 100644
--- a/sd/source/ui/inc/TabControl.hxx
+++ b/sd/source/ui/inc/TabControl.hxx
@@ -95,7 +95,7 @@ private:
         virtual             ~TabControlTransferable();
 
         virtual void        AddSupportedFormats() SAL_OVERRIDE;
-        virtual bool        GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+        virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
         virtual void        DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE;
 
     };
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index be54329fdde6..8a40c6037f45 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -100,7 +100,7 @@ public:
         SAL_DLLPRIVATE virtual               ~SdPageObjsTransferable();
 
         SAL_DLLPRIVATE virtual void      AddSupportedFormats() SAL_OVERRIDE;
-        SAL_DLLPRIVATE virtual bool      GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+        SAL_DLLPRIVATE virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
         SAL_DLLPRIVATE virtual void      DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE;
 
         SAL_DLLPRIVATE virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx
index 095beecf83dd..d9aa56e3826c 100644
--- a/sd/source/ui/inc/sdxfer.hxx
+++ b/sd/source/ui/inc/sdxfer.hxx
@@ -106,7 +106,7 @@ public:
 protected:
 
     virtual void                    AddSupportedFormats() SAL_OVERRIDE;
-    virtual bool                    GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+    virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
     virtual bool                    WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
     virtual void                    ObjectReleased() SAL_OVERRIDE;
 
diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx
index 827739acff84..2df6a85b04b7 100644
--- a/sd/source/ui/view/tabcontr.cxx
+++ b/sd/source/ui/view/tabcontr.cxx
@@ -62,7 +62,7 @@ void TabControl::TabControlTransferable::AddSupportedFormats()
 
 
 
-bool TabControl::TabControlTransferable::GetData( const ::com::sun::star::datatransfer::DataFlavor& )
+bool TabControl::TabControlTransferable::GetData( const css::datatransfer::DataFlavor& /*rFlavor*/, const OUString& /*rDestDoc*/ )
 {
     return false;
 }
diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx
index aa2375ba5317..5fa152ec0df2 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -76,7 +76,7 @@ void SvEmbedTransferHelper::AddSupportedFormats()
 
 
 
-bool SvEmbedTransferHelper::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
+bool SvEmbedTransferHelper::GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& /*rDestDoc*/ )
 {
     bool bRet = false;
 
diff --git a/svtools/source/misc/stringtransfer.cxx b/svtools/source/misc/stringtransfer.cxx
index 44349ae3e2e3..f6f614e8095b 100644
--- a/svtools/source/misc/stringtransfer.cxx
+++ b/svtools/source/misc/stringtransfer.cxx
@@ -44,7 +44,7 @@ namespace svt
     }
 
 
-    bool OStringTransferable::GetData( const DataFlavor& _rFlavor )
+    bool OStringTransferable::GetData( const DataFlavor& _rFlavor, const OUString& /*rDestDoc*/ )
     {
         sal_uInt32 nFormat = SotExchange::GetFormat( _rFlavor );
         if (SOT_FORMAT_STRING == nFormat)
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 0318887e1863..5a916b6ad4de 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -306,7 +306,7 @@ Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor )
     return getTransferData2(rFlavor, OUString());
 }
 
-Any SAL_CALL TransferableHelper::getTransferData2( const DataFlavor& rFlavor, const OUString& /*rDestDoc*/ )
+Any SAL_CALL TransferableHelper::getTransferData2( const DataFlavor& rFlavor, const OUString& rDestDoc )
     throw (UnsupportedFlavorException, IOException, RuntimeException, std::exception)
 {
     if( !maAny.hasValue() || !mpFormats->size() || ( maLastFormat != rFlavor.MimeType ) )
@@ -329,21 +329,21 @@ Any SAL_CALL TransferableHelper::getTransferData2( const DataFlavor& rFlavor, co
             if( SotExchange::GetFormatDataFlavor( FORMAT_STRING, aSubstFlavor ) &&
                 TransferableDataHelper::IsEqual( aSubstFlavor, rFlavor ) )
             {
-                GetData( aSubstFlavor );
+                GetData(aSubstFlavor, rDestDoc);
                 bDone = maAny.hasValue();
             }
             else if(SotExchange::GetFormatDataFlavor(SOT_FORMATSTR_ID_BMP, aSubstFlavor )
                 && TransferableDataHelper::IsEqual( aSubstFlavor, rFlavor )
                 && SotExchange::GetFormatDataFlavor(FORMAT_BITMAP, aSubstFlavor))
             {
-                GetData( aSubstFlavor );
+                GetData(aSubstFlavor, rDestDoc);
                 bDone = true;
             }
             else if( SotExchange::GetFormatDataFlavor( SOT_FORMATSTR_ID_EMF, aSubstFlavor ) &&
                      TransferableDataHelper::IsEqual( aSubstFlavor, rFlavor ) &&
                      SotExchange::GetFormatDataFlavor( FORMAT_GDIMETAFILE, aSubstFlavor ) )
             {
-                GetData( aSubstFlavor );
+                GetData(aSubstFlavor, rDestDoc);
 
                 if( maAny.hasValue() )
                 {
@@ -373,7 +373,7 @@ Any SAL_CALL TransferableHelper::getTransferData2( const DataFlavor& rFlavor, co
                      TransferableDataHelper::IsEqual( aSubstFlavor, rFlavor ) &&
                      SotExchange::GetFormatDataFlavor( FORMAT_GDIMETAFILE, aSubstFlavor ) )
             {
-                GetData( aSubstFlavor );
+                GetData(aSubstFlavor, rDestDoc);
 
                 if( maAny.hasValue() )
                 {
@@ -406,7 +406,7 @@ Any SAL_CALL TransferableHelper::getTransferData2( const DataFlavor& rFlavor, co
 
             // if any is not yet filled, use standard format
             if( !maAny.hasValue() )
-                GetData( rFlavor );
+                GetData(rFlavor, rDestDoc);
 
 #ifdef DEBUG
             if( maAny.hasValue() && ::com::sun::star::uno::TypeClass_STRING != maAny.getValueType().getTypeClass() )
diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx
index 541571fdea97..c79ddbf8bfc9 100644
--- a/svtools/source/misc/transfer2.cxx
+++ b/svtools/source/misc/transfer2.cxx
@@ -415,8 +415,8 @@ void TransferDataContainer::AddSupportedFormats()
 
 
 
-bool TransferDataContainer::GetData( const
-            ::com::sun::star::datatransfer::DataFlavor& rFlavor )
+bool TransferDataContainer::GetData(
+    const css::datatransfer::DataFlavor& rFlavor, const OUString& /*rDestDoc*/ )
 {
     TDataCntnrEntryList::iterator   aIter( pImpl->aFmtList.begin() ),
                                     aEnd( pImpl->aFmtList.end() );
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index 8818738b1a4f..4cd42174270f 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -224,7 +224,7 @@ namespace svx
     }
 
 
-    bool OColumnTransferable::GetData( const DataFlavor& _rFlavor )
+    bool OColumnTransferable::GetData( const DataFlavor& _rFlavor, const OUString& /*rDestDoc*/ )
     {
         const sal_uInt32 nFormatId = SotExchange::GetFormat(_rFlavor);
         switch (nFormatId)
@@ -469,7 +469,7 @@ namespace svx
     }
 
 
-    bool ODataAccessObjectTransferable::GetData( const DataFlavor& rFlavor )
+    bool ODataAccessObjectTransferable::GetData( const DataFlavor& rFlavor, const OUString& /*rDestDoc*/ )
     {
         sal_uIntPtr nFormat = SotExchange::GetFormat(rFlavor);
         switch (nFormat)
@@ -644,7 +644,7 @@ namespace svx
         AddFormat(getDescriptorFormatId());
     }
 
-    bool OMultiColumnTransferable::GetData( const DataFlavor& _rFlavor )
+    bool OMultiColumnTransferable::GetData( const DataFlavor& _rFlavor, const OUString& /*rDestDoc*/ )
     {
         const sal_uInt32 nFormatId = SotExchange::GetFormat(_rFlavor);
         if (nFormatId == getDescriptorFormatId())
diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx
index cd5fdf868afe..c994db3426db 100644
--- a/svx/source/fmcomp/dbaobjectex.cxx
+++ b/svx/source/fmcomp/dbaobjectex.cxx
@@ -90,7 +90,7 @@ namespace svx
     }
 
 
-    bool OComponentTransferable::GetData( const DataFlavor& _rFlavor )
+    bool OComponentTransferable::GetData( const DataFlavor& _rFlavor, const OUString& /*rDestDoc*/ )
     {
         const sal_uInt32 nFormatId = SotExchange::GetFormat(_rFlavor);
         if ( nFormatId == getDescriptorFormatId(true) || nFormatId == getDescriptorFormatId(false) )
diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx
index b02ea58f3e99..058d36d85d81 100644
--- a/svx/source/fmcomp/xmlexchg.cxx
+++ b/svx/source/fmcomp/xmlexchg.cxx
@@ -43,7 +43,7 @@ namespace svx
         AddFormat( SOT_FORMATSTR_ID_XFORMS );
     }
 
-    bool OXFormsTransferable::GetData( const DataFlavor& _rFlavor )
+    bool OXFormsTransferable::GetData( const DataFlavor& _rFlavor, const OUString& /*rDestDoc*/ )
     {
         const sal_uInt32 nFormatId = SotExchange::GetFormat( _rFlavor );
         if ( SOT_FORMATSTR_ID_XFORMS == nFormatId )
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index e67d15cfe572..b224432d8e86 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -115,7 +115,7 @@ namespace svxform
     }
 
 
-    bool OLocalExchange::GetData( const ::com::sun::star::datatransfer::DataFlavor& /*_rFlavor*/ )
+    bool OLocalExchange::GetData( const css::datatransfer::DataFlavor& /*_rFlavor*/, const OUString& /*rDestDoc*/ )
     {
         return false;   // do not have any formats by default
     }
@@ -290,7 +290,7 @@ namespace svxform
     }
 
 
-    bool OControlExchange::GetData( const DataFlavor& _rFlavor )
+    bool OControlExchange::GetData( const DataFlavor& _rFlavor, const OUString& rDestDoc )
     {
         const sal_uInt32 nFormatId = SotExchange::GetFormat( _rFlavor );
 
@@ -310,7 +310,7 @@ namespace svxform
             SetAny( makeAny( m_aHiddenControlModels ), _rFlavor );
         }
         else
-            return OLocalExchange::GetData( _rFlavor );
+            return OLocalExchange::GetData(_rFlavor, rDestDoc);
 
         return true;
     }
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index e89658761cdd..47b05eabaccd 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -507,7 +507,7 @@ void GalleryTransferable::AddSupportedFormats()
     }
 }
 
-bool GalleryTransferable::GetData( const datatransfer::DataFlavor& rFlavor )
+bool GalleryTransferable::GetData( const datatransfer::DataFlavor& rFlavor, const OUString& /*rDestDoc*/ )
 {
     sal_uInt32  nFormat = SotExchange::GetFormat( rFlavor );
     bool        bRet = false;
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index 8e47403aa43e..dbdc4f3c5140 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@@ -82,7 +82,7 @@ namespace svxform
 
         // TransferableHelper
         virtual void        DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE;
-        virtual bool        GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+        virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
 
     private:
         void StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, sal_Int32 nDragPointer = DND_POINTER_NONE, sal_Int32 nDragImage = DND_IMAGE_NONE )
@@ -225,7 +225,7 @@ namespace svxform
         inline static bool  hasHiddenControlModelsFormat( const DataFlavorExVector& _rFormats );
 
     protected:
-        virtual bool        GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+        virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
         virtual void        AddSupportedFormats() SAL_OVERRIDE;
     };
 
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 28809d41c303..5209fa9bfca2 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -49,7 +49,7 @@ private:
 protected:
 
     virtual void            AddSupportedFormats() SAL_OVERRIDE;
-    virtual bool            GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+    virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
     virtual bool            WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
 
 public:
@@ -67,7 +67,7 @@ void SvxColorValueSetData::AddSupportedFormats()
 
 
 
-bool SvxColorValueSetData::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
+bool SvxColorValueSetData::GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& /*rDestDoc*/ )
 {
     bool bRet = false;
 
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index dd687878485c..766cb5003733 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -396,7 +396,7 @@ namespace
     }
 }
 
-bool SwTransferable::GetData( const DataFlavor& rFlavor )
+bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDoc )
 {
     sal_uInt32  nFormat = SotExchange::GetFormat( rFlavor );
 
@@ -492,7 +492,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor )
         if( xObj.is() )
         {
             TransferableDataHelper aD( new SvEmbedTransferHelper( xObj, pOLEGraph, nAspect ) );
-            uno::Any aAny = aD.GetAny(rFlavor, OUString());
+            uno::Any aAny = aD.GetAny(rFlavor, rDestDoc);
             if( aAny.hasValue() )
                 bOK = SetAny( aAny, rFlavor );
         }
diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx
index c5d3b6e6a6ec..de20e748dca0 100644
--- a/sw/source/uibase/inc/swdtflvr.hxx
+++ b/sw/source/uibase/inc/swdtflvr.hxx
@@ -137,7 +137,7 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper
 
 protected:
     virtual void        AddSupportedFormats() SAL_OVERRIDE;
-    virtual bool        GetData( const css::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+    virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
     virtual bool        WriteObject( SotStorageStreamRef& rxOStm,
                                         void* pUserObject,
                                         sal_uInt32 nUserObjectId,