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/slideshow | |
| 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/slideshow')
| -rw-r--r-- | sd/source/ui/slideshow/slideshow.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/slideshow/slideshowviewimpl.cxx | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 5b2fd3aa9936..e9ebe9715fac 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -39,7 +39,7 @@ #include <cppuhelper/bootstrap.hxx> #include <comphelper/processfactory.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> @@ -70,7 +70,6 @@ using ::rtl::OUString; using ::com::sun::star::awt::XWindow; using namespace ::sd; using namespace ::cppu; -using namespace ::vos; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::presentation; diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index 30f3ac1dcdbd..62d0097e0353 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -30,7 +30,7 @@ #include "precompiled_sd.hxx" #include <slideshowviewimpl.hxx> #include <slideshowimpl.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <com/sun/star/beans/XPropertySet.hpp> |