Author: af
Date: Mon Mar 31 16:08:32 2014
New Revision: 1583360
URL: http://svn.apache.org/r1583360
Log:
i124461: Allow slightly larger nesting depth of SetupEntry call (merged from
branch AOO410).
Modified:
openoffice/trunk/ (props changed)
openoffice/trunk/main/sot/source/sdstor/stgdir.cxx
Propchange: openoffice/trunk/
------------------------------------------------------------------------------
Merged /openoffice/branches/AOO410:r1583349
Modified: openoffice/trunk/main/sot/source/sdstor/stgdir.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sot/source/sdstor/stgdir.cxx?rev=1583360&r1=1583359&r2=1583360&view=diff
==============================================================================
--- openoffice/trunk/main/sot/source/sdstor/stgdir.cxx (original)
+++ openoffice/trunk/main/sot/source/sdstor/stgdir.cxx Mon Mar 31 16:08:32 2014
@@ -846,7 +846,7 @@ void StgDirStrm::SetupEntry (
const sal_Int32 nEntryCount,
const sal_Int32 nDepth)
{
- if (nDepth >= nEntryCount)
+ if (nDepth > nEntryCount)
{
// Tree grew higher than there are different nodes. Looks like
// something is wrong with the file. Return now to avoid
