Kaydet (Commit) 0520eaf9 authored tarafından Michael Stahl's avatar Michael Stahl

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 abf18610)

Change-Id: Id3e80ee1ed67497786258a1096bc5c8dec90ce21
üst f74e6dd0
...@@ -1658,8 +1658,6 @@ void SwXNumberingRules::SetNumberingRuleByIndex( ...@@ -1658,8 +1658,6 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
const sal_uInt16 NotInChapterLast = 23; const sal_uInt16 NotInChapterLast = 23;
const sal_uInt16 InChapterFirst = 24; const sal_uInt16 InChapterFirst = 24;
const sal_uInt16 InChapterLast = 24; const sal_uInt16 InChapterLast = 24;
const sal_uInt16 IgnoredFirst = 25;
const sal_uInt16 IgnoredLast = 26;
const beans::PropertyValue* pPropArray = rProperties.getConstArray(); const beans::PropertyValue* pPropArray = rProperties.getConstArray();
PropValDataArr aPropertyValues; PropValDataArr aPropertyValues;
...@@ -1670,8 +1668,6 @@ void SwXNumberingRules::SetNumberingRuleByIndex( ...@@ -1670,8 +1668,6 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
bExcept = true; bExcept = true;
for(sal_uInt16 j = 0; j < SAL_N_ELEMENTS( aNumPropertyNames ); j++) for(sal_uInt16 j = 0; j < SAL_N_ELEMENTS( aNumPropertyNames ); j++)
{ {
if( j >= IgnoredFirst && j <= IgnoredLast )
continue;
if( pDocShell && j >= NotInChapterFirst && j <= NotInChapterLast ) if( pDocShell && j >= NotInChapterFirst && j <= NotInChapterLast )
continue; continue;
if( !pDocShell && j >= InChapterFirst && j <= InChapterLast ) if( !pDocShell && j >= InChapterFirst && j <= InChapterLast )
...@@ -2090,7 +2086,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( ...@@ -2090,7 +2086,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
break; break;
case 25: // BulletRelSize - unsupported - only available in Impress case 25: // BulletRelSize - unsupported - only available in Impress
break; break;
case 26: // ignored too case 26: // BulletColor - ignored too
break; break;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment