strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge vosremoval-conditn patch

Browse source
This commit is contained in:
Norbert Thiebaud 2010-10-11 16:11:20 -05:00
parent 04df950dcc
commit b67f62e299
9 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
extensions/inc/pch/precompiled_extensions.hxx
View file

@ -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"

4
extensions/source/plugin/inc/plugin/unx/mediator.hxx
View file

@ -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

2
extensions/test/sax/testsax.cxx
View file

@ -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>

2
extensions/test/stm/datatest.cxx
View file

@ -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>

2
extensions/test/stm/marktest.cxx
View file

@ -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>

2
extensions/test/stm/pipetest.cxx
View file

@ -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>

4
extensions/workben/pythonautotest.cxx
View file

@ -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;
};

4
extensions/workben/pythontest.cxx
View file

@ -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;

2
extensions/workben/testcomponent.cxx
View file

@ -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>