summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2012-12-13 17:04:58 +0000
committerNoel Power <noel.power@suse.com>2012-12-13 17:04:58 +0000
commit45b448b202b87ef66812d25c69e308f405ac221e (patch)
tree3b82f46ce35fca56195c049314803313ed68adf7 /oox
parent70b960b966d36b1cb12bfb0c71d093fa0c5a3288 (diff)
Revert "fix fdo#58237 import hyperlinks for shapes in xlsx documents"
Diffstat (limited to 'oox')
-rw-r--r--oox/inc/oox/core/relations.hxx2
-rw-r--r--oox/source/core/relations.cxx6
-rw-r--r--oox/source/drawingml/hyperlinkcontext.cxx4
3 files changed, 1 insertions, 11 deletions
diff --git a/oox/inc/oox/core/relations.hxx b/oox/inc/oox/core/relations.hxx
index 94b990858fd4..f84044862d34 100644
--- a/oox/inc/oox/core/relations.hxx
+++ b/oox/inc/oox/core/relations.hxx
@@ -79,8 +79,6 @@ 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 c49fe6320bf4..501f515ed410 100644
--- a/oox/source/core/relations.cxx
+++ b/oox/source/core/relations.cxx
@@ -83,12 +83,6 @@ 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 231b7f92d25c..f2d715cee1e4 100644
--- a/oox/source/drawingml/hyperlinkcontext.cxx
+++ b/oox/source/drawingml/hyperlinkcontext.cxx
@@ -44,12 +44,10 @@ HyperLinkContext::HyperLinkContext( ContextHandler& rParent,
{
OSL_TRACE("OOX: URI rId %s", OUStringToOString (aRelId, RTL_TEXTENCODING_UTF8).pData->buffer);
sHref = getRelations().getExternalTargetFromRelId( aRelId );
- OUString sExtHref = getRelations().getExternalTargetFromRelId( aRelId );
- sURL = getRelations().getInternalTargetFromRelId( aRelId );
if( !sHref.isEmpty() )
{
OSL_TRACE("OOX: URI href %s", OUStringToOString (sHref, RTL_TEXTENCODING_UTF8).pData->buffer);
- sURL = getFilter().getAbsoluteUrl( sExtHref );
+ sURL = getFilter().getAbsoluteUrl( sHref );
}
}
OUString sTooltip = xAttributes->getOptionalValue( R_TOKEN( tooltip ) );