diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-07-25 13:58:12 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-07-25 14:04:56 -0400 |
commit | 0915d82bec64fbf597a3778bcc314392e00a4cca (patch) | |
tree | 00b628cd1d6735240980467b5943539801312c41 /xmloff | |
parent | WaE: extern prototype in main file without definition (diff) | |
download | core-0915d82bec64fbf597a3778bcc314392e00a4cca.tar.gz core-0915d82bec64fbf597a3778bcc314392e00a4cca.zip |
Document what's in the type of the map entry.
And organize xmltypes.hxx a bit to make it easier to follow. Also
rename MID_FLAG_PROPERTY_MAY_EXCEPT to MID_FLAG_PROPERTY_MAY_THROW.
Change-Id: If18f07159a613555cf031bea5e07c04c7c45abec
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/style/PageMasterStyleMap.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/xmlimppr.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx index 92c6ee68fde9..e65da4402c45 100644 --- a/xmloff/source/style/PageMasterStyleMap.cxx +++ b/xmloff/source/style/PageMasterStyleMap.cxx @@ -45,7 +45,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] = PLMAP( "Height", XML_NAMESPACE_FO, XML_PAGE_HEIGHT, XML_TYPE_MEASURE, 0 ), PLMAP( "NumberingType", XML_NAMESPACE_STYLE, XML_NUM_FORMAT, XML_PM_TYPE_NUMFORMAT | MID_FLAG_MERGE_PROPERTY, 0 ), PLMAP( "NumberingType", XML_NAMESPACE_STYLE, XML_NUM_LETTER_SYNC, XML_PM_TYPE_NUMLETTERSYNC, 0 ), - PLMAP( "PrinterPaperTray", XML_NAMESPACE_STYLE, XML_PAPER_TRAY_NAME, XML_TYPE_STRING | MID_FLAG_PROPERTY_MAY_EXCEPT, 0 ), + PLMAP( "PrinterPaperTray", XML_NAMESPACE_STYLE, XML_PAPER_TRAY_NAME, XML_TYPE_STRING | MID_FLAG_PROPERTY_MAY_THROW, 0 ), PLMAP( "IsLandscape", XML_NAMESPACE_STYLE, XML_PRINT_ORIENTATION, XML_PM_TYPE_PRINTORIENTATION, 0 ), PLMAP( "TopMargin", XML_NAMESPACE_FO, XML_MARGIN, XML_TYPE_MEASURE, CTF_PM_MARGINALL ), PLMAP( "TopMargin", XML_NAMESPACE_FO, XML_MARGIN_TOP, XML_TYPE_MEASURE, CTF_PM_MARGINTOP ), diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx index 9e2d07052800..d0a12ea58324 100644 --- a/xmloff/source/style/xmlimppr.cxx +++ b/xmloff/source/style/xmlimppr.cxx @@ -489,7 +489,7 @@ bool SvXMLImportPropertyMapper::_FillPropertySet( { // illegal value: check whether this property is // allowed to throw this exception - if ( 0 == ( nPropFlags & MID_FLAG_PROPERTY_MAY_EXCEPT ) ) + if ( 0 == ( nPropFlags & MID_FLAG_PROPERTY_MAY_THROW ) ) { Sequence<OUString> aSeq(1); aSeq[0] = rPropName; |