rpms/openoffice.org/F-11 workspace.aw073.patch, NONE, 1.1 openoffice.org.spec, 1.1918, 1.1919
Caolan McNamara
caolanm at fedoraproject.org
Thu Jun 18 17:16:41 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13968/F-11
Modified Files:
openoffice.org.spec
Added Files:
workspace.aw073.patch
Log Message:
Resolves: rhbz#506184 workspace.aw073.patch
workspace.aw073.patch:
--- NEW FILE workspace.aw073.patch ---
Index: drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
===================================================================
--- drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx (revision 272938)
+++ drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx (revision 272939)
@@ -247,8 +247,8 @@
if(rB2DPolygon.count() && !mnSvtGraphicStrokeCount)
{
basegfx::BColor aStrokeColor;
- PolyPolygon aStartPolyPolygon;
- PolyPolygon aEndPolyPolygon;
+ basegfx::B2DPolyPolygon aStartArrow;
+ basegfx::B2DPolyPolygon aEndArrow;
if(pColor)
{
@@ -271,11 +271,9 @@
{
fPolyLength = basegfx::tools::getLength(rB2DPolygon);
- const basegfx::B2DPolyPolygon aStartArrow(basegfx::tools::createAreaGeometryForLineStartEnd(
+ aStartArrow = basegfx::tools::createAreaGeometryForLineStartEnd(
rB2DPolygon, pStart->getB2DPolyPolygon(), true, pStart->getWidth(),
- fPolyLength, pStart->isCentered() ? 0.5 : 0.0, 0));
-
- aStartPolyPolygon = PolyPolygon(aStartArrow);
+ fPolyLength, pStart->isCentered() ? 0.5 : 0.0, 0);
}
if(pEnd && pEnd->isActive())
@@ -285,11 +283,9 @@
fPolyLength = basegfx::tools::getLength(rB2DPolygon);
}
- const basegfx::B2DPolyPolygon aEndArrow(basegfx::tools::createAreaGeometryForLineStartEnd(
+ aEndArrow = basegfx::tools::createAreaGeometryForLineStartEnd(
rB2DPolygon, pEnd->getB2DPolyPolygon(), false, pEnd->getWidth(),
- fPolyLength, pEnd->isCentered() ? 0.5 : 0.0, 0));
-
- aEndPolyPolygon = PolyPolygon(aEndArrow);
+ fPolyLength, pEnd->isCentered() ? 0.5 : 0.0, 0);
}
}
@@ -341,10 +337,23 @@
aDashArray = pStrokeAttribute->getDotDashArray();
}
+ // #i101734# apply current object transformation to created geometry.
+ // This is a partial fix. When a object transformation is used which
+ // e.g. contains a scaleX != scaleY, an unproportional scaling would
+ // have to be applied to the evtl. existing fat line. The current
+ // concept of PDF export and SvtGraphicStroke usage does simply not
+ // allow handling such definitions. The only clean way would be to
+ // add the transformation to SvtGraphicStroke and to handle it there
+ basegfx::B2DPolygon aB2DPolygon(rB2DPolygon);
+
+ aB2DPolygon.transform(maCurrentTransformation);
+ aStartArrow.transform(maCurrentTransformation);
+ aEndArrow.transform(maCurrentTransformation);
+
pRetval = new SvtGraphicStroke(
- Polygon(rB2DPolygon),
- aStartPolyPolygon,
- aEndPolyPolygon,
+ Polygon(aB2DPolygon),
+ PolyPolygon(aStartArrow),
+ PolyPolygon(aEndArrow),
mfCurrentUnifiedTransparence,
fLineWidth,
SvtGraphicStroke::capButt,
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1918
retrieving revision 1.1919
diff -u -p -r1.1918 -r1.1919
--- openoffice.org.spec 18 Jun 2009 16:19:14 -0000 1.1918
+++ openoffice.org.spec 18 Jun 2009 17:16:10 -0000 1.1919
@@ -144,6 +144,7 @@ Patch68: openoffice.org-3.1.0.ooo101567.
Patch69: openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch
Patch70: workspace.pdfextfix02.patch
Patch71: openoffice.org-3.1.0.ooo102920.i18npool.utf16bustage.patch
+Patch72: workspace.aw073.patch
%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
%define instdir %{_libdir}
@@ -1646,6 +1647,7 @@ cat %{PATCH11} >> svtools/source/dialogs
%patch69 -p0 -b .ooo102566.sc.less.frenetic.progress.patch
%patch70 -p0 -b .workspace.pdfextfix02.patch
%patch71 -p0 -b .ooo102920.i18npool.utf16bustage.patch
+%patch72 -p0 -b .workspace.aw073.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4153,7 +4155,8 @@ fi
- Resolves: rhbz#503003 silence warnings on updates
- Resolves: rhbz#504419 openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch
- Resolves: rhbz#506039 workspace.pdfextfix02.patch upsidedown images in pdf import
-- Resolves: rhbz#506545: openoffice.org-3.1.0.ooo102920.i18npool.utf16bustage.patch
+- Resolves: rhbz#506545 openoffice.org-3.1.0.ooo102920.i18npool.utf16bustage.patch
+- Resolves: rhbz#506184 workspace.aw073.patch
* Mon May 25 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.3
- add in the ia64 and arm fixes for the secondary arch people
More information about the fedora-extras-commits
mailing list