diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-02 15:34:22 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-02 15:34:22 +0000 |
| commit | f678ace1abe7e4eff8465a926a025c893bc12db7 (patch) | |
| tree | 862e325c39a3065b7ab7b3cfc8281a0119d2a745 /basic | |
| parent | 1ae74487be1d893621e52331e94426d4f1596c46 (diff) | |
INTEGRATION: CWS npower4 (1.6.12); FILE MERGED
2006/10/18 20:29:19 npower 1.6.12.1: #i64884# changes for default properties
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/sbx/sbxobj.cxx | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 8f256d1ed4b6..508b56bf6c30 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sbxobj.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2006-09-17 10:11:04 $ + * last change: $Author: vg $ $Date: 2006-11-02 16:34:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -320,16 +320,21 @@ BOOL SbxObject::Call( const XubString& rName, SbxArray* pParam ) return FALSE; } -void SbxObject::SetDfltProperty( const XubString& rName ) +SbxProperty* SbxObject::GetDfltProperty() { - if( rName.Len() ) + if ( !pDfltProp && aDfltPropName.Len() ) { - pDfltProp = (SbxProperty*) Find( rName, SbxCLASS_PROPERTY ); + pDfltProp = (SbxProperty*) Find( aDfltPropName, SbxCLASS_PROPERTY ); if( !pDfltProp ) - pDfltProp = (SbxProperty*) Make( rName, SbxCLASS_PROPERTY, SbxVARIANT ); + pDfltProp = (SbxProperty*) Make( aDfltPropName, SbxCLASS_PROPERTY, SbxVARIANT ); } - else + return pDfltProp; +} +void SbxObject::SetDfltProperty( const XubString& rName ) +{ + if ( rName != aDfltPropName ) pDfltProp = NULL; + aDfltPropName = rName; SetModified( TRUE ); } |