[Bug 119657] [From Symphony] Additional dot appear after the numbering.

[bu...@apache.org]

https://issues.apache.org/ooo/show_bug.cgi?id=119657

wujinlong@gmail.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
  Attachment #79452|                            |review?
              Flags|                            |

--- Comment #2 from wujinlong@gmail.com ---
Created attachment 79452
  --> https://issues.apache.org/ooo/attachment.cgi?id=79452&action=edit
patch

I had a fix for this bug. 

The problem is about an AbstracNum references to a style, which references to
another Num. We don't have code to handle such case in Aoo.

My solution is,
1) During parsing of the styles.xml, if one style has numId property, save it.
(Changes in PropertyMap.hxx, DomainMapper.cxx)

2) During parsing of the numbering.xml, if an AbstractNum has a style linked,
find the style and get the Num the style uses, then use this Num to find the
actual AbstractNum that should be used. 
(Changes in NumberingManager.hxx, NumberingManager.cxx)

Below is XML examples shows this use case. 

In styles.xml, there is a style named 'style1', which uses Num '15'. 

In numbering.xml, the Num '16' uses AbstractNum '1', which has a style linked
to 'style1'. The Num '15' uses AbstractNum '14'.

In document.xml, paragraph uses numbering '16', so it actually should uses
numbering '15' (AbstractNum '14').

------------- styles.xml -------------
<w:style w:type="numbering" w:customStyle="1" w:styleId="Style1">
    <w:name w:val="Style1"/>
    <w:basedOn w:val="NoList"/>
    <w:rsid w:val="00F95E84"/>
    <w:pPr>
        <w:numPr>
            <w:numId w:val="15"/>
        </w:numPr>
    </w:pPr>
</w:style>
------------- styles.xml -------------

------------- numbering.xml -------------
<w:abstractNum w:abstractNumId="1">
    <w:nsid w:val="1D660BDF"/>
    <w:multiLevelType w:val="multilevel"/>
    <w:tmpl w:val="04090025"/>
    <w:numStyleLink w:val="Style1"/>
</w:abstractNum>

<w:num w:numId="15">
    <w:abstractNumId w:val="14"/>
</w:num>
<w:num w:numId="16">
    <w:abstractNumId w:val="1"/>
</w:num>
------------- numbering.xml -------------

------------- document.xml -------------
<w:p w:rsidR="004D49F0" w:rsidRDefault="007A33C6" w:rsidP="00F95E84">
    <w:pPr>
        <w:pStyle w:val="Heading1"/>
        <w:numPr>
            <w:ilvl w:val="0"/>
            <w:numId w:val="16"/>
        </w:numPr>
    </w:pPr>
    <w:r>
        <w:t>L</w:t>
    </w:r>
    <w:r w:rsidR="004D49F0">
        <w:t>ist style</w:t>
    </w:r>
</w:p>
------------- document.xml -------------

-- 
You are receiving this mail because:
You are the assignee for the bug.