diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-07-01 23:48:59 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2013-07-08 13:21:33 +0000 |
commit | ba560864b61fdfee32018751335d638a6affe12f (patch) | |
tree | bc35721607a213973a422fa19612506bcf5bca9a | |
parent | ebbe6b781151428272a0a3235f5eefc42c06a82e (diff) |
fdo#65650: fix Writer ODF import of list style with bullets and colorlibreoffice-3-6-7
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
(cherry picked from commit 0520eaf9e661abddadf9a21cfbeab37b0b85dd68)
Reviewed-on: https://gerrit.libreoffice.org/4666
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Reviewed-by: Eike Rathke <erack@redhat.com>
-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 2b312a31b4f6..ed7a5c9e5d00 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -1670,8 +1670,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; @@ -1682,8 +1680,6 @@ void SwXNumberingRules::SetNumberingRuleByIndex( bExcept = sal_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 ) @@ -2102,7 +2098,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( break; case 25: // BulletRelSize - unsupported - only available in Impress break; - case 26: // ignored too + case 26: // BulletColor - ignored too break; } } |