diff options
| author | Noel Power <noel.power@suse.com> | 2013-07-24 12:36:54 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2013-07-24 12:48:53 +0100 |
| commit | 7574e9dcddb8ade6c31f1930d400fc231ff72b20 (patch) | |
| tree | 532ef98c8b22dd5bda4f33c6e04d366b40609b3e | |
| parent | 49d077b80c15ec9d069435da08bbfe38cdd57c5a (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
(cherry picked from commit 40dd3d6e4ed8ed6a2f1c3f953955f9932c0c95ce)
| -rw-r--r-- | sc/source/filter/excel/xecontent.cxx | 9 |
1 files 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 ) { |