diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-28 12:54:15 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-28 12:54:15 +0000 |
| commit | 8ff405c8cf3f690e2e2d57b5741ad6c3638ef13e (patch) | |
| tree | a6b503d874fde68161610dddd4191137e492485a /xmloff/source/text/XMLTextShapeImportHelper.cxx | |
| parent | b270764558ab8467be5ee5a2cee8dacbf36e45ff (diff) | |
INTEGRATION: CWS swdrawpositioning (1.9.284); FILE MERGED
2004/06/01 11:44:26 od 1.9.284.5: #i26791# - correct syntax error
2004/06/01 11:29:02 od 1.9.284.4: #i26791# <XMLTextShapeImportHelper::addShape(..)> - allow all anchor types
2004/06/01 11:24:54 od 1.9.284.3: #i26791# - undo changes of revisions 1.9.284.2 and 1.9.284.1
2004/05/03 16:20:50 od 1.9.284.2: #i26791# class <XMLTextShapeImportHelper> - extension for the import of
group shapes.
2004/04/22 13:40:14 od 1.9.284.1: #i26791# - adjustments for the unification of the positioning of Writer
fly frames and drawing objects.
Diffstat (limited to 'xmloff/source/text/XMLTextShapeImportHelper.cxx')
| -rw-r--r-- | xmloff/source/text/XMLTextShapeImportHelper.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xmloff/source/text/XMLTextShapeImportHelper.cxx b/xmloff/source/text/XMLTextShapeImportHelper.cxx index 44a5ee8ca881..5d2b826b730f 100644 --- a/xmloff/source/text/XMLTextShapeImportHelper.cxx +++ b/xmloff/source/text/XMLTextShapeImportHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLTextShapeImportHelper.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: dvo $ $Date: 2001-09-21 16:27:53 $ + * last change: $Author: hjs $ $Date: 2004-06-28 13:54:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -160,13 +160,13 @@ void XMLTextShapeImportHelper::addShape( case XML_TOK_TEXT_FRAME_ANCHOR_TYPE: { TextContentAnchorType eNew; - if( XMLAnchorTypePropHdl::convert( rValue, - rImport.GetMM100UnitConverter(), eNew ) && - ( TextContentAnchorType_AT_PAGE == eNew || - TextContentAnchorType_AT_PARAGRAPH == eNew || - TextContentAnchorType_AS_CHARACTER == eNew || - TextContentAnchorType_AT_FRAME == eNew) ) + // OD 2004-06-01 #i26791# - allow all anchor types + if ( XMLAnchorTypePropHdl::convert( rValue, + rImport.GetMM100UnitConverter(), + eNew ) ) + { eAnchorType = eNew; + } } break; case XML_TOK_TEXT_FRAME_ANCHOR_PAGE_NUMBER: |