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

[Stephan Bergmann]

 sfx2/source/appl/app.cxx     |    4 ++--
 sfx2/source/appl/appserv.cxx |    2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 588591d94803c8e3807000e9f9bdbaeaae69fecd
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jun 4 16:59:56 2015 +0200

    Match basicide_macro_organizer in basctl/source/basicide/basobj2.cxx
    
    Change-Id: Ib185645e84f8792d3ed29e7d5e674e5e7cc39fc5

diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 43fc768..9b2b88c 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -468,14 +468,14 @@ void SfxApplication::Invalidate( sal_uInt16 nId )
 #ifndef DISABLE_DYNLOADING
 
 typedef long (SAL_CALL *basicide_handle_basic_error)(void*);
-typedef void* (SAL_CALL *basicide_macro_organizer)(sal_Int16);
+typedef void (SAL_CALL *basicide_macro_organizer)(sal_Int16);
 
 extern "C" { static void SAL_CALL thisModule() {} }
 
 #else
 
 extern "C" long basicide_handle_basic_error(void*);
-extern "C" void *basicide_macro_organizer(sal_Int16);
+extern "C" void basicide_macro_organizer(sal_Int16);
 
 #endif
 
commit 530ebc516b89af2b14c94eaa184c0fe7953e655a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jun 4 16:58:02 2015 +0200

    unused
    
    Change-Id: Ie11bf740c0ae672e7e1b14652f93bb6222bf45b7

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 40c8014..70645ee 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -833,14 +833,12 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
 #ifndef DISABLE_DYNLOADING
 
 typedef rtl_uString* (SAL_CALL *basicide_choose_macro)(XModel*, sal_Bool, rtl_uString*);
-typedef void (SAL_CALL *basicide_macro_organizer)( sal_Int16 );
 
 extern "C" { static void SAL_CALL thisModule() {} }
 
 #else
 
 extern "C" rtl_uString* basicide_choose_macro(XModel*, sal_Bool, rtl_uString*);
-extern "C" void basicide_macro_organizer( sal_Int16 );
 
 #endif