From 643f0d11e8a86d81af300d7b84270f64f5ea6f61 Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Tue, 5 Jun 2007 13:49:58 +0000
Subject: INTEGRATION: CWS bgdlremove (1.4.64); FILE MERGED 2007/05/18 11:38:08
 kso 1.4.64.2: #i77419# - cleanup of ucbhelper namespaces. 2007/05/11 12:54:06
 kso 1.4.64.1: #i76911# - ucbhelper no longer uses VOS

---
 ucbhelper/inc/ucbhelper/propertyvalueset.hxx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'ucbhelper')

diff --git a/ucbhelper/inc/ucbhelper/propertyvalueset.hxx b/ucbhelper/inc/ucbhelper/propertyvalueset.hxx
index 1c9c1bdff8c1..1ca3d88a2c79 100644
--- a/ucbhelper/inc/ucbhelper/propertyvalueset.hxx
+++ b/ucbhelper/inc/ucbhelper/propertyvalueset.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: propertyvalueset.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 16:29:25 $
+ *  last change: $Author: ihi $ $Date: 2007-06-05 14:49:58 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -51,9 +51,9 @@
 #ifndef _CPPUHELPER_WEAK_HXX_
 #include <cppuhelper/weak.hxx>
 #endif
-#ifndef _VOS_MUTEX_HXX_
-#include <vos/mutex.hxx>
-#endif
+
+#include "osl/mutex.hxx"
+
 #ifndef _UCBHELPER_MACROS_HXX
 #include <ucbhelper/macros.hxx>
 #endif
@@ -72,7 +72,7 @@ namespace com { namespace sun { namespace star { namespace beans {
     class XPropertySet;
 } } } }
 
-namespace ucb {
+namespace ucbhelper {
 
 class PropertyValues;
 
@@ -95,7 +95,7 @@ class UCBHELPER_DLLPUBLIC PropertyValueSet :
                                      m_xSMgr;
     com::sun::star::uno::Reference< com::sun::star::script::XTypeConverter >
                                      m_xTypeConverter;
-    vos::OMutex     m_aMutex;
+    osl::Mutex      m_aMutex;
     PropertyValues* m_pValues;
     sal_Bool        m_bWasNull;
     sal_Bool        m_bTriedToGetTypeConverter;
-- 
cgit