summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2013-07-24 12:36:54 +0100
committerNoel Power <noel.power@suse.com>2013-07-24 12:41:45 +0100
commit40dd3d6e4ed8ed6a2f1c3f953955f9932c0c95ce (patch)
tree191c38a8620e3aa0d746a9ead4f4c9079e052feb
parent329125abb63061214897e4f215d41cfa4b13b4b0 (diff)
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
-rw-r--r--sc/source/filter/excel/xecontent.cxx9
1 files changed, 3 insertions, 6 deletions
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 8fdb35b14861..19f2ecc685ad 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -391,12 +391,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 )
{