6 files changed, 8 insertions, 9 deletions
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index e77e86dd1759..08c27f819639 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -338,7 +338,7 @@ void ModulWindow::BasicExecute()
             if ( !pMethod )
             {
                 // If not in a method then prompt the user
-                ChooseMacro( uno::Reference< frame::XModel >(), false );
+                ChooseMacro( uno::Reference< frame::XModel >() );
                 return;
             }
             if ( pMethod )
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 74161eec8161..db3945369fc8 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -269,7 +269,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
         break;
         case SID_BASICIDE_CHOOSEMACRO:
         {
-            ChooseMacro( nullptr, false );
+            ChooseMacro( nullptr );
         }
         break;
         case SID_BASICIDE_CREATEMACRO:
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index fa0300dcb641..951c25287a86 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -564,7 +564,7 @@ void TabBar::Sort()
     }
 }
 
-void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, bool bEraseTrailingEmptyLines )
+void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines )
 {
     sal_Int32 nStartPos = 0;
     sal_Int32 nLine = 0;
@@ -596,7 +596,7 @@ void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, bool bEra
     rStr = rStr.copy( 0, nStartPos );
     rStr += aEndStr;
 
-    if ( bEraseTrailingEmptyLines )
+    // erase trailing empty lines
     {
         sal_Int32 n = nStartPos;
         sal_Int32 nLen = rStr.getLength();
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index d391ad20c708..9bb61bc870f0 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -304,7 +304,7 @@ void MacroChooser::DeleteMacro()
         sal_uInt16 nStart, nEnd;
         pMethod->GetLineRange( nStart, nEnd );
         pModule->GetMethods()->Remove( pMethod );
-        CutLines( aSource, nStart-1, nEnd-nStart+1, true );
+        CutLines( aSource, nStart-1, nEnd-nStart+1 );
         pModule->SetSource32( aSource );
 
         // update module in library
diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index 8e5e9badc8af..91862bff751f 100644
--- a/basctl/source/inc/basobj.hxx
+++ b/basctl/source/inc/basobj.hxx
@@ -77,9 +77,8 @@ namespace basctl
         const css::uno::Reference< css::frame::XModel >& rxLimitToDocument, const css::uno::Reference< css::frame::XFrame >& xDocFrame,
         bool bChooseOnly );
     inline OUString ChooseMacro(
-        const css::uno::Reference< css::frame::XModel >& rxLimitToDocument,
-        bool bChooseOnly )
-    { return ChooseMacro(rxLimitToDocument, css::uno::Reference< css::frame::XFrame >(), bChooseOnly); }
+        const css::uno::Reference< css::frame::XModel >& rxLimitToDocument )
+    { return ChooseMacro(rxLimitToDocument, css::uno::Reference< css::frame::XFrame >(), false/*bChooseOnly*/); }
 
     /// @throws css::container::NoSuchElementException
     /// @throws css::uno::RuntimeException
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 73b78afb7ced..429f4137a971 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -286,7 +286,7 @@ private:
     Map m_aMap;
 };
 
-void            CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, bool bEraseTrailingEmptyLines );
+void            CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines );
 OUString CreateMgrAndLibStr( const OUString& rMgrName, const OUString& rLibName );
 sal_uLong           CalcLineCount( SvStream& rStream );