summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorJacobo Aragunde Pérez <jaragunde@igalia.com>2013-12-04 10:17:14 +0100
committerJacobo Aragunde Pérez <jaragunde@igalia.com>2013-12-04 18:52:03 +0100
commit983002475fba1879fd00c75417342be55153b797 (patch)
tree1ee00cebc88b45b7a8f49244a65745f8a087083a /sw
parent458b89b303145085a1745fe408f0e860686d7220 (diff)
fdo#64232: Save font theme attributes in rPrDefault
The default values for run properties are stored in the styles.xml file, in the <w:rPrDefault> tag. The process of this tag is slightly different from normal <rPr> tags. First, we fix DocxAttributeOutput::OutputDefaultItem to be able to output the contents of the character grab bag. Second, we fix StyleSheetTable::applyDefaults to read the property values using the GetPropertyValue method instead of using an iterator directly, because the former creates the grab bags and returns them as properties while the latter returns all the properties individually, including those that should be inside a grab bag. Change-Id: I91254ba20fd9ca5a1b02afb587f52a449a215d6c
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index c8b4b9b2880d..6e9cf53954d6 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2634,6 +2634,9 @@ void DocxAttributeOutput::OutputDefaultItem(const SfxPoolItem& rHt)
case RES_PARATR_SNAPTOGRID:
bMustWrite = !static_cast< const SvxParaGridItem& >(rHt).GetValue();
break;
+ case RES_CHRATR_GRABBAG:
+ bMustWrite = true;
+ break;
default:
SAL_INFO("sw.ww8", "Unhandled SfxPoolItem with id " << rHt.Which() );