Hello community, here is the log from the commit of package libreoffice-bootstrap for openSUSE:Factory checked in at Mon Feb 21 15:14:45 CET 2011.
-------- --- libreoffice-bootstrap/libreoffice-bootstrap.changes 2011-01-13 14:53:02.000000000 +0100 +++ libreoffice-bootstrap/libreoffice-bootstrap.changes 2011-02-17 14:21:30.000000000 +0100 @@ -1,0 +2,112 @@ +Thu Feb 17 14:11:53 CET 2011 - [email protected] + +- fixed Cairo canvas regression when accessing polygon points outside range; + was visible with the test document from bnc#232232 + +------------------------------------------------------------------- +Wed Feb 16 16:27:04 CET 2011 - [email protected] + +- updated to libreoffice-3.3.1.2 (3.3.1-rc2): + * l10n + * updated some translations + * libs-core + * crashing oosplash and malformed picture (bnc#652562) + * Byref and declare Basic statement (fdo#33964, i#115716) + * fixed BorderLine(2) conversion to SvxBorderLine (fdo#34226) + * libs-gui + * getEnglishSearchFontName() searches Takao fonts + * sdk + * fix ODK settings.mk to only set STLPORTLIB if needed + * writer + * rtfExport::HackIsWW8OrHigher(): return true (fdo#33478) + * visual editor destroys formulas containing symbols (fdo#32759, fdo#32755) +- enabled KDE4 support for SLED11; LO-3.3.1 fixed the remaining annoying bugs +- fixed EMF+ import (bnc#650049) + +------------------------------------------------------------------- +Tue Feb 8 20:53:59 CET 2011 - [email protected] + +- updated to libreoffice-3.3.1.1 (3.3.1-rc1): + * artwork + * new MIME type icons for LibreOffice + * bootstrap + * wrong line break with ( (fdo#31271) + * build + * default formula string (n#664516) + * don't version the bundled ct2n extension + * last update of translations from Pootle for 3.3.1 + * calc + * import of cell attributes from Excel documents + * incorrect page number in page preview mode (fdo#33155) + * components + * remove pesky on-line registration menu entry (fdo#33112) + * crash on changing position of drawing object in header (rhbz#673819) + * extras + * start using technical.dic instead of oracle.dic (fdo#31798) + * filters + * pictures DOCX import (bnc#655763) + * parse 'color' property (fdo#33551) + * fix ole object import for writer (DOCX) (fdo#33237) + * help + * OOo -> LibO on Getting Support page (fdo#33249) + * libs-core + * handle css::table::BorderLine + * add preferred Malayalam fonts (fdo#32953) + * fix KDE3 library search order (fdo#32797) + * StarDesktop.terminate macro behaviour (#30879) + * Sun Microsystems -> TDF in desktop file (fdo#31191) + * fixed several crashes around config UNO API (fdo#33994) + * implementation names weren't matching with xcu (fdo#32872) + * improve the check for existence of the localized help (fdo#33258) + * libs-extern + * upgrade libwpd to 0.9.1 + * libs-gui + * painting of axial gradients (116318) + * fix wrong collation for Catalan language + * crash when moving through database types (fdo#32561) + * paint toolbar handle positioned properly (fdo#32558) + * remove the menu when Left Alt Key was pressed; for GTK + * default currency for Estonia should be Euro (fdo#33160) + * year of era in long format for zh_TW by default (fdo#33459) + * writer + * use standard Edit button width of 50 (fdo#32633) + * improve formfield checkbox binary export (bnc#660816) + * infinite loop while exporting some files in DOC/DOCX/RTF + * CTL/Other Default Font (i#25247, i#25561, i#48064, i#92341) +- updated setup_native_packinfo to version 3.3.1.1 + +------------------------------------------------------------------- +Mon Jan 31 20:32:38 CET 2011 - [email protected] + +- libreoffice-build-3.3.0.4 == 3.3.0-rc4 == final + +------------------------------------------------------------------- +Wed Jan 19 12:58:21 CET 2011 - [email protected] + +- updated to libreoffice-3.3.0.4 (3.3-rc4): + * common: + * remove pesky on-line registration menu entry (fdo#33112) + * artwork: + * fix search toolbar up/down search button icons + * base: + * report builder not shows properties on report fields (fdo#32742) + * report left/right page margin setting ignored on 64-bit (i#116187) + * build: + * updated translations + * calc: + * reverted problematic and dangerous: + * performance of filters with many filtered ranges (i#116164) + * obtain correct data range for external references (i#115906) + * libs-core: + * FMR crasher (fdo#33099) + * backgrounds for polypolygons in metafile (i#116371) + * unopkg crasher on SLED11-SP1 (bnc#655912) + * libs-gui: + * use sane scrollbar sizes when drawing + * painting of axial gradients (i#116318) + * do not mix unrelated X11 Visuals (fdo#33108) + * avoid GetHelpText() call which can be quite heavy + * writer: + * fields fixes: key inputs, 0-length fields import (bnc#657135) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-bootstrap-3.3.0.3.tar.bz2 libreoffice-build-3.3.0.1e-piece-sfx2.diff libreoffice-build-3.3.0.2-build-fixes.diff libreoffice-build-3.3.0.3-l10n-build-fixes.diff libreoffice-build-3.3.0.3-lowrappers.diff libreoffice-build-3.3.0.3-parallel-build-memory.diff libreoffice-build-3.3.0.3.tar.gz setup_native_packinfo-3.3.0.2.tar.bz2 New: ---- canvas-polygon-access-out-of-range.diff drawinglayer-metadata-decomposition.diff libreoffice-bootstrap-3.3.1.2.tar.bz2 libreoffice-build-3.3.1.1-enable-kde4-support.diff libreoffice-build-3.3.1.1-setup-native.diff libreoffice-build-3.3.1.2.tar.gz setup_native_packinfo-3.3.1.1.tar.bz2 svtools-enable-emfplus.diff vcl-use-canvas-bool.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.8yiVP8/_old 2011-02-21 15:07:28.000000000 +0100 +++ /var/tmp/diff_new_pack.8yiVP8/_new 2011-02-21 15:07:28.000000000 +0100 @@ -26,6 +26,8 @@ # basic stuff %if 0%{?suse_version} BuildRequires: db-devel krb5 openldap2-devel python-xml xorg-x11 +# LO-3.3 fixed all most annoying KDE4-related bugs => time to enable KDE4 support for SLED11 +BuildRequires: libkde4-devel %endif %if 0%{?meego_version} BuildRequires: db4-devel krb5-devel openldap-devel @@ -116,11 +118,6 @@ BuildRequires: hunspell-devel libwpd-devel libwpg-devel libwps-devel %endif ############################ -# 11.2 features -%if 0%{?suse_version} > 01110 -BuildRequires: libkde4-devel -%endif -############################ # CODE10 features ############################ %if 0%{?suse_version} > 01000 @@ -182,8 +179,8 @@ # we would like to support also a non-conflicting OOo2 package %define ooo_bin_suffix no # -%define ooo_build_version 3.3.0.3 -%define ooo_piece_version 3.3.0.3 +%define ooo_build_version 3.3.1.2 +%define ooo_piece_version 3.3.1.2 %define ooo_build_dir build %define ooo_sourcedirname libreoffice-%ooo_piece_version %define ooo_prefix %_libdir @@ -191,7 +188,7 @@ %define ooo_basis_dir basis3.3 License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT Group: Productivity/Office/Suite -Version: 3.3.0.3 +Version: 3.3.1.2 Release: 1 AutoReqProv: on # we use the tool "free" to detect the available memory and reduce the parallelism is needed @@ -204,7 +201,7 @@ Source0: libreoffice-build-%ooo_build_version.tar.gz Source1: libreoffice-bootstrap-%ooo_piece_version.tar.bz2 # hacked soures from setup_native -Source30: setup_native_packinfo-3.3.0.2.tar.bz2 +Source30: setup_native_packinfo-3.3.1.1.tar.bz2 # Hmm, rpmlint complains about devel files in non-devel package # We would like to keep the -bootstrap package name # So we need to disable these rpmlint checks @@ -215,23 +212,25 @@ # patches against libreoffice-build # Patch0: libreoffice-build-3.3.0.1-enable-foo.diff # example Patch0: libreoffice-build-3.2.99.2-extensions-hack.diff -Patch1: libreoffice-build-3.3.0.1e-piece-sfx2.diff -Patch2: libreoffice-build-3.3.0.2-build-fixes.diff -Patch3: libreoffice-build-3.3.0.3-lowrappers.diff -Patch4: libreoffice-build-3.3.0.3-l10n-build-fixes.diff -Patch5: libreoffice-build-3.3.0.3-parallel-build-memory.diff +Patch1: libreoffice-build-3.3.1.1-setup-native.diff +Patch2: libreoffice-build-3.3.1.1-enable-kde4-support.diff # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) Patch500: ooo-build-3.1.99.2-xulrunner-1.9.1.diff # FIXME: fix the python UNO components registration on SLED10 -Patch990: piece-disable-pyuno-registration.diff +Patch900: piece-disable-pyuno-registration.diff # compile sal/rtl/source with -O2 on MeeGo; File/Wizards/Letter crashed when compiled with -Os, see http://bugs.meego.com/show_bug.cgi?id=2652 -Patch991: sal-rtl-compiler-optimization-meego.diff +Patch901: sal-rtl-compiler-optimization-meego.diff # slower patching to debug and hopefully fix parallel build of ct2n extension; always happened only in the Build Service (bnc#595550) -Patch992: solenv-carefull-patching-hack.diff +Patch902: solenv-carefull-patching-hack.diff # FIXME: make it configurable in integrate into git -Patch993: officecfg-help-in-usr-share.diff +Patch903: officecfg-help-in-usr-share.diff # FIXME: temporary disable mono-loader build until the dependency on comphelper is removed -Patch994: cli_ure-disable-mono-loader.diff +Patch904: cli_ure-disable-mono-loader.diff +# FIXME: fix EMP+ import (bnc#650049) +Patch960: svtools-enable-emfplus.diff +Patch961: vcl-use-canvas-bool.diff +Patch962: drawinglayer-metadata-decomposition.diff +Patch963: canvas-polygon-access-out-of-range.diff # # patches against the upstream sources, must be -p0 # Patch1000: bug-123456-fix-foo.diff # example @@ -255,9 +254,6 @@ %patch0 %patch1 %patch2 -%patch3 -%patch4 -%patch5 install -m 644 %{S:1} %{S:30} src/ %if 0%{?suse_version} == 01010 install -m 644 %{S:150} src/ @@ -268,15 +264,20 @@ %endif %if 0%{?suse_version} == 01010 # temporary disable registration of python components on SLED10 -cp %{P:990} patches/hotfixes +cp %{P:900} patches/hotfixes %endif %if 0%{?meego_version} # compile sal/rtl/source with -O2 on MeeGo; File/Wizards/Letter crashed when compiled with -Os, see http://bugs.meego.com/show_bug.cgi?id=2652 -cp %{P:991} patches/hotfixes +cp %{P:901} patches/hotfixes %endif -cp %{P:992} patches/hotfixes -cp %{P:993} patches/hotfixes -cp %{P:994} patches/hotfixes +cp %{P:902} patches/hotfixes +cp %{P:903} patches/hotfixes +cp %{P:904} patches/hotfixes +# EMF+ stuff +cp %{P:960} patches/hotfixes +cp %{P:961} patches/hotfixes +cp %{P:962} patches/hotfixes +cp %{P:963} patches/hotfixes %endif %build ++++++ canvas-polygon-access-out-of-range.diff ++++++ commit 74b3688c6a388f077f6dd01dffee63bb872cce5c Author: Radek Doulik <[email protected]> Date: Wed Feb 16 18:12:33 2011 +0100 fix cairo canvas regression - do not access polygon points outside range (cherry picked from commit a898a8cb077c05b1085da8254e66f61aa265b7dc) Signed-off-by: Thorsten Behrens <[email protected]> diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index 0294780..bb5f6be 100644 --- canvas/source/cairo/cairo_canvashelper.cxx +++ canvas/source/cairo/cairo_canvashelper.cxx @@ -1074,7 +1074,7 @@ namespace cairocanvas { const sal_uInt32 nNextIndex((b + 1) % nPointCount); aEdge.setB2DPoint(1, aCandidate.getB2DPoint(nNextIndex)); - aEdge.setNextControlPoint(0, aCandidate.getNextControlPoint(b)); + aEdge.setNextControlPoint(0, aCandidate.getNextControlPoint(b % nPointCount)); aEdge.setPrevControlPoint(1, aCandidate.getPrevControlPoint(nNextIndex)); doPolyPolygonImplementation( basegfx::B2DPolyPolygon(aEdge), ++++++ drawinglayer-metadata-decomposition.diff ++++++ commit 220ca4436d36d4ef4b40b13f38c3863603bbae2d Author: Radek Doulik <[email protected]> Date: Tue Feb 15 17:30:45 2011 +0100 restrict metafile decomposition (fixes n#650049) - do not use metafile decomposition on metafiles which need canvas renderer (right now, these containing EMF+) diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index dfa3983..ff8d3f8 100644 --- drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -229,8 +229,10 @@ namespace drawinglayer mpOutputDevice->SetAntialiasing(nOldAntiAliase | ANTIALIASING_PIXELSNAPHAIRLINE); } + const primitive2d::MetafilePrimitive2D& rMetafilePrimitive( static_cast< const primitive2d::MetafilePrimitive2D& >(rCandidate) ); + static bool bTestMetaFilePrimitiveDecomposition(true); - if(bTestMetaFilePrimitiveDecomposition) + if( bTestMetaFilePrimitiveDecomposition && !rMetafilePrimitive.getMetaFile().GetUseCanvas() ) { // use new Metafile decomposition process(rCandidate.get2DDecomposition(getViewInformation2D())); @@ -238,7 +240,7 @@ namespace drawinglayer else { // direct draw of MetaFile - RenderMetafilePrimitive2D(static_cast< const primitive2d::MetafilePrimitive2D& >(rCandidate)); + RenderMetafilePrimitive2D( rMetafilePrimitive ); } if(bForceLineSnap) ++++++ libreoffice-bootstrap-3.3.0.3.tar.bz2 -> libreoffice-bootstrap-3.3.1.2.tar.bz2 ++++++ ++++ 5316 lines of diff (skipped) ++++++ libreoffice-build-3.3.1.1-enable-kde4-support.diff ++++++ --- distro-configs/SUSE-11.1.conf.in +++ distro-configs/SUSE-11.1.conf.in @@ -1,6 +1,5 @@ --with-vendor=\"Novell, Inc.\" --disable-access ---disable-kde4 --disable-odk --disable-qadevooo --enable-hids ++++++ libreoffice-build-3.3.1.1-setup-native.diff ++++++ --- bin/unpack +++ bin/unpack @@ -289,7 +289,7 @@ fi # ugly hack around odd positioning of this info echo "Unpacking setup_native .txt pieces" - ($OOO_DECOMPRESS_CMD $SRCDIR/setup_native_packinfo-3.3.0.2.tar.bz2 | $GNUTAR xf - ) || exit + ($OOO_DECOMPRESS_CMD $SRCDIR/setup_native_packinfo-3.3.1.1.tar.bz2 | $GNUTAR xf - ) || exit # hack to patch new files in the root dir if test "z$PIECE" = "zbootstrap" ; then touch $OOBUILDDIR/boost.m4 --- download.in +++ download.in @@ -538,7 +538,7 @@ } if ('@PIECE@' eq 'bootstrap') { - source_file( 'setup_native_packinfo-3.3.0.2.tar.bz2' ); + source_file( 'setup_native_packinfo-3.3.1.1.tar.bz2' ); } if ('@OOOP_FONTS_PACK@' ne '') { ++++++ libreoffice-build-3.3.0.3.tar.gz -> libreoffice-build-3.3.1.2.tar.gz ++++++ libreoffice-bootstrap/libreoffice-build-3.3.0.3.tar.gz libreoffice-bootstrap/libreoffice-build-3.3.1.2.tar.gz differ: char 5, line 1 ++++++ setup_native_packinfo-3.3.0.2.tar.bz2 -> setup_native_packinfo-3.3.1.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/packinfo_office.txt new/setup_native/source/packinfo/packinfo_office.txt --- old/setup_native/source/packinfo/packinfo_office.txt 2010-11-11 16:12:41.000000000 +0100 +++ new/setup_native/source/packinfo/packinfo_office.txt 2011-02-06 18:33:13.000000000 +0100 @@ -723,7 +723,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-hr" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" -copyright = "" +copyright = "2003-2010 by Denis Lackovic" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Hr dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -828,6 +828,22 @@ End Start +module = "gid_Module_Root_Extension_Dictionary_Oc" +script = "shellscripts_extensions.txt" +solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-oc" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-oc" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +linuxpatchrequires = "" +copyright = "1990-2011 by Dicollecte" +solariscopyright = "solariscopyrightfile" +vendor = "Dicollecte" +description = "Occitan-languedocian dictionary for %PRODUCTNAME %PRODUCTVERSION" +destpath = "/opt" +packageversion = "%PACKAGEVERSION" +End + +Start module = "gid_Module_Root_Extension_Dictionary_Pl" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-pl" @@ -986,6 +1002,22 @@ destpath = "/opt" packageversion = "%PACKAGEVERSION" End + +Start +module = "gid_Module_Root_Extension_Dictionary_Uk" +script = "shellscripts_extensions.txt" +solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-uk" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-uk" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +linuxpatchrequires = "" +copyright = "1999-2009 by Vladimir Yakovchuk, Oleg Podgurniy, Dmytro Kovalyov, Maksym Polyakov, Andriy Rysin, Valentyn Solomko, Volodymyr M. Lisivka, Eugeniy Meshcheryakov" +solariscopyright = "solariscopyrightfile" +vendor = "Document Foundation" +description = "Ukrainian dictionary for %PRODUCTNAME %PRODUCTVERSION" +destpath = "/opt" +packageversion = "%PACKAGEVERSION" +End Start module = "gid_Module_Root_Extension_Dictionary_Vi" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/spellchecker_selection.txt new/setup_native/source/packinfo/spellchecker_selection.txt --- old/setup_native/source/packinfo/spellchecker_selection.txt 2010-11-11 16:12:41.000000000 +0100 +++ new/setup_native/source/packinfo/spellchecker_selection.txt 2011-02-02 13:16:36.000000000 +0100 @@ -32,6 +32,7 @@ ne = "ne,en-US" nl = "nl,en-US,fr,de-DE" nn = "no,en-US,fr,de-DE,es" +oc = "oc,fr,en-US" pl = "pl,de-DE,en-US,ru" pt-BR = "pt,en-US,es" pt = "pt,en-US,es" @@ -45,7 +46,7 @@ sh = "sr,en-US" sw = "sw,en-US" th = "th,en-US" -uk = "ru,en-US" +uk = "uk,ru,en-US" vi = "vi,en-US,fr" zh-TW = "EMPTY,en-US" zh-CN = "EMPTY,en-US" ++++++ svtools-enable-emfplus.diff ++++++ --- svtools/source/filter.vcl/wmf/enhwmf.cxx.old 2011-02-15 18:42:33.000000000 +0100 +++ svtools/source/filter.vcl/wmf/enhwmf.cxx 2011-02-15 20:57:50.000000000 +0100 @@ -344,8 +344,12 @@ BOOL EnhWMFReader::ReadEnhWMF() sal_Bool bFlag, bStatus = ReadHeader(); sal_Bool bHaveDC = false; - // disable EMF+ temporarily on all platforms +#ifdef UNX + static sal_Bool bEnableEMFPlus = ( getenv( "EMF_PLUS_DISABLE" ) == NULL ); +#else + // TODO: make it possible to disable emf+ on windows static sal_Bool bEnableEMFPlus = sal_False; +#endif while( bStatus && nRecordCount-- ) { ++++++ vcl-use-canvas-bool.diff ++++++ commit 7de8695f19626c764a4b43cfb30179525d9a5956 Author: Radek Doulik <[email protected]> Date: Wed Feb 9 16:02:42 2011 +0100 GDIMetaFile::bUseCanvas related changes (prerequisite for fixing n#650049) - add GetUseCanvas() for read access - update bUseCanvas when playing on metafile commit bb6e3a77426bd8815760f6a46914dfc3568527cb Author: Radek Doulik <[email protected]> Date: Tue Feb 15 17:19:24 2011 +0100 clean the code a bit --- vcl/inc/vcl/gdimtf.hxx +++ vcl/inc/vcl/gdimtf.hxx @@ -247,6 +247,7 @@ public: BOOL CreateThumbnail( sal_uInt32 nMaximumExtent, BitmapEx& rBmpEx, const BitmapEx* pOverlay = NULL, const Rectangle* pOverlayRect = NULL ) const; void UseCanvas( BOOL _bUseCanvas ); + BOOL GetUseCanvas() const { return bUseCanvas; } }; /** Create a special metaaction that delegates rendering to specified --- vcl/source/gdi/gdimtf.cxx +++ vcl/source/gdi/gdimtf.cxx @@ -437,6 +437,8 @@ void GDIMetaFile::Play( GDIMetaFile& rMtf, ULONG nPos ) MetaAction* pAction = GetCurAction(); const ULONG nObjCount = Count(); + rMtf.UseCanvas( rMtf.GetUseCanvas() || bUseCanvas ); + if( nPos > nObjCount ) nPos = nObjCount; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
