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

Stephan Bergmann sbergman at redhat.com
Thu Jun 4 08:21:21 PDT 2015


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

New commits:
commit d8439ca1b42276aef19971cd8b321f12001355d6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jun 4 17:20:51 2015 +0200

    Match basicide_choose_macro in basctl/source/basicide/basobj2.cxx
    
    Change-Id: I9add8be1c20c2529edf8d8616fe5e372938cd355

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


More information about the Libreoffice-commits mailing list