diff options
author | Michael Brauer <mib@openoffice.org> | 2001-04-10 08:07:23 +0000 |
---|---|---|
committer | Michael Brauer <mib@openoffice.org> | 2001-04-10 08:07:23 +0000 |
commit | 0ace70c095348b08f280d5513704726edace991a (patch) | |
tree | 3302043cb9b30fe8c29f09916cab233f0445e22e /xmloff | |
parent | 4f9d0050c45a0b17a1a8e0f3745c049853782379 (diff) |
#85919#: Load page bound frames
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/text/XMLTextFrameContext.cxx | 20 | ||||
-rw-r--r-- | xmloff/source/text/txtimp.cxx | 5 |
2 files changed, 13 insertions, 12 deletions
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index 83ff5c2b5f30..aabc0c97830c 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLTextFrameContext.cxx,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: dvo $ $Date: 2001-03-29 16:26:25 $ + * last change: $Author: mib $ $Date: 2001-04-10 09:07:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -773,6 +773,14 @@ XMLTextFrameContext::XMLTextFrameContext( xPropSet->setPropertyValue( sGraphicRotation, aAny ); } + // page number (must be set after the frame is inserted, because it + // will be overwritten then inserting the frame. + if( TextContentAnchorType_AT_PAGE == eAnchorType && nPage > 0 ) + { + aAny <<= nPage; + xPropSet->setPropertyValue( sAnchorPageNo, aAny ); + } + if( XML_TEXT_FRAME_OBJECT != nType && XML_TEXT_FRAME_OBJECT_OLE != nType && XML_TEXT_FRAME_APPLET != nType && @@ -786,14 +794,6 @@ XMLTextFrameContext::XMLTextFrameContext( GetImport().GetShapeImport()->shapeWithZIndexAdded( xShape, nZIndex ); } - // page number (must be set after the frame is inserted, because it - // will be overwritten then inserting the frame. - if( TextContentAnchorType_AT_PAGE == eAnchorType && nPage > 0 ) - { - aAny <<= nPage; - xPropSet->setPropertyValue( sAnchorPageNo, aAny ); - } - if( XML_TEXT_FRAME_TEXTBOX == nType ) { xTxtImport->ConnectFrameChains( sName, sChainNextName, xPropSet ); diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 1de4f39d58d4..e698882c1d7f 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtimp.cxx,v $ * - * $Revision: 1.64 $ + * $Revision: 1.65 $ * - * last change: $Author: fs $ $Date: 2001-04-02 10:19:06 $ + * last change: $Author: mib $ $Date: 2001-04-10 09:07:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1553,6 +1553,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext( break; case XML_TOK_TEXT_CALCULATION_SETTINGS: pContext = new XMLCalculationSettingsContext ( rImport, nPrefix, rLocalName, xAttrList); + bContent = sal_False; break; default: if( (XML_TEXT_TYPE_BODY == eType && bBodyContentStarted) || |