diff options
Diffstat (limited to 'writerfilter/source/rtftok')
-rw-r--r-- | writerfilter/source/rtftok/rtfdispatchflag.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdispatchvalue.cxx | 12 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfsprm.cxx | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx b/writerfilter/source/rtftok/rtfdispatchflag.cxx index 833b38d16876..f6f4a2268843 100644 --- a/writerfilter/source/rtftok/rtfdispatchflag.cxx +++ b/writerfilter/source/rtftok/rtfdispatchflag.cxx @@ -1069,7 +1069,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) auto pValue = new 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 + [[fallthrough]]; // set the default + current value } case RTF_LNDSCPSXN: { diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx b/writerfilter/source/rtftok/rtfdispatchvalue.cxx index 5f37d62b9d79..a83d35701020 100644 --- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx +++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx @@ -965,7 +965,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) 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 + [[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); @@ -973,7 +973,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) 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 + [[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); @@ -981,7 +981,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) 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 + [[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); @@ -989,7 +989,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) 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 + [[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); @@ -997,7 +997,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) 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 + [[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); @@ -1005,7 +1005,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) 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 + [[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); diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 67121203c7d8..7960f12eea15 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -331,7 +331,7 @@ int RTFSdrImport::initShape(uno::Reference<drawing::XShape>& o_xShape, o_xPropSet->setPropertyValue(i.Name, i.Value); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: createShape("com.sun.star.drawing.CustomShape", o_xShape, o_xPropSet); o_rIsCustomShape = true; diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx index a4f3b81be211..9acc19675bb1 100644 --- a/writerfilter/source/rtftok/rtfsprm.cxx +++ b/writerfilter/source/rtftok/rtfsprm.cxx @@ -199,10 +199,10 @@ static bool isSPRMChildrenExpected(Id nId) case NS_ooxml::LN_CT_PBdr_bottom: case NS_ooxml::LN_CT_PBdr_right: // Expected children are NS_ooxml::LN_CT_Border_*. - SAL_FALLTHROUGH; + [[fallthrough]]; case NS_ooxml::LN_CT_PrBase_shd: // Expected children are NS_ooxml::LN_CT_Shd_*. - SAL_FALLTHROUGH; + [[fallthrough]]; case NS_ooxml::LN_CT_PPrBase_ind: // Expected children are NS_ooxml::LN_CT_Ind_*. return true; |