editeng/source/editeng/editdoc.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 2813632238380e0bfe40c0e6404a07102cde1398
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jan 13 11:27:57 2015 +0000
debugging assert about unsorted properties on loading ooo59216-14.ods
Change-Id: I30e7dcddcce188edef0d2affb148a3dba6f62c1d
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index 85419c6..7ded8e7 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1322,6 +1322,7 @@ void ContentNode::ExpandAttribs( sal_Int32 nIndex,
sal_Int32 nNew, SfxItemPool&
// Start <= nIndex, End >= nIndex => Start=End=nIndex!
// if ( pAttrib->GetStart() == nIndex )
pAttrib->Expand( nNew );
+ bResort = true;
if ( pAttrib->GetStart() == 0 )
bExpandedEmptyAtIndexNull = true;
}
@@ -1455,7 +1456,10 @@ void ContentNode::CollapsAttribs( sal_Int32 nIndex,
sal_Int32 nDeleted, SfxItemP
// Special case: Attribute covers the area exactly
// => keep as empty Attribute.
if ( !pAttrib->IsFeature() && ( pAttrib->GetStart() == nIndex
) && ( pAttrib->GetEnd() == nEndChanges ) )
+ {
pAttrib->GetEnd() = nIndex; // empty
+ bResort = true;
+ }
else
bDelAttr = true;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
