[Libreoffice-commits] .: cui/source extensions/source

[Norbert Thiebaud]

 cui/source/inc/cuigaldlg.hxx        |    6 +++---
 extensions/source/ole/olethread.cxx |   15 +++++++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit e14606f2055520f5f12c78b20ba53404cb9934cd
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Oct 12 01:54:49 2010 -0500

    vos:removal: missed a couple of OThread

diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 6895ad7..6c2e26a 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -28,7 +28,7 @@
 #ifndef _CUI_GALDLG_HXX_
 #define _CUI_GALDLG_HXX_
 
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/fixed.hxx>
@@ -71,7 +71,7 @@ struct FilterEntry
 // - SearchThread -
 // ----------------
 
-class SearchThread : public ::vos::OThread
+class SearchThread : public ::osl::Thread
 {
 private:
 
@@ -128,7 +128,7 @@ public:
 // - TakeThread -
 // --------------
 
-class TakeThread : public ::vos::OThread
+class TakeThread : public ::osl::Thread
 {
 private:
 
diff --git a/extensions/source/ole/olethread.cxx b/extensions/source/ole/olethread.cxx
index b512ecc..79c7cdd 100644
--- a/extensions/source/ole/olethread.cxx
+++ b/extensions/source/ole/olethread.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,20 +38,19 @@
 
 #include <osl/thread.hxx>
 
-using namespace vos;
 using namespace std;
 
 namespace ole_adapter
 {
 // CoInitializeEx *
-typedef DECLSPEC_IMPORT HRESULT (STDAPICALLTYPE *ptrCoInitEx)( LPVOID, DWORD); 
+typedef DECLSPEC_IMPORT HRESULT (STDAPICALLTYPE *ptrCoInitEx)( LPVOID, DWORD);
 // CoInitialize *
-typedef DECLSPEC_IMPORT HRESULT (STDAPICALLTYPE *ptrCoInit)( LPVOID); 
+typedef DECLSPEC_IMPORT HRESULT (STDAPICALLTYPE *ptrCoInit)( LPVOID);
 
 void o2u_attachCurrentThread()
 {
-    static OThreadData oleThreadData;
-    
+    static osl::ThreadData oleThreadData;
+
     if ((sal_Bool)(sal_IntPtr)oleThreadData.getData() != sal_True)
     {
         HINSTANCE inst=	LoadLibrary( _T("ole32.dll"));
@@ -70,8 +69,8 @@ void o2u_attachCurrentThread()
                     hr= initFunc( NULL);
             }
         }
-        oleThreadData.setData((void*)sal_True);				
+        oleThreadData.setData((void*)sal_True);
     }
-}	
+}
 
 } // end namespace