[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sc/source

[Caolán McNamara (via logerrit)]

 sc/source/filter/excel/xecontent.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 778359cceebb5aa60db05a44106868e855b6fcfc
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jul 17 09:06:39 2019 +0100
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Thu Jul 18 12:03:32 2019 +0200

    crashtesting: assert on export of fdo63407-3.ods to xls
    
    since...
    
    commit 3cdc1b35b9d86bcfa1277e3e94925ae7b18b8fde
    Date:   Tue Jul 2 10:07:24 2019 +0200
    
        tdf#126177 XLSX export: fix hyperlinks to documents
    
    Change-Id: Id5aaaab760a53b1e996d5d47c7477d77ce1d4efc
    Reviewed-on: https://gerrit.libreoffice.org/75774
    Tested-by: Jenkins
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 3237ff1fca75..6cdd0ad7ad27 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -447,7 +447,7 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot& rRoot, const SvxURLField& rU
         mnFlags |= EXC_HLINK_MARK;
 
         OUString location = XclXmlUtils::ToOUString(*mxTextMark);
-        if (msTarget.endsWith(location))
+        if (!location.isEmpty() && msTarget.endsWith("#" + location))
             msTarget = msTarget.copy(0, msTarget.getLength() - location.getLength() - 1);
     }