[Libreoffice-commits] .: patches/dev300

Tor Lillqvist tml at kemper.freedesktop.org
Mon Oct 18 00:55:38 PDT 2010


 patches/dev300/xlsx-shared-oox-chart-export-part1.diff |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 621aa6805ff7b286d66ab67855904413f5e7fee5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Oct 18 10:45:13 2010 +0300

    Make xlsx-shared-oox-chart-export-part1.diff apply again

diff --git a/patches/dev300/xlsx-shared-oox-chart-export-part1.diff b/patches/dev300/xlsx-shared-oox-chart-export-part1.diff
index f07af61..1276cb4 100644
--- a/patches/dev300/xlsx-shared-oox-chart-export-part1.diff
+++ b/patches/dev300/xlsx-shared-oox-chart-export-part1.diff
@@ -4254,11 +4254,7 @@ index a1b14f4..cd0a49b 100644
  
  #include <set>
  #include <rtl/ustrbuf.h>
-@@ -66,9 +70,12 @@
- #include "userdat.hxx"
- #include "drwlayer.hxx"
- #include "svx/unoapi.hxx"
-+#include "document.hxx"
+@@ -66,6 +70,8 @@
  
  #include <oox/core/tokens.hxx>
  #include <oox/export/drawingml.hxx>
@@ -4276,7 +4272,7 @@ index a1b14f4..cd0a49b 100644
  using ::oox::drawingml::DrawingML;
 +using ::oox::drawingml::ChartExport;
  
- // Escher client anchor =======================================================
+ #define  HMM2XL(x)        ((x)/26.5)+0.5
  
 @@ -936,7 +946,7 @@ void XclExpTbxControlObj::WriteSbs( XclExpStream& rStrm )
  
@@ -4436,9 +4432,9 @@ index 401a461..d067002 100644
  #include "xcl97rec.hxx"
  #include "xlescher.hxx"
 +#include <com/sun/star/chart/XChartDocument.hpp>
+ #include "svx/sdtaitm.hxx"
+ 
  
- namespace com { namespace sun { namespace star {
-     namespace script { struct ScriptEventDescriptor; }
 @@ -311,6 +312,8 @@ class XclExpChart;
  class XclExpChartObj : public XclObj, protected XclExpRoot
  {


More information about the Libreoffice-commits mailing list