summaryrefslogtreecommitdiff
path: root/basctl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-07-23 20:23:05 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-07-23 20:23:05 +0200
commitf9d86d0bc2dd1c2b93f1de47379e65be0a1eaf42 (patch)
treebd1e0a98bf8fe566d1b31028cfafc3d7d41309c7 /basctl
parent55c390d526a1877bc5370d94338b9ebd75a9f3da (diff)
Some clean-up
Change-Id: Ib515db3b5e3bc77a397d24ed7ec1ed446f2998a2
Diffstat (limited to 'basctl')
-rw-r--r--basctl/source/basicide/baside2b.cxx26
1 files changed, 3 insertions, 23 deletions
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 3682d72d015b..4fbd360412d1 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1967,46 +1967,26 @@ sal_Bool WatchTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString
sal_Bool WatchTreeListBox::ImplBasicEntryEdited( SvLBoxEntry* pEntry, const String& rResult )
{
- WatchItem* pItem = (WatchItem*)pEntry->GetUserData();
- String aVName( pItem->maName );
-
- sal_Bool bError = sal_False;
- String aResult( rResult );
- String aIndex;
bool bArrayElement;
SbxBase* pSBX = ImplGetSBXForEntry( pEntry, bArrayElement );
- SbxBase* pToBeChanged = NULL;
if ( pSBX && pSBX->ISA( SbxVariable ) && !pSBX->ISA( SbxMethod ) )
{
SbxVariable* pVar = (SbxVariable*)pSBX;
SbxDataType eType = pVar->GetType();
- if ( (sal_uInt8)eType == (sal_uInt8)SbxOBJECT )
- bError = sal_True;
- else if ( eType & SbxARRAY )
- bError = sal_True;
- else
- pToBeChanged = pSBX;
- }
-
- if ( pToBeChanged )
- {
- if ( pToBeChanged->ISA( SbxVariable ) )
+ if ( (sal_uInt8)eType != (sal_uInt8)SbxOBJECT
+ && ( eType & SbxARRAY ) == 0 )
{
// If the type is variable, the conversion of the SBX does not matter,
// else the string is converted.
- ((SbxVariable*)pToBeChanged)->PutStringExt( aResult );
+ pVar->PutStringExt( rResult );
}
- else
- bError = sal_True;
}
if ( SbxBase::IsError() )
{
- bError = sal_True;
SbxBase::ResetError();
}
- (void)bError; // used to Beep.
UpdateWatches();