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 /extensions/source/propctrlr/propcontroller.cxx | |
| 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 'extensions/source/propctrlr/propcontroller.cxx')
| -rw-r--r-- | extensions/source/propctrlr/propcontroller.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 16fedd434cad..50a6ed66bd65 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -56,7 +56,7 @@ #include <comphelper/property.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <cppuhelper/component_context.hxx> #include <cppuhelper/exc_hlp.hxx> |