diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:17:28 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 17:58:18 -0500 |
commit | d7fbd4ebf9823ee0af4bcf6a12b5ac1ef64b8606 (patch) | |
tree | 42849dbc65195d9ada71e27999cecb6875b9112a /sd/source/ui/framework/configuration | |
parent | be0c9d802186671420b6ea6bcc654f66e49d3e2c (diff) |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'sd/source/ui/framework/configuration')
-rw-r--r-- | sd/source/ui/framework/configuration/ConfigurationController.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index b84b3ac0f098..10d7a1aa00e7 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -47,7 +47,7 @@ #include <com/sun/star/util/XURLTransformer.hpp> #include <comphelper/stl_types.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> using namespace ::com::sun::star; |