diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-03-12 09:13:49 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-03-12 09:13:49 +0000 |
| commit | 96811913a935c9785589d2c992e46eca8fc78481 (patch) | |
| tree | e5e0f998d474bfbf31b2af55720efc6aa49e7b67 /svx/source/unoedit | |
| parent | 0356aa5725febcfb8c5dacf8d45b3ea472351c6d (diff) | |
INTEGRATION: CWS impresstables2 (1.29.232); FILE MERGED
2007/08/01 19:01:02 cl 1.29.232.2: RESYNC: (1.29-1.31); FILE MERGED
2007/03/15 17:31:21 cl 1.29.232.1: #i68103# starting to seperate the text from the SdrTextObj
Diffstat (limited to 'svx/source/unoedit')
| -rw-r--r-- | svx/source/unoedit/unoforou.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/svx/source/unoedit/unoforou.cxx b/svx/source/unoedit/unoforou.cxx index 2bcae6db5c87..e711966fab1b 100644 --- a/svx/source/unoedit/unoforou.cxx +++ b/svx/source/unoedit/unoforou.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unoforou.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: obo $ $Date: 2007-07-18 13:07:31 $ + * last change: $Author: rt $ $Date: 2008-03-12 10:13:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -71,7 +71,7 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------ -SvxOutlinerForwarder::SvxOutlinerForwarder( Outliner& rOutl, SdrObject* pSdrObj ) : +SvxOutlinerForwarder::SvxOutlinerForwarder( Outliner& rOutl, SdrObject* pSdrObj /* = 0 */ ) : rOutliner( rOutl ), pSdrObject( pSdrObj ), mpAttribsCache( NULL ), @@ -495,10 +495,7 @@ sal_Bool SvxOutlinerForwarder::SetDepth( USHORT nPara, USHORT nNewDepth ) { DBG_ASSERT( nPara < GetParagraphCount(), "SvxOutlinerForwarder::SetDepth: Invalid paragraph index"); - if(pSdrObject == NULL) - return sal_False; - - const sal_Bool bOutlinerText = (pSdrObject->GetObjInventor() == SdrInventor) && (pSdrObject->GetObjIdentifier() == OBJ_OUTLINETEXT); + const sal_Bool bOutlinerText = pSdrObject && (pSdrObject->GetObjInventor() == SdrInventor) && (pSdrObject->GetObjIdentifier() == OBJ_OUTLINETEXT); if(bOutlinerText) ++nNewDepth; |