diff options
Diffstat (limited to 'basic/source')
31 files changed, 61 insertions, 50 deletions
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx index ba9d263b0707..eca9c890428e 100644 --- a/basic/source/app/app.cxx +++ b/basic/source/app/app.cxx @@ -80,7 +80,7 @@ #include <com/sun/star/ucb/XContentProviderManager.hpp> #include <ucbhelper/content.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> using namespace comphelper; using namespace cppu; diff --git a/basic/source/app/app.hxx b/basic/source/app/app.hxx index 4fc9e9cb9c07..68b3db186785 100644 --- a/basic/source/app/app.hxx +++ b/basic/source/app/app.hxx @@ -42,8 +42,8 @@ #include <vcl/wrkwin.hxx> #endif #include <vcl/timer.hxx> -#include <svtools/brdcst.hxx> -#include <svtools/lstner.hxx> +#include <svl/brdcst.hxx> +#include <svl/lstner.hxx> class BasicFrame; #include <basic/mybasic.hxx> diff --git a/basic/source/app/appedit.cxx b/basic/source/app/appedit.cxx index a9b7b1d03b77..31e4192e5965 100644 --- a/basic/source/app/appedit.cxx +++ b/basic/source/app/appedit.cxx @@ -34,7 +34,7 @@ #include <svtools/ctrltool.hxx> #include <svtools/textview.hxx> #include <svtools/texteng.hxx> -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #ifndef _BASIC_TTRESHLP_HXX #include <basic/ttstrhlp.hxx> diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx index 8c4df4186f41..00eba2fbac6c 100644 --- a/basic/source/app/dialogs.cxx +++ b/basic/source/app/dialogs.cxx @@ -60,13 +60,13 @@ #include <svtools/stringtransfer.hxx> #include <vcl/splitwin.hxx> #ifndef _ZFORLIST_HXX //autogen -#include <svtools/zformat.hxx> +#include <svl/zformat.hxx> #endif #include <svtools/ctrltool.hxx> // Ohne Includeschutz #include <svtools/svtdata.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <basic/dispdefs.hxx> diff --git a/basic/source/app/msgedit.cxx b/basic/source/app/msgedit.cxx index 7d0755d39aa6..544d7c9f4d4d 100644 --- a/basic/source/app/msgedit.cxx +++ b/basic/source/app/msgedit.cxx @@ -48,7 +48,7 @@ Version 3 Changed Charset from CHARSET_IBMPC to RTL_TEXTENCODING_UTF8 #endif #include <tools/fsys.hxx> #include <svtools/stringtransfer.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #ifndef _BASIC_TTRESHLP_HXX #include <basic/ttstrhlp.hxx> #endif diff --git a/basic/source/app/textedit.hxx b/basic/source/app/textedit.hxx index 1598d4867140..5caf90d738d7 100644 --- a/basic/source/app/textedit.hxx +++ b/basic/source/app/textedit.hxx @@ -40,7 +40,7 @@ class BreakpointWindow; #include <vcl/timer.hxx> #include <tools/table.hxx> #include <tools/debug.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svtools/svmedit.hxx> #include "dataedit.hxx" diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx index 17bd8a712763..3a0be2efa41c 100644 --- a/basic/source/basmgr/basicmanagerrepository.cxx +++ b/basic/source/basmgr/basicmanagerrepository.cxx @@ -44,8 +44,8 @@ /** === end UNO includes === **/ #include <svtools/ehdl.hxx> #include <svtools/sfxecode.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/smplhint.hxx> +#include <unotools/pathoptions.hxx> +#include <svl/smplhint.hxx> #include <vcl/svapp.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 2620852370b1..0645bfb85c2a 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -33,14 +33,14 @@ #include <tools/stream.hxx> #include <sot/storage.hxx> #include <tools/urlobj.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/wrkwin.hxx> #include <vcl/msgbox.hxx> #include <basic/sbx.hxx> #include <sot/storinfo.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <basic/sbmod.hxx> diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx index aed5b2b3c575..f54cdc800d38 100644 --- a/basic/source/classes/propacc.cxx +++ b/basic/source/classes/propacc.cxx @@ -35,7 +35,7 @@ #include <tools/urlobj.hxx> #include <tools/errcode.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <basic/sbstar.hxx> #include <sbunoobj.hxx> diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index a6ae8cac29af..26d17d77c84b 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -36,7 +36,7 @@ #ifndef _TOOLERR_HXX //autogen #include <tools/errcode.hxx> #endif -#include <svtools/hint.hxx> +#include <svl/hint.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/exc_hlp.hxx> @@ -750,11 +750,11 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue ) // SbUnoObject instanzieren String aName; SbUnoObject* pSbUnoObject = new SbUnoObject( aName, aValue ); - //If this is called externally e.g. from the scripting
- //framework then there is no 'active' runtime the default property will not be set up
- //only a vba object will have XDefaultProp set anyway so... this
- //test seems a bit of overkill
- //if ( SbiRuntime::isVBAEnabled() )
+ //If this is called externally e.g. from the scripting + //framework then there is no 'active' runtime the default property will not be set up + //only a vba object will have XDefaultProp set anyway so... this + //test seems a bit of overkill + //if ( SbiRuntime::isVBAEnabled() ) { String sDfltPropName; @@ -3377,9 +3377,10 @@ SbxVariable* SbUnoService::Find( const String& rName, SbxClassType ) // Create and insert SbUnoServiceCtor SbxVariableRef xSbCtorRef = new SbUnoServiceCtor( aName, xCtor ); QuickInsert( (SbxVariable*)xSbCtorRef ); - pRes = xSbCtorRef; } } + + pRes = SbxObject::Find( rName, SbxCLASS_METHOD ); } } diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 2d5f4f7cdf89..393719b71c2d 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -36,7 +36,7 @@ #include <vos/macros.hxx> #include <vcl/svapp.hxx> #include <tools/stream.hxx> -#include <svtools/brdcst.hxx> +#include <svl/brdcst.hxx> #include <tools/shl.hxx> #include <basic/sbx.hxx> #include "sb.hxx" diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx index c3e8a000cf8c..8b840770a0e6 100644 --- a/basic/source/comp/codegen.cxx +++ b/basic/source/comp/codegen.cxx @@ -83,7 +83,7 @@ void SbiCodeGen::GenStmnt() UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode ) { -#ifndef PRODUCT +#ifdef DBG_UTIL if( eOpcode < SbOP0_START || eOpcode > SbOP0_END ) pParser->Error( SbERR_INTERNAL_ERROR, "OPCODE1" ); #endif @@ -94,7 +94,7 @@ UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode ) UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode, UINT32 nOpnd ) { -#ifndef PRODUCT +#ifdef DBG_UTIL if( eOpcode < SbOP1_START || eOpcode > SbOP1_END ) pParser->Error( SbERR_INTERNAL_ERROR, "OPCODE2" ); #endif @@ -107,7 +107,7 @@ UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode, UINT32 nOpnd ) UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode, UINT32 nOpnd1, UINT32 nOpnd2 ) { -#ifndef PRODUCT +#ifdef DBG_UTIL if( eOpcode < SbOP2_START || eOpcode > SbOP2_END ) pParser->Error( SbERR_INTERNAL_ERROR, "OPCODE3" ); #endif diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx index c18501c98e40..32a0007a61ca 100644 --- a/basic/source/comp/exprgen.cxx +++ b/basic/source/comp/exprgen.cxx @@ -170,7 +170,7 @@ void SbiExprNode::Gen( RecursiveMode eRecMode ) void SbiExprNode::GenElement( SbiOpcode eOp ) { -#ifndef PRODUCT +#ifdef DBG_UTIL if( (eOp < _RTL || eOp > _CALLC) && eOp != _FIND_G && eOp != _FIND_CM ) pGen->GetParser()->Error( SbERR_INTERNAL_ERROR, "Opcode" ); #endif diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx index 2eb87dcdcc52..089dc068773a 100644 --- a/basic/source/comp/symtbl.cxx +++ b/basic/source/comp/symtbl.cxx @@ -175,7 +175,7 @@ void SbiSymPool::Add( SbiSymDef* pDef ) { if( pDef->pIn ) { -#ifndef PRODUCT +#ifdef DBG_UTIL // schon in einem anderen Pool drin! pParser->Error( SbERR_INTERNAL_ERROR, "Dbl Pool" ); #endif diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx index 565c7a358a97..698b3d453d5b 100644 --- a/basic/source/inc/propacc.hxx +++ b/basic/source/inc/propacc.hxx @@ -30,7 +30,7 @@ #ifndef _SFX_PROPBAG_HXX #define _SFX_PROPBAG_HXX -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HXX_ #include <com/sun/star/beans/PropertyValue.hpp> #endif diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx index f3d691bf059a..7221ee68252f 100644 --- a/basic/source/inc/symtbl.hxx +++ b/basic/source/inc/symtbl.hxx @@ -31,7 +31,7 @@ #ifndef _SYMTBL_HXX #define _SYMTBL_HXX -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <tools/string.hxx> #include <basic/sbxdef.hxx> #include <basic/sbdef.hxx> diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx index e4c9ad1fe307..aa3fda6a7116 100644 --- a/basic/source/runtime/basrdll.cxx +++ b/basic/source/runtime/basrdll.cxx @@ -33,7 +33,7 @@ #include <tools/shl.hxx> #include <vcl/svapp.hxx> #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #include <tools/debug.hxx> #include <vcl/msgbox.hxx> diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx index 751bd57cc808..425eec2eaf85 100644 --- a/basic/source/runtime/ddectrl.cxx +++ b/basic/source/runtime/ddectrl.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basic.hxx" #include <tools/errcode.hxx> -#include <svtools/svdde.hxx> +#include <svl/svdde.hxx> #include "ddectrl.hxx" #ifndef _SBERRORS_HXX #include <basic/sberrors.hxx> diff --git a/basic/source/runtime/dllmgr.hxx b/basic/source/runtime/dllmgr.hxx index 607abaa843fa..ae25e570f10c 100644 --- a/basic/source/runtime/dllmgr.hxx +++ b/basic/source/runtime/dllmgr.hxx @@ -32,9 +32,9 @@ #define _DLLMGR_HXX #define _SVSTDARR_BYTESTRINGSSORT -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #ifndef _SVSTDARR_HXX //autogen -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif // !!! nur zum debuggen fuer infoboxes !!! diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index e92c8c974eb2..6c26409a883c 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -43,7 +43,7 @@ #include <vcl/wintypes.hxx> #include <vcl/msgbox.hxx> #include <basic/sbx.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <rtl/math.hxx> #include <tools/urlobj.hxx> #include <osl/time.h> diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index dbd66a61575c..bac63edb62f9 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -44,7 +44,7 @@ #ifndef _SBX_HXX #include <basic/sbx.hxx> #endif -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <tools/fsys.hxx> #include <tools/urlobj.hxx> #include <osl/file.hxx> diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index cc276eea766b..6c83c6e2f3f1 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -33,8 +33,8 @@ #include <tools/fsys.hxx> #include <vcl/svapp.hxx> #include <tools/wldcrd.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/syslocale.hxx> +#include <svl/zforlist.hxx> +#include <unotools/syslocale.hxx> #include "runtime.hxx" #include "sbintern.hxx" #include "opcodes.hxx" @@ -867,7 +867,7 @@ void SbiRuntime::PushVar( SbxVariable* pVar ) SbxVariableRef SbiRuntime::PopVar() { -#ifndef PRODUCT +#ifdef DBG_UTIL if( !nExprLvl ) { StarBASIC::FatalError( SbERR_INTERNAL_ERROR ); @@ -902,7 +902,7 @@ BOOL SbiRuntime::ClearExprStack() SbxVariable* SbiRuntime::GetTOS( short n ) { n = nExprLvl - n - 1; -#ifndef PRODUCT +#ifdef DBG_UTIL if( n < 0 ) { StarBASIC::FatalError( SbERR_INTERNAL_ERROR ); diff --git a/basic/source/runtime/step1.cxx b/basic/source/runtime/step1.cxx index 938e5f6ad236..3c461c1f5541 100644 --- a/basic/source/runtime/step1.cxx +++ b/basic/source/runtime/step1.cxx @@ -160,7 +160,7 @@ void SbiRuntime::StepPAD( UINT32 nOp1 ) void SbiRuntime::StepJUMP( UINT32 nOp1 ) { -#ifndef PRODUCT +#ifdef DBG_UTIL // #QUESTION shouln't this be // if( (BYTE*)( nOp1+pImagGetCode() ) >= pImg->GetCodeSize() ) if( nOp1 >= pImg->GetCodeSize() ) diff --git a/basic/source/sbx/format.src b/basic/source/sbx/format.src index 8609bbc875b3..618b6d97a8d1 100644 --- a/basic/source/sbx/format.src +++ b/basic/source/sbx/format.src @@ -28,7 +28,7 @@ * ************************************************************************/ -#include "svtools/svtools.hrc" +#include "svl/svtools.hrc" String STR_BASICKEY_FORMAT_ON { diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx index c6862a88a56c..76bb917699ce 100644 --- a/basic/source/sbx/sbxdate.cxx +++ b/basic/source/sbx/sbxdate.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basic.hxx" #include <vcl/svapp.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <tools/errcode.hxx> #include <tools/color.hxx> #include <i18npool/lang.h> diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 3f747f27c5bd..bb62caba2076 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -35,7 +35,7 @@ #include <basic/sbx.hxx> #include <basic/sbxbase.hxx> #include "sbxres.hxx" -#include <svtools/brdcst.hxx> +#include <svl/brdcst.hxx> TYPEINIT1(SbxMethod,SbxVariable) TYPEINIT1(SbxProperty,SbxVariable) diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index acc5d91c4e2e..1fc3ad018b15 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -34,7 +34,7 @@ #include <basic/sbx.hxx> #include "sbxconv.hxx" -#include "svtools/syslocale.hxx" +#include "unotools/syslocale.hxx" #if defined ( UNX ) #include <stdlib.h> @@ -50,12 +50,12 @@ #include "sbxres.hxx" #include <basic/sbxbase.hxx> #include <basic/sbxform.hxx> -#include <svtools/svtools.hrc> +#include <svl/svtools.hrc> #include "basrid.hxx" #include "runtime.hxx" -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <comphelper/processfactory.hxx> diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index 66c56adc731a..2f517c3453ca 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -33,7 +33,7 @@ #include <tools/stream.hxx> -#include "svtools/brdcst.hxx" +#include "svl/brdcst.hxx" #include <basic/sbx.hxx> #include <basic/sbxbase.hxx> diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index f7e5f9a842e4..f199353c2d7a 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -51,7 +51,7 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <xmlscript/xmldlg_imexp.hxx> #include <cppuhelper/factory.hxx> #include <svtools/sfxecode.hxx> diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index c397e402fac4..02a7b174da1c 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -54,7 +54,7 @@ #include <tools/diagnose_ex.h> #include <tools/urlobj.hxx> #include <unotools/streamwrap.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> #include <basic/basmgr.hxx> @@ -940,7 +940,17 @@ sal_Bool SfxLibraryContainer::init_Impl( // #110009 if( !bStorage && meInitMode == DEFAULT ) - implScanExtensions(); + { + try + { + implScanExtensions(); + } + catch( uno::Exception& ) + { + // TODO: error handling? + OSL_ASSERT( "Cannot access extensions!" ); + } + } // #110009 Preload? { diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index aad4815872c0..e72205744ce0 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -58,7 +58,7 @@ #include <tools/urlobj.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> #include <basic/basmgr.hxx> |