diff options
author | Oliver Bolte <obo@openoffice.org> | 2004-09-09 09:48:27 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2004-09-09 09:48:27 +0000 |
commit | a15cbc1ec87c2255effd207e2b4ef0594efb9c89 (patch) | |
tree | e00cf0391274bc2c0010055c27d5e54ff5c9d002 /xmloff | |
parent | 431844199194efe316789cd43caf70ba8cf6acc7 (diff) |
INTEGRATION: CWS swqbugfixes06 (1.8.40); FILE MERGED
2004/08/24 14:22:06 od 1.8.40.1: #i33242# - correct handling of anchor position of at-character anchored
Writer fly frames and drawing objects of type 'Text'.
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/text/XMLTextFrameHyperlinkContext.cxx | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx index a067a3088d..6162c57412 100644 --- a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx +++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLTextFrameHyperlinkContext.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: rt $ $Date: 2004-07-13 08:38:19 $ + * last change: $Author: obo $ $Date: 2004-09-09 10:48:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -176,7 +176,7 @@ SvXMLImportContext *XMLTextFrameHyperlinkContext::CreateChildContext( { if( IsXMLToken( rLocalName, XML_FRAME ) ) pTextFrameContext = new XMLTextFrameContext( GetImport(), nPrefix, - rLocalName, xAttrList, + rLocalName, xAttrList, eDefaultAnchorType ); } @@ -217,3 +217,18 @@ Reference < XTextContent > XMLTextFrameHyperlinkContext::GetTextContent() const return xTxt; } +// --> OD 2004-08-24 #33242# +Reference < drawing::XShape > XMLTextFrameHyperlinkContext::GetShape() const +{ + Reference < drawing::XShape > xShape; + if( xFrameContext.Is() ) + { + SvXMLImportContext *pContext = &xFrameContext; + xShape = PTR_CAST( XMLTextFrameContext, pContext )->GetShape(); + } + + return xShape; +} +// <-- + + |