[Libreoffice-commits] core.git: unotools/source

Stephan Bergmann sbergman at redhat.com
Mon Mar 6 14:36:23 UTC 2017


 unotools/source/misc/mediadescriptor.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 14368e63ab5d18f6b6c7f2eeb1e816593701827b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Mar 6 15:35:52 2017 +0100

    loplugin:simplifybool
    
    Change-Id: Ied05f5d8b09b3bab4bddfe0a189c5039f81b6f18

diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx
index 5d5dd7e..c8c2ec9 100644
--- a/unotools/source/misc/mediadescriptor.cxx
+++ b/unotools/source/misc/mediadescriptor.cxx
@@ -484,9 +484,8 @@ bool MediaDescriptor::addInputStream()
 /*-----------------------------------------------*/
 bool MediaDescriptor::addInputStreamOwnLock()
 {
-    const bool bLock = utl::ConfigManager::IsAvoidConfig()
-                     ? false
-                     : officecfg::Office::Common::Misc::UseDocumentSystemFileLocking::get();
+    const bool bLock = !utl::ConfigManager::IsAvoidConfig()
+        && officecfg::Office::Common::Misc::UseDocumentSystemFileLocking::get();
     return impl_addInputStream(bLock);
 }
 


More information about the Libreoffice-commits mailing list