diff options
| author | Carsten Driesner <cd@openoffice.org> | 2011-02-07 13:06:08 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2011-02-07 13:06:08 +0100 |
| commit | bebf85efd10e676c8a9409c6ebd98a6e767d16f0 (patch) | |
| tree | ab9f9265bb021e5eb6fc357e79234bba20bc4b8f /sfx2/source/appl/appserv.cxx | |
| parent | e4ee5496696455f7ef6657c15696f36d3da78659 (diff) | |
| parent | a1a2a5a68046e75aba3dfd6ba06083a314f12182 (diff) | |
removetooltypes01: Rebase to DEV300m99
Diffstat (limited to 'sfx2/source/appl/appserv.cxx')
| -rw-r--r-- | sfx2/source/appl/appserv.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index c9e09254edda..217bb87d3a04 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -107,7 +107,6 @@ #include <sfx2/new.hxx> #include <sfx2/templdlg.hxx> #include "sfxtypes.hxx" -#include "sfxbasic.hxx" #include <sfx2/tabdlg.hxx> #include "arrdecl.hxx" #include "fltfnc.hxx" @@ -118,7 +117,6 @@ #include "arrdecl.hxx" #include <sfx2/childwin.hxx> #include "appdata.hxx" -#include <sfx2/macrconf.hxx> #include "sfx2/minfitem.hxx" #include <sfx2/event.hxx> #include <sfx2/module.hxx> @@ -129,7 +127,7 @@ #include <sfx2/dialogs.hrc> #include "sorgitm.hxx" #include "sfx2/sfxhelp.hxx" -#include <tools/svlibrary.hxx>
+#include <tools/svlibrary.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::beans; @@ -746,7 +744,7 @@ extern "C" { static void SAL_CALL thisModule() {} } ::rtl::OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, sal_Bool bChooseOnly, const ::rtl::OUString& rMacroDesc = ::rtl::OUString() ) { // get basctl dllname - static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "basctl" ) ) );
+ static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "basctl" ) ) ); // load module oslModule handleMod = osl_loadModuleRelative( @@ -766,7 +764,7 @@ extern "C" { static void SAL_CALL thisModule() {} } void MacroOrganizer( sal_Int16 nTabId ) { // get basctl dllname - static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "basctl" ) ) );
+ static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "basctl" ) ) ); // load module oslModule handleMod = osl_loadModuleRelative( |