diff options
Diffstat (limited to 'writerfilter/source/rtftok/rtfdispatchvalue.cxx')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdispatchvalue.cxx | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx b/writerfilter/source/rtftok/rtfdispatchvalue.cxx index 76e24ddfe9e7..27777108b293 100644 --- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx +++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx @@ -860,41 +860,47 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) rAttributes.set((nKeyword == RTF_COLW ? NS_ooxml::LN_CT_Column_w : NS_ooxml::LN_CT_Column_space), pIntValue); } break; - case RTF_PAPERH: // fall through: set the default + current value + case RTF_PAPERH: putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_h, pIntValue); + SAL_FALLTHROUGH; // set the default + current value case RTF_PGHSXN: putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_h, pIntValue); break; - case RTF_PAPERW: // fall through: set the default + current value + case RTF_PAPERW: putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_w, pIntValue); + SAL_FALLTHROUGH; // set the default + current value case RTF_PGWSXN: putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_w, pIntValue); break; - case RTF_MARGL: // fall through: set the default + current value + case RTF_MARGL: putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_left, pIntValue); + SAL_FALLTHROUGH; // set the default + current value case RTF_MARGLSXN: putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_left, pIntValue); break; - case RTF_MARGR: // fall through: set the default + current value + case RTF_MARGR: putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_right, pIntValue); + SAL_FALLTHROUGH; // set the default + current value case RTF_MARGRSXN: putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_right, pIntValue); break; - case RTF_MARGT: // fall through: set the default + current value + case RTF_MARGT: putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_top, pIntValue); + SAL_FALLTHROUGH; // set the default + current value case RTF_MARGTSXN: putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_top, pIntValue); break; - case RTF_MARGB: // fall through: set the default + current value + case RTF_MARGB: putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_bottom, pIntValue); + SAL_FALLTHROUGH; // set the default + current value case RTF_MARGBSXN: putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_bottom, pIntValue); break; |