diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-11-25 21:01:08 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-11-25 21:01:08 +0100 |
| commit | 72274f70976e4347b1e5e7ff2a11e4c558c71b0c (patch) | |
| tree | eda3fc33cf240856df0c8752110ebb91762fe906 | |
| parent | d6c29a6c27745e2526f5e83c3018fc8a47450a61 (diff) | |
| parent | 1c4884546c72bca9b442fc1f66e23f887fbdc68d (diff) | |
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/writer
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 7 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8atr.cxx | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 5e3501e395..2c1dadede9 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -3154,7 +3154,7 @@ void DocxAttributeOutput::FootnotesEndnotes( bool bFootnotes ) } -void DocxAttributeOutput::ParaLineSpacing_Impl( short nSpace, short /*nMulti*/ ) +void DocxAttributeOutput::ParaLineSpacing_Impl( short nSpace, short nMulti ) { if ( !m_pSpacingAttrList ) m_pSpacingAttrList = m_pSerializer->createAttrList(); @@ -3164,6 +3164,11 @@ void DocxAttributeOutput::ParaLineSpacing_Impl( short nSpace, short /*nMulti*/ ) m_pSpacingAttrList->add( FSNS( XML_w, XML_lineRule ), "exact" ); m_pSpacingAttrList->add( FSNS( XML_w, XML_line ), OString::valueOf( sal_Int32( -nSpace ) ) ); } + else if( nMulti ) + { + m_pSpacingAttrList->add( FSNS( XML_w, XML_lineRule ), "auto" ); + m_pSpacingAttrList->add( FSNS( XML_w, XML_line ), OString::valueOf( sal_Int32( nSpace ) ) ); + } else if ( nSpace > 0 ) { m_pSpacingAttrList->add( FSNS( XML_w, XML_lineRule ), "atLeast" ); diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 606e7fe583..c4cfabf6fd 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -4499,7 +4499,9 @@ void AttributeOutputBase::ParaLineSpacing( const SvxLineSpacingItem& rSpacing ) } break; } - + // if nSpace is negative, it is a fixed size in 1/20 of a point + // if nSpace is positive and nMulti is 1, it is 1/240 of a single line height + // otherwise, I have no clue what the heck it is ParaLineSpacing_Impl( nSpace, nMulti ); } |