[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-0' - sw/source
Michael Stahl
mstahl at redhat.com
Thu Jan 16 11:58:45 PST 2014
sw/source/core/txtnode/txtedt.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 134e8747e2bce391304c112e864c626680887d02
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jan 13 18:36:04 2014 +0100
fdo#72788: sw: fix infinite loop in SwTxtAttr::RstTxtAttr
The increment was erroneously moved into the else branch in commit
c1c5feaff453cfbb23c43f2b423201b883ff048d.
Change-Id: If71cb58967e215548aed5679da86af20de17a0f1
(cherry picked from commit 8c59c30153b8a67d9455d70a66b4a42c35120f97)
Reviewed-on: https://gerrit.libreoffice.org/7414
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit b8c6514b483edfcedb3ce546cdea726b83d418a5)
Reviewed-on: https://gerrit.libreoffice.org/7473
Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index e1eb5c3..ecd75e8 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -613,8 +613,8 @@ void SwTxtNode::RstTxtAttr(
}
}
}
- ++i;
}
+ ++i;
}
TryDeleteSwpHints();
More information about the Libreoffice-commits
mailing list