loplugin:returnconstant

Change-Id: I5b859de6ccd908eee4356acbe1f12b441ab36df3
Reviewed-on: https://gerrit.libreoffice.org/62539
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 9 insertions, 13 deletions

diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 15d2715a6973..119f7c6b41a3 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -593,7 +593,7 @@ void ModulWindow::ManageBreakPoints()
     rBrkWin.Invalidate();
 }
 
-bool ModulWindow::BasicErrorHdl( StarBASIC const * pBasic )
+void ModulWindow::BasicErrorHdl( StarBASIC const * pBasic )
 {
     GetShell()->GetViewFrame()->ToTop();
 
@@ -630,11 +630,11 @@ bool ModulWindow::BasicErrorHdl( StarBASIC const * pBasic )
     // #i47002#
     VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( xWindow );
     if ( !pWindow )
-        return false;
+        return;
 
     if ( bMarkError )
         m_aXEditorWindow->GetBrkWindow().SetNoMarker();
-    return false;
+    return;
 }
 
 BasicDebugFlags ModulWindow::BasicBreakHdl()
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index c899f1dfdde6..ab46e7de04d2 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -199,7 +199,6 @@ class WatchTreeListBox final : public SvHeaderTabListBox
     virtual bool    EditingEntry( SvTreeListEntry* pEntry, Selection& rSel  ) override;
     virtual bool    EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) override;
 
-    bool            ImplBasicEntryEdited( SvTreeListEntry* pEntry, const OUString& rResult );
     SbxBase*        ImplGetSBXForEntry( SvTreeListEntry* pEntry, bool& rbArrayElement );
 
 public:
@@ -352,7 +351,7 @@ public:
     void            UpdateBreakPoint( const BreakPoint& rBrk );
     void            BasicAddWatch();
 
-    bool            BasicErrorHdl( StarBASIC const * pBasic );
+    void            BasicErrorHdl( StarBASIC const * pBasic );
     BasicDebugFlags BasicBreakHdl();
     void            AssertValidEditEngine();
 
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index ed4c9b23ba2b..4dc3b0571851 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2278,11 +2278,9 @@ bool WatchTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNe
     if( cFirst == '\"' && cLast == '\"' )
         aResult = aResult.copy( 1, nResultLen - 2 );
 
-    return aResult != aEditingRes && ImplBasicEntryEdited(pEntry, aResult);
-}
+    if (aResult == aEditingRes)
+        return false;
 
-bool WatchTreeListBox::ImplBasicEntryEdited( SvTreeListEntry* pEntry, const OUString& rResult )
-{
     bool bArrayElement;
     SbxBase* pSBX = ImplGetSBXForEntry( pEntry, bArrayElement );
 
@@ -2294,7 +2292,7 @@ bool WatchTreeListBox::ImplBasicEntryEdited( SvTreeListEntry* pEntry, const OUSt
         {
             // If the type is variable, the conversion of the SBX does not matter,
             // else the string is converted.
-            pVar->PutStringExt( rResult );
+            pVar->PutStringExt( aResult );
         }
     }
 
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 1159777d9037..97540e7d6707 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -1242,11 +1242,10 @@ VclPtr<BaseWindow> Shell::FindWindow(
 
 bool Shell::CallBasicErrorHdl( StarBASIC const * pBasic )
 {
-    bool bRet = false;
     VclPtr<ModulWindow> pModWin = ShowActiveModuleWindow( pBasic );
     if ( pModWin )
-        bRet = pModWin->BasicErrorHdl( pBasic );
-    return bRet;
+        pModWin->BasicErrorHdl( pBasic );
+    return false;
 }
 
 BasicDebugFlags Shell::CallBasicBreakHdl( StarBASIC const * pBasic )