[Libreoffice-commits] core.git: oox/source

[Markus Mohrhard]

 oox/source/export/drawingml.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1779d2a3dde60cf705702fcb132bba46aa38fc5b
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Wed Feb 12 03:34:03 2014 +0100

    nasty merge error
    
    Change-Id: I5afaf03c5aee417ea40cea65b2ac51dde7c35918

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 42fec3f..050b931 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -349,6 +349,7 @@ void DrawingML::WriteGradientFill( Reference< XPropertySet 
> rXPropSet )
         mpFS->endElementNS( XML_a, XML_gradFill );
     }
 }
+
 void DrawingML::WriteGrabBagGradientFill( Sequence< PropertyValue > 
aGradientStops, awt::Gradient rGradient )
 {
     // write back the original gradient
@@ -440,7 +441,6 @@ void DrawingML::WriteGradientFill( awt::Gradient rGradient )
                     FSEND );
             break;
     }
-    mpFS->endElementNS( XML_a, XML_gradFill );
 }
 
 void DrawingML::WriteLineArrow( Reference< XPropertySet > rXPropSet, sal_Bool 
bLineStart )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits