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 | 2f96b518e55c21fae22eebdba7e02545a9ab1ea9 (patch) | |
| tree | 8081fe09765bbad709198d78600c225817dde6e9 /sd/source/core/TransitionPreset.cxx | |
| parent | 245090f4b2b7982b412f99a7e4da1383d9729f8a (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/TransitionPreset.cxx')
| -rw-r--r-- | sd/source/core/TransitionPreset.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx index f942b4f28..b567d438b 100644 --- a/sd/source/core/TransitionPreset.cxx +++ b/sd/source/core/TransitionPreset.cxx @@ -37,7 +37,7 @@ #include <com/sun/star/util/XMacroExpander.hpp> #include <com/sun/star/animations/AnimationNodeType.hpp> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/urlobj.hxx> #include <unotools/streamwrap.hxx> #include <comphelper/processfactory.hxx> @@ -54,7 +54,6 @@ #include "sdpage.hxx" -using namespace ::vos; using namespace ::com::sun::star; using namespace ::com::sun::star::animations; |