rpms/openoffice.org/devel ooo-build.ooo2497.filter.svg.patch, 1.1, 1.2 openoffice.org.spec, 1.1926, 1.1927

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	ooo-build.ooo2497.filter.svg.patch openoffice.org.spec 
Log Message:
Resolves (partially): rhbz#498590 improve svg import

ooo-build.ooo2497.filter.svg.patch:

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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ooo-build.ooo2497.filter.svg.patch	18 Mar 2009 12:36:26 -0000	1.1
+++ ooo-build.ooo2497.filter.svg.patch	9 Jun 2009 16:38:24 -0000	1.2
@@ -6233,3 +6233,47 @@ diff -ruN OOO310_m6.orig/filter/source/s
 +} // namespace svgi
 +
 +#endif
+diff -ruN OOO310_m6.orig/filter/source/svg/units.cxx OOO310_m6/filter/source/svg/units.hxx
+--- OOO310_m6.orig/filter/source/svg/units.cxx	1970-01-01 01:00:00.000000000 +0100
++++ OOO310_m6/filter/source/svg/units.cxx	2009-03-17 14:59:37.000000000 +0000
+@@ -35,10 +35,6 @@
+ 
+ double convLength( double value, SvgUnit unit, const State& rState, char dir )
+ {
+-    const double fBoxLen( dir=='h' ? rState.maViewBox.getWidth() : 
+-                          (dir=='v' ? rState.maViewBox.getHeight() : 
+-                           rState.maViewBox.getRange().getLength()));
+-
+     // convert svg unit to internal coordinates ("pixel"). Since the
+     // OOo drawing layer is still largely integer-based, the initial
+     // viewport transformation includes a certain scale factor
+@@ -55,7 +51,28 @@
+         case SVG_LENGTH_UNIT_PT: break;
+         case SVG_LENGTH_UNIT_EM: fRet *= rState.mnFontSize; break;
+         case SVG_LENGTH_UNIT_EX: fRet *= rState.mnFontSize / 2.0; break;
+-        case SVG_LENGTH_UNIT_PERCENTAGE: fRet *= fBoxLen; break;
++        case SVG_LENGTH_UNIT_PERCENTAGE:
++        {
++            double fBoxLen;
++            if (rState.maViewBox.isEmpty())
++            {
++                basegfx::B2DRange aDefaultBox(0, 0,
++                  convLength(210, SVG_LENGTH_UNIT_MM, rState, 'h'), 
++                  convLength(297, SVG_LENGTH_UNIT_MM, rState, 'v'));
++                fBoxLen = (dir=='h' ? aDefaultBox.getWidth() : 
++                          (dir=='v' ? aDefaultBox.getHeight() : 
++                           aDefaultBox.getRange().getLength()));
++            }
++            else
++            {
++                fBoxLen = (dir=='h' ? rState.maViewBox.getWidth() : 
++                          (dir=='v' ? rState.maViewBox.getHeight() : 
++                           rState.maViewBox.getRange().getLength()));
++            }
++
++            fRet *= fBoxLen/100.0;
++        }
++        break;
+         default: OSL_TRACE( "Unknown length type" ); break;
+     }
+ 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1926
retrieving revision 1.1927
diff -u -p -r1.1926 -r1.1927
--- openoffice.org.spec	9 Jun 2009 10:33:54 -0000	1.1926
+++ openoffice.org.spec	9 Jun 2009 16:38:24 -0000	1.1927
@@ -4167,6 +4167,7 @@ fi
 * Tue Jun 09 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-12.4
 - Resolves: rhbz#504419  openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch
 - add openoffice.org-3.1.0.ooo102142.sd.resleak.patch
+- Resolves (partially): rhbz#498590 improve svg import
 
 * Sat Jun 06 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-12.3
 - don't over-write en_ZA auto-correct file