diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-07-01 23:48:59 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-07-01 23:58:50 +0200 |
| commit | 0520eaf9e661abddadf9a21cfbeab37b0b85dd68 (patch) | |
| tree | 46dbd556513a2dfa91b5679bfbd287dbef8c13de | |
| parent | f74e6dd07e971d25a610edbe0197b98984dbf353 (diff) | |
fdo#65650: fix Writer ODF import of list style with bullets and color
For such lists xmloff tries to set a BulletColor property but
SwXNumberingRules::SetNumberingRuleByIndex() throws a RuntimeException
and does not set any of the list properties on the NumRule.
(regression from abf18610998aa8330f8330f1d769508e47ef5b20)
Change-Id: Id3e80ee1ed67497786258a1096bc5c8dec90ce21
| -rw-r--r-- | sw/source/core/unocore/unosett.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 4f8e08375bbf..31dfa2ddc709 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -1658,8 +1658,6 @@ void SwXNumberingRules::SetNumberingRuleByIndex( const sal_uInt16 NotInChapterLast = 23; const sal_uInt16 InChapterFirst = 24; const sal_uInt16 InChapterLast = 24; - const sal_uInt16 IgnoredFirst = 25; - const sal_uInt16 IgnoredLast = 26; const beans::PropertyValue* pPropArray = rProperties.getConstArray(); PropValDataArr aPropertyValues; @@ -1670,8 +1668,6 @@ void SwXNumberingRules::SetNumberingRuleByIndex( bExcept = true; for(sal_uInt16 j = 0; j < SAL_N_ELEMENTS( aNumPropertyNames ); j++) { - if( j >= IgnoredFirst && j <= IgnoredLast ) - continue; if( pDocShell && j >= NotInChapterFirst && j <= NotInChapterLast ) continue; if( !pDocShell && j >= InChapterFirst && j <= InChapterLast ) @@ -2090,7 +2086,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( break; case 25: // BulletRelSize - unsupported - only available in Impress break; - case 26: // ignored too + case 26: // BulletColor - ignored too break; } } |