From 7574e9dcddb8ade6c31f1930d400fc231ff72b20 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Wed, 24 Jul 2013 12:36:54 +0100 Subject: followup fix for bnc#823935 exported xlsx causes errors for mso2007 previously we added 'file://' scheme to hyperlink urls detected as SMB but.. this is just how linux detects those windows share urls, on windows those urls are detected simply as FILE urls. So... we need to add the scheme if either FILE or SMB ( basically just relax the patch a little ) Change-Id: Ie9a2b0c9e297ee08352db88ad9a21583978dbe3d (cherry picked from commit 40dd3d6e4ed8ed6a2f1c3f953955f9932c0c95ce) --- sc/source/filter/excel/xecontent.cxx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index ce22d557d9fe..48fc2155d1e5 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -395,12 +395,9 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot& rRoot, const SvxURLField& rU mxRepr.reset( new String( aFileName ) ); msTarget = XclXmlUtils::ToOUString( aLink ); - if( eProtocol == INET_PROT_SMB ) - { - // ooxml expects the file:/// part appended ( or at least - // ms2007 does, ms2010 is more tolerant ) - msTarget = "file:///" + msTarget; - } + // ooxml expects the file:/// part appended ( or at least + // ms2007 does, ms2010 is more tolerant ) + msTarget = "file:///" + msTarget; } else if( eProtocol != INET_PROT_NOT_VALID ) { -- cgit