summaryrefslogtreecommitdiff
path: root/writerfilter/source/dmapper/PropertyIds.cxx
diff options
context:
space:
mode:
authorJacobo Aragunde Pérez <jaragunde@igalia.com>2014-03-19 17:10:24 +0100
committerJacobo Aragunde Pérez <jaragunde@igalia.com>2014-03-20 10:28:23 +0100
commit692fd140706c9366ee46c651813887c67d5b4a97 (patch)
treeb2218160872c437da6f6bcbbf9844aea05126a99 /writerfilter/source/dmapper/PropertyIds.cxx
parentf79f3e072c2ff2f4624c2ec4c577d400733584a5 (diff)
fdo#76327: only enclose the checkbox in the sdt block.
The exporter writes the sdt blocks enclosing an entire paragraph, but that's not the proper behaviour in all cases. The documents that mix checkboxes and text in the same paragraph export the text inside the sdt box and that's incorrect. We have added code to be able to write sdt blocks that enclose paragraphs or text runs, depending on the type of block. We have applied it to checkboxes now. There are two sets of properties in DocxAttributeOutput that store sdt properties for the text run and for the paragraph. We have modified the method WriteParagraphSdt to be generic enough to support both cases. To write the sdt block enclosing the text run we used parser marks. We have renamed the property id PROP_PARA_SDTPR to the more generic name PROP_SDTPR. Checkbox unit test was modified to match the new structure of the generated document. Change-Id: I81ffe0062e1a5f80fc4638f7ee454a9bc18e63ee
Diffstat (limited to 'writerfilter/source/dmapper/PropertyIds.cxx')
-rw-r--r--writerfilter/source/dmapper/PropertyIds.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx
index a26cdf9d93b9..8bdba4e404b3 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -387,7 +387,7 @@ OUString PropertyNameSupplier::GetName( PropertyIds eId ) const
case PROP_CHAR_NUMSPACING_TEXT_EFFECT : sName = "CharNumSpacingTextEffect"; break;
case PROP_CHAR_STYLISTICSETS_TEXT_EFFECT : sName = "CharStylisticSetsTextEffect"; break;
case PROP_CHAR_CNTXTALTS_TEXT_EFFECT : sName = "CharCntxtAltsTextEffect"; break;
- case PROP_PARA_SDTPR : sName = "ParaSdtPr"; break;
+ case PROP_SDTPR : sName = "SdtPr"; break;
}
::std::pair<PropertyNameMap_t::iterator,bool> aInsertIt =
m_pImpl->aNameMap.insert( PropertyNameMap_t::value_type( eId, sName ));