diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 16:32:47 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 16:32:47 +0000 |
| commit | 5df13e4b7995bdb0c8208a6da1ef62aebcf8c60e (patch) | |
| tree | c878d6243d0de0a030dfd182547cad5004446479 | |
| parent | b73f22d9a32aaa39186d3b0158bbb0fd270bb556 (diff) | |
INTEGRATION: CWS impress121 (1.154.182); FILE MERGED
2007/07/18 20:18:23 sj 1.154.182.3: RESYNC: (1.156-1.158); FILE MERGED
2007/06/05 14:52:10 sj 1.154.182.2: RESYNC: (1.154-1.156); FILE MERGED
2007/05/10 11:46:36 cl 1.154.182.1: #i76336# added patch to prevent crash during basic macro
| -rw-r--r-- | svx/source/unodraw/unoshape.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index c96b3163ace3..5568b6ff9be7 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unoshape.cxx,v $ * - * $Revision: 1.160 $ + * $Revision: 1.161 $ * - * last change: $Author: rt $ $Date: 2007-07-24 12:02:29 $ + * last change: $Author: hr $ $Date: 2007-07-31 17:32:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -4217,7 +4217,7 @@ uno::Reference< container::XIndexContainer > SAL_CALL SvxShape::getGluePoints() OGuard aGuard( Application::GetSolarMutex() ); uno::Reference< container::XIndexContainer > xGluePoints( mxGluePoints ); - if( !xGluePoints.is() ) + if( mpObj.is() && !xGluePoints.is() ) { uno::Reference< container::XIndexContainer > xNew( SvxUnoGluePointAccess_createInstance( mpObj.get() ), uno::UNO_QUERY ); mxGluePoints = xGluePoints = xNew; |