[Libreoffice-commits] .: Branch 'feature/pptx-export-ooxml11' - 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/oox-smartart-import.diff |   26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

New commits:
commit 9f8a40c02c11f38c67e239fe3c098e8987f64c9c
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Nov 8 19:40:05 2010 +0200

    Change getChartConverter also in epptooxml.hxx

diff --git a/patches/dev300/oox-smartart-import.diff b/patches/dev300/oox-smartart-import.diff
index e41bce0..a47144d 100644
--- a/patches/dev300/oox-smartart-import.diff
+++ b/patches/dev300/oox-smartart-import.diff
@@ -6327,3 +6327,14 @@ index cf5d5e2..212c6fe 100644
      virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() { return ::oox::drawingml::table::TableStyleListPtr(); }
  
      // Actual export of the DOCX document
+--- sd/source/filter/eppt/epptooxml.hxx
++++ sd/source/filter/eppt/epptooxml.hxx
+@@ -85,7 +85,7 @@
+     virtual oox::vml::Drawing* getVmlDrawing() { return NULL; }
+     virtual const oox::drawingml::Theme* getCurrentTheme() const { return NULL; }
+     virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() { return oox::drawingml::table::TableStyleListPtr(); }
+-    virtual oox::drawingml::chart::ChartConverter& getChartConverter() { static oox::drawingml::chart::ChartConverter aConverter; return aConverter; }
++    virtual oox::drawingml::chart::ChartConverter* getChartConverter() { return NULL; }
+ 
+     static const char* GetSideDirection( sal_uInt8 nDirection );
+     static const char* GetCornerDirection( sal_uInt8 nDirection );
commit e319d9b72ac65e8752cf5d0c6535d098a38726a6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Nov 1 17:47:23 2010 +0200

    Make oox-smartart-import.diff unapply cleanly
    
    When deleting files, delete also the recently added Emacs and Vim mode
    lines.

diff --git a/patches/dev300/oox-smartart-import.diff b/patches/dev300/oox-smartart-import.diff
index c418157..e41bce0 100644
--- a/patches/dev300/oox-smartart-import.diff
+++ b/patches/dev300/oox-smartart-import.diff
@@ -202,7 +202,8 @@ deleted file mode 100644
 index 6437482..0000000
 --- oox/inc/oox/drawingml/diagram/datamodelcontext.hxx
 +++ /dev/null
-@@ -1,54 +0,0 @@
+@@ -1,57 +0,0 @@
+-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 -/*************************************************************************
 - *
 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -257,6 +258,8 @@ index 6437482..0000000
 -} }
 -
 -#endif  //  OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
+-
+-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 diff --git oox/inc/oox/drawingml/diagram/diagram.hxx oox/inc/oox/drawingml/diagram/diagram.hxx
 index ef60545..e81a216 100644
 --- oox/inc/oox/drawingml/diagram/diagram.hxx
@@ -524,7 +527,8 @@ deleted file mode 100644
 index 5a42a46..0000000
 --- oox/inc/oox/drawingml/diagram/diagramfragmenthandler.hxx
 +++ /dev/null
-@@ -1,100 +0,0 @@
+@@ -1,103 +0,0 @@
+-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 -/*************************************************************************
 - *
 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -625,12 +629,15 @@ index 5a42a46..0000000
 -
 -
 -#endif
+-
+-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 diff --git oox/inc/oox/drawingml/diagram/diagramlayoutatoms.hxx oox/inc/oox/drawingml/diagram/diagramlayoutatoms.hxx
 deleted file mode 100644
 index ae25085..0000000
 --- oox/inc/oox/drawingml/diagram/diagramlayoutatoms.hxx
 +++ /dev/null
-@@ -1,209 +0,0 @@
+@@ -1,212 +0,0 @@
+-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 -/*************************************************************************
 - *
 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -840,6 +847,8 @@ index ae25085..0000000
 -} }
 -
 -#endif
+-
+-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 diff --git oox/inc/oox/drawingml/drawingmltypes.hxx oox/inc/oox/drawingml/drawingmltypes.hxx
 index c513446..b18414f 100644
 --- oox/inc/oox/drawingml/drawingmltypes.hxx