summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2010-10-10 21:29:08 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2010-10-10 21:29:08 -0500
commitf744968454477935f7396b495a2426cf5e70546b (patch)
treebc09336bedd062fbdd22fefc3c8940a05d2862ec /svtools
parent5584c277cb3d7a198b9bd554e5a4dc92b8bea87d (diff)
merge vosremoval-thread patch
Diffstat (limited to 'svtools')
-rw-r--r--svtools/inc/pch/precompiled_svtools.hxx3
-rw-r--r--svtools/source/control/inettbc.cxx4
2 files changed, 3 insertions, 4 deletions
diff --git a/svtools/inc/pch/precompiled_svtools.hxx b/svtools/inc/pch/precompiled_svtools.hxx
index ddedfc5a0369..ce0758765395 100644
--- a/svtools/inc/pch/precompiled_svtools.hxx
+++ b/svtools/inc/pch/precompiled_svtools.hxx
@@ -352,7 +352,6 @@
#include <cppuhelper/weakref.hxx>
#include <osl/conditn.hxx>
-#include <osl/conditn.hxx>
#include <osl/diagnose.h>
#include <osl/endian.h>
#include <osl/file.h>
@@ -428,7 +427,7 @@
#include <vos/ref.hxx>
#include <vos/refernce.hxx>
#include <vos/security.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#include <vos/timer.hxx>
//---MARKER---
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index b538449a7839..544b591bb0ed 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -52,7 +52,7 @@
#include <comphelper/processfactory.hxx>
#include <vcl/toolbox.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#include <vos/mutex.hxx>
#include <vcl/svapp.hxx>
#include <unotools/historyoptions.hxx>
@@ -110,7 +110,7 @@ public:
};
// -----------------------------------------------------------------------
-class SvtMatchContext_Impl : public ::vos::OThread
+class SvtMatchContext_Impl : public ::osl::Thread
{
static ::vos::OMutex* pDirMutex;