[Libreoffice-commits] .: 6 commits - starmath/inc starmath/source sw/inc sw/source sw/util
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Mon Oct 25 19:27:41 PDT 2010
starmath/inc/symbol.hxx | 1
starmath/source/accessibility.cxx | 120 ++++++++--------
starmath/source/math_pch.cxx | 7
starmath/source/smdetect.cxx | 4
starmath/source/unodoc.cxx | 4
starmath/source/unomodel.cxx | 20 +-
sw/inc/IDocumentSettingAccess.hxx | 6
sw/inc/accmap.hxx | 14 -
sw/inc/doc.hxx | 8 -
sw/inc/pch/precompiled_sw.hxx | 4
sw/inc/unobaseclass.hxx | 4
sw/source/core/access/acccell.cxx | 36 ++---
sw/source/core/access/acccontext.cxx | 140 +++++++++----------
sw/source/core/access/acccontext.hxx | 2
sw/source/core/access/accdoc.cxx | 28 +--
sw/source/core/access/accembedded.cxx | 2
sw/source/core/access/accfootnote.cxx | 8 -
sw/source/core/access/accframebase.cxx | 16 +-
sw/source/core/access/accfrmobjmap.cxx | 6
sw/source/core/access/accfrmobjslist.cxx | 12 -
sw/source/core/access/accgraphic.cxx | 2
sw/source/core/access/accheaderfooter.cxx | 10 -
sw/source/core/access/acchyperlink.cxx | 12 -
sw/source/core/access/acchyperlink.hxx | 4
sw/source/core/access/accmap.cxx | 136 +++++++++----------
sw/source/core/access/accnotextframe.cxx | 8 -
sw/source/core/access/accpage.cxx | 14 -
sw/source/core/access/accpara.cxx | 88 ++++++------
sw/source/core/access/accpreview.cxx | 2
sw/source/core/access/accselectionhelper.cxx | 22 +--
sw/source/core/access/acctable.cxx | 60 ++++----
sw/source/core/access/acctextframe.cxx | 10 -
sw/source/core/bastyp/SwSmartTagMgr.cxx | 6
sw/source/core/doc/doc.cxx | 10 -
sw/source/core/doc/docchart.cxx | 4
sw/source/core/doc/docnew.cxx | 2
sw/source/core/unocore/SwXTextDefaults.cxx | 8 -
sw/source/core/unocore/unobkm.cxx | 40 ++---
sw/source/core/unocore/unochart.cxx | 74 +++++-----
sw/source/core/unocore/unocoll.cxx | 94 ++++++-------
sw/source/core/unocore/unodraw.cxx | 60 ++++----
sw/source/core/unocore/unofield.cxx | 54 +++----
sw/source/core/unocore/unoflatpara.cxx | 30 ++--
sw/source/core/unocore/unoframe.cxx | 58 ++++----
sw/source/core/unocore/unoftn.cxx | 32 ++--
sw/source/core/unocore/unoidx.cxx | 74 +++++-----
sw/source/core/unocore/unoobj.cxx | 92 ++++++------
sw/source/core/unocore/unoobj2.cxx | 44 +++---
sw/source/core/unocore/unoparagraph.cxx | 54 +++----
sw/source/core/unocore/unoport.cxx | 56 +++----
sw/source/core/unocore/unoportenum.cxx | 8 -
sw/source/core/unocore/unoredline.cxx | 22 +--
sw/source/core/unocore/unoredlines.cxx | 10 -
sw/source/core/unocore/unorefmk.cxx | 64 ++++-----
sw/source/core/unocore/unosect.cxx | 38 ++---
sw/source/core/unocore/unosett.cxx | 36 ++---
sw/source/core/unocore/unosrch.cxx | 18 +-
sw/source/core/unocore/unostyle.cxx | 78 +++++------
sw/source/core/unocore/unotbl.cxx | 170 ++++++++++++------------
sw/source/core/unocore/unotext.cxx | 64 ++++-----
sw/source/core/unocore/unotextmarkup.cxx | 10 -
sw/source/filter/xml/XMLRedlineImportHelper.cxx | 8 -
sw/source/filter/xml/xmlexp.cxx | 4
sw/source/filter/xml/xmlfmte.cxx | 2
sw/source/filter/xml/xmlimp.cxx | 10 -
sw/source/filter/xml/xmltbli.cxx | 7
sw/source/filter/xml/xmltexte.cxx | 2
sw/source/filter/xml/xmltexti.cxx | 12 -
sw/source/ui/dbui/dbmgr.cxx | 4
sw/source/ui/dbui/dbtree.cxx | 4
sw/source/ui/dbui/mailmergechildwindow.cxx | 6
sw/source/ui/dbui/mmoutputpage.cxx | 2
sw/source/ui/dochdl/swdtflvr.cxx | 2
sw/source/ui/docvw/SidebarTxtControlAcc.cxx | 10 -
sw/source/ui/docvw/SidebarWinAcc.cxx | 8 -
sw/source/ui/docvw/edtwin.cxx | 4
sw/source/ui/inc/unodispatch.hxx | 4
sw/source/ui/uiview/pview.cxx | 4
sw/source/ui/uiview/uivwimp.cxx | 6
sw/source/ui/uno/SwXDocumentSettings.cxx | 6
sw/source/ui/uno/SwXFilterOptions.cxx | 4
sw/source/ui/uno/dlelstnr.cxx | 12 -
sw/source/ui/uno/swdetect.cxx | 4
sw/source/ui/uno/unoatxt.cxx | 72 +++++-----
sw/source/ui/uno/unodispatch.cxx | 1
sw/source/ui/uno/unodoc.cxx | 8 -
sw/source/ui/uno/unomailmerge.cxx | 32 ++--
sw/source/ui/uno/unomod.cxx | 6
sw/source/ui/uno/unomodule.cxx | 8 -
sw/source/ui/uno/unotxdoc.cxx | 104 +++++++-------
sw/source/ui/uno/unotxvw.cxx | 114 ++++++++--------
sw/util/makefile.mk | 2
92 files changed, 1297 insertions(+), 1295 deletions(-)
New commits:
commit e619136503ebb5b16171213a1ecb7f8887b2946f
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Oct 21 15:48:07 2010 -0500
finally, gut the vos module out of the build
diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk
index 72f2420..3ad3fc0 100644
--- a/sw/util/makefile.mk
+++ b/sw/util/makefile.mk
@@ -114,7 +114,7 @@ SHL1STDLIBS+= \
$(UCBHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(VOSLIB) \
+ \
$(SALLIB) \
$(SALHELPERLIB) \
$(ICUUCLIB) \
commit 109342a308b43d44447f59c643f8874aaf8dba57
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Oct 21 15:31:31 2010 -0500
remvove vos/macros.h usage
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index 148f31a..0bfb8b0 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -29,7 +29,6 @@
#ifndef SYMBOL_HXX
#define SYMBOL_HXX
-#include <vos/refernce.hxx>
#include <vcl/font.hxx>
#include <tools/list.hxx>
#include <tools/debug.hxx>
diff --git a/starmath/source/math_pch.cxx b/starmath/source/math_pch.cxx
index 2e8d557..0aec1ea 100644
--- a/starmath/source/math_pch.cxx
+++ b/starmath/source/math_pch.cxx
@@ -111,7 +111,6 @@
#include <usr/sequ.hxx>
#include <uno/types.h>
#include <uno/macros.h>
-#include <vos/xception.hxx>
#include <osl/mutex.h>
#include <tools/shl.hxx>
#include <sfx2/module.hxx>
@@ -120,11 +119,8 @@
#include <usr/xiface.hxx>
#include <usr/ustring.hxx>
#include <salhelper/simplereferenceobject.hxx>
-#include <vos/types.hxx>
#include <osl/types.h>
#include <osl/interlck.h>
-#include <vos/object.hxx>
-#include <vos/macros.hxx>
#include <smdll.hxx>
#include <sfx2/sfxsids.hrc>
#include <chaos/cntids.hrc>
@@ -146,7 +142,6 @@
#include <smmod.hxx>
#include <osl/thread.hxx>
#include <osl/thread.h>
-#include <vos/runnable.hxx>
#include <vcl/apptypes.hxx>
#include <tools/dynary.hxx>
#include <vcl/metric.hxx>
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 4366dd5..b3610ac 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -60,7 +60,6 @@
#include <config.hxx>
#include <smdll.hxx>
-using namespace ::vos;
using namespace ::cppu;
using namespace ::std;
using namespace ::comphelper;
commit fe9ee8c7b57291ecb79bca20761c69a5de1d7070
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Oct 20 06:26:34 2010 -0500
rename osl::SolarMutexGuard -> SolarGuard to avoid namespace ambiguity
diff --git a/sw/source/ui/inc/unodispatch.hxx b/sw/source/ui/inc/unodispatch.hxx
index ff9b6f6..dc77100 100644
--- a/sw/source/ui/inc/unodispatch.hxx
+++ b/sw/source/ui/inc/unodispatch.hxx
@@ -50,7 +50,7 @@ class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper3
class DispatchMutexLock_Impl
{
//::osl::MutexGuard aGuard; #102295# solar mutex has to be used currently
- osl::SolarMutexGuard aGuard;
+ osl::SolarGuard aGuard;
DispatchMutexLock_Impl();
public:
DispatchMutexLock_Impl(SwXDispatchProviderInterceptor&);
commit 99b69249ec528250782eb8f7473935042e26312b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Oct 16 03:22:02 2010 -0500
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 21f70ee..6b8f72b 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -48,7 +48,7 @@
#include <vcl/window.hxx>
#include <vcl/unohelp2.hxx>
#include <tools/gen.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <svl/itemset.hxx>
#include <editeng/editobj.hxx>
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index 0348da1..8f21cc7 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.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/starmath/source/unodoc.cxx b/starmath/source/unodoc.cxx
index 591ee43..9fae49f 100644
--- a/starmath/source/unodoc.cxx
+++ b/starmath/source/unodoc.cxx
@@ -38,7 +38,7 @@
#include "smdll.hxx"
#include "document.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
using namespace ::com::sun::star;
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 79e1282..4366dd5 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -30,7 +30,7 @@
#include "precompiled_starmath.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <osl/mutex.hxx>
#include <sfx2/printer.hxx>
#include <vcl/svapp.hxx>
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index bccb96d..7170d76 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -31,7 +31,7 @@
#include <cppuhelper/weakref.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <rtl/ref.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <svx/IAccessibleViewForwarder.hxx>
#include <svx/IAccessibleParent.hxx>
#include <tools/debug.hxx>
@@ -88,8 +88,8 @@ typedef sal_uInt16 tAccessibleStates;
class SwAccessibleMap : public accessibility::IAccessibleViewForwarder,
public accessibility::IAccessibleParent
{
- mutable ::vos::OMutex maMutex;
- ::vos::OMutex maEventMutex;
+ mutable ::osl::Mutex maMutex;
+ ::osl::Mutex maEventMutex;
SwAccessibleContextMap_Impl *mpFrmMap;
SwAccessibleShapeMap_Impl *mpShapeMap;
SwShapeList_Impl *mpShapes;
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 2bea3ee..6784017 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -954,7 +954,7 @@
#include "vcl/wintypes.hxx"
#include "vcl/wrkwin.hxx"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
#include "rtl/ref.hxx"
#include "xmloff/DocumentSettingsContext.hxx"
diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx
index 047e099..2821e27 100644
--- a/sw/inc/unobaseclass.hxx
+++ b/sw/inc/unobaseclass.hxx
@@ -104,7 +104,7 @@ void ClientModify(SwClient* pClient, SfxPoolItem *pOld, SfxPoolItem *pNew);
#include <boost/utility.hpp>
#include <osl/diagnose.h>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
namespace sw {
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index 68705dd..d0ba1db 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -30,7 +30,7 @@
#include "precompiled_sw.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
@@ -123,7 +123,7 @@ sal_Bool SwAccessibleCell::_InvalidateMyCursorPos()
sal_Bool bNew = IsSelected();
sal_Bool bOld;
{
- vos::OGuard aGuard( aMutex );
+ osl::MutexGuard aGuard( aMutex );
bOld = bIsSelected;
bIsSelected = bNew;
}
@@ -212,7 +212,7 @@ void SwAccessibleCell::_InvalidateCursorPos()
sal_Bool SwAccessibleCell::HasCursor()
{
- vos::OGuard aGuard( aMutex );
+ osl::MutexGuard aGuard( aMutex );
return bIsSelected;
}
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 7f26742..ea03b7c 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -46,7 +46,7 @@
#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
@@ -106,7 +106,7 @@ void SwAccessibleContext::InitStates()
void SwAccessibleContext::SetParent( SwAccessibleContext *pParent )
{
- vos::OGuard aGuard( aMutex );
+ osl::MutexGuard aGuard( aMutex );
uno::Reference < XAccessible > xParent( pParent );
xWeakParent = xParent;
@@ -114,7 +114,7 @@ void SwAccessibleContext::SetParent( SwAccessibleContext *pParent )
uno::Reference< XAccessible > SwAccessibleContext::GetWeakParent() const
{
- vos::OGuard aGuard( aMutex );
+ osl::MutexGuard aGuard( aMutex );
uno::Reference< XAccessible > xParent( xWeakParent );
return xParent;
@@ -323,7 +323,7 @@ void SwAccessibleContext::Scrolled( const SwRect& rOldVisArea )
sal_Bool bIsOldShowingState;
sal_Bool bIsNewShowingState = IsShowing( *(GetMap()) );
{
- vos::OGuard aGuard( aMutex );
+ osl::MutexGuard aGuard( aMutex );
bIsOldShowingState = bIsShowingState;
bIsShowingState = bIsNewShowingState;
}
@@ -552,7 +552,7 @@ sal_Bool SwAccessibleContext::IsEditableState()
{
sal_Bool bRet;
{
- vos::OGuard aGuard( aMutex );
+ osl::MutexGuard aGuard( aMutex );
bRet = bIsEditableState;
}
@@ -663,7 +663,7 @@ uno::Reference< XAccessible> SAL_CALL SwAccessibleContext::getAccessibleParent (
// Remember the parent as weak ref.
{
- vos::OGuard aWeakParentGuard( aMutex );
+ osl::MutexGuard aWeakParentGuard( aMutex );
xWeakParent = xAcc;
}
@@ -1110,7 +1110,7 @@ void SwAccessibleContext::Dispose( sal_Bool bRecursive )
// set defunc state (its not required to broadcast a state changed
// event if the object is diposed afterwards)
{
- vos::OGuard aDefuncStateGuard( aMutex );
+ osl::MutexGuard aDefuncStateGuard( aMutex );
bIsDefuncState = sal_True;
}
@@ -1179,7 +1179,7 @@ void SwAccessibleContext::InvalidatePosOrSize( const SwRect& )
sal_Bool bIsOldShowingState;
sal_Bool bIsNewShowingState = IsShowing( *(GetMap()) );
{
- vos::OGuard aShowingStateGuard( aMutex );
+ osl::MutexGuard aShowingStateGuard( aMutex );
bIsOldShowingState = bIsShowingState;
bIsShowingState = bIsNewShowingState;
}
@@ -1336,7 +1336,7 @@ void SwAccessibleContext::InvalidateStates( tAccessibleStates _nStates )
sal_Bool bIsOldEditableState;
sal_Bool bIsNewEditableState = IsEditable( pVSh );
{
- vos::OGuard aGuard( aMutex );
+ osl::MutexGuard aGuard( aMutex );
bIsOldEditableState = bIsEditableState;
bIsEditableState = bIsNewEditableState;
}
@@ -1350,7 +1350,7 @@ void SwAccessibleContext::InvalidateStates( tAccessibleStates _nStates )
sal_Bool bIsOldOpaqueState;
sal_Bool bIsNewOpaqueState = IsOpaque( pVSh );
{
- vos::OGuard aGuard( aMutex );
+ osl::MutexGuard aGuard( aMutex );
bIsOldOpaqueState = bIsOpaqueState;
bIsOpaqueState = bIsNewOpaqueState;
}
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index 0bbb811..43612eb 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -71,7 +71,7 @@ class SwAccessibleContext :
protected:
mutable ::osl::Mutex aListenerMutex;
- mutable ::vos::OMutex aMutex;
+ mutable ::osl::Mutex aMutex;
private:
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 2660a0c..e93cf81 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -39,7 +39,7 @@
#include <unotools/accessiblestatesethelper.hxx>
#include <tools/link.hxx>
#include <sfx2/viewsh.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <viewsh.hxx>
#include <doc.hxx>
diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx
index 6043c4d..6cfea84 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -30,7 +30,7 @@
#include "precompiled_sw.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <unotools/accessiblestatesethelper.hxx>
diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx
index 894acec..647258c 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -33,7 +33,7 @@
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <unotools/accessiblestatesethelper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <frmfmt.hxx>
@@ -153,7 +153,7 @@ void SwAccessibleFrameBase::_InvalidateCursorPos()
sal_Bool bOldSelected;
{
- vos::OGuard aGuard( aMutex );
+ osl::MutexGuard aGuard( aMutex );
bOldSelected = bIsSelected;
bIsSelected = bNewSelected;
}
@@ -196,7 +196,7 @@ void SwAccessibleFrameBase::_InvalidateFocus()
sal_Bool bSelected;
{
- vos::OGuard aGuard( aMutex );
+ osl::MutexGuard aGuard( aMutex );
bSelected = bIsSelected;
}
ASSERT( bSelected, "focus object should be selected" );
@@ -208,7 +208,7 @@ void SwAccessibleFrameBase::_InvalidateFocus()
sal_Bool SwAccessibleFrameBase::HasCursor()
{
- vos::OGuard aGuard( aMutex );
+ osl::MutexGuard aGuard( aMutex );
return bIsSelected;
}
diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx
index 8730fff..c1e2697 100644
--- a/sw/source/core/access/accheaderfooter.cxx
+++ b/sw/source/core/access/accheaderfooter.cxx
@@ -30,7 +30,7 @@
#include "precompiled_sw.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <unotools/accessiblestatesethelper.hxx>
diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx
index 21a8f5d..4967f02 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -30,7 +30,7 @@
#include "precompiled_sw.hxx"
#include <comphelper/accessiblekeybindinghelper.hxx>
#include <swurl.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <ndtxt.hxx>
#include <txtinet.hxx>
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index aeeae16..e8df924 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -856,7 +856,7 @@ void SwAccessibleMap::FireEvent( const SwAccessibleEvent_Impl& rEvent )
void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent )
{
- vos::OGuard aGuard( maEventMutex );
+ osl::MutexGuard aGuard( maEventMutex );
if( !mpEvents )
mpEvents = new SwAccessibleEventList_Impl;
@@ -1012,7 +1012,7 @@ void SwAccessibleMap::DoInvalidateShapeSelection()
sal_uInt16 nSelShapes = pFESh ? pFESh->IsObjSelected() : 0;
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
if( mpShapeMap )
pShapes = mpShapeMap->Copy( nShapes, pFESh, &pSelShape );
}
@@ -1063,7 +1063,7 @@ void SwAccessibleMap::DoInvalidateShapeSelection()
{
::rtl::Reference< SwAccessibleContext > xParentAccImpl;
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
if( mpFrmMap )
{
SwAccessibleContextMap_Impl::const_iterator aMapIter =
@@ -1107,7 +1107,7 @@ void SwAccessibleMap::DoInvalidateShapeFocus()
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
if( mpShapeMap )
pShapes = mpShapeMap->Copy( nShapes, pFESh, &pSelShape );
}
@@ -1157,7 +1157,7 @@ SwAccessibleMap::~SwAccessibleMap()
{
uno::Reference < XAccessible > xAcc;
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
if( mpFrmMap )
{
const SwRootFrm *pRootFrm = GetShell()->GetLayout();
@@ -1174,7 +1174,7 @@ SwAccessibleMap::~SwAccessibleMap()
pAcc->Dispose( sal_True );
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
#ifdef DBG_UTIL
ASSERT( !mpFrmMap || mpFrmMap->empty(),
"Frame map should be empty after disposing the root frame" );
@@ -1225,7 +1225,7 @@ SwAccessibleMap::~SwAccessibleMap()
mpPreview = NULL;
{
- vos::OGuard aGuard( maEventMutex );
+ osl::MutexGuard aGuard( maEventMutex );
#ifdef DBG_UTIL
ASSERT( !(mpEvents || mpEventMap), "pending events" );
if( mpEvents )
@@ -1260,7 +1260,7 @@ uno::Reference< XAccessible > SwAccessibleMap::_GetDocumentView(
sal_Bool bSetVisArea = sal_False;
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
if( !mpFrmMap )
{
@@ -1345,7 +1345,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm,
sal_Bool bOldShapeSelected = sal_False;
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
if( !mpFrmMap && bCreate )
mpFrmMap = new SwAccessibleContextMap_Impl;
@@ -1489,7 +1489,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext(
uno::Reference < XAccessible > xOldCursorAcc;
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
if( !mpShapeMap && bCreate )
mpShapeMap = new SwAccessibleShapeMap_Impl( this );
@@ -1562,7 +1562,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext(
void SwAccessibleMap::RemoveContext( const SwFrm *pFrm )
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
if( mpFrmMap )
{
@@ -1599,7 +1599,7 @@ void SwAccessibleMap::RemoveContext( const SwFrm *pFrm )
void SwAccessibleMap::RemoveContext( const SdrObject *pObj )
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
if( mpShapeMap )
{
@@ -1644,7 +1644,7 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
::rtl::Reference< ::accessibility::AccessibleShape > xShapeAccImpl;
// get accessible context for frame
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
// First of all look for an accessible context for a frame
if( aFrmOrObj.GetSwFrm() && mpFrmMap )
@@ -1708,7 +1708,7 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
// remove events stored for the frame
{
- vos::OGuard aGuard( maEventMutex );
+ osl::MutexGuard aGuard( maEventMutex );
if( mpEvents )
{
SwAccessibleEventMap_Impl::iterator aIter =
@@ -1761,7 +1761,7 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm,
::rtl::Reference< SwAccessibleContext > xAccImpl;
::rtl::Reference< SwAccessibleContext > xParentAccImpl;
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
if( mpFrmMap )
{
@@ -1842,7 +1842,7 @@ void SwAccessibleMap::InvalidateContent( const SwFrm *pFrm )
{
uno::Reference < XAccessible > xAcc;
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
if( mpFrmMap )
{
@@ -1880,7 +1880,7 @@ void SwAccessibleMap::InvalidateAttr( const SwTxtFrm& rTxtFrm )
{
uno::Reference < XAccessible > xAcc;
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
if( mpFrmMap )
{
@@ -1951,7 +1951,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
sal_Bool bOldShapeSelected = sal_False;
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
xOldAcc = mxCursorContext;
mxCursorContext = xAcc; // clear reference
@@ -2008,7 +2008,7 @@ void SwAccessibleMap::InvalidateFocus()
uno::Reference < XAccessible > xAcc;
sal_Bool bShapeSelected;
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
xAcc = mxCursorContext;
bShapeSelected = mbShapeSelected;
@@ -2029,7 +2029,7 @@ void SwAccessibleMap::InvalidateFocus()
void SwAccessibleMap::SetCursorContext(
const ::rtl::Reference < SwAccessibleContext >& rCursorContext )
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
uno::Reference < XAccessible > xAcc( rCursorContext.get() );
mxCursorContext = xAcc;
}
@@ -2072,7 +2072,7 @@ void SwAccessibleMap::_InvalidateRelationSet( const SwFrm* pFrm,
{
uno::Reference < XAccessible > xAcc;
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
if( mpFrmMap )
{
@@ -2133,7 +2133,7 @@ void SwAccessibleMap::InvalidateParaTextSelection( const SwTxtFrm& _rTxtFrm )
{
uno::Reference < XAccessible > xAcc;
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
if( mpFrmMap )
{
@@ -2179,7 +2179,7 @@ sal_Int32 SwAccessibleMap::GetChildIndex( const SwFrm& rParentFrm,
{
uno::Reference < XAccessible > xAcc;
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
if( mpFrmMap )
{
@@ -2225,7 +2225,7 @@ void SwAccessibleMap::UpdatePreview( const std::vector<PrevwPage*>& _rPrevwPages
uno::Reference < XAccessible > xOldAcc;
uno::Reference < XAccessible > xAcc;
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
xOldAcc = mxCursorContext;
@@ -2255,7 +2255,7 @@ void SwAccessibleMap::InvalidatePreViewSelection( sal_uInt16 nSelPage )
uno::Reference < XAccessible > xOldAcc;
uno::Reference < XAccessible > xAcc;
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
xOldAcc = mxCursorContext;
@@ -2285,7 +2285,7 @@ sal_Bool SwAccessibleMap::IsPageSelected( const SwPageFrm *pPageFrm ) const
void SwAccessibleMap::FireEvents()
{
{
- vos::OGuard aGuard( maEventMutex );
+ osl::MutexGuard aGuard( maEventMutex );
if( mpEvents )
{
mpEvents->SetFiring();
@@ -2304,7 +2304,7 @@ void SwAccessibleMap::FireEvents()
}
}
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
if( mpShapes )
{
delete mpShapes;
@@ -2406,7 +2406,7 @@ sal_Bool SwAccessibleMap::ReplaceChild (
{
const SdrObject *pObj = 0;
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
if( mpShapeMap )
{
SwAccessibleShapeMap_Impl::const_iterator aIter = mpShapeMap->begin();
@@ -2436,7 +2436,7 @@ sal_Bool SwAccessibleMap::ReplaceChild (
Dispose( 0, pObj, 0 );
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
if( !mpShapeMap )
mpShapeMap = new SwAccessibleShapeMap_Impl( this );
@@ -2675,7 +2675,7 @@ SwAccessibleSelectedParas_Impl* SwAccessibleMap::_BuildSelectedParas()
void SwAccessibleMap::InvalidateTextSelectionOfAllParas()
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
// keep previously known selected paragraphs
SwAccessibleSelectedParas_Impl* pPrevSelectedParas( mpSelectedParas );
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index a832fe1..fb5bc5b 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -30,7 +30,7 @@
#include "precompiled_sw.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index 06a08ef..a1015ca 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -85,7 +85,7 @@ void SwAccessiblePage::_InvalidateCursorPos()
sal_Bool bOldSelected;
{
- vos::OGuard aGuard( aMutex );
+ osl::MutexGuard aGuard( aMutex );
bOldSelected = bIsSelected;
bIsSelected = bNewSelected;
}
@@ -114,7 +114,7 @@ void SwAccessiblePage::_InvalidateFocus()
sal_Bool bSelected;
{
- vos::OGuard aGuard( aMutex );
+ osl::MutexGuard aGuard( aMutex );
bSelected = bIsSelected;
}
ASSERT( bSelected, "focus object should be selected" );
@@ -147,7 +147,7 @@ SwAccessiblePage::~SwAccessiblePage()
sal_Bool SwAccessiblePage::HasCursor()
{
- vos::OGuard aGuard( aMutex );
+ osl::MutexGuard aGuard( aMutex );
return bIsSelected;
}
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 16a9736..f774805 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -39,7 +39,7 @@
#include <accmap.hxx>
#include <fesh.hxx>
#include <viewopt.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <rtl/ustrbuf.hxx>
@@ -405,7 +405,7 @@ void SwAccessibleParagraph::_InvalidateContent( sal_Bool bVisibleDataFired )
sal_Bool bNewIsHeading = IsHeading();
sal_Bool bOldIsHeading;
{
- vos::OGuard aGuard( aMutex );
+ osl::MutexGuard aGuard( aMutex );
bOldIsHeading = bIsHeading;
if( bIsHeading != bNewIsHeading )
bIsHeading = bNewIsHeading;
@@ -417,7 +417,7 @@ void SwAccessibleParagraph::_InvalidateContent( sal_Bool bVisibleDataFired )
::rtl::OUString sNewDesc( GetDescription() );
::rtl::OUString sOldDesc;
{
- vos::OGuard aGuard( aMutex );
+ osl::MutexGuard aGuard( aMutex );
sOldDesc = sDesc;
if( sDesc != sNewDesc )
sDesc = sNewDesc;
@@ -442,7 +442,7 @@ void SwAccessibleParagraph::_InvalidateCursorPos()
sal_Int32 nNew = GetCaretPos();
sal_Int32 nOld;
{
- vos::OGuard aGuard( aMutex );
+ osl::MutexGuard aGuard( aMutex );
nOld = nOldCaretPos;
nOldCaretPos = nNew;
}
@@ -481,7 +481,7 @@ void SwAccessibleParagraph::_InvalidateFocus()
{
sal_Int32 nPos;
{
- vos::OGuard aGuard( aMutex );
+ osl::MutexGuard aGuard( aMutex );
nPos = nOldCaretPos;
}
ASSERT( nPos != -1, "focus object should be selected" );
@@ -532,7 +532,7 @@ SwAccessibleParagraph::~SwAccessibleParagraph()
sal_Bool SwAccessibleParagraph::HasCursor()
{
- vos::OGuard aGuard( aMutex );
+ osl::MutexGuard aGuard( aMutex );
return nOldCaretPos != -1;
}
@@ -838,7 +838,7 @@ sal_Bool SwAccessibleParagraph::GetTextBoundary(
CHECK_FOR_DEFUNC( XAccessibleContext );
- vos::OGuard aGuard2( aMutex );
+ osl::MutexGuard aGuard2( aMutex );
if( !sDesc.getLength() )
sDesc = GetDescription();
@@ -1146,7 +1146,7 @@ sal_Int32 SwAccessibleParagraph::getCaretPosition()
sal_Int32 nRet = GetCaretPos();
{
- vos::OGuard aOldCaretPosGuard( aMutex );
+ osl::MutexGuard aOldCaretPosGuard( aMutex );
ASSERT( nRet == nOldCaretPos, "caret pos out of sync" );
nOldCaretPos = nRet;
}
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index 2711282..2a4bf50 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -28,7 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <rtl/uuid.h>
#include <rtl/ustrbuf.hxx>
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index ef6b0c3..8d52032 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -31,7 +31,7 @@
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <rtl/uuid.h>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/sw/source/core/bastyp/SwSmartTagMgr.cxx b/sw/source/core/bastyp/SwSmartTagMgr.cxx
index dbed1c7..f4d4c77 100644
--- a/sw/source/core/bastyp/SwSmartTagMgr.cxx
+++ b/sw/source/core/bastyp/SwSmartTagMgr.cxx
@@ -30,7 +30,7 @@
#include "precompiled_sw.hxx"
#include "SwSmartTagMgr.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <swmodule.hxx>
diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx
index 5a2d7ef..7628704 100644
--- a/sw/source/core/doc/docchart.cxx
+++ b/sw/source/core/doc/docchart.cxx
@@ -53,7 +53,7 @@
#include <swtblfmt.hxx>
#include <tblsel.hxx>
#include <cellatr.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <unochart.hxx>
diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx
index 7930463..5e45817 100644
--- a/sw/source/core/unocore/SwXTextDefaults.cxx
+++ b/sw/source/core/unocore/SwXTextDefaults.cxx
@@ -31,7 +31,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <SwXTextDefaults.hxx>
diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx
index 39a17d1..27b39c1 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -30,7 +30,7 @@
#include "precompiled_sw.hxx"
#include <unobookmark.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <TextCursorHelper.hxx>
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index c82d500..ef57f01 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -35,7 +35,7 @@
#include <com/sun/star/chart/ChartDataRowSource.hpp>
#include <com/sun/star/chart2/data/LabelOrigin.hpp>
#include <cppuhelper/interfacecontainer.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <svl/zforlist.hxx> // SvNumberFormatter
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 381c834..67073a9 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -48,7 +48,7 @@
#include <txtftn.hxx>
#include <fmtpdsc.hxx>
#include <pagedesc.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <com/sun/star/text/XTextTableCursor.hpp>
#include <com/sun/star/text/XTextTablesSupplier.hpp>
#include <com/sun/star/text/TableColumnSeparator.hpp>
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 3bf8c57..1ba1140 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -68,7 +68,7 @@
#include <editeng/ulspitem.hxx>
#include <svx/shapepropertynotifier.hxx>
#include <crstate.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <comphelper/extract.hxx>
#include <comphelper/stl_types.hxx>
#include <comphelper/makesequence.hxx>
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index ec7c0bc..9cdbda4 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -88,7 +88,7 @@
#include <svx/dataaccessdescriptor.hxx>
#define _SVSTDARR_STRINGS
#include <svl/svstdarr.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <textapi.hxx>
#include <editeng/outliner.hxx>
diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx
index 35f678e..2090dc7 100644
--- a/sw/source/core/unocore/unoflatpara.cxx
+++ b/sw/source/core/unocore/unoflatpara.cxx
@@ -34,7 +34,7 @@
#include <unobaseclass.hxx>
#include <unoflatpara.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <com/sun/star/text/TextMarkupType.hpp>
#include <unotextmarkup.hxx>
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index f7da9ef..a2abf2d 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -103,7 +103,7 @@
#include <frmatr.hxx>
#include <ndtxt.hxx>
#include <ndgrf.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <sfx2/printer.hxx>
#include <SwStyleNameMapper.hxx>
diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx
index c1e7fa3..3d24614 100644
--- a/sw/source/core/unocore/unoftn.cxx
+++ b/sw/source/core/unocore/unoftn.cxx
@@ -31,7 +31,7 @@
#include <rtl/uuid.h>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <comphelper/sequence.hxx>
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 8e213f0..3ecc8bf 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -38,7 +38,7 @@
#include <com/sun/star/text/XTextDocument.hpp>
#include <tools/debug.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <editeng/unolingu.hxx>
#include <com/sun/star/text/ChapterFormat.hpp>
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 63d8321..16d4a81 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -106,7 +106,7 @@
#include <unoidx.hxx>
#include <unoframe.hxx>
#include <fmthdft.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <fmtflcnt.hxx>
#define _SVSTDARR_USHORTS
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index b534aad..23019ef 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -105,7 +105,7 @@
#include <unoidx.hxx>
#include <unoframe.hxx>
#include <fmthdft.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <fmtflcnt.hxx>
#define _SVSTDARR_USHORTS
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index 84ca2d2..1f80831 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -42,7 +42,7 @@
#include <unocrsrhelper.hxx>
#include <doc.hxx>
#include <ndtxt.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <docsh.hxx>
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index 5d2f7ed..4dd5779 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -31,7 +31,7 @@
#include <cmdid.h>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <svl/itemprop.hxx>
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index fa5e769..db17de9 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -58,7 +58,7 @@
#include <unoidx.hxx>
#include <redline.hxx>
#include <crsskip.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <set>
diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx
index bad37bf..ffe3050 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -33,7 +33,7 @@
#include <com/sun/star/text/XTextTable.hpp>
#include <rtl/ustrbuf.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <pagedesc.hxx>
diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx
index 8bcd58f..a27f22f 100644
--- a/sw/source/core/unocore/unoredlines.cxx
+++ b/sw/source/core/unocore/unoredlines.cxx
@@ -32,7 +32,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <tools/debug.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <unoredlines.hxx>
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index 4a2b1bb..8c25664 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <unomid.h>
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index 2f5c74a..2cf2cfb 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -39,7 +39,7 @@
#include <editeng/xmlcnitm.hxx>
#include <sfx2/linkmgr.hxx>
#include <sfx2/lnkbase.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <fmtclds.hxx>
#include <unotextrange.hxx>
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index b055021..799132c 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -66,7 +66,7 @@
#include <editeng/flstitem.hxx>
#include <vcl/metric.hxx>
#include <svtools/ctrltool.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <editeng/unofdesc.hxx>
diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx
index 5c6d3bd..c162b54 100644
--- a/sw/source/core/unocore/unosrch.cxx
+++ b/sw/source/core/unocore/unosrch.cxx
@@ -36,7 +36,7 @@
#include <unobaseclass.hxx>
#include <unomid.h>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include "editeng/unolingu.hxx"
#include <com/sun/star/util/SearchOptions.hpp>
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index b53bfe3..8f58968 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -31,7 +31,7 @@
#include <svx/svxids.hrc>
#include <hintids.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <svl/smplhint.hxx>
#include <svtools/ctrltool.hxx>
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index b29e41b..4792cf1 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -94,7 +94,7 @@
#include <editeng/keepitem.hxx>
#include <fmtlsplt.hxx>
#include <swundo.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <SwStyleNameMapper.hxx>
#include <frmatr.hxx>
#include <crsskip.hxx>
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index c0890d2..4e82ffe 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -36,7 +36,7 @@
#include <rtl/uuid.h>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <comphelper/sequence.hxx>
diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx
index a61a760..4776dd1 100644
--- a/sw/source/core/unocore/unotextmarkup.cxx
+++ b/sw/source/core/unocore/unotextmarkup.cxx
@@ -30,7 +30,7 @@
#include "precompiled_sw.hxx"
#include <unotextmarkup.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <SwSmartTagMgr.hxx>
#include <com/sun/star/text/TextMarkupType.hpp>
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index 3657067..c9ea0bd 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -43,7 +43,7 @@
// for locking SolarMutex: svapp + mutex
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 54e551c..ba0bde7 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -66,7 +66,7 @@
// for locking SolarMutex: svapp + mutex
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
// --> OD 2007-03-30 #i73788#
#include <pausethreadstarting.hxx>
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index ce938dd..ae53a81 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -69,7 +69,7 @@
// for locking SolarMutex: svapp + mutex
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <unotxdoc.hxx> // for initXForms()
#include <xmloff/xmlmetai.hxx>
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 7767de6..fa24bb3 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -66,7 +66,7 @@
// for locking SolarMutex: svapp + mutex
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include "ndtxt.hxx"
using ::rtl::OUString;
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 5c2eece..654a26c 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -67,7 +67,7 @@
// for locking SolarMutex: svapp + mutex
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <svtools/embedhlp.hxx>
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 106c3be..465e139 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -124,7 +124,7 @@
#include <sfx2/event.hxx>
#include <vcl/msgbox.hxx>
#include <svx/dataaccessdescriptor.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <rtl/textenc.h>
#include <ndindex.hxx>
#include <pam.hxx>
@@ -2944,7 +2944,7 @@ SwConnectionDisposedListener_Impl::~SwConnectionDisposedListener_Impl()
void SwConnectionDisposedListener_Impl::disposing( const EventObject& rSource )
throw (RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
uno::Reference<XConnection> xSource(rSource.Source, UNO_QUERY);
for(USHORT nPos = rDBMgr.aDataSourceParams.Count(); nPos; nPos--)
{
diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx
index 61dd3d5..a717f84 100644
--- a/sw/source/ui/dbui/dbtree.cxx
+++ b/sw/source/ui/dbui/dbtree.cxx
@@ -51,7 +51,7 @@
#include <view.hxx>
#include <wrtsh.hxx>
#include <dbtree.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <helpid.h>
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 77b1a92..2559912 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -67,7 +67,7 @@
#include <com/sun/star/sdb/XColumn.hpp>
#include <dbmgr.hxx>
#include <swunohelper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <shellio.hxx>
#include <svtools/htmlcfg.hxx>
#include <sfx2/event.hxx>
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 63fc77f..f981296 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -135,7 +135,7 @@
#include <SwRewriter.hxx>
#include <undobj.hxx>
#include <globals.hrc>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <swserv.hxx>
diff --git a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
index c1f22d3..845de5f 100644
--- a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
+++ b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
@@ -181,7 +181,7 @@ class SidebarTxtControlAccessibleContext : public VCLXAccessibleComponent
SidebarTxtControl& mrSidebarTxtControl;
::accessibility::AccessibleTextHelper* mpAccessibleTextHelper;
- ::vos::OMutex maMutex;
+ ::osl::Mutex maMutex;
void defunc();
};
@@ -212,7 +212,7 @@ void SidebarTxtControlAccessibleContext::defunc()
sal_Int32 SAL_CALL SidebarTxtControlAccessibleContext::getAccessibleChildCount()
throw (::com::sun::star::uno::RuntimeException)
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
sal_Int32 nChildCount( 0 );
@@ -227,7 +227,7 @@ sal_Int32 SAL_CALL SidebarTxtControlAccessibleContext::getAccessibleChildCount()
css::uno::Reference< css::accessibility::XAccessible > SAL_CALL SidebarTxtControlAccessibleContext::getAccessibleChild( sal_Int32 i )
throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException )
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
css::uno::Reference< css::accessibility::XAccessible > xChild;
@@ -243,7 +243,7 @@ void SAL_CALL SidebarTxtControlAccessibleContext::addEventListener (
const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener)
throw (css::uno::RuntimeException)
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
if ( mpAccessibleTextHelper )
{
@@ -255,7 +255,7 @@ void SAL_CALL SidebarTxtControlAccessibleContext::removeEventListener (
const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener)
throw (css::uno::RuntimeException)
{
- vos::OGuard aGuard( maMutex );
+ osl::MutexGuard aGuard( maMutex );
if ( mpAccessibleTextHelper )
{
diff --git a/sw/source/ui/docvw/SidebarWinAcc.cxx b/sw/source/ui/docvw/SidebarWinAcc.cxx
index ff3f7ae..e55ce35 100644
--- a/sw/source/ui/docvw/SidebarWinAcc.cxx
+++ b/sw/source/ui/docvw/SidebarWinAcc.cxx
@@ -67,7 +67,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
void ChangeAnchor( const SwFrm* pAnchorFrm )
{
- vos::OGuard aGuard(maMutex);
+ osl::MutexGuard aGuard(maMutex);
mpAnchorFrm = pAnchorFrm;
}
@@ -75,7 +75,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleParent() throw (css::uno::RuntimeException)
{
- vos::OGuard aGuard(maMutex);
+ osl::MutexGuard aGuard(maMutex);
css::uno::Reference< css::accessibility::XAccessible > xAccParent;
@@ -90,7 +90,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException)
{
- vos::OGuard aGuard(maMutex);
+ osl::MutexGuard aGuard(maMutex);
sal_Int32 nIndex( -1 );
@@ -108,7 +108,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
ViewShell& mrViewShell;
const SwFrm* mpAnchorFrm;
- ::vos::OMutex maMutex;
+ ::osl::Mutex maMutex;
};
// =============================================================================
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 01785d7..197c4d5 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -131,7 +131,7 @@
#include <pagedesc.hxx>
#include <svtools/ruler.hxx> // #i23726#
#include "formatclipboard.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <IMark.hxx>
diff --git a/sw/source/ui/inc/unodispatch.hxx b/sw/source/ui/inc/unodispatch.hxx
index 1623788..ff9b6f6 100644
--- a/sw/source/ui/inc/unodispatch.hxx
+++ b/sw/source/ui/inc/unodispatch.hxx
@@ -36,7 +36,7 @@
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/implbase3.hxx>
#include <list>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
class SwView;
@@ -50,7 +50,7 @@ class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper3
class DispatchMutexLock_Impl
{
//::osl::MutexGuard aGuard; #102295# solar mutex has to be used currently
- vos::OGuard aGuard;
+ osl::SolarMutexGuard aGuard;
DispatchMutexLock_Impl();
public:
DispatchMutexLock_Impl(SwXDispatchProviderInterceptor&);
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index 5572f6f..45da8ea 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -92,7 +92,7 @@
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/ui/uiview/uivwimp.cxx b/sw/source/ui/uiview/uivwimp.cxx
index b2dec0f..3350d8d 100644
--- a/sw/source/ui/uiview/uivwimp.cxx
+++ b/sw/source/ui/uiview/uivwimp.cxx
@@ -39,7 +39,7 @@
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/msgbox.hxx>
diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx
index 60b883b..4b1740e 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.cxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.cxx
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <sfx2/sfxbasecontroller.hxx>
#include <SwXDocumentSettings.hxx>
#include <SwXPrintPreviewSettings.hxx>
diff --git a/sw/source/ui/uno/SwXFilterOptions.cxx b/sw/source/ui/uno/SwXFilterOptions.cxx
index cd9e3db..03e5e75 100644
--- a/sw/source/ui/uno/SwXFilterOptions.cxx
+++ b/sw/source/ui/uno/SwXFilterOptions.cxx
@@ -32,7 +32,7 @@
#include <shellio.hxx>
#include <swdll.hxx>
#include <unoprnms.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
#include <com/sun/star/lang/XUnoTunnel.hpp>
diff --git a/sw/source/ui/uno/dlelstnr.cxx b/sw/source/ui/uno/dlelstnr.cxx
index 7ac1932..254d2e6 100644
--- a/sw/source/ui/uno/dlelstnr.cxx
+++ b/sw/source/ui/uno/dlelstnr.cxx
@@ -40,7 +40,7 @@
#include <com/sun/star/uno/Reference.h>
#include <comphelper/processfactory.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <tools/shl.hxx>
#include "dlelstnr.hxx"
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index a69250f..e32c96e 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -52,7 +52,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/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index 81faf76..c05d258 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -33,7 +33,7 @@
#define _SVSTDARR_STRINGS
#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <osl/diagnose.h>
#include <vcl/svapp.hxx>
#include <svl/svstdarr.hxx>
diff --git a/sw/source/ui/uno/unodispatch.cxx b/sw/source/ui/uno/unodispatch.cxx
index df70e3b..7f40376 100644
--- a/sw/source/ui/uno/unodispatch.cxx
+++ b/sw/source/ui/uno/unodispatch.cxx
@@ -44,7 +44,6 @@
using namespace ::com::sun::star;
using namespace rtl;
-using namespace vos;
const char* cURLStart = ".uno:DataSourceBrowser/";
const char* cURLFormLetter = ".uno:DataSourceBrowser/FormLetter";
diff --git a/sw/source/ui/uno/unodoc.cxx b/sw/source/ui/uno/unodoc.cxx
index 387e0ef..400c2c5 100644
--- a/sw/source/ui/uno/unodoc.cxx
+++ b/sw/source/ui/uno/unodoc.cxx
@@ -37,7 +37,7 @@
#include "docsh.hxx"
#include "globdoc.hxx"
#include "wdocsh.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx
index 8532816..7a11f86 100644
--- a/sw/source/ui/uno/unomailmerge.cxx
+++ b/sw/source/ui/uno/unomailmerge.cxx
@@ -31,7 +31,7 @@
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <osl/mutex.hxx>
#include <svl/itemprop.hxx>
#include <svl/urihelper.hxx>
diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx
index ca3e6aa..c99beb5 100644
--- a/sw/source/ui/uno/unomod.cxx
+++ b/sw/source/ui/uno/unomod.cxx
@@ -43,7 +43,7 @@
#include <docsh.hxx>
#include <wrtsh.hxx>
#include <viewopt.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <com/sun/star/text/NotePrintMode.hpp>
#include <doc.hxx>
diff --git a/sw/source/ui/uno/unomodule.cxx b/sw/source/ui/uno/unomodule.cxx
index 49db513..12f4736 100644
--- a/sw/source/ui/uno/unomodule.cxx
+++ b/sw/source/ui/uno/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/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 0b22344..095dd54 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/image.hxx>
#include <vcl/virdev.hxx>
#include <vcl/svapp.hxx>
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 5b0f6e8..a4c276c 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -61,7 +61,7 @@
#include <sfx2/bindings.hxx>
#include <sfx2/request.hxx>
#include <frmatr.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <IMark.hxx>
#include <unotxdoc.hxx>
#include <unodraw.hxx>
commit e93d748106a8e52a88ce11d2fb3e0651505dd677
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Oct 15 11:44:38 2010 -0500
merge vosremoval-reference.diff
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 6808371..21f70ee 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -64,7 +64,7 @@
#include <document.hxx>
#include <view.hxx>
-using namespace rtl;
+using rtl::OUString;
using namespace com::sun::star;
using namespace com::sun::star::lang;
using namespace com::sun::star::uno;
diff --git a/starmath/source/math_pch.cxx b/starmath/source/math_pch.cxx
index 4c9f622..2e8d557 100644
--- a/starmath/source/math_pch.cxx
+++ b/starmath/source/math_pch.cxx
@@ -119,7 +119,7 @@
#include <usr/uno.hxx>
#include <usr/xiface.hxx>
#include <usr/ustring.hxx>
-#include <vos/refernce.hxx>
+#include <salhelper/simplereferenceobject.hxx>
#include <vos/types.hxx>
#include <osl/types.h>
#include <osl/interlck.h>
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 205a85d..79e1282 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -61,7 +61,6 @@
#include <smdll.hxx>
using namespace ::vos;
-using namespace ::rtl;
using namespace ::cppu;
using namespace ::std;
using namespace ::comphelper;
@@ -74,6 +73,8 @@ using namespace ::com::sun::star::view;
using namespace ::com::sun::star::script;
+using rtl::OUString;
+
#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
#define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L))
diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx
index 6270f9c..2c8c5ab 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -30,7 +30,7 @@
#define IDOCUMENTSETTINGACCESS_HXX_INCLUDED
#include <tools/solar.h>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#include <chcmprse.hxx>
#include <fldupde.hxx>
@@ -147,14 +147,14 @@ namespace com { namespace sun { namespace star { namespace i18n { struct Forbidd
@returns
the forbidden characters table.
*/
- virtual vos::ORef<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() = 0;
+ virtual rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() = 0;
/** Get the forbidden character table.
@returns
the forbidden characters table.
*/
- virtual const vos::ORef<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() const = 0;
+ virtual const rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() const = 0;
/** Get the current link update mode.
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 2906afa..bccb96d 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -30,7 +30,7 @@
#include <cppuhelper/weakref.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#include <vos/mutex.hxx>
#include <svx/IAccessibleViewForwarder.hxx>
#include <svx/IAccessibleParent.hxx>
@@ -157,7 +157,7 @@ public:
const SwPageFrm* _pSelectedPageFrm,
const Size& _rPrevwWinSize );
- ::vos::ORef < SwAccessibleContext > GetContextImpl(
+ ::rtl::Reference < SwAccessibleContext > GetContextImpl(
const SwFrm *pFrm,
sal_Bool bCreate = sal_True );
::com::sun::star::uno::Reference<
@@ -165,7 +165,7 @@ public:
const SwFrm *pFrm,
sal_Bool bCreate = sal_True );
- ::vos::ORef < ::accessibility::AccessibleShape > GetContextImpl(
+ ::rtl::Reference < ::accessibility::AccessibleShape > GetContextImpl(
const SdrObject *pObj,
SwAccessibleContext *pParentImpl,
sal_Bool bCreate = sal_True );
@@ -221,7 +221,7 @@ public:
void InvalidateFocus();
void SetCursorContext(
- const ::vos::ORef < SwAccessibleContext >& rCursorContext );
+ const ::rtl::Reference < SwAccessibleContext >& rCursorContext );
// Invalidate state of whole tree. If an action is open, this call
// is processed when the last action ends.
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 91048bd..9a78865 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -74,7 +74,7 @@ class SwList;
#include <chcmprse.hxx>
#include <com/sun/star/linguistic2/XSpellChecker1.hpp>
#include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#include <svx/svdtypes.hxx>
#include <svl/style.hxx>
#include <editeng/numitem.hxx>
@@ -407,7 +407,7 @@ class SW_DLLPUBLIC SwDoc :
SwChartLockController_Helper *pChartControllerHelper;
// table of forbidden characters of this document
- vos::ORef<SvxForbiddenCharactersTable> xForbiddenCharsTable;
+ rtl::Reference<SvxForbiddenCharactersTable> xForbiddenCharsTable;
com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor > mxVbaEvents;
com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> m_xTemplateToProjectCache;
// --> OD 2007-10-26 #i83479#
@@ -752,8 +752,8 @@ public:
virtual void set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value);
virtual const com::sun::star::i18n::ForbiddenCharacters* getForbiddenCharacters(/*[in]*/ USHORT nLang, /*[in]*/ bool bLocaleData ) const;
virtual void setForbiddenCharacters(/*[in]*/ USHORT nLang, /*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rForbiddenCharacters );
- virtual vos::ORef<SvxForbiddenCharactersTable>& getForbiddenCharacterTable();
- virtual const vos::ORef<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() const;
+ virtual rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable();
+ virtual const rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() const;
virtual sal_uInt16 getLinkUpdateMode( /*[in]*/bool bGlobalSettings ) const;
virtual void setLinkUpdateMode( /*[in]*/ sal_uInt16 nMode );
virtual SwFldUpdateFlags getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const;
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index c0d2bfa..2bea3ee 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -955,7 +955,7 @@
#include "vcl/wrkwin.hxx"
#include "vos/mutex.hxx"
-#include "vos/ref.hxx"
+#include "rtl/ref.hxx"
#include "xmloff/DocumentSettingsContext.hxx"
#include "xmloff/ProgressBarHelper.hxx"
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index 4c7c449..68705dd 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -101,7 +101,7 @@ void SwAccessibleCell::GetStates( ::utl::AccessibleStateSetHelper& rStateSet )
{
rStateSet.AddState( AccessibleStateType::SELECTED );
ASSERT( bIsSelected, "bSelected out of sync" );
- ::vos::ORef < SwAccessibleContext > xThis( this );
+ ::rtl::Reference < SwAccessibleContext > xThis( this );
GetMap()->SetCursorContext( xThis );
}
}
@@ -131,7 +131,7 @@ sal_Bool SwAccessibleCell::_InvalidateMyCursorPos()
{
// remember that object as the one that has the caret. This is
// neccessary to notify that object if the cursor leaves it.
- ::vos::ORef < SwAccessibleContext > xThis( this );
+ ::rtl::Reference < SwAccessibleContext > xThis( this );
GetMap()->SetCursorContext( xThis );
}
@@ -156,14 +156,14 @@ sal_Bool SwAccessibleCell::_InvalidateChildrenCursorPos( const SwFrm *pFrm )
{
if( rLower.IsAccessible( GetMap()->GetShell()->IsPreView() ) )
{
- ::vos::ORef< SwAccessibleContext > xAccImpl(
+ ::rtl::Reference< SwAccessibleContext > xAccImpl(
GetMap()->GetContextImpl( pLower, sal_False ) );
- if( xAccImpl.isValid() )
+ if( xAccImpl.is() )
{
ASSERT( xAccImpl->GetFrm()->IsCellFrm(),
"table child is not a cell frame" )
bChanged |= static_cast< SwAccessibleCell *>(
- xAccImpl.getBodyPtr() )->_InvalidateMyCursorPos();
+ xAccImpl.get() )->_InvalidateMyCursorPos();
}
else
bChanged = sal_True; // If the context is not know we
@@ -196,9 +196,9 @@ void SwAccessibleCell::_InvalidateCursorPos()
sal_Bool bChanged = _InvalidateChildrenCursorPos( pTabFrm );
if( bChanged )
{
- ::vos::ORef< SwAccessibleContext > xAccImpl(
+ ::rtl::Reference< SwAccessibleContext > xAccImpl(
GetMap()->GetContextImpl( pTabFrm, sal_False ) );
- if( xAccImpl.isValid() )
+ if( xAccImpl.is() )
{
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::SELECTION_CHANGED;
@@ -255,9 +255,9 @@ uno::Sequence< OUString > SAL_CALL SwAccessibleCell::getSupportedServiceNames()
void SwAccessibleCell::Dispose( sal_Bool bRecursive )
{
const SwFrm *pParent = GetParent( SwAccessibleChild(GetFrm()), IsInPagePreview() );
- ::vos::ORef< SwAccessibleContext > xAccImpl(
+ ::rtl::Reference< SwAccessibleContext > xAccImpl(
GetMap()->GetContextImpl( pParent, sal_False ) );
- if( xAccImpl.isValid() )
+ if( xAccImpl.is() )
xAccImpl->DisposeChild( SwAccessibleChild(GetFrm()), bRecursive );
SwAccessibleContext::Dispose( bRecursive );
}
@@ -265,9 +265,9 @@ void SwAccessibleCell::Dispose( sal_Bool bRecursive )
void SwAccessibleCell::InvalidatePosOrSize( const SwRect& rOldBox )
{
const SwFrm *pParent = GetParent( SwAccessibleChild(GetFrm()), IsInPagePreview() );
- ::vos::ORef< SwAccessibleContext > xAccImpl(
+ ::rtl::Reference< SwAccessibleContext > xAccImpl(
GetMap()->GetContextImpl( pParent, sal_False ) );
- if( xAccImpl.isValid() )
+ if( xAccImpl.is() )
xAccImpl->InvalidateChildPosOrSize( SwAccessibleChild(GetFrm()), rOldBox );
SwAccessibleContext::InvalidatePosOrSize( rOldBox );
}
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index d7eb4fd..7f26742 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -229,10 +229,10 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm,
ASSERT( !rLower.AlwaysIncludeAsChild(),
"<SwAccessibleContext::ChildrenScrolled(..)> - always included child not considered!" );
const SwFrm* pLower( rLower.GetSwFrm() );
- ::vos::ORef< SwAccessibleContext > xAccImpl =
+ ::rtl::Reference< SwAccessibleContext > xAccImpl =
GetMap()->GetContextImpl( pLower, SCROLLED_OUT == eAction ||
SCROLLED_IN == eAction );
- if( xAccImpl.isValid() )
+ if( xAccImpl.is() )
{
switch( eAction )
{
@@ -261,12 +261,12 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm,
{
ASSERT( !rLower.AlwaysIncludeAsChild(),
"<SwAccessibleContext::ChildrenScrolled(..)> - always included child not considered!" );
- ::vos::ORef< ::accessibility::AccessibleShape > xAccImpl =
+ ::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl =
GetMap()->GetContextImpl( rLower.GetDrawObject(),
this,
SCROLLED_OUT == eAction ||
SCROLLED_IN == eAction );
- if( xAccImpl.isValid() )
+ if( xAccImpl.is() )
{
switch( eAction )
{
@@ -278,7 +278,7 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm,
break;
case SCROLLED_IN:
ScrolledInShape( rLower.GetDrawObject(),
- xAccImpl.getBodyPtr() );
+ xAccImpl.get() );
break;
case SCROLLED_OUT:
{
@@ -286,7 +286,7 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm,
::accessibility::IAccessibleViewForwarderListener::VISIBLE_AREA,
GetMap() );
DisposeShape( rLower.GetDrawObject(),
- xAccImpl.getBodyPtr() );
+ xAccImpl.get() );
}
break;
case NONE:
@@ -352,19 +352,19 @@ void SwAccessibleContext::ScrolledIn()
// Send child event at parent. That's all we have to do here.
const SwFrm* pParent = GetParent();
- ::vos::ORef< SwAccessibleContext > xParentImpl(
+ ::rtl::Reference< SwAccessibleContext > xParentImpl(
GetMap()->GetContextImpl( pParent, sal_False ) );
uno::Reference < XAccessibleContext > xThis( this );
- if( xParentImpl.isValid() )
+ if( xParentImpl.is() )
{
- SetParent( xParentImpl.getBodyPtr() );
+ SetParent( xParentImpl.get() );
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.NewValue <<= xThis;
xParentImpl->FireAccessibleEvent( aEvent );
- DBG_MSG_PARAM( "AccessibleChild (added)", xChildImpl.getBodyPtr() );
+ DBG_MSG_PARAM( "AccessibleChild (added)", xChildImpl.get() );
if( HasCursor() )
{
@@ -412,10 +412,10 @@ void SwAccessibleContext::InvalidateChildrenStates( const SwFrm* _pFrm,
const SwFrm* pLower = rLower.GetSwFrm();
if( pLower )
{
- ::vos::ORef< SwAccessibleContext > xAccImpl;
+ ::rtl::Reference< SwAccessibleContext > xAccImpl;
if( rLower.IsAccessible( GetShell()->IsPreView() ) )
xAccImpl = GetMap()->GetContextImpl( pLower, sal_False );
- if( xAccImpl.isValid() )
+ if( xAccImpl.is() )
xAccImpl->InvalidateStates( _nStates );
else
InvalidateChildrenStates( pLower, _nStates );
@@ -445,21 +445,21 @@ void SwAccessibleContext::DisposeChildren( const SwFrm *pFrm,
const SwFrm* pLower = rLower.GetSwFrm();
if( pLower )
{
- ::vos::ORef< SwAccessibleContext > xAccImpl;
+ ::rtl::Reference< SwAccessibleContext > xAccImpl;
if( rLower.IsAccessible( GetShell()->IsPreView() ) )
xAccImpl = GetMap()->GetContextImpl( pLower, sal_False );
- if( xAccImpl.isValid() )
+ if( xAccImpl.is() )
xAccImpl->Dispose( bRecursive );
else if( bRecursive )
DisposeChildren( pLower, bRecursive );
}
else if ( rLower.GetDrawObject() )
{
- ::vos::ORef< ::accessibility::AccessibleShape > xAccImpl(
+ ::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl(
GetMap()->GetContextImpl( rLower.GetDrawObject(),
this, sal_False ) );
- if( xAccImpl.isValid() )
- DisposeShape( rLower.GetDrawObject(), xAccImpl.getBodyPtr() );
+ if( xAccImpl.is() )
+ DisposeShape( rLower.GetDrawObject(), xAccImpl.get() );
}
else if ( rLower.GetWindow() )
{
@@ -621,21 +621,21 @@ uno::Reference< XAccessible> SAL_CALL
uno::Reference< XAccessible > xChild;
if( aChild.GetSwFrm() )
{
- ::vos::ORef < SwAccessibleContext > xChildImpl(
+ ::rtl::Reference < SwAccessibleContext > xChildImpl(
GetMap()->GetContextImpl( aChild.GetSwFrm(), !bDisposing ) );
- if( xChildImpl.isValid() )
+ if( xChildImpl.is() )
{
xChildImpl->SetParent( this );
- xChild = xChildImpl.getBodyPtr();
+ xChild = xChildImpl.get();
}
}
else if ( aChild.GetDrawObject() )
{
- ::vos::ORef < ::accessibility::AccessibleShape > xChildImpl(
+ ::rtl::Reference < ::accessibility::AccessibleShape > xChildImpl(
GetMap()->GetContextImpl( aChild.GetDrawObject(),
this, !bDisposing ) );
- if( xChildImpl.isValid() )
- xChild = xChildImpl.getBodyPtr();
+ if( xChildImpl.is() )
+ xChild = xChildImpl.get();
}
else if ( aChild.GetWindow() )
{
@@ -683,10 +683,10 @@ sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleIndexInParent (void)
sal_Int32 nIndex = -1;
if( pUpper )
{
- ::vos::ORef < SwAccessibleContext > xAccImpl(
+ ::rtl::Reference < SwAccessibleContext > xAccImpl(
GetMap()->GetContextImpl( pUpper, !bDisposing ) );
- ASSERT( xAccImpl.isValid() || bDisposing, "no parent found" );
- if( xAccImpl.isValid() )
+ ASSERT( xAccImpl.is() || bDisposing, "no parent found" );
+ if( xAccImpl.is() )
nIndex = xAccImpl->GetChildIndex( *(GetMap()), SwAccessibleChild(GetFrm()) );
}
@@ -1039,13 +1039,13 @@ uno::Sequence< OUString > SAL_CALL SwAccessibleContext::getSupportedServiceNames
void SwAccessibleContext::DisposeShape( const SdrObject *pObj,
::accessibility::AccessibleShape *pAccImpl )
{
- ::vos::ORef< ::accessibility::AccessibleShape > xAccImpl( pAccImpl );
- if( !xAccImpl.isValid() )
+ ::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl( pAccImpl );
+ if( !xAccImpl.is() )
xAccImpl = GetMap()->GetContextImpl( pObj, this, sal_True );
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
- uno::Reference< XAccessible > xAcc( xAccImpl.getBodyPtr() );
+ uno::Reference< XAccessible > xAcc( xAccImpl.get() );
aEvent.OldValue <<= xAcc;
FireAccessibleEvent( aEvent );
@@ -1143,18 +1143,18 @@ void SwAccessibleContext::DisposeChild( const SwAccessibleChild& rChildFrmOrObj,
// get notified of the movement.
if( rChildFrmOrObj.GetSwFrm() )
{
- ::vos::ORef< SwAccessibleContext > xAccImpl =
+ ::rtl::Reference< SwAccessibleContext > xAccImpl =
GetMap()->GetContextImpl( rChildFrmOrObj.GetSwFrm(),
sal_True );
xAccImpl->Dispose( bRecursive );
}
else if ( rChildFrmOrObj.GetDrawObject() )
{
- ::vos::ORef< ::accessibility::AccessibleShape > xAccImpl =
+ ::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl =
GetMap()->GetContextImpl( rChildFrmOrObj.GetDrawObject(),
this, sal_True );
DisposeShape( rChildFrmOrObj.GetDrawObject(),
- xAccImpl.getBodyPtr() );
+ xAccImpl.get() );
}
else if ( rChildFrmOrObj.GetWindow() )
{
@@ -1236,21 +1236,21 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
if( rChildFrmOrObj.GetSwFrm() )
{
// The frame becomes visible. A child event must be send.
- ::vos::ORef< SwAccessibleContext > xAccImpl =
+ ::rtl::Reference< SwAccessibleContext > xAccImpl =
GetMap()->GetContextImpl( rChildFrmOrObj.GetSwFrm(),
sal_True );
xAccImpl->ScrolledIn();
}
else if ( rChildFrmOrObj.GetDrawObject() )
{
- ::vos::ORef< ::accessibility::AccessibleShape > xAccImpl =
+ ::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl =
GetMap()->GetContextImpl( rChildFrmOrObj.GetDrawObject(),
this, sal_True );
// --> OD 2004-11-29 #i37790#
- if ( xAccImpl.isValid() )
+ if ( xAccImpl.is() )
{
ScrolledInShape( rChildFrmOrObj.GetDrawObject(),
- xAccImpl.getBodyPtr() );
+ xAccImpl.get() );
}
else
{
@@ -1279,7 +1279,7 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
{
if( rChildFrmOrObj.GetSwFrm() )
{
- ::vos::ORef< SwAccessibleContext > xAccImpl =
+ ::rtl::Reference< SwAccessibleContext > xAccImpl =
GetMap()->GetContextImpl( rChildFrmOrObj.GetSwFrm(),
sal_True );
xAccImpl->SetParent( this );
@@ -1287,11 +1287,11 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
}
else if ( rChildFrmOrObj.GetDrawObject() )
{
- ::vos::ORef< ::accessibility::AccessibleShape > xAccImpl =
+ ::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl =
GetMap()->GetContextImpl( rChildFrmOrObj.GetDrawObject(),
this, sal_True );
DisposeShape( rChildFrmOrObj.GetDrawObject(),
- xAccImpl.getBodyPtr() );
+ xAccImpl.get() );
}
else if ( rChildFrmOrObj.GetWindow() )
{
diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx
index 84fbe62..894acec 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -91,7 +91,7 @@ void SwAccessibleFrameBase::GetStates(
{
rStateSet.AddState( AccessibleStateType::SELECTED );
ASSERT( bIsSelected, "bSelected out of sync" );
- ::vos::ORef < SwAccessibleContext > xThis( this );
+ ::rtl::Reference < SwAccessibleContext > xThis( this );
GetMap()->SetCursorContext( xThis );
Window *pWin = GetWindow();
@@ -162,7 +162,7 @@ void SwAccessibleFrameBase::_InvalidateCursorPos()
{
// remember that object as the one that has the caret. This is
// neccessary to notify that object if the cursor leaves it.
- ::vos::ORef < SwAccessibleContext > xThis( this );
+ ::rtl::Reference < SwAccessibleContext > xThis( this );
GetMap()->SetCursorContext( xThis );
}
diff --git a/sw/source/core/access/accfrmobjmap.cxx b/sw/source/core/access/accfrmobjmap.cxx
index 645cb47..3ace3e1 100644
--- a/sw/source/core/access/accfrmobjmap.cxx
+++ b/sw/source/core/access/accfrmobjmap.cxx
@@ -106,11 +106,11 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea,
}
{
- ::vos::ORef < SwAccessibleContext > xAccImpl =
+ ::rtl::Reference < SwAccessibleContext > xAccImpl =
rAccMap.GetContextImpl( &rFrm, sal_False );
- if( xAccImpl.isValid() )
+ if( xAccImpl.is() )
{
- SwAccessibleContext* pAccImpl = xAccImpl.getBodyPtr();
+ SwAccessibleContext* pAccImpl = xAccImpl.get();
if ( pAccImpl &&
pAccImpl->HasAdditionalAccessibleChildren() )
{
diff --git a/sw/source/core/access/accfrmobjslist.cxx b/sw/source/core/access/accfrmobjslist.cxx
index 15c989e..846e06a 100644
--- a/sw/source/core/access/accfrmobjslist.cxx
+++ b/sw/source/core/access/accfrmobjslist.cxx
@@ -73,11 +73,11 @@ SwAccessibleChildSList_const_iterator::SwAccessibleChildSList_const_iterator(
}
if ( !aCurr.IsValid() )
{
- ::vos::ORef < SwAccessibleContext > xAccImpl =
+ ::rtl::Reference < SwAccessibleContext > xAccImpl =
rAccMap.GetContextImpl( &rFrm, sal_False );
- if( xAccImpl.isValid() )
+ if( xAccImpl.is() )
{
- SwAccessibleContext* pAccImpl = xAccImpl.getBodyPtr();
+ SwAccessibleContext* pAccImpl = xAccImpl.get();
aCurr = SwAccessibleChild( pAccImpl->GetAdditionalAccessibleChild( 0 ) );
++nNextObj;
}
@@ -139,11 +139,11 @@ SwAccessibleChildSList_const_iterator& SwAccessibleChildSList_const_iterator::ne
}
if ( !aCurr.IsValid() )
{
- ::vos::ORef < SwAccessibleContext > xAccImpl =
+ ::rtl::Reference < SwAccessibleContext > xAccImpl =
rList.GetAccMap().GetContextImpl( &rFrm, sal_False );
- if( xAccImpl.isValid() )
+ if( xAccImpl.is() )
{
- SwAccessibleContext* pAccImpl = xAccImpl.getBodyPtr();
+ SwAccessibleContext* pAccImpl = xAccImpl.get();
aCurr = SwAccessibleChild( pAccImpl->GetAdditionalAccessibleChild( nNextObj - nObjsCount ) );
++nNextObj;
}
diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx
index 1b5dbae..21a8f5d 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -53,7 +53,7 @@ SwAccessibleHyperlink::SwAccessibleHyperlink( sal_uInt16 nHPos,
const SwTxtAttr *SwAccessibleHyperlink::GetTxtAttr() const
{
const SwTxtAttr *pTxtAttr = 0;
- if( xPara.isValid() && xPara->GetMap() )
+ if( xPara.is() && xPara->GetMap() )
{
const SwTxtNode *pTxtNd = xPara->GetTxtNode();
const SwpHints *pHints = pTxtNd->GetpSwpHints();
@@ -180,7 +180,7 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::isValid( )
throw (uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return xPara.isValid();
+ return xPara.is();
}
void SwAccessibleHyperlink::Invalidate()
diff --git a/sw/source/core/access/acchyperlink.hxx b/sw/source/core/access/acchyperlink.hxx
index 68769f5..2907f20 100644
--- a/sw/source/core/access/acchyperlink.hxx
+++ b/sw/source/core/access/acchyperlink.hxx
@@ -28,7 +28,7 @@
#ifndef _ACCHYPERLINK_HXX
#define _ACCHYPERLINK_HXX
#include <com/sun/star/accessibility/XAccessibleHyperlink.hpp>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#include <cppuhelper/implbase1.hxx>
#include <fmtinfmt.hxx>
@@ -42,7 +42,7 @@ class SwAccessibleHyperlink :
friend class SwAccessibleParagraph;
friend class SwAccessibleHyperTextData;
sal_uInt16 nHintPos;
- ::vos::ORef< SwAccessibleParagraph > xPara;
+ ::rtl::Reference< SwAccessibleParagraph > xPara;
sal_Int32 nStartIdx;
sal_Int32 nEndIdx;
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 24f1feb..aeeae16 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -30,7 +30,7 @@
#include "precompiled_sw.hxx"
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#include <cppuhelper/weakref.hxx>
#include <vcl/window.hxx>
#include <svx/svdmodel.hxx>
@@ -209,7 +209,7 @@ struct SwShapeFunc
}
};
typedef ::std::map < const SdrObject *, uno::WeakReference < XAccessible >, SwShapeFunc > _SwAccessibleShapeMap_Impl;
-typedef ::std::pair < const SdrObject *, ::vos::ORef < ::accessibility::AccessibleShape > > SwAccessibleObjShape_Impl;
+typedef ::std::pair < const SdrObject *, ::rtl::Reference < ::accessibility::AccessibleShape > > SwAccessibleObjShape_Impl;
class SwAccessibleShapeMap_Impl: public _SwAccessibleShapeMap_Impl
@@ -395,10 +395,10 @@ public:
return meType;
}
- inline ::vos::ORef < SwAccessibleContext > GetContext() const
+ inline ::rtl::Reference < SwAccessibleContext > GetContext() const
{
uno::Reference < XAccessible > xTmp( mxAcc );
- ::vos::ORef < SwAccessibleContext > xAccImpl(
+ ::rtl::Reference < SwAccessibleContext > xAccImpl(
static_cast<SwAccessibleContext*>( xTmp.get() ) );
return xAccImpl;
@@ -790,12 +790,12 @@ static sal_Bool AreInSameTable( const uno::Reference< XAccessible >& rAcc,
void SwAccessibleMap::FireEvent( const SwAccessibleEvent_Impl& rEvent )
{
- ::vos::ORef < SwAccessibleContext > xAccImpl( rEvent.GetContext() );
+ ::rtl::Reference < SwAccessibleContext > xAccImpl( rEvent.GetContext() );
if( SwAccessibleEvent_Impl::SHAPE_SELECTION == rEvent.GetType() )
{
DoInvalidateShapeSelection();
}
- else if( xAccImpl.isValid() && xAccImpl->GetFrm() )
+ else if( xAccImpl.is() && xAccImpl->GetFrm() )
{
if ( rEvent.GetType() != SwAccessibleEvent_Impl::DISPOSE &&
rEvent.IsInvalidateTextAttrs() )
@@ -815,7 +815,7 @@ void SwAccessibleMap::FireEvent( const SwAccessibleEvent_Impl& rEvent )
rEvent.GetOldBox() );
break;
case SwAccessibleEvent_Impl::DISPOSE:
- ASSERT( xAccImpl.isValid(),
+ ASSERT( xAccImpl.is(),
"dispose event has been stored" );
break;
case SwAccessibleEvent_Impl::INVALID_ATTR:
@@ -1025,7 +1025,7 @@ void SwAccessibleMap::DoInvalidateShapeSelection()
SwAccessibleObjShape_Impl *pShape = pShapes;
while( nShapes )
{
- if( pShape->second.isValid() )
+ if( pShape->second.is() )
{
sal_Bool bChanged;
if( pShape >= pSelShape )
@@ -1061,7 +1061,7 @@ void SwAccessibleMap::DoInvalidateShapeSelection()
::std::list< const SwFrm * >::const_iterator aEndIter = aParents.end();
while( aIter != aEndIter )
{
- ::vos::ORef< SwAccessibleContext > xParentAccImpl;
+ ::rtl::Reference< SwAccessibleContext > xParentAccImpl;
{
vos::OGuard aGuard( maMutex );
if( mpFrmMap )
@@ -1076,7 +1076,7 @@ void SwAccessibleMap::DoInvalidateShapeSelection()
}
}
}
- if( xParentAccImpl.isValid() )
+ if( xParentAccImpl.is() )
{
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::SELECTION_CHANGED;
@@ -1119,7 +1119,7 @@ void SwAccessibleMap::DoInvalidateShapeFocus()
SwAccessibleObjShape_Impl *pShape = pShapes;
while( nShapes )
{
- if( pShape->second.isValid() )
+ if( pShape->second.is() )
{
if( bFocused && pShape >= pSelShape )
pShape->second->SetState( AccessibleStateType::FOCUSED );
@@ -1468,13 +1468,13 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm,
return xAcc;
}
-::vos::ORef < SwAccessibleContext > SwAccessibleMap::GetContextImpl(
+::rtl::Reference < SwAccessibleContext > SwAccessibleMap::GetContextImpl(
const SwFrm *pFrm,
sal_Bool bCreate )
{
uno::Reference < XAccessible > xAcc( GetContext( pFrm, bCreate ) );
- ::vos::ORef < SwAccessibleContext > xAccImpl(
+ ::rtl::Reference < SwAccessibleContext > xAccImpl(
static_cast< SwAccessibleContext * >( xAcc.get() ) );
return xAccImpl;
@@ -1546,14 +1546,14 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext(
return xAcc;
}
-::vos::ORef < ::accessibility::AccessibleShape > SwAccessibleMap::GetContextImpl(
+::rtl::Reference < ::accessibility::AccessibleShape > SwAccessibleMap::GetContextImpl(
const SdrObject *pObj,
SwAccessibleContext *pParentImpl,
sal_Bool bCreate )
{
uno::Reference < XAccessible > xAcc( GetContext( pObj, pParentImpl, bCreate ) );
- ::vos::ORef < ::accessibility::AccessibleShape > xAccImpl(
+ ::rtl::Reference < ::accessibility::AccessibleShape > xAccImpl(
static_cast< ::accessibility::AccessibleShape* >( xAcc.get() ) );
return xAccImpl;
@@ -1639,9 +1639,9 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
if( aFrmOrObj.IsAccessible( GetShell()->IsPreView() ) )
{
- ::vos::ORef< SwAccessibleContext > xAccImpl;
- ::vos::ORef< SwAccessibleContext > xParentAccImpl;
- ::vos::ORef< ::accessibility::AccessibleShape > xShapeAccImpl;
+ ::rtl::Reference< SwAccessibleContext > xAccImpl;
+ ::rtl::Reference< SwAccessibleContext > xParentAccImpl;
+ ::rtl::Reference< ::accessibility::AccessibleShape > xShapeAccImpl;
// get accessible context for frame
{
vos::OGuard aGuard( maMutex );
@@ -1658,7 +1658,7 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
static_cast< SwAccessibleContext *>( xAcc.get() );
}
}
- if( !xAccImpl.isValid() && mpFrmMap )
+ if( !xAccImpl.is() && mpFrmMap )
{
// If there is none, look if the parent is accessible.
const SwFrm *pParent =
@@ -1677,7 +1677,7 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
}
}
}
- if( !xParentAccImpl.isValid() && !aFrmOrObj.GetSwFrm() &&
+ if( !xParentAccImpl.is() && !aFrmOrObj.GetSwFrm() &&
mpShapeMap )
{
SwAccessibleShapeMap_Impl::iterator aIter =
@@ -1690,7 +1690,7 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
}
}
if( pObj && GetShell()->ActionPend() &&
- (xParentAccImpl.isValid() || xShapeAccImpl.isValid()) )
+ (xParentAccImpl.is() || xShapeAccImpl.is()) )
{
// Keep a reference to the XShape to avoid that it
// is deleted with a SwFrmFmt::Modify.
@@ -1726,11 +1726,11 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
// the frame. If the frame is no context for it but disposing should
// take place recursive, the frame's children have to be disposed
// anyway, so we have to create the context then.
- if( xAccImpl.isValid() )
+ if( xAccImpl.is() )
{
xAccImpl->Dispose( bRecursive );
}
- else if( xParentAccImpl.isValid() )
+ else if( xParentAccImpl.is() )
{
// If the frame is a cell frame, the table must be notified.
// If we are in an action, a table model change event will
@@ -1739,7 +1739,7 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
xParentAccImpl->DisposeChild( aFrmOrObj, bRecursive );
}
- else if( xShapeAccImpl.isValid() )
+ else if( xShapeAccImpl.is() )
{
RemoveContext( aFrmOrObj.GetDrawObject() );
xShapeAccImpl->dispose();
@@ -1758,8 +1758,8 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm,
SwAccessibleChild aFrmOrObj( pFrm, pObj, pWindow );
if( aFrmOrObj.IsAccessible( GetShell()->IsPreView() ) )
{
- ::vos::ORef< SwAccessibleContext > xAccImpl;
- ::vos::ORef< SwAccessibleContext > xParentAccImpl;
+ ::rtl::Reference< SwAccessibleContext > xAccImpl;
+ ::rtl::Reference< SwAccessibleContext > xParentAccImpl;
{
vos::OGuard aGuard( maMutex );
@@ -1778,7 +1778,7 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm,
static_cast< SwAccessibleContext *>( xAcc.get() );
}
}
- if( !xAccImpl.isValid() )
+ if( !xAccImpl.is() )
{
// Otherwise we look if the parent is accessible.
// If not, there is nothing to do.
@@ -1801,12 +1801,12 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm,
}
}
- if( xAccImpl.isValid() )
+ if( xAccImpl.is() )
{
if( GetShell()->ActionPend() )
{
SwAccessibleEvent_Impl aEvent(
- SwAccessibleEvent_Impl::POS_CHANGED, xAccImpl.getBodyPtr(),
+ SwAccessibleEvent_Impl::POS_CHANGED, xAccImpl.get(),
aFrmOrObj, rOldBox );
AppendEvent( aEvent );
}
@@ -1816,13 +1816,13 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm,
xAccImpl->InvalidatePosOrSize( rOldBox );
}
}
- else if( xParentAccImpl.isValid() )
+ else if( xParentAccImpl.is() )
{
if( GetShell()->ActionPend() )
{
SwAccessibleEvent_Impl aEvent(
SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
- xParentAccImpl.getBodyPtr(), aFrmOrObj, rOldBox );
+ xParentAccImpl.get(), aFrmOrObj, rOldBox );
AppendEvent( aEvent );
}
else
@@ -2027,10 +2027,10 @@ void SwAccessibleMap::InvalidateFocus()
}
void SwAccessibleMap::SetCursorContext(
- const ::vos::ORef < SwAccessibleContext >& rCursorContext )
+ const ::rtl::Reference < SwAccessibleContext >& rCursorContext )
{
vos::OGuard aGuard( maMutex );
- uno::Reference < XAccessible > xAcc( rCursorContext.getBodyPtr() );
+ uno::Reference < XAccessible > xAcc( rCursorContext.get() );
mxCursorContext = xAcc;
}
@@ -2219,7 +2219,7 @@ void SwAccessibleMap::UpdatePreview( const std::vector<PrevwPage*>& _rPrevwPages
// accessibility tree; this will also send appropriate scroll
// events
SwAccessibleContext* pDoc =
- GetContextImpl( GetShell()->GetLayout() ).getBodyPtr();
+ GetContextImpl( GetShell()->GetLayout() ).get();
static_cast<SwAccessibleDocumentBase*>( pDoc )->SetVisArea();
uno::Reference < XAccessible > xOldAcc;
@@ -2728,9 +2728,9 @@ void SwAccessibleMap::InvalidateTextSelectionOfAllParas()
uno::Reference < XAccessible > xAcc( (*aIter).first );
if ( xAcc.is() )
{
- ::vos::ORef < SwAccessibleContext > xAccImpl(
+ ::rtl::Reference < SwAccessibleContext > xAccImpl(
static_cast<SwAccessibleContext*>( xAcc.get() ) );
- if ( xAccImpl.isValid() && xAccImpl->GetFrm() )
+ if ( xAccImpl.is() && xAccImpl->GetFrm() )
{
const SwTxtFrm* pTxtFrm(
dynamic_cast<const SwTxtFrm*>(xAccImpl->GetFrm()) );
@@ -2756,9 +2756,9 @@ void SwAccessibleMap::InvalidateTextSelectionOfAllParas()
uno::Reference < XAccessible > xAcc( (*aIter).first );
if ( xAcc.is() )
{
- ::vos::ORef < SwAccessibleContext > xAccImpl(
+ ::rtl::Reference < SwAccessibleContext > xAccImpl(
static_cast<SwAccessibleContext*>( xAcc.get() ) );
- if ( xAccImpl.isValid() && xAccImpl->GetFrm() )
+ if ( xAccImpl.is() && xAccImpl->GetFrm() )
{
const SwTxtFrm* pTxtFrm(
dynamic_cast<const SwTxtFrm*>(xAccImpl->GetFrm()) );
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index 51df1e3..06a08ef 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -70,7 +70,7 @@ void SwAccessiblePage::GetStates(
if( IsSelected() )
{
ASSERT( bIsSelected, "bSelected out of sync" );
- ::vos::ORef < SwAccessibleContext > xThis( this );
+ ::rtl::Reference < SwAccessibleContext > xThis( this );
GetMap()->SetCursorContext( xThis );
Window *pWin = GetWindow();
@@ -94,7 +94,7 @@ void SwAccessiblePage::_InvalidateCursorPos()
{
// remember that object as the one that has the caret. This is
// neccessary to notify that object if the cursor leaves it.
- ::vos::ORef < SwAccessibleContext > xThis( this );
+ ::rtl::Reference < SwAccessibleContext > xThis( this );
GetMap()->SetCursorContext( xThis );
}
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index eef3b9a..16a9736 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -371,7 +371,7 @@ void SwAccessibleParagraph::GetStates(
Window *pWin = GetWindow();
if( pWin && pWin->HasFocus() )
rStateSet.AddState( AccessibleStateType::FOCUSED );
- ::vos::ORef < SwAccessibleContext > xThis( this );
+ ::rtl::Reference < SwAccessibleContext > xThis( this );
GetMap()->SetCursorContext( xThis );
}
}
@@ -450,7 +450,7 @@ void SwAccessibleParagraph::_InvalidateCursorPos()
{
// remember that object as the one that has the caret. This is
// neccessary to notify that object if the cursor leaves it.
- ::vos::ORef < SwAccessibleContext > xThis( this );
+ ::rtl::Reference < SwAccessibleContext > xThis( this );
GetMap()->SetCursorContext( xThis );
}
@@ -1152,7 +1152,7 @@ sal_Int32 SwAccessibleParagraph::getCaretPosition()
}
if( -1 != nRet )
{
- ::vos::ORef < SwAccessibleContext > xThis( this );
+ ::rtl::Reference < SwAccessibleContext > xThis( this );
GetMap()->SetCursorContext( xThis );
}
diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx
index b9aa2df..acb2bcd 100644
--- a/sw/source/core/access/accselectionhelper.cxx
+++ b/sw/source/core/access/accselectionhelper.cxx
@@ -302,22 +302,22 @@ Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild(
Reference< XAccessible > xChild;
if( aChild.GetSwFrm() )
{
- ::vos::ORef < SwAccessibleContext > xChildImpl(
+ ::rtl::Reference < SwAccessibleContext > xChildImpl(
rContext.GetMap()->GetContextImpl( aChild.GetSwFrm(),
sal_True ) );
- if( xChildImpl.isValid() )
+ if( xChildImpl.is() )
{
xChildImpl->SetParent( &rContext );
- xChild = xChildImpl.getBodyPtr();
+ xChild = xChildImpl.get();
}
}
else if ( aChild.GetDrawObject() )
{
- ::vos::ORef < ::accessibility::AccessibleShape > xChildImpl(
+ ::rtl::Reference < ::accessibility::AccessibleShape > xChildImpl(
rContext.GetMap()->GetContextImpl( aChild.GetDrawObject(),
&rContext, sal_True ) );
- if( xChildImpl.isValid() )
- xChild = xChildImpl.getBodyPtr();
+ if( xChildImpl.is() )
+ xChild = xChildImpl.get();
}
return xChild;
}
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index f974902..d2d0d7d 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -368,7 +368,7 @@ const i18n::ForbiddenCharacters*
SwDoc::getForbiddenCharacters(/*[in]*/ USHORT nLang, /*[in]*/ bool bLocaleData ) const
{
const i18n::ForbiddenCharacters* pRet = 0;
- if( xForbiddenCharsTable.isValid() )
+ if( xForbiddenCharsTable.is() )
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list