sw/source/filter/ww1/fltshell.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 9eb05aa6883ea41fb1d1dad2f7f1870e8e63ce32 Author: Miklos Vajna <vmik...@suse.cz> Date: Wed Aug 8 18:07:03 2012 +0200 n#774681 SwFltControlStack::NewAttr don't extend font name / size attributes Regression from commit b3cee382, the bugdoc is an example of why those can't be optimized with the current method. (Yes, it is somewhat special, after a resave in Word, the bug is no longer there.) Change-Id: I4b5e82b13242726d6df47c447642ca8916aa6f31 diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index 5669c86..a1e6d01 100644 --- a/sw/source/filter/ww1/fltshell.cxx +++ b/sw/source/filter/ww1/fltshell.cxx @@ -223,7 +223,7 @@ namespace return (pExtendCandidate && !pExtendCandidate->bConsumedByField && //potentially more, but lets keep it simple - (isPARATR_LIST(rAttr.Which()) || isCHRATR(rAttr.Which())) && + (isPARATR_LIST(rAttr.Which()) || (isCHRATR(rAttr.Which()) && rAttr.Which() != RES_CHRATR_FONT && rAttr.Which() != RES_CHRATR_FONTSIZE)) && *(pExtendCandidate->pAttr) == rAttr); } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits