diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:18:35 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:33 -0500 |
| commit | c17635d5752c010405efba458cfb3a98f5afaf75 (patch) | |
| tree | f8c521b54c3c65cbcbcad293f63cfa81113f480f /framework/source/helper | |
| parent | d3756b8b7318ecae4eaf0552aea3cde940e91490 (diff) | |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'framework/source/helper')
| -rw-r--r-- | framework/source/helper/actiontriggerhelper.cxx | 3 | ||||
| -rw-r--r-- | framework/source/helper/propertysetcontainer.cxx | 1 | ||||
| -rw-r--r-- | framework/source/helper/statusindicatorfactory.cxx | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/framework/source/helper/actiontriggerhelper.cxx b/framework/source/helper/actiontriggerhelper.cxx index 1827e6d6d99b..3506e0590af9 100644 --- a/framework/source/helper/actiontriggerhelper.cxx +++ b/framework/source/helper/actiontriggerhelper.cxx @@ -37,7 +37,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/XBitmap.hpp> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/stream.hxx> #include <cppuhelper/weak.hxx> #include <comphelper/processfactory.hxx> @@ -46,7 +46,6 @@ const USHORT START_ITEMID = 1000; using namespace rtl; -using namespace vos; using namespace com::sun::star::awt; using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/framework/source/helper/propertysetcontainer.cxx b/framework/source/helper/propertysetcontainer.cxx index f2ddda2c085f..a21a634a9106 100644 --- a/framework/source/helper/propertysetcontainer.cxx +++ b/framework/source/helper/propertysetcontainer.cxx @@ -36,7 +36,6 @@ #define WRONG_TYPE_EXCEPTION "Only XPropertSet allowed!" using namespace rtl; -using namespace vos; using namespace cppu; using namespace com::sun::star::uno; using namespace com::sun::star::container; diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index c063fd34241b..2e595386f8a3 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -63,7 +63,7 @@ #include <comphelper/mediadescriptor.hxx> #include <comphelper/configurationhelper.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> //----------------------------------------------- // namespace |