summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-10-03 10:07:41 +0200
committerCaolán McNamara <caolanm@redhat.com>2016-10-04 11:21:34 +0000
commit46d989cf31ce361515f6267adcc59455d094ad13 (patch)
treef016ee313ea0c8b77b9ed3a63855126c0cdeb1e3
parent7bc09f32ce86c6ed0df00ad72451b41204e0162f (diff)
fix bug in DocumentSettings::LoadList when testing result of lastIndexOf
managed to trigger it in a flat ODF test document of mine. I suspect that this might have something to do with one of the various conversions to OUString, the old String APIs might have returned -LARGE_INTEGER instead of -1. code was introduced in commit cbcfda9b2079ea4ef83b2a42828408b5f70f7692 Author: Michael Meeks <michael.meeks@novell.com> Date: Mon Sep 5 17:22:24 2011 +0100 add XPropertyList enum, factory, and associated cleanup Change-Id: I39b4715cc12ef6366fe0466786589ef198602a98 Reviewed-on: https://gerrit.libreoffice.org/29473 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 9f0096d934fcdec6cd55e32a15fd438f628f894b) Reviewed-on: https://gerrit.libreoffice.org/29480 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 85bd2c1145e23b67aafdfcc9c2ca8d720194fe97) Reviewed-on: https://gerrit.libreoffice.org/29512 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sd/source/ui/unoidl/UnoDocumentSettings.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index d3b506bde4fb..c2166f62f304 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -233,7 +233,7 @@ bool DocumentSettings::LoadList( XPropertyListType t, const OUString &rInPath,
sal_Int32 nSlash = rInPath.lastIndexOf('/');
OUString aPath, aName;
- if (nSlash < -1)
+ if (nSlash < 0)
aName = rInPath;
else {
aName = rInPath.copy( nSlash + 1 );