diff options
| author | Jan-Marek Glogowski <jan-marek.glogowski@extern.cib.de> | 2019-11-01 10:39:47 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2019-12-06 14:50:22 +0100 |
| commit | 4412689b1358b5cc932f905417f23e2a3cbb494b (patch) | |
| tree | 2232f9de89c6088af25a8c79b2faf05d36c26945 /writerfilter | |
| parent | e75dd1fc992f168f24d66595265a978071cdd277 (diff) | |
tdf#120546 fix DOCX overriding numrule format
... at least in the view.
This "fixes" the import side of the exported OOXML document with
multiple overridden numrule character format. This prevents the
change of the shared numrule, which results in all bullets being
formatted like the last overridden numrule.
What is missing is a consistent way to edit the override, as the
override is currently just stored in an internal attribute, the
"ListAutoFormat" property.
Fixing editing for good will be a larger work, as "ListAutoFormat"
must be reflected in the GUI and must have a higher priority then
the numrule format. Currently positioning the curser in front of
the number or bullet entry lets one change the numrule format,
which is applied to all bullets of the same rule.
This special DOCX override mode is enabled by the import filter
setting DocumentSettingId::APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING
to true. This should also change the edit mode, so that a change
of the entry doesn't modify the rule, but the override and this
must also be reflected in the GUI character settings.
Change-Id: I057f7a354bc3c413b114eec772e06c7063029699
Reviewed-on: https://gerrit.libreoffice.org/81878
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit 6ed12ab2d0742f86ce25defec3c776562dbfad9a)
Reviewed-on: https://gerrit.libreoffice.org/84624
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index fe66d4ddadb9..0633d195eb46 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -6432,6 +6432,9 @@ uno::Reference<beans::XPropertySet> DomainMapper_Impl::GetCurrentNumberingCharSt xLevels = GetCurrentNumberingRules(&nListLevel); if (!xLevels.is()) { + if (IsOOXMLImport()) + return xRet; + PropertyMapPtr pContext = m_pTopContext; if (IsRTFImport() && !IsOpenField()) { |