summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2012-08-08 18:07:03 +0200
committerMiklos Vajna <vmiklos@suse.cz>2012-08-08 18:12:06 +0200
commit9eb05aa6883ea41fb1d1dad2f7f1870e8e63ce32 (patch)
treeff9566074ac089df639660fb027d6fd64eb090b7
parent848e9fe2740d6192d98a4b966a3c3304c1cd6403 (diff)
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
-rw-r--r--sw/source/filter/ww1/fltshell.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index 5669c8692477..a1e6d011104a 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);
}
}