GNOME.org
 

ooo-build r13234 - in trunk: . patches/dev300

Author: thorstenb
Date: Tue Jul 15 17:24:53 2008
New Revision: 13234
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13234&view=rev

Log:
	* patches/dev300/svg-import-filter.diff:
	* patches/dev300/svg-import-filter-gfxfilter.diff: Fix how filled
	polylines are handled, kudos to Fridrich for finding this.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/svg-import-filter-gfxfilter.diff
   trunk/patches/dev300/svg-import-filter.diff

Modified: trunk/patches/dev300/svg-import-filter-gfxfilter.diff
==============================================================================
--- trunk/patches/dev300/svg-import-filter-gfxfilter.diff	(original)
+++ trunk/patches/dev300/svg-import-filter-gfxfilter.diff	Tue Jul 15 17:24:53 2008
@@ -1,14 +1,28 @@
- .../internalgraphicfilters/svg_Export.xcu          |   10 
+ .../config/fragments/fcfg_internalgraphics.mk      |    1 
+ .../internalgraphicfilters/svg_Import.xcu          |   10 
  filter/source/svg/exports.map                      |    1 
  filter/source/svg/makefile.mk                      |    1 
  filter/source/svg/svgfilter.cxx                    |    9 
  filter/source/svg/svgfilter.hxx                    |    7 
  filter/source/svg/svgreader.cxx                    |  745 ++++++++++++++++++++
  filter/source/svg/test/makefile.mk                 |    1 
- 7 files changed, 770 insertions(+), 4 deletions(-)
+ 8 files changed, 771 insertions(+), 4 deletions(-)
 
-diff --git a/filter/source/config/fragments/internalgraphicfilters/svg_Export.xcu b/filter/source/config/fragments/internalgraphicfilters/svg_Export.xcu
-index 8b73f15..f0cd69d 100644
+diff --git a/filter/source/config/fragments/fcfg_internalgraphics.mk b/filter/source/config/fragments/fcfg_internalgraphics.mk
+index ae978f0..d1f628a 100644
+--- filter/source/config/fragments/fcfg_internalgraphics.mk
++++ filter/source/config/fragments/fcfg_internalgraphics.mk
+@@ -68,6 +68,7 @@ F4_INTERNALGRAPHICS = \
+     sgf_Import \
+     sgv_Import \
+     svg_Export \
++    svg_Import \
+     svm_Export \
+     svm_Import \
+     tga_Import \
+diff --git a/filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu
+new file mode 100644
+index 0000000..f0285be
 --- /dev/null
 +++ filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu
 @@ -0,0 +1,10 @@
@@ -22,16 +36,6 @@
 +		</prop>
 +		<prop oor:name="Flags"><value>IMPORT</value></prop>
 +	</node>
---- filter/source/config/fragments/fcfg_internalgraphics.mk
-+++ filter/source/config/fragments/fcfg_internalgraphics.mk
-@@ -68,6 +68,7 @@
-     sgf_Import \
-     sgv_Import \
-     svg_Export \
-+    svg_Import \
-     svm_Export \
-     svm_Import \
-     tga_Import \
 diff --git a/filter/source/svg/exports.map b/filter/source/svg/exports.map
 index acb4748..d56c225 100644
 --- filter/source/svg/exports.map
@@ -45,7 +49,7 @@
          local:
                  *;
 diff --git a/filter/source/svg/makefile.mk b/filter/source/svg/makefile.mk
-index f5682cc..e24734b 100644
+index aa54c9e..6474385 100644
 --- filter/source/svg/makefile.mk
 +++ filter/source/svg/makefile.mk
 @@ -74,6 +74,7 @@ SHL1STDLIBS=\
@@ -57,7 +61,7 @@
  	$(CPPULIB)			\
  	$(SALLIB)			\
 diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
-index 9efbed7..de1e638 100644
+index 5b3c985..2ac5eb1 100644
 --- filter/source/svg/svgfilter.cxx
 +++ filter/source/svg/svgfilter.cxx
 @@ -208,6 +208,14 @@ rtl::OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescrip
@@ -81,7 +85,7 @@
  COMPHELPER_SERVICEDECL_EXPORTS1(svgFilter)
 +
 diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
