[Libreoffice-commits] .: svl/inc svx/source

[Norbert Thiebaud]

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

New commits:
commit 57dbe3e46690e9bf2361ea94221537f31b70d19c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Sep 30 11:39:01 2011 -0500

    temp fix to issues stemming from 979e2c8f8b9325a5c75bfc1f388aa8f69b988d2c

diff --git a/svl/inc/svl/svldata.hxx b/svl/inc/svl/svldata.hxx
index bfafb84..c498dd0 100644
--- a/svl/inc/svl/svldata.hxx
+++ b/svl/inc/svl/svldata.hxx
@@ -45,9 +45,7 @@ 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).
 
-private:
-    /// Can only construct via singleton
-    template<typename T, typename Unique> friend class rtl::Static;
+    public: //TODO: should be private
     ImpSvlData() : pStoringPool(0), m_pThreadsafeRMs(NULL) {}
     ~ImpSvlData();
 
diff --git a/svx/source/inc/DGColorNameLookUp.hxx b/svx/source/inc/DGColorNameLookUp.hxx
index 98b72c7..0b0068d 100644
--- a/svx/source/inc/DGColorNameLookUp.hxx
+++ b/svx/source/inc/DGColorNameLookUp.hxx
@@ -79,9 +79,8 @@ private:
     /// This ma translates from numerical color values to names.
     tColorValueToNameMap maColorValueToNameMap;
 
-private:
+public:
     /// Can only construct via singleton
-    template<typename T, typename Unique> friend class rtl::Static;
     DGColorNameLookUp();
     ~DGColorNameLookUp();
 };