diff options
| -rw-r--r-- | include/svl/documentlockfile.hxx | 5 | ||||
| -rw-r--r-- | sfx2/source/doc/docfile.cxx | 2 | ||||
| -rw-r--r-- | svl/source/misc/documentlockfile.cxx | 3 |
3 files changed, 1 insertions, 9 deletions
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." ) { |