summaryrefslogtreecommitdiff
path: root/toolkit/source/awt/vclxprinter.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit/source/awt/vclxprinter.cxx')
-rw-r--r--toolkit/source/awt/vclxprinter.cxx36
1 files changed, 18 insertions, 18 deletions
diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx
index c330de5aa047..093e02fc0efd 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -58,7 +58,7 @@
static sal_uInt16 nElements = 0;
if( !pProperties )
{
- ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() );
+ ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !pProperties )
{
static ::com::sun::star::beans::Property __FAR_DATA aPropTable[] =
@@ -102,7 +102,7 @@ VCLXPrinterPropertySet::VCLXPrinterPropertySet( const String& rPrinterName )
: OPropertySetHelper( BrdcstHelper )
, mpPrinter( new Printer( rPrinterName ) )
{
- osl::Guard< vos::IMutex > aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
mnOrientation = 0;
mbHorizontal = sal_False;
@@ -110,7 +110,7 @@ VCLXPrinterPropertySet::VCLXPrinterPropertySet( const String& rPrinterName )
VCLXPrinterPropertySet::~VCLXPrinterPropertySet()
{
- osl::Guard< vos::IMutex > aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
mpPrinter.reset();
}
@@ -136,7 +136,7 @@ VCLXPrinterPropertySet::~VCLXPrinterPropertySet()
static ::cppu::OPropertyArrayHelper* pPropertyArrayHelper = NULL;
if ( !pPropertyArrayHelper )
{
- ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() );
+ ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !pPropertyArrayHelper )
{
sal_uInt16 nElements;
@@ -149,7 +149,7 @@ VCLXPrinterPropertySet::~VCLXPrinterPropertySet()
sal_Bool VCLXPrinterPropertySet::convertFastPropertyValue( ::com::sun::star::uno::Any & rConvertedValue, ::com::sun::star::uno::Any & rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::lang::IllegalArgumentException)
{
- ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
+ ::osl::MutexGuard aGuard( Mutex );
sal_Bool bDifferent = sal_False;
switch ( nHandle )
@@ -186,7 +186,7 @@ sal_Bool VCLXPrinterPropertySet::convertFastPropertyValue( ::com::sun::star::uno
void VCLXPrinterPropertySet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception)
{
- ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
+ ::osl::MutexGuard aGuard( Mutex );
switch( nHandle )
{
@@ -209,7 +209,7 @@ void VCLXPrinterPropertySet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle
void VCLXPrinterPropertySet::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const
{
- ::osl::Guard< ::osl::Mutex > aGuard( ((VCLXPrinterPropertySet*)this)->Mutex );
+ ::osl::MutexGuard aGuard( ((VCLXPrinterPropertySet*)this)->Mutex );
switch( nHandle )
{
@@ -229,7 +229,7 @@ void VCLXPrinterPropertySet::getFastPropertyValue( ::com::sun::star::uno::Any& r
// ::com::sun::star::awt::XPrinterPropertySet
void VCLXPrinterPropertySet::setHorizontal( sal_Bool bHorizontal ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
- ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
+ ::osl::MutexGuard aGuard( Mutex );
::com::sun::star::uno::Any aValue;
aValue <<= bHorizontal;
@@ -238,7 +238,7 @@ void VCLXPrinterPropertySet::setHorizontal( sal_Bool bHorizontal ) throw(::com::
::com::sun::star::uno::Sequence< ::rtl::OUString > VCLXPrinterPropertySet::getFormDescriptions( ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
+ ::osl::MutexGuard aGuard( Mutex );
sal_uInt16 nPaperBinCount = GetPrinter()->GetPaperBinCount();
::com::sun::star::uno::Sequence< ::rtl::OUString > aDescriptions( nPaperBinCount );
@@ -258,7 +258,7 @@ void VCLXPrinterPropertySet::setHorizontal( sal_Bool bHorizontal ) throw(::com::
void VCLXPrinterPropertySet::selectForm( const ::rtl::OUString& rFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
- ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
+ ::osl::MutexGuard aGuard( Mutex );
sal_Int32 nIndex = 0;
sal_uInt16 nPaperBin = sal::static_int_cast< sal_uInt16 >(
@@ -268,7 +268,7 @@ void VCLXPrinterPropertySet::selectForm( const ::rtl::OUString& rFormDescription
::com::sun::star::uno::Sequence< sal_Int8 > VCLXPrinterPropertySet::getBinarySetup( ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
+ ::osl::MutexGuard aGuard( Mutex );
SvMemoryStream aMem;
aMem << BINARYSETUPMARKER;
@@ -278,7 +278,7 @@ void VCLXPrinterPropertySet::selectForm( const ::rtl::OUString& rFormDescription
void VCLXPrinterPropertySet::setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
- ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
+ ::osl::MutexGuard aGuard( Mutex );
SvMemoryStream aMem( (char*) data.getConstArray(), data.getLength(), STREAM_READ );
sal_uInt32 nMarker;
@@ -325,7 +325,7 @@ IMPL_XTYPEPROVIDER_END
sal_Bool VCLXPrinter::start( const ::rtl::OUString& /*rJobName*/, sal_Int16 /*nCopies*/, sal_Bool /*bCollate*/ ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
- ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
+ ::osl::MutexGuard aGuard( Mutex );
sal_Bool bDone = sal_True;
if ( mpListener.get() )
@@ -339,7 +339,7 @@ sal_Bool VCLXPrinter::start( const ::rtl::OUString& /*rJobName*/, sal_Int16 /*nC
void VCLXPrinter::end( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException)
{
- ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
+ ::osl::MutexGuard aGuard( Mutex );
if ( mpListener.get() )
{
@@ -350,14 +350,14 @@ void VCLXPrinter::end( ) throw(::com::sun::star::awt::PrinterException, ::com::
void VCLXPrinter::terminate( ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
+ ::osl::MutexGuard aGuard( Mutex );
mpListener.reset();
}
::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > VCLXPrinter::startPage( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException)
{
- ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
+ ::osl::MutexGuard aGuard( Mutex );
if ( mpListener.get() )
{
@@ -368,7 +368,7 @@ void VCLXPrinter::terminate( ) throw(::com::sun::star::uno::RuntimeException)
void VCLXPrinter::endPage( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException)
{
- ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
+ ::osl::MutexGuard aGuard( Mutex );
if ( mpListener.get() )
{
@@ -411,7 +411,7 @@ IMPL_XTYPEPROVIDER_END
// ::com::sun::star::awt::XInfoPrinter
::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > VCLXInfoPrinter::createDevice( ) throw(::com::sun::star::uno::RuntimeException)
{
- ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
+ ::osl::MutexGuard aGuard( Mutex );
return GetDevice();
}
generated by cgit (git 2.34.1) at 2024-08-21 16:35:47 +0000