diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:20:00 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:38 -0500 |
| commit | d88b292704957818eff9a348a524b5c90b40031b (patch) | |
| tree | eabf039491304b2c13f3bd77ca0b6d58c3dba1b8 /svtools/source/misc | |
| parent | 98b2c08dff4d00b3e7a2e001c326ebe27dae4549 (diff) | |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'svtools/source/misc')
| -rw-r--r-- | svtools/source/misc/acceleratorexecute.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/misc/cliplistener.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/misc/ehdl.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/misc/embedhlp.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/misc/imagemgr.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/misc/transfer.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/misc/transfer2.cxx | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index dedab2947b7f..fea433503989 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -56,7 +56,7 @@ #include <vcl/window.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> //=============================================== // namespace diff --git a/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx index 7389b30bc142..741e62cb64a8 100644 --- a/svtools/source/misc/cliplistener.cxx +++ b/svtools/source/misc/cliplistener.cxx @@ -33,7 +33,7 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include "cliplistener.hxx" #include <svtools/transfer.hxx> diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index c12b827ed253..f146a84a969e 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/debug.hxx> #include <tools/rcid.h> #include <vcl/wintypes.hxx> diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 9ed80ae82971..c8bf04e2f464 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -54,7 +54,7 @@ #include <cppuhelper/implbase4.hxx> #include "vcl/svapp.hxx" #include <rtl/logfile.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> using namespace com::sun::star; diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 3d0b34e9fec7..19148344a6f4 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -54,7 +54,7 @@ #include <svtools/svtools.hrc> #include "imagemgr.hrc" #include <svtools/svtdata.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> // globals ******************************************************************* diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index f4ee42cfeebd..50ad17317955 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -40,7 +40,7 @@ #endif #include <tools/postwin.h> #endif -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <rtl/memory.h> #include <rtl/uuid.h> #include <rtl/uri.hxx> diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index adc955af754a..3ef70f236b0d 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/debug.hxx> #include <tools/urlobj.hxx> #include <unotools/ucbstreamhelper.hxx> |