diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 11:28:12 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 11:28:12 +0000 |
| commit | f9846208df4b992439907ec0ce103d658976b18b (patch) | |
| tree | 859c7c1655821fa51cca23ceec9f41cd6c327775 /svx/source/unodraw/unoshap4.cxx | |
| parent | f6d3f5a8bd544e215fd39bb6ca8cf10e0fac5b2a (diff) | |
INTEGRATION: CWS rptchart02 (1.33.2); FILE MERGED
2008/04/16 06:35:52 oj 1.33.2.2: RESYNC: (1.33-1.36); FILE MERGED
2008/04/03 13:25:31 oj 1.33.2.1: impl XInplaceClient at lightclient
Diffstat (limited to 'svx/source/unodraw/unoshap4.cxx')
| -rw-r--r-- | svx/source/unodraw/unoshap4.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 2b347c35c698..698d88d86715 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: unoshap4.cxx,v $ - * $Revision: 1.36 $ + * $Revision: 1.37 $ * * This file is part of OpenOffice.org. * @@ -471,7 +471,7 @@ sal_Bool SvxOle2Shape::createObject( const SvGlobalName &aClassName ) DBG_TESTSOLARMUTEX(); SdrOle2Obj* pOle2Obj = dynamic_cast< SdrOle2Obj* >( mpObj.get() ); - if ( !pOle2Obj && !pOle2Obj->IsEmpty() ) + if ( !pOle2Obj || !pOle2Obj->IsEmpty() ) return sal_False; // create storage and inplace object |