[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - unotools/source

Stephan Bergmann sbergman at redhat.com
Tue Nov 12 04:12:55 PST 2013


 unotools/source/config/securityoptions.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2ee3782d5f21c9dc3fcc52072160e4f857691e97
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Nov 11 10:31:33 2013 +0100

    Fix CompareIgnoreCaseToAscii -> matchIgnoreAsciiCaseAsciiL regression
    
    ...introduced with 19ebc215d19ed9c7c5c6fdabf2f4acd5af02cbc4 "INTEGRATION: CWS
    ineturl1: #i34006# modify INetURLObject to use rtl::OUString and
    rtl::OUStringBuffer," where String::CompareIgnoreCaseToAscii returns
    StringCompare but rtl::OUString::matchIgnoreAsciiCaseAsciiL return sal_Bool.
    
    Change-Id: I009bd6f606850f4e971fda4a1b468e7b0d102685
    Reviewed-on: https://gerrit.libreoffice.org/6635
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx
index cd0e6c7..153004f 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -880,7 +880,7 @@ sal_Bool SvtSecurityOptions_Impl::IsSecureURL(  const   OUString&   sURL    ,
 
     // All other URLs must checked in combination with referer and internal information about security
     if ( (aProtocol != INET_PROT_MACRO && aProtocol !=  INET_PROT_SLOT) ||
-         aURL.GetMainURL( INetURLObject::NO_DECODE ).matchIgnoreAsciiCaseAsciiL( "macro:///", 9 ) == 0)
+         aURL.GetMainURL( INetURLObject::NO_DECODE ).matchIgnoreAsciiCaseAsciiL( "macro:///", 9 ) )
     {
         // security check only for "macro" ( without app basic ) or "slot" protocols
         bState = sal_True;


More information about the Libreoffice-commits mailing list