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/core/stlfamily.cxx | |
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/core/stlfamily.cxx')
-rw-r--r-- | sd/source/core/stlfamily.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx index cff63b525919..bd1e389cf5df 100644 --- a/sd/source/core/stlfamily.cxx +++ b/sd/source/core/stlfamily.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/lang/IllegalAccessException.hpp> #include <comphelper/serviceinfohelper.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <svl/style.hxx> @@ -51,7 +51,6 @@ #include <map> using ::rtl::OUString; -using namespace ::vos; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; |