basic/source/runtime/runtime.cxx |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit af15f1eb6642a8c21b6404dc8405396eaa50c17d
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sun Aug 18 12:18:38 2024 +0500
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sun Aug 18 10:53:25 2024 +0200

    Simplify a bit
    
    Change-Id: Ibe34a1c17d856146d191e784af06b8cb6301b912
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172007
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Tested-by: Jenkins

diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index d8feb4123305..6897f41b2183 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -89,17 +89,16 @@ class ScopedWritableGuard
 {
 public:
     ScopedWritableGuard(const SbxVariableRef& rVar, bool bMakeWritable)
-        : m_rVar(rVar)
-        , m_bReset(bMakeWritable && !rVar->CanWrite())
+        : m_rVar(bMakeWritable && !rVar->CanWrite() ? rVar : SbxVariableRef())
     {
-        if (m_bReset)
+        if (m_rVar)
         {
             m_rVar->SetFlag(SbxFlagBits::Write);
         }
     }
     ~ScopedWritableGuard()
     {
-        if (m_bReset)
+        if (m_rVar)
         {
             m_rVar->ResetFlag(SbxFlagBits::Write);
         }
@@ -107,7 +106,6 @@ public:
 
 private:
     SbxVariableRef m_rVar;
-    bool m_bReset;
 };
 }
 

Reply via email to