diff options
| author | Mark Hung <marklh9@gmail.com> | 2014-11-17 13:13:10 -0800 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-18 11:24:19 +0100 |
| commit | 29a91e4739496e1db5995fdece6a3ffa89e42774 (patch) | |
| tree | 89bef452fbbec414bd0c0187050ce4da3538720d /writerfilter | |
| parent | 24714f5eaa08016da3f8a74f4842b25eb37ad814 (diff) | |
Fix outline numbering for ooxml import filter.
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Reviewed on:
https://gerrit.libreoffice.org/12519
Change-Id: Ifd8a562bcee4f57cc99ed3215e6d8d6dd95216b0
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/NumberingManager.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 586b9a1fdc40..2d5618d179ca 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -147,11 +147,11 @@ void ListLevel::SetParaStyle( boost::shared_ptr< StyleSheetEntry > pStyle ) // AFAICT .docx spec does not identify which numberings or paragraph // styles are actually the ones to be used for outlines (chapter numbering), // it only kind of says somewhere that they should be named Heading1 to Heading9. - const OUString styleId = pStyle->sStyleIdentifierD; - m_outline = ( styleId.getLength() == RTL_CONSTASCII_LENGTH( "Heading1" ) - && styleId.match( "Heading", 0 ) - && styleId[ RTL_CONSTASCII_LENGTH( "Heading" ) ] >= '1' - && styleId[ RTL_CONSTASCII_LENGTH( "Heading" ) ] <= '9' ); + const OUString styleId= pStyle->sConvertedStyleName; + m_outline = ( styleId.getLength() == RTL_CONSTASCII_LENGTH( "Heading 1" ) + && styleId.match( "Heading ", 0 ) + && styleId[ RTL_CONSTASCII_LENGTH( "Heading " ) ] >= '1' + && styleId[ RTL_CONSTASCII_LENGTH( "Heading " ) ] <= '9' ); } sal_Int16 ListLevel::GetParentNumbering( const OUString& sText, sal_Int16 nLevel, |