-index dcb8065..b057a5e 100644
+index b1123cc..1557dc5 100644
 --- filter/source/svg/svgfilter.hxx
 +++ filter/source/svg/svgfilter.hxx
 @@ -271,4 +271,11 @@ sal_Bool SAL_CALL SVGFilter_supportsService( const ::rtl::OUString& ServiceName
@@ -97,7 +101,7 @@
 +
  #endif // SVGFILTER_HXX
 diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
-index 2525999..cda0efd 100644
+index 2714f05..cb2b455 100644
 --- filter/source/svg/svgreader.cxx
 +++ filter/source/svg/svgreader.cxx
 @@ -7,6 +7,7 @@
@@ -240,7 +244,7 @@
 +                rtl::OUString sPoints = xElem->hasAttribute(USTR("points")) ? xElem->getAttribute(USTR("points")) : USTR("");
 +                basegfx::B2DPolygon aPoly;
 +                basegfx::tools::importFromSvgPoints(aPoly, sPoints);
-+                // if( nTokenId == XML_POLYGON )
++                if( nTokenId == XML_POLYGON || maCurrState.meFillType != NONE )
 +                    aPoly.setClosed(true);
 +
 +                renderPathShape(basegfx::B2DPolyPolygon(aPoly));

Modified: trunk/patches/dev300/svg-import-filter.diff
==============================================================================
--- trunk/patches/dev300/svg-import-filter.diff	(original)
+++ trunk/patches/dev300/svg-import-filter.diff	Tue Jul 15 17:24:53 2008
@@ -15,7 +15,6 @@
  filter/source/svg/svgimport.cxx                    |  191 --
  filter/source/svg/svgreader.cxx                    | 1876 ++++++++++++++++++++
  filter/source/svg/svgreader.hxx                    |   43 
- filter/source/svg/svguno.cxx                       |  105 -
  filter/source/svg/test/makefile.mk                 |  114 +
  filter/source/svg/test/odfserializer.cxx           |  140 +
  filter/source/svg/test/odfserializer.hxx           |   31 
@@ -26,7 +25,7 @@
  filter/source/svg/tokens.txt                       |  403 ++++
  filter/source/svg/units.cxx                        |   99 +
  filter/source/svg/units.hxx                        |   60 +
- 28 files changed, 4682 insertions(+), 369 deletions(-)
+ 27 files changed, 4682 insertions(+), 264 deletions(-)
 
 diff --git a/filter/source/config/fragments/fcfg_drawgraphics.mk b/filter/source/config/fragments/fcfg_drawgraphics.mk
 index 7038e27..41a4625 100644
@@ -749,7 +748,7 @@
 +
 +#endif
 diff --git a/filter/source/svg/makefile.mk b/filter/source/svg/makefile.mk
-index 74e3908..f5682cc 100644
+index f63be94..aa54c9e 100644
 --- filter/source/svg/makefile.mk
 +++ filter/source/svg/makefile.mk
 @@ -30,24 +30,34 @@
@@ -1555,7 +1554,7 @@
 +# endif
 +#endif
 diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
-index 15d5d64..9efbed7 100644
+index bc194c0..5b3c985 100644
 --- filter/source/svg/svgfilter.cxx
 +++ filter/source/svg/svgfilter.cxx
 @@ -33,13 +33,16 @@
@@ -1727,7 +1726,7 @@
 +// The C shared lib entry points
 +COMPHELPER_SERVICEDECL_EXPORTS1(svgFilter)
 diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
-index dc4b64e..dcb8065 100644
+index 43b73d3..b1123cc 100644
 --- filter/source/svg/svgfilter.hxx
 +++ filter/source/svg/svgfilter.hxx
 @@ -38,20 +38,14 @@
@@ -1821,7 +1820,7 @@
  
  // -----------------------------------------------------------------------------
 diff --git a/filter/source/svg/svgimport.cxx b/filter/source/svg/svgimport.cxx
-index 32c114c..1d27cf0 100644
+index be0329f..b8a079b 100644
 --- filter/source/svg/svgimport.cxx
 +++ filter/source/svg/svgimport.cxx
 @@ -32,160 +32,59 @@
@@ -2032,7 +2031,7 @@
      
 diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
 new file mode 100644
-index 0000000..2525999
+index 0000000..2714f05
 --- /dev/null
 +++ filter/source/svg/svgreader.cxx
 @@ -0,0 +1,1876 @@
@@ -3161,7 +3160,7 @@
 +                rtl::OUString sPoints = xElem->hasAttribute(USTR("points")) ? xElem->getAttribute(USTR("points")) : USTR("");
 +                basegfx::B2DPolygon aPoly;
 +                basegfx::tools::importFromSvgPoints(aPoly, sPoints);
-+                // if( nTokenId == XML_POLYGON )
++                if( nTokenId == XML_POLYGON || maCurrState.meFillType != NONE )
 +                    aPoly.setClosed(true);
 +
 +                writePathShape(xAttrs,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]