summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2013-06-24 11:47:55 +0100
committerNoel Power <noel.power@suse.com>2013-06-24 13:09:50 +0100
commit732640c353b39cff7a9d5b5906f8975102cbed11 (patch)
tree76e9d7f9fc8aeb0bcba204e5d05c65f7b627830a
parente4e9768e43b9c435036a0f0f3446688c9a5b8375 (diff)
fix for bnc#823935
window network drive urls on import get internall converted to SMB (so it appears anyway) when exported the file:/// that was on the target ( in the relId ) for the hyperlink is dropped. Apparently the scheme isn't necessary for the binary import. If one of these strange 'detected as smb' window shares are exported make sure we add the file:/// (cherry picked from commit 8e33e95500c2f5edc91e853024a5c0fff285fcce) Change-Id: Id62e1f4845bfbc610f73499881dc33d3d955923b
-rw-r--r--sc/source/filter/excel/xecontent.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index aa007b8d4fae..8fdb35b14861 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -391,6 +391,12 @@ 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;
+ }
}
else if( eProtocol != INET_PROT_NOT_VALID )
{