[Libreoffice-commits] core.git: include/svl sfx2/source svl/source

[Libreoffice Gerrit user]

 include/svl/documentlockfile.hxx     |    5 -----
 sfx2/source/doc/docfile.cxx          |    2 +-
 svl/source/misc/documentlockfile.cxx |    3 ---
 3 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit a0e01e3a34d9f60822a5bc1bfe90cb74b62bb999
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Dec 5 11:05:10 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Dec 5 14:54:51 2018 +0100

    loplugin:singlevalfields in svl
    
    Change-Id: I26d11f60f486f3cfe4615828a410789f8e22af48
    Reviewed-on: https://gerrit.libreoffice.org/64602
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/svl/documentlockfile.hxx b/include/svl/documentlockfile.hxx
index 25531dc3332e..f91aa352c56e 100644
--- a/include/svl/documentlockfile.hxx
+++ b/include/svl/documentlockfile.hxx
@@ -31,9 +31,6 @@ namespace svt {
 
 class SVL_DLLPUBLIC DocumentLockFile : public LockFileCommon
 {
-    // the workaround for automated testing!
-    static bool m_bAllowInteraction;
-
     css::uno::Reference< css::io::XInputStream > OpenStream();
 
     void WriteEntryToStream( const LockFileEntry& aEntry, const css::uno::Reference< css::io::XOutputStream >& xStream );
@@ -49,8 +46,6 @@ public:
     void RemoveFile();
     /// Only delete lockfile, disregarding ownership
     void RemoveFileDirectly();
-
-    static bool IsInteractionAllowed() { return m_bAllowInteraction; }
 };
 
 }
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 04ae1f735cdc..45449a26731b 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1000,7 +1000,7 @@ SfxMedium::ShowLockResult SfxMedium::ShowLockedDocumentDialog(const OUString& aD
     // show the interaction regarding the document opening
     uno::Reference< task::XInteractionHandler > xHandler = GetInteractionHandler();
 
-    if ( ::svt::DocumentLockFile::IsInteractionAllowed() && xHandler.is() && ( bIsLoading || !bHandleSysLocked || bOwnLock ) )
+    if ( xHandler.is() && ( bIsLoading || !bHandleSysLocked || bOwnLock ) )
     {
         OUString aDocumentURL = GetURLObject().GetLastName();
         OUString aInfo;
diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx
index 837005bd6f85..406dfb5d9693 100644
--- a/svl/source/misc/documentlockfile.cxx
+++ b/svl/source/misc/documentlockfile.cxx
@@ -54,9 +54,6 @@ using namespace ::com::sun::star;
 
 namespace svt {
 
-bool DocumentLockFile::m_bAllowInteraction = true;
-
-
 DocumentLockFile::DocumentLockFile( const OUString& aOrigURL )
 : LockFileCommon( aOrigURL, ".~lock." )
 {