• Miklos Vajna's avatar
    tdf#95376 DOCX import: fix incorrectly indented tab stops · 3915bf2d
    Miklos Vajna yazdı
    Regression from commit f4badd9a
    (tdf#92454 DOCX import: allow overriding para prop from num style in
    para style, 2015-09-22), the problem was yet another priority
    mishandling in the maze of various styles and indentation handling.
    
    In the tdf#92454 bugdoc, both a numbering-from-paragraph-style and a
    paragraph-style defined indentation, and Word preferred the numbering,
    while Writer preferred the paragraph style, that's why the import-time
    conversion was added.
    
    However, it turns out there is a 3rd source that's still not direct
    indentation formatting: a direct numbering. So the correct priority is:
    
    direct-ind > ind-from-num > ind-from-parastyle > ind-from-num-from-parastyle
    
    Which means in this case the indentation should not be set directly: the
    two conflicting value (ind-from-num and ind-from-parastyle) will be
    resolved correctly by Writer core.
    
    Given that we always first get the para style info, and only then the
    numbering, we just need to undo the conversion added for the other bug
    if we see a direct numbering, then both the old bugdoc and this new one
    will be handled properly.
    
    Change-Id: I09cc84605d5df6159da985ad069d46b580a53358
    3915bf2d
Adı
Son kayıt (commit)
Son güncelleme
..
inc Loading commit data...
qa Loading commit data...
sdi Loading commit data...
source Loading commit data...
uiconfig Loading commit data...
util Loading commit data...
AllLangResTarget_sw.mk Loading commit data...
CppunitTest_sw_docbookexport.mk Loading commit data...
CppunitTest_sw_filters_test.mk Loading commit data...
CppunitTest_sw_globalfilter.mk Loading commit data...
CppunitTest_sw_htmlexport.mk Loading commit data...
CppunitTest_sw_htmlimport.mk Loading commit data...
CppunitTest_sw_layout_test.mk Loading commit data...
CppunitTest_sw_macros_test.mk Loading commit data...
CppunitTest_sw_mailmerge.mk Loading commit data...
CppunitTest_sw_odfexport.mk Loading commit data...
CppunitTest_sw_odfimport.mk Loading commit data...
CppunitTest_sw_ooxmlexport.mk Loading commit data...
CppunitTest_sw_ooxmlexport2.mk Loading commit data...
CppunitTest_sw_ooxmlexport3.mk Loading commit data...
CppunitTest_sw_ooxmlexport4.mk Loading commit data...
CppunitTest_sw_ooxmlexport5.mk Loading commit data...
CppunitTest_sw_ooxmlexport6.mk Loading commit data...
CppunitTest_sw_ooxmlexport7.mk Loading commit data...
CppunitTest_sw_ooxmlfieldexport.mk Loading commit data...
CppunitTest_sw_ooxmlimport.mk Loading commit data...
CppunitTest_sw_ooxmlw14export.mk Loading commit data...
CppunitTest_sw_rtfexport.mk Loading commit data...
CppunitTest_sw_rtfimport.mk Loading commit data...
CppunitTest_sw_tiledrendering.mk Loading commit data...
CppunitTest_sw_uiwriter.mk Loading commit data...
CppunitTest_sw_uwriter.mk Loading commit data...
CppunitTest_sw_ww8export.mk Loading commit data...
CppunitTest_sw_ww8import.mk Loading commit data...
CustomTarget_generated.mk Loading commit data...
JunitTest_sw_complex.mk Loading commit data...
JunitTest_sw_unoapi_1.mk Loading commit data...
JunitTest_sw_unoapi_2.mk Loading commit data...
JunitTest_sw_unoapi_3.mk Loading commit data...
JunitTest_sw_unoapi_4.mk Loading commit data...
Library_msword.mk Loading commit data...
Library_sw.mk Loading commit data...
Library_swd.mk Loading commit data...
Library_swui.mk Loading commit data...
Library_vbaswobj.mk Loading commit data...
Makefile Loading commit data...
Module_sw.mk Loading commit data...
PythonTest_sw_python.mk Loading commit data...
README Loading commit data...
UIConfig_sglobal.mk Loading commit data...
UIConfig_sweb.mk Loading commit data...
UIConfig_swform.mk Loading commit data...
UIConfig_swreport.mk Loading commit data...
UIConfig_swriter.mk Loading commit data...
UIConfig_swxform.mk Loading commit data...
ooxmlexport_setup.mk Loading commit data...