diff options
| author | Justin Luth <justin_luth@sil.org> | 2018-07-27 13:29:39 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-08-08 12:33:46 +0200 |
| commit | 2c00f5c896bee61033b93ddb9f32d959b0b01e94 (patch) | |
| tree | ff3645619586e6793759c49f27ac5af0e9675863 /sw | |
| parent | 674416a2f16dfa050a23f2b1f0b749214ea1f2a6 (diff) | |
tdf#103961: delay merge of default props until export
Until now, during docx import the pPrDefault properties have been
directly added to the parentless styles. However, things like
table styles are supposed to over-ride these document defaults, but
not style defaults. Since the docDefaults are merged into the style,
table-styles were unable detect if they could override them.
Exporting doesn't export pPrDefaults well, so the
properties still need to be merged into the style when
round-tripping.
Almost every existing unit test document is a proof test.
It effectively ought to act as a non-functional change.
Plus, this basically reverts 7f697ec27b1175ed94228155935d9ccd3cd5606c
so that unit test still covers bug 103961.
Change-Id: I4948299ddd610c07d828f2bd57c58734f1b94c49
Reviewed-on: https://gerrit.libreoffice.org/58203
Reviewed-by: Justin Luth <justin_luth@sil.org>
Tested-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/wrtw8sty.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index e0a8e7ba9dce..ef4b2c21d6f9 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -460,7 +460,8 @@ void MSWordStyles::SetStyleDefaults( const SwFormat& rFormat, bool bPap ) // dynamic defaults const SfxItemPool& rPool = *rFormat.GetAttrSet().GetPool(); for( n = nStt; n < nEnd; ++n ) - aFlags[ n - RES_CHRATR_BEGIN ] = nullptr != rPool.GetPoolDefaultItem( n ); + aFlags[ n - RES_CHRATR_BEGIN ] = nullptr != rPool.GetPoolDefaultItem( n ) + || SfxItemState::SET == m_rExport.m_pDoc->GetDfltTextFormatColl()->GetItemState( n, false ); // static defaults, that differs between WinWord and SO if( bPap ) |