diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-05-22 12:45:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-05-28 13:26:37 +0200 |
| commit | 71ce1181942741d0899d9dbbf035632dffe2b323 (patch) | |
| tree | 5e259a0bc3e90e56ca67ea6eee51eed66d28cf9e | |
| parent | 550e50c529f8be00320cfd7ab1c305d9e6912dea (diff) | |
loplugin:ostr in sw/../ww8
Change-Id: I48cc8f196e116c9c20c2930bb043e1d1ccf1de33
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167952
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
24 files changed, 381 insertions, 374 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 682959b33f33..1532ecf72c81 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -482,7 +482,7 @@ static void checkAndWriteFloatingTables(DocxAttributeOutput& rDocxAttributeOutpu const SfxGrabBagItem* pTableGrabBag = pTableFormat->GetAttrSet().GetItem<SfxGrabBagItem>(RES_FRMATR_GRABBAG); const std::map<OUString, css::uno::Any> & rTableGrabBag = pTableGrabBag->GetGrabBag(); // no grabbag? - if (rTableGrabBag.find("TablePosition") == rTableGrabBag.end()) + if (rTableGrabBag.find(u"TablePosition"_ustr) == rTableGrabBag.end()) { if (pFrameFormat->GetFlySplit().GetValue()) { @@ -577,7 +577,7 @@ sal_Int32 DocxAttributeOutput::StartParagraph(ww8::WW8TableNodeInfo::Pointer_t p { const SfxGrabBagItem& rParaGrabBag = static_cast<const SfxGrabBagItem&>(*pItem); const std::map<OUString, css::uno::Any>& rMap = rParaGrabBag.GetGrabBag(); - bEndParaSdt = m_aParagraphSdt.m_bStartedSdt && rMap.contains("ParaSdtEndBefore"); + bEndParaSdt = m_aParagraphSdt.m_bStartedSdt && rMap.contains(u"ParaSdtEndBefore"_ustr); } } } @@ -1110,12 +1110,12 @@ bool DocxAttributeOutput::TextBoxIsFramePr(const SwFrameFormat& rFrameFormat) return false; uno::Reference<beans::XPropertySetInfo> xPropSetInfo(xPropertySet->getPropertySetInfo()); - if (!xPropSetInfo.is() || !xPropSetInfo->hasPropertyByName("FrameInteropGrabBag")) + if (!xPropSetInfo.is() || !xPropSetInfo->hasPropertyByName(u"FrameInteropGrabBag"_ustr)) return false; bool bRet = false; uno::Sequence<beans::PropertyValue> propList; - xPropertySet->getPropertyValue("FrameInteropGrabBag") >>= propList; + xPropertySet->getPropertyValue(u"FrameInteropGrabBag"_ustr) >>= propList; auto pProp = std::find_if(std::cbegin(propList), std::cend(propList), [](const beans::PropertyValue& rProp) { return rProp.Name == "ParaFrameProperties"; }); if (pProp != std::cend(propList)) @@ -1718,7 +1718,7 @@ void DocxAttributeOutput::EndParagraphProperties(const SfxItemSet& rParagraphMar SwTextNode* pTextNode = m_rExport.m_pCurPam->GetPointNode().GetTextNode(); std::map<OUString, OUString> aStatements; if (pTextNode) - aStatements = SwRDFHelper::getTextNodeStatements("urn:bails", *pTextNode); + aStatements = SwRDFHelper::getTextNodeStatements(u"urn:bails"_ustr, *pTextNode); if (!aStatements.empty()) { m_pSerializer->startElementNS(XML_w, XML_smartTag, @@ -2042,7 +2042,7 @@ void DocxAttributeOutput::EndRun(const SwTextNode* pNode, sal_Int32 nPos, sal_In m_pSerializer->startElementNS(XML_w, XML_r); if(GetExport().m_bTabInTOC && m_pHyperlinkAttrList.is()) { - RunText("\t") ; + RunText(u"\t"_ustr) ; } m_pSerializer->mergeTopMarks(Tag_EndRun_1, sax_fastparser::MergeMarks::PREPEND); // merges with "postponed run start", see above @@ -2464,15 +2464,15 @@ void DocxAttributeOutput::WriteFFData( const FieldInfos& rInfos ) FieldMarkParamsHelper params( rFieldmark ); OUString sEntryMacro; - params.extractParam("EntryMacro", sEntryMacro); + params.extractParam(u"EntryMacro"_ustr, sEntryMacro); OUString sExitMacro; - params.extractParam("ExitMacro", sExitMacro); + params.extractParam(u"ExitMacro"_ustr, sExitMacro); OUString sHelp; - params.extractParam("Help", sHelp); + params.extractParam(u"Help"_ustr, sHelp); OUString sHint; - params.extractParam("Hint", sHint); // .docx StatusText + params.extractParam(u"Hint"_ustr, sHint); // .docx StatusText if ( sHint.isEmpty() ) - params.extractParam("Description", sHint); // .doc StatusText + params.extractParam(u"Description"_ustr, sHint); // .doc StatusText if ( rInfos.eType == ww::eFORMDROPDOWN ) { @@ -2509,13 +2509,13 @@ void DocxAttributeOutput::WriteFFData( const FieldInfos& rInfos ) else if ( rInfos.eType == ww::eFORMTEXT ) { OUString sType; - params.extractParam("Type", sType); + params.extractParam(u"Type"_ustr, sType); OUString sDefaultText; - params.extractParam("Content", sDefaultText); + params.extractParam(u"Content"_ustr, sDefaultText); sal_uInt16 nMaxLength = 0; - params.extractParam("MaxLength", nMaxLength); + params.extractParam(u"MaxLength"_ustr, nMaxLength); OUString sFormat; - params.extractParam("Format", sFormat); + params.extractParam(u"Format"_ustr, sFormat); FFDataWriterHelper ffdataOut( m_pSerializer ); ffdataOut.WriteFormText( params.getName(), sEntryMacro, sExitMacro, sHelp, sHint, sType, sDefaultText, nMaxLength, sFormat ); @@ -3029,11 +3029,11 @@ void DocxAttributeOutput::CmdField_Impl( const SwTextNode* pNode, sal_Int32 nPos { OUString sActualFormula = sToken.trim(); const std::map<OUString, uno::Any>& rGrabBag = pItem->GetGrabBag(); - std::map<OUString, uno::Any>::const_iterator aStoredFormula = rGrabBag.find("CellFormulaConverted"); + std::map<OUString, uno::Any>::const_iterator aStoredFormula = rGrabBag.find(u"CellFormulaConverted"_ustr); if ( aStoredFormula != rGrabBag.end() && sActualFormula.indexOf('=') == 0 && o3tl::trim(sActualFormula.subView(1)) == o3tl::trim(aStoredFormula->second.get<OUString>()) ) { - aStoredFormula = rGrabBag.find("CellFormula"); + aStoredFormula = rGrabBag.find(u"CellFormula"_ustr); if ( aStoredFormula != rGrabBag.end() ) { sToken = " =" + aStoredFormula->second.get<OUString>(); @@ -3061,7 +3061,7 @@ void DocxAttributeOutput::CmdField_Impl( const SwTextNode* pNode, sal_Int32 nPos // Replace tabs by </instrText><tab/><instrText> if ( nIdx > 0 ) // Is another token expected? - RunText( "\t" ); + RunText( u"\t"_ustr ); } if ( bWriteRun ) @@ -3379,90 +3379,90 @@ struct NameToId const NameToId constNameToIdMapping[] = { - { OUString("glow"), FSNS( XML_w14, XML_glow ) }, - { OUString("shadow"), FSNS( XML_w14, XML_shadow ) }, - { OUString("reflection"), FSNS( XML_w14, XML_reflection ) }, - { OUString("textOutline"), FSNS( XML_w14, XML_textOutline ) }, - { OUString("textFill"), FSNS( XML_w14, XML_textFill ) }, - { OUString("scene3d"), FSNS( XML_w14, XML_scene3d ) }, - { OUString("props3d"), FSNS( XML_w14, XML_props3d ) }, - { OUString("ligatures"), FSNS( XML_w14, XML_ligatures ) }, - { OUString("numForm"), FSNS( XML_w14, XML_numForm ) }, - { OUString("numSpacing"), FSNS( XML_w14, XML_numSpacing ) }, - { OUString("stylisticSets"),FSNS( XML_w14, XML_stylisticSets ) }, - { OUString("cntxtAlts"), FSNS( XML_w14, XML_cntxtAlts ) }, - - { OUString("val"), FSNS( XML_w14, XML_val ) }, - { OUString("rad"), FSNS( XML_w14, XML_rad ) }, - { OUString("blurRad"), FSNS( XML_w14, XML_blurRad ) }, - { OUString("stA"), FSNS( XML_w14, XML_stA ) }, - { OUString("stPos"), FSNS( XML_w14, XML_stPos ) }, - { OUString("endA"), FSNS( XML_w14, XML_endA ) }, - { OUString("endPos"), FSNS( XML_w14, XML_endPos ) }, - { OUString("dist"), FSNS( XML_w14, XML_dist ) }, - { OUString("dir"), FSNS( XML_w14, XML_dir ) }, - { OUString("fadeDir"), FSNS( XML_w14, XML_fadeDir ) }, - { OUString("sx"), FSNS( XML_w14, XML_sx ) }, - { OUString("sy"), FSNS( XML_w14, XML_sy ) }, - { OUString("kx"), FSNS( XML_w14, XML_kx ) }, - { OUString("ky"), FSNS( XML_w14, XML_ky ) }, - { OUString("algn"), FSNS( XML_w14, XML_algn ) }, - { OUString("w"), FSNS( XML_w14, XML_w ) }, - { OUString("cap"), FSNS( XML_w14, XML_cap ) }, - { OUString("cmpd"), FSNS( XML_w14, XML_cmpd ) }, - { OUString("pos"), FSNS( XML_w14, XML_pos ) }, - { OUString("ang"), FSNS( XML_w14, XML_ang ) }, - { OUString("scaled"), FSNS( XML_w14, XML_scaled ) }, - { OUString("path"), FSNS( XML_w14, XML_path ) }, - { OUString("l"), FSNS( XML_w14, XML_l ) }, - { OUString("t"), FSNS( XML_w14, XML_t ) }, - { OUString("r"), FSNS( XML_w14, XML_r ) }, - { OUString("b"), FSNS( XML_w14, XML_b ) }, - { OUString("lim"), FSNS( XML_w14, XML_lim ) }, - { OUString("prst"), FSNS( XML_w14, XML_prst ) }, - { OUString("rig"), FSNS( XML_w14, XML_rig ) }, - { OUString("lat"), FSNS( XML_w14, XML_lat ) }, - { OUString("lon"), FSNS( XML_w14, XML_lon ) }, - { OUString("rev"), FSNS( XML_w14, XML_rev ) }, - { OUString("h"), FSNS( XML_w14, XML_h ) }, - { OUString("extrusionH"), FSNS( XML_w14, XML_extrusionH ) }, - { OUString("contourW"), FSNS( XML_w14, XML_contourW ) }, - { OUString("prstMaterial"), FSNS( XML_w14, XML_prstMaterial ) }, - { OUString("id"), FSNS( XML_w14, XML_id ) }, - - { OUString("schemeClr"), FSNS( XML_w14, XML_schemeClr ) }, - { OUString("srgbClr"), FSNS( XML_w14, XML_srgbClr ) }, - { OUString("tint"), FSNS( XML_w14, XML_tint ) }, - { OUString("shade"), FSNS( XML_w14, XML_shade ) }, - { OUString("alpha"), FSNS( XML_w14, XML_alpha ) }, - { OUString("hueMod"), FSNS( XML_w14, XML_hueMod ) }, - { OUString("sat"), FSNS( XML_w14, XML_sat ) }, - { OUString("satOff"), FSNS( XML_w14, XML_satOff ) }, - { OUString("satMod"), FSNS( XML_w14, XML_satMod ) }, - { OUString("lum"), FSNS( XML_w14, XML_lum ) }, - { OUString("lumOff"), FSNS( XML_w14, XML_lumOff ) }, - { OUString("lumMod"), FSNS( XML_w14, XML_lumMod ) }, - { OUString("noFill"), FSNS( XML_w14, XML_noFill ) }, - { OUString("solidFill"), FSNS( XML_w14, XML_solidFill ) }, - { OUString("gradFill"), FSNS( XML_w14, XML_gradFill ) }, - { OUString("gsLst"), FSNS( XML_w14, XML_gsLst ) }, - { OUString("gs"), FSNS( XML_w14, XML_gs ) }, - { OUString("pos"), FSNS( XML_w14, XML_pos ) }, - { OUString("lin"), FSNS( XML_w14, XML_lin ) }, - { OUString("path"), FSNS( XML_w14, XML_path ) }, - { OUString("fillToRect"), FSNS( XML_w14, XML_fillToRect ) }, - { OUString("prstDash"), FSNS( XML_w14, XML_prstDash ) }, - { OUString("round"), FSNS( XML_w14, XML_round ) }, - { OUString("bevel"), FSNS( XML_w14, XML_bevel ) }, - { OUString("miter"), FSNS( XML_w14, XML_miter ) }, - { OUString("camera"), FSNS( XML_w14, XML_camera ) }, - { OUString("lightRig"), FSNS( XML_w14, XML_lightRig ) }, - { OUString("rot"), FSNS( XML_w14, XML_rot ) }, - { OUString("bevelT"), FSNS( XML_w14, XML_bevelT ) }, - { OUString("bevelB"), FSNS( XML_w14, XML_bevelB ) }, - { OUString("extrusionClr"), FSNS( XML_w14, XML_extrusionClr ) }, - { OUString("contourClr"), FSNS( XML_w14, XML_contourClr ) }, - { OUString("styleSet"), FSNS( XML_w14, XML_styleSet ) }, + { u"glow"_ustr, FSNS( XML_w14, XML_glow ) }, + { u"shadow"_ustr, FSNS( XML_w14, XML_shadow ) }, + { u"reflection"_ustr, FSNS( XML_w14, XML_reflection ) }, + { u"textOutline"_ustr, FSNS( XML_w14, XML_textOutline ) }, + { u"textFill"_ustr, FSNS( XML_w14, XML_textFill ) }, + { u"scene3d"_ustr, FSNS( XML_w14, XML_scene3d ) }, + { u"props3d"_ustr, FSNS( XML_w14, XML_props3d ) }, + { u"ligatures"_ustr, FSNS( XML_w14, XML_ligatures ) }, + { u"numForm"_ustr, FSNS( XML_w14, XML_numForm ) }, + { u"numSpacing"_ustr, FSNS( XML_w14, XML_numSpacing ) }, + { u"stylisticSets"_ustr,FSNS( XML_w14, XML_stylisticSets ) }, + { u"cntxtAlts"_ustr, FSNS( XML_w14, XML_cntxtAlts ) }, + + { u"val"_ustr, FSNS( XML_w14, XML_val ) }, + { u"rad"_ustr, FSNS( XML_w14, XML_rad ) }, + { u"blurRad"_ustr, FSNS( XML_w14, XML_blurRad ) }, + { u"stA"_ustr, FSNS( XML_w14, XML_stA ) }, + { u"stPos"_ustr, FSNS( XML_w14, XML_stPos ) }, + { u"endA"_ustr, FSNS( XML_w14, XML_endA ) }, + { u"endPos"_ustr, FSNS( XML_w14, XML_endPos ) }, + { u"dist"_ustr, FSNS( XML_w14, XML_dist ) }, + { u"dir"_ustr, FSNS( XML_w14, XML_dir ) }, + { u"fadeDir"_ustr, FSNS( XML_w14, XML_fadeDir ) }, + { u"sx"_ustr, FSNS( XML_w14, XML_sx ) }, + { u"sy"_ustr, FSNS( XML_w14, XML_sy ) }, + { u"kx"_ustr, FSNS( XML_w14, XML_kx ) }, + { u"ky"_ustr, FSNS( XML_w14, XML_ky ) }, + { u"algn"_ustr, FSNS( XML_w14, XML_algn ) }, + { u"w"_ustr, FSNS( XML_w14, XML_w ) }, + { u"cap"_ustr, FSNS( XML_w14, XML_cap ) }, + { u"cmpd"_ustr, FSNS( XML_w14, XML_cmpd ) }, + { u"pos"_ustr, FSNS( XML_w14, XML_pos ) }, + { u"ang"_ustr, FSNS( XML_w14, XML_ang ) }, + { u"scaled"_ustr, FSNS( XML_w14, XML_scaled ) }, + { u"path"_ustr, FSNS( XML_w14, XML_path ) }, + { u"l"_ustr, FSNS( XML_w14, XML_l ) }, + { u"t"_ustr, FSNS( XML_w14, XML_t ) }, + { u"r"_ustr, FSNS( XML_w14, XML_r ) }, + { u"b"_ustr, FSNS( XML_w14, XML_b ) }, + { u"lim"_ustr, FSNS( XML_w14, XML_lim ) }, + { u"prst"_ustr, FSNS( XML_w14, XML_prst ) }, + { u"rig"_ustr, FSNS( XML_w14, XML_rig ) }, + { u"lat"_ustr, FSNS( XML_w14, XML_lat ) }, + { u"lon"_ustr, FSNS( XML_w14, XML_lon ) }, + { u"rev"_ustr, FSNS( XML_w14, XML_rev ) }, + { u"h"_ustr, FSNS( XML_w14, XML_h ) }, + { u"extrusionH"_ustr, FSNS( XML_w14, XML_extrusionH ) }, + { u"contourW"_ustr, FSNS( XML_w14, XML_contourW ) }, + { u"prstMaterial"_ustr, FSNS( XML_w14, XML_prstMaterial ) }, + { u"id"_ustr, FSNS( XML_w14, XML_id ) }, + + { u"schemeClr"_ustr, FSNS( XML_w14, XML_schemeClr ) }, + { u"srgbClr"_ustr, FSNS( XML_w14, XML_srgbClr ) }, + { u"tint"_ustr, FSNS( XML_w14, XML_tint ) }, + { u"shade"_ustr, FSNS( XML_w14, XML_shade ) }, + { u"alpha"_ustr, FSNS( XML_w14, XML_alpha ) }, + { u"hueMod"_ustr, FSNS( XML_w14, XML_hueMod ) }, + { u"sat"_ustr, FSNS( XML_w14, XML_sat ) }, + { u"satOff"_ustr, FSNS( XML_w14, XML_satOff ) }, + { u"satMod"_ustr, FSNS( XML_w14, XML_satMod ) }, + { u"lum"_ustr, FSNS( XML_w14, XML_lum ) }, + { u"lumOff"_ustr, FSNS( XML_w14, XML_lumOff ) }, + { u"lumMod"_ustr, FSNS( XML_w14, XML_lumMod ) }, + { u"noFill"_ustr, FSNS( XML_w14, XML_noFill ) }, + { u"solidFill"_ustr, FSNS( XML_w14, XML_solidFill ) }, + { u"gradFill"_ustr, FSNS( XML_w14, XML_gradFill ) }, + { u"gsLst"_ustr, FSNS( XML_w14, XML_gsLst ) }, + { u"gs"_ustr, FSNS( XML_w14, XML_gs ) }, + { u"pos"_ustr, FSNS( XML_w14, XML_pos ) }, + { u"lin"_ustr, FSNS( XML_w14, XML_lin ) }, + { u"path"_ustr, FSNS( XML_w14, XML_path ) }, + { u"fillToRect"_ustr, FSNS( XML_w14, XML_fillToRect ) }, + { u"prstDash"_ustr, FSNS( XML_w14, XML_prstDash ) }, + { u"round"_ustr, FSNS( XML_w14, XML_round ) }, + { u"bevel"_ustr, FSNS( XML_w14, XML_bevel ) }, + { u"miter"_ustr, FSNS( XML_w14, XML_miter ) }, + { u"camera"_ustr, FSNS( XML_w14, XML_camera ) }, + { u"lightRig"_ustr, FSNS( XML_w14, XML_lightRig ) }, + { u"rot"_ustr, FSNS( XML_w14, XML_rot ) }, + { u"bevelT"_ustr, FSNS( XML_w14, XML_bevelT ) }, + { u"bevelB"_ustr, FSNS( XML_w14, XML_bevelB ) }, + { u"extrusionClr"_ustr, FSNS( XML_w14, XML_extrusionClr ) }, + { u"contourClr"_ustr, FSNS( XML_w14, XML_contourClr ) }, + { u"styleSet"_ustr, FSNS( XML_w14, XML_styleSet ) }, }; std::optional<sal_Int32> lclGetElementIdForName(std::u16string_view rName) @@ -3636,13 +3636,13 @@ void DocxAttributeOutput::GetSdtEndBefore(const SdrObject* pSdrObj) uno::Reference< beans::XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo(); uno::Sequence< beans::PropertyValue > aGrabBag; - if (xPropSetInfo.is() && xPropSetInfo->hasPropertyByName("FrameInteropGrabBag")) + if (xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(u"FrameInteropGrabBag"_ustr)) { - xPropSet->getPropertyValue("FrameInteropGrabBag") >>= aGrabBag; + xPropSet->getPropertyValue(u"FrameInteropGrabBag"_ustr) >>= aGrabBag; } - else if(xPropSetInfo.is() && xPropSetInfo->hasPropertyByName("InteropGrabBag")) + else if(xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(u"InteropGrabBag"_ustr)) { - xPropSet->getPropertyValue("InteropGrabBag") >>= aGrabBag; + xPropSet->getPropertyValue(u"InteropGrabBag"_ustr) >>= aGrabBag; } auto pProp = std::find_if(std::cbegin(aGrabBag), std::cend(aGrabBag), @@ -4621,7 +4621,7 @@ void DocxAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Point if (const SfxGrabBagItem* pItem = pTableBox->GetFrameFormat()->GetAttrSet().GetItem<SfxGrabBagItem>(RES_FRMATR_GRABBAG)) { const std::map<OUString, uno::Any>& rGrabBag = pItem->GetGrabBag(); - std::map<OUString, uno::Any>::const_iterator it = rGrabBag.find("CellCnfStyle"); + std::map<OUString, uno::Any>::const_iterator it = rGrabBag.find(u"CellCnfStyle"_ustr); if (it != rGrabBag.end()) { uno::Sequence<beans::PropertyValue> aAttributes = it->second.get< uno::Sequence<beans::PropertyValue> >(); @@ -4733,7 +4733,7 @@ void DocxAttributeOutput::StartTableRow( ww8::WW8TableNodeInfoInner::Pointer_t c if (const SfxGrabBagItem* pItem = pTableLine->GetFrameFormat()->GetAttrSet().GetItem<SfxGrabBagItem>(RES_FRMATR_GRABBAG)) { const std::map<OUString, uno::Any>& rGrabBag = pItem->GetGrabBag(); - std::map<OUString, uno::Any>::const_iterator it = rGrabBag.find("RowCnfStyle"); + std::map<OUString, uno::Any>::const_iterator it = rGrabBag.find(u"RowCnfStyle"_ustr); if (it != rGrabBag.end()) { uno::Sequence<beans::PropertyValue> aAttributes = it->second.get< uno::Sequence<beans::PropertyValue> >(); @@ -4841,7 +4841,7 @@ void DocxAttributeOutput::LatentStyles() // Do we have latent styles available? uno::Reference<beans::XPropertySet> xPropertySet(m_rExport.m_rDoc.GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW); uno::Sequence<beans::PropertyValue> aInteropGrabBag; - xPropertySet->getPropertyValue("InteropGrabBag") >>= aInteropGrabBag; + xPropertySet->getPropertyValue(u"InteropGrabBag"_ustr) >>= aInteropGrabBag; uno::Sequence<beans::PropertyValue> aLatentStyles; auto pProp = std::find_if(std::cbegin(aInteropGrabBag), std::cend(aInteropGrabBag), [](const beans::PropertyValue& rProp) { return rProp.Name == "latentStyles"; }); @@ -5112,7 +5112,7 @@ void DocxAttributeOutput::WriteSrcRect( const SwFrameFormat* pFrameFormat) { uno::Reference<graphic::XGraphic> xGraphic; - xShapePropSet->getPropertyValue("Graphic") >>= xGraphic; + xShapePropSet->getPropertyValue(u"Graphic"_ustr) >>= xGraphic; const Graphic aGraphic(xGraphic); Size aOriginalSize(aGraphic.GetPrefSize()); @@ -5125,7 +5125,7 @@ void DocxAttributeOutput::WriteSrcRect( } css::text::GraphicCrop aGraphicCropStruct; - xShapePropSet->getPropertyValue("GraphicCrop") >>= aGraphicCropStruct; + xShapePropSet->getPropertyValue(u"GraphicCrop"_ustr) >>= aGraphicCropStruct; sal_Int32 nCropL = aGraphicCropStruct.Left; sal_Int32 nCropR = aGraphicCropStruct.Right; sal_Int32 nCropT = aGraphicCropStruct.Top; @@ -5286,7 +5286,7 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size // and only use passed frame size as fallback. if (xShapePropSet) { - if (css::awt::Size val; xShapePropSet->getPropertyValue("Size") >>= val) + if (css::awt::Size val; xShapePropSet->getPropertyValue(u"Size"_ustr) >>= val) aSize = Size(o3tl::toTwips(val.Width, o3tl::Length::mm100), o3tl::toTwips(val.Height, o3tl::Length::mm100)); } @@ -5302,7 +5302,7 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size OUString sURL, sRelId; if (xShapePropSet) { - xShapePropSet->getPropertyValue("HyperLinkURL") >>= sURL; + xShapePropSet->getPropertyValue(u"HyperLinkURL"_ustr) >>= sURL; if(!sURL.isEmpty()) { if (sURL.startsWith("#") && sURL.indexOf(' ') != -1 && !sURL.endsWith("|outline") && !sURL.endsWith("|table") && @@ -5449,7 +5449,7 @@ bool DocxAttributeOutput::WriteOLEChart( const SdrObject* pSdrObj, const Size& r return false; OUString clsid; // why is the property of type string, not sequence<byte>? - xPropSet->getPropertyValue("CLSID") >>= clsid; + xPropSet->getPropertyValue(u"CLSID"_ustr) >>= clsid; assert(!clsid.isEmpty()); SvGlobalName aClassID; bool const isValid(aClassID.MakeId(clsid)); @@ -5478,7 +5478,7 @@ void DocxAttributeOutput::WritePostponedChart() { uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY ); if( xPropSet.is() ) - xChartDoc.set( xPropSet->getPropertyValue( "Model" ), uno::UNO_QUERY ); + xChartDoc.set( xPropSet->getPropertyValue( u"Model"_ustr ), uno::UNO_QUERY ); } if( xChartDoc.is() ) @@ -5487,15 +5487,15 @@ void DocxAttributeOutput::WritePostponedChart() m_rExport.SdrExporter().startDMLAnchorInline(rChart.frame, rChart.size); - OUString sName("Object 1"); + OUString sName(u"Object 1"_ustr); uno::Reference< container::XNamed > xNamed( xShape, uno::UNO_QUERY ); if( xNamed.is() ) sName = xNamed->getName(); // tdf#153203 export a11y related properties uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY); - OUString const title(xShapeProps->getPropertyValue("Title").get<OUString>()); - OUString const descr(xShapeProps->getPropertyValue("Description").get<OUString>()); + OUString const title(xShapeProps->getPropertyValue(u"Title"_ustr).get<OUString>()); + OUString const descr(xShapeProps->getPropertyValue(u"Description"_ustr).get<OUString>()); /* If there is a scenario where a chart is followed by a shape which is being exported as an alternate content then, the @@ -5595,7 +5595,7 @@ void DocxAttributeOutput::WritePostponedFormControl(const SdrObject* pObject) if (!xInfo.is()) return; - if (xInfo->supportsService("com.sun.star.form.component.DateField")) + if (xInfo->supportsService(u"com.sun.star.form.component.DateField"_ustr)) { // gather component properties @@ -5606,7 +5606,7 @@ void DocxAttributeOutput::WritePostponedFormControl(const SdrObject* pObject) OUString aContentText; bool bHasDate = false; css::util::Date aUNODate; - if (xPropertySet->getPropertyValue("Date") >>= aUNODate) + if (xPropertySet->getPropertyValue(u"Date"_ustr) >>= aUNODate) { bHasDate = true; Date aDate(aUNODate.Day, aUNODate.Month, aUNODate.Year); @@ -5616,7 +5616,7 @@ void DocxAttributeOutput::WritePostponedFormControl(const SdrObject* pObject) } else { - aContentText = xPropertySet->getPropertyValue("HelpText").get<OUString>(); + aContentText = xPropertySet->getPropertyValue(u"HelpText"_ustr).get<OUString>(); if(sDateFormat.isEmpty()) sDateFormat = "dd/MM/yyyy"; // Need to set date format even if there is no date set } @@ -5651,13 +5651,13 @@ void DocxAttributeOutput::WritePostponedFormControl(const SdrObject* pObject) m_pSerializer->endElementNS(XML_w, XML_sdt); } - else if (xInfo->supportsService("com.sun.star.form.component.ComboBox")) + else if (xInfo->supportsService(u"com.sun.star.form.component.ComboBox"_ustr)) { // gather component properties uno::Reference<beans::XPropertySet> xPropertySet(xControlModel, uno::UNO_QUERY); - OUString sText = xPropertySet->getPropertyValue("Text").get<OUString>(); - const uno::Sequence<OUString> aItems = xPropertySet->getPropertyValue("StringItemList").get< uno::Sequence<OUString> >(); + OUString sText = xPropertySet->getPropertyValue(u"Text"_ustr).get<OUString>(); + const uno::Sequence<OUString> aItems = xPropertySet->getPropertyValue(u"StringItemList"_ustr).get< uno::Sequence<OUString> >(); // output component @@ -5789,8 +5789,8 @@ bool DocxAttributeOutput::ExportAsActiveXControl(const SdrObject* pObject) const // See WritePostponedFormControl // By now date field and combobox is handled on a different way, so let's not interfere with the other method. - if(xInfo->supportsService("com.sun.star.form.component.DateField") || - xInfo->supportsService("com.sun.star.form.component.ComboBox")) + if(xInfo->supportsService(u"com.sun.star.form.component.DateField"_ustr) || + xInfo->supportsService(u"com.sun.star.form.component.ComboBox"_ustr)) return false; oox::ole::OleFormCtrlExportHelper exportHelper(comphelper::getProcessComponentContext(), xModel, xControlModel); @@ -6671,16 +6671,16 @@ static bool lcl_guessQFormat(const OUString& rName, sal_uInt16 nWwId) static o3tl::sorted_vector<OUString, OUStringIgnoreCase> const aAllowlist { - "No Spacing", - "List Paragraph", - "Quote", - "Intense Quote", - "Subtle Emphasis", - "Intense Emphasis", - "Subtle Reference", - "Intense Reference", - "Book Title", - "TOC Heading", + u"No Spacing"_ustr, + u"List Paragraph"_ustr, + u"Quote"_ustr, + u"Intense Quote"_ustr, + u"Subtle Emphasis"_ustr, + u"Intense Emphasis"_ustr, + u"Subtle Reference"_ustr, + u"Intense Reference"_ustr, + u"Book Title"_ustr, + u"TOC Heading"_ustr, }; // Not custom style? Then we have a list of standard styles which should be qFormat. return aAllowlist.find(rName) != aAllowlist.end(); @@ -7403,7 +7403,7 @@ bool DocxAttributeOutput::EmbedFontStyle(std::u16string_view name, int tag, Font return false; uno::Reference< css::io::XOutputStream > xOutStream = m_rExport.GetFilter().openFragmentStream( "word/fonts/font" + OUString::number(m_nextFontId) + ".odttf", - "application/vnd.openxmlformats-officedocument.obfuscatedFont" ); + u"application/vnd.openxmlformats-officedocument.obfuscatedFont"_ustr ); // Not much point in trying hard with the obfuscation key, whoever reads the spec can read the font anyway, // so just alter the first and last part of the key. char fontKeyStr[] = "{00014A78-CABC-4EF0-12AC-5CD89AEFDE00}"; @@ -9733,7 +9733,7 @@ void DocxAttributeOutput::FormatBox( const SvxBoxItem& rBox ) uno::Reference< drawing::XShape > xShape( const_cast<SdrObject*>(pSdrObj)->getUnoShape(), uno::UNO_QUERY ); uno::Reference< beans::XPropertySet > xPropertySet( xShape, uno::UNO_QUERY ); m_rDrawingML.SetFS(m_pSerializer); - m_rDrawingML.WriteBlipFill(xPropertySet, "BackGraphic"); + m_rDrawingML.WriteBlipFill(xPropertySet, u"BackGraphic"_ustr); } } } diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index fe72e357e376..adff5738da45 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -391,7 +391,7 @@ OString DocxExport::OutputChart( uno::Reference< frame::XModel > const & xModel, aFileName = "word/charts/chart" + OUString::number(nCount) + ".xml"; ::sax_fastparser::FSHelperPtr pChartFS = m_rFilter.openFragmentStreamWithSerializer( aFileName, - "application/vnd.openxmlformats-officedocument.drawingml.chart+xml" ); + u"application/vnd.openxmlformats-officedocument.drawingml.chart+xml"_ustr ); #if !ENABLE_WASM_STRIP_CHART // WASM_CHART change @@ -470,11 +470,11 @@ std::pair<OString, OString> DocxExport::WriteActiveXObject(const uno::Reference< OString sGUID; OString sName; - uno::Reference<io::XStream> xOutStorage(m_rFilter.openFragmentStream(sBinaryFileName, "application/vnd.ms-office.activeX"), uno::UNO_QUERY); + uno::Reference<io::XStream> xOutStorage(m_rFilter.openFragmentStream(sBinaryFileName, u"application/vnd.ms-office.activeX"_ustr), uno::UNO_QUERY); if(xOutStorage.is()) { oox::ole::OleStorage aOleStorage(m_rFilter.getComponentContext(), xOutStorage, false); - uno::Reference<io::XOutputStream> xOutputStream(aOleStorage.openOutputStream("contents"), uno::UNO_SET_THROW); + uno::Reference<io::XOutputStream> xOutputStream(aOleStorage.openOutputStream(u"contents"_ustr), uno::UNO_SET_THROW); uno::Reference< css::frame::XModel > xModel( m_rDoc.GetDocShell() ? m_rDoc.GetDocShell()->GetModel() : nullptr ); oox::ole::OleFormCtrlExportHelper exportHelper(comphelper::getProcessComponentContext(), xModel, rxControlModel); if ( !exportHelper.isValid() ) @@ -487,7 +487,7 @@ std::pair<OString, OString> DocxExport::WriteActiveXObject(const uno::Reference< // Write out ActiveX fragment const OUString sXMLFileName = "word/activeX/activeX" + OUString::number( m_nActiveXControls ) + ".xml"; - ::sax_fastparser::FSHelperPtr pActiveXFS = m_rFilter.openFragmentStreamWithSerializer(sXMLFileName, "application/vnd.ms-office.activeX+xml" ); + ::sax_fastparser::FSHelperPtr pActiveXFS = m_rFilter.openFragmentStreamWithSerializer(sXMLFileName, u"application/vnd.ms-office.activeX+xml"_ustr ); const OUString sBinaryId = m_rFilter.addRelation( pActiveXFS->getOutputStream(), oox::getRelationship(Relationship::ACTIVEXCONTROLBINARY), @@ -514,9 +514,9 @@ void DocxExport::OutputDML(uno::Reference<drawing::XShape> const & xShape) { uno::Reference<lang::XServiceInfo> xServiceInfo(xShape, uno::UNO_QUERY_THROW); sal_Int32 nNamespace = XML_wps; - if (xServiceInfo->supportsService("com.sun.star.drawing.GroupShape")) + if (xServiceInfo->supportsService(u"com.sun.star.drawing.GroupShape"_ustr)) nNamespace = XML_wpg; - else if (xServiceInfo->supportsService("com.sun.star.drawing.GraphicObjectShape")) + else if (xServiceInfo->supportsService(u"com.sun.star.drawing.GraphicObjectShape"_ustr)) nNamespace = XML_pic; oox::drawingml::ShapeExport aExport(nNamespace, m_pAttrOutput->GetSerializer(), nullptr, &m_rFilter, oox::drawingml::DOCUMENT_DOCX, m_pAttrOutput.get()); aExport.WriteShape(xShape); @@ -675,8 +675,8 @@ void DocxExport::InitStyles() u"styles.xml" ); ::sax_fastparser::FSHelperPtr pStylesFS = - m_rFilter.openFragmentStreamWithSerializer( "word/styles.xml", - "application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml" ); + m_rFilter.openFragmentStreamWithSerializer( u"word/styles.xml"_ustr, + u"application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml"_ustr ); // switch the serializer to redirect the output to word/styles.xml m_pAttrOutput->SetSerializer( pStylesFS ); @@ -700,8 +700,8 @@ void DocxExport::WriteFootnotesEndnotes() u"footnotes.xml" ); ::sax_fastparser::FSHelperPtr pFootnotesFS = - m_rFilter.openFragmentStreamWithSerializer( "word/footnotes.xml", - "application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml" ); + m_rFilter.openFragmentStreamWithSerializer( u"word/footnotes.xml"_ustr, + u"application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml"_ustr ); // switch the serializer to redirect the output to word/footnotes.xml m_pAttrOutput->SetSerializer( pFootnotesFS ); @@ -730,8 +730,8 @@ void DocxExport::WriteFootnotesEndnotes() u"endnotes.xml" ); ::sax_fastparser::FSHelperPtr pEndnotesFS = - m_rFilter.openFragmentStreamWithSerializer( "word/endnotes.xml", - "application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml" ); + m_rFilter.openFragmentStreamWithSerializer( u"word/endnotes.xml"_ustr, + u"application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml"_ustr ); // switch the serializer to redirect the output to word/endnotes.xml m_pAttrOutput->SetSerializer( pEndnotesFS ); @@ -761,8 +761,8 @@ void DocxExport::WritePostitFields() u"comments.xml" ); ::sax_fastparser::FSHelperPtr pPostitFS = - m_rFilter.openFragmentStreamWithSerializer( "word/comments.xml", - "application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml" ); + m_rFilter.openFragmentStreamWithSerializer( u"word/comments.xml"_ustr, + u"application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml"_ustr ); pPostitFS->startElementNS( XML_w, XML_comments, MainXmlNamespaces()); m_pAttrOutput->SetSerializer( pPostitFS ); @@ -779,8 +779,8 @@ void DocxExport::WritePostitFields() u"commentsExtended.xml"); pPostitFS = m_rFilter.openFragmentStreamWithSerializer( - "word/commentsExtended.xml", - "application/vnd.openxmlformats-officedocument.wordprocessingml.commentsExtended+xml"); + u"word/commentsExtended.xml"_ustr, + u"application/vnd.openxmlformats-officedocument.wordprocessingml.commentsExtended+xml"_ustr); pPostitFS->startElementNS(XML_w15, XML_commentsEx, // Add namespaces manually now FSNS(XML_xmlns, XML_mc), m_rFilter.getNamespaceURL(OOX_NS(mce)), @@ -802,8 +802,8 @@ void DocxExport::WriteNumbering() oox::getRelationship(Relationship::NUMBERING), u"numbering.xml" ); - ::sax_fastparser::FSHelperPtr pNumberingFS = m_rFilter.openFragmentStreamWithSerializer( "word/numbering.xml", - "application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml" ); + ::sax_fastparser::FSHelperPtr pNumberingFS = m_rFilter.openFragmentStreamWithSerializer( u"word/numbering.xml"_ustr, + u"application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml"_ustr ); // switch the serializer to redirect the output to word/numbering.xml m_pAttrOutput->SetSerializer( pNumberingFS ); @@ -847,7 +847,7 @@ void DocxExport::WriteHeaderFooter( const SwFormat* pFormat, bool bHeader, const aName ); pFS = m_rFilter.openFragmentStreamWithSerializer( "word/" + aName, - "application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml" ); + u"application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml"_ustr ); pFS->startElementNS( XML_w, XML_hdr, MainXmlNamespaces()); } @@ -860,7 +860,7 @@ void DocxExport::WriteHeaderFooter( const SwFormat* pFormat, bool bHeader, const aName ); pFS = m_rFilter.openFragmentStreamWithSerializer( "word/" + aName, - "application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml" ); + u"application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml"_ustr ); pFS->startElementNS( XML_w, XML_ftr, MainXmlNamespaces()); } @@ -914,8 +914,8 @@ void DocxExport::WriteFonts() u"fontTable.xml" ); ::sax_fastparser::FSHelperPtr pFS = m_rFilter.openFragmentStreamWithSerializer( - "word/fontTable.xml", - "application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml" ); + u"word/fontTable.xml"_ustr, + u"application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml"_ustr ); pFS->startElementNS( XML_w, XML_fonts, FSNS( XML_xmlns, XML_w ), m_rFilter.getNamespaceURL(OOX_NS(doc)), @@ -988,7 +988,7 @@ void DocxExport::WriteDocVars(const sax_fastparser::FSHelperPtr& pFS) OUString aKey = rMasterName.copy(aPrefix.getLength()); OUString aValue; - xField->getPropertyValue("Content") >>= aValue; + xField->getPropertyValue(u"Content"_ustr) >>= aValue; if (!bStarted) { bStarted = true; @@ -1046,8 +1046,8 @@ void DocxExport::WriteSettings() u"settings.xml" ); ::sax_fastparser::FSHelperPtr pFS = m_rFilter.openFragmentStreamWithSerializer( - "word/settings.xml", - "application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml" ); + u"word/settings.xml"_ustr, + u"application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml"_ustr ); pFS->startElementNS( XML_w, XML_settings, FSNS( XML_xmlns, XML_w ), m_rFilter.getNamespaceURL(OOX_NS(doc)) ); @@ -1247,10 +1247,10 @@ void DocxExport::WriteSettings() { bWriterWantsToProtect = bWriterWantsToProtectForm = true; } - if ( xPropSetInfo->hasPropertyByName( "RedlineProtectionKey" ) ) + if ( xPropSetInfo->hasPropertyByName( u"RedlineProtectionKey"_ustr ) ) { uno::Sequence<sal_Int8> aKey; - xPropSet->getPropertyValue( "RedlineProtectionKey" ) >>= aKey; + xPropSet->getPropertyValue( u"RedlineProtectionKey"_ustr ) >>= aKey; bool bHasRedlineProtectionKey = aKey.hasElements(); bHasDummyRedlineProtectionKey = aKey.getLength() == 1 && aKey[0] == 1; if ( bHasRedlineProtectionKey && !bHasDummyRedlineProtectionKey ) @@ -1562,8 +1562,8 @@ void DocxExport::WriteGlossary() oox::getRelationship(Relationship::GLOSSARYDOCUMENT), u"glossary/document.xml" ); - uno::Reference< io::XOutputStream > xOutputStream = GetFilter().openFragmentStream( "word/glossary/document.xml", - "application/vnd.openxmlformats-officedocument.wordprocessingml.document.glossary+xml" ); + uno::Reference< io::XOutputStream > xOutputStream = GetFilter().openFragmentStream( u"word/glossary/document.xml"_ustr, + u"application/vnd.openxmlformats-officedocument.wordprocessingml.document.glossary+xml"_ustr ); uno::Reference< xml::sax::XSAXSerializable > serializer( glossaryDocDom, uno::UNO_QUERY ); uno::Reference< xml::sax::XWriter > writer = xml::sax::Writer::create( comphelper::getProcessComponentContext() ); @@ -1655,7 +1655,7 @@ static void lcl_UpdateXmlValues(const SdtData& sdtData, const uno::Reference<css // XSLT transformation stylesheet: // - write all elements as is // - but if element matches sdtData.xpath, replace its text content by sdtData.xpath - uno::Any(beans::NamedValue("StylesheetText", uno::Any(OUString("<?xml version=\"1.0\" encoding=\"UTF-8\"?> \ + uno::Any(beans::NamedValue(u"StylesheetText"_ustr, uno::Any(OUString("<?xml version=\"1.0\" encoding=\"UTF-8\"?> \ <xsl:stylesheet\ xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"\ " + sdtData.namespaces + "\ @@ -1722,12 +1722,12 @@ void DocxExport::WriteCustomXml() uno::Reference< xml::sax::XWriter > writer = xml::sax::Writer::create( comphelper::getProcessComponentContext() ); uno::Reference < css::io::XOutputStream > xOutStream = GetFilter().openFragmentStream("customXml/item" + OUString::number(j + 1) + ".xml", - "application/xml"); + u"application/xml"_ustr); if (m_SdtData.size()) { // There are some SDT blocks data with data bindings which can update some custom xml values uno::Reference< io::XStream > xMemStream( - comphelper::getProcessComponentContext()->getServiceManager()->createInstanceWithContext("com.sun.star.comp.MemoryStream", + comphelper::getProcessComponentContext()->getServiceManager()->createInstanceWithContext(u"com.sun.star.comp.MemoryStream"_ustr, comphelper::getProcessComponentContext()), uno::UNO_QUERY_THROW); @@ -1751,7 +1751,7 @@ void DocxExport::WriteCustomXml() else { xXSLTOutStream.set( - comphelper::getProcessComponentContext()->getServiceManager()->createInstanceWithContext("com.sun.star.comp.MemoryStream", + comphelper::getProcessComponentContext()->getServiceManager()->createInstanceWithContext(u"com.sun.star.comp.MemoryStream"_ustr, comphelper::getProcessComponentContext()), uno::UNO_QUERY_THROW); lcl_UpdateXmlValues(m_SdtData[i], xXSLTInStream->getInputStream(), xXSLTOutStream->getOutputStream()); @@ -1775,13 +1775,13 @@ void DocxExport::WriteCustomXml() uno::Reference< xml::sax::XSAXSerializable > serializer( customXmlDomProps, uno::UNO_QUERY ); uno::Reference< xml::sax::XWriter > writer = xml::sax::Writer::create( comphelper::getProcessComponentContext() ); writer->setOutputStream( GetFilter().openFragmentStream( "customXml/itemProps"+OUString::number(j+1)+".xml", - "application/vnd.openxmlformats-officedocument.customXmlProperties+xml" ) ); + u"application/vnd.openxmlformats-officedocument.customXmlProperties+xml"_ustr ) ); serializer->serialize( uno::Reference< xml::sax::XDocumentHandler >( writer, uno::UNO_QUERY_THROW ), uno::Sequence< beans::StringPair >() ); // Adding itemprops's relationship entry to item.xml.rels file m_rFilter.addRelation( GetFilter().openFragmentStream( "customXml/item"+OUString::number(j+1)+".xml", - "application/xml" ) , + u"application/xml"_ustr ) , oox::getRelationship(Relationship::CUSTOMXMLPROPS), Concat2View("itemProps"+OUString::number(j+1)+".xml" )); } @@ -1795,7 +1795,7 @@ void DocxExport::WriteVBA() return; uno::Reference<embed::XStorage> xDocumentStorage = xStorageBasedDocument->getDocumentStorage(); - OUString aMacrosName("_MS_VBA_Macros"); + OUString aMacrosName(u"_MS_VBA_Macros"_ustr); if (!xDocumentStorage.is() || !xDocumentStorage->hasByName(aMacrosName)) return; @@ -1807,7 +1807,7 @@ void DocxExport::WriteVBA() // First handle the project stream, this sets xProjectStream. std::unique_ptr<SvStream> pIn(utl::UcbStreamHelper::CreateStream(xMacrosStream)); - xProjectStream = GetFilter().openFragmentStream("word/vbaProject.bin", "application/vnd.ms-office.vbaProject"); + xProjectStream = GetFilter().openFragmentStream(u"word/vbaProject.bin"_ustr, u"application/vnd.ms-office.vbaProject"_ustr); uno::Reference<io::XStream> xOutputStream(xProjectStream, uno::UNO_QUERY); if (!xOutputStream.is()) return; @@ -1820,7 +1820,7 @@ void DocxExport::WriteVBA() m_rFilter.addRelation(m_pDocumentFS->getOutputStream(), oox::getRelationship(Relationship::VBAPROJECT), u"vbaProject.bin"); } - OUString aDataName("_MS_VBA_Macros_XML"); + OUString aDataName(u"_MS_VBA_Macros_XML"_ustr); if (!xDocumentStorage.is() || !xDocumentStorage->hasByName(aDataName)) return; @@ -1832,7 +1832,7 @@ void DocxExport::WriteVBA() // xProjectStream. std::unique_ptr<SvStream> pIn(utl::UcbStreamHelper::CreateStream(xDataStream)); - uno::Reference<io::XStream> xOutputStream(GetFilter().openFragmentStream("word/vbaData.xml", "application/vnd.ms-word.vbaData+xml"), uno::UNO_QUERY); + uno::Reference<io::XStream> xOutputStream(GetFilter().openFragmentStream(u"word/vbaData.xml"_ustr, u"application/vnd.ms-word.vbaData+xml"_ustr), uno::UNO_QUERY); if (!xOutputStream.is()) return; std::unique_ptr<SvStream> pOut(utl::UcbStreamHelper::CreateStream(xOutputStream)); @@ -1877,7 +1877,7 @@ void DocxExport::WriteEmbeddings() { try { - const css::uno::Any val = xProps->getPropertyValue("MediaType"); + const css::uno::Any val = xProps->getPropertyValue(u"MediaType"_ustr); val >>= contentType; } catch (const css::beans::UnknownPropertyException&) @@ -2203,7 +2203,7 @@ DocxExport::DocxExport(DocxExportFilter& rFilter, SwDoc& rDocument, // the actual document - m_pDocumentFS = m_rFilter.openFragmentStreamWithSerializer( "word/document.xml", aMediaType ); + m_pDocumentFS = m_rFilter.openFragmentStreamWithSerializer( u"word/document.xml"_ustr, aMediaType ); SetFS(m_pDocumentFS); diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx index 04a5d015050f..1d3004e2aa9b 100644 --- a/sw/source/filter/ww8/docxexportfilter.cxx +++ b/sw/source/filter/ww8/docxexportfilter.cxx @@ -126,7 +126,7 @@ bool DocxExportFilter::exportDocument() OUString DocxExportFilter::getImplementationName() { - return "com.sun.star.comp.Writer.DocxExport"; + return u"com.sun.star.comp.Writer.DocxExport"_ustr; } extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index 70281e4eac7b..82acd5a78f03 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -74,7 +74,7 @@ OUString lclGetAnchorIdFromGrabBag(const SdrObject* pObj) uno::UNO_QUERY); OUString aGrabBagName; uno::Reference<lang::XServiceInfo> xServiceInfo(xShape, uno::UNO_QUERY); - if (xServiceInfo->supportsService("com.sun.star.text.TextFrame")) + if (xServiceInfo->supportsService(u"com.sun.star.text.TextFrame"_ustr)) aGrabBagName = "FrameInteropGrabBag"; else aGrabBagName = "InteropGrabBag"; @@ -802,7 +802,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrameFormat* pFrameFormat, cons uno::Any aAny; pObj->GetGrabBagItem(aAny); comphelper::SequenceAsHashMap aGrabBag(aAny); - auto it = aGrabBag.find("AnchorDistDiff"); + auto it = aGrabBag.find(u"AnchorDistDiff"_ustr); if (it != aGrabBag.end()) { comphelper::SequenceAsHashMap aAnchorDistDiff(it->second); @@ -869,7 +869,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrameFormat* pFrameFormat, cons uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY); if (xShapeProps.is()) - xShapeProps->getPropertyValue("IsFollowingTextFlow") >>= bLclInTabCell; + xShapeProps->getPropertyValue(u"IsFollowingTextFlow"_ustr) >>= bLclInTabCell; } const SwFormatHoriOrient& rHoriOri(pFrameFormat->GetHoriOrient()); @@ -1167,7 +1167,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrameFormat* pFrameFormat, cons uno::Any aAny; pObj->GetGrabBagItem(aAny); comphelper::SequenceAsHashMap aGrabBag(aAny); - auto it = aGrabBag.find("CT_EffectExtent"); + auto it = aGrabBag.find(u"CT_EffectExtent"_ustr); if (it != aGrabBag.end()) { comphelper::SequenceAsHashMap aEffectExtent(it->second); @@ -1227,17 +1227,17 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrameFormat* pFrameFormat, cons switch (rSurround.GetSurround()) { case text::WrapTextMode_DYNAMIC: - sWrapType = OUString("largest"); + sWrapType = u"largest"_ustr; break; case text::WrapTextMode_LEFT: - sWrapType = OUString("left"); + sWrapType = u"left"_ustr; break; case text::WrapTextMode_RIGHT: - sWrapType = OUString("right"); + sWrapType = u"right"_ustr; break; case text::WrapTextMode_PARALLEL: default: - sWrapType = OUString("bothSides"); + sWrapType = u"bothSides"_ustr; break; } @@ -1296,7 +1296,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrameFormat* pFrameFormat, cons uno::Any aAny; pObj->GetGrabBagItem(aAny); comphelper::SequenceAsHashMap aGrabBag(aAny); - auto it = aGrabBag.find("CT_WrapPath"); + auto it = aGrabBag.find(u"CT_WrapPath"_ustr); if (it != aGrabBag.end()) { m_pImpl->getSerializer()->startElementNS(XML_wp, nWrapToken, XML_wrapText, sWrapType); @@ -1377,7 +1377,8 @@ void DocxSdrExport::writeVMLDrawing(const SdrObject* sdrObj, const SwFrameFormat static bool lcl_isLockedCanvas(const uno::Reference<drawing::XShape>& xShape) { - const uno::Sequence<beans::PropertyValue> propList = lclGetProperty(xShape, "InteropGrabBag"); + const uno::Sequence<beans::PropertyValue> propList + = lclGetProperty(xShape, u"InteropGrabBag"_ustr); /* * Export as Locked Canvas only if the property * is in the PropertySet @@ -1390,7 +1391,7 @@ static bool lcl_isLockedCanvas(const uno::Reference<drawing::XShape>& xShape) void AddExtLst(sax_fastparser::FSHelperPtr const& pFS, DocxExport const& rExport, uno::Reference<beans::XPropertySet> const& xShape) { - if (xShape->getPropertyValue("Decorative").get<bool>()) + if (xShape->getPropertyValue(u"Decorative"_ustr).get<bool>()) { pFS->startElementNS(XML_a, XML_extLst, // apparently for DOCX the namespace isn't declared on the root @@ -1453,9 +1454,9 @@ void DocxSdrExport::writeDMLDrawing(const SdrObject* pSdrObject, const SwFrameFo uno::Reference<lang::XServiceInfo> xServiceInfo(xShape, uno::UNO_QUERY_THROW); const char* pNamespace = "http://schemas.microsoft.com/office/word/2010/wordprocessingShape"; - if (xServiceInfo->supportsService("com.sun.star.drawing.GroupShape")) + if (xServiceInfo->supportsService(u"com.sun.star.drawing.GroupShape"_ustr)) pNamespace = "http://schemas.microsoft.com/office/word/2010/wordprocessingGroup"; - else if (xServiceInfo->supportsService("com.sun.star.drawing.GraphicObjectShape")) + else if (xServiceInfo->supportsService(u"com.sun.star.drawing.GraphicObjectShape"_ustr)) pNamespace = "http://schemas.openxmlformats.org/drawingml/2006/picture"; pFS->startElementNS(XML_a, XML_graphic, FSNS(XML_xmlns, XML_a), m_pImpl->getExport().GetFilter().getNamespaceURL(OOX_NS(dml))); @@ -1576,16 +1577,16 @@ bool DocxSdrExport::Impl::isSupportedDMLShape(const uno::Reference<drawing::XSha const SdrObject* pSdrObject) { uno::Reference<lang::XServiceInfo> xServiceInfo(xShape, uno::UNO_QUERY_THROW); - if (xServiceInfo->supportsService("com.sun.star.drawing.PolyPolygonShape") - || xServiceInfo->supportsService("com.sun.star.drawing.PolyLineShape")) + if (xServiceInfo->supportsService(u"com.sun.star.drawing.PolyPolygonShape"_ustr) + || xServiceInfo->supportsService(u"com.sun.star.drawing.PolyLineShape"_ustr)) return false; uno::Reference<beans::XPropertySet> xShapeProperties(xShape, uno::UNO_QUERY); // For signature line shapes, we don't want DML, just the VML shape. - if (xServiceInfo->supportsService("com.sun.star.drawing.GraphicObjectShape")) + if (xServiceInfo->supportsService(u"com.sun.star.drawing.GraphicObjectShape"_ustr)) { bool bIsSignatureLineShape = false; - xShapeProperties->getPropertyValue("IsSignatureLine") >>= bIsSignatureLineShape; + xShapeProperties->getPropertyValue(u"IsSignatureLine"_ustr) >>= bIsSignatureLineShape; if (bIsSignatureLineShape) return false; } @@ -1595,7 +1596,7 @@ bool DocxSdrExport::Impl::isSupportedDMLShape(const uno::Reference<drawing::XSha if (pSdrObject->IsTextPath()) { css::drawing::FillStyle eFillStyle = css::drawing::FillStyle_SOLID; - xShapeProperties->getPropertyValue("FillStyle") >>= eFillStyle; + xShapeProperties->getPropertyValue(u"FillStyle"_ustr) >>= eFillStyle; if (eFillStyle == css::drawing::FillStyle_BITMAP) return false; } @@ -1816,8 +1817,8 @@ void DocxSdrExport::writeDMLTextFrame(ww8::Frame const* pParentFrame, int nAncho m_pImpl->setBodyPrAttrList(sax_fastparser::FastSerializerHelper::createAttrList().get()); { drawing::TextVerticalAdjust eAdjust = drawing::TextVerticalAdjust_TOP; - if (xPropSetInfo.is() && xPropSetInfo->hasPropertyByName("TextVerticalAdjust")) - xPropertySet->getPropertyValue("TextVerticalAdjust") >>= eAdjust; + if (xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(u"TextVerticalAdjust"_ustr)) + xPropertySet->getPropertyValue(u"TextVerticalAdjust"_ustr) >>= eAdjust; m_pImpl->getBodyPrAttrList()->add(XML_anchor, oox::drawingml::GetTextVerticalAdjust(eAdjust)); } @@ -1835,7 +1836,7 @@ void DocxSdrExport::writeDMLTextFrame(ww8::Frame const* pParentFrame, int nAncho OUString sHyperlink; if (xPropertySet.is()) - xPropertySet->getPropertyValue("HyperLinkURL") >>= sHyperlink; + xPropertySet->getPropertyValue(u"HyperLinkURL"_ustr) >>= sHyperlink; if (!sHyperlink.isEmpty()) { OUString sRelId = m_pImpl->getExport().GetFilter().addRelation( @@ -1858,10 +1859,10 @@ void DocxSdrExport::writeDMLTextFrame(ww8::Frame const* pParentFrame, int nAncho uno::Any aRotation; m_pImpl->setDMLandVMLTextFrameRotation(0_deg100); - if (xPropSetInfo.is() && xPropSetInfo->hasPropertyByName("FrameInteropGrabBag")) + if (xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(u"FrameInteropGrabBag"_ustr)) { uno::Sequence<beans::PropertyValue> propList; - xPropertySet->getPropertyValue("FrameInteropGrabBag") >>= propList; + xPropertySet->getPropertyValue(u"FrameInteropGrabBag"_ustr) >>= propList; auto pProp = std::find_if(std::cbegin(propList), std::cend(propList), [](const beans::PropertyValue& rProp) { return rProp.Name == "mso-rotation-angle"; @@ -1889,11 +1890,11 @@ void DocxSdrExport::writeDMLTextFrame(ww8::Frame const* pParentFrame, int nAncho OString aHeight(OString::number(TwipsToEMU(aSize.Height()))); pFS->singleElementNS(XML_a, XML_ext, XML_cx, aWidth, XML_cy, aHeight); pFS->endElementNS(XML_a, XML_xfrm); - OUString shapeType = "rect"; - if (xPropSetInfo.is() && xPropSetInfo->hasPropertyByName("FrameInteropGrabBag")) + OUString shapeType = u"rect"_ustr; + if (xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(u"FrameInteropGrabBag"_ustr)) { uno::Sequence<beans::PropertyValue> propList; - xPropertySet->getPropertyValue("FrameInteropGrabBag") >>= propList; + xPropertySet->getPropertyValue(u"FrameInteropGrabBag"_ustr) >>= propList; auto pProp = std::find_if(std::cbegin(propList), std::cend(propList), [](const beans::PropertyValue& rProp) { return rProp.Name == "mso-orig-shape-type"; @@ -1962,10 +1963,10 @@ void DocxSdrExport::writeDMLTextFrame(ww8::Frame const* pParentFrame, int nAncho OUString sLinkChainName; if (xPropSetInfo.is()) { - if (xPropSetInfo->hasPropertyByName("LinkDisplayName")) - xPropertySet->getPropertyValue("LinkDisplayName") >>= sLinkChainName; - else if (xPropSetInfo->hasPropertyByName("ChainName")) - xPropertySet->getPropertyValue("ChainName") >>= sLinkChainName; + if (xPropSetInfo->hasPropertyByName(u"LinkDisplayName"_ustr)) + xPropertySet->getPropertyValue(u"LinkDisplayName"_ustr) >>= sLinkChainName; + else if (xPropSetInfo->hasPropertyByName(u"ChainName"_ustr)) + xPropertySet->getPropertyValue(u"ChainName"_ustr) >>= sLinkChainName; } // second, check if THIS textbox is linked and then decide whether to write the tag txbx or linkedTxbx @@ -2132,7 +2133,7 @@ void DocxSdrExport::writeVMLTextFrame(ww8::Frame const* pParentFrame, bool bText uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY); OUString sHyperlink; if (xShapeProps.is()) - xShapeProps->getPropertyValue("HyperLinkURL") >>= sHyperlink; + xShapeProps->getPropertyValue(u"HyperLinkURL"_ustr) >>= sHyperlink; if (!sHyperlink.isEmpty()) m_pImpl->getFlyAttrList()->add(XML_href, sHyperlink); } diff --git a/sw/source/filter/ww8/docxtableexport.cxx b/sw/source/filter/ww8/docxtableexport.cxx index ba89f5695d04..8f56d3af9d9f 100644 --- a/sw/source/filter/ww8/docxtableexport.cxx +++ b/sw/source/filter/ww8/docxtableexport.cxx @@ -221,12 +221,12 @@ void DocxAttributeOutput::TableDefinition( rtl::Reference<SwXTextTable> xPropertySet = SwXTextTables::GetObject(*pTable->GetFrameFormat()); bool isWidthRelative = false; - xPropertySet->getPropertyValue("IsWidthRelative") >>= isWidthRelative; + xPropertySet->getPropertyValue(u"IsWidthRelative"_ustr) >>= isWidthRelative; if (!isWidthRelative && !nWidthPercent) { // The best fit for "automatic" table placement is relative 100% short nHoriOrient = -1; - xPropertySet->getPropertyValue("HoriOrient") >>= nHoriOrient; + xPropertySet->getPropertyValue(u"HoriOrient"_ustr) >>= nHoriOrient; isWidthRelative = nHoriOrient == text::HoriOrientation::FULL; if (isWidthRelative) nWidthPercent = 100; @@ -576,7 +576,7 @@ void DocxAttributeOutput::TableBackgrounds( = pFormat->GetAttrSet().GetItem<SfxGrabBagItem>(RES_FRMATR_GRABBAG)->GetGrabBag(); OString sOriginalColor; - auto aGrabBagIt = rGrabBag.find("originalColor"); + auto aGrabBagIt = rGrabBag.find(u"originalColor"_ustr); if (aGrabBagIt != rGrabBag.end()) sOriginalColor = OUStringToOString(aGrabBagIt->second.get<OUString>(), RTL_TEXTENCODING_UTF8); diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx b/sw/source/filter/ww8/docxtablestyleexport.cxx index 0de587eaa400..99904394acef 100644 --- a/sw/source/filter/ww8/docxtablestyleexport.cxx +++ b/sw/source/filter/ww8/docxtablestyleexport.cxx @@ -127,7 +127,7 @@ void DocxTableStyleExport::TableStyles(sal_Int32 nCountStylesToWrite) uno::Reference<beans::XPropertySet> xPropertySet( m_pImpl->getDoc().GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW); uno::Sequence<beans::PropertyValue> aInteropGrabBag; - xPropertySet->getPropertyValue("InteropGrabBag") >>= aInteropGrabBag; + xPropertySet->getPropertyValue(u"InteropGrabBag"_ustr) >>= aInteropGrabBag; uno::Sequence<beans::PropertyValue> aTableStyles; auto pProp = std::find_if( std::cbegin(aInteropGrabBag), std::cend(aInteropGrabBag), @@ -167,8 +167,9 @@ void DocxTableStyleExport::Impl::tableStyleTableCellMar( comphelper::SequenceAsHashMap aMap( rProp.Value.get<uno::Sequence<beans::PropertyValue>>()); m_pSerializer->singleElementNS(XML_w, nToken, FSNS(XML_w, XML_w), - OString::number(aMap["w"].get<sal_Int32>()), - FSNS(XML_w, XML_type), aMap["type"].get<OUString>()); + OString::number(aMap[u"w"_ustr].get<sal_Int32>()), + FSNS(XML_w, XML_type), + aMap[u"type"_ustr].get<OUString>()); } } m_pSerializer->endElementNS(XML_w, nType); diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index b996446b01eb..5b0e89de1e73 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -2312,7 +2312,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi uno::Reference<beans::XPropertySetInfo> xPropSetInfo = xPropSet->getPropertySetInfo(); OUString sName; - if (xInfo->supportsService("com.sun.star.form.component.CheckBox")) + if (xInfo->supportsService(u"com.sun.star.form.component.CheckBox"_ustr)) { m_aRun->append(OUStringToOString(FieldString(ww::eFORMCHECKBOX), m_rExport.GetCurrentEncoding())); @@ -2361,10 +2361,10 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi } sal_Int16 nTemp = 0; - xPropSet->getPropertyValue("DefaultState") >>= nTemp; + xPropSet->getPropertyValue(u"DefaultState"_ustr) >>= nTemp; m_aRun->append(OOO_STRING_SVTOOLS_RTF_FFDEFRES); m_aRun->append(static_cast<sal_Int32>(nTemp)); - xPropSet->getPropertyValue("State") >>= nTemp; + xPropSet->getPropertyValue(u"State"_ustr) >>= nTemp; m_aRun->append(OOO_STRING_SVTOOLS_RTF_FFRES); m_aRun->append(static_cast<sal_Int32>(nTemp)); @@ -2373,7 +2373,8 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi // field result is empty, ffres already contains the form result m_aRun->append("}{" OOO_STRING_SVTOOLS_RTF_FLDRSLT " "); } - else if (xInfo->supportsService("com.sun.star.form.component.TextField")) + else if (xInfo->supportsService( + u"com.sun.star.form.component.TextField"_ustr)) { OStringBuffer aBuf; OString aStr; @@ -2387,11 +2388,11 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi " "); for (int i = 0; i < 8; i++) aBuf.append(char(0x00)); - xPropSet->getPropertyValue("Name") >>= aTmp; + xPropSet->getPropertyValue(u"Name"_ustr) >>= aTmp; aStr = OUStringToOString(aTmp, m_rExport.GetCurrentEncoding()); aBuf.append(OStringChar(static_cast<char>(aStr.getLength())) + aStr + OStringChar(char(0x00))); - xPropSet->getPropertyValue("DefaultText") >>= aTmp; + xPropSet->getPropertyValue(u"DefaultText"_ustr) >>= aTmp; aStr = OUStringToOString(aTmp, m_rExport.GetCurrentEncoding()); aBuf.append(static_cast<char>(aStr.getLength())); aBuf.append(aStr); @@ -2403,7 +2404,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi m_aRun->append(msfilter::rtfutil::OutHex(*pStr, 2)); m_aRun->append('}'); m_aRun->append("}{" OOO_STRING_SVTOOLS_RTF_FLDRSLT " "); - xPropSet->getPropertyValue("Text") >>= aTmp; + xPropSet->getPropertyValue(u"Text"_ustr) >>= aTmp; m_aRun->append(OUStringToOString(aTmp, m_rExport.GetCurrentEncoding())); m_aRun->append('}'); m_aRun->append( @@ -2434,7 +2435,8 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi } m_aRun->append("}"); } - else if (xInfo->supportsService("com.sun.star.form.component.ListBox")) + else if (xInfo->supportsService( + u"com.sun.star.form.component.ListBox"_ustr)) { OUString aStr; uno::Sequence<sal_Int16> aIntSeq; @@ -2448,7 +2450,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi m_aRun->append(OOO_STRING_SVTOOLS_RTF_FFTYPE "2"); // 2 = list m_aRun->append(OOO_STRING_SVTOOLS_RTF_FFHASLISTBOX); - xPropSet->getPropertyValue("DefaultSelection") >>= aIntSeq; + xPropSet->getPropertyValue(u"DefaultSelection"_ustr) >>= aIntSeq; if (aIntSeq.hasElements()) { m_aRun->append(OOO_STRING_SVTOOLS_RTF_FFDEFRES); @@ -2456,7 +2458,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi m_aRun->append(static_cast<sal_Int32>(aIntSeq[0])); } - xPropSet->getPropertyValue("SelectedItems") >>= aIntSeq; + xPropSet->getPropertyValue(u"SelectedItems"_ustr) >>= aIntSeq; if (aIntSeq.hasElements()) { m_aRun->append(OOO_STRING_SVTOOLS_RTF_FFRES); @@ -2500,7 +2502,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi m_aRun->append('}'); } - xPropSet->getPropertyValue("StringItemList") >>= aStrSeq; + xPropSet->getPropertyValue(u"StringItemList"_ustr) >>= aStrSeq; for (const auto& rStr : aStrSeq) m_aRun->append( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FFL " " @@ -4105,7 +4107,7 @@ bool RtfAttributeOutput::PlaceholderField(const SwField* pField) } RtfAttributeOutput::RtfAttributeOutput(RtfExport& rExport) - : AttributeOutputBase("") // ConvertURL isn't used now in RTF output + : AttributeOutputBase(u""_ustr) // ConvertURL isn't used now in RTF output , m_rExport(rExport) , m_pPrevPageDesc(nullptr) , m_nStyleId(0) @@ -4646,7 +4648,7 @@ void RtfAttributeOutput::TextLineBreak(const SwFormatLineBreak& rLineBreak) m_aStyles.append(static_cast<sal_Int32>(rLineBreak.GetEnumValue())); // Write the linebreak itself. - RunText("\x0b"); + RunText(u"\x0b"_ustr); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index ec2563088dfd..8acd96461ac6 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -262,7 +262,7 @@ void RtfExport::WriteRevTab() return; // RTF always seems to use Unknown as the default first entry - GetRedline("Unknown"); + GetRedline(u"Unknown"_ustr); for (SwRangeRedline* pRedl : m_rDoc.getIDocumentRedlineAccess().GetRedlineTable()) { @@ -544,10 +544,10 @@ void RtfExport::WriteInfo() uno::Reference<beans::XPropertySetInfo> xPropertySetInfo = xPropertySet->getPropertySetInfo(); // Do we have explicit markup in RTF for this property name? - if (xPropertySetInfo->hasPropertyByName("Company")) + if (xPropertySetInfo->hasPropertyByName(u"Company"_ustr)) { OUString aValue; - xPropertySet->getPropertyValue("Company") >>= aValue; + xPropertySet->getPropertyValue(u"Company"_ustr) >>= aValue; OutUnicode(OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_COMPANY, aValue); } } @@ -712,7 +712,7 @@ void RtfExport::WriteDocVars() OUString aKey = rMasterName.copy(aPrefix.getLength()); OUString aValue; - xField->getPropertyValue("Content") >>= aValue; + xField->getPropertyValue(u"Content"_ustr) >>= aValue; Strm().WriteChar('{').WriteOString( OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_DOCVAR); diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx index 83016728901d..755189950490 100644 --- a/sw/source/filter/ww8/rtfexportfilter.cxx +++ b/sw/source/filter/ww8/rtfexportfilter.cxx @@ -96,7 +96,10 @@ void RtfExportFilter::setSourceDocument(const uno::Reference<lang::XComponent>& m_xSrcDoc = xDoc; } -OUString RtfExportFilter::getImplementationName() { return "com.sun.star.comp.Writer.RtfExport"; } +OUString RtfExportFilter::getImplementationName() +{ + return u"com.sun.star.comp.Writer.RtfExport"_ustr; +} sal_Bool RtfExportFilter::supportsService(OUString const& ServiceName) { @@ -105,7 +108,7 @@ sal_Bool RtfExportFilter::supportsService(OUString const& ServiceName) css::uno::Sequence<OUString> RtfExportFilter::getSupportedServiceNames() { - return { "com.sun.star.comp.Writer.RtfExport" }; + return { u"com.sun.star.comp.Writer.RtfExport"_ustr }; } // UNO helpers diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index d6427dd45f2c..5e486b99de8a 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -494,7 +494,7 @@ void RtfSdrExport::impl_writeGraphic() try { - xPropertySet->getPropertyValue("Graphic") >>= xGraphic; + xPropertySet->getPropertyValue(u"Graphic"_ustr) >>= xGraphic; } catch (beans::UnknownPropertyException const&) { diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index 529100289737..e2c76cfaf257 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -329,7 +329,7 @@ namespace myImplHelpers static OUString FindBestMSSubstituteFont(std::u16string_view rFont) { if (IsOpenSymbol(rFont)) - return "Arial Unicode MS"; + return u"Arial Unicode MS"_ustr; return GetSubsFontName(rFont, SubsFontFlags::ONLYONE | SubsFontFlags::MS); } diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 5040c190be2a..03048a9dcba9 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -358,7 +358,7 @@ bool WW8Export::MiserableFormFieldExportHack(const SwFrameFormat& rFrameFormat) if (!xInfo.is()) return false; - if (xInfo->supportsService("com.sun.star.form.component.ComboBox")) + if (xInfo->supportsService(u"com.sun.star.form.component.ComboBox"_ustr)) { DoComboBox(xPropSet); return true; @@ -371,10 +371,10 @@ void WW8Export::DoComboBox(uno::Reference<beans::XPropertySet> const & xPropSet) { OUString sSelected; uno::Sequence<OUString> aListItems; - xPropSet->getPropertyValue("StringItemList") >>= aListItems; + xPropSet->getPropertyValue(u"StringItemList"_ustr) >>= aListItems; if (aListItems.hasElements()) { - uno::Any aTmp = xPropSet->getPropertyValue("DefaultText"); + uno::Any aTmp = xPropSet->getPropertyValue(u"DefaultText"_ustr); auto pStr = o3tl::tryAccess<OUString>(aTmp); if (pStr) sSelected = *pStr; @@ -382,7 +382,7 @@ void WW8Export::DoComboBox(uno::Reference<beans::XPropertySet> const & xPropSet) OUString sName; { - uno::Any aTmp = xPropSet->getPropertyValue("Name"); + uno::Any aTmp = xPropSet->getPropertyValue(u"Name"_ustr); auto pStr = o3tl::tryAccess<OUString>(aTmp); if (pStr) sName = *pStr; @@ -393,7 +393,7 @@ void WW8Export::DoComboBox(uno::Reference<beans::XPropertySet> const & xPropSet) // property "Help" does not exist and due to the no-existence an exception is thrown. try { - uno::Any aTmp = xPropSet->getPropertyValue("HelpText"); + uno::Any aTmp = xPropSet->getPropertyValue(u"HelpText"_ustr); auto pStr = o3tl::tryAccess<OUString>(aTmp); if (pStr) sHelp = *pStr; @@ -404,7 +404,7 @@ void WW8Export::DoComboBox(uno::Reference<beans::XPropertySet> const & xPropSet) OUString sToolTip; { - uno::Any aTmp = xPropSet->getPropertyValue("Name"); + uno::Any aTmp = xPropSet->getPropertyValue(u"Name"_ustr); auto pStr = o3tl::tryAccess<OUString>(aTmp); if (pStr) sToolTip = *pStr; diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 99dcd831492b..ee561dc129b6 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -124,19 +124,19 @@ static OUString lcl_getFieldCode( const IFieldmark* pFieldmark ) assert(pFieldmark); if ( pFieldmark->GetFieldname( ) == ODF_FORMTEXT ) - return " FORMTEXT "; + return u" FORMTEXT "_ustr; if ( pFieldmark->GetFieldname( ) == ODF_FORMDROPDOWN ) - return " FORMDROPDOWN "; + return u" FORMDROPDOWN "_ustr; if ( pFieldmark->GetFieldname( ) == ODF_FORMCHECKBOX ) - return " FORMCHECKBOX "; + return u" FORMCHECKBOX "_ustr; if ( pFieldmark->GetFieldname( ) == ODF_FORMDATE ) - return " ODFFORMDATE "; + return u" ODFFORMDATE "_ustr; if ( pFieldmark->GetFieldname( ) == ODF_TOC ) - return " TOC "; + return u" TOC "_ustr; if ( pFieldmark->GetFieldname( ) == ODF_HYPERLINK ) - return " HYPERLINK "; + return u" HYPERLINK "_ustr; if ( pFieldmark->GetFieldname( ) == ODF_PAGEREF ) - return " PAGEREF "; + return u" PAGEREF "_ustr; return pFieldmark->GetFieldname(); } @@ -166,14 +166,14 @@ lcl_getLinkChainName(const uno::Reference<beans::XPropertySet>& rPropertySet, const uno::Reference<beans::XPropertySetInfo>& rPropertySetInfo) { OUString sLinkChainName; - if (rPropertySetInfo->hasPropertyByName("LinkDisplayName")) + if (rPropertySetInfo->hasPropertyByName(u"LinkDisplayName"_ustr)) { - rPropertySet->getPropertyValue("LinkDisplayName") >>= sLinkChainName; + rPropertySet->getPropertyValue(u"LinkDisplayName"_ustr) >>= sLinkChainName; if (!sLinkChainName.isEmpty()) return sLinkChainName; } - if (rPropertySetInfo->hasPropertyByName("ChainName")) - rPropertySet->getPropertyValue("ChainName") >>= sLinkChainName; + if (rPropertySetInfo->hasPropertyByName(u"ChainName"_ustr)) + rPropertySet->getPropertyValue(u"ChainName"_ustr) >>= sLinkChainName; return sLinkChainName; } @@ -773,10 +773,10 @@ FlyProcessingState SwWW8AttrIter::OutFlys(sal_Int32 nSwPos) const OUString sLinkChainName = lcl_getLinkChainName(xPropertySet, xPropertySetInfo); - if( xPropertySetInfo->hasPropertyByName("ChainNextName") ) - xPropertySet->getPropertyValue("ChainNextName") >>= aLinkedTextboxInfo.sNextChain; - if( xPropertySetInfo->hasPropertyByName("ChainPrevName") ) - xPropertySet->getPropertyValue("ChainPrevName") >>= aLinkedTextboxInfo.sPrevChain; + if( xPropertySetInfo->hasPropertyByName(u"ChainNextName"_ustr) ) + xPropertySet->getPropertyValue(u"ChainNextName"_ustr) >>= aLinkedTextboxInfo.sNextChain; + if( xPropertySetInfo->hasPropertyByName(u"ChainPrevName"_ustr) ) + xPropertySet->getPropertyValue(u"ChainPrevName"_ustr) >>= aLinkedTextboxInfo.sPrevChain; //collect a list of linked textboxes: those with a NEXT or PREVIOUS link if( !aLinkedTextboxInfo.sNextChain.isEmpty() || !aLinkedTextboxInfo.sPrevChain.isEmpty() ) @@ -3477,8 +3477,8 @@ void MSWordExportBase::UpdateTocSectionNodeProperties(const SwSectionNode& rSect { uno::Sequence<beans::PropertyValue> aDocPropertyValues(comphelper::InitPropertySequence( { - {"ooxml:CT_SdtDocPart_docPartGallery", uno::Any(OUString("Table of Contents"))}, - {"ooxml:CT_SdtDocPart_docPartUnique", uno::Any(OUString("true"))}, + {"ooxml:CT_SdtDocPart_docPartGallery", uno::Any(u"Table of Contents"_ustr)}, + {"ooxml:CT_SdtDocPart_docPartUnique", uno::Any(u"true"_ustr)}, })); uno::Sequence<beans::PropertyValue> aSdtPrPropertyValues(comphelper::InitPropertySequence( @@ -3487,7 +3487,7 @@ void MSWordExportBase::UpdateTocSectionNodeProperties(const SwSectionNode& rSect })); SfxGrabBagItem aGrabBag(RES_PARATR_GRABBAG); - aGrabBag.GetGrabBag()["SdtPr"] <<= aSdtPrPropertyValues; + aGrabBag.GetGrabBag()[u"SdtPr"_ustr] <<= aSdtPrPropertyValues; // create temp attr set SwAttrSet aSet(pNode->GetSwAttrSet()); @@ -3507,7 +3507,7 @@ void MSWordExportBase::UpdateTocSectionNodeProperties(const SwSectionNode& rSect if (pNodeAfterToc) { SfxGrabBagItem aGrabBag(RES_PARATR_GRABBAG); - aGrabBag.GetGrabBag()["ParaSdtEndBefore"] <<= true; + aGrabBag.GetGrabBag()[u"ParaSdtEndBefore"_ustr] <<= true; // create temp attr set SwAttrSet aSet(pNodeAfterToc->GetSwAttrSet()); diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 3c23ddc5a0b9..28309d9546d7 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -391,7 +391,7 @@ void MSWordStyles::BuildWwNames() assert(!m_aStyles.empty()); assert(!m_aStyles[0].format || m_aStyles[0].ww_id == ww::stiNormal); m_aStyles[0].ww_name = "Normal"; - aUsed.insert("normal"); + aUsed.insert(u"normal"_ustr); // 1. Handle styles having special wwIds, and thus pre-defined names for (auto& entry : m_aStyles) @@ -2352,7 +2352,7 @@ bool WW8_WrPlcSubDoc::WriteGenericText( WW8Export& rWrt, sal_uInt8 nTTyp, // Additional paragraph containing a space to // assure that by WW created RTF from written WW8 // does not crash WW. - rWrt.WriteStringAsPara( " " ); + rWrt.WriteStringAsPara( u" "_ustr ); } } } diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index f56a04de65a4..a14412469cf8 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -517,8 +517,8 @@ static void WriteDop( WW8Export& rWrt ) // so round-trip it since protection is still enabled. if ( rDop.lKeyProtDoc == 0 && xProps.is() ) { - comphelper::SequenceAsHashMap aPropMap( xProps->getPropertyValue("InteropGrabBag")); - aPropMap.getValue("FormPasswordHash") >>= rDop.lKeyProtDoc; + comphelper::SequenceAsHashMap aPropMap( xProps->getPropertyValue(u"InteropGrabBag"_ustr)); + aPropMap.getValue(u"FormPasswordHash"_ustr) >>= rDop.lKeyProtDoc; } } else @@ -1484,7 +1484,7 @@ void WW8Export::AppendAnnotationMarks(const SwWW8AttrIter& rAttrs, sal_Int32 nCu void WW8Export::AppendSmartTags(SwTextNode& rTextNode) { - std::map<OUString, OUString> aStatements = SwRDFHelper::getTextNodeStatements("urn:bails", rTextNode); + std::map<OUString, OUString> aStatements = SwRDFHelper::getTextNodeStatements(u"urn:bails"_ustr, rTextNode); if (!aStatements.empty()) { WW8_CP nCP = Fc2Cp(Strm().Tell()); @@ -1590,7 +1590,7 @@ void WW8Export::ExportGrfBullet(const SwTextNode& rNd) if (nCount > 0) { SwPosition aPos(rNd); - OUString aPicBullets("_PictureBullets"); + OUString aPicBullets(u"_PictureBullets"_ustr); AppendBookmark(aPicBullets); for (int i = 0; i < nCount; i++) { @@ -1665,7 +1665,7 @@ sal_uInt16 WW8Export::AddRedlineAuthor( std::size_t nId ) if( !m_pRedlAuthors ) { m_pRedlAuthors.reset(new WW8_WrtRedlineAuthor); - m_pRedlAuthors->AddName("Unknown"); + m_pRedlAuthors->AddName(u"Unknown"_ustr); } return m_pRedlAuthors->AddName( SW_MOD()->GetRedlineAuthor( nId ) ); } @@ -3527,7 +3527,7 @@ bool SwWW8Writer::InitStd97CodecUpdateMedium( ::msfilter::MSCodec_Std97& rCodec sal_uInt8 pDocId[ 16 ]; if (rtl_random_getBytes(nullptr, pDocId, 16) != rtl_Random_E_None) { - throw uno::RuntimeException("rtl_random_getBytes failed"); + throw uno::RuntimeException(u"rtl_random_getBytes failed"_ustr); } sal_uInt16 aPassword[16] = {}; @@ -3772,7 +3772,7 @@ void WW8Export::PrepareStorage() SvGlobalName aGName(MSO_WW8_CLASSID); GetWriter().GetStorage().SetClass( - aGName, SotClipboardFormatId::NONE, "Microsoft Word-Document"); + aGName, SotClipboardFormatId::NONE, u"Microsoft Word-Document"_ustr); rtl::Reference<SotStorageStream> xStor(GetWriter().GetStorage().OpenSotStream(sCompObj)); xStor->WriteBytes(pData, sizeof(pData)); @@ -3815,13 +3815,13 @@ ErrCodeMsg SwWW8Writer::WriteStorage() if (pEncryptionDataItem && (pEncryptionDataItem->GetValue() >>= aEncryptionData)) { ::comphelper::SequenceAsHashMap aHashData(aEncryptionData); - OUString sCryptoType = aHashData.getUnpackedValueOrDefault("CryptoType", OUString()); + OUString sCryptoType = aHashData.getUnpackedValueOrDefault(u"CryptoType"_ustr, OUString()); if (sCryptoType.getLength()) { uno::Reference<uno::XComponentContext> xComponentContext(comphelper::getProcessComponentContext()); uno::Sequence<uno::Any> aArguments{ - uno::Any(beans::NamedValue("Binary", uno::Any(true))) }; + uno::Any(beans::NamedValue(u"Binary"_ustr, uno::Any(true))) }; xPackageEncryption.set( xComponentContext->getServiceManager()->createInstanceWithArgumentsAndContext( "com.sun.star.comp.oox.crypto." + sCryptoType, aArguments, xComponentContext), uno::UNO_QUERY); @@ -4252,7 +4252,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) OUString ffexitmcr; ::sw::mark::IFieldmark::parameter_map_t::const_iterator pParameter - = rFieldmark.GetParameters()->find("Type"); + = rFieldmark.GetParameters()->find(u"Type"_ustr); if (type == 0) // iTypeText { sal_uInt16 nType = 0; @@ -4270,7 +4270,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) if ( nType < 3 || nType == 5 ) // not currentTime or currentDate { - pParameter = rFieldmark.GetParameters()->find("Content"); + pParameter = rFieldmark.GetParameters()->find(u"Content"_ustr); if ( pParameter != rFieldmark.GetParameters()->end() ) { OUString aDefaultText; @@ -4280,7 +4280,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) } } - pParameter = rFieldmark.GetParameters()->find("MaxLength"); + pParameter = rFieldmark.GetParameters()->find(u"MaxLength"_ustr); if ( pParameter != rFieldmark.GetParameters()->end() ) { sal_uInt16 nLength = 0; @@ -4289,7 +4289,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) aFieldHeader.cch = nLength; } - pParameter = rFieldmark.GetParameters()->find("Format"); + pParameter = rFieldmark.GetParameters()->find(u"Format"_ustr); if ( pParameter != rFieldmark.GetParameters()->end() ) { OUString aFormat; @@ -4299,7 +4299,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) } } - pParameter = rFieldmark.GetParameters()->find("Help"); //help + pParameter = rFieldmark.GetParameters()->find(u"Help"_ustr); //help if ( ffhelptext.isEmpty() && pParameter != rFieldmark.GetParameters()->end() ) { OUString aHelpText; @@ -4310,9 +4310,9 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) if ( !ffhelptext.isEmpty() ) aFieldHeader.bits |= 0x1<<7; - pParameter = rFieldmark.GetParameters()->find("Description"); // doc tooltip + pParameter = rFieldmark.GetParameters()->find(u"Description"_ustr); // doc tooltip if ( pParameter == rFieldmark.GetParameters()->end() ) - pParameter = rFieldmark.GetParameters()->find("Hint"); //docx tooltip + pParameter = rFieldmark.GetParameters()->find(u"Hint"_ustr); //docx tooltip if ( pParameter != rFieldmark.GetParameters()->end() ) { OUString aStatusText; @@ -4323,7 +4323,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) if ( !ffstattext.isEmpty() ) aFieldHeader.bits |= 0x1<<8; - pParameter = rFieldmark.GetParameters()->find("EntryMacro"); + pParameter = rFieldmark.GetParameters()->find(u"EntryMacro"_ustr); if ( pParameter != rFieldmark.GetParameters()->end() ) { OUString aEntryMacro; @@ -4332,7 +4332,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) ffentrymcr = aEntryMacro.copy (0, nLen); } - pParameter = rFieldmark.GetParameters()->find("ExitMacro"); + pParameter = rFieldmark.GetParameters()->find(u"ExitMacro"_ustr); if ( pParameter != rFieldmark.GetParameters()->end() ) { OUString aExitMacro; diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index 9b041e4a5c32..08790a50b372 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -242,7 +242,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode ) m_oOLEExp->ExportOLEObject( aObjRef, *xOleStg ); if ( nAspect == embed::Aspects::MSOLE_ICON ) { - OUString aObjInfo( "\3ObjInfo" ); + OUString aObjInfo( u"\3ObjInfo"_ustr ); if ( !xOleStg->IsStream( aObjInfo ) ) { const sal_uInt8 pObjInfoData[] = { 0x40, 0x00, 0x03, 0x00 }; @@ -316,7 +316,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode ) void WW8Export::OutputLinkedOLE( const OUString& rOleId ) { uno::Reference< embed::XStorage > xDocStg = m_rDoc.GetDocStorage(); - uno::Reference< embed::XStorage > xOleStg = xDocStg->openStorageElement( "OLELinks", embed::ElementModes::READ ); + uno::Reference< embed::XStorage > xOleStg = xDocStg->openStorageElement( u"OLELinks"_ustr, embed::ElementModes::READ ); rtl::Reference<SotStorage> xObjSrc = SotStorage::OpenOLEStorage( xOleStg, rOleId, StreamMode::READ ); rtl::Reference<SotStorage> xObjStg = GetWriter().GetStorage().OpenSotStorage(SL::aObjectPool); diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index e1787614f732..a9ec2d1983c5 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -2330,9 +2330,9 @@ static auto GetSeparatorForLocale() -> OUString case sal_uInt16(LANGUAGE_GERMAN_LIECHTENSTEIN): case sal_uInt16(LANGUAGE_GERMAN_LUXEMBOURG): case sal_uInt16(LANGUAGE_GERMAN_SWISS): - return ";"; + return u";"_ustr; default: - return ","; + return u","_ustr; } } @@ -2813,7 +2813,7 @@ OUString FieldString(ww::eField eIndex) { if (const char *pField = ww::GetEnglishFieldName(eIndex)) return " " + OUString::createFromAscii(pField) + " "; - return " "; + return u" "_ustr; } void WW8AttributeOutput::HiddenField( const SwField& rField ) @@ -3339,7 +3339,7 @@ void AttributeOutputBase::TextField( const SwFormatField& rField ) break; } - OUString sExtraFlags = "\\h "; // by default, include a hyperlink + OUString sExtraFlags = u"\\h "_ustr; // by default, include a hyperlink switch (eField) { @@ -6001,7 +6001,7 @@ void AttributeOutputBase::CharBackgroundBase( const SvxBrushItem& rBrush ) { const SfxGrabBagItem aGrabBag = static_cast< const SfxGrabBagItem& >(*pItem); const std::map<OUString, css::uno::Any>& rMap = aGrabBag.GetGrabBag(); - auto aIterator = rMap.find("CharShadingMarker"); + auto aIterator = rMap.find(u"CharShadingMarker"_ustr); if( aIterator != rMap.end() ) { aIterator->second >>= bHasShadingMarker; diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 6d1666359eec..8ea537bf4a06 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -380,7 +380,7 @@ bool BasicProjImportHelper::import( const uno::Reference< io::XInputStream >& rx try { oox::ole::OleStorage root( mxCtx, rxIn, false ); - oox::StorageRef vbaStg = root.openSubStorage( "Macros" , false ); + oox::StorageRef vbaStg = root.openSubStorage( u"Macros"_ustr , false ); if ( vbaStg ) { oox::ole::VbaProject aVbaPrj( mxCtx, mrDocShell.GetModel(), u"Writer" ); @@ -396,13 +396,13 @@ bool BasicProjImportHelper::import( const uno::Reference< io::XInputStream >& rx OUString BasicProjImportHelper::getProjectName() const { - OUString sProjName( "Standard" ); + OUString sProjName( u"Standard"_ustr ); uno::Reference< beans::XPropertySet > xProps( mrDocShell.GetModel(), uno::UNO_QUERY ); if ( xProps.is() ) { try { - uno::Reference< script::vba::XVBACompatibility > xVBA( xProps->getPropertyValue( "BasicLibraries" ), uno::UNO_QUERY_THROW ); + uno::Reference< script::vba::XVBACompatibility > xVBA( xProps->getPropertyValue( u"BasicLibraries"_ustr ), uno::UNO_QUERY_THROW ); sProjName = xVBA->getProjectName(); } @@ -1968,24 +1968,24 @@ void SwWW8ImplReader::ImportDop() uno::Reference<beans::XPropertySetInfo> xInfo = xDocProps->getPropertySetInfo(); if (xInfo.is()) { - if (xInfo->hasPropertyByName("ApplyFormDesignMode")) - xDocProps->setPropertyValue("ApplyFormDesignMode", css::uno::Any(false)); + if (xInfo->hasPropertyByName(u"ApplyFormDesignMode"_ustr)) + xDocProps->setPropertyValue(u"ApplyFormDesignMode"_ustr, css::uno::Any(false)); } // for the benefit of DOCX - if this is ever saved in that format. - comphelper::SequenceAsHashMap aGrabBag(xDocProps->getPropertyValue("InteropGrabBag")); + comphelper::SequenceAsHashMap aGrabBag(xDocProps->getPropertyValue(u"InteropGrabBag"_ustr)); uno::Sequence<beans::PropertyValue> aCompatSetting( comphelper::InitPropertySequence({ - { "name", uno::Any(OUString("compatibilityMode")) }, - { "uri", uno::Any(OUString("http://schemas.microsoft.com/office/word")) }, - { "val", uno::Any(OUString("11")) } //11: Use features specified in MS-DOC. + { "name", uno::Any(u"compatibilityMode"_ustr) }, + { "uri", uno::Any(u"http://schemas.microsoft.com/office/word"_ustr) }, + { "val", uno::Any(u"11"_ustr) } //11: Use features specified in MS-DOC. })); uno::Sequence< beans::PropertyValue > aValue(comphelper::InitPropertySequence({ { "compatSetting", uno::Any(aCompatSetting) } })); - aGrabBag["CompatSettings"] <<= aValue; - xDocProps->setPropertyValue("InteropGrabBag", uno::Any(aGrabBag.getAsConstPropertyValueList())); + aGrabBag[u"CompatSettings"_ustr] <<= aValue; + xDocProps->setPropertyValue(u"InteropGrabBag"_ustr, uno::Any(aGrabBag.getAsConstPropertyValueList())); } // The password can force read-only, comments-only, fill-in-form-only, or require track-changes. @@ -1996,9 +1996,9 @@ void SwWW8ImplReader::ImportDop() m_pDocShell->SetModifyPasswordHash(m_xWDop->lKeyProtDoc); else if ( xDocProps.is() ) { - comphelper::SequenceAsHashMap aGrabBag(xDocProps->getPropertyValue("InteropGrabBag")); - aGrabBag["FormPasswordHash"] <<= m_xWDop->lKeyProtDoc; - xDocProps->setPropertyValue("InteropGrabBag", uno::Any(aGrabBag.getAsConstPropertyValueList())); + comphelper::SequenceAsHashMap aGrabBag(xDocProps->getPropertyValue(u"InteropGrabBag"_ustr)); + aGrabBag[u"FormPasswordHash"_ustr] <<= m_xWDop->lKeyProtDoc; + xDocProps->setPropertyValue(u"InteropGrabBag"_ustr, uno::Any(aGrabBag.getAsConstPropertyValueList())); } if (officecfg::Office::Common::Filter::Microsoft::Import::ImportWWFieldsAsEnhancedFields::get()) @@ -4257,7 +4257,7 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SotStorage* pStorage, , m_aSectionManager(*this) , m_aExtraneousParas(rD) , m_aInsertedTables(rD) - , m_aSectionNameGenerator(rD, "WW") + , m_aSectionNameGenerator(rD, u"WW"_ustr) , m_aGrfNameGenerator(bNewDoc, OUString('G')) , m_aParaStyleMapper(rD) , m_aCharStyleMapper(rD) @@ -4836,10 +4836,10 @@ void SwWW8ImplReader::ReadDocVars() } else { - xMaster.set(xTextFactory->createInstance("com.sun.star.text.FieldMaster.User"), uno::UNO_QUERY_THROW); - xMaster->setPropertyValue("Name", uno::Any(rName)); + xMaster.set(xTextFactory->createInstance(u"com.sun.star.text.FieldMaster.User"_ustr), uno::UNO_QUERY_THROW); + xMaster->setPropertyValue(u"Name"_ustr, uno::Any(rName)); } - xMaster->setPropertyValue("Content", aValue); + xMaster->setPropertyValue(u"Content"_ustr, aValue); } } @@ -5005,7 +5005,7 @@ void SwWW8ImplReader::ReadGlobalTemplateSettings( std::u16string_view sCreatedFr aBasicImporter.import( m_pDocShell->GetMedium()->GetInputStream() ); lcl_createTemplateToProjectEntry( xPrjNameCache, aURL, aBasicImporter.getProjectName() ); // Read toolbars & menus - rtl::Reference<SotStorageStream> refMainStream = rRoot->OpenSotStream("WordDocument"); + rtl::Reference<SotStorageStream> refMainStream = rRoot->OpenSotStream(u"WordDocument"_ustr); refMainStream->SetEndian(SvStreamEndian::LITTLE); WW8Fib aWwFib( *refMainStream, 8 ); rtl::Reference<SotStorageStream> xTableStream = @@ -5263,7 +5263,7 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const *pGloss) uno::Reference< container::XNameContainer > xPrjNameCache; uno::Reference< lang::XMultiServiceFactory> xSF(m_pDocShell->GetModel(), uno::UNO_QUERY); if ( xSF.is() ) - xPrjNameCache.set( xSF->createInstance( "ooo.vba.VBAProjectNameProvider" ), uno::UNO_QUERY ); + xPrjNameCache.set( xSF->createInstance( u"ooo.vba.VBAProjectNameProvider"_ustr ), uno::UNO_QUERY ); // Read Global templates ReadGlobalTemplateSettings( sCreatedFrom, xPrjNameCache ); @@ -5273,7 +5273,7 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const *pGloss) uno::Sequence< uno::Any > aArgs{ uno::Any(m_pDocShell->GetModel()) }; try { - aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( "ooo.vba.word.Globals", aArgs ); + aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( u"ooo.vba.word.Globals"_ustr, aArgs ); } catch (const uno::Exception&) { @@ -5285,7 +5285,7 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const *pGloss) { BasicManager *pBasicMan = m_pDocShell->GetBasicManager(); if (pBasicMan) - pBasicMan->SetGlobalUNOConstant( "VBAGlobals", aGlobs ); + pBasicMan->SetGlobalUNOConstant( u"VBAGlobals"_ustr, aGlobs ); } #endif BasicProjImportHelper aBasicImporter( *m_pDocShell ); @@ -5419,7 +5419,7 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const *pGloss) IDocumentMarkAccess* const pMarkAccess = m_rDoc.getIDocumentMarkAccess(); if ( pMarkAccess ) { - IDocumentMarkAccess::const_iterator_t ppBkmk = pMarkAccess->findBookmark( "_PictureBullets" ); + IDocumentMarkAccess::const_iterator_t ppBkmk = pMarkAccess->findBookmark( u"_PictureBullets"_ustr ); if ( ppBkmk != pMarkAccess->getBookmarksEnd() && IDocumentMarkAccess::GetType(**ppBkmk) == IDocumentMarkAccess::MarkType::BOOKMARK ) { @@ -5669,7 +5669,7 @@ namespace sal_uInt8 pDocId[ 16 ]; if (rtl_random_getBytes(nullptr, pDocId, 16) != rtl_Random_E_None) { - throw uno::RuntimeException("rtl_random_getBytes failed"); + throw uno::RuntimeException(u"rtl_random_getBytes failed"_ustr); } sal_uInt16 pStd97Pass[16] = {}; @@ -6371,24 +6371,24 @@ bool TestImportDOC(SvStream &rStream, const OUString &rFltName) extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportWW8(SvStream &rStream) { - return TestImportDOC(rStream, "CWW8"); + return TestImportDOC(rStream, u"CWW8"_ustr); } extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportWW6(SvStream &rStream) { - return TestImportDOC(rStream, "CWW6"); + return TestImportDOC(rStream, u"CWW6"_ustr); } extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportWW2(SvStream &rStream) { - return TestImportDOC(rStream, "WW6"); + return TestImportDOC(rStream, u"WW6"_ustr); } ErrCode WW8Reader::OpenMainStream(rtl::Reference<SotStorageStream>& rRef, sal_uInt16& rBuffSize) { ErrCode nRet = ERR_SWG_READ_ERROR; OSL_ENSURE(m_pStorage, "Where is my Storage?"); - rRef = m_pStorage->OpenSotStream( "WordDocument", StreamMode::READ | StreamMode::SHARE_DENYALL); + rRef = m_pStorage->OpenSotStream( u"WordDocument"_ustr, StreamMode::READ | StreamMode::SHARE_DENYALL); if( rRef.is() ) { @@ -6441,7 +6441,7 @@ ErrCode WW8Reader::DecryptDRMPackage() uno::Reference<uno::XComponentContext> xComponentContext(comphelper::getProcessComponentContext()); uno::Reference< packages::XPackageEncryption > xPackageEncryption( xComponentContext->getServiceManager()->createInstanceWithArgumentsAndContext( - "com.sun.star.comp.oox.crypto.DRMDataSpace", aArguments, xComponentContext), uno::UNO_QUERY); + u"com.sun.star.comp.oox.crypto.DRMDataSpace"_ustr, aArguments, xComponentContext), uno::UNO_QUERY); if (!xPackageEncryption.is()) { @@ -6460,7 +6460,7 @@ ErrCode WW8Reader::DecryptDRMPackage() return ERRCODE_IO_ACCESSDENIED; } - rtl::Reference<SotStorageStream> rContentStream = m_pStorage->OpenSotStream("\011DRMContent", StreamMode::READ | StreamMode::SHARE_DENYALL); + rtl::Reference<SotStorageStream> rContentStream = m_pStorage->OpenSotStream(u"\011DRMContent"_ustr, StreamMode::READ | StreamMode::SHARE_DENYALL); if (!rContentStream.is()) { return ERRCODE_IO_NOTEXISTS; @@ -6483,7 +6483,7 @@ ErrCode WW8Reader::DecryptDRMPackage() m_pStorage = new SotStorage(*mDecodedStream); // Set the media descriptor data - uno::Sequence<beans::NamedValue> aEncryptionData = xPackageEncryption->createEncryptionData(""); + uno::Sequence<beans::NamedValue> aEncryptionData = xPackageEncryption->createEncryptionData(u""_ustr); m_pMedium->GetItemSet().Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA, uno::Any(aEncryptionData))); } catch (const std::exception&) @@ -6526,7 +6526,7 @@ ErrCodeMsg WW8Reader::Read(SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c if( m_pStorage.is() ) { // Check if we have special encrypted content - rtl::Reference<SotStorageStream> rRef = m_pStorage->OpenSotStream("\006DataSpaces/DataSpaceInfo/\011DRMDataSpace", StreamMode::READ | StreamMode::SHARE_DENYALL); + rtl::Reference<SotStorageStream> rRef = m_pStorage->OpenSotStream(u"\006DataSpaces/DataSpaceInfo/\011DRMDataSpace"_ustr, StreamMode::READ | StreamMode::SHARE_DENYALL); if (rRef.is()) { nRet = DecryptDRMPackage(); diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index c1e80efd2d38..b32e9184e2ea 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -580,10 +580,10 @@ static void SetBaseAnlv(SwNumFormat &rNum, WW8_ANLV const &rAV, sal_uInt8 nSwLev if( rAV.nfc == 5 || rAV.nfc == 7 ) { OUString sP = "." + rNum.GetSuffix(); - rNum.SetListFormat("", sP, nSwLevel); // ordinal number + rNum.SetListFormat(u""_ustr, sP, nSwLevel); // ordinal number } else - rNum.SetListFormat("", "", nSwLevel); + rNum.SetListFormat(u""_ustr, u""_ustr, nSwLevel); } void SwWW8ImplReader::SetAnlvStrings(SwNumFormat &rNum, int nLevel, WW8_ANLV const &rAV, @@ -708,7 +708,7 @@ void SwWW8ImplReader::SetAnld(SwNumRule* pNumR, WW8_ANLD const * pAD, sal_uInt8 bool bOutLine) { SwNumFormat aNF; - aNF.SetListFormat("", "", nSwLevel); + aNF.SetListFormat(u""_ustr, u""_ustr, nSwLevel); if (pAD) { // there is an Anld-Sprm m_bCurrentAND_fNumberAcross = 0 != pAD->fNumberAcross; diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 1ed1f0f15e8f..02e67fc4d026 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -161,21 +161,21 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, OUString& rStr ) m_aFieldStack.back().SetBookmarkName(aBookmarkName); m_aFieldStack.back().SetBookmarkType(ODF_FORMTEXT); if ( aFormula.msToolTip.getLength() < 139 ) - m_aFieldStack.back().getParameters()["Description"] <<= aFormula.msToolTip; - m_aFieldStack.back().getParameters()["Name"] <<= aFormula.msTitle; + m_aFieldStack.back().getParameters()[u"Description"_ustr] <<= aFormula.msToolTip; + m_aFieldStack.back().getParameters()[u"Name"_ustr] <<= aFormula.msTitle; if (aFormula.mnMaxLen && aFormula.mnMaxLen < 32768 ) - m_aFieldStack.back().getParameters()["MaxLength"] <<= aFormula.mnMaxLen; + m_aFieldStack.back().getParameters()[u"MaxLength"_ustr] <<= aFormula.mnMaxLen; if ( aFormula.mfType == 1 ) - m_aFieldStack.back().getParameters()["Type"] <<= OUString("number"); + m_aFieldStack.back().getParameters()[u"Type"_ustr] <<= u"number"_ustr; else if ( aFormula.mfType == 2 ) - m_aFieldStack.back().getParameters()["Type"] <<= OUString("date"); + m_aFieldStack.back().getParameters()[u"Type"_ustr] <<= u"date"_ustr; else if ( aFormula.mfType == 3 ) - m_aFieldStack.back().getParameters()["Type"] <<= OUString("currentTime"); + m_aFieldStack.back().getParameters()[u"Type"_ustr] <<= u"currentTime"_ustr; else if ( aFormula.mfType == 4 ) - m_aFieldStack.back().getParameters()["Type"] <<= OUString("currentDate"); + m_aFieldStack.back().getParameters()[u"Type"_ustr] <<= u"currentDate"_ustr; else if ( aFormula.mfType == 5 ) - m_aFieldStack.back().getParameters()["Type"] <<= OUString("calculated"); + m_aFieldStack.back().getParameters()[u"Type"_ustr] <<= u"calculated"_ustr; } return eF_ResT::TEXT; } @@ -2406,7 +2406,7 @@ bool WW8FormulaListBox::Import(const uno::Reference < lang::XMultiServiceFactory> &rServiceFactory, uno::Reference <form::XFormComponent> &rFComp,awt::Size &rSz ) { - uno::Reference<uno::XInterface> xCreate = rServiceFactory->createInstance("com.sun.star.form.component.ComboBox"); + uno::Reference<uno::XInterface> xCreate = rServiceFactory->createInstance(u"com.sun.star.form.component.ComboBox"_ustr); if( !xCreate.is() ) return false; @@ -2421,15 +2421,15 @@ bool WW8FormulaListBox::Import(const uno::Reference < aTmp <<= msTitle; else aTmp <<= msName; - xPropSet->setPropertyValue("Name", aTmp ); + xPropSet->setPropertyValue(u"Name"_ustr, aTmp ); if (!msToolTip.isEmpty()) { aTmp <<= msToolTip; - xPropSet->setPropertyValue("HelpText", aTmp ); + xPropSet->setPropertyValue(u"HelpText"_ustr, aTmp ); } - xPropSet->setPropertyValue("Dropdown", css::uno::Any(true)); + xPropSet->setPropertyValue(u"Dropdown"_ustr, css::uno::Any(true)); if (!maListEntries.empty()) { @@ -2439,7 +2439,7 @@ bool WW8FormulaListBox::Import(const uno::Reference < for (sal_uInt32 nI = 0; nI < nLen; ++nI) aListSourceRange[nI] = maListEntries[nI]; aTmp <<= aListSource; - xPropSet->setPropertyValue("StringItemList", aTmp ); + xPropSet->setPropertyValue(u"StringItemList"_ustr, aTmp ); if (mfDropdownIndex < nLen) { @@ -2450,7 +2450,7 @@ bool WW8FormulaListBox::Import(const uno::Reference < aTmp <<= aListSource[0]; } - xPropSet->setPropertyValue("DefaultText", aTmp ); + xPropSet->setPropertyValue(u"DefaultText"_ustr, aTmp ); rSz = mrRdr.MiserableDropDownFormHack(maListEntries[0], xPropSet); } @@ -2496,7 +2496,7 @@ bool WW8FormulaCheckBox::Import(const uno::Reference < lang::XMultiServiceFactory> &rServiceFactory, uno::Reference <form::XFormComponent> &rFComp,awt::Size &rSz ) { - uno::Reference< uno::XInterface > xCreate = rServiceFactory->createInstance("com.sun.star.form.component.CheckBox"); + uno::Reference< uno::XInterface > xCreate = rServiceFactory->createInstance(u"com.sun.star.form.component.CheckBox"_ustr); if( !xCreate.is() ) return false; @@ -2514,16 +2514,16 @@ bool WW8FormulaCheckBox::Import(const uno::Reference < aTmp <<= msTitle; else aTmp <<= msName; - xPropSet->setPropertyValue("Name", aTmp ); + xPropSet->setPropertyValue(u"Name"_ustr, aTmp ); aTmp <<= static_cast<sal_Int16>(mnChecked); - xPropSet->setPropertyValue("DefaultState", aTmp); + xPropSet->setPropertyValue(u"DefaultState"_ustr, aTmp); if (!msToolTip.isEmpty()) - lcl_AddToPropertyContainer(xPropSet, "HelpText", msToolTip); + lcl_AddToPropertyContainer(xPropSet, u"HelpText"_ustr, msToolTip); if (!msHelp.isEmpty()) - lcl_AddToPropertyContainer(xPropSet, "HelpF1Text", msHelp); + lcl_AddToPropertyContainer(xPropSet, u"HelpF1Text"_ustr, msHelp); return true; @@ -2549,7 +2549,7 @@ bool SwMSConvertControls::InsertControl( return false; uno::Reference< uno::XInterface > xCreate = rServiceFactory->createInstance( - "com.sun.star.drawing.ControlShape"); + u"com.sun.star.drawing.ControlShape"_ustr); if( !xCreate.is() ) return false; @@ -2569,16 +2569,16 @@ bool SwMSConvertControls::InsertControl( else nTemp = text::TextContentAnchorType_AS_CHARACTER; - xShapePropSet->setPropertyValue("AnchorType", uno::Any(static_cast<sal_Int16>(nTemp)) ); + xShapePropSet->setPropertyValue(u"AnchorType"_ustr, uno::Any(static_cast<sal_Int16>(nTemp)) ); - xShapePropSet->setPropertyValue("VertOrient", uno::Any(sal_Int16(text::VertOrientation::TOP)) ); + xShapePropSet->setPropertyValue(u"VertOrient"_ustr, uno::Any(sal_Int16(text::VertOrientation::TOP)) ); uno::Reference< text::XText > xDummyTextRef; uno::Reference< text::XTextRange > xTextRg = new SwXTextRange( *m_pPaM, xDummyTextRef ); aTmp <<= xTextRg; - xShapePropSet->setPropertyValue("TextRange", aTmp ); + xShapePropSet->setPropertyValue(u"TextRange"_ustr, aTmp ); // Set the Control-Model for the Control-Shape uno::Reference< drawing::XControlShape > xControlShape( xShape, diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index 981cc95faffa..666186fca6a7 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -79,7 +79,7 @@ static bool SwWw8ReadScaling(tools::Long& rX, tools::Long& rY, rtl::Reference<So // 0x2c, 0x30 scaling x,y in per thousand // 0x34, 0x38, 0x3c, 0x40 Crop Left, Top, Right, Bot in tw - rtl::Reference<SotStorageStream> xSrc3 = rSrc1->OpenSotStream( "\3PIC", + rtl::Reference<SotStorageStream> xSrc3 = rSrc1->OpenSotStream( u"\3PIC"_ustr, StreamMode::STD_READ ); SotStorageStream* pS = xSrc3.get(); pS->SetEndian( SvStreamEndian::LITTLE ); @@ -123,7 +123,7 @@ static bool SwWw8ReadScaling(tools::Long& rX, tools::Long& rY, rtl::Reference<So static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp, rtl::Reference<SotStorage> const& rSrc1) { - rtl::Reference<SotStorageStream> xSrc2 = rSrc1->OpenSotStream( "\3META", + rtl::Reference<SotStorageStream> xSrc2 = rSrc1->OpenSotStream( u"\3META"_ustr, StreamMode::STD_READ ); SotStorageStream* pSt = xSrc2.get(); pSt->SetEndian( SvStreamEndian::LITTLE ); @@ -177,7 +177,7 @@ static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp, static bool SwWw6ReadMacPICTStream(Graphic& rGraph, rtl::Reference<SotStorage> const& rSrc1) { // 03-META-stream does not exist. Maybe a 03-PICT? - rtl::Reference<SotStorageStream> xSrc4 = rSrc1->OpenSotStream("\3PICT"); + rtl::Reference<SotStorageStream> xSrc4 = rSrc1->OpenSotStream(u"\3PICT"_ustr); SotStorageStream* pStp = xSrc4.get(); pStp->SetEndian( SvStreamEndian::LITTLE ); sal_uInt8 aTestA[10]; // Does the 01Ole-stream even exist? @@ -414,7 +414,7 @@ rtl::Reference<SdrObject> SwWW8ImplReader::ImportOleBase( Graphic& rGraph, sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; { - rtl::Reference<SotStorageStream> xObjInfoSrc = xSrc1->OpenSotStream("\3ObjInfo", + rtl::Reference<SotStorageStream> xObjInfoSrc = xSrc1->OpenSotStream(u"\3ObjInfo"_ustr, StreamMode::STD_READ ); if ( xObjInfoSrc.is() && !xObjInfoSrc->GetError() ) { diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index f34f5996caa9..cb65250a83c5 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -205,7 +205,7 @@ tools::Long SwWW8ImplReader::Read_Book(WW8PLCFManResult*) if( bSetAsHex ) { //all Hex-Numbers with \x before - OUString sTmp( "\\x" ); + OUString sTmp( u"\\x"_ustr ); if( cChar < 0x10 ) sTmp += "0"; sTmp += OUString::number( cChar, 16 ); @@ -707,7 +707,7 @@ sal_uInt16 SwWW8ImplReader::End_Field() if (xDocStg.is()) { uno::Reference< embed::XStorage > xOleStg = xDocStg->openStorageElement( - "OLELinks", embed::ElementModes::WRITE ); + u"OLELinks"_ustr, embed::ElementModes::WRITE ); rtl::Reference<SotStorage> xObjDst = SotStorage::OpenOLEStorage( xOleStg, sOleId ); if ( xObjDst.is() ) @@ -1147,7 +1147,7 @@ void SwWW8ImplReader::MakeTagString( OUString& rStr, const OUString& rOrg ) if( bSetAsHex ) { //all Hex-Numbers with \x before - OUString sTmp( "\\x" ); + OUString sTmp( u"\\x"_ustr ); if( cChar < 0x10 ) sTmp += "0"; sTmp += OUString::number( cChar, 16 ); @@ -1162,7 +1162,7 @@ void SwWW8ImplReader::MakeTagString( OUString& rStr, const OUString& rOrg ) void SwWW8ImplReader::InsertTagField( const sal_uInt16 nId, const OUString& rTagText ) { - OUString aName("WwFieldTag"); + OUString aName(u"WwFieldTag"_ustr); if( SwFltGetFlag( m_nFieldFlags, SwFltControlStack::TAGS_DO_ID ) ) // Number? aName += OUString::number( nId ); // return it? @@ -1473,7 +1473,7 @@ eF_ResT SwWW8ImplReader::Read_F_InputVar( WW8FieldDesc* pF, OUString& rStr ) eF_ResT SwWW8ImplReader::Read_F_ANumber( WW8FieldDesc*, OUString& rStr ) { if( !m_pNumFieldType ){ // 1st time - SwSetExpFieldType aT( &m_rDoc, "AutoNr", nsSwGetSetExpType::GSE_SEQ ); + SwSetExpFieldType aT( &m_rDoc, u"AutoNr"_ustr, nsSwGetSetExpType::GSE_SEQ ); m_pNumFieldType = static_cast<SwSetExpFieldType*>(m_rDoc.getIDocumentFieldsAccess().InsertFieldType( aT )); } SwSetExpField aField( m_pNumFieldType, OUString(), GetNumberPara( rStr ) ); @@ -2066,7 +2066,7 @@ eF_ResT SwWW8ImplReader::Read_F_Symbol( WW8FieldDesc*, OUString& rStr ) } else { - m_rDoc.getIDocumentContentOperations().InsertString(*m_pPaM, "###"); + m_rDoc.getIDocumentContentOperations().InsertString(*m_pPaM, u"###"_ustr); } return eF_ResT::OK; @@ -2198,7 +2198,7 @@ eF_ResT SwWW8ImplReader::Read_F_Ref( WW8FieldDesc*, OUString& rStr ) SwGetRefField aField( static_cast<SwGetRefFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( SwFieldIds::GetRef )), - sBkmName,"",REF_BOOKMARK,0,0,eFormat); + sBkmName,u""_ustr,REF_BOOKMARK,0,0,eFormat); if (eFormat == REF_CONTENT) { @@ -2253,14 +2253,14 @@ eF_ResT SwWW8ImplReader::Read_F_NoteReference( WW8FieldDesc*, OUString& rStr ) // set Sequence No of corresponding Foot-/Endnote to Zero // (will be corrected in SwGetRefField aField( static_cast<SwGetRefFieldType*>( - m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( SwFieldIds::GetRef )), aBkmName, "", REF_FOOTNOTE, 0, 0, + m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( SwFieldIds::GetRef )), aBkmName, u""_ustr, REF_FOOTNOTE, 0, 0, REF_ONLYNUMBER ); m_xReffingStck->NewAttr(*m_pPaM->GetPoint(), SwFormatField(aField)); m_xReffingStck->SetAttr(*m_pPaM->GetPoint(), RES_TXTATR_FIELD); if (bAboveBelow) { SwGetRefField aField2( static_cast<SwGetRefFieldType*>( - m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( SwFieldIds::GetRef )),aBkmName, "", REF_FOOTNOTE, 0, 0, + m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( SwFieldIds::GetRef )),aBkmName, u""_ustr, REF_FOOTNOTE, 0, 0, REF_UPDOWN ); m_xReffingStck->NewAttr(*m_pPaM->GetPoint(), SwFormatField(aField2)); m_xReffingStck->SetAttr(*m_pPaM->GetPoint(), RES_TXTATR_FIELD); @@ -2308,7 +2308,7 @@ eF_ResT SwWW8ImplReader::Read_F_PgRef( WW8FieldDesc*, OUString& rStr ) sBookmarkName = sName; } OUString sURL = "#" + sBookmarkName; - SwFormatINetFormat aURL( sURL, "" ); + SwFormatINetFormat aURL( sURL, u""_ustr ); static constexpr OUString sLinkStyle(u"Index Link"_ustr); const sal_uInt16 nPoolId = SwStyleNameMapper::GetPoolIdFromUIName( sLinkStyle, SwGetPoolIdFromName::ChrFmt ); @@ -2333,7 +2333,7 @@ eF_ResT SwWW8ImplReader::Read_F_PgRef( WW8FieldDesc*, OUString& rStr ) sPageRefBookmarkName = sName; } SwGetRefField aField( static_cast<SwGetRefFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( SwFieldIds::GetRef )), - sPageRefBookmarkName, "", REF_BOOKMARK, 0, 0, REF_PAGE ); + sPageRefBookmarkName, u""_ustr, REF_BOOKMARK, 0, 0, REF_PAGE ); m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFormatField( aField ) ); return eF_ResT::OK; @@ -2465,7 +2465,7 @@ bool CanUseRemoteLink(const OUString &rGrfName) if ( !INetURLObject( rGrfName ).isAnyKnownWebDAVScheme() ) { OUString aTitle; - aCnt.getPropertyValue("Title") >>= aTitle; + aCnt.getPropertyValue(u"Title"_ustr) >>= aTitle; bUseRemote = !aTitle.isEmpty(); } else @@ -2473,7 +2473,7 @@ bool CanUseRemoteLink(const OUString &rGrfName) // is a link to a WebDAV resource // need to use MediaType to check for link usability OUString aMediaType; - aCnt.getPropertyValue("MediaType") >>= aMediaType; + aCnt.getPropertyValue(u"MediaType"_ustr) >>= aMediaType; bUseRemote = !aMediaType.isEmpty(); } } @@ -3628,7 +3628,7 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, OUString& rStr // If on loading TOC field, change the default style into the "index link" if (m_bLoadingTOXCache) { - OUString sLinkStyle("Index Link"); + OUString sLinkStyle(u"Index Link"_ustr); sal_uInt16 nPoolId = SwStyleNameMapper::GetPoolIdFromUIName( sLinkStyle, SwGetPoolIdFromName::ChrFmt ); aURL.SetVisitedFormatAndId( sLinkStyle, nPoolId ); diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 80f9102dcb1b..ab9e76db1226 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -4478,7 +4478,7 @@ OUString WW8PLCFx_Book::GetBookmark(tools::Long nStart,tools::Long nEnd, sal_uIn OUString WW8PLCFx_Book::GetUniqueBookmarkName(const OUString &rSuggestedName) { - OUString aRet(rSuggestedName.isEmpty() ? OUString("Unnamed") : rSuggestedName); + OUString aRet(rSuggestedName.isEmpty() ? u"Unnamed"_ustr : rSuggestedName); size_t i = 0; while (i < m_aBookNames.size()) { diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx index 9ef5cdf0ca10..880e568f4c23 100644 --- a/sw/source/filter/ww8/ww8toolbar.cxx +++ b/sw/source/filter/ww8/ww8toolbar.cxx @@ -195,7 +195,7 @@ bool SwCTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh ) { uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xAppCfgSupp( ui::theModuleUIConfigurationManagerSupplier::get(xContext) ); - xCfgMgr = xAppCfgSupp->getUIConfigurationManager("com.sun.star.text.TextDocument"); + xCfgMgr = xAppCfgSupp->getUIConfigurationManager(u"com.sun.star.text.TextDocument"_ustr); } CustomToolBarImportHelper helper(rDocSh, xCfgMgr); helper.setMSOCommandMap( new MSOWordCommandConvertor() ); @@ -296,10 +296,10 @@ bool Customization::ImportMenu( SwCTBWrapper& rWrapper, CustomToolBarImportHelpe uno::Reference< container::XIndexContainer > xMenuContainer( xSCF->createInstanceWithContext( xContext ), uno::UNO_QUERY_THROW ); // create the popup menu uno::Sequence< beans::PropertyValue > aPopupMenu{ - comphelper::makePropertyValue("CommandURL", "vnd.openoffice.org:" + sMenuName), - comphelper::makePropertyValue("Label", sMenuName), - comphelper::makePropertyValue("Type", sal_Int32( 0 )), - comphelper::makePropertyValue("ItemDescriptorContainer", xMenuContainer) + comphelper::makePropertyValue(u"CommandURL"_ustr, "vnd.openoffice.org:" + sMenuName), + comphelper::makePropertyValue(u"Label"_ustr, sMenuName), + comphelper::makePropertyValue(u"Type"_ustr, sal_Int32( 0 )), + comphelper::makePropertyValue(u"ItemDescriptorContainer"_ustr, xMenuContainer) }; if ( pCust->m_customizationDataCTB && !pCust->m_customizationDataCTB->ImportMenuTB( rWrapper, xMenuContainer, helper ) ) return false; @@ -435,7 +435,7 @@ bool SwCTB::ImportCustomToolBar( SwCTBWrapper& rWrapper, CustomToolBarImportHelp uno::Reference< beans::XPropertySet > xProps( xIndexContainer, uno::UNO_QUERY_THROW ); // set UI name for toolbar - xProps->setPropertyValue( "UIName", uno::Any( m_name.getString() ) ); + xProps->setPropertyValue( u"UIName"_ustr, uno::Any( m_name.getString() ) ); const OUString sToolBarName = "private:resource/toolbar/custom_" + m_name.getString(); for ( auto& rItem : m_rTBC ) @@ -591,7 +591,7 @@ SwTBC::ImportToolBarControl( SwCTBWrapper& rWrapper, const css::uno::Reference< { // insert spacer uno::Sequence< beans::PropertyValue > sProps{ comphelper::makePropertyValue( - "Type", ui::ItemType::SEPARATOR_LINE) }; + u"Type"_ustr, ui::ItemType::SEPARATOR_LINE) }; toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::Any( sProps ) ); } |