[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Thorsten Behrens]

 patches/dev300/apply                             |    1 
 patches/dev300/oox-smartart-import-colorfix.diff |   28 +++++++++++++++++++++++
 2 files changed, 29 insertions(+)

New commits:
commit bb5902bc2d36a30d4e5a644dc7f2b1166f5ed0fe
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Fri Sep 10 23:21:09 2010 +0200

    Fix black fill color for smartart import
    
    * patches/dev300/apply: added below patch
    * patches/dev300/oox-smartart-import-colorfix.diff: Using correct
      ImportContext for colors.xml fragment snippets

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 32870ad..a98b981 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3364,6 +3364,7 @@ xlsx-shared-xlsx-export-no-more-svstream-sotstorage.diff
 odf-converter-ignore-writerfilter.diff, n#348471, n#502173, jholesov
 
 oox-smartart-import.diff, thorsten
+oox-smartart-import-colorfix.diff, n#619678, thorsten
 
 [ OOXMLExportDevel ]
 # depends on oox-smartart-import.diff
diff --git a/patches/dev300/oox-smartart-import-colorfix.diff b/patches/dev300/oox-smartart-import-colorfix.diff
new file mode 100644
index 0000000..74c13e4
--- /dev/null
+++ b/patches/dev300/oox-smartart-import-colorfix.diff
@@ -0,0 +1,28 @@
+diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
+index fca0382..9c7dce1 100644
+--- oox/source/drawingml/diagram/diagramfragmenthandler.cxx
++++ oox/source/drawingml/diagram/diagramfragmenthandler.cxx
+@@ -239,17 +239,17 @@ ColorFragmentHandler::ColorFragmentHandler( ::oox::core::XmlFilterBase& rFilter,
+         // definitions in it, after all it's called list. but
+         // apparently colorChoiceContext doesn't handle that anyway...
+         case NMSP_DIAGRAM|XML_fillClrLst:
+-            return new ColorContext( *this, maColorEntry.maFillColor );
++            return new ColorValueContext( *this, maColorEntry.maFillColor );
+         case NMSP_DIAGRAM|XML_linClrLst:
+-            return new ColorContext( *this, maColorEntry.maLineColor );
++            return new ColorValueContext( *this, maColorEntry.maLineColor );
+         case NMSP_DIAGRAM|XML_effectClrLst:
+-            return new ColorContext( *this, maColorEntry.maEffectColor );
++            return new ColorValueContext( *this, maColorEntry.maEffectColor );
+         case NMSP_DIAGRAM|XML_txFillClrLst:
+-            return new ColorContext( *this, maColorEntry.maTextFillColor );
++            return new ColorValueContext( *this, maColorEntry.maTextFillColor );
+         case NMSP_DIAGRAM|XML_txLinClrLst:
+-            return new ColorContext( *this, maColorEntry.maTextLineColor );
++            return new ColorValueContext( *this, maColorEntry.maTextLineColor );
+         case NMSP_DIAGRAM|XML_txEffectClrLst:
+-            return new ColorContext( *this, maColorEntry.maTextEffectColor );
++            return new ColorValueContext( *this, maColorEntry.maTextEffectColor );
+     }
+ 
+     return 0;