diff options
| author | Noel Power <noel.power@suse.com> | 2012-12-13 17:32:00 +0000 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2012-12-13 17:34:10 +0000 |
| commit | 5deba0e70c9287e6e933df458c21cc3e72f3aa70 (patch) | |
| tree | 26c56cdc00e36f9a83d68bb1e0fcf6066c2c56a0 /oox | |
| parent | 64f98aa1f492911c6ce1b76c394bd87abee330a2 (diff) | |
fix fdo#58237 import hyperlinks for shapes in xlsx documents
Change-Id: I9c64c0f4d1eb8533b65f35d5e85e1ab4881a2b67
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/inc/oox/core/relations.hxx | 2 | ||||
| -rw-r--r-- | oox/source/core/relations.cxx | 6 | ||||
| -rw-r--r-- | oox/source/drawingml/hyperlinkcontext.cxx | 5 |
3 files changed, 13 insertions, 0 deletions
diff --git a/oox/inc/oox/core/relations.hxx b/oox/inc/oox/core/relations.hxx index f84044862d34..94b990858fd4 100644 --- a/oox/inc/oox/core/relations.hxx +++ b/oox/inc/oox/core/relations.hxx @@ -79,6 +79,8 @@ public: /** Returns the external target of the relation with the passed relation identifier. */ ::rtl::OUString getExternalTargetFromRelId( const ::rtl::OUString& rRelId ) const; + /** Returns the internal target of the relation with the passed relation identifier. */ + ::rtl::OUString getInternalTargetFromRelId( const ::rtl::OUString& rRelId ) const; /** Returns the full fragment path for the target of the passed relation. */ ::rtl::OUString getFragmentPathFromRelation( const Relation& rRelation ) const; diff --git a/oox/source/core/relations.cxx b/oox/source/core/relations.cxx index 501f515ed410..c49fe6320bf4 100644 --- a/oox/source/core/relations.cxx +++ b/oox/source/core/relations.cxx @@ -83,6 +83,12 @@ OUString Relations::getExternalTargetFromRelId( const OUString& rRelId ) const return (pRelation && pRelation->mbExternal) ? pRelation->maTarget : OUString(); } +OUString Relations::getInternalTargetFromRelId( const OUString& rRelId ) const +{ + const Relation* pRelation = getRelationFromRelId( rRelId ); + return (pRelation && !pRelation->mbExternal) ? pRelation->maTarget : OUString(); +} + OUString Relations::getFragmentPathFromRelation( const Relation& rRelation ) const { // no target, no fragment path diff --git a/oox/source/drawingml/hyperlinkcontext.cxx b/oox/source/drawingml/hyperlinkcontext.cxx index f2d715cee1e4..6da4db30062f 100644 --- a/oox/source/drawingml/hyperlinkcontext.cxx +++ b/oox/source/drawingml/hyperlinkcontext.cxx @@ -49,6 +49,11 @@ HyperLinkContext::HyperLinkContext( ContextHandler& rParent, OSL_TRACE("OOX: URI href %s", OUStringToOString (sHref, RTL_TEXTENCODING_UTF8).pData->buffer); sURL = getFilter().getAbsoluteUrl( sHref ); } + else + { + // not sure if we also need to set sHref to the internal target + sURL = getRelations().getInternalTargetFromRelId( aRelId ); + } } OUString sTooltip = xAttributes->getOptionalValue( R_TOKEN( tooltip ) ); if ( !sTooltip.isEmpty() ) |