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

[Caolán McNamara]

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

New commits:
commit 2e11d06b061e1f0059b6ea4645dd262d0d2a1436
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Sep 12 11:54:05 2011 +0100

    not going to get away with this friend syntax

diff --git a/svl/inc/svl/svldata.hxx b/svl/inc/svl/svldata.hxx
index ab4ccc0..b51a368 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:
-    template<class> friend class rtl::Static;
-
+public:
     ImpSvlData():
         pStoringPool(0), m_pThreadsafeRMs(NULL)
     {}
diff --git a/svx/source/inc/DGColorNameLookUp.hxx b/svx/source/inc/DGColorNameLookUp.hxx
index d3a04a2..9fd8dc4 100644
--- a/svx/source/inc/DGColorNameLookUp.hxx
+++ b/svx/source/inc/DGColorNameLookUp.hxx
@@ -79,8 +79,7 @@ private:
     /// This ma translates from numerical color values to names.
     tColorValueToNameMap maColorValueToNameMap;
 
-private:
-    template<class> friend class rtl::Static;
+public:
     /// Create a new (the only) instance of this class.
     DGColorNameLookUp();
     ~DGColorNameLookUp();