summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/dmapper/DomainMapper.cxx6
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.cxx2
-rw-r--r--writerfilter/source/ooxml/OOXMLFastContextHandler.cxx2
-rw-r--r--writerfilter/source/rtftok/rtfdispatchflag.cxx2
-rw-r--r--writerfilter/source/rtftok/rtfdispatchvalue.cxx12
-rw-r--r--writerfilter/source/rtftok/rtfsdrimport.cxx2
-rw-r--r--writerfilter/source/rtftok/rtfsprm.cxx4
7 files changed, 15 insertions, 15 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 56a03ec877c8..aa3588cde860 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2258,7 +2258,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext )
break;
case NS_ooxml::LN_paratrackchange:
m_pImpl->StartParaMarkerChange( );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case NS_ooxml::LN_CT_PPr_pPrChange:
case NS_ooxml::LN_trackchange:
case NS_ooxml::LN_EG_RPrContent_rPrChange:
@@ -3469,7 +3469,7 @@ void DomainMapper::handleUnderlineType(const Id nId, const ::tools::SvRef<Proper
break;
case NS_ooxml::LN_Value_ST_Underline_words:
rContext->Insert(PROP_CHAR_WORD_MODE, uno::makeAny(true));
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case NS_ooxml::LN_Value_ST_Underline_single:
nUnderline = awt::FontUnderline::SINGLE;
break;
@@ -3540,7 +3540,7 @@ void DomainMapper::handleParaJustification(const sal_Int32 nIntValue, const ::to
break;
case 4:
nLastLineAdjust = style::ParagraphAdjust_BLOCK;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case NS_ooxml::LN_Value_ST_Jc_both:
nAdjust = style::ParagraphAdjust_BLOCK;
aStringValue = "both";
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 957cdbedf356..a8304c088f92 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -446,7 +446,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
break;
default:
SAL_WARN("writerfilter", "unknown LN_CT_Style_type " << nType);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case 0: // explicit unknown set by tokenizer
break;
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index ff3da8a3ba5a..1c3448f59660 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1725,7 +1725,7 @@ OOXMLFastContextHandlerShape::lcl_createFastChildContext
case NMSP_vmlOffice:
if (!bGroupShape)
xContextHandler.set(OOXMLFactory::createFastChildContextFromStart(this, Element));
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default:
if (!xContextHandler.is())
{
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;
generated by cgit (git 2.34.1) at 2024-07-29 07:56:10 +0000