fdo#71076, fdo#71767: Preserve number formats when charts are copied.

(cherry picked from commit 1d38cb365543924f9c50014e6b2227e77de1d0c9)

Conflicts:
	xmloff/source/chart/SchXMLExport.cxx
	sd/source/ui/view/sdview3.cxx
	chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
	chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
	chart2/source/controller/main/ChartTransferable.cxx
	chart2/source/controller/main/ChartTransferable.hxx
	chart2/source/model/main/Axis.cxx
	chart2/source/model/template/ChartTypeTemplate.cxx
	chart2/source/tools/AxisHelper.cxx
	chart2/source/view/main/ChartView.cxx
	comphelper/source/container/embeddedobjectcontainer.cxx
	dbaccess/source/ui/browser/dbexchange.cxx
	dbaccess/source/ui/inc/JoinExchange.hxx
	dbaccess/source/ui/inc/TableRowExchange.hxx
	dbaccess/source/ui/inc/dbexchange.hxx
	dbaccess/source/ui/querydesign/JoinExchange.cxx
	dbaccess/source/ui/tabledesign/TableRowExchange.cxx
	embeddedobj/source/commonembedding/persistence.cxx
	embeddedobj/source/inc/commonembobj.hxx
	include/comphelper/embeddedobjectcontainer.hxx
	include/svtools/embedtransfer.hxx
	include/svtools/stringtransfer.hxx
	include/svtools/transfer.hxx
	include/svx/dbaexchange.hxx
	include/svx/dbaobjectex.hxx
	include/svx/fmview.hxx
	include/svx/galmisc.hxx
	include/svx/svdobj.hxx
	include/svx/svdoole2.hxx
	include/svx/svdxcgv.hxx
	include/svx/view3d.hxx
	include/svx/xmlexchg.hxx
	include/xmloff/xmlexp.hxx
	reportdesign/source/ui/dlg/GroupExchange.cxx
	reportdesign/source/ui/dlg/GroupExchange.hxx
	reportdesign/source/ui/inc/dlgedclip.hxx
	reportdesign/source/ui/report/dlgedclip.cxx
	sc/inc/column.hxx
	sc/source/ui/app/drwtrans.cxx
	sc/source/ui/app/lnktrans.cxx
	sc/source/ui/app/seltrans.cxx
	sc/source/ui/app/transobj.cxx
	sc/source/ui/inc/drwtrans.hxx
	sc/source/ui/inc/lnktrans.hxx
	sc/source/ui/inc/seltrans.hxx
	sc/source/ui/inc/transobj.hxx
	sc/source/ui/inc/viewfunc.hxx
	sc/source/ui/view/viewfun5.cxx
	sc/source/ui/view/viewfun7.cxx
	sd/source/ui/app/sdxfer.cxx
	sd/source/ui/dlg/sdtreelb.cxx
	sd/source/ui/inc/TabControl.hxx
	sd/source/ui/inc/View.hxx
	sd/source/ui/inc/sdtreelb.hxx
	sd/source/ui/inc/sdxfer.hxx
	sd/source/ui/view/sdview2.cxx
	sd/source/ui/view/tabcontr.cxx
	sfx2/source/doc/objxtor.cxx
	svtools/source/misc/embedtransfer.cxx
	svtools/source/misc/stringtransfer.cxx
	svtools/source/misc/transfer.cxx
	svtools/source/misc/transfer2.cxx
	svx/source/engine3d/view3d.cxx
	svx/source/fmcomp/dbaexchange.cxx
	svx/source/fmcomp/dbaobjectex.cxx
	svx/source/fmcomp/xmlexchg.cxx
	svx/source/form/fmexch.cxx
	svx/source/form/fmview.cxx
	svx/source/gallery2/galmisc.cxx
	svx/source/inc/fmexch.hxx
	svx/source/svdraw/svdoole2.cxx
	svx/source/svdraw/svdxcgv.cxx
	svx/source/tbxctrls/colrctrl.cxx
	sw/source/core/uibase/dochdl/swdtflvr.cxx
	sw/source/core/uibase/inc/swdtflvr.hxx
	sw/source/core/undo/unins.cxx

