merge vosremoval-conditn patch

9 files changed, 12 insertions, 13 deletions

diff --git a/extensions/inc/pch/precompiled_extensions.hxx b/extensions/inc/pch/precompiled_extensions.hxx
index adbaf3f4cf74..8d58b18e147e 100644
--- a/extensions/inc/pch/precompiled_extensions.hxx
+++ b/extensions/inc/pch/precompiled_extensions.hxx
@@ -464,6 +464,7 @@
 
 
 #include "osl/conditn.h"
+#include "osl/conditn.hxx"
 #include "osl/diagnose.h"
 #include "osl/doublecheckedlocking.h"
 #include "osl/file.hxx"
@@ -535,8 +536,6 @@
 
 #include "vcl/fldunit.hxx"
 
-#include "vos/conditn.hxx"
-#include "osl/diagnose.h"
 #include "vos/macros.hxx"
 #include "vos/module.hxx"
 #include "vos/mutex.hxx"
diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
index 1fd1c9c85c6c..8610211bb1a8 100644
--- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
@@ -33,7 +33,7 @@
 #include <tools/link.hxx>
 #include <vos/pipe.hxx>
 #include <vos/mutex.hxx>
-#include <vos/conditn.hxx>
+#include <osl/conditn.hxx>
 #include <osl/thread.hxx>
 #if OSL_DEBUG_LEVEL > 1
 #include <stdio.h>
@@ -93,7 +93,7 @@ protected:
     NAMESPACE_VOS(OMutex)               m_aQueueMutex;
     NAMESPACE_VOS(OMutex)               m_aSendMutex;
     // only one thread can send a message at any given time
-    NAMESPACE_VOS(OCondition)           m_aNewMessageCdtn;
+    osl::Condition                      m_aNewMessageCdtn;
     MediatorListener*                   m_pListener;
     // thread to fill the queue
 
diff --git a/extensions/test/sax/testsax.cxx b/extensions/test/sax/testsax.cxx
index 1500cb76e52e..0a68f413e60e 100644
--- a/extensions/test/sax/testsax.cxx
+++ b/extensions/test/sax/testsax.cxx
@@ -37,7 +37,7 @@
 #include <osl/time.h>
 #include <usr/weak.hxx>
 #include <tools/string.hxx>
-#include <vos/conditn.hxx>
+#include <osl/conditn.hxx>
 
 #include <smart/com/sun/star/io/XOutputStream.hxx>
 #include <smart/com/sun/star/xml/sax/SAXParseException.hxx>
diff --git a/extensions/test/stm/datatest.cxx b/extensions/test/stm/datatest.cxx
index d9efab06b3e3..a35d187f114c 100644
--- a/extensions/test/stm/datatest.cxx
+++ b/extensions/test/stm/datatest.cxx
@@ -46,7 +46,7 @@
 #include <usr/reflserv.hxx>  // for EXTERN_SERVICE_CALLTYPE
 #include <usr/weak.hxx>      // OWeakObject
 
-#include <vos/conditn.hxx>
+#include <osl/conditn.hxx>
 #include <vos/mutex.hxx>
 #include <osl/thread.hxx>
 
diff --git a/extensions/test/stm/marktest.cxx b/extensions/test/stm/marktest.cxx
index 8bf12a271781..00b4e4910634 100644
--- a/extensions/test/stm/marktest.cxx
+++ b/extensions/test/stm/marktest.cxx
@@ -42,7 +42,7 @@
 #include <usr/reflserv.hxx>  // for EXTERN_SERVICE_CALLTYPE
 #include <usr/weak.hxx>      // OWeakObject
 
-#include <vos/conditn.hxx>
+#include <osl/conditn.hxx>
 #include <vos/mutex.hxx>
 #include <osl/thread.hxx>
 
diff --git a/extensions/test/stm/pipetest.cxx b/extensions/test/stm/pipetest.cxx
index e516f41778dd..95adfd52c4c5 100644
--- a/extensions/test/stm/pipetest.cxx
+++ b/extensions/test/stm/pipetest.cxx
@@ -39,7 +39,7 @@
 #include <usr/reflserv.hxx>  // for EXTERN_SERVICE_CALLTYPE
 #include <usr/weak.hxx>      // OWeakObject
 
-#include <vos/conditn.hxx>
+#include <osl/conditn.hxx>
 #include <vos/mutex.hxx>
 #include <osl/thread.hxx>
 
diff --git a/extensions/workben/pythonautotest.cxx b/extensions/workben/pythonautotest.cxx
index 9072b74f6354..930e8395442f 100644
--- a/extensions/workben/pythonautotest.cxx
+++ b/extensions/workben/pythonautotest.cxx
@@ -41,7 +41,7 @@
 #include <usr/ustring.hxx>
 #include <usr/weak.hxx>
 #include <tools/string.hxx>
-#include <vos/conditn.hxx>
+#include <osl/conditn.hxx>
 
 using namespace rtl;
 using namespace vos;
@@ -279,7 +279,7 @@ public:
     void cmdLine();
 protected:
 
-    OCondition m_aDebugCondition;
+    osl::Condition m_aDebugCondition;
     XDebuggingRef *m_pDebuggingRef;
 };
 
diff --git a/extensions/workben/pythontest.cxx b/extensions/workben/pythontest.cxx
index 0be56698a4d0..49ab2438d45f 100644
--- a/extensions/workben/pythontest.cxx
+++ b/extensions/workben/pythontest.cxx
@@ -42,7 +42,7 @@
 #include <usr/ustring.hxx>
 #include <usr/weak.hxx>
 #include <tools/string.hxx>
-#include <vos/conditn.hxx>
+#include <osl/conditn.hxx>
 
 using namespace rtl;
 using namespace vos;
@@ -152,7 +152,7 @@ public:
     void cmdLine();
 protected:
 
-    OCondition m_aDebugCondition;
+    osl::Condition m_aDebugCondition;
     XDebuggingRef *m_pDebuggingRef;
     XEngineRef  *m_pEngineRef;
     XInvokationRef *m_pInvokationRef;
diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx
index eadc75ba2ad3..a34dfc615566 100644
--- a/extensions/workben/testcomponent.cxx
+++ b/extensions/workben/testcomponent.cxx
@@ -47,7 +47,7 @@
 #include <vcl/svapp.hxx>
 #include <usr/ustring.hxx>
 #include <tools/string.hxx>
-#include <vos/conditn.hxx>
+#include <osl/conditn.hxx>
 
 #include <smart/com/sun/star/test/XSimpleTest.hxx>