diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-12-23 10:01:58 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-12-23 10:01:58 +0100 |
| commit | cc8d3de7d22e8f27db46d074e9b310e22f169a34 (patch) | |
| tree | 8a123fb2997c63a7600e2dbe33de63064ca017c4 /basctl | |
| parent | 37d1299dcb5dbd2c9ca417305b30e307b5270861 (diff) | |
| parent | fcb659ae5ba83fe354842cf7bdefbdfb95894872 (diff) | |
undoapi: merged after pulling DEV300_m96. Most probably still not buildable:A number of changes which happened in the CWS need to be redone due to the new build system
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/prj/build.lst | 2 | ||||
| -rw-r--r-- | basctl/source/basicide/baside2b.cxx | 5 | ||||
| -rw-r--r-- | basctl/source/basicide/basidesh.cxx | 2 | ||||
| -rw-r--r-- | basctl/util/makefile.mk | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/basctl/prj/build.lst b/basctl/prj/build.lst index a48a698a99a7..0c5283ff0aec 100644 --- a/basctl/prj/build.lst +++ b/basctl/prj/build.lst @@ -1,4 +1,4 @@ -bc basctl : l10n svx NULL +bc basctl : LIBXSLT:libxslt l10n svx NULL bc basctl usr1 - all bc_mkout NULL bc basctl\inc nmake - all bc_inc NULL bc basctl\source\inc get - all bc_sinc NULL diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 782485b535a2..68cdbe9ad9ed 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1635,9 +1635,10 @@ void __EXPORT StackWindow::UpdateCalls() aEntry += pParam->aName; } aEntry += '='; - if( pVar->GetType() & SbxARRAY ) + SbxDataType eType = pVar->GetType(); + if( eType & SbxARRAY ) aEntry += String( RTL_CONSTASCII_USTRINGPARAM( "..." ) ); - else + else if( eType != SbxOBJECT ) aEntry += pVar->GetString(); if ( nParam < ( pParams->Count() - 1 ) ) aEntry += String( RTL_CONSTASCII_USTRINGPARAM( ", " ) ); diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index cffe1748846d..02dbb525b972 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -161,8 +161,6 @@ SFX_IMPL_NAMED_VIEWFACTORY( BasicIDEShell, "Default" ) } -// MI: Prinzipiel IDL, aber ich lieber doch nicht? -// SFX_IMPL_ /*IDL_*/ INTERFACE( BasicIDEShell, SfxViewShell, IDEResId( RID_STR_IDENAME ) ) SFX_IMPL_INTERFACE( BasicIDEShell, SfxViewShell, IDEResId( RID_STR_IDENAME ) ) { SFX_CHILDWINDOW_REGISTRATION( SID_SEARCH_DLG ); diff --git a/basctl/util/makefile.mk b/basctl/util/makefile.mk index 9401bbfb8d4d..1719a7c9c078 100644 --- a/basctl/util/makefile.mk +++ b/basctl/util/makefile.mk @@ -92,8 +92,6 @@ SRSFILELIST=\ $(SRS)$/basicide.srs \ $(SRS)$/dlged.srs -SRSFILELIST+= $(SOLARCOMMONRESDIR)$/sfx.srs - RESLIB1NAME=basctl RESLIB1IMAGES =$(PRJ)$/res RESLIB1SRSFILES= $(SRSFILELIST) |