diff options
| author | Oliver-Rainer Wittmann <od@openoffice.org> | 2011-05-16 13:51:34 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2011-05-16 13:51:34 +0200 |
| commit | e03712a9c093663895fc6d7c999d574e948ab8dd (patch) | |
| tree | e78c0fa96f001ee8af83f98b6d4f901c6eae5a5a | |
| parent | d5885f16f6cbed93d1dc96703a084b9aaf9af32d (diff) | |
sw34bf06 #i117711# - correct RTF page margin export
Signed-off-by: Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>
| -rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.cxx | 20 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8atr.cxx | 4 |
2 files changed, 13 insertions, 11 deletions
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index c08c7046f7..93412a25a8 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -2677,24 +2677,24 @@ void RtfAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace ) HdFtDistanceGlue aDistances( *m_rExport.GetCurItemSet() ); + if( aDistances.dyaTop ) + { + m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGTSXN); + m_aSectionBreaks.append((sal_Int32)aDistances.dyaTop); + } if ( aDistances.HasHeader() ) { - if( aDistances.dyaTop ) - { - m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGTSXN); - m_aSectionBreaks.append((sal_Int32)aDistances.dyaTop); - } m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_HEADERY); m_aSectionBreaks.append((sal_Int32)aDistances.dyaHdrTop); } + if( aDistances.dyaBottom ) + { + m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGBSXN); + m_aSectionBreaks.append((sal_Int32)aDistances.dyaBottom); + } if( aDistances.HasFooter() ) { - if( aDistances.dyaBottom ) - { - m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGBSXN); - m_aSectionBreaks.append((sal_Int32)aDistances.dyaBottom); - } m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_FOOTERY); m_aSectionBreaks.append((sal_Int32)aDistances.dyaHdrBottom); } diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 901d8fb81f..63ee393bb8 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -841,8 +841,10 @@ void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpF } } break; + case RES_FRMFMT: + break; default: - OSL_ENSURE( !this, "Was wird hier ausgegeben ??? " ); + OSL_ENSURE( !this, "Which format is exported here?" ); break; } |