mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ChooseMacro rMacroDesc parameter is unused

Browse Source 
...ever since 49751c8765 "INTEGRATION: CWS tbe11"

Change-Id: I038616f5e69bbf1fa04c2fff3ca63e381549aa89
This commit is contained in:
Stephan Bergmann
2017-06-28 17:15:36 +02:00
parent be00e2a73d
commit e9bae752fe
5 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
basctl/source/basicide/baside2.cxx
View File

@@ -337,7 +337,7 @@ void ModulWindow::BasicExecute()
if ( !pMethod ) if ( !pMethod )
{ {
// If not in a method then prompt the user // If not in a method then prompt the user
ChooseMacro( uno::Reference< frame::XModel >(), false, OUString() ); ChooseMacro( uno::Reference< frame::XModel >(), false );
return; return;
} }
if ( pMethod ) if ( pMethod )

2
basctl/source/basicide/basides1.cxx
View File

@@ -268,7 +268,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
break; break;
case SID_BASICIDE_CHOOSEMACRO: case SID_BASICIDE_CHOOSEMACRO:
{ {
ChooseMacro( nullptr, false, OUString() ); ChooseMacro( nullptr, false );
} }
break; break;
case SID_BASICIDE_CREATEMACRO: case SID_BASICIDE_CREATEMACRO:

9
basctl/source/basicide/basobj2.cxx
View File

@@ -43,12 +43,11 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container; using namespace ::com::sun::star::container;
extern "C" { 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::XModel > aDocument( static_cast< frame::XModel* >( pOnlyInDocument_AsXModel ) );
Reference< frame::XFrame > aDocFrame( static_cast< frame::XFrame* >( pDocFrame_AsXFrame ) ); 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* pScriptURL = aScriptURL.pData;
rtl_uString_acquire( pScriptURL ); rtl_uString_acquire( pScriptURL );
@@ -235,10 +234,8 @@ namespace
OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument, OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument,
const uno::Reference< frame::XFrame >& xDocFrame, const uno::Reference< frame::XFrame >& xDocFrame,
bool bChooseOnly, const OUString& rMacroDesc ) bool bChooseOnly )
{ {
(void)rMacroDesc;
EnsureIde(); EnsureIde();
GetExtraData()->ChoosingMacro() = true; GetExtraData()->ChoosingMacro() = true;

6
basctl/source/inc/basobj.hxx
View File

@@ -75,11 +75,11 @@ namespace basctl
OUString ChooseMacro( OUString ChooseMacro(
const css::uno::Reference< css::frame::XModel >& rxLimitToDocument, const css::uno::Reference< css::frame::XFrame >& xDocFrame, 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( inline OUString ChooseMacro(
const css::uno::Reference< css::frame::XModel >& rxLimitToDocument, const css::uno::Reference< css::frame::XModel >& rxLimitToDocument,
bool bChooseOnly, const OUString& rMacroDesc ) bool bChooseOnly )
{ return ChooseMacro(rxLimitToDocument, css::uno::Reference< css::frame::XFrame >(), bChooseOnly, rMacroDesc); } { return ChooseMacro(rxLimitToDocument, css::uno::Reference< css::frame::XFrame >(), bChooseOnly); }
/// @throws css::container::NoSuchElementException /// @throws css::container::NoSuchElementException
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException

7
sfx2/source/appl/appserv.cxx
View File

@@ -1181,13 +1181,13 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
#ifndef DISABLE_DYNLOADING #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() {} } extern "C" { static void SAL_CALL thisModule() {} }
#else #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 #endif
@@ -1210,8 +1210,7 @@ OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, const Refere
#endif #endif
// call basicide_choose_macro in basctl // call basicide_choose_macro in basctl
OUString rMacroDesc; rtl_uString* pScriptURL = pSymbol( rxLimitToDocument.get(), xDocFrame.get(), bChooseOnly );
rtl_uString* pScriptURL = pSymbol( rxLimitToDocument.get(), xDocFrame.get(), bChooseOnly, rMacroDesc.pData );
OUString aScriptURL( pScriptURL ); OUString aScriptURL( pScriptURL );
rtl_uString_release( pScriptURL ); rtl_uString_release( pScriptURL );
return aScriptURL; return aScriptURL;