diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 15:52:56 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 15:52:56 +0000 |
| commit | b90486b688c52f750f653cf591dacee7face2e82 (patch) | |
| tree | 9e578a6bef178b6f76b7e51432afa96a0836b2d5 /svx | |
| parent | 35aea4d22fc87a7e41278de75ae3c120636c5c72 (diff) | |
INTEGRATION: CWS fwkpostbeta02 (1.20.52); FILE MERGED
2005/02/16 10:04:44 mba 1.20.52.3: #i41965#: wichids for applet must be coherent
2005/02/15 16:14:08 mba 1.20.52.2: #i41965#: small correction
2005/02/14 16:46:31 mba 1.20.52.1: #i41965#: pass DocBase parameter
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/unodraw/unoshap4.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 7de86c128886..1b72a8052cdb 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoshap4.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: rt $ $Date: 2005-01-31 09:14:55 $ + * last change: $Author: vg $ $Date: 2005-02-21 16:52:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -423,7 +423,7 @@ void SAL_CALL SvxAppletShape::setPropertyValue( const OUString& aPropertyName, c if( pMap && pObj && pModel ) { - if( pMap->nWID >= OWN_ATTR_APPLET_CODEBASE && pMap->nWID <= OWN_ATTR_APPLET_ISSCRIPT ) + if( pMap->nWID >= OWN_ATTR_APPLET_DOCBASE && pMap->nWID <= OWN_ATTR_APPLET_ISSCRIPT ) { if ( !svt::EmbeddedObjectRef::TryRunningState( ((SdrOle2Obj*)pObj)->GetObjRef() ) ) return; @@ -439,6 +439,7 @@ void SAL_CALL SvxAppletShape::setPropertyValue( const OUString& aPropertyName, c case OWN_ATTR_APPLET_CODE: case OWN_ATTR_APPLET_COMMANDS: case OWN_ATTR_APPLET_ISSCRIPT: + case OWN_ATTR_APPLET_DOCBASE: // allow exceptions to pass through xSet->setPropertyValue( aPropertyName, aValue ); bOwn = sal_True; @@ -477,7 +478,7 @@ Any SAL_CALL SvxAppletShape::getPropertyValue( const OUString& PropertyName ) th if( pMap && pObj && pModel ) { - if( pMap->nWID >= OWN_ATTR_APPLET_CODEBASE && pMap->nWID <= OWN_ATTR_APPLET_ISSCRIPT ) + if( pMap->nWID >= OWN_ATTR_APPLET_DOCBASE && pMap->nWID <= OWN_ATTR_APPLET_ISSCRIPT ) { if ( !svt::EmbeddedObjectRef::TryRunningState( ((SdrOle2Obj*)pObj)->GetObjRef() ) ) return uno::Any(); |