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 | 1979ac8a7c2ae9be2fa1b75450f2428b3bf0ef75 (patch) | |
tree | 127c4b92c30f6dcf21b8a121b66a1fdf21a8f9a9 /editeng | |
parent | 4ec839be778e5541c09b0f1a6e3b707ca29bae6d (diff) |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/inc/pch/precompiled_editeng.hxx | 2 | ||||
-rw-r--r-- | editeng/source/accessibility/AccessibleContextBase.cxx | 2 | ||||
-rw-r--r-- | editeng/source/accessibility/AccessibleEditableTextPara.cxx | 2 | ||||
-rw-r--r-- | editeng/source/accessibility/AccessibleImageBullet.cxx | 2 | ||||
-rw-r--r-- | editeng/source/accessibility/AccessibleStaticTextBase.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/eeobj.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.cxx | 2 | ||||
-rw-r--r-- | editeng/source/uno/UnoForbiddenCharsTable.cxx | 2 | ||||
-rw-r--r-- | editeng/source/uno/unoedprx.cxx | 2 | ||||
-rw-r--r-- | editeng/source/uno/unofield.cxx | 3 | ||||
-rw-r--r-- | editeng/source/uno/unonrule.cxx | 3 | ||||
-rw-r--r-- | editeng/source/uno/unopracc.cxx | 2 | ||||
-rw-r--r-- | editeng/source/uno/unotext.cxx | 3 | ||||
-rw-r--r-- | editeng/source/uno/unotext2.cxx | 3 |
14 files changed, 14 insertions, 18 deletions
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx index d33419d809..d9c29b4e5c 100644 --- a/editeng/inc/pch/precompiled_editeng.hxx +++ b/editeng/inc/pch/precompiled_editeng.hxx @@ -877,7 +877,7 @@ #include "vcl/unohelp2.hxx" #include "vcl/wall.hxx" #include "vcl/wintypes.hxx" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "vos/thread.hxx" #include "vos/xception.hxx" #include "xmloff/DashStyle.hxx" diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx index a3c7b63cb4..695ec888f3 100644 --- a/editeng/source/accessibility/AccessibleContextBase.cxx +++ b/editeng/source/accessibility/AccessibleContextBase.cxx @@ -42,7 +42,7 @@ #include <unotools/accessiblerelationsethelper.hxx> #include <comphelper/accessibleeventnotifier.hxx> #include <rtl/uuid.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <utility> diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index ab0dff3f03..727b994f2c 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -38,7 +38,7 @@ #include <limits.h> #include <vector> #include <algorithm> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/window.hxx> #include <vcl/svapp.hxx> #include <editeng/flditem.hxx> diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index a5846b6adf..3d65307c4c 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_editeng.hxx" #include <tools/gen.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/awt/Point.hpp> diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx index 7d362a8867..ad35aab519 100644 --- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx +++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx @@ -39,7 +39,7 @@ #include <vector> #include <algorithm> #include <boost/bind.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/window.hxx> #include <vcl/svapp.hxx> #include <comphelper/sequenceasvector.hxx> diff --git a/editeng/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx index db7387ae4f..34d5959709 100644 --- a/editeng/source/editeng/eeobj.cxx +++ b/editeng/source/editeng/eeobj.cxx @@ -37,7 +37,7 @@ #include <sot/formats.hxx> #include <editeng/editeng.hxx> #include <svl/itempool.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> using namespace ::com::sun::star; diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 8777efced4..bfb199d7ce 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -47,7 +47,7 @@ #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <editeng/flditem.hxx> #include <svl/intitem.hxx> #include <svtools/transfer.hxx> diff --git a/editeng/source/uno/UnoForbiddenCharsTable.cxx b/editeng/source/uno/UnoForbiddenCharsTable.cxx index 59a8831630..5d3c3b468f 100644 --- a/editeng/source/uno/UnoForbiddenCharsTable.cxx +++ b/editeng/source/uno/UnoForbiddenCharsTable.cxx @@ -30,7 +30,7 @@ #include "precompiled_editeng.hxx" #include <editeng/UnoForbiddenCharsTable.hxx> #include <editeng/forbiddencharacterstable.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <editeng/unolingu.hxx> // LocalToLanguage, LanguageToLocale diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx index 395d1d6e75..23f9878ecc 100644 --- a/editeng/source/uno/unoedprx.cxx +++ b/editeng/source/uno/unoedprx.cxx @@ -38,7 +38,7 @@ #include <limits.h> #include <vector> #include <algorithm> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/window.hxx> #include <vcl/svapp.hxx> #include <com/sun/star/uno/Any.hxx> diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index 41cbc848ba..6a00140341 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <rtl/uuid.h> #include <rtl/memory.h> @@ -46,7 +46,6 @@ #include <comphelper/serviceinfohelper.hxx> using namespace ::rtl; -using namespace ::vos; using namespace ::cppu; using namespace ::com::sun::star; diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index 06f3dd5bd3..a9c5dd6f6d 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -35,7 +35,7 @@ #include <com/sun/star/awt/XBitmap.hpp> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/graph.hxx> #include <svtools/grfmgr.hxx> #include <toolkit/unohlp.hxx> @@ -57,7 +57,6 @@ using ::com::sun::star::util::XCloneable; using ::com::sun::star::ucb::XAnyCompare; -using namespace ::vos; using namespace ::std; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/editeng/source/uno/unopracc.cxx b/editeng/source/uno/unopracc.cxx index 3e7a997d8f..759c8c686d 100644 --- a/editeng/source/uno/unopracc.cxx +++ b/editeng/source/uno/unopracc.cxx @@ -34,7 +34,7 @@ // Global header // //------------------------------------------------------------------------ -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> #include <cppuhelper/weakref.hxx> diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 8d756288bf..d0bf0b206b 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/text/ControlCharacter.hpp> #include <com/sun/star/text/ControlCharacter.hpp> #include <com/sun/star/text/XTextField.hdl> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <svl/itemset.hxx> #include <svl/itempool.hxx> #include <svl/intitem.hxx> @@ -57,7 +57,6 @@ #include <comphelper/serviceinfohelper.hxx> using namespace ::rtl; -using namespace ::vos; using namespace ::cppu; using namespace ::com::sun::star; diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx index 687a499f22..ced114204b 100644 --- a/editeng/source/uno/unotext2.cxx +++ b/editeng/source/uno/unotext2.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_editeng.hxx" #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #define _SVSTDARR_USHORTS #include <svl/svstdarr.hxx> @@ -44,7 +44,6 @@ #include <comphelper/serviceinfohelper.hxx> using namespace ::rtl; -using namespace ::vos; using namespace ::cppu; using namespace ::com::sun::star; |