[Libreoffice-commits] .: 7 commits - sd/inc sd/source sd/util
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Mon Oct 25 19:27:05 PDT 2010
sd/inc/pch/precompiled_sd.hxx | 7
sd/source/core/CustomAnimationPreset.cxx | 5
sd/source/core/EffectMigration.cxx | 1
sd/source/core/TransitionPreset.cxx | 5
sd/source/core/sdpage_animations.cxx | 3
sd/source/core/stlfamily.cxx | 25 +-
sd/source/core/stlsheet.cxx | 27 +--
sd/source/filter/eppt/epptso.cxx | 5
sd/source/filter/html/HtmlOptionsDialog.cxx | 2
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 22 +-
sd/source/ui/accessibility/AccessibleOutlineView.cxx | 14 -
sd/source/ui/accessibility/AccessibleScrollPanel.cxx | 6
sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx | 12 -
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 32 +--
sd/source/ui/accessibility/AccessibleTreeNode.cxx | 16 -
sd/source/ui/app/sdxfer.cxx | 5
sd/source/ui/controller/slidelayoutcontroller.cxx | 2
sd/source/ui/dlg/TemplateScanner.cxx | 4
sd/source/ui/dlg/dlgass.cxx | 4
sd/source/ui/dlg/filedlg.cxx | 6
sd/source/ui/framework/configuration/ConfigurationController.cxx | 6
sd/source/ui/framework/factories/Pane.cxx | 4
sd/source/ui/framework/factories/ViewShellWrapper.cxx | 2
sd/source/ui/func/fusel.cxx | 1
sd/source/ui/notes/EditWindow.cxx | 4
sd/source/ui/notes/TextLogger.cxx | 4
sd/source/ui/presenter/SlideRenderer.cxx | 6
sd/source/ui/slideshow/slideshow.cxx | 17 -
sd/source/ui/slideshow/slideshowimpl.cxx | 89 ++++------
sd/source/ui/slideshow/slideshowviewimpl.cxx | 6
sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx | 4
sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx | 4
sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 6
sd/source/ui/slidesorter/shell/SlideSorterService.cxx | 2
sd/source/ui/toolpanel/TaskPaneFocusManager.cxx | 4
sd/source/ui/toolpanel/TitleBar.cxx | 2
sd/source/ui/toolpanel/ToolPanelFactory.cxx | 4
sd/source/ui/unoidl/DrawController.cxx | 31 +--
sd/source/ui/unoidl/SdUnoOutlineView.cxx | 3
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 7
sd/source/ui/unoidl/sddetect.cxx | 4
sd/source/ui/unoidl/unocpres.cxx | 31 +--
sd/source/ui/unoidl/unodoc.cxx | 6
sd/source/ui/unoidl/unolayer.cxx | 29 +--
sd/source/ui/unoidl/unomodel.cxx | 87 ++++-----
sd/source/ui/unoidl/unomodule.cxx | 8
sd/source/ui/unoidl/unoobj.cxx | 13 -
sd/source/ui/unoidl/unopage.cxx | 67 +++----
sd/source/ui/unoidl/unopback.cxx | 15 -
sd/source/ui/unoidl/unosrch.cxx | 9 -
sd/source/ui/view/ViewClipboard.cxx | 4
sd/source/ui/view/ViewTabBar.cxx | 16 -
sd/source/ui/view/drviews8.cxx | 4
sd/util/makefile.mk | 2
54 files changed, 339 insertions(+), 365 deletions(-)
New commits:
commit 39790d323a5f82e540c0dcb4998158a13b5f7899
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Oct 21 16:15:01 2010 -0500
Finally, gut the vos module out of the build
diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
index 8de0aed..7c2573d 100755
--- a/sd/util/makefile.mk
+++ b/sd/util/makefile.mk
@@ -84,7 +84,6 @@ SHL1STDLIBS+= \
$(UCBHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(VOSLIB) \
$(CANVASLIB) \
$(SALLIB) \
$(SALHELPERLIB) \
commit a5928cb94cdd1f93c3a302e5bb902edab4adcc26
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Oct 21 15:35:08 2010 -0500
convert vos/process.hxx and related API
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 73bb5a3..ae551d2 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -908,8 +908,7 @@
#include "osl/diagnose.h"
#include "osl/module.hxx"
#include "osl/mutex.hxx"
-#include "vos/process.hxx"
-#include "vos/xception.hxx"
+#include "osl/process.h"
//---MARKER---
#endif
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 22c3417..0b42564 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -91,11 +91,6 @@
#include "i18npool/mslangid.hxx"
-#include <vos/xception.hxx>
-#ifndef _VOS_NO_NAMESPACE
-using namespace vos;
-#endif
-
using namespace ::com::sun::star;
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 9ed3758..240d963 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -31,7 +31,6 @@
#include "fusel.hxx"
-#include <vos/process.hxx>
#include <basic/sbstar.hxx>
#include <svx/svdpagv.hxx>
#include <svx/svdogrp.hxx>
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index e2efd71..5aae88c 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -44,7 +44,6 @@
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
-#include <vos/process.hxx>
#include <svl/aeitem.hxx>
#include <svl/urihelper.hxx>
commit 6ace417ed494d2063ff79fca3e84facb39ff8250
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Oct 16 03:50:23 2010 -0500
migrate vos::Omodule to osl:Module
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 13ba06e..73bb5a3 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -906,7 +906,7 @@
#include "vcl/wrkwin.hxx"
#include "osl/diagnose.h"
-#include "vos/module.hxx"
+#include "osl/module.hxx"
#include "osl/mutex.hxx"
#include "vos/process.hxx"
#include "vos/xception.hxx"
diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx
index 16ce8c9..c754c8d 100644
--- a/sd/source/filter/html/HtmlOptionsDialog.cxx
+++ b/sd/source/filter/html/HtmlOptionsDialog.cxx
@@ -30,7 +30,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sd.hxx"
#include <osl/file.hxx>
-#include <vos/module.hxx>
+#include <osl/module.hxx>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/document/XViewDataSupplier.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
commit 2f96b518e55c21fae22eebdba7e02545a9ab1ea9
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Oct 16 03:17:28 2010 -0500
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index d97162c..13ba06e 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -907,7 +907,7 @@
#include "osl/diagnose.h"
#include "vos/module.hxx"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
#include "vos/process.hxx"
#include "vos/xception.hxx"
//---MARKER---
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index d5dee6b..9f98367 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -48,13 +48,12 @@
#include <tools/debug.hxx>
#include <rtl/uri.hxx>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <CustomAnimationPreset.hxx>
#include <algorithm>
-using namespace ::vos;
using namespace ::com::sun::star;
using namespace ::com::sun::star::animations;
using namespace ::com::sun::star::presentation;
diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx
index f942b4f..b567d43 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -37,7 +37,7 @@
#include <com/sun/star/util/XMacroExpander.hpp>
#include <com/sun/star/animations/AnimationNodeType.hpp>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <tools/urlobj.hxx>
#include <unotools/streamwrap.hxx>
#include <comphelper/processfactory.hxx>
@@ -54,7 +54,6 @@
#include "sdpage.hxx"
-using namespace ::vos;
using namespace ::com::sun::star;
using namespace ::com::sun::star::animations;
diff --git a/sd/source/core/sdpage_animations.cxx b/sd/source/core/sdpage_animations.cxx
index fbaccbd..305c966 100644
--- a/sd/source/core/sdpage_animations.cxx
+++ b/sd/source/core/sdpage_animations.cxx
@@ -32,7 +32,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/presentation/EffectNodeType.hpp>
#include <comphelper/processfactory.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <editeng/outliner.hxx>
#include "CustomAnimationCloner.hxx"
#include "drawdoc.hxx"
@@ -42,7 +42,6 @@
#include "undoanim.hxx"
#include "EffectMigration.hxx"
-using namespace ::vos;
using ::rtl::OUString;
using namespace ::sd;
using namespace ::com::sun::star::uno;
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index 9b11567..162a361 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -33,7 +33,7 @@
#include <com/sun/star/lang/IllegalAccessException.hpp>
#include <comphelper/serviceinfohelper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <svl/style.hxx>
@@ -51,7 +51,6 @@
#include <map>
using ::rtl::OUString;
-using namespace ::vos;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container;
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 4d47b00..b58ce02 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -34,7 +34,7 @@
#include <com/sun/star/style/XStyle.hpp>
#include <osl/mutex.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <comphelper/serviceinfohelper.hxx>
#include <boost/bind.hpp>
@@ -70,7 +70,6 @@ using ::rtl::OUString;
using ::osl::MutexGuard;
using ::osl::ClearableMutexGuard;
using ::cppu::OInterfaceContainerHelper;
-using namespace ::vos;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::lang;
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 1963282..8d43941 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 e28c898..6d0c436 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 5daa39a..62af8aa 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 adb3436..981e1c9 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 379583b..63da147 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 a7fd828..b234c39 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 73ba363..e1b7042 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 753e6bc..de8eed0 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 f905dd4..f3f4ab4 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 30c5567..c0f1d5e 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 339da1f..f123b8b 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 969c6b8..5a76617 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 c839abc..e3f9cf8 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 e0fccc3..c852ff5 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 627825c..10ec1e0 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 c0f2038..2000ae0 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 a614d08..f1159b2 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 8147443..a15d10f 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 8d9ef01..16c60e9 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 a575a26..cd543a4 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 5a4858f..83f39e6 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 f37ccb3..86adba9 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 72ea42a..db4b85f 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 399e70c..100f79a 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 ed08e93..909b94d 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 5ae5c26..e0cdcc3 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 d231341..4c18277 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 b3a232e..14a3e72 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 af4f9f5..44415e6 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 e5e437e..d19585c 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 1061dd3..d340fc4 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 f2bd515..e666329 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 4fd4557..e0232bb 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 f47e017..be98f8e 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 0c55c11..3eb2055 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 6392f4f..87ad96d 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 c1f2bff..a1bde64 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 ef2af89..1d13671 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>
commit 245090f4b2b7982b412f99a7e4da1383d9729f8a
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Oct 15 12:11:00 2010 -0500
merge vosremoval-reference.diff
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index f7e2f46..8300bbc 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -41,7 +41,6 @@
#include <EffectMigration.hxx>
#include <anminfo.hxx>
-using namespace ::vos;
using namespace ::sd;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::animations;
diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
index 088057e..8de0aed 100755
--- a/sd/util/makefile.mk
+++ b/sd/util/makefile.mk
@@ -87,6 +87,7 @@ SHL1STDLIBS+= \
$(VOSLIB) \
$(CANVASLIB) \
$(SALLIB) \
+ $(SALHELPERLIB) \
$(AVMEDIALIB)
SHL1LIBS= $(LIB3TARGET) $(LIB5TARGET) $(LIB6TARGET)
commit e81e42dd6cca618f2173f8664d2a2303e630bf29
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Oct 14 23:10:46 2010 -0500
replace a pair acquire/release on the SolarMutex by a SolarMutexGuard
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 9ef1249..adb3436 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -140,7 +140,7 @@ SdTransferable::~SdTransferable()
if( mpSdView )
EndListening( *const_cast< sd::View *>( mpSdView) );
- Application::GetSolarMutex().acquire();
+ SolarMutexGuard aSolarGuard;
ObjectReleased();
@@ -171,7 +171,6 @@ SdTransferable::~SdTransferable()
delete mpVDev;
delete mpObjDesc;
- Application::GetSolarMutex().release();
}
// -----------------------------------------------------------------------------
commit 5961a2e3fda6ba902f4784d6a05c283685d5a49a
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Oct 13 02:37:50 2010 -0500
use SolarMutexGuard to guard the SolarMutex
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index a4b2a2d..d5dee6b 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -614,7 +614,7 @@ const CustomAnimationPresets& CustomAnimationPresets::getCustomAnimationPresets(
{
if( !mpCustomAnimationPresets )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( !mpCustomAnimationPresets )
{
diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx
index 2e9a1f9..f942b4f 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -232,7 +232,7 @@ const TransitionPresetList& TransitionPreset::getTransitionPresetList()
{
if( !mpTransitionPresetList )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( !mpTransitionPresetList )
{
mpTransitionPresetList = new sd::TransitionPresetList();
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index 8b97ce2..9b11567 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -245,7 +245,7 @@ void SAL_CALL SdStyleFamily::setName( const ::rtl::OUString& ) throw (RuntimeExc
Any SAL_CALL SdStyleFamily::getByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
throwIfDisposed();
return Any( Reference< XStyle >( static_cast<SfxUnoStyleSheet*>(GetSheetByName( rName )) ) );
}
@@ -254,7 +254,7 @@ Any SAL_CALL SdStyleFamily::getByName( const OUString& rName ) throw(NoSuchEleme
Sequence< OUString > SAL_CALL SdStyleFamily::getElementNames() throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
throwIfDisposed();
@@ -301,7 +301,7 @@ Sequence< OUString > SAL_CALL SdStyleFamily::getElementNames() throw(RuntimeExce
sal_Bool SAL_CALL SdStyleFamily::hasByName( const OUString& aName ) throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
throwIfDisposed();
if( aName.getLength() )
@@ -340,7 +340,7 @@ Type SAL_CALL SdStyleFamily::getElementType() throw(RuntimeException)
sal_Bool SAL_CALL SdStyleFamily::hasElements() throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
throwIfDisposed();
if( mnFamily == SD_STYLE_FAMILY_MASTERPAGE )
@@ -367,7 +367,7 @@ sal_Bool SAL_CALL SdStyleFamily::hasElements() throw(RuntimeException)
sal_Int32 SAL_CALL SdStyleFamily::getCount() throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
throwIfDisposed();
sal_Int32 nCount = 0;
@@ -393,7 +393,7 @@ sal_Int32 SAL_CALL SdStyleFamily::getCount() throw(RuntimeException)
Any SAL_CALL SdStyleFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
throwIfDisposed();
if( Index >= 0 )
@@ -435,7 +435,7 @@ Any SAL_CALL SdStyleFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBounds
void SAL_CALL SdStyleFamily::insertByName( const OUString& rName, const Any& rElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
throwIfDisposed();
if(rName.getLength() == 0)
@@ -453,7 +453,7 @@ void SAL_CALL SdStyleFamily::insertByName( const OUString& rName, const Any& rEl
void SAL_CALL SdStyleFamily::removeByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
throwIfDisposed();
SdStyleSheet* pStyle = GetSheetByName( rName );
@@ -470,7 +470,7 @@ void SAL_CALL SdStyleFamily::removeByName( const OUString& rName ) throw(NoSuchE
void SAL_CALL SdStyleFamily::replaceByName( const OUString& rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
throwIfDisposed();
SdStyleSheet* pOldStyle = GetSheetByName( rName );
@@ -486,7 +486,7 @@ void SAL_CALL SdStyleFamily::replaceByName( const OUString& rName, const Any& aE
Reference< XInterface > SAL_CALL SdStyleFamily::createInstance() throw(Exception, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
throwIfDisposed();
if( mnFamily == SD_STYLE_FAMILY_MASTERPAGE )
@@ -557,7 +557,7 @@ Any SdStyleFamily::getPropertyValue( const OUString& PropertyName ) throw (Unkno
{
if (PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DisplayName") ))
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
OUString sDisplayName;
switch( mnFamily )
{
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 6530808..4d47b00 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -993,7 +993,7 @@ Sequence< OUString > SAL_CALL SdStyleSheet::getSupportedServiceNames() throw(Run
OUString SAL_CALL SdStyleSheet::getName() throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
throwIfDisposed();
return GetApiName();
}
@@ -1002,7 +1002,7 @@ OUString SAL_CALL SdStyleSheet::getName() throw(RuntimeException)
void SAL_CALL SdStyleSheet::setName( const OUString& rName ) throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
throwIfDisposed();
if( IsUserDefined() )
{
@@ -1020,7 +1020,7 @@ void SAL_CALL SdStyleSheet::setName( const OUString& rName ) throw(RuntimeExcep
sal_Bool SAL_CALL SdStyleSheet::isUserDefined() throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
throwIfDisposed();
return IsUserDefined() ? sal_True : sal_False;
}
@@ -1029,7 +1029,7 @@ sal_Bool SAL_CALL SdStyleSheet::isUserDefined() throw(RuntimeException)
sal_Bool SAL_CALL SdStyleSheet::isInUse() throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
throwIfDisposed();
return IsUsed() ? sal_True : sal_False;
}
@@ -1038,7 +1038,7 @@ sal_Bool SAL_CALL SdStyleSheet::isInUse() throw(RuntimeException)
OUString SAL_CALL SdStyleSheet::getParentStyle() throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
throwIfDisposed();
if( GetParent().Len() )
@@ -1054,7 +1054,7 @@ OUString SAL_CALL SdStyleSheet::getParentStyle() throw(RuntimeException)
void SAL_CALL SdStyleSheet::setParentStyle( const OUString& rParentName ) throw(NoSuchElementException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
throwIfDisposed();
if( IsUserDefined() )
@@ -1099,7 +1099,7 @@ Reference< XPropertySetInfo > SdStyleSheet::getPropertySetInfo() throw(RuntimeEx
void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
throwIfDisposed();
const SfxItemPropertySimpleEntry* pEntry = getPropertyMapEntry( aPropertyName );
@@ -1180,7 +1180,7 @@ void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, con
Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
throwIfDisposed();
@@ -1282,7 +1282,7 @@ void SAL_CALL SdStyleSheet::removeVetoableChangeListener( const OUString& , cons
PropertyState SAL_CALL SdStyleSheet::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
throwIfDisposed();
@@ -1363,7 +1363,7 @@ PropertyState SAL_CALL SdStyleSheet::getPropertyState( const OUString& PropertyN
Sequence< PropertyState > SAL_CALL SdStyleSheet::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
throwIfDisposed();
@@ -1383,7 +1383,7 @@ Sequence< PropertyState > SAL_CALL SdStyleSheet::getPropertyStates( const Sequen
void SAL_CALL SdStyleSheet::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
throwIfDisposed();
@@ -1409,7 +1409,7 @@ void SAL_CALL SdStyleSheet::setPropertyToDefault( const OUString& PropertyName )
Any SAL_CALL SdStyleSheet::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
throwIfDisposed();
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 02d3db7..1963282 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -404,26 +404,26 @@ void SAL_CALL
if( aServices.getLength() >= 2 &&
aServices[1] == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PresentationView")))
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sName = String( SdResId(SID_SD_A11Y_I_DRAWVIEW_N) );
}
else
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sName = String( SdResId(SID_SD_A11Y_D_DRAWVIEW_N) );
}
}
else if (sFirstService == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.NotesView")))
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sName = String( SdResId(SID_SD_A11Y_I_NOTESVIEW_N) );
}
else if (sFirstService == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.HandoutView")))
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sName = String( SdResId(SID_SD_A11Y_I_HANDOUTVIEW_N) );
}
@@ -461,26 +461,26 @@ void SAL_CALL
if( aServices.getLength() >= 2 &&
aServices[1] == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PresentationView")))
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sDescription = String( SdResId(SID_SD_A11Y_I_DRAWVIEW_D) );
}
else
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sDescription = String( SdResId(SID_SD_A11Y_D_DRAWVIEW_D) );
}
}
else if (sFirstService == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.NotesView")))
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sDescription = String( SdResId(SID_SD_A11Y_I_NOTESVIEW_D) );
}
else if (sFirstService == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.HandoutView")))
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sDescription = String( SdResId(SID_SD_A11Y_I_HANDOUTVIEW_D) );
}
@@ -505,7 +505,7 @@ sal_Bool
AccessibleDrawDocumentView::implIsSelected( sal_Int32 nAccessibleChildIndex )
throw (uno::RuntimeException)
{
- const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aSolarGuard;
uno::Reference< view::XSelectionSupplier > xSel( mxController, uno::UNO_QUERY );
sal_Bool bRet = sal_False;
@@ -550,7 +550,7 @@ void
AccessibleDrawDocumentView::implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aSolarGuard;
uno::Reference< view::XSelectionSupplier > xSel( mxController, uno::UNO_QUERY );
AccessibleShape* pAccessibleChild;
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index 51f3b39..e28c898 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -78,7 +78,7 @@ AccessibleOutlineView::AccessibleOutlineView (
: AccessibleDocumentViewBase (pSdWindow, pViewShell, rxController, rxParent),
maTextHelper( ::std::auto_ptr< SvxEditSource >( NULL ) )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// Beware! Here we leave the paths of the UNO API and descend into the
// depths of the core. Necessary for making the edit engine accessible.
@@ -194,7 +194,7 @@ void AccessibleOutlineView::FireEvent(const AccessibleEventObject& aEvent )
void AccessibleOutlineView::Activated (void)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// delegate listener handling to children manager.
maTextHelper.SetFocus(sal_True);
@@ -202,7 +202,7 @@ void AccessibleOutlineView::Activated (void)
void AccessibleOutlineView::Deactivated (void)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// delegate listener handling to children manager.
maTextHelper.SetFocus(sal_False);
@@ -254,7 +254,7 @@ void SAL_CALL
AccessibleOutlineView::CreateAccessibleName (void)
throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return String( SdResId(SID_SD_A11Y_I_OUTLINEVIEW_N) );
}
@@ -267,14 +267,14 @@ void SAL_CALL
AccessibleOutlineView::CreateAccessibleDescription (void)
throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return String( SdResId(SID_SD_A11Y_I_OUTLINEVIEW_D) );
}
void AccessibleOutlineView::UpdateChildren()
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// Update visible children
maTextHelper.UpdateChildren();
diff --git a/sd/source/ui/accessibility/AccessibleScrollPanel.cxx b/sd/source/ui/accessibility/AccessibleScrollPanel.cxx
index 10731d1..5daa39a 100644
--- a/sd/source/ui/accessibility/AccessibleScrollPanel.cxx
+++ b/sd/source/ui/accessibility/AccessibleScrollPanel.cxx
@@ -77,7 +77,7 @@ sal_Int32 SAL_CALL
throw (RuntimeException)
{
ThrowIfDisposed();
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
sal_Int32 nChildCount (mrTreeNode.GetControlContainer().GetControlCount());
if (GetScrollPanel().IsVerticalScrollBarVisible())
@@ -97,7 +97,7 @@ Reference<XAccessible> SAL_CALL
RuntimeException)
{
ThrowIfDisposed();
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
Reference<XAccessible> xChild;
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index 1b49153..d62e946 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -113,7 +113,7 @@ void AccessibleSlideSorterObject::FireAccessibleEvent (
void SAL_CALL AccessibleSlideSorterObject::disposing (void)
{
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
// Send a disposing to all listeners.
if (mnClientId != 0)
@@ -173,7 +173,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleIndexInParent()
throw (uno::RuntimeException)
{
ThrowIfDisposed();
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
sal_Int32 nIndexInParent(-1);
if (mxParent.is())
@@ -223,7 +223,7 @@ sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole (void)
throw (uno::RuntimeException)
{
ThrowIfDisposed();
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
SdPage* pPage = GetPage();
if (pPage != NULL)
@@ -251,7 +251,7 @@ Reference<XAccessibleStateSet> SAL_CALL
throw (uno::RuntimeException)
{
ThrowIfDisposed();
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
::utl::AccessibleStateSetHelper* pStateSet = new ::utl::AccessibleStateSetHelper();
if (mxParent.is())
@@ -384,7 +384,7 @@ awt::Rectangle SAL_CALL AccessibleSlideSorterObject::getBounds (void)
{
ThrowIfDisposed ();
- const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aSolarGuard;
Rectangle aBBox (mrSlideSorter.GetView().GetPageBoundingBox (
mnPageNumber,
@@ -431,7 +431,7 @@ awt::Point SAL_CALL AccessibleSlideSorterObject::getLocationOnScreen (void)
{
ThrowIfDisposed ();
- const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aSolarGuard;
awt::Point aLocation (getLocation());
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 2721bdf..0a64428 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -234,7 +234,7 @@ Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleParent
throw (uno::RuntimeException)
{
ThrowIfDisposed();
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
Reference<XAccessible> xParent;
if (mpContentWindow != NULL)
@@ -252,7 +252,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleIndexInParent (void)
{
OSL_ASSERT(getAccessibleParent().is());
ThrowIfDisposed();
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
sal_Int32 nIndexInParent(-1);
@@ -290,7 +290,7 @@ sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole (void)
throw (uno::RuntimeException)
{
ThrowIfDisposed();
- ::vos::OGuard aGuard (Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
return String(SdResId(SID_SD_A11Y_I_SLIDEVIEW_D));
}
@@ -302,7 +302,7 @@ sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole (void)
throw (uno::RuntimeException)
{
ThrowIfDisposed();
- ::vos::OGuard aGuard (Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
return String(SdResId(SID_SD_A11Y_I_SLIDEVIEW_N));
}
@@ -325,7 +325,7 @@ Reference<XAccessibleStateSet > SAL_CALL
throw (uno::RuntimeException)
{
ThrowIfDisposed();
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
::utl::AccessibleStateSetHelper* pStateSet = new ::utl::AccessibleStateSetHelper();
pStateSet->AddState(AccessibleStateType::FOCUSABLE);
@@ -444,7 +444,7 @@ Reference<XAccessible> SAL_CALL
{
ThrowIfDisposed();
Reference<XAccessible> xAccessible;
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
const Point aTestPoint (aPoint.X, aPoint.Y);
::sd::slidesorter::model::SharedPageDescriptor pHitDescriptor (
@@ -463,7 +463,7 @@ awt::Rectangle SAL_CALL AccessibleSlideSorterView::getBounds (void)
throw (uno::RuntimeException)
{
ThrowIfDisposed();
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
awt::Rectangle aBBox;
if (mpContentWindow != NULL)
@@ -509,7 +509,7 @@ awt::Point SAL_CALL AccessibleSlideSorterView::getLocationOnScreen()
throw (uno::RuntimeException)
{
ThrowIfDisposed();
- const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aSolarGuard;
awt::Point aParentLocationOnScreen;
Reference<XAccessible> xParent (getAccessibleParent());
@@ -554,7 +554,7 @@ void SAL_CALL AccessibleSlideSorterView::grabFocus (void)
throw (uno::RuntimeException)
{
ThrowIfDisposed();
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
if (mpContentWindow)
mpContentWindow->GrabFocus();
@@ -593,7 +593,7 @@ void SAL_CALL AccessibleSlideSorterView::selectAccessibleChild (sal_Int32 nChild
RuntimeException)
{
ThrowIfDisposed();
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
AccessibleSlideSorterObject* pChild = mpImpl->GetAccessibleChild(nChildIndex);
if (pChild != NULL)
@@ -611,7 +611,7 @@ sal_Bool SAL_CALL AccessibleSlideSorterView::isAccessibleChildSelected (sal_Int3
{
ThrowIfDisposed();
sal_Bool bIsSelected = sal_False;
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
AccessibleSlideSorterObject* pChild = mpImpl->GetAccessibleChild(nChildIndex);
if (pChild != NULL)
@@ -630,7 +630,7 @@ void SAL_CALL AccessibleSlideSorterView::clearAccessibleSelection (void)
throw (uno::RuntimeException)
{
ThrowIfDisposed();
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
mrSlideSorter.GetController().GetPageSelector().DeselectAllPages();
}
@@ -642,7 +642,7 @@ void SAL_CALL AccessibleSlideSorterView::selectAllAccessibleChildren (void)
throw (uno::RuntimeException)
{
ThrowIfDisposed();
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
mrSlideSorter.GetController().GetPageSelector().SelectAllPages();
}
@@ -654,7 +654,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChildCount (v
throw (uno::RuntimeException)
{
ThrowIfDisposed ();
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
return mrSlideSorter.GetController().GetPageSelector().GetSelectedPageCount();
}
@@ -666,7 +666,7 @@ Reference<XAccessible > SAL_CALL
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
ThrowIfDisposed ();
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
Reference<XAccessible> xChild;
::sd::slidesorter::controller::PageSelector& rSelector (
@@ -699,7 +699,7 @@ void SAL_CALL AccessibleSlideSorterView::deselectAccessibleChild (sal_Int32 nChi
RuntimeException)
{
ThrowIfDisposed();
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
AccessibleSlideSorterObject* pChild = mpImpl->GetAccessibleChild(nChildIndex);
if (pChild != NULL)
diff --git a/sd/source/ui/accessibility/AccessibleTreeNode.cxx b/sd/source/ui/accessibility/AccessibleTreeNode.cxx
index 7847cd7..fb62178 100644
--- a/sd/source/ui/accessibility/AccessibleTreeNode.cxx
+++ b/sd/source/ui/accessibility/AccessibleTreeNode.cxx
@@ -182,7 +182,7 @@ sal_Int32 SAL_CALL AccessibleTreeNode::getAccessibleChildCount (void)
throw (RuntimeException)
{
ThrowIfDisposed();
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
return mrTreeNode.GetControlContainer().GetControlCount();
}
@@ -194,7 +194,7 @@ Reference<XAccessible > SAL_CALL
throw (lang::IndexOutOfBoundsException, RuntimeException)
{
ThrowIfDisposed();
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
if (nIndex<0 || (sal_uInt32)nIndex>=mrTreeNode.GetControlContainer().GetControlCount())
throw lang::IndexOutOfBoundsException();
@@ -215,7 +215,7 @@ Reference<XAccessible > SAL_CALL AccessibleTreeNode::getAccessibleParent (void)
throw (uno::RuntimeException)
{
ThrowIfDisposed();
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
return mxParent;
}
@@ -227,7 +227,7 @@ sal_Int32 SAL_CALL AccessibleTreeNode::getAccessibleIndexInParent (void)
{
OSL_ASSERT(getAccessibleParent().is());
ThrowIfDisposed();
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
sal_Int32 nIndexInParent(-1);
@@ -296,7 +296,7 @@ Reference<XAccessibleStateSet > SAL_CALL
throw (uno::RuntimeException)
{
ThrowIfDisposed();
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
return mrStateSet.get();
}
@@ -440,7 +440,7 @@ Reference<XAccessible> SAL_CALL
{
ThrowIfDisposed();
Reference<XAccessible> xChildAtPoint;
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
sal_Int32 nChildCount = getAccessibleChildCount();
for (sal_Int32 nIndex=0; nIndex<nChildCount; ++nIndex)
@@ -524,7 +524,7 @@ awt::Point SAL_CALL AccessibleTreeNode::getLocationOnScreen()
throw (uno::RuntimeException)
{
ThrowIfDisposed();
- const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aSolarGuard;
awt::Point aLocationOnScreen;
::Window* pWindow = mrTreeNode.GetWindow();
@@ -556,7 +556,7 @@ void SAL_CALL AccessibleTreeNode::grabFocus (void)
throw (uno::RuntimeException)
{
ThrowIfDisposed();
- const vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
if (mrTreeNode.GetWindow() != NULL)
mrTreeNode.GetWindow()->GrabFocus();
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx
index 20e190b..a7fd828 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -278,7 +278,7 @@ TemplateScanner::State TemplateScanner::ScanEntry (void)
}
else
{
- ::vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
maFolderList.push_back(mpTemplateDirectory);
}
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 8cb2c84..73ba363 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -886,7 +886,7 @@ void AssistentDlgImpl::TemplateScanDone (
std::vector<TemplateDir*>& rTemplateFolder)
{
// This method is called from a thread. Therefore we get the solar mutex.
- ::vos::OGuard aGuard (Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
// Copy the contents of the given template folders to a local list.
maPresentList.swap (rTemplateFolder);
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index 349231f..753e6bc 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -100,7 +100,7 @@ public:
// ------------------------------------------------------------------------
void SAL_CALL SdFileDialog_Imp::ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
switch( aEvent.ElementId )
{
@@ -192,7 +192,7 @@ IMPL_LINK( SdFileDialog_Imp, PlayMusicHdl, void *, EMPTYARG )
// ------------------------------------------------------------------------
IMPL_LINK( SdFileDialog_Imp, IsMusicStoppedHdl, void *, EMPTYARG )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if (
mxPlayer.is() && mxPlayer->isPlaying() &&
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index 0588070..f905dd4 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -206,7 +206,7 @@ void SAL_CALL ConfigurationController::disposing (void)
aEvent.Source = uno::Reference<uno::XInterface>((cppu::OWeakObject*)this);
{
- const ::vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
mpImplementation->mpBroadcaster->DisposeAndClear();
}
@@ -656,7 +656,7 @@ void SAL_CALL ConfigurationController::initialize (const Sequence<Any>& aArgumen
if (aArguments.getLength() == 1)
{
- const ::vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
mpImplementation.reset(new Implementation(
*this,
diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx
index df50374..30c5567 100644
--- a/sd/source/ui/framework/factories/Pane.cxx
+++ b/sd/source/ui/framework/factories/Pane.cxx
@@ -200,7 +200,7 @@ const Sequence<sal_Int8>& Pane::getUnoTunnelId (void)
static Sequence<sal_Int8>* pSequence = NULL;
if (pSequence == NULL)
{
- const ::vos::OGuard aSolarGuard (Application::GetSolarMutex());
+ const SolarMutexGuard aSolarGuard;
if (pSequence == NULL)
{
static ::com::sun::star::uno::Sequence<sal_Int8> aSequence (16);
diff --git a/sd/source/ui/notes/EditWindow.cxx b/sd/source/ui/notes/EditWindow.cxx
index 26a9805..969c6b8 100644
--- a/sd/source/ui/notes/EditWindow.cxx
+++ b/sd/source/ui/notes/EditWindow.cxx
@@ -874,7 +874,7 @@ void EditWindow::Delete()
void EditWindow::InsertText(const String& Text)
{
DBG_ASSERT( mpEditView, "EditView missing" );
- ::vos::OGuard aGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
if (mpEditView)
mpEditView->InsertText(Text);
}
diff --git a/sd/source/ui/notes/TextLogger.cxx b/sd/source/ui/notes/TextLogger.cxx
index f51c1e7..c839abc 100644
--- a/sd/source/ui/notes/TextLogger.cxx
+++ b/sd/source/ui/notes/TextLogger.cxx
@@ -43,7 +43,7 @@ TextLogger& TextLogger::Instance (void)
{
if (spInstance == NULL)
{
- ::vos::OGuard aGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
if (spInstance == NULL)
spInstance = new TextLogger ();
}
diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx
index 13fc4ba..e0fccc3 100644
--- a/sd/source/ui/presenter/SlideRenderer.cxx
+++ b/sd/source/ui/presenter/SlideRenderer.cxx
@@ -134,7 +134,7 @@ Reference<awt::XBitmap> SlideRenderer::createPreview (
throw (css::uno::RuntimeException)
{
ThrowIfDisposed();
- ::vos::OGuard aGuard (Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
return VCLUnoHelper::CreateBitmap(
CreatePreview(rxSlide, rMaximalSize, nSuperSampleFactor));
@@ -151,7 +151,7 @@ Reference<rendering::XBitmap> SlideRenderer::createPreviewForCanvas (
throw (css::uno::RuntimeException)
{
ThrowIfDisposed();
- ::vos::OGuard aGuard (Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
cppcanvas::BitmapCanvasSharedPtr pCanvas (cppcanvas::VCLFactory::getInstance().createCanvas(
Reference<rendering::XBitmapCanvas>(rxCanvas, UNO_QUERY)));
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index fd3e2ac..627825c 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -296,7 +296,7 @@ Sequence< OUString > SAL_CALL SlideShow::getSupportedServiceNames( ) throw(Runt
Reference< XPropertySetInfo > SAL_CALL SlideShow::getPropertySetInfo() throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
static Reference< XPropertySetInfo > xInfo = maPropSet.getPropertySetInfo();
return xInfo;
}
@@ -305,7 +305,7 @@ Reference< XPropertySetInfo > SAL_CALL SlideShow::getPropertySetInfo() throw(Run
void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
ThrowIfDisposed();
sd::PresentationSettings& rPresSettings = mpDoc->getPresentationSettings();
@@ -578,7 +578,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const
Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
ThrowIfDisposed();
const sd::PresentationSettings& rPresSettings = mpDoc->getPresentationSettings();
@@ -680,7 +680,7 @@ void SAL_CALL SlideShow::start() throw(RuntimeException)
void SAL_CALL SlideShow::end() throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// The mbIsInStartup flag should have been reset during the start of the
// slide show. Reset it here just in case that something has horribly
@@ -822,7 +822,7 @@ void SAL_CALL SlideShow::rehearseTimings() throw(RuntimeException)
void SAL_CALL SlideShow::startWithArguments( const Sequence< PropertyValue >& rArguments ) throw (RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
ThrowIfDisposed();
// Stop a running show before starting a new one.
@@ -872,7 +872,7 @@ void SAL_CALL SlideShow::startWithArguments( const Sequence< PropertyValue >& rA
::sal_Bool SAL_CALL SlideShow::isRunning( ) throw (RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return mxController.is() && mxController->isRunning();
}
@@ -892,7 +892,7 @@ Reference< XSlideShowController > SAL_CALL SlideShow::getController( ) throw (R
void SAL_CALL SlideShow::disposing (void)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( mnInPlaceConfigEvent )
{
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index ec052ba..e2efd71 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -622,7 +622,7 @@ void SAL_CALL SlideshowImpl::disposing()
maInputFreezeTimer.Stop();
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
if( !mxShow.is() )
return;
@@ -1236,7 +1236,7 @@ void SlideshowImpl::onFirstPaint()
mpShowWindow->SetBackground();
}
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
maUpdateTimer.SetTimeout( (ULONG)100 );
maUpdateTimer.Start();
}
@@ -1487,7 +1487,7 @@ IMPL_LINK( SlideshowImpl, endPresentationHdl, void*, EMPTYARG )
void SAL_CALL SlideshowImpl::pause() throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
if( !mbIsPaused ) try
{
@@ -1516,7 +1516,7 @@ void SAL_CALL SlideshowImpl::pause() throw (RuntimeException)
void SAL_CALL SlideshowImpl::resume() throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
if( mbIsPaused ) try
{
@@ -1553,7 +1553,7 @@ void SAL_CALL SlideshowImpl::resume() throw (RuntimeException)
sal_Bool SAL_CALL SlideshowImpl::isPaused() throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
return mbIsPaused;
}
@@ -1561,7 +1561,7 @@ sal_Bool SAL_CALL SlideshowImpl::isPaused() throw (RuntimeException)
void SAL_CALL SlideshowImpl::blankScreen( sal_Int32 nColor ) throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
if( mpShowWindow && mpSlideController )
{
@@ -1578,7 +1578,7 @@ void SAL_CALL SlideshowImpl::blankScreen( sal_Int32 nColor ) throw (RuntimeExcep
void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun::star::awt::MouseEvent& /* aOriginalEvent */ )
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
WrappedShapeEventImplPtr pEvent = maShapeEventMap[xShape];
if( !pEvent.get() )
@@ -1836,7 +1836,7 @@ sal_Int32 SlideshowImpl::getLastSlideNumber()
sal_Bool SAL_CALL SlideshowImpl::isEndless() throw( RuntimeException )
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
return maPresSettings.mbEndless;
}
@@ -1852,7 +1852,7 @@ double SlideshowImpl::update()
void SlideshowImpl::startUpdateTimer()
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
maUpdateTimer.SetTimeout( 0 );
maUpdateTimer.Start();
}
@@ -2869,7 +2869,7 @@ void SlideshowImpl::setActiveXToolbarsVisible( sal_Bool bVisible )
void SAL_CALL SlideshowImpl::activate() throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
maDeactivateTimer.Stop();
@@ -2910,7 +2910,7 @@ void SAL_CALL SlideshowImpl::activate() throw (RuntimeException)
void SAL_CALL SlideshowImpl::deactivate() throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
if( mbActive && mxShow.is() )
{
@@ -2946,7 +2946,7 @@ IMPL_LINK( SlideshowImpl, deactivateHdl, Timer*, EMPTYARG )
sal_Bool SAL_CALL SlideshowImpl::isActive() throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
return mbActive;
}
@@ -3038,7 +3038,7 @@ void SlideshowImpl::setAutoSaveState( bool bOn)
Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide() throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
Reference< XDrawPage > xSlide;
if( mxShow.is() && mpSlideController.get() )
@@ -3055,7 +3055,7 @@ Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide() throw (RuntimeE
sal_Int32 SAL_CALL SlideshowImpl::getNextSlideIndex() throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
if( mxShow.is() )
{
@@ -3095,7 +3095,7 @@ Reference< XDrawPage > SAL_CALL SlideshowImpl::getSlideByIndex(::sal_Int32 Index
sal_Bool SAL_CALL SlideshowImpl::getAlwaysOnTop() throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
return maPresSettings.mbAlwaysOnTop;
}
@@ -3103,7 +3103,7 @@ sal_Bool SAL_CALL SlideshowImpl::getAlwaysOnTop() throw (RuntimeException)
void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways ) throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
if( maPresSettings.mbAlwaysOnTop != bAlways )
{
maPresSettings.mbAlwaysOnTop = bAlways;
@@ -3115,7 +3115,7 @@ void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways ) throw (RuntimeEx
sal_Bool SAL_CALL SlideshowImpl::isFullScreen() throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
return maPresSettings.mbFullScreen;
}
@@ -3123,7 +3123,7 @@ sal_Bool SAL_CALL SlideshowImpl::isFullScreen() throw (RuntimeException)
sal_Bool SAL_CALL SlideshowImpl::getMouseVisible() throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
return maPresSettings.mbMouseVisible;
}
@@ -3131,7 +3131,7 @@ sal_Bool SAL_CALL SlideshowImpl::getMouseVisible() throw (RuntimeException)
void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible ) throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
if( maPresSettings.mbMouseVisible != bVisible )
{
maPresSettings.mbMouseVisible = bVisible;
@@ -3144,7 +3144,7 @@ void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible ) throw (Runtime
sal_Bool SAL_CALL SlideshowImpl::getUsePen() throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
return maPresSettings.mbMouseAsPen;
}
@@ -3152,7 +3152,7 @@ sal_Bool SAL_CALL SlideshowImpl::getUsePen() throw (RuntimeException)
void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
maPresSettings.mbMouseAsPen = bMouseAsPen;
if( mxShow.is() ) try
{
@@ -3212,7 +3212,7 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc
#ifdef ENABLE_PRESENTER_EXTRA_UI
void SAL_CALL SlideshowImpl::setUseEraser( sal_Bool bMouseAsPen ) throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
maPresSettings.mbMouseAsPen = bMouseAsPen;
if( mxShow.is() ) try
{
@@ -3251,7 +3251,7 @@ void SAL_CALL SlideshowImpl::setUseEraser( sal_Bool bMouseAsPen ) throw (Runtime
double SAL_CALL SlideshowImpl::getPenWidth() throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
return mdUserPaintStrokeWidth;
}
@@ -3259,7 +3259,7 @@ double SAL_CALL SlideshowImpl::getPenWidth() throw (RuntimeException)
void SAL_CALL SlideshowImpl::setPenWidth( double dStrokeWidth ) throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
mdUserPaintStrokeWidth = dStrokeWidth;
mbSwitchPenMode = true;
mbSwitchEraserMode = !mbSwitchPenMode;
@@ -3271,7 +3271,7 @@ void SAL_CALL SlideshowImpl::setPenWidth( double dStrokeWidth ) throw (RuntimeEx
sal_Int32 SAL_CALL SlideshowImpl::getPenColor() throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
return mnUserPaintColor;
}
@@ -3279,7 +3279,7 @@ sal_Int32 SAL_CALL SlideshowImpl::getPenColor() throw (RuntimeException)
void SAL_CALL SlideshowImpl::setPenColor( sal_Int32 nColor ) throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
mnUserPaintColor = nColor;
#ifdef ENABLE_PRESENTER_EXTRA_UI
mbSwitchPenMode = true;
@@ -3294,7 +3294,7 @@ void SAL_CALL SlideshowImpl::setPenColor( sal_Int32 nColor ) throw (RuntimeExcep
void SAL_CALL SlideshowImpl::setPenMode( bool bSwitchPenMode ) throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
mbSwitchPenMode = bSwitchPenMode;
if(mbSwitchPenMode == true){
@@ -3309,7 +3309,7 @@ void SAL_CALL SlideshowImpl::setPenMode( bool bSwitchPenMode ) throw (RuntimeExc
void SAL_CALL SlideshowImpl::setEraserMode(bool bSwitchEraserMode ) throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
mbSwitchEraserMode = bSwitchEraserMode;
if(mbSwitchEraserMode = true){
mbSwitchPenMode = false;
@@ -3327,7 +3327,7 @@ void SAL_CALL SlideshowImpl::setEraserMode(bool bSwitchEraserMode ) throw (Runti
void SAL_CALL SlideshowImpl::setEraseAllInk( bool bEraseAllInk ) throw (RuntimeException)
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list