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 | |
parent | merge vosremoval-reference.diff (diff) | |
download | core-c17635d5752c010405efba458cfb3a98f5afaf75.tar.gz core-c17635d5752c010405efba458cfb3a98f5afaf75.zip |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'framework')
41 files changed, 57 insertions, 66 deletions
diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx index f8cf02eebdfb..cebdb1ee7c50 100644 --- a/framework/inc/pch/precompiled_framework.hxx +++ b/framework/inc/pch/precompiled_framework.hxx @@ -487,7 +487,7 @@ #include "vcl/window.hxx" #include "vcl/wintypes.hxx" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "vos/process.hxx" #include "vos/thread.hxx" diff --git a/framework/inc/threadhelp/lockhelper.hxx b/framework/inc/threadhelp/lockhelper.hxx index 5677350b5349..5cbbbdae353d 100644 --- a/framework/inc/threadhelp/lockhelper.hxx +++ b/framework/inc/threadhelp/lockhelper.hxx @@ -45,8 +45,6 @@ // other includes //_________________________________________________________________________________________________________________ #include <osl/mutex.hxx> -#include <vos/mutex.hxx> - //_________________________________________________________________________________________________________________ // namespace //_________________________________________________________________________________________________________________ @@ -116,7 +114,7 @@ class LockHelper : public IMutex //------------------------------------------------------------------------------------------------------------- // ctor/dtor //------------------------------------------------------------------------------------------------------------- - LockHelper( ::vos::IMutex* pSolarMutex = NULL ); + LockHelper( ::osl::SolarMutex* pSolarMutex = NULL ); virtual ~LockHelper( ); //------------------------------------------------------------------------------------------------------------- @@ -137,7 +135,7 @@ class LockHelper : public IMutex //------------------------------------------------------------------------------------------------------------- // something else //------------------------------------------------------------------------------------------------------------- - static LockHelper& getGlobalLock ( ::vos::IMutex* pSolarMutex = NULL ); + static LockHelper& getGlobalLock ( ::osl::SolarMutex* pSolarMutex = NULL ); ::osl::Mutex& getShareableOslMutex( ); //------------------------------------------------------------------------------------------------------------- @@ -169,7 +167,7 @@ class LockHelper : public IMutex mutable FairRWLock* m_pFairRWLock ; mutable ::osl::Mutex* m_pOwnMutex ; - mutable ::vos::IMutex* m_pSolarMutex ; + mutable ::osl::SolarMutex* m_pSolarMutex ; mutable ::osl::Mutex* m_pShareableOslMutex ; mutable sal_Bool m_bDummySolarMutex ; }; diff --git a/framework/inc/threadhelp/threadhelpbase.hxx b/framework/inc/threadhelp/threadhelpbase.hxx index 499d6324d6ca..74c6b4d149ca 100644 --- a/framework/inc/threadhelp/threadhelpbase.hxx +++ b/framework/inc/threadhelp/threadhelpbase.hxx @@ -77,7 +77,7 @@ struct ThreadHelpBase // public methods //------------------------------------------------------------------------------------------------------------- public: - ThreadHelpBase( ::vos::IMutex* pSolarMutex = NULL ) + ThreadHelpBase( ::osl::SolarMutex* pSolarMutex = NULL ) : m_aLock( pSolarMutex ) { } diff --git a/framework/source/classes/fwkresid.cxx b/framework/source/classes/fwkresid.cxx index 74b8c50661ac..a5c701c7838a 100644 --- a/framework/source/classes/fwkresid.cxx +++ b/framework/source/classes/fwkresid.cxx @@ -31,7 +31,7 @@ #include "classes/fwkresid.hxx" #include <tools/string.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <rtl/strbuf.hxx> diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx index 9e06707eac2a..27a5485c4484 100644 --- a/framework/source/classes/fwlresid.cxx +++ b/framework/source/classes/fwlresid.cxx @@ -31,7 +31,7 @@ #include "classes/fwlresid.hxx" #include <tools/string.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <rtl/strbuf.hxx> diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 1c86cdd421c3..2275a1d7eb82 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -73,7 +73,7 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <osl/file.hxx> #include <cppuhelper/implbase1.hxx> @@ -83,7 +83,6 @@ //_________________________________________________________________________________________________________________ using namespace ::cppu; -using namespace ::vos; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; using namespace ::com::sun::star::beans; diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 693bda1e07df..38546c1640d3 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -55,7 +55,7 @@ #include <vcl/window.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <unotools/moduleoptions.hxx> //_______________________________________________ diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index 6ae5f86c5ed0..e76c11ecf8da 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -59,7 +59,7 @@ #include <vcl/svapp.hxx> #include <tools/resmgr.hxx> #include <tools/rcid.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <rtl/logfile.hxx> @@ -84,10 +84,7 @@ using namespace ::com::sun::star::lang ; using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::util ; using namespace ::cppu ; -using namespace ::osl ; -using namespace ::rtl ; -using namespace ::vos ; - + using ::rtl::OUString; //_________________________________________________________________________________________________________________ // non exported const //_________________________________________________________________________________________________________________ diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx index d5bf9e513b7a..96c57d78c3fe 100644 --- a/framework/source/dispatch/popupmenudispatcher.cxx +++ b/framework/source/dispatch/popupmenudispatcher.cxx @@ -58,7 +58,7 @@ //_________________________________________________________________________________________________________________ #include <ucbhelper/content.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> @@ -79,7 +79,6 @@ using namespace ::com::sun::star::util ; using namespace ::cppu ; using namespace ::osl ; using namespace ::rtl ; -using namespace ::vos ; //_________________________________________________________________________________________________________________ // non exported const diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index c2f4c584c981..d5b6a9d287d0 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -57,7 +57,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <vcl/window.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <unotools/moduleoptions.hxx> //_______________________________________________ diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx index 7138f2656cc8..1df848ad358f 100644 --- a/framework/source/dispatch/windowcommanddispatch.cxx +++ b/framework/source/dispatch/windowcommanddispatch.cxx @@ -51,7 +51,7 @@ #include <vcl/window.hxx> #include <vcl/svapp.hxx> #include <vcl/cmdevt.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <rtl/logfile.hxx> 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 diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index 0741a35d2018..d283d75f73ab 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/framework/source/inc/pattern/window.hxx @@ -46,7 +46,7 @@ #include <vcl/syswin.hxx> #include <vcl/wrkwin.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <rtl/ustring.hxx> //_______________________________________________ diff --git a/framework/source/threadhelp/lockhelper.cxx b/framework/source/threadhelp/lockhelper.cxx index 25268bc514d0..49bb0245f49b 100644 --- a/framework/source/threadhelp/lockhelper.cxx +++ b/framework/source/threadhelp/lockhelper.cxx @@ -37,6 +37,7 @@ #include <macros/debug.hxx> #include <macros/generic.hxx> +#include "vcl/solarmutex.hxx" //_________________________________________________________________________________________________________________ // interface includes @@ -77,7 +78,7 @@ namespace framework{ @onerror - *//*-*************************************************************************************************************/ -LockHelper::LockHelper( ::vos::IMutex* pSolarMutex ) +LockHelper::LockHelper( ::osl::SolarMutex* pSolarMutex ) : m_pFairRWLock ( NULL ) , m_pOwnMutex ( NULL ) , m_pSolarMutex ( NULL ) @@ -93,17 +94,17 @@ LockHelper::LockHelper( ::vos::IMutex* pSolarMutex ) } break; case E_SOLARMUTEX : { - if( pSolarMutex == NULL ) - { - m_pSolarMutex = new ::vos::OMutex; - m_bDummySolarMutex = sal_True; - } - else - { - m_pSolarMutex = pSolarMutex; - } - } - break; + if( pSolarMutex == NULL ) + { + m_pSolarMutex = new ::vcl::SolarMutexObject; + m_bDummySolarMutex = sal_True; + } + else + { + m_pSolarMutex = pSolarMutex; + } + } + break; case E_FAIRRWLOCK : { m_pFairRWLock = new FairRWLock; } @@ -148,7 +149,7 @@ LockHelper::~LockHelper() { if (m_bDummySolarMutex) { - delete static_cast<vos::OMutex*>(m_pSolarMutex); + delete static_cast<vcl::SolarMutexObject*>(m_pSolarMutex); m_bDummySolarMutex = sal_False; } m_pSolarMutex = NULL; @@ -433,7 +434,7 @@ void LockHelper::downgradeWriteAccess() @onerror No error should occure. *//*-*************************************************************************************************************/ -LockHelper& LockHelper::getGlobalLock( ::vos::IMutex* pSolarMutex ) +LockHelper& LockHelper::getGlobalLock( ::osl::SolarMutex* pSolarMutex ) { // Initialize static "member" only for one time! // Algorithm: diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx index 54191bef7787..c57eb210b4fc 100644 --- a/framework/source/uielement/buttontoolbarcontroller.cxx +++ b/framework/source/uielement/buttontoolbarcontroller.cxx @@ -53,7 +53,7 @@ //_________________________________________________________________________________________________________________ #include <rtl/uri.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <comphelper/processfactory.hxx> #include <unotools/ucbstreamhelper.hxx> #include <tools/urlobj.hxx> diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index 6288e157030c..47300348d993 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -53,7 +53,7 @@ // other includes //_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/mnemonic.hxx> #include <vcl/toolbox.hxx> diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 320b68bd1970..2448f2004f98 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -53,7 +53,7 @@ // other includes //_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/mnemonic.hxx> #include <tools/urlobj.hxx> diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 2139ebef9165..7cf66b62405a 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -63,7 +63,7 @@ #include <vcl/image.hxx> #include <svtools/menuoptions.hxx> #include <dispatch/uieventloghelper.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> // Copied from svx // Function-Id's diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index 8ac988114332..cb1fa6cc9e4e 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -52,7 +52,7 @@ // other includes //_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/mnemonic.hxx> #include <tools/urlobj.hxx> diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index b52ce4f4aba0..2b9a6b811467 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -52,7 +52,7 @@ // other includes //_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/mnemonic.hxx> #include <tools/urlobj.hxx> diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index b593cf453b08..3ef69ce99276 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -56,7 +56,7 @@ #include <rtl/ustrbuf.hxx> #include <vcl/mnemonic.hxx> #include <dispatch/uieventloghelper.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> //_________________________________________________________________________________________________________________ // Defines diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index abc6f9157a79..955b909891cd 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -57,7 +57,7 @@ #include <vcl/print.hxx> #include <svtools/ctrltool.hxx> #include <dispatch/uieventloghelper.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> //_________________________________________________________________________________________________________________ // Defines diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 1fc728e419d6..42f1acbb4ac0 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -52,7 +52,7 @@ // other includes //_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/mnemonic.hxx> #include <tools/urlobj.hxx> diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index 9e4abf317472..642dcf3cd5fb 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -60,7 +60,7 @@ #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> #include <dispatch/uieventloghelper.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> //_________________________________________________________________________________________________________________ // Defines diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index 4bd53d6d2436..fc99b77451c6 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -53,7 +53,7 @@ //_________________________________________________________________________________________________________________ #include <rtl/uri.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <comphelper/processfactory.hxx> #include <unotools/ucbstreamhelper.hxx> #include <tools/urlobj.hxx> diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index 2b68790a46d0..ec7f306cce03 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -72,7 +72,7 @@ #include <dispatch/uieventloghelper.hxx> #include "helper/mischelper.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <map> #include <set> diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index 50b2f44c97c9..a668d4890986 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -33,7 +33,7 @@ #include <classes/fwkresid.hxx> #include <services.h> #include <classes/resource.hrc> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/status.hxx> diff --git a/framework/source/uielement/logoimagestatusbarcontroller.cxx b/framework/source/uielement/logoimagestatusbarcontroller.cxx index a4ba634c307d..6b20e717c457 100644 --- a/framework/source/uielement/logoimagestatusbarcontroller.cxx +++ b/framework/source/uielement/logoimagestatusbarcontroller.cxx @@ -32,7 +32,7 @@ #include <classes/fwlresid.hxx> #include <services.h> #include <classes/resource.hrc> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/status.hxx> diff --git a/framework/source/uielement/logotextstatusbarcontroller.cxx b/framework/source/uielement/logotextstatusbarcontroller.cxx index 6ae22de22474..f332c458a6e7 100644 --- a/framework/source/uielement/logotextstatusbarcontroller.cxx +++ b/framework/source/uielement/logotextstatusbarcontroller.cxx @@ -32,7 +32,7 @@ #include <classes/fwlresid.hxx> #include <services.h> #include <classes/resource.hrc> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/status.hxx> diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index 6a8ab3f1c3f1..83ed615f1d80 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -49,7 +49,7 @@ #include <rtl/ustrbuf.hxx> #include <dispatch/uieventloghelper.hxx> #include "helper/mischelper.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 6e6e72aad362..d6a6c0473656 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -87,7 +87,7 @@ #include <tools/urlobj.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <osl/file.hxx> #include <cppuhelper/implbase1.hxx> @@ -113,7 +113,6 @@ struct SystemMenuData //_________________________________________________________________________________________________________________ using namespace ::cppu; -using namespace ::vos; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index c5d09e12584e..a89daf163cf2 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -66,7 +66,7 @@ #include <svtools/acceleratorexecute.hxx> #include <unotools/moduleoptions.hxx> #include <dispatch/uieventloghelper.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> //_________________________________________________________________________________________________________________ // Defines diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx index 2668c0cdf288..ebe99722af25 100644 --- a/framework/source/uielement/objectmenucontroller.cxx +++ b/framework/source/uielement/objectmenucontroller.cxx @@ -56,7 +56,7 @@ #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> #include <dispatch/uieventloghelper.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> //_________________________________________________________________________________________________________________ // Defines diff --git a/framework/source/uielement/popupmenucontroller.cxx b/framework/source/uielement/popupmenucontroller.cxx index 0eb398000eef..31308e9a7df1 100644 --- a/framework/source/uielement/popupmenucontroller.cxx +++ b/framework/source/uielement/popupmenucontroller.cxx @@ -39,7 +39,7 @@ #include <vcl/toolbox.hxx> #include <vcl/menu.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include "uielement/popupmenucontroller.hxx" #include "services.h" diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index d0ce26a9f330..78186f94aac8 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -64,7 +64,7 @@ #include <odma_lib.hxx> #endif #include <dispatch/uieventloghelper.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> //_________________________________________________________________________________________________________________ // Defines diff --git a/framework/source/uielement/simpletextstatusbarcontroller.cxx b/framework/source/uielement/simpletextstatusbarcontroller.cxx index fe9be5614e84..df968765a6e6 100644 --- a/framework/source/uielement/simpletextstatusbarcontroller.cxx +++ b/framework/source/uielement/simpletextstatusbarcontroller.cxx @@ -32,7 +32,7 @@ #include <classes/fwkresid.hxx> #include <services.h> #include <classes/resource.hrc> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/status.hxx> diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index 0cf4455fe697..32c1fbb0777e 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -55,7 +55,7 @@ // other includes //_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/mnemonic.hxx> #include <tools/urlobj.hxx> diff --git a/framework/source/uielement/statusindicatorinterfacewrapper.cxx b/framework/source/uielement/statusindicatorinterfacewrapper.cxx index 521b9e5a312f..28bc86fb49b5 100644 --- a/framework/source/uielement/statusindicatorinterfacewrapper.cxx +++ b/framework/source/uielement/statusindicatorinterfacewrapper.cxx @@ -41,7 +41,7 @@ //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> using namespace cppu; using namespace com::sun::star::uno; diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx index 6dc632bbf8d3..e15a63c20f74 100644 --- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx @@ -53,7 +53,7 @@ //_________________________________________________________________________________________________________________ #include <rtl/uri.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <comphelper/processfactory.hxx> #include <unotools/ucbstreamhelper.hxx> #include <tools/urlobj.hxx> |