diff options
Diffstat (limited to 'basic/source/runtime')
-rw-r--r-- | basic/source/runtime/basrdll.cxx | 2 | ||||
-rw-r--r-- | basic/source/runtime/ddectrl.cxx | 2 | ||||
-rw-r--r-- | basic/source/runtime/dllmgr.hxx | 4 | ||||
-rw-r--r-- | basic/source/runtime/methods.cxx | 2 | ||||
-rw-r--r-- | basic/source/runtime/methods1.cxx | 2 | ||||
-rw-r--r-- | basic/source/runtime/runtime.cxx | 8 | ||||
-rw-r--r-- | basic/source/runtime/step1.cxx | 2 |
7 files changed, 11 insertions, 11 deletions
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() ) |