[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source

[Michael Stahl]

 sw/source/core/doc/docfly.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9428ec8dc7f44d465a5b9744b9ed95ce02adf104
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue May 27 11:00:14 2014 +0200

    fdo#79236: sw: Undo of changing style crashes on invalid item (-1)
    
    Change-Id: Ie0b0791722a0ca8d75b7981362661be0c9706c6d
    (cherry picked from commit 732eee2de4d0579eda69fe0ebfa361180fa35456)

diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index e306eb8..cd5162c 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -431,6 +431,8 @@ void SwDoc::CheckForUniqueItemForLineFillNameOrIndex(SfxItemSet& rSet)
 
     for(const SfxPoolItem* pItem = aIter.FirstItem(); pItem; pItem = aIter.NextItem())
     {
+        if (IsInvalidItem(pItem))
+            continue;
         const SfxPoolItem* pResult = pItem;
 
         switch(pItem->Which())