[Libreoffice-commits] core.git: Branch 'private/kohei/chart-bugs' - 2 commits - offapi/com xmloff/source

[Kohei Yoshida]

 offapi/com/sun/star/datatransfer/XTransferable2.idl |    7 +++----
 xmloff/source/chart/SchXMLExport.cxx                |    4 ----
 2 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 3dfaa840f6cc0a183b14ae12f9f723e6cef385ea
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Thu Jun 19 10:57:15 2014 -0400

    Update the API doc to reflect the change.
    
    Change-Id: I12940317edcce2f9698812a571d0dbc483c1f4c1

diff --git a/offapi/com/sun/star/datatransfer/XTransferable2.idl b/offapi/com/sun/star/datatransfer/XTransferable2.idl
index ee07e1d..5ff7d58 100644
--- a/offapi/com/sun/star/datatransfer/XTransferable2.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferable2.idl
@@ -18,9 +18,8 @@ interface XTransferable2 : com::sun::star::datatransfer::XTransferable
         additional parameter that specifies the destination document type.
 
         @param aFlavor requested data format
-        @param aDestDoc destination document type given as document service
-        type which may be used to adjust data content based on the destination
-        type.
+        @param aDestShellID destination document shell ID.  The ID of each
+        individual shell must be unique.
 
         @returns data in specified data format.
 
@@ -30,7 +29,7 @@ interface XTransferable2 : com::sun::star::datatransfer::XTransferable
         @throws com::sun::star::datatransfer::UnsupportedFlavorException
         if the requested DataFlavor is not supported.
      */
-    any getTransferData2( [in] DataFlavor aFlavor, [in] string aDestDoc )
+    any getTransferData2( [in] DataFlavor aFlavor, [in] string aDestShellID )
         raises ( UnsupportedFlavorException, com::sun::star::io::IOException );
 };
 
commit c445a679bab81d9b9a97c59e4e7a671fdc3d8e3b
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Thu Jun 19 10:53:02 2014 -0400

    Remove this debug statement.
    
    Change-Id: Ibe2bc19e9cec1d112eb3e3bf631896203974b7e1

diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index e9beedf..8e4e994 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -2326,10 +2326,6 @@ void SchXMLExportHelper_Impl::exportAxis(
         lcl_exportNumberFormat( sNumFormat, xAxisProps, mrExport );
         aPropertyStates = mxExpPropMapper->Filter( xAxisProps );
 
-        fprintf(stdout, "SchXMLExportHelper_Impl::exportAxis:   src shell = '%s'  dest shell = '%s'\n",
-                rtl::OUStringToOString(maSrcShellID, RTL_TEXTENCODING_UTF8).getStr(),
-                rtl::OUStringToOString(maDestShellID, RTL_TEXTENCODING_UTF8).getStr());
-
         if (!maSrcShellID.isEmpty() && !maDestShellID.isEmpty() && maSrcShellID != maDestShellID)
         {
             // Disable link to source number format property when pasting to