From 8b2600bb4d8da8a58e0bf39a96b0058c38cac9d2 Mon Sep 17 00:00:00 2001 From: Arnaud Versini Date: Sun, 23 Aug 2026 18:34:28 +0200 Subject: [PATCH] sw : use more OUStringLiteral Change-Id: Id0c3abbc2f44ca7ae818eeb357e435cc18793ea8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/209730 Tested-by: Jenkins Reviewed-by: Arnaud Versini --- .../writerfilter/dmapper/BorderHandler.cxx | 16 ++-- .../writerfilter/dmapper/CellColorHandler.cxx | 76 +++++++++---------- .../dmapper/CellMarginHandler.cxx | 8 +- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/sw/source/writerfilter/dmapper/BorderHandler.cxx b/sw/source/writerfilter/dmapper/BorderHandler.cxx index 6c90a06260cb..371f4ae4ed8a 100644 --- a/sw/source/writerfilter/dmapper/BorderHandler.cxx +++ b/sw/source/writerfilter/dmapper/BorderHandler.cxx @@ -104,35 +104,35 @@ void BorderHandler::lcl_sprm(Sprm & rSprm) { case NS_ooxml::LN_CT_TblBorders_top: pos = BorderPosition::Top; - aBorderPos = "top"; + aBorderPos = u"top"_ustr; break; case NS_ooxml::LN_CT_TblBorders_start: pos = rtl ? BorderPosition::Right : BorderPosition::Left; - aBorderPos = "start"; + aBorderPos = u"start"_ustr; break; case NS_ooxml::LN_CT_TblBorders_left: pos = BorderPosition::Left; - aBorderPos = "left"; + aBorderPos = u"left"_ustr; break; case NS_ooxml::LN_CT_TblBorders_bottom: pos = BorderPosition::Bottom; - aBorderPos = "bottom"; + aBorderPos = u"bottom"_ustr; break; case NS_ooxml::LN_CT_TblBorders_end: pos = rtl ? BorderPosition::Left : BorderPosition::Right; - aBorderPos = "end"; + aBorderPos = u"end"_ustr; break; case NS_ooxml::LN_CT_TblBorders_right: pos = BorderPosition::Right; - aBorderPos = "right"; + aBorderPos = u"right"_ustr; break; case NS_ooxml::LN_CT_TblBorders_insideH: pos = BorderPosition::Horizontal; - aBorderPos = "insideH"; + aBorderPos = u"insideH"_ustr; break; case NS_ooxml::LN_CT_TblBorders_insideV: pos = BorderPosition::Vertical; - aBorderPos = "insideV"; + aBorderPos = u"insideV"_ustr; break; default: return; diff --git a/sw/source/writerfilter/dmapper/CellColorHandler.cxx b/sw/source/writerfilter/dmapper/CellColorHandler.cxx index 15fcdf215111..4788f62b7f39 100644 --- a/sw/source/writerfilter/dmapper/CellColorHandler.cxx +++ b/sw/source/writerfilter/dmapper/CellColorHandler.cxx @@ -54,44 +54,44 @@ static uno::Any lcl_ConvertShd(sal_Int32 nIntValue) // This should be in sync with the ST_Shd list in ooxml's model.xml. switch (nIntValue) { - case NS_ooxml::LN_Value_ST_Shd_clear: aRet = "clear"; break; - case NS_ooxml::LN_Value_ST_Shd_solid: aRet = "solid"; break; - case NS_ooxml::LN_Value_ST_Shd_pct5: aRet = "pct5"; break; - case NS_ooxml::LN_Value_ST_Shd_pct10: aRet = "pct10"; break; - case NS_ooxml::LN_Value_ST_Shd_pct20: aRet = "pct20"; break; - case NS_ooxml::LN_Value_ST_Shd_pct25: aRet = "pct25"; break; - case NS_ooxml::LN_Value_ST_Shd_pct30: aRet = "pct30"; break; - case NS_ooxml::LN_Value_ST_Shd_pct40: aRet = "pct40"; break; - case NS_ooxml::LN_Value_ST_Shd_pct50: aRet = "pct50"; break; - case NS_ooxml::LN_Value_ST_Shd_pct60: aRet = "pct60"; break; - case NS_ooxml::LN_Value_ST_Shd_pct70: aRet = "pct70"; break; - case NS_ooxml::LN_Value_ST_Shd_pct75: aRet = "pct75"; break; - case NS_ooxml::LN_Value_ST_Shd_pct80: aRet = "pct80"; break; - case NS_ooxml::LN_Value_ST_Shd_pct90: aRet = "pct90"; break; - case NS_ooxml::LN_Value_ST_Shd_horzStripe: aRet = "horzStripe"; break; - case NS_ooxml::LN_Value_ST_Shd_vertStripe: aRet = "vertStripe"; break; - case NS_ooxml::LN_Value_ST_Shd_reverseDiagStripe: aRet = "reverseDiagStripe"; break; - case NS_ooxml::LN_Value_ST_Shd_diagStripe: aRet = "diagStripe"; break; - case NS_ooxml::LN_Value_ST_Shd_horzCross: aRet = "horzCross"; break; - case NS_ooxml::LN_Value_ST_Shd_diagCross: aRet = "diagCross"; break; - case NS_ooxml::LN_Value_ST_Shd_thinHorzStripe: aRet = "thinHorzStripe"; break; - case NS_ooxml::LN_Value_ST_Shd_thinVertStripe: aRet = "thinVertStripe"; break; - case NS_ooxml::LN_Value_ST_Shd_thinReverseDiagStripe: aRet = "thinReverseDiagStripe"; break; - case NS_ooxml::LN_Value_ST_Shd_thinDiagStripe: aRet = "thinDiagStripe"; break; - case NS_ooxml::LN_Value_ST_Shd_thinHorzCross: aRet = "thinHorzCross"; break; - case NS_ooxml::LN_Value_ST_Shd_thinDiagCross: aRet = "thinDiagCross"; break; - case NS_ooxml::LN_Value_ST_Shd_pct12: aRet = "pct12"; break; - case NS_ooxml::LN_Value_ST_Shd_pct15: aRet = "pct15"; break; - case NS_ooxml::LN_Value_ST_Shd_pct35: aRet = "pct35"; break; - case NS_ooxml::LN_Value_ST_Shd_pct37: aRet = "pct37"; break; - case NS_ooxml::LN_Value_ST_Shd_pct45: aRet = "pct45"; break; - case NS_ooxml::LN_Value_ST_Shd_pct55: aRet = "pct55"; break; - case NS_ooxml::LN_Value_ST_Shd_pct62: aRet = "pct62"; break; - case NS_ooxml::LN_Value_ST_Shd_pct65: aRet = "pct65"; break; - case NS_ooxml::LN_Value_ST_Shd_pct85: aRet = "pct85"; break; - case NS_ooxml::LN_Value_ST_Shd_pct87: aRet = "pct87"; break; - case NS_ooxml::LN_Value_ST_Shd_pct95: aRet = "pct95"; break; - case NS_ooxml::LN_Value_ST_Shd_nil: aRet = "nil"; break; + case NS_ooxml::LN_Value_ST_Shd_clear: aRet = u"clear"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_solid: aRet = u"solid"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_pct5: aRet = u"pct5"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_pct10: aRet = u"pct10"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_pct20: aRet = u"pct20"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_pct25: aRet = u"pct25"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_pct30: aRet = u"pct30"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_pct40: aRet = u"pct40"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_pct50: aRet = u"pct50"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_pct60: aRet = u"pct60"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_pct70: aRet = u"pct70"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_pct75: aRet = u"pct75"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_pct80: aRet = u"pct80"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_pct90: aRet = u"pct90"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_horzStripe: aRet = u"horzStripe"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_vertStripe: aRet = u"vertStripe"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_reverseDiagStripe: aRet = u"reverseDiagStripe"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_diagStripe: aRet = u"diagStripe"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_horzCross: aRet = u"horzCross"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_diagCross: aRet = u"diagCross"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_thinHorzStripe: aRet = u"thinHorzStripe"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_thinVertStripe: aRet = u"thinVertStripe"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_thinReverseDiagStripe: aRet = u"thinReverseDiagStripe"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_thinDiagStripe: aRet = u"thinDiagStripe"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_thinHorzCross: aRet = u"thinHorzCross"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_thinDiagCross: aRet = u"thinDiagCross"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_pct12: aRet = u"pct12"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_pct15: aRet = u"pct15"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_pct35: aRet = u"pct35"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_pct37: aRet = u"pct37"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_pct45: aRet = u"pct45"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_pct55: aRet = u"pct55"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_pct62: aRet = u"pct62"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_pct65: aRet = u"pct65"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_pct85: aRet = u"pct85"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_pct87: aRet = u"pct87"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_pct95: aRet = u"pct95"_ustr; break; + case NS_ooxml::LN_Value_ST_Shd_nil: aRet = u"nil"_ustr; break; } return uno::Any(aRet); } diff --git a/sw/source/writerfilter/dmapper/CellMarginHandler.cxx b/sw/source/writerfilter/dmapper/CellMarginHandler.cxx index 080d7f324db8..eb1a866c780a 100644 --- a/sw/source/writerfilter/dmapper/CellMarginHandler.cxx +++ b/sw/source/writerfilter/dmapper/CellMarginHandler.cxx @@ -77,10 +77,10 @@ void CellMarginHandler::createGrabBag(const OUString& aName) OUString sType; switch (m_nType) { - case NS_ooxml::LN_Value_ST_TblWidth_nil: sType = "nil"; break; - case NS_ooxml::LN_Value_ST_TblWidth_pct: sType = "pct"; break; - case NS_ooxml::LN_Value_ST_TblWidth_dxa: sType = "dxa"; break; - case NS_ooxml::LN_Value_ST_TblWidth_auto: sType = "auto"; break; + case NS_ooxml::LN_Value_ST_TblWidth_nil: sType = u"nil"_ustr; break; + case NS_ooxml::LN_Value_ST_TblWidth_pct: sType = u"pct"_ustr; break; + case NS_ooxml::LN_Value_ST_TblWidth_dxa: sType = u"dxa"_ustr; break; + case NS_ooxml::LN_Value_ST_TblWidth_auto: sType = u"auto"_ustr; break; } uno::Sequence aSeq( comphelper::InitPropertySequence({ { "w", uno::Any(m_nWidth) },