diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:17:28 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 17:58:18 -0500 |
commit | d7fbd4ebf9823ee0af4bcf6a12b5ac1ef64b8606 (patch) | |
tree | 42849dbc65195d9ada71e27999cecb6875b9112a /sd/source/ui | |
parent | be0c9d802186671420b6ea6bcc654f66e49d3e2c (diff) |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'sd/source/ui')
38 files changed, 114 insertions, 125 deletions
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 7576e00f9e17..e748724054ab 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -61,7 +61,7 @@ #include "accessibility.hrc" #include "sdresid.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> using ::rtl::OUString; using namespace ::com::sun::star; diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx index f6f94445d4a3..de9bd6f0a74d 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx @@ -60,7 +60,7 @@ #include "accessibility.hrc" #include "sdresid.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; diff --git a/sd/source/ui/accessibility/AccessibleScrollPanel.cxx b/sd/source/ui/accessibility/AccessibleScrollPanel.cxx index 2e8f3fa20cdc..a8087118cecc 100644 --- a/sd/source/ui/accessibility/AccessibleScrollPanel.cxx +++ b/sd/source/ui/accessibility/AccessibleScrollPanel.cxx @@ -37,7 +37,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <unotools/accessiblestatesethelper.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> using ::rtl::OUString; diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index b0207b1d70df..3fd510215cdb 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -32,7 +32,7 @@ #include <com/sun/star/embed/XEmbedPersist.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/tempfile.hxx> #include <editeng/eeitem.hxx> diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 9affc3b57a87..cf7bbf6d44e5 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -40,7 +40,7 @@ #include <memory> #include <boost/scoped_ptr.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index 511e4aaa478c..78bc6eb08766 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -35,7 +35,7 @@ #include <comphelper/documentconstants.hxx> #include <tools/debug.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <com/sun/star/frame/XDocumentTemplates.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 71d09caba9e0..5ef9531f1a07 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -34,7 +34,7 @@ #endif #include <com/sun/star/presentation/ClickAction.hpp> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/msgbox.hxx> #include <vcl/lstbox.hxx> #include <vcl/combobox.hxx> diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index a7cf56fbab7a..3d49fe26dd24 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -45,7 +45,7 @@ #include <sal/types.h> #include <tools/urlobj.hxx> #include <osl/thread.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <sfx2/filedlghelper.hxx> #include <avmedia/mediawindow.hxx> diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index b84b3ac0f098..10d7a1aa00e7 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -47,7 +47,7 @@ #include <com/sun/star/util/XURLTransformer.hpp> #include <comphelper/stl_types.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> using namespace ::com::sun::star; diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index a9eca8b47215..aef8527a0429 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -32,7 +32,7 @@ #include <rtl/uuid.h> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/window.hxx> #include <cppcanvas/vclfactory.hxx> diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index a7ec6b818c50..465e2b3640d8 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -42,7 +42,7 @@ #include <comphelper/sequence.hxx> #include <cppuhelper/typeprovider.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/diagnose_ex.h> diff --git a/sd/source/ui/notes/EditWindow.cxx b/sd/source/ui/notes/EditWindow.cxx index a37ddb0b8ec7..0390b244e56d 100644 --- a/sd/source/ui/notes/EditWindow.cxx +++ b/sd/source/ui/notes/EditWindow.cxx @@ -41,7 +41,7 @@ #include "sdresid.hxx" #include <svl/itempool.hxx> #include <editeng/fhgtitem.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <unotools/linguprops.hxx> #include <unotools/lingucfg.hxx> diff --git a/sd/source/ui/notes/TextLogger.cxx b/sd/source/ui/notes/TextLogger.cxx index da8bc462b570..ffcd743accbc 100644 --- a/sd/source/ui/notes/TextLogger.cxx +++ b/sd/source/ui/notes/TextLogger.cxx @@ -32,7 +32,7 @@ #include "TextLogger.hxx" #include "EditWindow.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> namespace sd { namespace notes { diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx index ecc33d0ee83e..dbd43cbbab5b 100644 --- a/sd/source/ui/presenter/SlideRenderer.cxx +++ b/sd/source/ui/presenter/SlideRenderer.cxx @@ -31,7 +31,7 @@ #include "SlideRenderer.hxx" #include "sdpage.hxx" #include <toolkit/helper/vclunohelper.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <cppcanvas/vclfactory.hxx> diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 5b2fd3aa9936..e9ebe9715fac 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -39,7 +39,7 @@ #include <cppuhelper/bootstrap.hxx> #include <comphelper/processfactory.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> @@ -70,7 +70,6 @@ using ::rtl::OUString; using ::com::sun::star::awt::XWindow; using namespace ::sd; using namespace ::cppu; -using namespace ::vos; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::presentation; diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index 30f3ac1dcdbd..62d0097e0353 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -30,7 +30,7 @@ #include "precompiled_sd.hxx" #include <slideshowviewimpl.hxx> #include <slideshowimpl.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx index 3da2d66cb709..092c69fcd08f 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx @@ -30,7 +30,7 @@ #include "precompiled_sd.hxx" #include "SlsCacheConfiguration.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <comphelper/processfactory.hxx> diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index ce5539aad8b4..662ba4293c95 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -78,7 +78,7 @@ #include <vcl/msgbox.hxx> #include <tools/urlobj.hxx> #include <rtl/ustring.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> namespace sd { namespace slidesorter { namespace controller { diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index f5bb343270f8..e24da73862e1 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -39,7 +39,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <cppuhelper/proptypehlp.hxx> diff --git a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx index 9aaa29633185..6099e46c4c5e 100644 --- a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx +++ b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx @@ -32,7 +32,7 @@ #include "TaskPaneFocusManager.hxx" #include <vcl/window.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/event.hxx> #include <hash_map> diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx index 59c860dbf37f..fd690a364aba 100644 --- a/sd/source/ui/toolpanel/TitleBar.cxx +++ b/sd/source/ui/toolpanel/TitleBar.cxx @@ -37,7 +37,7 @@ #include <vcl/decoview.hxx> #include <vcl/window.hxx> #include <vcl/virdev.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include "sdresid.hxx" #include <vcl/bitmap.hxx> diff --git a/sd/source/ui/toolpanel/ToolPanelFactory.cxx b/sd/source/ui/toolpanel/ToolPanelFactory.cxx index ce758467e36e..42c68083057c 100644 --- a/sd/source/ui/toolpanel/ToolPanelFactory.cxx +++ b/sd/source/ui/toolpanel/ToolPanelFactory.cxx @@ -44,7 +44,7 @@ #include <sfx2/frame.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <sfx2/viewfrm.hxx> #include <cppuhelper/implbase3.hxx> #include <comphelper/namedvaluecollection.hxx> diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 0f7a5fe95cf3..5e9d15f867bd 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -54,14 +54,13 @@ #include "slideshow.hxx" #include <svx/fmshell.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <boost/shared_ptr.hpp> using namespace ::std; using ::rtl::OUString; using namespace ::cppu; -using namespace ::vos; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx index 7e7e716f6446..28ee0e1cd5ca 100644 --- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx +++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx @@ -40,11 +40,10 @@ #include <cppuhelper/proptypehlp.hxx> #include <svx/unopage.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> using ::rtl::OUString; -using namespace ::vos; using namespace ::cppu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index 94f200585e57..ef466220fe88 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -41,7 +41,7 @@ #include <svx/xtable.hxx> #include <osl/diagnose.h> #include <osl/mutex.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include "drawdoc.hxx" @@ -71,7 +71,6 @@ using namespace ::comphelper; using namespace ::osl; using ::rtl::OUString; using namespace ::cppu; -using namespace ::vos; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; @@ -236,7 +235,7 @@ DocumentSettings::~DocumentSettings() throw() void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, const Any* pValues ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException ) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; SdDrawDocument* pDoc = mpModel->GetDoc(); ::sd::DrawDocShell* pDocSh = mpModel->GetDocShell(); @@ -881,7 +880,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c void DocumentSettings::_getPropertyValues( const PropertyMapEntry** ppEntries, Any* pValue ) throw(UnknownPropertyException, WrappedTargetException ) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; SdDrawDocument* pDoc = mpModel->GetDoc(); ::sd::DrawDocShell* pDocSh = mpModel->GetDocShell(); diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index af0126afa4e4..9d9fda79de96 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -59,7 +59,7 @@ #include <svl/eitem.hxx> #include <svl/stritem.hxx> #include <tools/urlobj.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> #include <sot/storinfo.hxx> diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx index 873a5ecca545..e60c36c10cbb 100644 --- a/sd/source/ui/unoidl/unocpres.cxx +++ b/sd/source/ui/unoidl/unocpres.cxx @@ -30,7 +30,7 @@ #include "precompiled_sd.hxx" #include <com/sun/star/lang/DisposedException.hpp> #include <osl/mutex.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <svx/svdpage.hxx> #include <comphelper/extract.hxx> @@ -44,7 +44,6 @@ #include "unopage.hxx" using namespace ::rtl; -using namespace ::vos; using namespace ::com::sun::star; diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx index 4613a16a5613..dd2102ffb2cf 100644 --- a/sd/source/ui/unoidl/unodoc.cxx +++ b/sd/source/ui/unoidl/unodoc.cxx @@ -39,7 +39,7 @@ #include "sdmod.hxx" #include "DrawDocShell.hxx" #include "GraphicDocShell.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> using namespace ::com::sun::star; diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index 52b69a5c0877..71feca60efe8 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -32,7 +32,7 @@ #include "unolayer.hxx" #include <osl/mutex.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <svx/svdpagv.hxx> #include <svx/unoshape.hxx> @@ -65,7 +65,6 @@ #include <vcl/svapp.hxx> using namespace ::rtl; -using namespace ::vos; using namespace ::com::sun::star; //============================================================================= diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 91a541309fef..e0a5bc560790 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -63,7 +63,7 @@ #include <svx/unopool.hxx> #include <svx/svdorect.hxx> #include <editeng/flditem.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <toolkit/awt/vclxdevice.hxx> #include <svx/svdpool.hxx> #include <editeng/unolingu.hxx> @@ -119,7 +119,6 @@ using ::rtl::OUString; #include <drawinglayer/primitive2d/structuretagprimitive2d.hxx> using namespace ::osl; -using namespace ::vos; using namespace ::cppu; using namespace ::com::sun::star; @@ -392,7 +391,7 @@ sal_Int64 SAL_CALL SdXImpressDocument::getSomething( const ::com::sun::star::uno // XTypeProvider uno::Sequence< uno::Type > SAL_CALL SdXImpressDocument::getTypes( ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( maTypeSequence.getLength() == 0 ) { @@ -432,7 +431,7 @@ uno::Sequence< uno::Type > SAL_CALL SdXImpressDocument::getTypes( ) throw(uno:: uno::Sequence< sal_Int8 > SAL_CALL SdXImpressDocument::getImplementationId( ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; static uno::Sequence< sal_Int8 > aId; if( aId.getLength() == 0 ) @@ -618,7 +617,7 @@ void SdXImpressDocument::SetModified( sal_Bool bModified /* = sal_True */ ) thro void SAL_CALL SdXImpressDocument ::lockControllers( ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpDoc ) throw lang::DisposedException(); @@ -629,7 +628,7 @@ void SAL_CALL SdXImpressDocument ::lockControllers( ) void SAL_CALL SdXImpressDocument::unlockControllers( ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpDoc ) throw lang::DisposedException(); @@ -643,7 +642,7 @@ void SAL_CALL SdXImpressDocument::unlockControllers( ) sal_Bool SAL_CALL SdXImpressDocument::hasControllersLocked( ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpDoc ) throw lang::DisposedException(); @@ -655,7 +654,7 @@ sal_Bool SAL_CALL SdXImpressDocument::hasControllersLocked( ) uno::Reference < container::XIndexAccess > SAL_CALL SdXImpressDocument::getViewData() throw( uno::RuntimeException ) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpDoc ) throw lang::DisposedException(); @@ -698,7 +697,7 @@ uno::Reference < container::XIndexAccess > SAL_CALL SdXImpressDocument::getViewD void SAL_CALL SdXImpressDocument::setViewData( const uno::Reference < container::XIndexAccess >& xData ) throw(::com::sun::star::uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpDoc ) throw lang::DisposedException(); @@ -747,7 +746,7 @@ void SAL_CALL SdXImpressDocument::setViewData( const uno::Reference < container: uno::Reference< drawing::XDrawPage > SAL_CALL SdXImpressDocument::duplicate( const uno::Reference< drawing::XDrawPage >& xPage ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpDoc ) throw lang::DisposedException(); @@ -776,7 +775,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdXImpressDocument::duplicate( con uno::Reference< drawing::XDrawPages > SAL_CALL SdXImpressDocument::getDrawPages() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpDoc ) throw lang::DisposedException(); @@ -796,7 +795,7 @@ uno::Reference< drawing::XDrawPages > SAL_CALL SdXImpressDocument::getDrawPages( uno::Reference< drawing::XDrawPages > SAL_CALL SdXImpressDocument::getMasterPages() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpDoc ) throw lang::DisposedException(); @@ -816,7 +815,7 @@ uno::Reference< drawing::XDrawPages > SAL_CALL SdXImpressDocument::getMasterPage uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getLayerManager( ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpDoc ) throw lang::DisposedException(); @@ -833,7 +832,7 @@ uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getLayerMa uno::Reference< container::XNameContainer > SAL_CALL SdXImpressDocument::getCustomPresentations() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpDoc ) throw lang::DisposedException(); @@ -852,7 +851,7 @@ extern uno::Reference< presentation::XPresentation > createPresentation( SdXImpr uno::Reference< presentation::XPresentation > SAL_CALL SdXImpressDocument::getPresentation() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpDoc ) throw lang::DisposedException(); @@ -864,7 +863,7 @@ uno::Reference< presentation::XPresentation > SAL_CALL SdXImpressDocument::getPr uno::Reference< drawing::XDrawPage > SAL_CALL SdXImpressDocument::getHandoutMasterPage() throw (uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpDoc ) throw lang::DisposedException(); @@ -885,7 +884,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdXImpressDocument::getHandoutMast uno::Reference< uno::XInterface > SAL_CALL SdXImpressDocument::createInstance( const OUString& aServiceSpecifier ) throw(uno::Exception, uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpDoc ) throw lang::DisposedException(); @@ -1152,7 +1151,7 @@ uno::Reference< uno::XInterface > SAL_CALL SdXImpressDocument::createInstance( c uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getAvailableServiceNames() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpDoc ) throw lang::DisposedException(); @@ -1225,7 +1224,7 @@ OUString SAL_CALL SdXImpressDocument::getImplementationName() sal_Bool SAL_CALL SdXImpressDocument::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if ( (ServiceName.equalsAscii("com.sun.star.document.OfficeDocument" )) || @@ -1244,7 +1243,7 @@ sal_Bool SAL_CALL SdXImpressDocument::supportsService( const OUString& ServiceNa uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getSupportedServiceNames() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; uno::Sequence< OUString > aSeq( 4 ); OUString* pServices = aSeq.getArray(); @@ -1265,14 +1264,14 @@ uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getSupportedServiceNames( uno::Reference< beans::XPropertySetInfo > SAL_CALL SdXImpressDocument::getPropertySetInfo( ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; return mpPropSet->getPropertySetInfo(); } void SAL_CALL SdXImpressDocument::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpDoc ) throw lang::DisposedException(); @@ -1346,7 +1345,7 @@ void SAL_CALL SdXImpressDocument::setPropertyValue( const OUString& aPropertyNam uno::Any SAL_CALL SdXImpressDocument::getPropertyValue( const OUString& PropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; uno::Any aAny; if( NULL == mpDoc ) @@ -1430,7 +1429,7 @@ void SAL_CALL SdXImpressDocument::removeVetoableChangeListener( const OUString& uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getLinks() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpDoc ) throw lang::DisposedException(); @@ -1445,7 +1444,7 @@ uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getLinks() uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getStyleFamilies( ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpDoc ) throw lang::DisposedException(); @@ -1466,7 +1465,7 @@ sal_Int32 SAL_CALL SdXImpressDocument::getRendererCount( const uno::Any& rSelect const uno::Sequence< beans::PropertyValue >& ) throw (lang::IllegalArgumentException, uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; sal_Int32 nRet = 0; if( NULL == mpDoc ) @@ -1499,7 +1498,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SdXImpressDocument::getRenderer( const uno::Sequence< beans::PropertyValue >& rxOptions ) throw (lang::IllegalArgumentException, uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpDoc ) throw lang::DisposedException(); @@ -1858,7 +1857,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r const uno::Sequence< beans::PropertyValue >& rxOptions ) throw (lang::IllegalArgumentException, uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpDoc ) throw lang::DisposedException(); @@ -2230,7 +2229,7 @@ void SAL_CALL SdXImpressDocument::dispose() throw (::com::sun::star::uno::Runtim if( !mbDisposed ) { { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( mpDoc ) { @@ -2344,7 +2343,7 @@ SdDrawPagesAccess::~SdDrawPagesAccess() throw() sal_Int32 SAL_CALL SdDrawPagesAccess::getCount() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpModel ) throw lang::DisposedException(); @@ -2355,7 +2354,7 @@ sal_Int32 SAL_CALL SdDrawPagesAccess::getCount() uno::Any SAL_CALL SdDrawPagesAccess::getByIndex( sal_Int32 Index ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpModel ) throw lang::DisposedException(); @@ -2378,7 +2377,7 @@ uno::Any SAL_CALL SdDrawPagesAccess::getByIndex( sal_Int32 Index ) // XNameAccess uno::Any SAL_CALL SdDrawPagesAccess::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpModel ) throw lang::DisposedException(); @@ -2408,7 +2407,7 @@ uno::Any SAL_CALL SdDrawPagesAccess::getByName( const OUString& aName ) throw(co uno::Sequence< OUString > SAL_CALL SdDrawPagesAccess::getElementNames() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpModel ) throw lang::DisposedException(); @@ -2429,7 +2428,7 @@ uno::Sequence< OUString > SAL_CALL SdDrawPagesAccess::getElementNames() throw(un sal_Bool SAL_CALL SdDrawPagesAccess::hasByName( const OUString& aName ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpModel ) throw lang::DisposedException(); @@ -2471,7 +2470,7 @@ sal_Bool SAL_CALL SdDrawPagesAccess::hasElements() uno::Reference< drawing::XDrawPage > SAL_CALL SdDrawPagesAccess::insertNewByIndex( sal_Int32 nIndex ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpModel ) throw lang::DisposedException(); @@ -2497,7 +2496,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdDrawPagesAccess::insertNewByInde void SAL_CALL SdDrawPagesAccess::remove( const uno::Reference< drawing::XDrawPage >& xPage ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpModel || mpModel->mpDoc == NULL ) throw lang::DisposedException(); @@ -2616,7 +2615,7 @@ void SAL_CALL SdMasterPagesAccess::removeEventListener( const uno::Reference< la sal_Int32 SAL_CALL SdMasterPagesAccess::getCount() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpModel->mpDoc ) throw lang::DisposedException(); @@ -2631,7 +2630,7 @@ sal_Int32 SAL_CALL SdMasterPagesAccess::getCount() uno::Any SAL_CALL SdMasterPagesAccess::getByIndex( sal_Int32 Index ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpModel ) throw lang::DisposedException(); @@ -2668,7 +2667,7 @@ sal_Bool SAL_CALL SdMasterPagesAccess::hasElements() uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIndex( sal_Int32 nInsertPos ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpModel ) throw lang::DisposedException(); @@ -2767,7 +2766,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn void SAL_CALL SdMasterPagesAccess::remove( const uno::Reference< drawing::XDrawPage >& xPage ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpModel || mpModel->mpDoc == NULL ) throw lang::DisposedException(); @@ -2870,7 +2869,7 @@ void SAL_CALL SdDocLinkTargets::removeEventListener( const uno::Reference< lang: uno::Any SAL_CALL SdDocLinkTargets::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpModel ) throw lang::DisposedException(); @@ -2892,7 +2891,7 @@ uno::Any SAL_CALL SdDocLinkTargets::getByName( const OUString& aName ) uno::Sequence< OUString > SAL_CALL SdDocLinkTargets::getElementNames() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpModel ) throw lang::DisposedException(); @@ -2945,7 +2944,7 @@ uno::Sequence< OUString > SAL_CALL SdDocLinkTargets::getElementNames() sal_Bool SAL_CALL SdDocLinkTargets::hasByName( const OUString& aName ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpModel ) throw lang::DisposedException(); @@ -2963,7 +2962,7 @@ uno::Type SAL_CALL SdDocLinkTargets::getElementType() sal_Bool SAL_CALL SdDocLinkTargets::hasElements() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; if( NULL == mpModel ) throw lang::DisposedException(); diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx index 20b826dab656..7f4807c6ce3a 100644 --- a/sd/source/ui/unoidl/unomodule.cxx +++ b/sd/source/ui/unoidl/unomodule.cxx @@ -38,7 +38,7 @@ #include <sfx2/objface.hxx> #include <sfx2/bindings.hxx> #include <sfx2/request.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> using namespace ::com::sun::star; diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index b9fa914961d0..93974410a197 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -37,7 +37,7 @@ #include <com/sun/star/beans/PropertyValues.hpp> #include <rtl/ustrbuf.hxx> #include <comphelper/stl_types.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <svl/itemprop.hxx> #include <svl/style.hxx> #include <svx/svdpool.hxx> @@ -92,7 +92,6 @@ using ::rtl::OUString; using ::rtl::OUStringBuffer; -using namespace ::vos; using namespace ::sd; using namespace ::com::sun::star; using namespace ::com::sun::star::presentation; diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 9639d682df55..7a2f577b153b 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -59,7 +59,7 @@ #include <svx/unoshape.hxx> #include <com/sun/star/style/XStyle.hpp> #include <svx/svdorect.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <svl/style.hxx> #include <rtl/uuid.h> #include <rtl/memory.h> @@ -90,7 +90,6 @@ using ::com::sun::star::animations::XAnimationNodeSupplier; using ::rtl::OUString; using ::rtl::OUStringBuffer; -using namespace ::vos; using namespace ::osl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -591,7 +590,7 @@ Any SAL_CALL SdGenericDrawPage::queryInterface( const uno::Type & rType ) Reference< beans::XPropertySetInfo > SAL_CALL SdGenericDrawPage::getPropertySetInfo() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); return mpPropSet->getPropertySetInfo(); } @@ -599,7 +598,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL SdGenericDrawPage::getPropertySetI void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -1002,7 +1001,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -1573,7 +1572,7 @@ void SdGenericDrawPage::setBookmarkURL( rtl::OUString& rURL ) Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::combine( const Reference< drawing::XShapes >& xShapes ) throw( uno::RuntimeException ) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -1610,7 +1609,7 @@ Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::combine( const Referenc void SAL_CALL SdGenericDrawPage::split( const Reference< drawing::XShape >& xGroup ) throw( uno::RuntimeException ) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -1629,7 +1628,7 @@ void SAL_CALL SdGenericDrawPage::split( const Reference< drawing::XShape >& xGro Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::bind( const Reference< drawing::XShapes >& xShapes ) throw( uno::RuntimeException ) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -1663,7 +1662,7 @@ Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::bind( const Reference< void SAL_CALL SdGenericDrawPage::unbind( const Reference< drawing::XShape >& xShape ) throw( uno::RuntimeException ) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -1877,7 +1876,7 @@ void SdGenericDrawPage::disposing() throw() // XAnimationNodeSupplier Reference< XAnimationNode > SAL_CALL SdGenericDrawPage::getAnimationNode() throw (uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -1911,7 +1910,7 @@ uno::Type SAL_CALL SdPageLinkTargets::getElementType() sal_Bool SAL_CALL SdPageLinkTargets::hasElements() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; SdPage* pPage = mpUnoPage->GetPage(); if( pPage != NULL ) @@ -1938,7 +1937,7 @@ sal_Bool SAL_CALL SdPageLinkTargets::hasElements() Any SAL_CALL SdPageLinkTargets::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; SdPage* pPage = mpUnoPage->GetPage(); if( pPage != NULL ) @@ -1957,7 +1956,7 @@ Any SAL_CALL SdPageLinkTargets::getByName( const OUString& aName ) Sequence< OUString > SAL_CALL SdPageLinkTargets::getElementNames() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; sal_uInt32 nObjCount = 0; @@ -1999,7 +1998,7 @@ Sequence< OUString > SAL_CALL SdPageLinkTargets::getElementNames() sal_Bool SAL_CALL SdPageLinkTargets::hasByName( const OUString& aName ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; return FindObject( aName ) != NULL; } @@ -2101,7 +2100,7 @@ UNO3_GETIMPLEMENTATION2_IMPL( SdDrawPage, SdGenericDrawPage ); // XTypeProvider Sequence< uno::Type > SAL_CALL SdDrawPage::getTypes() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -2149,7 +2148,7 @@ Sequence< uno::Type > SAL_CALL SdDrawPage::getTypes() throw(uno::RuntimeExceptio Sequence< sal_Int8 > SAL_CALL SdDrawPage::getImplementationId() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -2265,7 +2264,7 @@ OUString SAL_CALL SdDrawPage::getImplementationName() throw(uno::RuntimeExceptio Sequence< OUString > SAL_CALL SdDrawPage::getSupportedServiceNames() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -2288,7 +2287,7 @@ sal_Bool SAL_CALL SdDrawPage::supportsService( const OUString& ServiceName ) void SAL_CALL SdDrawPage::setName( const OUString& rName ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -2368,7 +2367,7 @@ void SAL_CALL SdDrawPage::setName( const OUString& rName ) OUString SAL_CALL SdDrawPage::getName() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -2379,7 +2378,7 @@ OUString SAL_CALL SdDrawPage::getName() Reference< drawing::XDrawPage > SAL_CALL SdDrawPage::getMasterPage( ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -2402,7 +2401,7 @@ Reference< drawing::XDrawPage > SAL_CALL SdDrawPage::getMasterPage( ) void SAL_CALL SdDrawPage::setMasterPage( const Reference< drawing::XDrawPage >& xMasterPage ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -2441,7 +2440,7 @@ void SAL_CALL SdDrawPage::setMasterPage( const Reference< drawing::XDrawPage >& Reference< drawing::XDrawPage > SAL_CALL SdDrawPage::getNotesPage() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -2492,7 +2491,7 @@ void SAL_CALL SdDrawPage::add( const Reference< drawing::XShape >& xShape ) thro void SAL_CALL SdDrawPage::remove( const Reference< drawing::XShape >& xShape ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -2726,7 +2725,7 @@ SdMasterPage::~SdMasterPage() throw() Any SAL_CALL SdMasterPage::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -2763,7 +2762,7 @@ UNO3_GETIMPLEMENTATION2_IMPL( SdMasterPage, SdGenericDrawPage ); // XTypeProvider Sequence< uno::Type > SAL_CALL SdMasterPage::getTypes() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -2810,7 +2809,7 @@ Sequence< uno::Type > SAL_CALL SdMasterPage::getTypes() throw(uno::RuntimeExcept Sequence< sal_Int8 > SAL_CALL SdMasterPage::getImplementationId() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -2831,7 +2830,7 @@ OUString SAL_CALL SdMasterPage::getImplementationName() throw(uno::RuntimeExcept Sequence< OUString > SAL_CALL SdMasterPage::getSupportedServiceNames() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -2853,7 +2852,7 @@ sal_Bool SAL_CALL SdMasterPage::supportsService( const OUString& ServiceName ) // XElementAccess sal_Bool SAL_CALL SdMasterPage::hasElements() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -2873,7 +2872,7 @@ uno::Type SAL_CALL SdMasterPage::getElementType() sal_Int32 SAL_CALL SdMasterPage::getCount() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -2883,7 +2882,7 @@ sal_Int32 SAL_CALL SdMasterPage::getCount() Any SAL_CALL SdMasterPage::getByIndex( sal_Int32 Index ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -3057,7 +3056,7 @@ void SdMasterPage::getBackground( Any& rValue ) throw() void SAL_CALL SdMasterPage::setName( const OUString& aName ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -3094,7 +3093,7 @@ void SAL_CALL SdMasterPage::setName( const OUString& aName ) OUString SAL_CALL SdMasterPage::getName( ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -3113,7 +3112,7 @@ OUString SAL_CALL SdMasterPage::getName( ) Reference< drawing::XDrawPage > SAL_CALL SdMasterPage::getNotesPage() throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -3137,7 +3136,7 @@ void SAL_CALL SdMasterPage::add( const Reference< drawing::XShape >& xShape ) th void SAL_CALL SdMasterPage::remove( const Reference< drawing::XShape >& xShape ) throw(uno::RuntimeException) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; throwIfDisposed(); diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 5afbc3beb808..190a83a995b1 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" #include <com/sun/star/drawing/BitmapMode.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <svl/itemset.hxx> #include <svx/svdpool.hxx> @@ -49,7 +49,6 @@ #include "unokywds.hxx" using namespace ::rtl; -using namespace ::vos; using namespace ::com::sun::star; const SvxItemPropertySet* ImplGetPageBackgroundPropertySet() diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx index 7201fcd25339..db0114ce5163 100644 --- a/sd/source/ui/unoidl/unosrch.cxx +++ b/sd/source/ui/unoidl/unosrch.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <svx/unoshape.hxx> #include <svx/svdpool.hxx> @@ -44,7 +44,6 @@ #include "unoprnms.hxx" #include "unosrch.hxx" -using namespace ::vos; using namespace ::rtl; using namespace ::com::sun::star; diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx index f7f03347a9d1..e7e3e7c53a5a 100644 --- a/sd/source/ui/view/ViewClipboard.cxx +++ b/sd/source/ui/view/ViewClipboard.cxx @@ -43,7 +43,7 @@ #include "glob.hrc" #include <svx/svdpagv.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> namespace sd { diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index 2e5d92d124eb..270ace5928c2 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -48,7 +48,7 @@ #include "Client.hxx" #include <vcl/svapp.hxx> #include <vcl/tabpage.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <sfx2/viewfrm.hxx> #include <com/sun/star/drawing/framework/ResourceId.hpp> #include <com/sun/star/drawing/framework/XControllerManager.hpp> diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx index 59822d5a53c2..ea63e37bf0c8 100644 --- a/sd/source/ui/view/drviews8.cxx +++ b/sd/source/ui/view/drviews8.cxx @@ -77,7 +77,7 @@ #include "Window.hxx" #include "drawview.hxx" #include "zoomlist.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/salbtype.hxx> // FRound #include <vcl/svapp.hxx> |