[Libreoffice-commits] .: Branch 'feature/vos-removal' - comphelper/source svtools/source toolkit/source vcl/aqua vcl/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Wed Oct 20 04:46:29 PDT 2010
comphelper/source/property/ChainablePropertySet.cxx | 16
comphelper/source/property/MasterPropertySet.cxx | 38 -
svtools/source/toolpanel/paneltabbarpeer.cxx | 4
svtools/source/toolpanel/toolpaneldeckpeer.cxx | 4
svtools/source/toolpanel/toolpaneldrawerpeer.cxx | 2
svtools/source/uno/svtxgridcontrol.cxx | 18
svtools/source/uno/treecontrolpeer.cxx | 66 +-
svtools/source/uno/unoiface.cxx | 166 +++---
toolkit/source/awt/stylesettings.cxx | 2
toolkit/source/awt/vclxcontainer.cxx | 12
toolkit/source/awt/vclxdevice.cxx | 24
toolkit/source/awt/vclxdialog.cxx | 18
toolkit/source/awt/vclxfixedline.cxx | 8
toolkit/source/awt/vclxgraphics.cxx | 58 +-
toolkit/source/awt/vclxplugin.cxx | 4
toolkit/source/awt/vclxscroller.cxx | 6
toolkit/source/awt/vclxspinbutton.cxx | 16
toolkit/source/awt/vclxsplitter.cxx | 2
toolkit/source/awt/vclxsystemdependentwindow.cxx | 2
toolkit/source/awt/vclxtabcontrol.cxx | 6
toolkit/source/awt/vclxtabpage.cxx | 4
toolkit/source/awt/vclxtopwindow.cxx | 24
toolkit/source/awt/vclxwindow.cxx | 126 ++--
toolkit/source/awt/vclxwindows.cxx | 552 ++++++++++----------
toolkit/source/awt/xsimpleanimation.cxx | 4
toolkit/source/awt/xthrobber.cxx | 6
toolkit/source/helper/throbberimpl.cxx | 8
toolkit/source/layout/core/localized-string.cxx | 4
vcl/aqua/inc/salinst.h | 2
vcl/source/app/svapp.cxx | 19
vcl/source/app/svmain.cxx | 7
31 files changed, 612 insertions(+), 616 deletions(-)
New commits:
commit af1e435efe903111ef5c30ffeb57ff566910be84
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/comphelper/source/property/ChainablePropertySet.cxx b/comphelper/source/property/ChainablePropertySet.cxx
index e8a5d92..6d0fc4f 100644
--- a/comphelper/source/property/ChainablePropertySet.cxx
+++ b/comphelper/source/property/ChainablePropertySet.cxx
@@ -78,9 +78,9 @@ void SAL_CALL ChainablePropertySet::setPropertyValue( const ::rtl::OUString& rPr
throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
{
// acquire mutex in c-tor and releases it in the d-tor (exception safe!).
- std::auto_ptr< osl::SolarMutexGuard > pMutexGuard;
+ std::auto_ptr< osl::SolarGuard > pMutexGuard;
if (mpMutex)
- pMutexGuard.reset( new osl::SolarMutexGuard(mpMutex) );
+ pMutexGuard.reset( new osl::SolarGuard(mpMutex) );
PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
@@ -96,9 +96,9 @@ Any SAL_CALL ChainablePropertySet::getPropertyValue( const ::rtl::OUString& rPro
throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
// acquire mutex in c-tor and releases it in the d-tor (exception safe!).
- std::auto_ptr< osl::SolarMutexGuard > pMutexGuard;
+ std::auto_ptr< osl::SolarGuard > pMutexGuard;
if (mpMutex)
- pMutexGuard.reset( new osl::SolarMutexGuard(mpMutex) );
+ pMutexGuard.reset( new osl::SolarGuard(mpMutex) );
PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
@@ -142,9 +142,9 @@ void SAL_CALL ChainablePropertySet::setPropertyValues( const Sequence< ::rtl::OU
throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
{
// acquire mutex in c-tor and releases it in the d-tor (exception safe!).
- std::auto_ptr< osl::SolarMutexGuard > pMutexGuard;
+ std::auto_ptr< osl::SolarGuard > pMutexGuard;
if (mpMutex)
- pMutexGuard.reset( new osl::SolarMutexGuard(mpMutex) );
+ pMutexGuard.reset( new osl::SolarGuard(mpMutex) );
const sal_Int32 nCount = aPropertyNames.getLength();
@@ -176,9 +176,9 @@ Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues( const Sequence
throw(RuntimeException)
{
// acquire mutex in c-tor and releases it in the d-tor (exception safe!).
- std::auto_ptr< osl::SolarMutexGuard > pMutexGuard;
+ std::auto_ptr< osl::SolarGuard > pMutexGuard;
if (mpMutex)
- pMutexGuard.reset( new osl::SolarMutexGuard(mpMutex) );
+ pMutexGuard.reset( new osl::SolarGuard(mpMutex) );
const sal_Int32 nCount = aPropertyNames.getLength();
diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx
index be42344..253c46a 100644
--- a/comphelper/source/property/MasterPropertySet.cxx
+++ b/comphelper/source/property/MasterPropertySet.cxx
@@ -42,19 +42,19 @@
class AutoOGuardArray
{
sal_Int32 nSize;
- std::auto_ptr< osl::SolarMutexGuard > * pGuardArray;
+ std::auto_ptr< osl::SolarGuard > * pGuardArray;
public:
AutoOGuardArray( sal_Int32 nNumElements );
~AutoOGuardArray();
- std::auto_ptr< osl::SolarMutexGuard > & operator[] ( sal_Int32 i ) { return pGuardArray[i]; }
+ std::auto_ptr< osl::SolarGuard > & operator[] ( sal_Int32 i ) { return pGuardArray[i]; }
};
AutoOGuardArray::AutoOGuardArray( sal_Int32 nNumElements )
{
nSize = nNumElements;
- pGuardArray = new std::auto_ptr< osl::SolarMutexGuard >[ nSize ];
+ pGuardArray = new std::auto_ptr< osl::SolarGuard >[ nSize ];
}
AutoOGuardArray::~AutoOGuardArray()
@@ -130,9 +130,9 @@ void SAL_CALL MasterPropertySet::setPropertyValue( const ::rtl::OUString& rPrope
throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
{
// acquire mutex in c-tor and releases it in the d-tor (exception safe!).
- std::auto_ptr< osl::SolarMutexGuard > pMutexGuard;
+ std::auto_ptr< osl::SolarGuard > pMutexGuard;
if (mpMutex)
- pMutexGuard.reset( new osl::SolarMutexGuard(mpMutex) );
+ pMutexGuard.reset( new osl::SolarGuard(mpMutex) );
PropertyDataHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
@@ -150,9 +150,9 @@ void SAL_CALL MasterPropertySet::setPropertyValue( const ::rtl::OUString& rPrope
ChainablePropertySet * pSlave = maSlaveMap [ (*aIter).second->mnMapId ]->mpSlave;
// acquire mutex in c-tor and releases it in the d-tor (exception safe!).
- std::auto_ptr< osl::SolarMutexGuard > pMutexGuard2;
+ std::auto_ptr< osl::SolarGuard > pMutexGuard2;
if (pSlave->mpMutex)
- pMutexGuard2.reset( new osl::SolarMutexGuard(pSlave->mpMutex) );
+ pMutexGuard2.reset( new osl::SolarGuard(pSlave->mpMutex) );
pSlave->_preSetValues();
pSlave->_setSingleValue( *((*aIter).second->mpInfo), rValue );
@@ -164,9 +164,9 @@ Any SAL_CALL MasterPropertySet::getPropertyValue( const ::rtl::OUString& rProper
throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
// acquire mutex in c-tor and releases it in the d-tor (exception safe!).
- std::auto_ptr< osl::SolarMutexGuard > pMutexGuard;
+ std::auto_ptr< osl::SolarGuard > pMutexGuard;
if (mpMutex)
- pMutexGuard.reset( new osl::SolarMutexGuard(mpMutex) );
+ pMutexGuard.reset( new osl::SolarGuard(mpMutex) );
PropertyDataHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
@@ -185,9 +185,9 @@ Any SAL_CALL MasterPropertySet::getPropertyValue( const ::rtl::OUString& rProper
ChainablePropertySet * pSlave = maSlaveMap [ (*aIter).second->mnMapId ]->mpSlave;
// acquire mutex in c-tor and releases it in the d-tor (exception safe!).
- std::auto_ptr< osl::SolarMutexGuard > pMutexGuard2;
+ std::auto_ptr< osl::SolarGuard > pMutexGuard2;
if (pSlave->mpMutex)
- pMutexGuard2.reset( new osl::SolarMutexGuard(pSlave->mpMutex) );
+ pMutexGuard2.reset( new osl::SolarGuard(pSlave->mpMutex) );
pSlave->_preGetValues();
pSlave->_getSingleValue( *((*aIter).second->mpInfo), aAny );
@@ -225,9 +225,9 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< ::rtl::OUStr
throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
{
// acquire mutex in c-tor and releases it in the d-tor (exception safe!).
- std::auto_ptr< osl::SolarMutexGuard > pMutexGuard;
+ std::auto_ptr< osl::SolarGuard > pMutexGuard;
if (mpMutex)
- pMutexGuard.reset( new osl::SolarMutexGuard(mpMutex) );
+ pMutexGuard.reset( new osl::SolarGuard(mpMutex) );
const sal_Int32 nCount = aPropertyNames.getLength();
@@ -264,7 +264,7 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< ::rtl::OUStr
{
// acquire mutex in c-tor and releases it in the d-tor (exception safe!).
if (pSlave->mpSlave->mpMutex)
- aOGuardArray[i].reset( new osl::SolarMutexGuard(pSlave->mpSlave->mpMutex) );
+ aOGuardArray[i].reset( new osl::SolarGuard(pSlave->mpSlave->mpMutex) );
pSlave->mpSlave->_preSetValues();
pSlave->SetInit ( sal_True );
@@ -291,9 +291,9 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< :
throw(RuntimeException)
{
// acquire mutex in c-tor and releases it in the d-tor (exception safe!).
- std::auto_ptr< osl::SolarMutexGuard > pMutexGuard;
+ std::auto_ptr< osl::SolarGuard > pMutexGuard;
if (mpMutex)
- pMutexGuard.reset( new osl::SolarMutexGuard(mpMutex) );
+ pMutexGuard.reset( new osl::SolarGuard(mpMutex) );
const sal_Int32 nCount = aPropertyNames.getLength();
@@ -329,7 +329,7 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< :
{
// acquire mutex in c-tor and releases it in the d-tor (exception safe!).
if (pSlave->mpSlave->mpMutex)
- aOGuardArray[i].reset( new osl::SolarMutexGuard(pSlave->mpSlave->mpMutex) );
+ aOGuardArray[i].reset( new osl::SolarGuard(pSlave->mpSlave->mpMutex) );
pSlave->mpSlave->_preGetValues();
pSlave->SetInit ( sal_True );
@@ -392,9 +392,9 @@ PropertyState SAL_CALL MasterPropertySet::getPropertyState( const ::rtl::OUStrin
ChainablePropertySet * pSlave = maSlaveMap [ (*aIter).second->mnMapId ]->mpSlave;
// acquire mutex in c-tor and releases it in the d-tor (exception safe!).
- std::auto_ptr< osl::SolarMutexGuard > pMutexGuard;
+ std::auto_ptr< osl::SolarGuard > pMutexGuard;
if (pSlave->mpMutex)
- pMutexGuard.reset( new osl::SolarMutexGuard(pSlave->mpMutex) );
+ pMutexGuard.reset( new osl::SolarGuard(pSlave->mpMutex) );
pSlave->_preGetPropertyState();
pSlave->_getPropertyState( *((*aIter).second->mpInfo), aState );
diff --git a/svtools/source/toolpanel/paneltabbarpeer.cxx b/svtools/source/toolpanel/paneltabbarpeer.cxx
index af108f0..9da8cce 100644
--- a/svtools/source/toolpanel/paneltabbarpeer.cxx
+++ b/svtools/source/toolpanel/paneltabbarpeer.cxx
@@ -75,7 +75,7 @@ namespace svt
//------------------------------------------------------------------------------------------------------------------
Reference< XAccessibleContext > PanelTabBarPeer::CreateAccessibleContext()
{
- ::osl::SolarMutexGuard aSolarGuard( GetMutex() );
+ ::osl::SolarGuard aSolarGuard( GetMutex() );
if ( m_pTabBar == NULL )
throw DisposedException( ::rtl::OUString(), *this );
@@ -91,7 +91,7 @@ namespace svt
void SAL_CALL PanelTabBarPeer::dispose() throw(RuntimeException)
{
{
- ::osl::SolarMutexGuard aSolarGuard( GetMutex() );
+ ::osl::SolarGuard aSolarGuard( GetMutex() );
m_pTabBar = NULL;
}
VCLXWindow::dispose();
diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.cxx b/svtools/source/toolpanel/toolpaneldeckpeer.cxx
index 7713d9b..00b3034 100644
--- a/svtools/source/toolpanel/toolpaneldeckpeer.cxx
+++ b/svtools/source/toolpanel/toolpaneldeckpeer.cxx
@@ -75,7 +75,7 @@ namespace svt
//------------------------------------------------------------------------------------------------------------------
Reference< XAccessibleContext > ToolPanelDeckPeer::CreateAccessibleContext()
{
- ::osl::SolarMutexGuard aSolarGuard( GetMutex() );
+ ::osl::SolarGuard aSolarGuard( GetMutex() );
if ( m_pDeck == NULL )
throw DisposedException( ::rtl::OUString(), *this );
@@ -89,7 +89,7 @@ namespace svt
void SAL_CALL ToolPanelDeckPeer::dispose() throw(RuntimeException)
{
{
- ::osl::SolarMutexGuard aSolarGuard( GetMutex() );
+ ::osl::SolarGuard aSolarGuard( GetMutex() );
m_pDeck = NULL;
}
VCLXWindow::dispose();
diff --git a/svtools/source/toolpanel/toolpaneldrawerpeer.cxx b/svtools/source/toolpanel/toolpaneldrawerpeer.cxx
index 0116aa8..5f08e3e 100644
--- a/svtools/source/toolpanel/toolpaneldrawerpeer.cxx
+++ b/svtools/source/toolpanel/toolpaneldrawerpeer.cxx
@@ -134,7 +134,7 @@ namespace svt
//------------------------------------------------------------------------------------------------------------------
Reference< XAccessibleContext > ToolPanelDrawerPeer::CreateAccessibleContext()
{
- ::osl::SolarMutexGuard aSolarGuard( GetMutex() );
+ ::osl::SolarGuard aSolarGuard( GetMutex() );
return new ToolPanelDrawerContext( *this );
}
diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx
index bc1ece9..4f21cea 100644
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.cxx
@@ -124,7 +124,7 @@ void SAL_CALL SVTXGridControl::removeSelectionListener(const ::com::sun::star::u
void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const Any& aValue) throw(RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
TableControl* pTable = (TableControl*)GetWindow();
switch( GetPropertyId( PropertyName ) )
@@ -363,7 +363,7 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An
Any SVTXGridControl::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
const sal_uInt16 nPropId = GetPropertyId( PropertyName );
TableControl* pTable = (TableControl*)GetWindow();
@@ -422,7 +422,7 @@ void SVTXGridControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
}
void SAL_CALL SVTXGridControl::setVisible( sal_Bool bVisible ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
TableControl* pTable = (TableControl*)GetWindow();
if ( pTable )
{
@@ -432,13 +432,13 @@ void SAL_CALL SVTXGridControl::setVisible( sal_Bool bVisible ) throw(::com::sun:
}
void SAL_CALL SVTXGridControl::setFocus() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
if ( GetWindow())
GetWindow()->GrabFocus();
}
void SAL_CALL SVTXGridControl::rowAdded(const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
std::vector< Any > newRow;
Sequence< Any > rawRowData = Event.rowData;
@@ -486,7 +486,7 @@ void SAL_CALL SVTXGridControl::rowAdded(const ::com::sun::star::awt::grid::GridD
void SAL_CALL SVTXGridControl::rowRemoved(const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
TableControl* pTable = (TableControl*)GetWindow();
if(Event.index == -1)
@@ -529,7 +529,7 @@ void SAL_CALL SVTXGridControl::rowRemoved(const ::com::sun::star::awt::grid::Gri
void SAL_CALL SVTXGridControl::columnChanged(const ::com::sun::star::awt::grid::GridColumnEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
TableControl* pTable = (TableControl*)GetWindow();
if(Event.valueName == rtl::OUString::createFromAscii("ColumnResize"))
@@ -578,7 +578,7 @@ void SAL_CALL SVTXGridControl::columnChanged(const ::com::sun::star::awt::grid:
}
void SAL_CALL SVTXGridControl::dataChanged(const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
TableControl* pTable = (TableControl*)GetWindow();
if(Event.valueName == rtl::OUString::createFromAscii("RowHeight"))
@@ -819,7 +819,7 @@ void SAL_CALL SVTXGridControl::selectColumn(::sal_Int32 x) throw (::com::sun::st
}
void SVTXGridControl::dispose() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::lang::EventObject aObj;
aObj.Source = (::cppu::OWeakObject*)this;
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index a6b4d75..96a5e0a 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -487,7 +487,7 @@ UnoTreeListBoxImpl& TreeControlPeer::getTreeListBoxOrThrow() const throw (Runtim
void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect, bool bSetSelection ) throw( RuntimeException, IllegalArgumentException )
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
@@ -549,7 +549,7 @@ void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect,
sal_Bool SAL_CALL TreeControlPeer::select( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
ChangeNodesSelection( rSelection, true, true );
return sal_True;
}
@@ -558,7 +558,7 @@ sal_Bool SAL_CALL TreeControlPeer::select( const Any& rSelection ) throw (Illega
Any SAL_CALL TreeControlPeer::getSelection() throw (RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
@@ -625,7 +625,7 @@ void SAL_CALL TreeControlPeer::removeSelection( const Any& rSelection ) throw (I
void SAL_CALL TreeControlPeer::clearSelection() throw (RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
getTreeListBoxOrThrow().SelectAll( FALSE );
}
@@ -633,7 +633,7 @@ void SAL_CALL TreeControlPeer::clearSelection() throw (RuntimeException)
sal_Int32 SAL_CALL TreeControlPeer::getSelectionCount() throw (RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
return getTreeListBoxOrThrow().GetSelectionCount();
}
@@ -679,7 +679,7 @@ Any SAL_CALL TreeSelectionEnumeration::nextElement() throw (NoSuchElementExcepti
Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration() throw (RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
@@ -703,7 +703,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration()
Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumeration() throw (RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
@@ -729,7 +729,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumer
OUString SAL_CALL TreeControlPeer::getDefaultExpandedGraphicURL() throw (::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
return msDefaultExpandedGraphicURL;
}
@@ -737,7 +737,7 @@ OUString SAL_CALL TreeControlPeer::getDefaultExpandedGraphicURL() throw (::com::
void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const ::rtl::OUString& sDefaultExpandedGraphicURL ) throw (::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
if( msDefaultExpandedGraphicURL != sDefaultExpandedGraphicURL )
{
if( sDefaultExpandedGraphicURL.getLength() )
@@ -767,7 +767,7 @@ void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const ::rtl::OUStri
OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
return msDefaultCollapsedGraphicURL;
}
@@ -775,7 +775,7 @@ OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (::com:
void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const ::rtl::OUString& sDefaultCollapsedGraphicURL ) throw (::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
if( msDefaultCollapsedGraphicURL != sDefaultCollapsedGraphicURL )
{
if( sDefaultCollapsedGraphicURL.getLength() )
@@ -805,7 +805,7 @@ void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const ::rtl::OUStr
sal_Bool SAL_CALL TreeControlPeer::isNodeExpanded( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
UnoTreeListEntry* pEntry = getEntry( xNode );
@@ -816,7 +816,7 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeExpanded( const Reference< XTreeNode >&
sal_Bool SAL_CALL TreeControlPeer::isNodeCollapsed( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
return !isNodeExpanded( xNode );
}
@@ -824,7 +824,7 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeCollapsed( const Reference< XTreeNode >
void SAL_CALL TreeControlPeer::makeNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
UnoTreeListEntry* pEntry = getEntry( xNode );
@@ -836,7 +836,7 @@ void SAL_CALL TreeControlPeer::makeNodeVisible( const Reference< XTreeNode >& xN
sal_Bool SAL_CALL TreeControlPeer::isNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
UnoTreeListEntry* pEntry = getEntry( xNode );
@@ -847,7 +847,7 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeVisible( const Reference< XTreeNode >&
void SAL_CALL TreeControlPeer::expandNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
UnoTreeListEntry* pEntry = getEntry( xNode );
@@ -859,7 +859,7 @@ void SAL_CALL TreeControlPeer::expandNode( const Reference< XTreeNode >& xNode )
void SAL_CALL TreeControlPeer::collapseNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
UnoTreeListEntry* pEntry = getEntry( xNode );
@@ -885,7 +885,7 @@ void SAL_CALL TreeControlPeer::removeTreeExpansionListener( const Reference< XTr
Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
@@ -903,7 +903,7 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x
Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
@@ -921,7 +921,7 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_
awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode >& i_Node ) throw (IllegalArgumentException, RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
UnoTreeListEntry* pEntry = getEntry( i_Node, true );
@@ -934,7 +934,7 @@ awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode
sal_Bool SAL_CALL TreeControlPeer::isEditing( ) throw (RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
return rTree.IsEditingActive() ? sal_True : sal_False;
@@ -944,7 +944,7 @@ sal_Bool SAL_CALL TreeControlPeer::isEditing( ) throw (RuntimeException)
sal_Bool SAL_CALL TreeControlPeer::stopEditing() throw (RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
if( rTree.IsEditingActive() )
@@ -962,7 +962,7 @@ sal_Bool SAL_CALL TreeControlPeer::stopEditing() throw (RuntimeException)
void SAL_CALL TreeControlPeer::cancelEditing( ) throw (RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
rTree.EndEditing(FALSE);
@@ -972,7 +972,7 @@ void SAL_CALL TreeControlPeer::cancelEditing( ) throw (RuntimeException)
void SAL_CALL TreeControlPeer::startEditingAtNode( const Reference< XTreeNode >& xNode ) throw (IllegalArgumentException, RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
UnoTreeListEntry* pEntry = getEntry( xNode );
@@ -1042,7 +1042,7 @@ bool TreeControlPeer::onEditedEntry( UnoTreeListEntry* pEntry, const XubString&
void SAL_CALL TreeControlPeer::treeNodesChanged( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
if( mnEditLock != 0 )
return;
@@ -1052,7 +1052,7 @@ void SAL_CALL TreeControlPeer::treeNodesChanged( const ::com::sun::star::awt::tr
void SAL_CALL TreeControlPeer::treeNodesInserted( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
if( mnEditLock != 0 )
return;
@@ -1062,7 +1062,7 @@ void SAL_CALL TreeControlPeer::treeNodesInserted( const ::com::sun::star::awt::t
void SAL_CALL TreeControlPeer::treeNodesRemoved( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
if( mnEditLock != 0 )
return;
@@ -1072,7 +1072,7 @@ void SAL_CALL TreeControlPeer::treeNodesRemoved( const ::com::sun::star::awt::tr
void SAL_CALL TreeControlPeer::treeStructureChanged( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
if( mnEditLock != 0 )
return;
@@ -1242,7 +1242,7 @@ OUString TreeControlPeer::getEntryString( const Any& rValue )
void SAL_CALL TreeControlPeer::disposing( const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException)
{
// model is disposed, so we clear our tree
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
rTree.Clear();
mxDataModel.clear();
@@ -1282,7 +1282,7 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere
::com::sun::star::awt::Size TreeControlPeer::getMinimumSize() throw(RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::awt::Size aSz;
/* todo
@@ -1300,7 +1300,7 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere
::com::sun::star::awt::Size TreeControlPeer::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::awt::Size aSz = rNewSize;
/* todo
@@ -1317,7 +1317,7 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere
void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& aValue) throw(RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
@@ -1420,7 +1420,7 @@ void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const An
Any TreeControlPeer::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
const sal_uInt16 nPropId = GetPropertyId( PropertyName );
if( (nPropId >= BASEPROPERTY_TREE_START) && (nPropId <= BASEPROPERTY_TREE_END) )
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 9c79c23..74a3912 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -226,7 +226,7 @@ void VCLXMultiLineEdit::removeTextListener( const ::com::sun::star::uno::Referen
void VCLXMultiLineEdit::setText( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
MultiLineEdit* pEdit = (MultiLineEdit*)GetWindow();
if ( pEdit )
@@ -243,7 +243,7 @@ void VCLXMultiLineEdit::setText( const ::rtl::OUString& aText ) throw(::com::sun
void VCLXMultiLineEdit::insertText( const ::com::sun::star::awt::Selection& rSel, const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
MultiLineEdit* pEdit = (MultiLineEdit*)GetWindow();
if ( pEdit )
@@ -255,7 +255,7 @@ void VCLXMultiLineEdit::insertText( const ::com::sun::star::awt::Selection& rSel
::rtl::OUString VCLXMultiLineEdit::getText() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::rtl::OUString aText;
MultiLineEdit* pEdit = (MultiLineEdit*)GetWindow();
@@ -266,7 +266,7 @@ void VCLXMultiLineEdit::insertText( const ::com::sun::star::awt::Selection& rSel
::rtl::OUString VCLXMultiLineEdit::getSelectedText() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::rtl::OUString aText;
MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow();
@@ -278,7 +278,7 @@ void VCLXMultiLineEdit::insertText( const ::com::sun::star::awt::Selection& rSel
void VCLXMultiLineEdit::setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow();
if ( pMultiLineEdit )
@@ -289,7 +289,7 @@ void VCLXMultiLineEdit::setSelection( const ::com::sun::star::awt::Selection& aS
::com::sun::star::awt::Selection VCLXMultiLineEdit::getSelection() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::awt::Selection aSel;
MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow();
@@ -303,7 +303,7 @@ void VCLXMultiLineEdit::setSelection( const ::com::sun::star::awt::Selection& aS
sal_Bool VCLXMultiLineEdit::isEditable() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow();
return ( pMultiLineEdit && !pMultiLineEdit->IsReadOnly() && pMultiLineEdit->IsEnabled() ) ? sal_True : sal_False;
@@ -311,7 +311,7 @@ sal_Bool VCLXMultiLineEdit::isEditable() throw(::com::sun::star::uno::RuntimeExc
void VCLXMultiLineEdit::setEditable( sal_Bool bEditable ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow();
if ( pMultiLineEdit )
@@ -320,7 +320,7 @@ void VCLXMultiLineEdit::setEditable( sal_Bool bEditable ) throw(::com::sun::star
void VCLXMultiLineEdit::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow();
if ( pMultiLineEdit )
@@ -329,7 +329,7 @@ void VCLXMultiLineEdit::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::
sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow();
return pMultiLineEdit ? (sal_Int16)pMultiLineEdit->GetMaxTextLen() : (sal_Int16)0;
@@ -337,7 +337,7 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::Runtim
::rtl::OUString VCLXMultiLineEdit::getTextLines() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::rtl::OUString aText;
MultiLineEdit* pEdit = (MultiLineEdit*)GetWindow();
@@ -348,7 +348,7 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::Runtim
::com::sun::star::awt::Size VCLXMultiLineEdit::getMinimumSize() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::awt::Size aSz;
MultiLineEdit* pEdit = (MultiLineEdit*) GetWindow();
@@ -364,7 +364,7 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::Runtim
::com::sun::star::awt::Size VCLXMultiLineEdit::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::awt::Size aSz = rNewSize;
MultiLineEdit* pEdit = (MultiLineEdit*) GetWindow();
@@ -375,7 +375,7 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::Runtim
::com::sun::star::awt::Size VCLXMultiLineEdit::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::awt::Size aSz;
MultiLineEdit* pEdit = (MultiLineEdit*) GetWindow();
@@ -386,7 +386,7 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::Runtim
void VCLXMultiLineEdit::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
nCols = nLines = 0;
MultiLineEdit* pEdit = (MultiLineEdit*) GetWindow();
@@ -423,7 +423,7 @@ void VCLXMultiLineEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEven
void VCLXMultiLineEdit::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
MultiLineEdit* pMultiLineEdit = (MultiLineEdit*)GetWindow();
if ( pMultiLineEdit )
@@ -479,7 +479,7 @@ void VCLXMultiLineEdit::setProperty( const ::rtl::OUString& PropertyName, const
::com::sun::star::uno::Any VCLXMultiLineEdit::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::uno::Any aProp;
MultiLineEdit* pMultiLineEdit = (MultiLineEdit*)GetWindow();
@@ -523,7 +523,7 @@ void VCLXMultiLineEdit::setProperty( const ::rtl::OUString& PropertyName, const
void SAL_CALL VCLXMultiLineEdit::setFocus( ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
// don't grab the focus if we already have it. Reason is that the only thing which the edit
// does is forwarding the focus to it's text window. This text window then does a "select all".
@@ -578,7 +578,7 @@ IMPL_XTYPEPROVIDER_END
void SAL_CALL VCLXFileControl::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FileControl* pControl = (FileControl*)GetWindow();
if ( pControl )
@@ -628,7 +628,7 @@ void VCLXFileControl::removeTextListener( const ::com::sun::star::uno::Reference
void VCLXFileControl::setText( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
Window* pWindow = GetWindow();
if ( pWindow )
@@ -643,7 +643,7 @@ void VCLXFileControl::setText( const ::rtl::OUString& aText ) throw(::com::sun::
void VCLXFileControl::insertText( const ::com::sun::star::awt::Selection& rSel, const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FileControl* pFileControl = (FileControl*) GetWindow();
if ( pFileControl )
@@ -655,7 +655,7 @@ void VCLXFileControl::insertText( const ::com::sun::star::awt::Selection& rSel,
::rtl::OUString VCLXFileControl::getText() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::rtl::OUString aText;
Window* pWindow = GetWindow();
@@ -666,7 +666,7 @@ void VCLXFileControl::insertText( const ::com::sun::star::awt::Selection& rSel,
::rtl::OUString VCLXFileControl::getSelectedText() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::rtl::OUString aText;
FileControl* pFileControl = (FileControl*) GetWindow();
@@ -678,7 +678,7 @@ void VCLXFileControl::insertText( const ::com::sun::star::awt::Selection& rSel,
void VCLXFileControl::setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FileControl* pFileControl = (FileControl*) GetWindow();
if ( pFileControl )
@@ -687,7 +687,7 @@ void VCLXFileControl::setSelection( const ::com::sun::star::awt::Selection& aSel
::com::sun::star::awt::Selection VCLXFileControl::getSelection() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::awt::Selection aSel;
FileControl* pFileControl = (FileControl*) GetWindow();
@@ -701,7 +701,7 @@ void VCLXFileControl::setSelection( const ::com::sun::star::awt::Selection& aSel
sal_Bool VCLXFileControl::isEditable() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FileControl* pFileControl = (FileControl*) GetWindow();
return ( pFileControl && !pFileControl->GetEdit().IsReadOnly() && pFileControl->GetEdit().IsEnabled() ) ? sal_True : sal_False;
@@ -709,7 +709,7 @@ sal_Bool VCLXFileControl::isEditable() throw(::com::sun::star::uno::RuntimeExcep
void VCLXFileControl::setEditable( sal_Bool bEditable ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FileControl* pFileControl = (FileControl*) GetWindow();
if ( pFileControl )
@@ -718,7 +718,7 @@ void VCLXFileControl::setEditable( sal_Bool bEditable ) throw(::com::sun::star::
void VCLXFileControl::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FileControl* pFileControl = (FileControl*) GetWindow();
if ( pFileControl )
@@ -727,7 +727,7 @@ void VCLXFileControl::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::un
sal_Int16 VCLXFileControl::getMaxTextLen() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FileControl* pFileControl = (FileControl*) GetWindow();
return pFileControl ? pFileControl->GetEdit().GetMaxTextLen() : 0;
@@ -745,7 +745,7 @@ IMPL_LINK( VCLXFileControl, ModifyHdl, Edit*, EMPTYARG )
::com::sun::star::awt::Size VCLXFileControl::getMinimumSize() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::awt::Size aSz;
FileControl* pControl = (FileControl*) GetWindow();
@@ -767,7 +767,7 @@ IMPL_LINK( VCLXFileControl, ModifyHdl, Edit*, EMPTYARG )
::com::sun::star::awt::Size VCLXFileControl::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::awt::Size aSz =rNewSize;
FileControl* pControl = (FileControl*) GetWindow();
@@ -782,7 +782,7 @@ IMPL_LINK( VCLXFileControl, ModifyHdl, Edit*, EMPTYARG )
::com::sun::star::awt::Size VCLXFileControl::getMinimumSize( sal_Int16 nCols, sal_Int16 ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::awt::Size aSz;
FileControl* pControl = (FileControl*) GetWindow();
@@ -796,7 +796,7 @@ IMPL_LINK( VCLXFileControl, ModifyHdl, Edit*, EMPTYARG )
void VCLXFileControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
nCols = 0;
nLines = 1;
@@ -847,7 +847,7 @@ void SVTXFormattedField::SetWindow( Window* _pWindow )
// --------------------------------------------------------------------------------------
void SVTXFormattedField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
if ( pField )
@@ -972,7 +972,7 @@ void SVTXFormattedField::setProperty( const ::rtl::OUString& PropertyName, const
// --------------------------------------------------------------------------------------
::com::sun::star::uno::Any SVTXFormattedField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::uno::Any aReturn;
@@ -1433,7 +1433,7 @@ void SVTXRoadmap::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
{
case VCLEVENT_ROADMAP_ITEMSELECTED:
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::svt::ORoadmap* pField = GetRoadmap();
if ( pField )
{
@@ -1455,7 +1455,7 @@ void SVTXRoadmap::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
void SVTXRoadmap::propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::svt::ORoadmap* pField = GetRoadmap();
if ( pField )
{
@@ -1524,7 +1524,7 @@ RMItemData SVTXRoadmap::GetRMItemData( const ::com::sun::star::container::Contai
void SVTXRoadmap::elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent )throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::svt::ORoadmap* pField = GetRoadmap();
if ( pField )
{
@@ -1537,7 +1537,7 @@ void SVTXRoadmap::elementInserted( const ::com::sun::star::container::ContainerE
void SVTXRoadmap::elementRemoved( const ::com::sun::star::container::ContainerEvent& _rEvent )throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::svt::ORoadmap* pField = GetRoadmap();
if ( pField )
{
@@ -1551,7 +1551,7 @@ void SVTXRoadmap::elementRemoved( const ::com::sun::star::container::ContainerEv
void SVTXRoadmap::elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent )throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::svt::ORoadmap* pField = GetRoadmap();
if ( pField )
{
@@ -1567,7 +1567,7 @@ void SVTXRoadmap::elementReplaced( const ::com::sun::star::container::ContainerE
// --------------------------------------------------------------------------------------
void SVTXRoadmap::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::svt::ORoadmap* pField = GetRoadmap();
if ( pField )
@@ -1622,7 +1622,7 @@ void SVTXRoadmap::setProperty( const ::rtl::OUString& PropertyName, const ::com:
// --------------------------------------------------------------------------------------
::com::sun::star::uno::Any SVTXRoadmap::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::uno::Any aReturn;
@@ -1696,7 +1696,7 @@ IMPL_XTYPEPROVIDER_END
void SVTXNumericField::setValue( double Value ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
if ( pField )
@@ -1705,7 +1705,7 @@ void SVTXNumericField::setValue( double Value ) throw(::com::sun::star::uno::Run
double SVTXNumericField::getValue() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
return pField ? pField->GetValue() : 0;
@@ -1713,7 +1713,7 @@ double SVTXNumericField::getValue() throw(::com::sun::star::uno::RuntimeExceptio
void SVTXNumericField::setMin( double Value ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
if ( pField )
@@ -1722,7 +1722,7 @@ void SVTXNumericField::setMin( double Value ) throw(::com::sun::star::uno::Runti
double SVTXNumericField::getMin() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
return pField ? pField->GetMinValue() : 0;
@@ -1730,7 +1730,7 @@ double SVTXNumericField::getMin() throw(::com::sun::star::uno::RuntimeException)
void SVTXNumericField::setMax( double Value ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
if ( pField )
@@ -1739,7 +1739,7 @@ void SVTXNumericField::setMax( double Value ) throw(::com::sun::star::uno::Runti
double SVTXNumericField::getMax() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
return pField ? pField->GetMaxValue() : 0;
@@ -1747,7 +1747,7 @@ double SVTXNumericField::getMax() throw(::com::sun::star::uno::RuntimeException)
void SVTXNumericField::setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
if ( pField )
@@ -1756,7 +1756,7 @@ void SVTXNumericField::setFirst( double Value ) throw(::com::sun::star::uno::Run
double SVTXNumericField::getFirst() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
return pField ? pField->GetSpinFirst() : 0;
@@ -1764,7 +1764,7 @@ double SVTXNumericField::getFirst() throw(::com::sun::star::uno::RuntimeExceptio
void SVTXNumericField::setLast( double Value ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
if ( pField )
@@ -1773,7 +1773,7 @@ void SVTXNumericField::setLast( double Value ) throw(::com::sun::star::uno::Runt
double SVTXNumericField::getLast() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
return pField ? pField->GetSpinLast() : 0;
@@ -1781,7 +1781,7 @@ double SVTXNumericField::getLast() throw(::com::sun::star::uno::RuntimeException
void SVTXNumericField::setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
if ( pField )
@@ -1790,7 +1790,7 @@ void SVTXNumericField::setSpinSize( double Value ) throw(::com::sun::star::uno::
double SVTXNumericField::getSpinSize() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
return pField ? pField->GetSpinSize() : 0;
@@ -1798,7 +1798,7 @@ double SVTXNumericField::getSpinSize() throw(::com::sun::star::uno::RuntimeExcep
void SVTXNumericField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
if ( pField )
@@ -1807,7 +1807,7 @@ void SVTXNumericField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::sta
sal_Int16 SVTXNumericField::getDecimalDigits() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
return pField ? pField->GetDecimalDigits() : 0;
@@ -1815,7 +1815,7 @@ sal_Int16 SVTXNumericField::getDecimalDigits() throw(::com::sun::star::uno::Runt
void SVTXNumericField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
if ( pField )
@@ -1824,7 +1824,7 @@ void SVTXNumericField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::sta
sal_Bool SVTXNumericField::isStrictFormat() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
return pField ? pField->IsStrictFormat() : sal_False;
@@ -1862,7 +1862,7 @@ IMPL_XTYPEPROVIDER_END
void SVTXCurrencyField::setValue( double Value ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
if ( pField )
@@ -1871,7 +1871,7 @@ void SVTXCurrencyField::setValue( double Value ) throw(::com::sun::star::uno::Ru
double SVTXCurrencyField::getValue() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
return pField ? pField->GetValue() : 0;
@@ -1879,7 +1879,7 @@ double SVTXCurrencyField::getValue() throw(::com::sun::star::uno::RuntimeExcepti
void SVTXCurrencyField::setMin( double Value ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
if ( pField )
@@ -1888,7 +1888,7 @@ void SVTXCurrencyField::setMin( double Value ) throw(::com::sun::star::uno::Runt
double SVTXCurrencyField::getMin() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
return pField ? pField->GetMinValue() : 0;
@@ -1896,7 +1896,7 @@ double SVTXCurrencyField::getMin() throw(::com::sun::star::uno::RuntimeException
void SVTXCurrencyField::setMax( double Value ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
if ( pField )
@@ -1905,7 +1905,7 @@ void SVTXCurrencyField::setMax( double Value ) throw(::com::sun::star::uno::Runt
double SVTXCurrencyField::getMax() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
return pField ? pField->GetMaxValue() : 0;
@@ -1913,7 +1913,7 @@ double SVTXCurrencyField::getMax() throw(::com::sun::star::uno::RuntimeException
void SVTXCurrencyField::setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
if ( pField )
@@ -1922,7 +1922,7 @@ void SVTXCurrencyField::setFirst( double Value ) throw(::com::sun::star::uno::Ru
double SVTXCurrencyField::getFirst() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
return pField ? pField->GetSpinFirst() : 0;
@@ -1930,7 +1930,7 @@ double SVTXCurrencyField::getFirst() throw(::com::sun::star::uno::RuntimeExcepti
void SVTXCurrencyField::setLast( double Value ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
if ( pField )
@@ -1939,7 +1939,7 @@ void SVTXCurrencyField::setLast( double Value ) throw(::com::sun::star::uno::Run
double SVTXCurrencyField::getLast() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
return pField ? pField->GetSpinLast() : 0;
@@ -1947,7 +1947,7 @@ double SVTXCurrencyField::getLast() throw(::com::sun::star::uno::RuntimeExceptio
void SVTXCurrencyField::setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
if ( pField )
@@ -1956,7 +1956,7 @@ void SVTXCurrencyField::setSpinSize( double Value ) throw(::com::sun::star::uno:
double SVTXCurrencyField::getSpinSize() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
return pField ? pField->GetSpinSize() : 0;
@@ -1964,7 +1964,7 @@ double SVTXCurrencyField::getSpinSize() throw(::com::sun::star::uno::RuntimeExce
void SVTXCurrencyField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
if ( pField )
@@ -1973,7 +1973,7 @@ void SVTXCurrencyField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::st
sal_Int16 SVTXCurrencyField::getDecimalDigits() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
return pField ? pField->GetDecimalDigits() : 0;
@@ -1981,7 +1981,7 @@ sal_Int16 SVTXCurrencyField::getDecimalDigits() throw(::com::sun::star::uno::Run
void SVTXCurrencyField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
if ( pField )
@@ -1990,7 +1990,7 @@ void SVTXCurrencyField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::st
sal_Bool SVTXCurrencyField::isStrictFormat() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
FormattedField* pField = GetFormattedField();
return pField ? pField->IsStrictFormat() : sal_False;
@@ -1998,7 +1998,7 @@ sal_Bool SVTXCurrencyField::isStrictFormat() throw(::com::sun::star::uno::Runtim
void SVTXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::uno::Any aReturn;
@@ -2038,7 +2038,7 @@ void SVTXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const
::com::sun::star::uno::Any SVTXCurrencyField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::uno::Any aReturn;
@@ -2159,7 +2159,7 @@ IMPL_XTYPEPROVIDER_END
// ::com::sun::star::awt::XProgressBar
void VCLXProgressBar::setForegroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
Window* pWindow = GetWindow();
if ( pWindow )
@@ -2171,7 +2171,7 @@ void VCLXProgressBar::setForegroundColor( sal_Int32 nColor ) throw(::com::sun::s
void VCLXProgressBar::setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
Window* pWindow = GetWindow();
if ( pWindow )
@@ -2185,7 +2185,7 @@ void VCLXProgressBar::setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::s
void VCLXProgressBar::setValue( sal_Int32 nValue ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
m_nValue = nValue;
ImplUpdateValue();
@@ -2193,7 +2193,7 @@ void VCLXProgressBar::setValue( sal_Int32 nValue ) throw(::com::sun::star::uno::
void VCLXProgressBar::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException )
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
if ( nMin < nMax )
{
@@ -2213,7 +2213,7 @@ void VCLXProgressBar::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::su
sal_Int32 VCLXProgressBar::getValue() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
return m_nValue;
}
@@ -2221,7 +2221,7 @@ sal_Int32 VCLXProgressBar::getValue() throw(::com::sun::star::uno::RuntimeExcept
// ::com::sun::star::awt::VclWindowPeer
void VCLXProgressBar::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
ProgressBar* pProgressBar = (ProgressBar*)GetWindow();
if ( pProgressBar )
@@ -2279,7 +2279,7 @@ void VCLXProgressBar::setProperty( const ::rtl::OUString& PropertyName, const ::
::com::sun::star::uno::Any VCLXProgressBar::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::uno::Any aProp;
ProgressBar* pProgressBar = (ProgressBar*)GetWindow();
diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx
index 97aa746..077ddbc 100644
--- a/toolkit/source/awt/stylesettings.cxx
+++ b/toolkit/source/awt/stylesettings.cxx
@@ -117,7 +117,7 @@ namespace toolkit
}
private:
- ::osl::SolarMutexGuard m_aGuard;
+ ::osl::SolarGuard m_aGuard;
};
//==================================================================================================================
diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx
index 6d1941a..a21234e 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.cxx
@@ -77,21 +77,21 @@ IMPL_XTYPEPROVIDER_END
// ::com::sun::star::awt::XVclContainer
void VCLXContainer::addVclContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclContainerListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
GetContainerListeners().addInterface( rxListener );
}
void VCLXContainer::removeVclContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclContainerListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
GetContainerListeners().removeInterface( rxListener );
}
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > > VCLXContainer::getWindows( ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
// Bei allen Childs das Container-Interface abfragen...
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > > aSeq;
@@ -119,7 +119,7 @@ void VCLXContainer::removeVclContainerListener( const ::com::sun::star::uno::Ref
// ::com::sun::star::awt::XVclContainerPeer
void VCLXContainer::enableDialogControl( sal_Bool bEnable ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
Window* pWindow = GetWindow();
if ( pWindow )
@@ -135,7 +135,7 @@ void VCLXContainer::enableDialogControl( sal_Bool bEnable ) throw(::com::sun::st
void VCLXContainer::setTabOrder( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& Components, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Tabs, sal_Bool bGroupControl ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
sal_uInt32 nCount = Components.getLength();
DBG_ASSERT( nCount == (sal_uInt32)Tabs.getLength(), "setTabOrder: TabCount != ComponentCount" );
@@ -180,7 +180,7 @@ void VCLXContainer::setTabOrder( const ::com::sun::star::uno::Sequence< ::com::s
void VCLXContainer::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& Components ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
sal_uInt32 nCount = Components.getLength();
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > * pComps = Components.getConstArray();
diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx
index ecdc990..4faed3b 100644
--- a/toolkit/source/awt/vclxdevice.cxx
+++ b/toolkit/source/awt/vclxdevice.cxx
@@ -112,7 +112,7 @@ IMPL_XTYPEPROVIDER_END
// ::com::sun::star::awt::XDevice,
::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > VCLXDevice::createGraphics( ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > xRef;
@@ -124,7 +124,7 @@ IMPL_XTYPEPROVIDER_END
::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > VCLXDevice::createDevice( sal_Int32 nWidth, sal_Int32 nHeight ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > xRef;
if ( GetOutputDevice() )
@@ -140,7 +140,7 @@ IMPL_XTYPEPROVIDER_END
::com::sun::star::awt::DeviceInfo VCLXDevice::getInfo() throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::awt::DeviceInfo aInfo;
@@ -191,7 +191,7 @@ IMPL_XTYPEPROVIDER_END
::com::sun::star::uno::Sequence< ::com::sun::star::awt::FontDescriptor > VCLXDevice::getFontDescriptors( ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::uno::Sequence< ::com::sun::star::awt::FontDescriptor> aFonts;
if( mpOutputDevice )
@@ -210,7 +210,7 @@ IMPL_XTYPEPROVIDER_END
::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > VCLXDevice::getFont( const ::com::sun::star::awt::FontDescriptor& rDescriptor ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > xRef;
if( mpOutputDevice )
@@ -224,7 +224,7 @@ IMPL_XTYPEPROVIDER_END
::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > VCLXDevice::createBitmap( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > xBmp;
if( mpOutputDevice )
@@ -240,7 +240,7 @@ IMPL_XTYPEPROVIDER_END
::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayBitmap > VCLXDevice::createDisplayBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >& rxBitmap ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
BitmapEx aBmp = VCLUnoHelper::GetBitmap( rxBitmap );
VCLXBitmap* pBmp = new VCLXBitmap;
@@ -252,7 +252,7 @@ IMPL_XTYPEPROVIDER_END
VCLXVirtualDevice::~VCLXVirtualDevice()
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
DestroyOutputDevice();
}
@@ -265,7 +265,7 @@ VCLXVirtualDevice::~VCLXVirtualDevice()
::com::sun::star::awt::Point SAL_CALL VCLXDevice::convertPointToLogic( const ::com::sun::star::awt::Point& aPoint, ::sal_Int16 TargetUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
(void)aPoint;
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
if (TargetUnit == com::sun::star::util::MeasureUnit::PERCENT )
{
// percentage not allowed here
@@ -290,7 +290,7 @@ VCLXVirtualDevice::~VCLXVirtualDevice()
::com::sun::star::awt::Point SAL_CALL VCLXDevice::convertPointToPixel( const ::com::sun::star::awt::Point& aPoint, ::sal_Int16 SourceUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
(void)aPoint;
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
if (SourceUnit == com::sun::star::util::MeasureUnit::PERCENT ||
SourceUnit == com::sun::star::util::MeasureUnit::PIXEL )
{
@@ -314,7 +314,7 @@ VCLXVirtualDevice::~VCLXVirtualDevice()
::com::sun::star::awt::Size SAL_CALL VCLXDevice::convertSizeToLogic( const ::com::sun::star::awt::Size& aSize, ::sal_Int16 TargetUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
(void)aSize;
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
if (TargetUnit == com::sun::star::util::MeasureUnit::PERCENT)
{
// percentage not allowed here
@@ -339,7 +339,7 @@ VCLXVirtualDevice::~VCLXVirtualDevice()
::com::sun::star::awt::Size SAL_CALL VCLXDevice::convertSizeToPixel( const ::com::sun::star::awt::Size& aSize, ::sal_Int16 SourceUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
(void)aSize;
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
if (SourceUnit == com::sun::star::util::MeasureUnit::PERCENT ||
SourceUnit == com::sun::star::util::MeasureUnit::PIXEL)
{
diff --git a/toolkit/source/awt/vclxdialog.cxx b/toolkit/source/awt/vclxdialog.cxx
index f15111f..89d7a6a 100644
--- a/toolkit/source/awt/vclxdialog.cxx
+++ b/toolkit/source/awt/vclxdialog.cxx
@@ -102,7 +102,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXDialog, VCLXWindow, VCLXDialog_Base );
void SAL_CALL VCLXDialog::dispose() throw(::com::sun::star::uno::RuntimeException)
{
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::lang::EventObject aDisposeEvent;
aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
@@ -147,7 +147,7 @@ void SAL_CALL VCLXDialog::allocateArea( const css::awt::Rectangle &rArea )
void VCLXDialog::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
{
- ::osl::ClearableSolarMutexGuard aGuard( GetMutex() );
+ ::osl::ClearableSolarGuard aGuard( GetMutex() );
switch ( _rVclWindowEvent.GetId() )
{
@@ -162,7 +162,7 @@ void VCLXDialog::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
void SAL_CALL VCLXDialog::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any &Value ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
if ( GetWindow() )
{
@@ -179,7 +179,7 @@ void SAL_CALL VCLXDialog::setProperty( const ::rtl::OUString& PropertyName, cons
::com::sun::star::uno::Any SAL_CALL VCLXDialog::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::uno::Any aReturn;
if ( GetWindow() )
@@ -200,7 +200,7 @@ void SAL_CALL VCLXDialog::setProperty( const ::rtl::OUString& PropertyName, cons
void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
Window* pWindow = GetWindow();
if ( pWindow )
@@ -209,7 +209,7 @@ void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star
void VCLXDialog::setHelpId( sal_Int32 id ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
Window* pWindow = GetWindow();
if ( pWindow )
@@ -218,7 +218,7 @@ void VCLXDialog::setHelpId( sal_Int32 id ) throw(::com::sun::star::uno::RuntimeE
::rtl::OUString VCLXDialog::getTitle() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
::rtl::OUString aTitle;
Window* pWindow = GetWindow();
@@ -229,7 +229,7 @@ void VCLXDialog::setHelpId( sal_Int32 id ) throw(::com::sun::star::uno::RuntimeE
sal_Int16 VCLXDialog::execute() throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
sal_Int16 nRet = 0;
if ( GetWindow() )
@@ -253,7 +253,7 @@ sal_Int16 VCLXDialog::execute() throw(::com::sun::star::uno::RuntimeException)
void VCLXDialog::endDialog( sal_Int32 nResult ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
if ( nResult == BUTTONID_HELP )
{
diff --git a/toolkit/source/awt/vclxfixedline.cxx b/toolkit/source/awt/vclxfixedline.cxx
index ee40b61..ad0f044 100644
--- a/toolkit/source/awt/vclxfixedline.cxx
+++ b/toolkit/source/awt/vclxfixedline.cxx
@@ -63,7 +63,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER1( VCLXFixedLine, VCLXWindow );
void SAL_CALL VCLXFixedLine::dispose() throw(RuntimeException)
{
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
EventObject aDisposeEvent;
aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
@@ -80,7 +80,7 @@ void SAL_CALL VCLXFixedLine::dispose() throw(RuntimeException)
void VCLXFixedLine::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
{
- ::osl::ClearableSolarMutexGuard aGuard( GetMutex() );
+ ::osl::ClearableSolarGuard aGuard( GetMutex() );
/*
switch ( _rVclWindowEvent.GetId() )
{
@@ -96,7 +96,7 @@ void VCLXFixedLine::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
void SAL_CALL VCLXFixedLine::setProperty( const ::rtl::OUString& PropertyName, const Any &Value ) throw(RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
if ( GetWindow() )
{
@@ -113,7 +113,7 @@ void SAL_CALL VCLXFixedLine::setProperty( const ::rtl::OUString& PropertyName, c
Any SAL_CALL VCLXFixedLine::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
Any aReturn;
if ( GetWindow() )
diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx
index e984f13..4f7e3a0 100644
--- a/toolkit/source/awt/vclxgraphics.cxx
+++ b/toolkit/source/awt/vclxgraphics.cxx
@@ -142,7 +142,7 @@ void VCLXGraphics::InitOutputDevice( sal_uInt16 nFlags )
::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > VCLXGraphics::getDevice() throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
if( !mxDevice.is() && mpOutputDevice )
{
@@ -155,7 +155,7 @@ void VCLXGraphics::InitOutputDevice( sal_uInt16 nFlags )
::com::sun::star::awt::SimpleFontMetric VCLXGraphics::getFontMetric() throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
::com::sun::star::awt::SimpleFontMetric aM;
if( mpOutputDevice )
@@ -168,56 +168,56 @@ void VCLXGraphics::InitOutputDevice( sal_uInt16 nFlags )
void VCLXGraphics::setFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& rxFont ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
maFont = VCLUnoHelper::CreateFont( rxFont );
}
void VCLXGraphics::selectFont( const ::com::sun::star::awt::FontDescriptor& rDescription ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
maFont = VCLUnoHelper::CreateFont( rDescription, Font() );
}
void VCLXGraphics::setTextColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
maTextColor = Color( (sal_uInt32)nColor );
}
void VCLXGraphics::setTextFillColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
maTextFillColor = Color( (sal_uInt32)nColor );
}
void VCLXGraphics::setLineColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
maLineColor = Color( (sal_uInt32)nColor );
}
void VCLXGraphics::setFillColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
maFillColor = Color( (sal_uInt32)nColor );
}
void VCLXGraphics::setRasterOp( ::com::sun::star::awt::RasterOperation eROP ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
meRasterOp = (RasterOp)eROP;
}
void VCLXGraphics::setClipRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
delete mpClipRegion;
if ( rxRegion.is() )
@@ -228,7 +228,7 @@ void VCLXGraphics::setClipRegion( const ::com::sun::star::uno::Reference< ::com:
void VCLXGraphics::intersectClipRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
if ( rxRegion.is() )
{
@@ -242,7 +242,7 @@ void VCLXGraphics::intersectClipRegion( const ::com::sun::star::uno::Reference<
void VCLXGraphics::push( ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
if( mpOutputDevice )
@@ -251,7 +251,7 @@ void VCLXGraphics::push( ) throw(::com::sun::star::uno::RuntimeException)
void VCLXGraphics::pop( ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
if( mpOutputDevice )
@@ -260,7 +260,7 @@ void VCLXGraphics::pop( ) throw(::com::sun::star::uno::RuntimeException)
void VCLXGraphics::copy( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >& rxSource, sal_Int32 nSourceX, sal_Int32 nSourceY, sal_Int32 nSourceWidth, sal_Int32 nSourceHeight, sal_Int32 nDestX, sal_Int32 nDestY, sal_Int32 nDestWidth, sal_Int32 nDestHeight ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
if ( mpOutputDevice )
{
@@ -277,7 +277,7 @@ void VCLXGraphics::copy( const ::com::sun::star::uno::Reference< ::com::sun::sta
void VCLXGraphics::draw( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayBitmap >& rxBitmapHandle, sal_Int32 nSourceX, sal_Int32 nSourceY, sal_Int32 nSourceWidth, sal_Int32 nSourceHeight, sal_Int32 nDestX, sal_Int32 nDestY, sal_Int32 nDestWidth, sal_Int32 nDestHeight ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
if( mpOutputDevice )
{
@@ -309,7 +309,7 @@ void VCLXGraphics::draw( const ::com::sun::star::uno::Reference< ::com::sun::sta
void VCLXGraphics::drawPixel( sal_Int32 x, sal_Int32 y ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
if( mpOutputDevice )
{
@@ -320,7 +320,7 @@ void VCLXGraphics::drawPixel( sal_Int32 x, sal_Int32 y ) throw(::com::sun::star:
void VCLXGraphics::drawLine( sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 y2 ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
if( mpOutputDevice )
{
@@ -331,7 +331,7 @@ void VCLXGraphics::drawLine( sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32
void VCLXGraphics::drawRect( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
if( mpOutputDevice )
{
@@ -342,7 +342,7 @@ void VCLXGraphics::drawRect( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int3
void VCLXGraphics::drawRoundedRect( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, sal_Int32 nHorzRound, sal_Int32 nVertRound ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
if( mpOutputDevice )
{
@@ -353,7 +353,7 @@ void VCLXGraphics::drawRoundedRect( sal_Int32 x, sal_Int32 y, sal_Int32 width, s
void VCLXGraphics::drawPolyLine( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
if( mpOutputDevice )
{
@@ -364,7 +364,7 @@ void VCLXGraphics::drawPolyLine( const ::com::sun::star::uno::Sequence< sal_Int3
void VCLXGraphics::drawPolygon( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
if( mpOutputDevice )
{
@@ -375,7 +375,7 @@ void VCLXGraphics::drawPolygon( const ::com::sun::star::uno::Sequence< sal_Int32
void VCLXGraphics::drawPolyPolygon( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > >& DataX, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > >& DataY ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
if( mpOutputDevice )
{
@@ -391,7 +391,7 @@ void VCLXGraphics::drawPolyPolygon( const ::com::sun::star::uno::Sequence< ::com
void VCLXGraphics::drawEllipse( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
if( mpOutputDevice )
{
@@ -402,7 +402,7 @@ void VCLXGraphics::drawEllipse( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_I
void VCLXGraphics::drawArc( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 y2 ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
if( mpOutputDevice )
{
@@ -413,7 +413,7 @@ void VCLXGraphics::drawArc( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32
void VCLXGraphics::drawPie( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 y2 ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
if( mpOutputDevice )
{
@@ -424,7 +424,7 @@ void VCLXGraphics::drawPie( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32
void VCLXGraphics::drawChord( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 y2 ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
if( mpOutputDevice )
{
@@ -435,7 +435,7 @@ void VCLXGraphics::drawChord( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int
void VCLXGraphics::drawGradient( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, const ::com::sun::star::awt::Gradient& rGradient ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
if( mpOutputDevice )
{
@@ -454,7 +454,7 @@ void VCLXGraphics::drawGradient( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_
void VCLXGraphics::drawText( sal_Int32 x, sal_Int32 y, const ::rtl::OUString& rText ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
if( mpOutputDevice )
{
@@ -465,7 +465,7 @@ void VCLXGraphics::drawText( sal_Int32 x, sal_Int32 y, const ::rtl::OUString& rT
void VCLXGraphics::drawTextArray( sal_Int32 x, sal_Int32 y, const ::rtl::OUString& rText, const ::com::sun::star::uno::Sequence< sal_Int32 >& rLongs ) throw(::com::sun::star::uno::RuntimeException)
{
- osl::SolarMutexGuard aGuard( GetMutex() );
+ osl::SolarGuard aGuard( GetMutex() );
if( mpOutputDevice )
{
diff --git a/toolkit/source/awt/vclxplugin.cxx b/toolkit/source/awt/vclxplugin.cxx
index fd24712..c48d1de 100644
--- a/toolkit/source/awt/vclxplugin.cxx
+++ b/toolkit/source/awt/vclxplugin.cxx
@@ -55,7 +55,7 @@ VCLXPlugin::~VCLXPlugin()
void SAL_CALL VCLXPlugin::dispose() throw(uno::RuntimeException)
{
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
lang::EventObject aDisposeEvent;
aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
@@ -72,7 +72,7 @@ void VCLXPlugin::SetPlugin( ::Control *p )
awt::Size SAL_CALL VCLXPlugin::getMinimumSize()
throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::ClearableSolarMutexGuard aGuard( GetMutex() );
+ ::osl::ClearableSolarGuard aGuard( GetMutex() );
if ( mpPlugin )
return AWTSize( mpPlugin->GetSizePixel() );
return awt::Size();
diff --git a/toolkit/source/awt/vclxscroller.cxx b/toolkit/source/awt/vclxscroller.cxx
index 07ec886..1655116 100644
--- a/toolkit/source/awt/vclxscroller.cxx
+++ b/toolkit/source/awt/vclxscroller.cxx
@@ -69,7 +69,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER1( VCLXScroller, VCLXWindow );
void SAL_CALL VCLXScroller::dispose() throw(RuntimeException)
{
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
EventObject aDisposeEvent;
aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
@@ -154,7 +154,7 @@ void VCLXScroller::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
void SAL_CALL VCLXScroller::setProperty( const ::rtl::OUString& PropertyName, const Any &Value ) throw(RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
if ( GetWindow() )
{
@@ -173,7 +173,7 @@ void SAL_CALL VCLXScroller::setProperty( const ::rtl::OUString& PropertyName, co
Any SAL_CALL VCLXScroller::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
Any aReturn;
if ( GetWindow() )
diff --git a/toolkit/source/awt/vclxspinbutton.cxx b/toolkit/source/awt/vclxspinbutton.cxx
index 764b172..9c81294 100644
--- a/toolkit/source/awt/vclxspinbutton.cxx
+++ b/toolkit/source/awt/vclxspinbutton.cxx
@@ -93,7 +93,7 @@ namespace toolkit
void SAL_CALL VCLXSpinButton::dispose( ) throw(RuntimeException)
{
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
EventObject aDisposeEvent;
aDisposeEvent.Source = *this;
@@ -125,7 +125,7 @@ namespace toolkit
//................................................................
void lcl_setSpinButtonValue( ::osl::SolarMutex& _rMutex, Window* _pWindow, SetSpinButtonValue _pSetter, sal_Int32 _nValue )
{
- ::osl::SolarMutexGuard aGuard( _rMutex );
+ ::osl::SolarGuard aGuard( _rMutex );
SpinButton* pSpinButton = static_cast< SpinButton* >( _pWindow );
if ( pSpinButton )
@@ -135,7 +135,7 @@ namespace toolkit
//................................................................
sal_Int32 lcl_getSpinButtonValue( ::osl::SolarMutex& _rMutex, const Window* _pWindow, GetSpinButtonValue _pGetter )
{
- ::osl::SolarMutexGuard aGuard( _rMutex );
+ ::osl::SolarGuard aGuard( _rMutex );
sal_Int32 nValue = 0;
@@ -155,7 +155,7 @@ namespace toolkit
//--------------------------------------------------------------------
void SAL_CALL VCLXSpinButton::setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
setMinimum( minValue );
setMaximum( maxValue );
@@ -207,7 +207,7 @@ namespace toolkit
//--------------------------------------------------------------------
void SAL_CALL VCLXSpinButton::setOrientation( sal_Int32 orientation ) throw (NoSupportException, RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
lcl_modifyStyle( GetWindow(), WB_HSCROLL, orientation == ScrollBarOrientation::HORIZONTAL );
}
@@ -223,7 +223,7 @@ namespace toolkit
//--------------------------------------------------------------------
void VCLXSpinButton::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
{
- ::osl::ClearableSolarMutexGuard aGuard( GetMutex() );
+ ::osl::ClearableSolarGuard aGuard( GetMutex() );
Reference< XSpinValue > xKeepAlive( this );
SpinButton* pSpinButton = static_cast< SpinButton* >( GetWindow() );
if ( !pSpinButton )
@@ -255,7 +255,7 @@ namespace toolkit
//--------------------------------------------------------------------
void SAL_CALL VCLXSpinButton::setProperty( const ::rtl::OUString& PropertyName, const Any& Value ) throw(RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
sal_Int32 nValue = 0;
sal_Bool bIsLongValue = ( Value >>= nValue );
@@ -305,7 +305,7 @@ namespace toolkit
//--------------------------------------------------------------------
Any SAL_CALL VCLXSpinButton::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
Any aReturn;
diff --git a/toolkit/source/awt/vclxsplitter.cxx b/toolkit/source/awt/vclxsplitter.cxx
index 3f01212..bbd2dac 100644
--- a/toolkit/source/awt/vclxsplitter.cxx
+++ b/toolkit/source/awt/vclxsplitter.cxx
@@ -107,7 +107,7 @@ VCLXSplitter::getChild( int i )
void SAL_CALL VCLXSplitter::dispose() throw(RuntimeException)
{
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
EventObject aDisposeEvent;
aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx
index bb58b11..a7155fd 100644
--- a/toolkit/source/awt/vclxsystemdependentwindow.cxx
+++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx
@@ -80,7 +80,7 @@ IMPL_XTYPEPROVIDER_END
::com::sun::star::uno::Any VCLXSystemDependentWindow::getWindowHandle( const ::com::sun::star::uno::Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
// TODO, check the process id
::com::sun::star::uno::Any aRet;
diff --git a/toolkit/source/awt/vclxtabcontrol.cxx b/toolkit/source/awt/vclxtabcontrol.cxx
index 42694cd..39c7155 100644
--- a/toolkit/source/awt/vclxtabcontrol.cxx
+++ b/toolkit/source/awt/vclxtabcontrol.cxx
@@ -100,7 +100,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXTabControl, VCLXWindow, VCLXTabControl_Bas
void SAL_CALL VCLXTabControl::dispose( ) throw(uno::RuntimeException)
{
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
EventObject aDisposeEvent;
aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
@@ -233,7 +233,7 @@ uno::Sequence< NamedValue > SAL_CALL VCLXTabControl::getTabProps( sal_Int32 ID )
// TODO: draw tab border here
void SAL_CALL VCLXTabControl::draw( sal_Int32 nX, sal_Int32 nY ) throw(uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
TabControl *pTabControl = getTabControl();
TabPage *pTabPage = pTabControl->GetTabPage( sal::static_int_cast< USHORT >( getActiveTabID() ) );
@@ -469,7 +469,7 @@ awt::Size SAL_CALL VCLXTabControl::getMinimumSize()
void VCLXTabControl::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
{
- ::osl::ClearableSolarMutexGuard aGuard( GetMutex() );
+ ::osl::ClearableSolarGuard aGuard( GetMutex() );
TabControl* pTabControl = static_cast< TabControl* >( GetWindow() );
if ( !pTabControl )
return;
diff --git a/toolkit/source/awt/vclxtabpage.cxx b/toolkit/source/awt/vclxtabpage.cxx
index 9120a6e..8a5ea06 100644
--- a/toolkit/source/awt/vclxtabpage.cxx
+++ b/toolkit/source/awt/vclxtabpage.cxx
@@ -66,7 +66,7 @@ VCLXTabPage::~VCLXTabPage()
void SAL_CALL VCLXTabPage::dispose() throw(uno::RuntimeException)
{
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
lang::EventObject aDisposeEvent;
aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
@@ -149,7 +149,7 @@ void SAL_CALL VCLXTabPage::allocateArea( awt::Rectangle const& area )
awt::Size SAL_CALL VCLXTabPage::getMinimumSize()
throw(uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
return Bin::getMinimumSize();
}
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index 419b42e..3ed456a 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -93,7 +93,7 @@ Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException)
::com::sun::star::uno::Any VCLXTopWindow_Base::getWindowHandle( const ::com::sun::star::uno::Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutexImpl() );
+ ::osl::SolarGuard aGuard( GetMutexImpl() );
// TODO, check the process id
::com::sun::star::uno::Any aRet;
@@ -134,21 +134,21 @@ Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException)
void VCLXTopWindow_Base::addTopWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindowListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutexImpl() );
+ ::osl::SolarGuard aGuard( GetMutexImpl() );
GetTopWindowListenersImpl().addInterface( rxListener );
}
void VCLXTopWindow_Base::removeTopWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindowListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutexImpl() );
+ ::osl::SolarGuard aGuard( GetMutexImpl() );
GetTopWindowListenersImpl().removeInterface( rxListener );
}
void VCLXTopWindow_Base::toFront( ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( GetMutexImpl() );
+ ::osl::SolarGuard aGuard( GetMutexImpl() );
Window* pWindow = GetWindowImpl();
if ( pWindow )
@@ -159,7 +159,7 @@ void VCLXTopWindow_Base::toBack( ) throw(::com::sun::star::uno::RuntimeExceptio
{
#if 0 // Not possible in VCL...
- ::osl::SolarMutexGuard aGuard( GetMutexImpl() );
+ ::osl::SolarGuard aGuard( GetMutexImpl() );
Window* pWindow = GetWindowImpl();
if ( pWindow )
@@ -171,7 +171,7 @@ void VCLXTopWindow_Base::toBack( ) throw(::com::sun::star::uno::RuntimeExceptio
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list