diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:03:12 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:03:12 +0000 |
| commit | 024d90ab91181d37bfff723d9e498e5c815d0611 (patch) | |
| tree | 2272a8741641dc87e8823b38dc41f97918a72e3b | |
| parent | feeb550f470dccfc2f8b067f64eda017b0d1ee7c (diff) | |
INTEGRATION: CWS sb71 (1.28.22); FILE MERGED
2007/07/18 12:57:08 sb 1.28.22.2: RESYNC: (1.28-1.29); FILE MERGED
2007/06/28 12:51:12 sb 1.28.22.1: #i75466# Removed obsolete runtime loading of xcr lib from sb lib.
| -rw-r--r-- | basic/source/classes/eventatt.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx index 002e23eb48..a9d9197a98 100644 --- a/basic/source/classes/eventatt.cxx +++ b/basic/source/classes/eventatt.cxx @@ -4,9 +4,9 @@ * * $RCSfile: eventatt.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: hr $ $Date: 2007-06-27 14:17:52 $ + * last change: $Author: vg $ $Date: 2007-10-15 13:03:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -101,7 +101,7 @@ //================================================================================================== -#include <xmlscript/dynload.hxx> +#include <xmlscript/xmldlg_imexp.hxx> #include <sbunoobj.hxx> #include <basic/sbstar.hxx> #include <basic/sbmeth.hxx> @@ -790,10 +790,6 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite ) (void)pBasic; (void)bWrite; - static ::xmlscript::XML_script * s_xmlscript = 0; - if (0 == s_xmlscript) - s_xmlscript = ::xmlscript::getXmlScript(); - Reference< XMultiServiceFactory > xMSF( comphelper::getProcessServiceFactory() ); if( !xMSF.is() ) return; @@ -841,7 +837,7 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite ) // Import the DialogModel Reference< XInputStream > xInput( xISP->createInputStream() ); - s_xmlscript->importDialogModel( xInput, xDialogModel, xContext ); + xmlscript::importDialogModel( xInput, xDialogModel, xContext ); // Find dialog library for dialog, direct access is not possible here StarBASIC* pStartedBasic = pINST->GetBasic(); |