diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:20:00 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:38 -0500 |
| commit | d88b292704957818eff9a348a524b5c90b40031b (patch) | |
| tree | eabf039491304b2c13f3bd77ca0b6d58c3dba1b8 /svtools/source/control/valueimp.hxx | |
| parent | merge vosremoval-reference.diff (diff) | |
| download | core-d88b292704957818eff9a348a524b5c90b40031b.tar.gz core-d88b292704957818eff9a348a524b5c90b40031b.zip | |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'svtools/source/control/valueimp.hxx')
| -rw-r--r-- | svtools/source/control/valueimp.hxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index 93aacf9245f5..1c2d1812f8ad 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -26,7 +26,7 @@ * ************************************************************************/ -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/list.hxx> #include <tools/color.hxx> #include <tools/string.hxx> @@ -204,7 +204,6 @@ public: virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException ); private: - // ::vos::OMutex maMutex; ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener > > mxEventListeners; ValueSet* mpParent; @@ -273,7 +272,7 @@ private: ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener > > mxEventListeners; - ::vos::OMutex maMutex; + ::osl::Mutex maMutex; ValueSetItem* mpParent; bool mbIsTransientChildrenDisabled; |