diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-26 15:10:39 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-26 15:10:39 +0000 |
| commit | d147d5e03af5675bb93d95d3c036657d872f262f (patch) | |
| tree | 2ed17700a0ad78f40fd9f9ed096deff2012a0301 /comphelper/source | |
| parent | 164c23a9840546de97cf08e92bc3c08c6ea904ff (diff) | |
INTEGRATION: CWS mav21 (1.20.4); FILE MERGED
2007/06/05 14:00:15 mav 1.20.4.1: #i77319# the scenario was broken by the changes for m213
Diffstat (limited to 'comphelper/source')
| -rw-r--r-- | comphelper/source/container/embeddedobjectcontainer.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index baec496dd0c1..3dcbe8a2242c 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -4,9 +4,9 @@ * * $RCSfile: embeddedobjectcontainer.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: vg $ $Date: 2007-05-22 20:19:18 $ + * last change: $Author: hr $ $Date: 2007-06-26 16:10:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1131,7 +1131,9 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < e pImpl->maObjectContainer.erase( aIt ); bFound = sal_True; uno::Reference < container::XChild > xChild( xObj, uno::UNO_QUERY ); - xChild->setParent( uno::Reference < uno::XInterface >() ); + if ( xChild.is() ) + xChild->setParent( uno::Reference < uno::XInterface >() ); + break; } |