diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-04-06 12:41:02 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-04-06 12:41:02 +0000 |
| commit | 91d4cd81fb7c1718edaafa886902a2748994163b (patch) | |
| tree | 719fe5cce78326c8dc1d40071e2f366b8269ea32 /xmloff | |
| parent | fe112b9cae8067358b710c735454d1930da45736 (diff) | |
INTEGRATION: CWS swqbf59 (1.15.94); FILE MERGED
2006/03/21 14:06:36 ama 1.15.94.1: Fix #i61399#: Robust against wrong numbering style ("Bullet") in footnote configuration
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx index 1a31cf4c7873..e727f9190d85 100644 --- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx @@ -4,9 +4,9 @@ * * $RCSfile: XMLFootnoteConfigurationImportContext.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: rt $ $Date: 2005-09-09 15:01:44 $ + * last change: $Author: vg $ $Date: 2006-04-06 13:41:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -480,6 +480,11 @@ void XMLFootnoteConfigurationImportContext::ProcessSettings( sal_Int16 nNumType = NumberingType::ARABIC; GetImport().GetMM100UnitConverter().convertNumFormat( nNumType, sNumFormat, sNumSync ); + // #i61399: Corrupt file? It contains "Bullet" as numbering style for footnotes. + // Okay, even it seems to be corrupt, we will oversee this and set the style to ARABIC + if( NumberingType::CHAR_SPECIAL == nNumType ) + nNumType = NumberingType::ARABIC; + aAny <<= nNumType; rConfig->setPropertyValue(sPropertyNumberingType, aAny); |