diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:18:35 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:33 -0500 |
| commit | c17635d5752c010405efba458cfb3a98f5afaf75 (patch) | |
| tree | f8c521b54c3c65cbcbcad293f63cfa81113f480f /scripting | |
| parent | d3756b8b7318ecae4eaf0552aea3cde940e91490 (diff) | |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/source/basprov/baslibnode.cxx | 2 | ||||
| -rw-r--r-- | scripting/source/basprov/basmethnode.cxx | 2 | ||||
| -rw-r--r-- | scripting/source/basprov/basmodnode.cxx | 2 | ||||
| -rw-r--r-- | scripting/source/basprov/basprov.cxx | 2 | ||||
| -rw-r--r-- | scripting/source/basprov/basscript.cxx | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/scripting/source/basprov/baslibnode.cxx b/scripting/source/basprov/baslibnode.cxx index 6ce97eb241ea..acec5ae07bef 100644 --- a/scripting/source/basprov/baslibnode.cxx +++ b/scripting/source/basprov/baslibnode.cxx @@ -31,7 +31,7 @@ #include "baslibnode.hxx" #include "basmodnode.hxx" #include <com/sun/star/script/browse/BrowseNodeTypes.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <basic/basmgr.hxx> #include <basic/sbstar.hxx> diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx index ecc0734df638..f87ee1759dd2 100644 --- a/scripting/source/basprov/basmethnode.cxx +++ b/scripting/source/basprov/basmethnode.cxx @@ -35,7 +35,7 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/script/browse/BrowseNodeTypes.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <basic/sbstar.hxx> #include <basic/sbmeth.hxx> diff --git a/scripting/source/basprov/basmodnode.cxx b/scripting/source/basprov/basmodnode.cxx index d6b908e582a6..d64cdac165d4 100644 --- a/scripting/source/basprov/basmodnode.cxx +++ b/scripting/source/basprov/basmodnode.cxx @@ -31,7 +31,7 @@ #include "basmodnode.hxx" #include "basmethnode.hxx" #include <com/sun/star/script/browse/BrowseNodeTypes.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <basic/sbx.hxx> #include <basic/sbstar.hxx> diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index 2893f2cf3a19..5cb4e1425f7b 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -40,7 +40,7 @@ #include <rtl/uri.hxx> #include <osl/process.h> #include <osl/file.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <basic/sbx.hxx> #include <basic/basmgr.hxx> diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx index f6fc16332905..978065053d5d 100644 --- a/scripting/source/basprov/basscript.cxx +++ b/scripting/source/basprov/basscript.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_scripting.hxx" #include "basscript.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <basic/sbx.hxx> #include <basic/sbstar.hxx> |