[openoffice.org/f14/master] Related: rhbz#684477 make sure this is thread safe

[Caolan McNamara]

commit defc6866b40586cebfc183206e876967c348616b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 14 10:29:49 2011 +0000

    Related: rhbz#684477 make sure this is thread safe

 ...rhbz-684477-make-sure-this-is-thread-safe.patch |   69 ++++++++++++++++++++
 openoffice.org.spec                                |    5 +-
 2 files changed, 73 insertions(+), 1 deletions(-)
---
diff --git a/0001-Related-rhbz-684477-make-sure-this-is-thread-safe.patch b/0001-Related-rhbz-684477-make-sure-this-is-thread-safe.patch
new file mode 100644
index 0000000..1fbcb67
--- /dev/null
+++ b/0001-Related-rhbz-684477-make-sure-this-is-thread-safe.patch
@@ -0,0 +1,69 @@
+From fca3e47954fe36687989328ac90cbc6747e4bc4e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Mon, 14 Mar 2011 10:20:12 +0000
+Subject: [PATCH] Related: rhbz#684477 make sure this is thread safe
+
+---
+ basegfx/source/polygon/b2dpolygontools.cxx |   36 +++++++++++++++++----------
+ 1 files changed, 23 insertions(+), 13 deletions(-)
+
+diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx
+index 1967e6e..3271314 100644
+--- a/basegfx/source/polygon/b2dpolygontools.cxx
++++ b/basegfx/source/polygon/b2dpolygontools.cxx
+@@ -32,6 +32,7 @@
+ #include <basegfx/polygon/b2dpolygontools.hxx>
+ #include <osl/diagnose.h>
+ #include <rtl/math.hxx>
++#include <rtl/instance.hxx>
+ #include <basegfx/polygon/b2dpolygon.hxx>
+ #include <basegfx/polygon/b2dpolypolygon.hxx>
+ #include <basegfx/range/b2drange.hxx>
+@@ -1836,22 +1837,31 @@ namespace basegfx
+             return aRetval;
+         }
+ 
+-        B2DPolygon createUnitPolygon()
++        namespace
+         {
+-            static B2DPolygon aRetval;
+-
+-            if(!aRetval.count())
++            struct theUnitPolygon :
++                public rtl::StaticWithInit<B2DPolygon, theUnitPolygon>
+             {
+-                aRetval.append( B2DPoint( 0.0, 0.0 ) );
+-                aRetval.append( B2DPoint( 1.0, 0.0 ) );
+-                aRetval.append( B2DPoint( 1.0, 1.0 ) );
+-                aRetval.append( B2DPoint( 0.0, 1.0 ) );
++                B2DPolygon operator () ()
++                {
++                    B2DPolygon aRetval;
+ 
+-                // close
+-                aRetval.setClosed( true );
+-            }
+-            
+-            return aRetval;
++                    aRetval.append( B2DPoint( 0.0, 0.0 ) );
++                    aRetval.append( B2DPoint( 1.0, 0.0 ) );
++                    aRetval.append( B2DPoint( 1.0, 1.0 ) );
++                    aRetval.append( B2DPoint( 0.0, 1.0 ) );
++
++                    // close
++                    aRetval.setClosed( true );
++
++                    return aRetval;
++                }
++            };
++        }
++
++        B2DPolygon createUnitPolygon()
++        {
++            return theUnitPolygon::get();
+         }
+ 
+         B2DPolygon createPolygonFromCircle( const B2DPoint& rCenter, double fRadius )
+-- 
+1.7.4.1
+
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 80eef14..50ded44 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -167,6 +167,7 @@ Patch83: 0001-rhbz-666440-don-t-pushback-and-process-a-corrupt-extension.patch
 Patch84: 0001-Resolves-rhbz-674330-dereference-of-NULL-mpBase.patch
 Patch85: 0001-Resolves-rhbz-681159-bandaid-for-crash.patch
 Patch86: 0001-Resolves-rhbz-672818-bandaid-for-crash-in-SwTxtNode-.patch
+Patch87: 0001-Related-rhbz-684477-make-sure-this-is-thread-safe.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1750,6 +1751,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch84 -p1 -b .rhbz674330-dereference-of-NULL-mpBase.patch
 %patch85 -p0 -b .rhbz681159-bandaid-for-crash.patch
 %patch86 -p0 -b .rhbz672818-bandaid-for-crash-in-SwTxtNode-.patch
+%patch87 -p1 -b .rhbz684477-make-sure-this-is-thread-safe.patch
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
 touch scripting/util/provider/javascript/delzip
@@ -3945,7 +3947,7 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
-* Wed Mar 02 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.3-UNBUILT
+* Thu Mar 14 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.3-UNBUILT
 - Related: rhbz#610103 make this even more robust
 - Related: rhbz#672872 cancel gtk file dialog on terminate
 - Resolves: rhbz#673819 crash on changing position of header/footer drawing object
@@ -3957,6 +3959,7 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 - Resolves: rhbz#674330 dereference of NULL mpBase
 - Resolves: rhbz#681159 crash in writer
 - Resolves: rhbz#672818 crash in writer
+- Related: rhbz#684477 make sure this is thread safe
 
 * Mon Jan 24 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.2
 - Resolves: rhbz#671540 fix lonely )