From ddf93e2c09481609c4f5fe4ab6750379146379cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 12 Sep 2011 23:52:07 +0100
Subject: [PATCH] try better template friend class syntax

---
 svl/inc/svl/svldata.hxx              | 9 ++++-----
 svx/source/inc/DGColorNameLookUp.hxx | 5 +++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/svl/inc/svl/svldata.hxx b/svl/inc/svl/svldata.hxx
index b51a36822084..bfafb848b99c 100644
--- a/svl/inc/svl/svldata.hxx
+++ b/svl/inc/svl/svldata.hxx
@@ -45,11 +45,10 @@ public:
         // further request for any other language supply the resmgr of the first call.
         // For the simple resmgr we have a mgr for each language ever requested).
 
-public:
-    ImpSvlData():
-        pStoringPool(0), m_pThreadsafeRMs(NULL)
-    {}
-
+private:
+    /// Can only construct via singleton
+    template<typename T, typename Unique> friend class rtl::Static;
+    ImpSvlData() : pStoringPool(0), m_pThreadsafeRMs(NULL) {}
     ~ImpSvlData();
 
 public:
diff --git a/svx/source/inc/DGColorNameLookUp.hxx b/svx/source/inc/DGColorNameLookUp.hxx
index 9fd8dc471da7..98b72c7e6e90 100644
--- a/svx/source/inc/DGColorNameLookUp.hxx
+++ b/svx/source/inc/DGColorNameLookUp.hxx
@@ -79,8 +79,9 @@ private:
     /// This ma translates from numerical color values to names.
     tColorValueToNameMap maColorValueToNameMap;
 
-public:
-    /// Create a new (the only) instance of this class.
+private:
+    /// Can only construct via singleton
+    template<typename T, typename Unique> friend class rtl::Static;
     DGColorNameLookUp();
     ~DGColorNameLookUp();
 };