try better template friend class syntax

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:

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();
 };