diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-12 01:54:49 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-12 01:57:31 -0500 |
| commit | d217505d16fdbe74d8a3770897735411a441ff92 (patch) | |
| tree | de402cf3687ec5ee9c444fb45a7dbce6e73acb80 | |
| parent | 4b57550386783adaba884185a5386385694513a6 (diff) | |
vos:removal: missed a couple of OThread
| -rw-r--r-- | cui/source/inc/cuigaldlg.hxx | 6 | ||||
| -rw-r--r-- | extensions/source/ole/olethread.cxx | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 56aedff40de1..9bd80879816d 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 7fcd29612f57..64df49888b68 100644 --- a/extensions/source/ole/olethread.cxx +++ b/extensions/source/ole/olethread.cxx @@ -38,7 +38,6 @@ #include <osl/thread.hxx> -using namespace vos; using namespace std; namespace ole_adapter @@ -50,7 +49,7 @@ 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) { |