diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:15:49 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:29 -0500 |
commit | 46308b84ddc46d8f99e6b3416636e6286d23d7e3 (patch) | |
tree | 97d55ea961f775677ed95cb94be5aadbc9bcc680 /forms/source | |
parent | merge vosremoval-reference.diff (diff) | |
download | core-46308b84ddc46d8f99e6b3416636e6286d23d7e3.tar.gz core-46308b84ddc46d8f99e6b3416636e6286d23d7e3.zip |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'forms/source')
-rw-r--r-- | forms/source/component/Button.cxx | 2 | ||||
-rw-r--r-- | forms/source/component/DatabaseForm.cxx | 2 | ||||
-rw-r--r-- | forms/source/component/FormattedField.cxx | 2 | ||||
-rw-r--r-- | forms/source/component/ImageButton.cxx | 2 | ||||
-rw-r--r-- | forms/source/component/clickableimage.cxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/richtextcontrol.cxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/richtextengine.cxx | 2 | ||||
-rw-r--r-- | forms/source/runtime/formoperations.cxx | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index 1dd34d151fe1..da060f997052 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -39,7 +39,7 @@ #include <tools/debug.hxx> #include <tools/urlobj.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> //......................................................................... namespace frm diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index fccd544d99f6..248fbb44c0b9 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -90,7 +90,7 @@ #include <unotools/ucbstreamhelper.hxx> #include <vcl/svapp.hxx> #include <vcl/timer.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <ctype.h> #include <hash_map> diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index d7e075826209..8bafb3f893b4 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -60,7 +60,7 @@ #include <com/sun/star/util/XNumberFormatTypes.hpp> #include <com/sun/star/form/XForm.hpp> #include <com/sun/star/container/XIndexAccess.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> // needed as long as we use the SolarMutex #include <comphelper/streamsection.hxx> #include <cppuhelper/weakref.hxx> diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx index c0f2c87b2a64..926ed5c57e55 100644 --- a/forms/source/component/ImageButton.cxx +++ b/forms/source/component/ImageButton.cxx @@ -32,7 +32,7 @@ #include <tools/debug.hxx> #include <tools/urlobj.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <comphelper/basicio.hxx> #include <com/sun/star/awt/MouseButton.hpp> diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index 2619c4e094b8..2c62e7960f69 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -47,7 +47,7 @@ #include <vcl/svapp.hxx> #include <sfx2/docfile.hxx> #include <sfx2/objsh.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include "services.hxx" #include <comphelper/container.hxx> #include <comphelper/listenernotification.hxx> diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 266225310ee8..9d738c49be72 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -375,7 +375,7 @@ namespace frm void ORichTextPeer::dispose( ) throw(RuntimeException) { { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); RichTextControl* pRichTextControl = static_cast< RichTextControl* >( GetWindow() ); if ( pRichTextControl ) diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx index 4e251ec53115..a627c6d0e4e3 100644 --- a/forms/source/richtext/richtextengine.cxx +++ b/forms/source/richtext/richtextengine.cxx @@ -44,7 +44,7 @@ #include <vcl/outdev.hxx> #include <unotools/lingucfg.hxx> #include <svl/undo.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <algorithm> #include <functional> diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index 78190b19ae7a..601af810779b 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -68,7 +68,7 @@ #include <comphelper/property.hxx> #include <comphelper/namedvaluecollection.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <sal/macros.h> //-------------------------------------------------------------------------- |