sc/source/filter/excel/xecontent.cxx | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 40dd3d6e4ed8ed6a2f1c3f953955f9932c0c95ce
Author: Noel Power <noel.po...@suse.com>
Date: Wed Jul 24 12:36:54 2013 +0100
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
diff --git a/sc/source/filter/excel/xecontent.cxx
b/sc/source/filter/excel/xecontent.cxx
index 8fdb35b..19f2ecc 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 )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
