diff options
| author | Justin Luth <justin_luth@sil.org> | 2017-08-24 22:17:18 -0400 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-09-05 16:26:54 +0200 |
| commit | adce43a12a9e9b3834e188ea0deb4af8d28a2d06 (patch) | |
| tree | 51e781d4fc24553d3b446982c51356b2f5b1f23b /writerfilter | |
| parent | 45bc0b931eb2569bf267d226b67e58b7b8390529 (diff) | |
tdf#108765 DOCX: after import, allow default styles again
During import, we don't want LO's style defaults to intermingle
with those of MSO [1]. However, if any styles are NOT defined by
the document itself, then we want to use that new style with
appropriate defaults.
For example, if footnotes were never used, that style might not be
defined in the .docx file. Later, if a user inserts a footnote
for the first time, we certainly don't want the "default paragraph"
settings. Instead, we want the default "Footnote" settings.
[1]: see commit b95d203bc17c83ec0fe5139f519d53ed1d842d3a
Change-Id: Ia71490e795885d3c16f764d0f716f6499765cb67
Reviewed-on: https://gerrit.libreoffice.org/41546
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit c071e5f6858661881065cbb4e644c37c8e94ccc6)
Reviewed-on: https://gerrit.libreoffice.org/41769
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 7fd0975bf6e3..44460d7e8fac 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -206,6 +206,9 @@ DomainMapper::~DomainMapper() // Apply the document settings after everything else m_pImpl->GetSettingsTable()->ApplyProperties( m_pImpl->GetTextDocument( ) ); + // now that importing is finished, re-enable default styles for any that were never defined/imported. + m_pImpl->SetDocumentSettingsProperty("StylesNoDefault", uno::makeAny(false)); + // Grab-bag handling comphelper::SequenceAsHashMap aProperties; // Add the saved w:themeFontLang setting |