[Libreoffice-commits] core.git: vcl/android vcl/headless vcl/inc vcl/ios vcl/osx vcl/source vcl/unx vcl/win
Noel Grandin
noel.grandin at collabora.co.uk
Tue Oct 31 06:34:52 UTC 2017
vcl/android/androidinst.cxx | 2 +-
vcl/headless/headlessinst.cxx | 2 +-
vcl/headless/svpinst.cxx | 2 +-
vcl/inc/osx/salinst.h | 2 +-
vcl/inc/salinst.hxx | 2 +-
vcl/inc/unx/geninst.h | 2 +-
vcl/inc/win/salinst.h | 2 +-
vcl/ios/iosinst.cxx | 2 +-
vcl/osx/salinst.cxx | 4 ++--
vcl/source/app/svapp.cxx | 2 +-
vcl/unx/generic/app/geninst.cxx | 4 ++--
vcl/unx/generic/plugadapt/salplug.cxx | 2 +-
vcl/win/app/salinst.cxx | 4 ++--
vcl/win/gdi/salprn.cxx | 2 +-
14 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 4cfcf965b5c95b1ba7dd454e9dda954e8315b8a9
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Oct 30 16:27:01 2017 +0200
ReleaseYieldMutex is always called with true
so drop param and rename to ReleaseYieldMutexAll
Change-Id: Ic4fcee24d46405659e54363c87f21d88696b0ce1
Reviewed-on: https://gerrit.libreoffice.org/44057
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 3c181ace2ff6..7bf18338a3fe 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -197,7 +197,7 @@ SalInstance *CreateSalInstance()
void DestroySalInstance( SalInstance *pInst )
{
- pInst->ReleaseYieldMutex( true );
+ pInst->ReleaseYieldMutexAll();
delete pInst;
}
diff --git a/vcl/headless/headlessinst.cxx b/vcl/headless/headlessinst.cxx
index 79f2f268ed2e..299c5f7d607d 100644
--- a/vcl/headless/headlessinst.cxx
+++ b/vcl/headless/headlessinst.cxx
@@ -98,7 +98,7 @@ SalInstance *CreateSalInstance()
void DestroySalInstance( SalInstance *pInst )
{
- pInst->ReleaseYieldMutex( true );
+ pInst->ReleaseYieldMutexAll();
delete pInst;
}
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 50eeb9cc207c..e20592b51b67 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -312,7 +312,7 @@ void SvpSalInstance::DoReleaseYield( int nTimeoutMS )
aPoll.revents = 0;
// release yield mutex
- sal_uInt32 nAcquireCount = ReleaseYieldMutex( true );
+ sal_uInt32 nAcquireCount = ReleaseYieldMutexAll();
(void)poll( &aPoll, 1, nTimeoutMS );
diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h
index f70bbcac1ca5..95dd4db26c24 100644
--- a/vcl/inc/osx/salinst.h
+++ b/vcl/inc/osx/salinst.h
@@ -109,7 +109,7 @@ public:
virtual SalSystem* CreateSalSystem() override;
virtual SalBitmap* CreateSalBitmap() override;
virtual comphelper::SolarMutex* GetYieldMutex() override;
- virtual sal_uInt32 ReleaseYieldMutex( bool bUnlockAll = false ) override;
+ virtual sal_uInt32 ReleaseYieldMutexAll() override;
virtual void AcquireYieldMutex( sal_uInt32 nCount = 1 ) override;
virtual bool DoYield(bool bWait, bool bHandleAllCurrentEvents) override;
virtual bool AnyInput( VclInputFlags nType ) override;
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index 8418a1ed8126..f33d9d4d912a 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -122,7 +122,7 @@ public:
// YieldMutex
virtual comphelper::SolarMutex*
GetYieldMutex() = 0;
- virtual sal_uInt32 ReleaseYieldMutex( bool bUnlockAll = false ) = 0;
+ virtual sal_uInt32 ReleaseYieldMutexAll() = 0;
virtual void AcquireYieldMutex( sal_uInt32 nCount = 1 ) = 0;
// return true, if yield mutex is owned by this thread, else false
virtual bool IsMainThread() const = 0;
diff --git a/vcl/inc/unx/geninst.h b/vcl/inc/unx/geninst.h
index 516ca7c37956..af97a2d9ba83 100644
--- a/vcl/inc/unx/geninst.h
+++ b/vcl/inc/unx/geninst.h
@@ -53,7 +53,7 @@ public:
// Yield mutex
virtual comphelper::SolarMutex* GetYieldMutex() override;
- virtual sal_uInt32 ReleaseYieldMutex( bool bUnlockAll = false ) override;
+ virtual sal_uInt32 ReleaseYieldMutexAll() override;
virtual void AcquireYieldMutex( sal_uInt32 nCount = 1 ) override;
// Printing
diff --git a/vcl/inc/win/salinst.h b/vcl/inc/win/salinst.h
index d95f08b49e91..9f5dbdf955b1 100644
--- a/vcl/inc/win/salinst.h
+++ b/vcl/inc/win/salinst.h
@@ -66,7 +66,7 @@ public:
virtual SalSystem* CreateSalSystem() override;
virtual SalBitmap* CreateSalBitmap() override;
virtual comphelper::SolarMutex* GetYieldMutex() override;
- virtual sal_uInt32 ReleaseYieldMutex( bool bUnlockAll = false ) override;
+ virtual sal_uInt32 ReleaseYieldMutexAll() override;
virtual void AcquireYieldMutex( sal_uInt32 nCount = 1 ) override;
virtual bool IsMainThread() const override;
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index afc1dc87be50..fd5647f154da 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -178,7 +178,7 @@ SalInstance *CreateSalInstance()
void DestroySalInstance( SalInstance *pInst )
{
- pInst->ReleaseYieldMutex( true );
+ pInst->ReleaseYieldMutexAll();
delete pInst;
}
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 50623eac24aa..f9254d873227 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -410,9 +410,9 @@ comphelper::SolarMutex* AquaSalInstance::GetYieldMutex()
return mpSalYieldMutex;
}
-sal_uInt32 AquaSalInstance::ReleaseYieldMutex( bool bUnlockAll )
+sal_uInt32 AquaSalInstance::ReleaseYieldMutexAll()
{
- return mpSalYieldMutex->release( bUnlockAll );
+ return mpSalYieldMutex->release( true/*bUnlockAll*/ );
}
void AquaSalInstance::AcquireYieldMutex( sal_uInt32 nCount )
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 21426cb190f8..ab5a82dee4dd 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -558,7 +558,7 @@ oslThreadIdentifier Application::GetMainThreadIdentifier()
sal_uInt32 Application::ReleaseSolarMutex()
{
ImplSVData* pSVData = ImplGetSVData();
- return pSVData->mpDefInst->ReleaseYieldMutex( true );
+ return pSVData->mpDefInst->ReleaseYieldMutexAll();
}
void Application::AcquireSolarMutex( sal_uInt32 nCount )
diff --git a/vcl/unx/generic/app/geninst.cxx b/vcl/unx/generic/app/geninst.cxx
index 3c31a68b81c7..a297ddc24c7f 100644
--- a/vcl/unx/generic/app/geninst.cxx
+++ b/vcl/unx/generic/app/geninst.cxx
@@ -53,9 +53,9 @@ comphelper::SolarMutex* SalGenericInstance::GetYieldMutex()
return mpSalYieldMutex.get();
}
-sal_uInt32 SalGenericInstance::ReleaseYieldMutex( bool bUnlockAll )
+sal_uInt32 SalGenericInstance::ReleaseYieldMutexAll()
{
- return mpSalYieldMutex.get()->release( bUnlockAll );
+ return mpSalYieldMutex.get()->release( true/*bUnlockAll*/ );
}
void SalGenericInstance::AcquireYieldMutex( sal_uInt32 nCount )
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index 0f301f01d9b4..a1195dbde18a 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -254,7 +254,7 @@ SalInstance *CreateSalInstance()
void DestroySalInstance( SalInstance *pInst )
{
// release SolarMutex
- pInst->ReleaseYieldMutex( true );
+ pInst->ReleaseYieldMutexAll();
delete pInst;
if( pCloseModule )
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 442a937af6ee..5671361c987b 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -449,9 +449,9 @@ comphelper::SolarMutex* WinSalInstance::GetYieldMutex()
return mpSalYieldMutex;
}
-sal_uInt32 WinSalInstance::ReleaseYieldMutex( bool bUnlockAll )
+sal_uInt32 WinSalInstance::ReleaseYieldMutexAll()
{
- return mpSalYieldMutex->release( bUnlockAll );
+ return mpSalYieldMutex->release( true/*bUnlockAll*/ );
}
void WinSalInstance::AcquireYieldMutex( sal_uInt32 nCount )
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index 07c2da6d7504..a961bbf4ace2 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -400,7 +400,7 @@ static bool ImplUpdateSalJobSetup( WinSalInfoPrinter const * pPrinter, ImplJobSe
sal_uInt32 nMutexCount = 0;
WinSalInstance* pInst = GetSalData()->mpInstance;
if ( pInst && pVisibleDlgParent )
- nMutexCount = pInst->ReleaseYieldMutex( true );
+ nMutexCount = pInst->ReleaseYieldMutexAll();
BYTE* pOutDevMode = (reinterpret_cast<BYTE*>(pOutBuffer) + pOutBuffer->mnDriverOffset);
nRet = DocumentPropertiesW( hWnd, hPrn,
More information about the Libreoffice-commits
mailing list