sw/source/core/undo/unattr.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
New commits: commit 183c317f01ccade1c7865e05e608ea7295c8d39e Author: Michael Stahl <mst...@redhat.com> Date: Wed Jul 29 23:59:43 2015 +0200 tdf#83223: sw: fix Undo of format change of conditional para style SwUndoFormatAttr was simply missing a case for RES_CONDTXTFMTCOLL. Handle it the same way as an oridnary paragraph style, which seems to work for me. Change-Id: Ib529beb1116633e4890d5b51df39da21de485db9 (cherry picked from commit 37e936996acb4a8329fad2ec73a35f66be446e90) Reviewed-on: https://gerrit.libreoffice.org/17428 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk> diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx index 8eec8e2..28f47fc 100644 --- a/sw/source/core/undo/unattr.cxx +++ b/sw/source/core/undo/unattr.cxx @@ -204,6 +204,7 @@ bool SwUndoFormatAttr::IsFormatInDoc( SwDoc* pDoc ) switch ( m_nFormatWhich ) { case RES_TXTFMTCOLL: + case RES_CONDTXTFMTCOLL: bFound = pDoc->GetTextFormatColls()->Contains( m_pFormat ); break; @@ -301,7 +302,9 @@ void SwUndoFormatAttr::RepeatImpl(::sw::RepeatContext & rContext) } break; - case RES_TXTFMTCOLL: { + case RES_TXTFMTCOLL: + case RES_CONDTXTFMTCOLL: + { SwTextNode *const pNd = rContext.GetRepeatPaM().GetNode().GetTextNode(); if( pNd ) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits