diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-11 16:11:20 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:29 -0500 |
commit | b67f62e299a22a33c32523db06f509ff92b5b829 (patch) | |
tree | e3369077b53053223f44ba3d6c98c92f59f0a7c6 /extensions/workben | |
parent | 04df950dcc432834bbc2d3a27e13a7817eb775d5 (diff) |
merge vosremoval-conditn patch
Diffstat (limited to 'extensions/workben')
-rw-r--r-- | extensions/workben/pythonautotest.cxx | 4 | ||||
-rw-r--r-- | extensions/workben/pythontest.cxx | 4 | ||||
-rw-r--r-- | extensions/workben/testcomponent.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
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> |