diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:15:49 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:29 -0500 |
commit | 46308b84ddc46d8f99e6b3416636e6286d23d7e3 (patch) | |
tree | 97d55ea961f775677ed95cb94be5aadbc9bcc680 /basctl | |
parent | d3d553e1ef00b1ae5ac4d65e53e8ea08b24085f3 (diff) |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'basctl')
-rw-r--r-- | basctl/source/basicide/doceventnotifier.cxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/scriptdocument.cxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/unomodel.cxx | 2 | ||||
-rw-r--r-- | basctl/source/dlged/dlgedclip.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx index b8afffe21d88..a47c269f2c3d 100644 --- a/basctl/source/basicide/doceventnotifier.cxx +++ b/basctl/source/basicide/doceventnotifier.cxx @@ -43,7 +43,7 @@ #include <comphelper/componentcontext.hxx> #include <comphelper/processfactory.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <sal/macros.h> #include <cppuhelper/compbase1.hxx> diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx index 1f277b3da112..bc21f4b3f556 100644 --- a/basctl/source/basicide/scriptdocument.cxx +++ b/basctl/source/basicide/scriptdocument.cxx @@ -81,7 +81,7 @@ #include <comphelper/documentinfo.hxx> #include <comphelper/componentcontext.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx index 456d9eb89e35..498599a6bb04 100644 --- a/basctl/source/basicide/unomodel.cxx +++ b/basctl/source/basicide/unomodel.cxx @@ -30,7 +30,7 @@ #include "precompiled_basctl.hxx" #include "unomodel.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <sfx2/docfac.hxx> diff --git a/basctl/source/dlged/dlgedclip.cxx b/basctl/source/dlged/dlgedclip.cxx index 9364cb2f5d4c..17392b2510ac 100644 --- a/basctl/source/dlged/dlgedclip.cxx +++ b/basctl/source/dlged/dlgedclip.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basctl.hxx" #include "dlgedclip.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/datatransfer/XMimeContentType.hpp> |