diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-07 12:27:06 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-07 12:27:06 +0000 |
| commit | 5f7a740767594cded0f80deb20f106f88cd0d1fb (patch) | |
| tree | 59ed1045520c37b462e377cd8d2bcd0f3cf54cab /xmloff | |
| parent | dba569f93e4f7070b2baef9580327060bcc693ba (diff) | |
INTEGRATION: CWS impress146 (1.67.54); FILE MERGED
2008/06/30 13:57:23 sj 1.67.54.2: added newline at end of file
2008/06/25 14:09:12 cl 1.67.54.1: #i91056# import shapes inside draw:a elements
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/shapeimport.cxx | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 31099f9639f6..030e365a7c51 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: shapeimport.cxx,v $ - * $Revision: 1.67 $ + * $Revision: 1.68 $ * * This file is part of OpenOffice.org. * @@ -30,10 +30,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "unointerfacetouniqueidentifiermapper.hxx" + #include <tools/debug.hxx> + +#include <com/sun/star/text/PositionLayoutDir.hpp> #include <com/sun/star/chart/XChartDocument.hpp> +#include "unointerfacetouniqueidentifiermapper.hxx" + #include <list> #ifndef _XMLOFF_SHAPEIMPORT_HXX @@ -49,9 +53,7 @@ #include "ximp3dscene.hxx" #include "ximp3dobject.hxx" #include "ximpgrp.hxx" -// --> OD 2004-10-28 #i28749#, #i36248# -#include <com/sun/star/text/PositionLayoutDir.hpp> -// <-- +#include "ximplink.hxx" #include <map> #include <vector> @@ -296,6 +298,7 @@ static __FAR_DATA SvXMLTokenMapEntry aGroupShapeElemTokenMap[] = { XML_NAMESPACE_DRAW, XML_CUSTOM_SHAPE, XML_TOK_GROUP_CUSTOM_SHAPE }, { XML_NAMESPACE_OFFICE, XML_ANNOTATION, XML_TOK_GROUP_ANNOTATION }, + { XML_NAMESPACE_DRAW, XML_A, XML_TOK_GROUP_A }, XML_TOKEN_MAP_END }; @@ -826,12 +829,10 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateGroupChildContext( pContext = new SdXMLCustomShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False ); break; } -// case XML_TOK_GROUP_CUSTOM_SHAPE: -// { -// // draw:customshape -// pContext = new SdXMLCustomShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes ); -// break; -// } + case XML_TOK_GROUP_A: + { + return new SdXMLShapeLinkContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes ); + } // add other shapes here... default: return new SvXMLShapeContext( rImport, p_nPrefix, rLocalName, bTemporaryShape ); @@ -1385,3 +1386,8 @@ const rtl::Reference< XMLTableImport >& XMLShapeImportHelper::GetShapeTableImpor return mxShapeTableImport; } + +void SvXMLShapeContext::setHyperlink( const OUString& rHyperlink ) +{ + msHyperlink = rHyperlink; +} |