rpms/openoffice.org/devel ooo-build.ooo2497.filter.svg.patch, 1.5, 1.6 openoffice.org.spec, 1.2165, 1.2166

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12431/devel

Modified Files:
	ooo-build.ooo2497.filter.svg.patch openoffice.org.spec 
Log Message:
Resolves: rhbz#571100 svg import crash

ooo-build.ooo2497.filter.svg.patch:
 OOO310_m6/filter/source/config/fragments/fcfg_drawgraphics.mk                       |    1 
 OOO310_m6/filter/source/config/fragments/fcfg_internalgraphics.mk                   |    1 
 OOO310_m6/filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu |   13 
 OOO310_m6/filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu      |   10 
 OOO310_m6/filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu     |    6 
 OOO310_m6/filter/source/svg/b2dellipse.cxx                                          |  139 
 OOO310_m6/filter/source/svg/b2dellipse.hxx                                          |   77 
 OOO310_m6/filter/source/svg/exports.map                                             |    5 
 OOO310_m6/filter/source/svg/gentoken.pl                                             |   58 
 OOO310_m6/filter/source/svg/gfxtypes.hxx                                            |  343 +
 OOO310_m6/filter/source/svg/makefile.mk                                             |   49 
 OOO310_m6/filter/source/svg/parserfragments.cxx                                     |  600 ++
 OOO310_m6/filter/source/svg/parserfragments.hxx                                     |   74 
 OOO310_m6/filter/source/svg/spirit_supplements.hxx                                  |  115 
 OOO310_m6/filter/source/svg/svgfilter.cxx                                           |  109 
 OOO310_m6/filter/source/svg/svgfilter.hxx                                           |   46 
 OOO310_m6/filter/source/svg/svgimport.cxx                                           |  197 
 OOO310_m6/filter/source/svg/svgreader.cxx                                           | 2773 ++++++++++
 OOO310_m6/filter/source/svg/svgreader.hxx                                           |   43 
 OOO310_m6/filter/source/svg/test/makefile.mk                                        |  115 
 OOO310_m6/filter/source/svg/test/odfserializer.cxx                                  |  140 
 OOO310_m6/filter/source/svg/test/odfserializer.hxx                                  |   31 
 OOO310_m6/filter/source/svg/test/parsertest.cxx                                     |  210 
 OOO310_m6/filter/source/svg/test/svg2odf.cxx                                        |  124 
 OOO310_m6/filter/source/svg/tokenmap.cxx                                            |   62 
 OOO310_m6/filter/source/svg/tokenmap.hxx                                            |   32 
 OOO310_m6/filter/source/svg/tokens.txt                                              |  403 +
 OOO310_m6/filter/source/svg/units.cxx                                               |   99 
 OOO310_m6/filter/source/svg/units.hxx                                               |   60 
 filter/source/svg/units.cxx                                                         |   27 
 30 files changed, 5705 insertions(+), 257 deletions(-)

Index: ooo-build.ooo2497.filter.svg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/ooo-build.ooo2497.filter.svg.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ooo-build.ooo2497.filter.svg.patch	17 Feb 2010 15:07:44 -0000	1.5
+++ ooo-build.ooo2497.filter.svg.patch	8 Mar 2010 12:49:39 -0000	1.6
@@ -2100,7 +2100,7 @@ diff -ruN OOO310_m6.orig/filter/source/s
 diff -ruN OOO310_m6.orig/filter/source/svg/svgreader.cxx OOO310_m6/filter/source/svg/svgreader.cxx
 --- OOO310_m6.orig/filter/source/svg/svgreader.cxx	1970-01-01 01:00:00.000000000 +0100
 +++ OOO310_m6/filter/source/svg/svgreader.cxx	2009-03-17 14:59:37.000000000 +0000
-@@ -0,0 +1,2772 @@
+@@ -0,0 +1,2773 @@
 +/*************************************************************************
 + *
 + *    OpenOffice.org - a multi-platform office productivity suite
@@ -3735,7 +3735,8 @@ diff -ruN OOO310_m6.orig/filter/source/s
 +                  maCurrState.maCTM.get(1,1),
 +                  maCurrState.maCTM.get(1,2));
 +        
-+		if( aState.maDashArray.size() )
++        if( aState.maDashArray.size() && 
++            aState.meStrokeType != NONE )
 +        {
 +            // ODF dashing is severly borked - generate filled polygon instead
 +            aPolys.clear();


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2165
retrieving revision 1.2166
diff -u -p -r1.2165 -r1.2166
--- openoffice.org.spec	5 Mar 2010 09:18:35 -0000	1.2165
+++ openoffice.org.spec	8 Mar 2010 12:49:39 -0000	1.2166
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 12
-%define rh_rpm_release 10
+%define rh_rpm_release 11
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4199,6 +4199,9 @@ fi
 %endif
 
 %changelog
+* Mon Mar 08 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.11
+- Resolves: rhbz#571100 fix .svg import crash (caolanm)
+
 * Wed Mar 03 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.10
 - Resolves: rhbz#570102 openoffice.org-3.2.0.ooo109766.dbaccess.catch.patch (caolanm)