[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 2 commits - sfx2/source

[Matúš Kukan]

 sfx2/source/appl/appuno.cxx          |    2 +-
 sfx2/source/notify/eventsupplier.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7a282cda5eb8ce9d01b89cb0f28f925222023a2c
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Dec 10 11:51:55 2013 +0100

    Fix another string conversion regression.
    
    Change-Id: I8297fd60b7db057504260a2304ccce6358bb9776
    (cherry picked from commit a3f3fd00e4fb6beb70284902791ef9cbc3318659)

diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index d3095b0..3a12c9e 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -443,7 +443,7 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i
             {
                 sal_Int32 nHashPos = aScript.indexOf( '/', 8 );
                 sal_Int32 nArgsPos = aScript.indexOf( '(' );
-                if ( ( nHashPos != -1 ) && ( nHashPos < nArgsPos ) )
+                if ( ( nHashPos != -1 ) && ( nArgsPos == -1 || nHashPos < nArgsPos ) )
                 {
                     OUString aBasMgrName( INetURLObject::decode( aScript.copy( 8, nHashPos-8 ), INET_HEX_ESCAPE, INetURLObject::DECODE_WITH_CHARSET ) );
                     if ( aBasMgrName == "." )
commit 8af7f174bdd38d38e386901c76d63b65c4ce9f09
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Dec 10 11:46:24 2013 +0100

    fdo#72037: Fix comparison of indexOf values after string conversion.
    
    regression from 9daa4f31944e1b9510b092ab9fdd433984c85d10
    
    Change-Id: I369a9a342984084f5269bcd9d829c42de9ac4a23
    (cherry picked from commit 088756cb2d67442f7d422ca064ab1dcdb410411f)

diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index edc0bc5..50f8ee6 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -1855,7 +1855,7 @@ ErrCode SfxMacroLoader::loadMacro( const OUString& rURL, com::sun::star::uno::An
     ErrCode nErr = ERRCODE_NONE;
 
     // should a macro function be executed ( no direct API call)?
-    if ( -1 != nHashPos && nHashPos < nArgsPos )
+    if ( -1 != nHashPos && ( -1 == nArgsPos || nHashPos < nArgsPos ) )
     {
         // find BasicManager
         SfxObjectShell* pDoc = NULL;