diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-03-15 16:01:36 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-03-15 16:01:36 +0000 |
| commit | 53ffbbfd7b929d25ba2e1cf453bd51e7de05c7f1 (patch) | |
| tree | 5d178366116d21162594bdf0d7fe8e74f88d844d /sfx2/source/appl/app.cxx | |
| parent | 71f93dee2d8d2626e3aace8182f046e6052becfe (diff) | |
INTEGRATION: CWS basmgr02 (1.106.4); FILE MERGED
2007/02/21 09:41:21 fs 1.106.4.2: #i73331# basicide_choose_macro changed signature
2007/02/14 14:41:16 fs 1.106.4.1: ChooseMacro is not used anymore
Diffstat (limited to 'sfx2/source/appl/app.cxx')
| -rw-r--r-- | sfx2/source/appl/app.cxx | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 68c0883c41ea..7e864b13b688 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -4,9 +4,9 @@ * * $RCSfile: app.cxx,v $ * - * $Revision: 1.106 $ + * $Revision: 1.107 $ * - * last change: $Author: obo $ $Date: 2007-01-23 07:13:23 $ + * last change: $Author: obo $ $Date: 2007-03-15 17:01:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -778,7 +778,7 @@ void SfxApplication::Invalidate( USHORT nId ) #define STRING( x ) DOSTRING( x ) typedef long (SAL_CALL *basicide_handle_basic_error)(void*); -typedef rtl_uString* (SAL_CALL *basicide_choose_macro)(BOOL, BOOL, rtl_uString*); +typedef rtl_uString* (SAL_CALL *basicide_choose_macro)(void*, BOOL, rtl_uString*); typedef void* (SAL_CALL *basicide_macro_organizer)(INT16); IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic ) { @@ -866,28 +866,6 @@ SfxApplication::ChooseScript() return aScriptURL; } -::rtl::OUString SfxApplication::ChooseMacro( BOOL bExecute, BOOL bChooseOnly, const ::rtl::OUString& rMacroDesc ) -{ - // get basctl dllname - String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) ); - sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "basctl" ) ) ); - ::rtl::OUString aLibName( sLibName ); - - // load module - oslModule handleMod = osl_loadModule( aLibName.pData, 0 ); - - // get symbol - ::rtl::OUString aSymbol( RTL_CONSTASCII_USTRINGPARAM( "basicide_choose_macro" ) ); - basicide_choose_macro pSymbol = (basicide_choose_macro) osl_getFunctionSymbol( handleMod, aSymbol.pData ); - - // call basicide_choose_macro in basctl - rtl_uString* pScriptURL = pSymbol( bExecute, bChooseOnly, rMacroDesc.pData ); - - ::rtl::OUString aScriptURL( pScriptURL ); - rtl_uString_release( pScriptURL ); - return aScriptURL; -} - void SfxApplication::MacroOrganizer( INT16 nTabId ) { // get basctl dllname |