summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2013-12-10 11:46:24 +0100
committerMatúš Kukan <matus.kukan@collabora.com>2013-12-10 11:58:18 +0100
commit8af7f174bdd38d38e386901c76d63b65c4ce9f09 (patch)
tree1dc6cf098269209b3dc1e9ba738801bbe8ff370c
parentffc0181c840b90b3ee48bdd31f5787669a233cff (diff)
fdo#72037: Fix comparison of indexOf values after string conversion.
regression from 9daa4f31944e1b9510b092ab9fdd433984c85d10 Change-Id: I369a9a342984084f5269bcd9d829c42de9ac4a23 (cherry picked from commit 088756cb2d67442f7d422ca064ab1dcdb410411f)
-rw-r--r--sfx2/source/appl/appuno.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index edc0bc536ef1..50f8ee613697 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;