diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-08-08 18:07:03 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-09-28 14:12:28 +0200 |
| commit | dfaa2a0274c301bdc658c08caac8234549428a77 (patch) | |
| tree | 77f3917af20364bd53b1e896fdd51774e5287362 /sw | |
| parent | 9837e432eae2a40bf67a68440bd236c8ab6a4f61 (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
(cherry picked from commit 9eb05aa6883ea41fb1d1dad2f7f1870e8e63ce32)
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww1/fltshell.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index 51e0a65ab885..deebd6d20254 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); } } |