sfx2/source/appl/shutdownicon.cxx | 6 ------
sfx2/source/appl/shutdownicon.hxx | 1 -
2 files changed, 7 deletions(-)
New commits:
commit 0c62e89bcc1a353c292b93f88e5f164df546d224
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Mon Jul 24 09:10:00 2017 +0200
loplugin:unusedfields some writeonly fields
Change-Id: I08dbc46956a09a0be0b8a045560a2204de2b222c
Reviewed-on: https://gerrit.libreoffice.org/40356
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sfx2/source/appl/shutdownicon.cxx
b/sfx2/source/appl/shutdownicon.cxx
index 9b013a94393f..80b8c2bf94dd 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -206,7 +206,6 @@ ShutdownIcon::ShutdownIcon( const css::uno::Reference<
XComponentContext > & rxC
m_bVeto ( false ),
m_bListenForTermination ( false ),
m_bSystemDialogs( false ),
- m_pResLocale( nullptr ),
m_pFileDlg( nullptr ),
m_xContext( rxContext ),
m_bInitialized( false )
@@ -541,12 +540,7 @@ ShutdownIcon* ShutdownIcon::createInstance()
void ShutdownIcon::init()
{
- // access resource system and sfx only protected by solarmutex
- ::SolarMutexGuard aSolarGuard;
- std::locale *pResLocale = SfxResLocale::GetResLocale();
-
::osl::ResettableMutexGuard aGuard( m_aMutex );
- m_pResLocale = pResLocale;
aGuard.clear();
css::uno::Reference < XDesktop2 > xDesktop = Desktop::create( m_xContext );
aGuard.reset();
diff --git a/sfx2/source/appl/shutdownicon.hxx
b/sfx2/source/appl/shutdownicon.hxx
index 455fe4cd4043..67abad2b6ce0 100644
--- a/sfx2/source/appl/shutdownicon.hxx
+++ b/sfx2/source/appl/shutdownicon.hxx
@@ -67,7 +67,6 @@ class SFX2_DLLPUBLIC ShutdownIcon : public
ShutdownIconServiceBase
bool m_bVeto;
bool m_bListenForTermination;
bool m_bSystemDialogs;
- std::locale* m_pResLocale;
sfx2::FileDialogHelper* m_pFileDlg;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
