diff options
| author | Arnaud Versini <arnaud.versini@libreoffice.org> | 2022-03-29 16:52:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-03-30 12:45:06 +0200 |
| commit | e96150520918d1bd008ba39485512e74cec3bc35 (patch) | |
| tree | 108e0fca9de8132e7665c0e95c25bc76e8420c78 /desktop | |
| parent | bbd196ff82bda9f66b4ba32a412f10cefe6da60e (diff) | |
desktop : use std::mutex instead of osl::Mutex
Change-Id: I775baf9a2c9599b10eb855535ac0f8e438dd863b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132279
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/splash/splash.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index 2389e14f4d11..6402d9f7e99b 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -34,6 +34,8 @@ #include <vcl/introwin.hxx> #include <vcl/virdev.hxx> +#include <mutex> + #define NOT_LOADED (tools::Long(-1)) #define NOT_LOADED_COLOR (Color(ColorTransparency, 0xffffffff)) @@ -73,8 +75,6 @@ private: void SetScreenBitmap(BitmapEx &rBitmap); static void determineProgressRatioValues( double& rXRelPos, double& rYRelPos, double& rRelWidth, double& rRelHeight ); - static osl::Mutex _aMutex; - BitmapEx _aIntroBmp; Color _cProgressFrameColor; Color _cProgressBarColor; @@ -243,7 +243,8 @@ void SAL_CALL SplashScreen::setValue(sal_Int32 nValue) void SAL_CALL SplashScreen::initialize( const css::uno::Sequence< css::uno::Any>& aArguments ) { - osl::MutexGuard aGuard( _aMutex ); + static std::mutex aMutex; + std::lock_guard aGuard( aMutex ); if (!aArguments.hasElements()) return; @@ -616,10 +617,6 @@ void SplashScreenWindow::Paint(vcl::RenderContext& rRenderContext, const tools:: rRenderContext.DrawOutDev(Point(), GetOutputSizePixel(), Point(), _vdev->GetOutputSizePixel(), *_vdev); } - -// get service instance... -osl::Mutex SplashScreen::_aMutex; - } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* |