From 93d25a20042974342582ec8047dfb30b10ec3f36 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 4 Apr 2011 11:45:39 +0100
Subject: use consistent naming

---
 svl/source/config/cjkoptions.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx
index e64a03a96e8e..a3a19fe443c8 100644
--- a/svl/source/config/cjkoptions.cxx
+++ b/svl/source/config/cjkoptions.cxx
@@ -378,7 +378,7 @@ sal_Bool SvtCJKOptions_Impl::IsReadOnly(SvtCJKOptions::EOption eOption) const
 
 static SvtCJKOptions_Impl*  pCJKOptions = NULL;
 static sal_Int32            nCJKRefCount = 0;
-namespace { struct CJKMutex : public rtl::Static< ::osl::Mutex , CJKMutex >{}; }
+namespace { struct theCJKOptionsMutex : public rtl::Static< ::osl::Mutex , theCJKOptionsMutex >{}; }
 
 
 // class SvtCJKOptions --------------------------------------------------
@@ -386,7 +386,7 @@ namespace { struct CJKMutex : public rtl::Static< ::osl::Mutex , CJKMutex >{}; }
 SvtCJKOptions::SvtCJKOptions(sal_Bool bDontLoad)
 {
     // Global access, must be guarded (multithreading)
-    ::osl::MutexGuard aGuard( CJKMutex::get() );
+    ::osl::MutexGuard aGuard( theCJKOptionsMutex::get() );
     if ( !pCJKOptions )
     {
         pCJKOptions = new SvtCJKOptions_Impl;
@@ -404,7 +404,7 @@ SvtCJKOptions::SvtCJKOptions(sal_Bool bDontLoad)
 SvtCJKOptions::~SvtCJKOptions()
 {
     // Global access, must be guarded (multithreading)
-    ::osl::MutexGuard aGuard( CJKMutex::get() );
+    ::osl::MutexGuard aGuard( theCJKOptionsMutex::get() );
     if ( !--nCJKRefCount )
         DELETEZ( pCJKOptions );
 }
-- 
cgit