rpms/openoffice.org/devel ooo-build.ooo2497.filter.svg.patch, 1.4, 1.5 openoffice.org.spec, 1.2153, 1.2154

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	ooo-build.ooo2497.filter.svg.patch openoffice.org.spec 
Log Message:
Resolves: rhbz#565906 don't crash on bad .svg in add to gallery

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                                           | 2772 ++++++++++
 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, 5704 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.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ooo-build.ooo2497.filter.svg.patch	10 Oct 2009 22:44:58 -0000	1.4
+++ ooo-build.ooo2497.filter.svg.patch	17 Feb 2010 15:07:44 -0000	1.5
@@ -1652,7 +1652,7 @@ diff -ruN OOO310_m6.orig/filter/source/s
      if( mxSrcDoc.is() )
  	{
  		uno::Reference< frame::XDesktop > xDesktop( mxMSF->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ), 
-@@ -156,77 +158,73 @@
+@@ -156,77 +158,80 @@
  
  // -----------------------------------------------------------------------------
  
@@ -1738,7 +1738,14 @@ diff -ruN OOO310_m6.orig/filter/source/s
 +extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, BOOL )
  {
 -	return (cppu::OWeakObject*) new SVGFilter( rSMgr );
-+	return importSvg( rStream, rGraphic );
++    BOOL bRet = FALSE;
++    try
++    {
++        bRet = importSvg( rStream, rGraphic );
++    }
++    catch (const uno::Exception&) {
++    }
++    return bRet;
  }
  
  // -----------------------------------------------------------------------------


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2153
retrieving revision 1.2154
diff -u -p -r1.2153 -r1.2154
--- openoffice.org.spec	16 Feb 2010 10:50:41 -0000	1.2153
+++ openoffice.org.spec	17 Feb 2010 15:07:44 -0000	1.2154
@@ -4187,8 +4187,9 @@ fi
 %endif
 
 %changelog
-* Tue Feb 16 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.6
+* Wed Feb 16 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.6
 - Resolves: rhbz#565519 add openoffice.org-3.2.0.ooo95369.sw.sortedobjs.patch
+- Resolves: rhbz#565906 don't crash on bad .svg in add to gallery
 
 * Mon Feb 15 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.5
 - Resolves: rhbz#565330 abrt in ImplGetGraphics