odk/CustomTarget_javadoc.mk | 2 +- sysui/Zip_osxicons.mk | 1 - vcl/inc/vcl/outdev.hxx | 1 + vcl/source/gdi/outmap.cxx | 8 ++++++++ 4 files changed, 10 insertions(+), 2 deletions(-)
New commits: commit 8131b3892a6d7b287075a3ccb50f947a63e42e33 Author: Michael Stahl <[email protected]> Date: Wed Mar 13 19:57:36 2013 +0100 vcl: targetted restoration of OutputDevice::PixelToLogic overload Add some code needed for commit 684c502ed0a6782fe1b9c7d7cd1911a4a88b543a This fixes the infinite loop that allocates gigs of memory in sc_unoapi test. The problem was that instead of PixelToLogic overload an implicit Region ctor was called. Change-Id: Iefcd453a5c6327964c219074239ac65be737da6e diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx index a4c3981..e51ec2b 100644 --- a/vcl/inc/vcl/outdev.hxx +++ b/vcl/inc/vcl/outdev.hxx @@ -978,6 +978,7 @@ public: Rectangle PixelToLogic( const Rectangle& rDeviceRect ) const; Polygon PixelToLogic( const Polygon& rDevicePoly ) const; PolyPolygon PixelToLogic( const PolyPolygon& rDevicePolyPoly ) const; + basegfx::B2DPolyPolygon PixelToLogic( const basegfx::B2DPolyPolygon& rDevicePolyPoly ) const; Region PixelToLogic( const Region& rDeviceRegion ) const; Point PixelToLogic( const Point& rDevicePt, const MapMode& rMapMode ) const; diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx index b1a5e01..6b28d77 100644 --- a/vcl/source/gdi/outmap.cxx +++ b/vcl/source/gdi/outmap.cxx @@ -1414,6 +1414,14 @@ PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly ) con return aPolyPoly; } +basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygon& rPixelPolyPoly ) const +{ + basegfx::B2DPolyPolygon aTransformedPoly = rPixelPolyPoly; + const ::basegfx::B2DHomMatrix& rTransformationMatrix = GetInverseViewTransformation(); + aTransformedPoly.transform( rTransformationMatrix ); + return aTransformedPoly; +} + // ----------------------------------------------------------------------- Region OutputDevice::PixelToLogic( const Region& rDeviceRegion ) const commit e85105b5b13339f13fe755ee479c10ee19d54992 Author: Michael Stahl <[email protected]> Date: Wed Mar 13 20:04:42 2013 +0100 odk: depend on OUTDIR jar file if that is on classpath Change-Id: I416b5aac3afd636bb67f496fa061f9ff9db9bdf0 diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk index 24f06b3..296ecf4 100644 --- a/odk/CustomTarget_javadoc.mk +++ b/odk/CustomTarget_javadoc.mk @@ -19,7 +19,7 @@ odk_JAVAPACKAGES := com.sun.star.comp.helper \ $(eval $(call gb_CustomTarget_register_target,odk/odkcommon/docs/java/ref,index.html)) -$(odk_WORKDIR)/docs/java/ref/index.html: $(call gb_Jar_get_target,ridl) +$(odk_WORKDIR)/docs/java/ref/index.html: $(call gb_Jar_get_outdir_target,ridl) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JDC,1) $(JAVADOC) -J-Xmx120m -use -splitindex \ -windowtitle "Java UNO Runtime Reference" \ commit 2b80ac59767fdb1d6bf5249e1e10f69237180aa5 Author: Michael Stahl <[email protected]> Date: Wed Mar 13 20:03:32 2013 +0100 sysui: remove non-existent imaginary extract_icons_names.pl Change-Id: I6f2f785f50a83789bc45b90747144eb030f7fe7d diff --git a/sysui/Zip_osxicons.mk b/sysui/Zip_osxicons.mk index 62eff41..1f73521 100644 --- a/sysui/Zip_osxicons.mk +++ b/sysui/Zip_osxicons.mk @@ -14,7 +14,6 @@ $(eval $(call gb_Zip_Zip,osxicons,$(SRCDIR)/sysui/desktop)) $(eval $(call gb_Zip_add_files,osxicons,\ $(addprefix icons/,$(osxicons_LIST)) \ macosx/Info.plist \ - macosx/extract_icons_names.pl \ )) # vim: set ts=4 sw=4 et: _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
