[Libreoffice-commits] core.git: basctl/source sfx2/source

[Stephan Bergmann]

 basctl/source/basicide/baside2.cxx  |    2 +-
 basctl/source/basicide/basides1.cxx |    2 +-
 basctl/source/basicide/basobj2.cxx  |    9 +++------
 basctl/source/inc/basobj.hxx        |    6 +++---
 sfx2/source/appl/appserv.cxx        |    7 +++----
 5 files changed, 11 insertions(+), 15 deletions(-)

New commits:
commit e9bae752fe762e82137e709a39f74e4db0b9af31
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jun 28 17:15:36 2017 +0200

    ChooseMacro rMacroDesc parameter is unused
    
    ...ever since 49751c87652bdd9de8aeca244b4644811f4b0956 "INTEGRATION: CWS tbe11"
    
    Change-Id: I038616f5e69bbf1fa04c2fff3ca63e381549aa89

diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 0c9568f9eadf..1d2c0cf8dbdf 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -337,7 +337,7 @@ void ModulWindow::BasicExecute()
             if ( !pMethod )
             {
                 // If not in a method then prompt the user
-                ChooseMacro( uno::Reference< frame::XModel >(), false, OUString() );
+                ChooseMacro( uno::Reference< frame::XModel >(), false );
                 return;
             }
             if ( pMethod )
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index a1c9304139ec..a9c9187a5ad4 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -268,7 +268,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
         break;
         case SID_BASICIDE_CHOOSEMACRO:
         {
-            ChooseMacro( nullptr, false, OUString() );
+            ChooseMacro( nullptr, false );
         }
         break;
         case SID_BASICIDE_CREATEMACRO:
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 59267871fc17..13b84b029ff0 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -43,12 +43,11 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
 
 extern "C" {
-    SAL_DLLPUBLIC_EXPORT rtl_uString* basicide_choose_macro( void* pOnlyInDocument_AsXModel, void* pDocFrame_AsXFrame, sal_Bool bChooseOnly, rtl_uString* pMacroDesc )
+    SAL_DLLPUBLIC_EXPORT rtl_uString* basicide_choose_macro( void* pOnlyInDocument_AsXModel, void* pDocFrame_AsXFrame, sal_Bool bChooseOnly )
     {
-        OUString aMacroDesc( pMacroDesc );
         Reference< frame::XModel > aDocument( static_cast< frame::XModel* >( pOnlyInDocument_AsXModel ) );
         Reference< frame::XFrame > aDocFrame( static_cast< frame::XFrame* >( pDocFrame_AsXFrame ) );
-        OUString aScriptURL = basctl::ChooseMacro( aDocument, aDocFrame, bChooseOnly, aMacroDesc );
+        OUString aScriptURL = basctl::ChooseMacro( aDocument, aDocFrame, bChooseOnly );
         rtl_uString* pScriptURL = aScriptURL.pData;
         rtl_uString_acquire( pScriptURL );
 
@@ -235,10 +234,8 @@ namespace
 
 OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument,
                       const uno::Reference< frame::XFrame >& xDocFrame,
-                      bool bChooseOnly, const OUString& rMacroDesc )
+                      bool bChooseOnly )
 {
-    (void)rMacroDesc;
-
     EnsureIde();
 
     GetExtraData()->ChoosingMacro() = true;
diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index 9ebbe0f949b8..8b10c60035ff 100644
--- a/basctl/source/inc/basobj.hxx
+++ b/basctl/source/inc/basobj.hxx
@@ -75,11 +75,11 @@ namespace basctl
 
     OUString        ChooseMacro(
         const css::uno::Reference< css::frame::XModel >& rxLimitToDocument, const css::uno::Reference< css::frame::XFrame >& xDocFrame,
-        bool bChooseOnly, const OUString& rMacroDesc );
+        bool bChooseOnly );
     inline OUString ChooseMacro(
         const css::uno::Reference< css::frame::XModel >& rxLimitToDocument,
-        bool bChooseOnly, const OUString& rMacroDesc )
-    { return ChooseMacro(rxLimitToDocument, css::uno::Reference< css::frame::XFrame >(), bChooseOnly, rMacroDesc); }
+        bool bChooseOnly )
+    { return ChooseMacro(rxLimitToDocument, css::uno::Reference< css::frame::XFrame >(), bChooseOnly); }
 
     /// @throws css::container::NoSuchElementException
     /// @throws css::uno::RuntimeException
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index efdd469b424e..a4a8b84dae44 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -1181,13 +1181,13 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
 
 #ifndef DISABLE_DYNLOADING
 
-typedef rtl_uString* (SAL_CALL *basicide_choose_macro)(void*, void*, sal_Bool, rtl_uString*);
+typedef rtl_uString* (SAL_CALL *basicide_choose_macro)(void*, void*, sal_Bool);
 
 extern "C" { static void SAL_CALL thisModule() {} }
 
 #else
 
-extern "C" rtl_uString* basicide_choose_macro(void*, void*, sal_Bool, rtl_uString*);
+extern "C" rtl_uString* basicide_choose_macro(void*, void*, sal_Bool);
 
 #endif
 
@@ -1210,8 +1210,7 @@ OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, const Refere
 #endif
 
     // call basicide_choose_macro in basctl
-    OUString rMacroDesc;
-    rtl_uString* pScriptURL = pSymbol( rxLimitToDocument.get(), xDocFrame.get(), bChooseOnly, rMacroDesc.pData );
+    rtl_uString* pScriptURL = pSymbol( rxLimitToDocument.get(), xDocFrame.get(), bChooseOnly );
     OUString aScriptURL( pScriptURL );
     rtl_uString_release( pScriptURL );
     return aScriptURL;