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

[Tor Lillqvist]

 patches/dev300/apply                                             |    5 ---
 patches/dev300/xlsx-shared-oox-chart-export-part1-pptx-part.diff |   14 ----------
 2 files changed, 19 deletions(-)

New commits:
commit 692ac25fd6930f1fe4306c6d9a47e8e9747a8383
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Nov 8 14:17:56 2010 +0200

    xlsx-shared-oox-chart-export-part1-pptx-part.diff is in git
    
    Here in the feature/pptx-export-ooxml11 branch

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4e1736f..32eb2cb 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2116,11 +2116,6 @@ iso-ooxml-sw.diff, cbosdo
 # mostly merged into git by now, except for
 # xlsx-export-row-limit-fix.diff, n#504623, kohei
 
-# this used to be xlsx-shared-oox-chart-export-part1.diff, Fong
-# it is now merged into git, except for the hunk patching pptx
-# which follows:
-xlsx-shared-oox-chart-export-part1-pptx-part.diff
-
 [ UnstableLibwpd ]
 config_office-testing.diff
 libwpd-testing.diff
diff --git a/patches/dev300/xlsx-shared-oox-chart-export-part1-pptx-part.diff b/patches/dev300/xlsx-shared-oox-chart-export-part1-pptx-part.diff
deleted file mode 100644
index bded31c..0000000
--- a/patches/dev300/xlsx-shared-oox-chart-export-part1-pptx-part.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git sd/source/filter/pptx/pptx-epptooxml.cxx sd/source/filter/pptx/pptx-epptooxml.cxx
-index 0b64cca..0e348c5 100644
---- sd/source/filter/pptx/pptx-epptooxml.cxx
-+++ sd/source/filter/pptx/pptx-epptooxml.cxx
-@@ -1588,7 +1588,7 @@ ShapeExport& PowerPointShapeExport::WritePlaceholderShape( Reference< XShape > x
- 
-     // visual shape properties
-     mpFS->startElementNS( XML_p, XML_spPr, FSEND );
--    WriteShapeTransformation( xShape );
-+    WriteShapeTransformation( xShape, XML_a );
-     WritePresetShape( "rect" );
-     Reference< XPropertySet > xProps( xShape, UNO_QUERY );
-     if( xProps.is() )
-