3 files changed, 15 insertions, 8 deletions
diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx b/writerfilter/source/rtftok/rtfdispatchflag.cxx
index d3bc5175b282..6888f3f80eb4 100644
--- a/writerfilter/source/rtftok/rtfdispatchflag.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchflag.cxx
@@ -978,11 +978,12 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
         m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Lvl_numFmt, std::make_shared<RTFValue>(23)); // bullets, same as \levelnfc23
     }
     break;
-    case RTF_LANDSCAPE: // fall through: set the default + current value
+    case RTF_LANDSCAPE:
     {
         auto pValue = std::make_shared<RTFValue>(NS_ooxml::LN_Value_ST_PageOrientation_landscape);
         putNestedAttribute(m_aDefaultState.aSectionSprms,
                            NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_orient, pValue);
+        SAL_FALLTHROUGH; // set the default + current value
     }
     case RTF_LNDSCPSXN:
     {
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;
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index e69ec23af97a..56b99fce863f 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -301,7 +301,7 @@ int RTFSdrImport::initShape(uno::Reference<drawing::XShape>& o_xShape,
                 o_xPropSet->setPropertyValue(aDefaults[j].Name, aDefaults[j].Value);
             break;
         }
-    // fall-through intended
+        SAL_FALLTHROUGH;
     default:
         createShape("com.sun.star.drawing.CustomShape", o_xShape, o_xPropSet);
         o_rIsCustomShape = true;