From 64ced968cc82b552e178da033e7a3b5af6996ae1 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Fri, 25 Aug 2017 20:56:28 +0200
Subject: [PATCH] basegfx: remove global ImplB2DPolyPolygon

Change-Id: I6035aaf8aabf71062bb63a4d416c253378fb4756
---
 basegfx/source/polygon/b2dpolypolygon.cxx | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/basegfx/source/polygon/b2dpolypolygon.cxx b/basegfx/source/polygon/b2dpolypolygon.cxx
index 9c6b1eb50fe9..eaed3bacdc54 100644
--- a/basegfx/source/polygon/b2dpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dpolypolygon.cxx
@@ -21,7 +21,6 @@
 #include <osl/diagnose.h>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <rtl/instance.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 
 #include <functional>
@@ -170,11 +169,9 @@ public:
 
 namespace basegfx
 {
-    namespace { struct DefaultPolyPolygon: public rtl::Static<B2DPolyPolygon::ImplType,
-                                                              DefaultPolyPolygon> {}; }
 
-    B2DPolyPolygon::B2DPolyPolygon() :
-        mpPolyPolygon(DefaultPolyPolygon::get())
+    B2DPolyPolygon::B2DPolyPolygon()
+        : mpPolyPolygon()
     {
     }
 
@@ -325,7 +322,7 @@ namespace basegfx
 
     void B2DPolyPolygon::clear()
     {
-        mpPolyPolygon = DefaultPolyPolygon::get();
+        *mpPolyPolygon = ImplB2DPolyPolygon();
     }
 
     bool B2DPolyPolygon::isClosed() const