Change-Id: If5ae8852152012483237e7602e56a0c46ea8748a

5 files changed, 10 insertions, 10 deletions

diff --git a/reportdesign/source/ui/dlg/GroupExchange.cxx b/reportdesign/source/ui/dlg/GroupExchange.cxx
index 06753d8d7653..2e1397993917 100644
--- a/reportdesign/source/ui/dlg/GroupExchange.cxx
+++ b/reportdesign/source/ui/dlg/GroupExchange.cxx
@@ -48,8 +48,8 @@ namespace rptui
             AddFormat(OGroupExchange::getReportGroupId());
         }
     }
-    // -----------------------------------------------------------------------------
-    sal_Bool OGroupExchange::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
+
+    sal_Bool OGroupExchange::GetData( const ::com::sun::star::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 01eb4373718e..f45ce9974c53 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();
-        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();
     };
 }
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 0bfdd4652cb8..09b5e3c835ad 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -278,7 +278,7 @@ sal_Int8 OFieldExpressionControl::ExecuteDrop( const BrowserExecuteDropEvent& rE
         SetNoSelection();
 
         TransferableDataHelper aDropped( rEvt.maDropEvent.Transferable );
-        uno::Any aDrop = aDropped.GetAny(OGroupExchange::getReportGroupId());
+        uno::Any aDrop = aDropped.GetAny(OGroupExchange::getReportGroupId(), OUString());
         uno::Sequence< uno::Any > aGroups;
         aDrop >>= aGroups;
         if ( aGroups.getLength() )
@@ -881,7 +881,7 @@ void OFieldExpressionControl::InsertRows( long nRow )
         SotExchange::GetFormatDataFlavor(OGroupExchange::getReportGroupId(), aFlavor);
         uno::Sequence< uno::Any > aGroups;
 
-        if( (aTransferData.GetAny(aFlavor) >>= aGroups) && aGroups.getLength() )
+        if ((aTransferData.GetAny(aFlavor, OUString()) >>= aGroups) && aGroups.getLength())
         {
             m_bIgnoreEvent = false;
             {
diff --git a/reportdesign/source/ui/inc/dlgedclip.hxx b/reportdesign/source/ui/inc/dlgedclip.hxx
index 52b7f8d8372f..5ea8eb5fc3eb 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();
-    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 );
 private:
     TSectionElements    m_aCopyElements;
 };
diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx
index 48b334e9cbd5..5bcebc9e5570 100644
--- a/reportdesign/source/ui/report/dlgedclip.cxx
+++ b/reportdesign/source/ui/report/dlgedclip.cxx
@@ -51,15 +51,15 @@ void OReportExchange::AddSupportedFormats()
 {
     AddFormat(getDescriptorFormatId());
 }
-//--------------------------------------------------------------------
-sal_Bool OReportExchange::GetData( const datatransfer::DataFlavor& _rFlavor )
+
+sal_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 )
         : sal_False;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OReportExchange::canExtract(const DataFlavorExVector& _rFlavor)
 {
     return IsFormatSupported(_rFlavor,getDescriptorFormatId());
@@ -78,7 +78,7 @@ OReportExchange::TSectionElements OReportExchange::extractCopies(const Transfera
         SotExchange::GetFormatDataFlavor(nKnownFormatId, aFlavor);
         OSL_ENSURE(bSuccess, "OReportExchange::extractCopies: invalid data format (no flavor)!");
 
-        uno::Any aDescriptor = _rData.GetAny(aFlavor);
+        uno::Any aDescriptor = _rData.GetAny(aFlavor, OUString());
 
         TSectionElements aCopies;
 #if OSL_DEBUG_LEVEL > 0