diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-04-08 14:30:17 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-04-08 14:30:17 +0000 |
| commit | a2187ac63b4eac7be7604903230130dbf093efae (patch) | |
| tree | a2095910e010af95a8d80e6e72ad9f58841adcc1 | |
| parent | 2dc836906e898952c93234a72870f7baafc98317 (diff) | |
INTEGRATION: CWS draw8 (1.54.66); FILE MERGED
2003/04/03 14:39:20 aw 1.54.66.2: #107848#
One little optimization to not create a TextImportHelper if not needed.
2003/03/12 10:27:21 aw 1.54.66.1: #107848# Make adding the shepe to Z-Ordering dependent from if we are inside a inside_deleted_section (redlining). That is necessary since the shape will be removed again later. It would lead to errors if it would stay inside the Z-Ordering. Thus, the easiest way to solve that conflict is to not add it here.
| -rw-r--r-- | xmloff/source/text/XMLTextFrameContext.cxx | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index 2ceae7fb8b46..c06ef63c9d9f 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLTextFrameContext.cxx,v $ * - * $Revision: 1.54 $ + * $Revision: 1.55 $ * - * last change: $Author: mib $ $Date: 2002-11-25 17:11:55 $ + * last change: $Author: rt $ $Date: 2003-04-08 15:30:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -692,7 +692,18 @@ void XMLTextFrameContext::Create( sal_Bool bHRefOrBase64 ) } Reference < XShape > xShape( xPropSet, UNO_QUERY ); - GetImport().GetShapeImport()->shapeWithZIndexAdded( xShape, nZIndex ); + + // #107848# + // Make adding the shepe to Z-Ordering dependent from if we are + // inside a inside_deleted_section (redlining). That is necessary + // since the shape will be removed again later. It would lead to + // errors if it would stay inside the Z-Ordering. Thus, the + // easiest way to solve that conflict is to not add it here. + if(!GetImport().HasTextImport() + || !GetImport().GetTextImport()->IsInsideDeleteContext()) + { + GetImport().GetShapeImport()->shapeWithZIndexAdded( xShape, nZIndex ); + } if( XML_TEXT_FRAME_TEXTBOX == nType ) { |