core.git: vcl/source

[Christopher Sherlock (via logerrit)]

 vcl/source/app/help.cxx |   38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

New commits:
commit a9caf1506b5e4b78cf98ab23fc495fb324282e49
Author:     Christopher Sherlock <chris.sherloc...@gmail.com>
AuthorDate: Sun Feb 23 18:58:18 2025 +1100
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Mon Apr 7 10:45:00 2025 +0200

    vcl: flatten StartExtHelp() and EndExtHelp() in Help
    
    Change-Id: If061ec9e47f89b473ee582ff1f6b6a8d97cbafa9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182062
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index de54818d05a0..0fa849b4b358 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -99,17 +99,17 @@ bool Help::StartExtHelp()
     ImplSVData* pSVData = ImplGetSVData();
     ImplSVHelpData& aHelpData = ImplGetSVHelpData();
 
-    if ( aHelpData.mbExtHelp && !aHelpData.mbExtHelpMode )
-    {
-        aHelpData.mbExtHelpMode = true;
-        aHelpData.mbOldBalloonMode = aHelpData.mbBalloonHelp;
-        aHelpData.mbBalloonHelp = true;
-        if (pSVData->maFrameData.mpAppWin)
-            pSVData->maFrameData.mpAppWin->ImplGenerateMouseMove();
-        return true;
-    }
+    if (!aHelpData.mbExtHelp || aHelpData.mbExtHelpMode )
+        return false;
 
-    return false;
+    aHelpData.mbExtHelpMode = true;
+    aHelpData.mbOldBalloonMode = aHelpData.mbBalloonHelp;
+    aHelpData.mbBalloonHelp = true;
+
+    if (pSVData->maFrameData.mpAppWin)
+        pSVData->maFrameData.mpAppWin->ImplGenerateMouseMove();
+
+    return true;
 }
 
 bool Help::EndExtHelp()
@@ -117,16 +117,16 @@ bool Help::EndExtHelp()
     ImplSVData* pSVData = ImplGetSVData();
     ImplSVHelpData& aHelpData = ImplGetSVHelpData();
 
-    if ( aHelpData.mbExtHelp && aHelpData.mbExtHelpMode )
-    {
-        aHelpData.mbExtHelpMode = false;
-        aHelpData.mbBalloonHelp = aHelpData.mbOldBalloonMode;
-        if (pSVData->maFrameData.mpAppWin)
-            pSVData->maFrameData.mpAppWin->ImplGenerateMouseMove();
-        return true;
-    }
+    if (!aHelpData.mbExtHelp || !aHelpData.mbExtHelpMode)
+        return false;
 
-    return false;
+    aHelpData.mbExtHelpMode = false;
+    aHelpData.mbBalloonHelp = aHelpData.mbOldBalloonMode;
+
+    if (pSVData->maFrameData.mpAppWin)
+        pSVData->maFrameData.mpAppWin->ImplGenerateMouseMove();
+
+    return true;
 }
 
 void Help::EnableBalloonHelp()