sw/source/core/undo/rolbck.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit ed81bf39dd3431d28860fed6a2d4e8814126cc61
Author: HaidongWu <personal...@hotmail.com>
Date: Wed Mar 9 11:28:14 2016 +0800
tdf#98512 Fix the Undo action of insert an input field.
Change-Id: Ia3214564f78a300bfd3f2e6de677fcdff39e107b
Reviewed-on: https://gerrit.libreoffice.org/23055
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.spe...@cib.de>
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index e990009..5c9e684 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -1392,7 +1392,9 @@ bool SwRegHistory::InsertItems( const SfxItemSet& rSet,
pTextNode->GetpSwpHints()->DeRegister();
}
- if ( m_pHistory && bInserted )
+ // if (m_pHistory->Count()) return true, then it shouldn't to be pushed
into
+ // the m_pHistory->m_SwpHstry again, or Undo Action will do the same thing
twice
+ if ( m_pHistory && bInserted && !m_pHistory->Count() )
{
SwHistoryHint* pNewHstr = new SwHistoryResetAttrSet( rSet,
pTextNode->GetIndex(), nStart, nEnd );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
