diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-05-16 13:32:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-05-29 12:55:31 +0200 |
| commit | 5edbc4fd99db9fa568143aa4fa15b29de4bcc48b (patch) | |
| tree | 05ce037866d9a19afe1b193f1cde2305b9ad02dd | |
| parent | 2be07e3c42b2c59a75f6ebb90e6f806c369483cb (diff) | |
loplugin:ostr in sw/../writerfilter
Change-Id: Ib3fe74f1522f3c0a2b203e49b98c10cc825160a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167737
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
38 files changed, 1472 insertions, 1452 deletions
diff --git a/sw/source/writerfilter/dmapper/BorderHandler.cxx b/sw/source/writerfilter/dmapper/BorderHandler.cxx index ed14194c2a01..ad37a1d46c35 100644 --- a/sw/source/writerfilter/dmapper/BorderHandler.cxx +++ b/sw/source/writerfilter/dmapper/BorderHandler.cxx @@ -58,37 +58,37 @@ void BorderHandler::lcl_attribute(Id rName, Value & rVal) case NS_ooxml::LN_CT_Border_sz: // width of a single line in 1/8 pt, max of 32 pt -> twip * 5 / 2. m_nLineWidth = nIntValue * 5 / 2; - appendGrabBag("sz", OUString::number(nIntValue)); + appendGrabBag(u"sz"_ustr, OUString::number(nIntValue)); break; case NS_ooxml::LN_CT_Border_val: m_nLineType = nIntValue; - appendGrabBag("val", TDefTableHandler::getBorderTypeString(nIntValue)); + appendGrabBag(u"val"_ustr, TDefTableHandler::getBorderTypeString(nIntValue)); break; case NS_ooxml::LN_CT_Border_color: m_nLineColor = nIntValue; - appendGrabBag("color", msfilter::util::ConvertColorOU(Color(ColorTransparency, nIntValue))); + appendGrabBag(u"color"_ustr, msfilter::util::ConvertColorOU(Color(ColorTransparency, nIntValue))); break; case NS_ooxml::LN_CT_Border_space: // border distance in points m_nLineDistance = ConversionHelper::convertTwipToMM100( nIntValue * 20 ); - appendGrabBag("space", OUString::number(nIntValue)); + appendGrabBag(u"space"_ustr, OUString::number(nIntValue)); break; case NS_ooxml::LN_CT_Border_shadow: m_bShadow = nIntValue; break; case NS_ooxml::LN_CT_Border_frame: - appendGrabBag("frame", OUString::number(nIntValue, 16)); + appendGrabBag(u"frame"_ustr, OUString::number(nIntValue, 16)); break; case NS_ooxml::LN_CT_Border_themeTint: m_nThemeTint = nIntValue; - appendGrabBag("themeTint", OUString::number(nIntValue, 16)); + appendGrabBag(u"themeTint"_ustr, OUString::number(nIntValue, 16)); break; case NS_ooxml::LN_CT_Border_themeShade: m_nThemeShade = nIntValue; - appendGrabBag("themeShade", OUString::number(nIntValue, 16)); + appendGrabBag(u"themeShade"_ustr, OUString::number(nIntValue, 16)); break; case NS_ooxml::LN_CT_Border_themeColor: m_eThemeColorType = TDefTableHandler::getThemeColorTypeIndex(nIntValue); - appendGrabBag("themeColor", TDefTableHandler::getThemeColorTypeString(nIntValue)); + appendGrabBag(u"themeColor"_ustr, TDefTableHandler::getThemeColorTypeString(nIntValue)); break; default: OSL_FAIL( "unknown attribute"); diff --git a/sw/source/writerfilter/dmapper/CellColorHandler.cxx b/sw/source/writerfilter/dmapper/CellColorHandler.cxx index b99d40c08a12..33817df83a82 100644 --- a/sw/source/writerfilter/dmapper/CellColorHandler.cxx +++ b/sw/source/writerfilter/dmapper/CellColorHandler.cxx @@ -103,12 +103,12 @@ void CellColorHandler::lcl_attribute(Id rName, Value & rVal) { case NS_ooxml::LN_CT_Shd_val: { - createGrabBag("val", lcl_ConvertShd(nIntValue)); + createGrabBag(u"val"_ustr, lcl_ConvertShd(nIntValue)); m_nShadingPattern = nIntValue; } break; case NS_ooxml::LN_CT_Shd_fill: - createGrabBag("fill", uno::Any(msfilter::util::ConvertColorOU(Color(ColorTransparency, nIntValue)))); + createGrabBag(u"fill"_ustr, uno::Any(msfilter::util::ConvertColorOU(Color(ColorTransparency, nIntValue)))); if( nIntValue == sal_Int32(COL_AUTO) ) nIntValue = 0xffffff; //fill color auto means white else @@ -118,7 +118,7 @@ void CellColorHandler::lcl_attribute(Id rName, Value & rVal) m_bFillSpecified = true; break; case NS_ooxml::LN_CT_Shd_color: - createGrabBag("color", uno::Any(msfilter::util::ConvertColorOU(Color(ColorTransparency, nIntValue)))); + createGrabBag(u"color"_ustr, uno::Any(msfilter::util::ConvertColorOU(Color(ColorTransparency, nIntValue)))); if( nIntValue == sal_Int32(COL_AUTO) ) nIntValue = 0; //shading color auto means black //color of the shading @@ -126,27 +126,27 @@ void CellColorHandler::lcl_attribute(Id rName, Value & rVal) break; case NS_ooxml::LN_CT_Shd_themeFill: m_eFillThemeColorType = TDefTableHandler::getThemeColorTypeIndex(nIntValue); - createGrabBag("themeFill", uno::Any(TDefTableHandler::getThemeColorTypeString(nIntValue))); + createGrabBag(u"themeFill"_ustr, uno::Any(TDefTableHandler::getThemeColorTypeString(nIntValue))); break; case NS_ooxml::LN_CT_Shd_themeFillShade: m_nFillThemeColorShade = nIntValue; - createGrabBag("themeFillShade", uno::Any(OUString::number(nIntValue, 16))); + createGrabBag(u"themeFillShade"_ustr, uno::Any(OUString::number(nIntValue, 16))); break; case NS_ooxml::LN_CT_Shd_themeFillTint: m_nFillThemeColorTint = nIntValue; - createGrabBag("themeFillTint", uno::Any(OUString::number(nIntValue, 16))); + createGrabBag(u"themeFillTint"_ustr, uno::Any(OUString::number(nIntValue, 16))); break; case NS_ooxml::LN_CT_Shd_themeColor: m_eThemeColorType = TDefTableHandler::getThemeColorTypeIndex(nIntValue); - createGrabBag("themeColor", uno::Any(TDefTableHandler::getThemeColorTypeString(nIntValue))); + createGrabBag(u"themeColor"_ustr, uno::Any(TDefTableHandler::getThemeColorTypeString(nIntValue))); break; case NS_ooxml::LN_CT_Shd_themeShade: m_nThemeColorShade = nIntValue; - createGrabBag("themeShade", uno::Any(OUString::number(nIntValue, 16))); + createGrabBag(u"themeShade"_ustr, uno::Any(OUString::number(nIntValue, 16))); break; case NS_ooxml::LN_CT_Shd_themeTint: m_nThemeColorTint = nIntValue; - createGrabBag("themeTint", uno::Any(OUString::number(nIntValue, 16))); + createGrabBag(u"themeTint"_ustr, uno::Any(OUString::number(nIntValue, 16))); break; default: OSL_FAIL( "unknown attribute"); @@ -308,7 +308,7 @@ TablePropertyMapPtr CellColorHandler::getProperties() } } } - createGrabBag("originalColor", uno::Any(msfilter::util::ConvertColorOU(Color(ColorTransparency, nApplyColor)))); + createGrabBag(u"originalColor"_ustr, uno::Any(msfilter::util::ConvertColorOU(Color(ColorTransparency, nApplyColor)))); return pPropertyMap; } diff --git a/sw/source/writerfilter/dmapper/CellMarginHandler.cxx b/sw/source/writerfilter/dmapper/CellMarginHandler.cxx index e8262156e55f..8c014c093cf2 100644 --- a/sw/source/writerfilter/dmapper/CellMarginHandler.cxx +++ b/sw/source/writerfilter/dmapper/CellMarginHandler.cxx @@ -104,7 +104,7 @@ void CellMarginHandler::lcl_sprm(Sprm & rSprm) case NS_ooxml::LN_CT_TcMar_top: m_nTopMargin = m_nValue; m_bTopMarginValid = true; - createGrabBag("top"); + createGrabBag(u"top"_ustr); break; case NS_ooxml::LN_CT_TblCellMar_start: case NS_ooxml::LN_CT_TcMar_start: @@ -118,19 +118,19 @@ void CellMarginHandler::lcl_sprm(Sprm & rSprm) m_nLeftMargin = m_nValue; m_bLeftMarginValid = true; } - createGrabBag("start"); + createGrabBag(u"start"_ustr); break; case NS_ooxml::LN_CT_TblCellMar_left: case NS_ooxml::LN_CT_TcMar_left: m_nLeftMargin = m_nValue; m_bLeftMarginValid = true; - createGrabBag("left"); + createGrabBag(u"left"_ustr); break; case NS_ooxml::LN_CT_TblCellMar_bottom: case NS_ooxml::LN_CT_TcMar_bottom: m_nBottomMargin = m_nValue; m_bBottomMarginValid = true; - createGrabBag("bottom"); + createGrabBag(u"bottom"_ustr); break; case NS_ooxml::LN_CT_TblCellMar_end: case NS_ooxml::LN_CT_TcMar_end: @@ -144,13 +144,13 @@ void CellMarginHandler::lcl_sprm(Sprm & rSprm) m_nRightMargin = m_nValue; m_bRightMarginValid = true; } - createGrabBag("end"); + createGrabBag(u"end"_ustr); break; case NS_ooxml::LN_CT_TblCellMar_right: case NS_ooxml::LN_CT_TcMar_right: m_nRightMargin = m_nValue; m_bRightMarginValid = true; - createGrabBag("right"); + createGrabBag(u"right"_ustr); break; default: SAL_WARN("writerfilter", "CellMarginHandler::lcl_sprm: unknown sprm"); diff --git a/sw/source/writerfilter/dmapper/DocumentProtection.cxx b/sw/source/writerfilter/dmapper/DocumentProtection.cxx index dddf964c4022..f5ce6a4872ca 100644 --- a/sw/source/writerfilter/dmapper/DocumentProtection.cxx +++ b/sw/source/writerfilter/dmapper/DocumentProtection.cxx @@ -37,8 +37,8 @@ DocumentProtection::DocumentProtection() , m_bEnforcement(false) , m_bFormatting(false) , m_nCryptProviderType(NS_ooxml::LN_Value_doc_ST_CryptProv_rsaAES) - , m_sCryptAlgorithmClass("hash") - , m_sCryptAlgorithmType("typeAny") + , m_sCryptAlgorithmClass(u"hash"_ustr) + , m_sCryptAlgorithmType(u"typeAny"_ustr) , m_CryptSpinCount(0) { } @@ -128,19 +128,19 @@ uno::Sequence<beans::PropertyValue> DocumentProtection::toSequence() const switch (m_nEdit) { case NS_ooxml::LN_Value_doc_ST_DocProtect_none: - aValue.Value <<= OUString("none"); + aValue.Value <<= u"none"_ustr; break; case NS_ooxml::LN_Value_doc_ST_DocProtect_readOnly: - aValue.Value <<= OUString("readOnly"); + aValue.Value <<= u"readOnly"_ustr; break; case NS_ooxml::LN_Value_doc_ST_DocProtect_comments: - aValue.Value <<= OUString("comments"); + aValue.Value <<= u"comments"_ustr; break; case NS_ooxml::LN_Value_doc_ST_DocProtect_trackedChanges: - aValue.Value <<= OUString("trackedChanges"); + aValue.Value <<= u"trackedChanges"_ustr; break; case NS_ooxml::LN_Value_doc_ST_DocProtect_forms: - aValue.Value <<= OUString("forms"); + aValue.Value <<= u"forms"_ustr; break; default: { @@ -158,7 +158,7 @@ uno::Sequence<beans::PropertyValue> DocumentProtection::toSequence() const { beans::PropertyValue aValue; aValue.Name = "enforcement"; - aValue.Value <<= OUString("1"); + aValue.Value <<= u"1"_ustr; documentProtection.push_back(aValue); } @@ -167,7 +167,7 @@ uno::Sequence<beans::PropertyValue> DocumentProtection::toSequence() const { beans::PropertyValue aValue; aValue.Name = "formatting"; - aValue.Value <<= OUString("1"); + aValue.Value <<= u"1"_ustr; documentProtection.push_back(aValue); } @@ -176,9 +176,9 @@ uno::Sequence<beans::PropertyValue> DocumentProtection::toSequence() const beans::PropertyValue aValue; aValue.Name = "cryptProviderType"; if (m_nCryptProviderType == NS_ooxml::LN_Value_doc_ST_CryptProv_rsaAES) - aValue.Value <<= OUString("rsaAES"); + aValue.Value <<= u"rsaAES"_ustr; else if (m_nCryptProviderType == NS_ooxml::LN_Value_doc_ST_CryptProv_rsaFull) - aValue.Value <<= OUString("rsaFull"); + aValue.Value <<= u"rsaFull"_ustr; documentProtection.push_back(aValue); } diff --git a/sw/source/writerfilter/dmapper/DomainMapper.cxx b/sw/source/writerfilter/dmapper/DomainMapper.cxx index 3af9d5d85ff6..9144acaf79f7 100644 --- a/sw/source/writerfilter/dmapper/DomainMapper.cxx +++ b/sw/source/writerfilter/dmapper/DomainMapper.cxx @@ -136,13 +136,13 @@ DomainMapper::DomainMapper( const uno::Reference< uno::XComponentContext >& xCon uno::Any(true)); // Don't load the default style definitions to avoid weird mix - m_pImpl->SetDocumentSettingsProperty("StylesNoDefault", uno::Any(true)); - m_pImpl->SetDocumentSettingsProperty("MsWordCompTrailingBlanks", uno::Any(true)); - m_pImpl->SetDocumentSettingsProperty("HeaderSpacingBelowLastPara", + m_pImpl->SetDocumentSettingsProperty(u"StylesNoDefault"_ustr, uno::Any(true)); + m_pImpl->SetDocumentSettingsProperty(u"MsWordCompTrailingBlanks"_ustr, uno::Any(true)); + m_pImpl->SetDocumentSettingsProperty(u"HeaderSpacingBelowLastPara"_ustr, uno::Any(true)); - m_pImpl->SetDocumentSettingsProperty("FrameAutowidthWithMorePara", uno::Any(true)); - m_pImpl->SetDocumentSettingsProperty("FootnoteInColumnToPageEnd", uno::Any(true)); - m_pImpl->SetDocumentSettingsProperty("TabAtLeftIndentForParagraphsInList", uno::Any(true)); + m_pImpl->SetDocumentSettingsProperty(u"FrameAutowidthWithMorePara"_ustr, uno::Any(true)); + m_pImpl->SetDocumentSettingsProperty(u"FootnoteInColumnToPageEnd"_ustr, uno::Any(true)); + m_pImpl->SetDocumentSettingsProperty(u"TabAtLeftIndentForParagraphsInList"_ustr, uno::Any(true)); m_pImpl->SetDocumentSettingsProperty(u"NoGapAfterNoteNumber"_ustr, uno::Any(true)); // Enable only for new documents, since pasting from clipboard can influence existing doc @@ -157,7 +157,7 @@ DomainMapper::DomainMapper( const uno::Reference< uno::XComponentContext >& xCon if (xModel) { uno::Reference<embed::XStorage> xStorage = comphelper::OStorageHelper::GetTemporaryStorage(); - OUString aBaseURL = rMediaDesc.getUnpackedValueOrDefault("URL", OUString()); + OUString aBaseURL = rMediaDesc.getUnpackedValueOrDefault(u"URL"_ustr, OUString()); const uno::Reference<frame::XModel> xModel_(static_cast<SfxBaseModel*>(xModel.get())); const uno::Reference<rdf::XURI> xBaseURI(sfx2::createBaseURI(xContext, xModel_, aBaseURL, u"")); const uno::Reference<task::XInteractionHandler> xHandler; @@ -177,7 +177,7 @@ DomainMapper::DomainMapper( const uno::Reference< uno::XComponentContext >& xCon try { rtl::Reference<SwXTextDefaults> xDefProps(GetTextDocument()->createTextDefaults()); - xDefProps->setPropertyValue(getPropertyName(PROP_CHAR_FONT_NAME), css::uno::Any(OUString("Calibri"))); + xDefProps->setPropertyValue(getPropertyName(PROP_CHAR_FONT_NAME), css::uno::Any(u"Calibri"_ustr)); xDefProps->setPropertyValue(getPropertyName(PROP_CHAR_HEIGHT), css::uno::Any(double(11))); } catch (const uno::Exception&) @@ -193,7 +193,7 @@ DomainMapper::DomainMapper( const uno::Reference< uno::XComponentContext >& xCon OFOPXML_STORAGE_FORMAT_STRING, xInputStream, xContext, bRepairStorage); uno::Reference< uno::XInterface > xTemp = xContext->getServiceManager()->createInstanceWithContext( - "com.sun.star.document.OOXMLDocumentPropertiesImporter", + u"com.sun.star.document.OOXMLDocumentPropertiesImporter"_ustr, xContext); uno::Reference< document::XOOXMLDocumentPropertiesImporter > xImporter( xTemp, uno::UNO_QUERY_THROW ); @@ -242,32 +242,32 @@ DomainMapper::~DomainMapper() m_pImpl->GetSettingsTable()->ApplyProperties( m_pImpl->GetTextDocument( ) ); // now that importing is finished, re-enable default styles for any that were never defined/imported. - m_pImpl->SetDocumentSettingsProperty("StylesNoDefault", uno::Any(false)); + m_pImpl->SetDocumentSettingsProperty(u"StylesNoDefault"_ustr, uno::Any(false)); // Grab-bag handling comphelper::SequenceAsHashMap aProperties; // Add the saved w:themeFontLang setting - aProperties["ThemeFontLangProps"] <<= m_pImpl->GetSettingsTable()->GetThemeFontLangProperties(); + aProperties[u"ThemeFontLangProps"_ustr] <<= m_pImpl->GetSettingsTable()->GetThemeFontLangProperties(); // Add the saved compat settings - aProperties["CompatSettings"] <<= m_pImpl->GetSettingsTable()->GetCompatSettings(); + aProperties[u"CompatSettings"_ustr] <<= m_pImpl->GetSettingsTable()->GetCompatSettings(); // Add the saved DocumentProtection settings - aProperties["DocumentProtection"] <<= m_pImpl->GetSettingsTable()->GetDocumentProtectionSettings(); + aProperties[u"DocumentProtection"_ustr] <<= m_pImpl->GetSettingsTable()->GetDocumentProtectionSettings(); // Add the saved w:doNotHyphenateCaps setting - aProperties["NoHyphenateCaps"] <<= m_pImpl->GetSettingsTable()->GetNoHyphenateCaps(); + aProperties[u"NoHyphenateCaps"_ustr] <<= m_pImpl->GetSettingsTable()->GetNoHyphenateCaps(); if (m_pImpl->GetTextDocument()) { - comphelper::SequenceAsHashMap aGrabBag(m_pImpl->GetTextDocument()->getPropertyValue("InteropGrabBag")); + comphelper::SequenceAsHashMap aGrabBag(m_pImpl->GetTextDocument()->getPropertyValue(u"InteropGrabBag"_ustr)); aGrabBag.update(aProperties); - m_pImpl->GetTextDocument()->setPropertyValue("InteropGrabBag", uno::Any(aGrabBag.getAsConstPropertyValueList())); + m_pImpl->GetTextDocument()->setPropertyValue(u"InteropGrabBag"_ustr, uno::Any(aGrabBag.getAsConstPropertyValueList())); } // tdf#138782: for docs created in MS Word 2010 and older (compatibilityMode <= 14) m_pImpl->SetDocumentSettingsProperty( - "AddFrameOffsets", + u"AddFrameOffsets"_ustr, uno::Any(14 >= m_pImpl->GetSettingsTable()->GetWordCompatibilityMode())); } catch( const uno::Exception& ) {} @@ -420,7 +420,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) } break; case NS_ooxml::LN_CT_Fonts_asciiTheme: - m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "asciiTheme", ThemeHandler::getStringForTheme(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, u"asciiTheme"_ustr, ThemeHandler::getStringForTheme(nIntValue)); if (m_pImpl->GetTopContext()) { // note: overwrite Fonts_ascii with Fonts_asciiTheme *even if* @@ -434,7 +434,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) case NS_ooxml::LN_CT_Fonts_hAnsi: break;//unsupported case NS_ooxml::LN_CT_Fonts_hAnsiTheme: - m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "hAnsiTheme", ThemeHandler::getStringForTheme(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, u"hAnsiTheme"_ustr, ThemeHandler::getStringForTheme(nIntValue)); if (m_pImpl->GetTopContext()) m_pImpl->GetTopContext()->Insert(PROP_CHAR_THEME_NAME_H_ANSI, uno::Any( ThemeHandler::getStringForTheme(nIntValue) ), true, CHAR_GRAB_BAG); break; @@ -443,7 +443,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME_ASIAN, uno::Any( sStringValue )); break; case NS_ooxml::LN_CT_Fonts_eastAsiaTheme: - m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "eastAsiaTheme", ThemeHandler::getStringForTheme(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, u"eastAsiaTheme"_ustr, ThemeHandler::getStringForTheme(nIntValue)); if (m_pImpl->GetTopContext()) { uno::Any aPropValue( m_pImpl->getFontNameForTheme( nIntValue ) ); @@ -457,7 +457,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME_COMPLEX, uno::Any( sStringValue )); break; case NS_ooxml::LN_CT_Fonts_cstheme: - m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "cstheme", ThemeHandler::getStringForTheme(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, u"cstheme"_ustr, ThemeHandler::getStringForTheme(nIntValue)); if (m_pImpl->GetTopContext()) { uno::Any aPropValue( m_pImpl->getFontNameForTheme( nIntValue ) ); @@ -467,7 +467,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) } break; case NS_ooxml::LN_CT_Spacing_before: - m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "before", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, u"before"_ustr, OUString::number(nIntValue)); if (m_pImpl->GetTopContext()) // Don't overwrite NS_ooxml::LN_CT_Spacing_beforeAutospacing. m_pImpl->GetTopContext()->Insert( @@ -475,7 +475,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) uno::Any(static_cast<sal_Int32>(convertTwipToMm100(nIntValue))), false); break; case NS_ooxml::LN_CT_Spacing_beforeLines: - m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "beforeLines", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, u"beforeLines"_ustr, OUString::number(nIntValue)); // We would need to make sure that this doesn't overwrite any // NS_ooxml::LN_CT_Spacing_before in parent styles before style // sheet support can be enabled. @@ -483,7 +483,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) m_pImpl->GetTopContext()->Insert(PROP_PARA_TOP_MARGIN, uno::Any(ConversionHelper::convertTwipToMM100(nIntValue * nSingleLineSpacing / 100)), false); break; case NS_ooxml::LN_CT_Spacing_after: - m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "after", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, u"after"_ustr, OUString::number(nIntValue)); if (m_pImpl->GetTopContext()) { // Don't overwrite NS_ooxml::LN_CT_Spacing_afterAutospacing. @@ -497,7 +497,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) } break; case NS_ooxml::LN_CT_Spacing_afterLines: - m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "afterLines", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, u"afterLines"_ustr, OUString::number(nIntValue)); // We would need to make sure that this doesn't overwrite any // NS_ooxml::LN_CT_Spacing_after in parent styles before style // sheet support can be enabled. @@ -522,7 +522,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) } if( nName == NS_ooxml::LN_CT_Spacing_line ) { - m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "line", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, u"line"_ustr, OUString::number(nIntValue)); //now set the value depending on the Mode if( aSpacing.Mode == style::LineSpacingMode::PROP ) aSpacing.Height = sal_Int16(nIntValue * 100 / nSingleLineSpacing ); @@ -534,7 +534,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) // exactly, atLeast, auto if( sal::static_int_cast<Id>(nIntValue) == NS_ooxml::LN_Value_doc_ST_LineSpacingRule_auto) { - m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "lineRule", "auto"); + m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, u"lineRule"_ustr, u"auto"_ustr); if (aSpacing.Height >= 0) { aSpacing.Mode = style::LineSpacingMode::PROP; @@ -551,12 +551,12 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) } else if( sal::static_int_cast<Id>(nIntValue) == NS_ooxml::LN_Value_doc_ST_LineSpacingRule_atLeast) { - m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "lineRule", "atLeast"); + m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, u"lineRule"_ustr, u"atLeast"_ustr); aSpacing.Mode = style::LineSpacingMode::MINIMUM; } else // NS_ooxml::LN_Value_doc_ST_LineSpacingRule_exact { - m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "lineRule", "exact"); + m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, u"lineRule"_ustr, u"exact"_ustr); aSpacing.Mode = style::LineSpacingMode::FIX; } } @@ -570,8 +570,8 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) { // Word inherits FirstLineIndent property of the numbering, even if ParaLeftMargin is set, Writer does not. // So copy it explicitly, if necessary. - sal_Int32 nFirstLineIndent = m_pImpl->getCurrentNumberingProperty("FirstLineIndent"); - sal_Int32 nIndentAt = m_pImpl->getCurrentNumberingProperty("IndentAt"); + sal_Int32 nFirstLineIndent = m_pImpl->getCurrentNumberingProperty(u"FirstLineIndent"_ustr); + sal_Int32 nIndentAt = m_pImpl->getCurrentNumberingProperty(u"IndentAt"_ustr); sal_Int32 nParaLeftMargin = ConversionHelper::convertTwipToMM100(nIntValue); if (nParaLeftMargin != 0 && nIndentAt == nParaLeftMargin) @@ -592,8 +592,8 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) { // Word inherits FirstLineIndent/ParaLeftMargin property of the numbering, even if ParaRightMargin is set, Writer does not. // So copy it explicitly, if necessary. - sal_Int32 nFirstLineIndent = m_pImpl->getCurrentNumberingProperty("FirstLineIndent"); - sal_Int32 nParaLeftMargin = m_pImpl->getCurrentNumberingProperty("IndentAt"); + sal_Int32 nFirstLineIndent = m_pImpl->getCurrentNumberingProperty(u"FirstLineIndent"_ustr); + sal_Int32 nParaLeftMargin = m_pImpl->getCurrentNumberingProperty(u"IndentAt"_ustr); if (nFirstLineIndent != 0) m_pImpl->GetTopContext()->Insert(PROP_PARA_FIRST_LINE_INDENT, uno::Any(nFirstLineIndent), /*bOverwrite=*/false); @@ -603,7 +603,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) m_pImpl->GetTopContext()->Insert( PROP_PARA_RIGHT_MARGIN, uno::Any( ConversionHelper::convertTwipToMM100(nIntValue ) )); } - m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "right", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, u"right"_ustr, OUString::number(nIntValue)); break; case NS_ooxml::LN_CT_Ind_hanging: if (m_pImpl->GetTopContext()) @@ -613,7 +613,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) PROP_PARA_FIRST_LINE_INDENT, uno::Any( - nValue )); // See above, need to inherit left margin from list style when first is set. - sal_Int32 nParaLeftMargin = m_pImpl->getCurrentNumberingProperty("IndentAt"); + sal_Int32 nParaLeftMargin = m_pImpl->getCurrentNumberingProperty(u"IndentAt"_ustr); if (nParaLeftMargin != 0) m_pImpl->GetTopContext()->Insert(PROP_PARA_LEFT_MARGIN, uno::Any(nParaLeftMargin), /*bOverwrite=*/false); } @@ -622,7 +622,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) if (m_pImpl->GetTopContext()) { sal_Int32 nFirstLineIndent - = m_pImpl->getCurrentNumberingProperty("FirstLineIndent"); + = m_pImpl->getCurrentNumberingProperty(u"FirstLineIndent"_ustr); sal_Int32 nParaFirstLineIndent = ConversionHelper::convertTwipToMM100(nIntValue); if (nParaFirstLineIndent != 0 && nFirstLineIndent == nParaFirstLineIndent) // Avoid direct first margin when it's the same as from the @@ -633,7 +633,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) } break; case NS_ooxml::LN_CT_Ind_rightChars: - m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "rightChars", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, u"rightChars"_ustr, OUString::number(nIntValue)); break; case NS_ooxml::LN_CT_EastAsianLayout_id: @@ -722,11 +722,11 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) } if (nName == NS_ooxml::LN_CT_Language_eastAsia) - m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "eastAsia", sStringValue); + m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, u"eastAsia"_ustr, sStringValue); else if (nName == NS_ooxml::LN_CT_Language_val) - m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "val", sStringValue); + m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, u"val"_ustr, sStringValue); else if (nName == NS_ooxml::LN_CT_Language_bidi) - m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "bidi", sStringValue); + m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, u"bidi"_ustr, sStringValue); lang::Locale aLocale; if (sStringValue.getLength() <= 3 && sStringValue.getLength() >= 1) { @@ -1289,30 +1289,30 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) break; case NS_ooxml::LN_CT_DataBinding_prefixMappings: m_pImpl->m_pSdtHelper->setDataBindingPrefixMapping(sStringValue); - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "ooxml:CT_DataBinding_prefixMappings", sStringValue); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"ooxml:CT_DataBinding_prefixMappings"_ustr, sStringValue); break; case NS_ooxml::LN_CT_DataBinding_xpath: m_pImpl->m_pSdtHelper->setDataBindingXPath(sStringValue); - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "ooxml:CT_DataBinding_xpath", sStringValue); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"ooxml:CT_DataBinding_xpath"_ustr, sStringValue); break; case NS_ooxml::LN_CT_DataBinding_storeItemID: m_pImpl->m_pSdtHelper->setDataBindingStoreItemID(sStringValue); - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "ooxml:CT_DataBinding_storeItemID", sStringValue); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"ooxml:CT_DataBinding_storeItemID"_ustr, sStringValue); break; case NS_ooxml::LN_CT_SdtPlaceholder_docPart_val: - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "ooxml:CT_SdtPlaceholder_docPart_val", sStringValue); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"ooxml:CT_SdtPlaceholder_docPart_val"_ustr, sStringValue); m_pImpl->m_pSdtHelper->SetPlaceholderDocPart(sStringValue); break; case NS_ooxml::LN_CT_SdtColor_val: - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "ooxml:CT_SdtColor_val", sStringValue); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"ooxml:CT_SdtColor_val"_ustr, sStringValue); m_pImpl->m_pSdtHelper->SetColor(sStringValue); break; case NS_ooxml::LN_CT_SdtAppearance_val: - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "ooxml:CT_SdtAppearance_val", sStringValue); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"ooxml:CT_SdtAppearance_val"_ustr, sStringValue); m_pImpl->m_pSdtHelper->SetAppearance(sStringValue); break; case NS_ooxml::LN_CT_SdtText_multiLine: - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "ooxml:CT_SdtText_multiLine", sStringValue); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"ooxml:CT_SdtText_multiLine"_ustr, sStringValue); break; case NS_ooxml::LN_CT_PTab_leader: case NS_ooxml::LN_CT_PTab_relativeTo: @@ -1321,43 +1321,43 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) m_pImpl->HandlePTab(nIntValue); break; case NS_ooxml::LN_CT_Cnf_lastRowLastColumn: - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "lastRowLastColumn", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"lastRowLastColumn"_ustr, OUString::number(nIntValue)); break; case NS_ooxml::LN_CT_Cnf_lastRowFirstColumn: - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "lastRowFirstColumn", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"lastRowFirstColumn"_ustr, OUString::number(nIntValue)); break; case NS_ooxml::LN_CT_Cnf_firstRowLastColumn: - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "firstRowLastColumn", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"firstRowLastColumn"_ustr, OUString::number(nIntValue)); break; case NS_ooxml::LN_CT_Cnf_oddHBand: - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "oddHBand", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"oddHBand"_ustr, OUString::number(nIntValue)); break; case NS_ooxml::LN_CT_Cnf_firstRowFirstColumn: - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "firstRowFirstColumn", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"firstRowFirstColumn"_ustr, OUString::number(nIntValue)); break; case NS_ooxml::LN_CT_Cnf_evenVBand: - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "evenVBand", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"evenVBand"_ustr, OUString::number(nIntValue)); break; case NS_ooxml::LN_CT_Cnf_evenHBand: - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "evenHBand", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"evenHBand"_ustr, OUString::number(nIntValue)); break; case NS_ooxml::LN_CT_Cnf_lastColumn: - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "lastColumn", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"lastColumn"_ustr, OUString::number(nIntValue)); break; case NS_ooxml::LN_CT_Cnf_firstColumn: - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "firstColumn", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"firstColumn"_ustr, OUString::number(nIntValue)); break; case NS_ooxml::LN_CT_Cnf_oddVBand: - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "oddVBand", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"oddVBand"_ustr, OUString::number(nIntValue)); break; case NS_ooxml::LN_CT_Cnf_lastRow: - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "lastRow", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"lastRow"_ustr, OUString::number(nIntValue)); break; case NS_ooxml::LN_CT_Cnf_firstRow: - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "firstRow", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"firstRow"_ustr, OUString::number(nIntValue)); break; case NS_ooxml::LN_CT_Cnf_val: - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "val", sStringValue); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"val"_ustr, sStringValue); break; case NS_ooxml::LN_CT_DocPartName_val: { @@ -1479,7 +1479,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) const uno::Reference<beans::XPropertySetInfo> xFillInfo = xFillPropertySet->getPropertySetInfo(); uno::Reference<beans::XPropertySet> xPS( - m_pImpl->GetPageStyles()->getByName("Standard"), uno::UNO_QUERY_THROW); + m_pImpl->GetPageStyles()->getByName(u"Standard"_ustr), uno::UNO_QUERY_THROW); for (const beans::Property& rProp : xPS->getPropertySetInfo()->getProperties()) { if (rProp.Name == "FillComplexColor" || rProp.Name == "FillGradientName" @@ -1743,7 +1743,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) pCellColorHandler->setOutputFormat( CellColorHandler::Paragraph ); bool bEnableTempGrabBag = !pCellColorHandler->isInteropGrabBagEnabled(); if( bEnableTempGrabBag ) - pCellColorHandler->enableInteropGrabBag( "TempShdPropsGrabBag" ); + pCellColorHandler->enableInteropGrabBag( u"TempShdPropsGrabBag"_ustr ); pProperties->resolve(*pCellColorHandler); rContext->InsertProps(pCellColorHandler->getProperties().get()); @@ -2028,9 +2028,9 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) rContext->Insert(PROP_CHAR_WEIGHT_ASIAN, aBold ); if (nSprmId == NS_ooxml::LN_EG_RPrBase_b) - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "b", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"b"_ustr, OUString::number(nIntValue)); else if (nSprmId == NS_ooxml::LN_EG_RPrBase_bCs) - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "bCs", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"bCs"_ustr, OUString::number(nIntValue)); } break; case NS_ooxml::LN_EG_RPrBase_i: @@ -2041,7 +2041,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) if (nSprmId != NS_ooxml::LN_EG_RPrBase_iCs) rContext->Insert(PROP_CHAR_POSTURE_ASIAN, aPosture ); if (nSprmId == NS_ooxml::LN_EG_RPrBase_i) - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "i", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"i"_ustr, OUString::number(nIntValue)); } break; case NS_ooxml::LN_EG_RPrBase_strike: @@ -2070,12 +2070,12 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) // If smallcaps would be just disabled and another casemap is already inserted, don't do anything. if (nIntValue || !rContext->isSet(ePropertyId) ) rContext->Insert(ePropertyId, uno::Any( nIntValue ? style::CaseMap::SMALLCAPS : style::CaseMap::NONE)); - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "smallCaps", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"smallCaps"_ustr, OUString::number(nIntValue)); break; case NS_ooxml::LN_EG_RPrBase_caps: rContext->Insert(ePropertyId, uno::Any( nIntValue ? style::CaseMap::UPPERCASE : style::CaseMap::NONE)); - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "caps", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"caps"_ustr, OUString::number(nIntValue)); break; case NS_ooxml::LN_EG_RPrBase_emboss: rContext->Insert(ePropertyId, @@ -2113,7 +2113,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) rContext->Insert( PROP_CHAR_HEIGHT, aVal ); rContext->Insert( PROP_CHAR_HEIGHT_ASIAN, aVal ); } - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, (nSprmId == NS_ooxml::LN_EG_RPrBase_sz ? OUString("sz") : OUString("szCs")), OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, (nSprmId == NS_ooxml::LN_EG_RPrBase_sz ? u"sz"_ustr : u"szCs"_ustr), OUString::number(nIntValue)); } break; case NS_ooxml::LN_EG_RPrBase_position: @@ -2161,7 +2161,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) nResult = static_cast<sal_Int16>(nIntValue); } rContext->Insert(PROP_CHAR_CHAR_KERNING, uno::Any(nResult)); - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "spacing", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"spacing"_ustr, OUString::number(nIntValue)); } break; case NS_ooxml::LN_EG_RPrBase_kern: // auto kerning is bound to a minimum font size in Word - but not in Writer :-( @@ -2400,13 +2400,13 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) { if (pThemeColorHandler->mnIndex >= 0) { - m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "themeColor", aThemeColorName.get<OUString>()); + m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, u"themeColor"_ustr, aThemeColorName.get<OUString>()); if (pThemeColorHandler->mnTint > 0) - m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "themeTint", aThemeColorTint.get<OUString>()); + m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, u"themeTint"_ustr, aThemeColorTint.get<OUString>()); if (pThemeColorHandler->mnShade > 0) - m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "themeShade", aThemeColorShade.get<OUString>()); + m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, u"themeShade"_ustr, aThemeColorShade.get<OUString>()); } - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "color", m_pImpl->m_aSubInteropGrabBag); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"color"_ustr, m_pImpl->m_aSubInteropGrabBag); } } } @@ -2429,17 +2429,17 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) m_pImpl->SetParaSectpr(true); resolveSprmProps(*this, rSprm); if (nSprmId == NS_ooxml::LN_CT_PPrBase_spacing) - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "spacing", m_pImpl->m_aSubInteropGrabBag); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"spacing"_ustr, m_pImpl->m_aSubInteropGrabBag); else if (nSprmId == NS_ooxml::LN_EG_RPrBase_rFonts) - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "rFonts", m_pImpl->m_aSubInteropGrabBag); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"rFonts"_ustr, m_pImpl->m_aSubInteropGrabBag); else if (nSprmId == NS_ooxml::LN_EG_RPrBase_lang) - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "lang", m_pImpl->m_aSubInteropGrabBag); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"lang"_ustr, m_pImpl->m_aSubInteropGrabBag); else if (nSprmId == NS_ooxml::LN_CT_PPrBase_ind) - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "ind", m_pImpl->m_aSubInteropGrabBag); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"ind"_ustr, m_pImpl->m_aSubInteropGrabBag); } break; case NS_ooxml::LN_CT_PPrBase_wordWrap: - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "wordWrap", ""); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"wordWrap"_ustr, u""_ustr); break; case NS_ooxml::LN_EG_SectPrContents_footnotePr: case NS_ooxml::LN_EG_SectPrContents_endnotePr: @@ -2651,7 +2651,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) } else { - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "snapToGrid", OUString::number(nIntValue)); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"snapToGrid"_ustr, OUString::number(nIntValue)); } break; case NS_ooxml::LN_CT_PPrBase_pStyle: @@ -3074,7 +3074,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) m_pImpl->m_pSdtHelper->getInteropGrabBagAndClear(); break; } - enableInteropGrabBag("ooxml:CT_SdtPr_text"); + enableInteropGrabBag(u"ooxml:CT_SdtPr_text"_ustr); writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); if (pProperties) pProperties->resolve(*this); @@ -3271,7 +3271,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) } else { - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "ooxml:CT_SdtCheckbox_checked", + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"ooxml:CT_SdtCheckbox_checked"_ustr, TextEffectsHandler::getOnOffString(nIntValue)); } break; @@ -3282,7 +3282,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) } else { - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "ooxml:CT_SdtCheckbox_checkedState", + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"ooxml:CT_SdtCheckbox_checkedState"_ustr, sStringValue); } break; @@ -3295,17 +3295,17 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) else { m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, - "ooxml:CT_SdtCheckbox_uncheckedState", sStringValue); + u"ooxml:CT_SdtCheckbox_uncheckedState"_ustr, sStringValue); } break; case NS_ooxml::LN_CT_SdtDocPart_docPartGallery: - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "ooxml:CT_SdtDocPart_docPartGallery", sStringValue); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"ooxml:CT_SdtDocPart_docPartGallery"_ustr, sStringValue); break; case NS_ooxml::LN_CT_SdtDocPart_docPartCategory: - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "ooxml:CT_SdtDocPart_docPartCategory", sStringValue); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"ooxml:CT_SdtDocPart_docPartCategory"_ustr, sStringValue); break; case NS_ooxml::LN_CT_SdtDocPart_docPartUnique: - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "ooxml:CT_SdtDocPart_docPartUnique", sStringValue); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"ooxml:CT_SdtDocPart_docPartUnique"_ustr, sStringValue); break; case NS_ooxml::LN_EG_SectPrContents_pgNumType: { @@ -3424,7 +3424,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) break; case NS_ooxml::LN_CT_TrPrBase_cnfStyle: { - m_pImpl->enableInteropGrabBag("cnfStyle"); + m_pImpl->enableInteropGrabBag(u"cnfStyle"_ustr); resolveSprmProps(*this, rSprm); TablePropertyMapPtr pPropMap(new TablePropertyMap()); @@ -3436,7 +3436,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) break; case NS_ooxml::LN_CT_TcPrBase_cnfStyle: { - m_pImpl->enableInteropGrabBag("cnfStyle"); + m_pImpl->enableInteropGrabBag(u"cnfStyle"_ustr); resolveSprmProps(*this, rSprm); TablePropertyMapPtr pPropMap(new TablePropertyMap()); @@ -3448,7 +3448,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) break; case NS_ooxml::LN_CT_PPrBase_cnfStyle: { - m_pImpl->enableInteropGrabBag("cnfStyle"); + m_pImpl->enableInteropGrabBag(u"cnfStyle"_ustr); resolveSprmProps(*this, rSprm); rContext->Insert(PROP_PARA_CNF_STYLE, uno::Any(comphelper::containerToSequence(m_pImpl->m_aInteropGrabBag)), true, PARA_GRAB_BAG); m_pImpl->disableInteropGrabBag(); @@ -3476,7 +3476,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) // which would be removed by SwXText::Impl::finishOrAppendParagraph xAnchorCursor->collapseToEnd(); uno::Reference<text::XTextRange> xHackRange(xAnchorCursor, uno::UNO_QUERY); - xHackRange->setString("x"); + xHackRange->setString(u"x"_ustr); uno::Reference<beans::XPropertySet> xAnchorProps(xAnchorRange, uno::UNO_QUERY); xAnchorProps->setPropertyValue(getPropertyName(PROP_CHAR_FONT_NAME), aVal); @@ -3485,7 +3485,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) xAnchorProps->setPropertyValue(getPropertyName(PROP_CHAR_FONT_CHAR_SET), uno::Any(awt::CharSet::SYMBOL)); // remove the dummy char - xHackRange->setString(""); + xHackRange->setString(u""_ustr); OUString sLabel = xFootnote->getLabel() + OUStringChar(aSymbolData.cSymbol); xFootnote->setLabel(sLabel); @@ -3779,7 +3779,7 @@ void DomainMapper::lcl_endParagraphGroup() while (m_pImpl->isBreakDeferred(LINE_BREAK)) { m_pImpl->clearDeferredBreak(LINE_BREAK); - m_pImpl->appendTextPortion("\n", m_pImpl->GetTopContext()); + m_pImpl->appendTextPortion(u"\n"_ustr, m_pImpl->GetTopContext()); } } @@ -4006,7 +4006,7 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_, size_t len) while (m_pImpl->isBreakDeferred(LINE_BREAK)) { m_pImpl->clearDeferredBreak(LINE_BREAK); - m_pImpl->appendTextPortion("\n", pContext); + m_pImpl->appendTextPortion(u"\n"_ustr, pContext); } if (!m_pImpl->GetFootnoteContext() && !m_pImpl->IsInShape() && !m_pImpl->IsInComments()) @@ -4304,11 +4304,11 @@ void DomainMapper::lcl_utext(const sal_Unicode *const data_, size_t len) m_pImpl->m_pSdtHelper->getInteropGrabBagAndClear(); return; } - if((m_pImpl->m_pSdtHelper->containedInInteropGrabBag("ooxml:CT_SdtPr_checkbox") || - m_pImpl->m_pSdtHelper->containedInInteropGrabBag("ooxml:CT_SdtPr_text") || - m_pImpl->m_pSdtHelper->containedInInteropGrabBag("ooxml:CT_SdtPr_dataBinding") || - m_pImpl->m_pSdtHelper->containedInInteropGrabBag("ooxml:CT_SdtPr_citation") || - (m_pImpl->m_pSdtHelper->containedInInteropGrabBag("ooxml:CT_SdtPr_id") && + if((m_pImpl->m_pSdtHelper->containedInInteropGrabBag(u"ooxml:CT_SdtPr_checkbox"_ustr) || + m_pImpl->m_pSdtHelper->containedInInteropGrabBag(u"ooxml:CT_SdtPr_text"_ustr) || + m_pImpl->m_pSdtHelper->containedInInteropGrabBag(u"ooxml:CT_SdtPr_dataBinding"_ustr) || + m_pImpl->m_pSdtHelper->containedInInteropGrabBag(u"ooxml:CT_SdtPr_citation"_ustr) || + (m_pImpl->m_pSdtHelper->containedInInteropGrabBag(u"ooxml:CT_SdtPr_id"_ustr) && m_pImpl->m_pSdtHelper->getInteropGrabBagSize() == 1)) && !m_pImpl->m_pSdtHelper->isOutsideAParagraph()) { PropertyMapPtr pContext = m_pImpl->GetTopContextOfType(CONTEXT_CHARACTER); @@ -4353,7 +4353,7 @@ void DomainMapper::lcl_utext(const sal_Unicode *const data_, size_t len) while (m_pImpl->isBreakDeferred(LINE_BREAK)) { m_pImpl->clearDeferredBreak(LINE_BREAK); - m_pImpl->appendTextPortion("\n", m_pImpl->GetTopContext()); + m_pImpl->appendTextPortion(u"\n"_ustr, m_pImpl->GetTopContext()); } } else if (len == 1 && sText[0] == '\t' ) @@ -4385,7 +4385,7 @@ void DomainMapper::lcl_utext(const sal_Unicode *const data_, size_t len) while (m_pImpl->isBreakDeferred(LINE_BREAK)) { m_pImpl->clearDeferredBreak(LINE_BREAK); - m_pImpl->appendTextPortion("\n", m_pImpl->GetTopContext()); + m_pImpl->appendTextPortion(u"\n"_ustr, m_pImpl->GetTopContext()); } m_pImpl->getTableManager().utext(data_, len); @@ -4714,7 +4714,7 @@ void DomainMapper::handleParaJustification(const sal_Int32 nIntValue, const ::to { style::ParagraphAdjust nAdjust = style::ParagraphAdjust_LEFT; style::ParagraphAdjust nLastLineAdjust = style::ParagraphAdjust_LEFT; - OUString aStringValue = "left"; + OUString aStringValue = u"left"_ustr; switch(nIntValue) { case NS_ooxml::LN_Value_ST_Jc_center: @@ -4741,7 +4741,7 @@ void DomainMapper::handleParaJustification(const sal_Int32 nIntValue, const ::to } rContext->Insert( PROP_PARA_ADJUST, uno::Any( nAdjust ) ); rContext->Insert( PROP_PARA_LAST_LINE_ADJUST, uno::Any( nLastLineAdjust ) ); - m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "jc", aStringValue); + m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, u"jc"_ustr, aStringValue); } bool DomainMapper::getColorFromId(const Id nId, sal_Int32 &nColor) @@ -4798,23 +4798,23 @@ OUString DomainMapper::getBracketStringFromEnum(const sal_Int32 nIntValue, const { case NS_ooxml::LN_Value_ST_CombineBrackets_round: if (bIsPrefix) - return "("; - return ")"; + return u"("_ustr; + return u")"_ustr; case NS_ooxml::LN_Value_ST_CombineBrackets_square: if (bIsPrefix) - return "["; - return "]"; + return u"["_ustr; + return u"]"_ustr; case NS_ooxml::LN_Value_ST_CombineBrackets_angle: if (bIsPrefix) - return "<"; - return ">"; + return u"<"_ustr; + return u">"_ustr; case NS_ooxml::LN_Value_ST_CombineBrackets_curly: if (bIsPrefix) - return "{"; - return "}"; + return u"{"_ustr; + return u"}"_ustr; case NS_ooxml::LN_Value_ST_CombineBrackets_none: default: diff --git a/sw/source/writerfilter/dmapper/DomainMapperTableHandler.cxx b/sw/source/writerfilter/dmapper/DomainMapperTableHandler.cxx index 422d643cb7ba..e5332fcb79cf 100644 --- a/sw/source/writerfilter/dmapper/DomainMapperTableHandler.cxx +++ b/sw/source/writerfilter/dmapper/DomainMapperTableHandler.cxx @@ -364,7 +364,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo if (bConvertToFloatingInFootnote) { // define empty "TablePosition" to avoid export temporary floating - aGrabBag["TablePosition"] = uno::Any(); + aGrabBag[u"TablePosition"_ustr] = uno::Any(); } std::optional<PropertyMap::Property> aTableStyleVal = m_aTableProperties->getProperty(META_PROP_TABLE_STYLE_NAME); @@ -378,7 +378,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo pTableStyle = dynamic_cast<TableStyleSheetEntry*>( pStyleSheet.get( ) ); m_aTableProperties->Erase( aTableStyleVal->first ); - aGrabBag["TableStyleName"] <<= sTableStyleName; + aGrabBag[u"TableStyleName"_ustr] <<= sTableStyleName; if( pStyleSheet ) { @@ -393,19 +393,19 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo TableInfo rStyleInfo; if (lcl_extractTableBorderProperty(pMergedProperties, PROP_TOP_BORDER, rStyleInfo, aBorderLine)) { - aGrabBag["TableStyleTopBorder"] <<= aBorderLine; + aGrabBag[u"TableStyleTopBorder"_ustr] <<= aBorderLine; } if (lcl_extractTableBorderProperty(pMergedProperties, PROP_BOTTOM_BORDER, rStyleInfo, aBorderLine)) { - aGrabBag["TableStyleBottomBorder"] <<= aBorderLine; + aGrabBag[u"TableStyleBottomBorder"_ustr] <<= aBorderLine; } if (lcl_extractTableBorderProperty(pMergedProperties, PROP_LEFT_BORDER, rStyleInfo, aBorderLine)) { - aGrabBag["TableStyleLeftBorder"] <<= aBorderLine; + aGrabBag[u"TableStyleLeftBorder"_ustr] <<= aBorderLine; } if (lcl_extractTableBorderProperty(pMergedProperties, PROP_RIGHT_BORDER, rStyleInfo, aBorderLine)) { - aGrabBag["TableStyleRightBorder"] <<= aBorderLine; + aGrabBag[u"TableStyleRightBorder"_ustr] <<= aBorderLine; } #ifdef DBG_UTIL @@ -437,7 +437,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo std::optional<PropertyMap::Property> oTableLook = m_aTableProperties->getProperty(META_PROP_TABLE_LOOK); if (oTableLook) { - aGrabBag["TableStyleLook"] = oTableLook->second; + aGrabBag[u"TableStyleLook"_ustr] = oTableLook->second; m_aTableProperties->Erase(oTableLook->first); } @@ -1138,7 +1138,7 @@ void DomainMapperTableHandler::ApplyParagraphPropertiesFromTableStyle(TableParag } } OUString sParaStyleName; - rParaProp.m_rPropertySet->getPropertyValue("ParaStyleName") >>= sParaStyleName; + rParaProp.m_rPropertySet->getPropertyValue(u"ParaStyleName"_ustr) >>= sParaStyleName; bool bDocDefault; uno::Any aParaStyle = m_rDMapper_Impl.GetPropertyFromStyleSheet(eId, m_rDMapper_Impl.GetStyleSheetTable()->FindStyleSheetByConvertedStyleName(sParaStyleName), @@ -1173,7 +1173,7 @@ void DomainMapperTableHandler::ApplyParagraphPropertiesFromTableStyle(TableParag if (eId == PROP_FILL_COLOR) { // we need this for complete import of table-style based paragraph background color - aProps.push_back(comphelper::makePropertyValue("FillStyle", uno::Any(drawing::FillStyle_SOLID))); + aProps.push_back(comphelper::makePropertyValue(u"FillStyle"_ustr, uno::Any(drawing::FillStyle_SOLID))); } } catch ( const uno::Exception & ) @@ -1215,7 +1215,7 @@ void DomainMapperTableHandler::ApplyParagraphPropertiesFromTableStyle(TableParag rParaProp.m_rEndParagraph->getText()->createTextCursorByRange( rParaProp.m_rEndParagraph), uno::UNO_QUERY_THROW); - xCursorProps->setPropertyValue("ParaAutoStyleDef", + xCursorProps->setPropertyValue(u"ParaAutoStyleDef"_ustr, uno::Any(comphelper::containerToSequence(aProps))); } } @@ -1234,7 +1234,7 @@ static void lcl_convertFormulaRanges(const uno::Reference<text::XTextTable> & xT { uno::Reference<beans::XPropertySet> xCellProperties(xCellRange->getCellByPosition(nCol, nRow), uno::UNO_QUERY_THROW); uno::Sequence<beans::PropertyValue> aCellGrabBag; - xCellProperties->getPropertyValue("CellInteropGrabBag") >>= aCellGrabBag; + xCellProperties->getPropertyValue(u"CellInteropGrabBag"_ustr) >>= aCellGrabBag; OUString sFormula; bool bReplace = false; for (const auto& rProp : aCellGrabBag) @@ -1250,10 +1250,10 @@ static void lcl_convertFormulaRanges(const uno::Reference<text::XTextTable> & xT }; static const RangeDirection pDirections[] = { - { OUString(" LEFT "), -1, 0}, - { OUString(" RIGHT "), 1, 0}, - { OUString(" ABOVE "), 0, -1}, - { OUString(" BELOW "), 0, 1 } + { u" LEFT "_ustr, -1, 0}, + { u" RIGHT "_ustr, 1, 0}, + { u" ABOVE "_ustr, 0, -1}, + { u" BELOW "_ustr, 0, 1 } }; for (const RangeDirection& rRange : pDirections) { @@ -1276,7 +1276,7 @@ static void lcl_convertFormulaRanges(const uno::Reference<text::XTextTable> & xT uno::UNO_QUERY_THROW); // empty cell or cell with text content is end of the range uno::Reference<text::XText> xText(xCell, uno::UNO_QUERY_THROW); - sLastCell = xCell->getPropertyValue("CellName").get<OUString>(); + sLastCell = xCell->getPropertyValue(u"CellName"_ustr).get<OUString>(); if (sNextCell.isEmpty()) sNextCell = sLastCell; @@ -1331,21 +1331,21 @@ static void lcl_convertFormulaRanges(const uno::Reference<text::XTextTable> & xT { uno::Reference<text::XTextRange> xRun(xRunEnum->nextElement(), uno::UNO_QUERY); uno::Reference< beans::XPropertySet > xRunProperties( xRun, uno::UNO_QUERY_THROW ); - if ( xRunProperties->getPropertyValue("TextPortionType") == uno::Any(OUString("TextField")) ) + if ( xRunProperties->getPropertyValue(u"TextPortionType"_ustr) == uno::Any(u"TextField"_ustr) ) { - uno::Reference<text::XTextField> const xField(xRunProperties->getPropertyValue("TextField").get<uno::Reference<text::XTextField>>()); + uno::Reference<text::XTextField> const xField(xRunProperties->getPropertyValue(u"TextField"_ustr).get<uno::Reference<text::XTextField>>()); uno::Reference< beans::XPropertySet > xFieldProperties( xField, uno::UNO_QUERY_THROW ); // cell can contain multiple text fields, but only one is handled now (~formula cell) - if ( rProp.Value != xFieldProperties->getPropertyValue("Content") ) + if ( rProp.Value != xFieldProperties->getPropertyValue(u"Content"_ustr) ) continue; - xFieldProperties->setPropertyValue("Content", uno::Any(sFormula)); + xFieldProperties->setPropertyValue(u"Content"_ustr, uno::Any(sFormula)); // update grab bag auto aGrabBag = comphelper::sequenceToContainer< std::vector<beans::PropertyValue> >(aCellGrabBag); beans::PropertyValue aValue; aValue.Name = "CellFormulaConverted"; aValue.Value <<= sFormula; aGrabBag.push_back(aValue); - xCellProperties->setPropertyValue("CellInteropGrabBag", uno::Any(comphelper::containerToSequence(aGrabBag))); + xCellProperties->setPropertyValue(u"CellInteropGrabBag"_ustr, uno::Any(comphelper::containerToSequence(aGrabBag))); } } } @@ -1494,7 +1494,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel) xCellRange->getCellByPosition(it->m_nFirstCol, it->m_nFirstRow), uno::UNO_QUERY_THROW); OUString aFirst - = xFirstCell->getPropertyValue("CellName").get<OUString>(); + = xFirstCell->getPropertyValue(u"CellName"_ustr).get<OUString>(); // tdf#105852: Only try to merge if m_nLastCol is set (i.e. there were some merge continuation cells) if (it->m_nLastCol != -1) { @@ -1509,7 +1509,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel) xCellRange->getCellByPosition(it->m_nLastCol, it->m_nLastRow), uno::UNO_QUERY_THROW); OUString aLast - = xLastCell->getPropertyValue("CellName").get<OUString>(); + = xLastCell->getPropertyValue(u"CellName"_ustr).get<OUString>(); uno::Reference<text::XTextTableCursor> xCursor = xTable->createCursorByCellName(aFirst); xCursor->gotoCellByName(aLast, true); @@ -1551,35 +1551,35 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel) { uno::Reference<beans::XPropertySet> xTableProperties(xTable, uno::UNO_QUERY); bool bIsRelative = false; - xTableProperties->getPropertyValue("IsWidthRelative") >>= bIsRelative; + xTableProperties->getPropertyValue(u"IsWidthRelative"_ustr) >>= bIsRelative; if (!bIsRelative) { beans::PropertyValue aValue; aValue.Name = "Width"; - aValue.Value = xTableProperties->getPropertyValue("Width"); + aValue.Value = xTableProperties->getPropertyValue(u"Width"_ustr); aFrameProperties.push_back(aValue); } else { beans::PropertyValue aValue; aValue.Name = "FrameWidthPercent"; - aValue.Value = xTableProperties->getPropertyValue("RelativeWidth"); + aValue.Value = xTableProperties->getPropertyValue(u"RelativeWidth"_ustr); aFrameProperties.push_back(aValue); // Applying the relative width to the frame, needs to have the table width to be 100% of the frame width - xTableProperties->setPropertyValue("RelativeWidth", uno::Any(sal_Int16(100))); + xTableProperties->setPropertyValue(u"RelativeWidth"_ustr, uno::Any(sal_Int16(100))); } // A non-zero left margin would move the table out of the frame, move the frame itself instead. - xTableProperties->setPropertyValue("LeftMargin", uno::Any(sal_Int32(0))); + xTableProperties->setPropertyValue(u"LeftMargin"_ustr, uno::Any(sal_Int32(0))); style::BreakType eBreakType{}; - xTableProperties->getPropertyValue("BreakType") >>= eBreakType; + xTableProperties->getPropertyValue(u"BreakType"_ustr) >>= eBreakType; if (eBreakType != style::BreakType_NONE) { // A break before the table was requested. Reset that break here, since the table // will be at the start of the fly frame, not in the body frame. - xTableProperties->setPropertyValue("BreakType", uno::Any(style::BreakType_NONE)); + xTableProperties->setPropertyValue(u"BreakType"_ustr, uno::Any(style::BreakType_NONE)); } if (nestedTableLevel >= 2 || m_rDMapper_Impl.IsInHeaderFooter()) @@ -1605,11 +1605,11 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel) } aFrameProperties.push_back( - comphelper::makePropertyValue("IsFollowingTextFlow", bIsFollowingTextFlow)); + comphelper::makePropertyValue(u"IsFollowingTextFlow"_ustr, bIsFollowingTextFlow)); } // A text frame created for floating tables is always allowed to split. - aFrameProperties.push_back(comphelper::makePropertyValue("IsSplitAllowed", true)); + aFrameProperties.push_back(comphelper::makePropertyValue(u"IsSplitAllowed"_ustr, true)); sal_Int32 nTableWidth = 0; m_aTableProperties->getValue(TablePropertyMap::TABLE_WIDTH, nTableWidth); @@ -1640,7 +1640,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel) uno::Reference<lang::XServiceInfo> xText(xContent->getAnchor()->getText(), uno::UNO_QUERY); if (xText.is()) { - bConvertToFloatingInFootnote = xText->supportsService("com.sun.star.text.Footnote"); + bConvertToFloatingInFootnote = xText->supportsService(u"com.sun.star.text.Footnote"_ustr); } } @@ -1653,9 +1653,9 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel) xContent->getAnchor(), uno::UNO_QUERY); if ( xParagraph.is() ) { - xParagraph->setPropertyValue("ParaTopMargin", + xParagraph->setPropertyValue(u"ParaTopMargin"_ustr, uno::Any(static_cast<sal_Int32>(0))); - xParagraph->setPropertyValue("ParaBottomMargin", + xParagraph->setPropertyValue(u"ParaBottomMargin"_ustr, uno::Any(static_cast<sal_Int32>(0))); } } @@ -1670,10 +1670,10 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel) if (xParagraph.is()) { bool bCharHidden{}; - xParagraph->getPropertyValue("CharHidden") >>= bCharHidden; + xParagraph->getPropertyValue(u"CharHidden"_ustr) >>= bCharHidden; if (bCharHidden) { - xParagraph->setPropertyValue("CharHidden", uno::Any(false)); + xParagraph->setPropertyValue(u"CharHidden"_ustr, uno::Any(false)); } } } @@ -1684,7 +1684,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel) if (xFrameAnchor.is() && eBreakType != style::BreakType_NONE) { // A break before the table was requested. Restore that on the anchor. - xFrameAnchor->setPropertyValue("BreakType", uno::Any(eBreakType)); + xFrameAnchor->setPropertyValue(u"BreakType"_ustr, uno::Any(eBreakType)); } } } diff --git a/sw/source/writerfilter/dmapper/DomainMapperTableManager.cxx b/sw/source/writerfilter/dmapper/DomainMapperTableManager.cxx index 2bbdfe86540e..499a2a580ad2 100644 --- a/sw/source/writerfilter/dmapper/DomainMapperTableManager.cxx +++ b/sw/source/writerfilter/dmapper/DomainMapperTableManager.cxx @@ -67,26 +67,26 @@ bool DomainMapperTableManager::attribute(Id nName, Value const & rValue) TablePropertyMapPtr pPropMap(new TablePropertyMap()); pPropMap->Insert(PROP_TBL_LOOK, uno::Any(sal_Int32(rValue.getInt()))); insertTableProps(pPropMap); - m_aTableLook["val"] <<= static_cast<sal_Int32>(rValue.getInt()); + m_aTableLook[u"val"_ustr] <<= static_cast<sal_Int32>(rValue.getInt()); } break; case NS_ooxml::LN_CT_TblLook_noVBand: - m_aTableLook["noVBand"] <<= static_cast<sal_Int32>(rValue.getInt()); + m_aTableLook[u"noVBand"_ustr] <<= static_cast<sal_Int32>(rValue.getInt()); break; case NS_ooxml::LN_CT_TblLook_noHBand: - m_aTableLook["noHBand"] <<= static_cast<sal_Int32>(rValue.getInt()); + m_aTableLook[u"noHBand"_ustr] <<= static_cast<sal_Int32>(rValue.getInt()); break; case NS_ooxml::LN_CT_TblLook_lastColumn: - m_aTableLook["lastColumn"] <<= static_cast<sal_Int32>(rValue.getInt()); + m_aTableLook[u"lastColumn"_ustr] <<= static_cast<sal_Int32>(rValue.getInt()); break; case NS_ooxml::LN_CT_TblLook_lastRow: - m_aTableLook["lastRow"] <<= static_cast<sal_Int32>(rValue.getInt()); + m_aTableLook[u"lastRow"_ustr] <<= static_cast<sal_Int32>(rValue.getInt()); break; case NS_ooxml::LN_CT_TblLook_firstColumn: - m_aTableLook["firstColumn"] <<= static_cast<sal_Int32>(rValue.getInt()); + m_aTableLook[u"firstColumn"_ustr] <<= static_cast<sal_Int32>(rValue.getInt()); break; case NS_ooxml::LN_CT_TblLook_firstRow: - m_aTableLook["firstRow"] <<= static_cast<sal_Int32>(rValue.getInt()); + m_aTableLook[u"firstRow"_ustr] <<= static_cast<sal_Int32>(rValue.getInt()); break; default: bRet = false; diff --git a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx index 2f46d3e977fb..7ce54f5ace36 100644 --- a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx +++ b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx @@ -183,19 +183,19 @@ static void lcl_handleDropdownField( const uno::Reference< beans::XPropertySet > return; if ( !pFFDataHandler->getName().isEmpty() ) - rxFieldProps->setPropertyValue( "Name", uno::Any( pFFDataHandler->getName() ) ); + rxFieldProps->setPropertyValue( u"Name"_ustr, uno::Any( pFFDataHandler->getName() ) ); const FFDataHandler::DropDownEntries_t& rEntries = pFFDataHandler->getDropDownEntries(); uno::Sequence< OUString > sItems( rEntries.size() ); ::std::copy( rEntries.begin(), rEntries.end(), sItems.getArray()); if ( sItems.hasElements() ) - rxFieldProps->setPropertyValue( "Items", uno::Any( sItems ) ); + rxFieldProps->setPropertyValue( u"Items"_ustr, uno::Any( sItems ) ); sal_Int32 nResult = pFFDataHandler->getDropDownResult().toInt32(); if (nResult > 0 && o3tl::make_unsigned(nResult) < sItems.size()) - rxFieldProps->setPropertyValue("SelectedItem", uno::Any(sItems[nResult])); + rxFieldProps->setPropertyValue(u"SelectedItem"_ustr, uno::Any(sItems[nResult])); if ( !pFFDataHandler->getHelpText().isEmpty() ) - rxFieldProps->setPropertyValue( "Help", uno::Any( pFFDataHandler->getHelpText() ) ); + rxFieldProps->setPropertyValue( u"Help"_ustr, uno::Any( pFFDataHandler->getHelpText() ) ); } static void lcl_handleTextField( const uno::Reference< beans::XPropertySet >& rxFieldProps, const FFDataHandler::Pointer_t& pFFDataHandler ) @@ -378,11 +378,11 @@ DomainMapper_Impl::DomainMapper_Impl( m_bUsingEnhancedFields( false ), m_nAnnotationId( -1 ), m_aSmartTagHandler(m_xComponentContext, m_xTextDocument), - m_xInsertTextRange(rMediaDesc.getUnpackedValueOrDefault("TextInsertModeRange", uno::Reference<text::XTextRange>())), - m_xAltChunkStartingRange(rMediaDesc.getUnpackedValueOrDefault("AltChunkStartingRange", uno::Reference<text::XTextRange>())), - m_bIsNewDoc(!rMediaDesc.getUnpackedValueOrDefault("InsertMode", false)), - m_bIsAltChunk(rMediaDesc.getUnpackedValueOrDefault("AltChunkMode", false)), - m_bIsReadGlossaries(rMediaDesc.getUnpackedValueOrDefault("ReadGlossaries", false)), + m_xInsertTextRange(rMediaDesc.getUnpackedValueOrDefault(u"TextInsertModeRange"_ustr, uno::Reference<text::XTextRange>())), + m_xAltChunkStartingRange(rMediaDesc.getUnpackedValueOrDefault(u"AltChunkStartingRange"_ustr, uno::Reference<text::XTextRange>())), + m_bIsNewDoc(!rMediaDesc.getUnpackedValueOrDefault(u"InsertMode"_ustr, false)), + m_bIsAltChunk(rMediaDesc.getUnpackedValueOrDefault(u"AltChunkMode"_ustr, false)), + m_bIsReadGlossaries(rMediaDesc.getUnpackedValueOrDefault(u"ReadGlossaries"_ustr, false)), m_bHasFtnSep(false), m_bIsSplitPara(false), m_bIsActualParagraphFramed( false ), @@ -400,7 +400,7 @@ DomainMapper_Impl::DomainMapper_Impl( GetBodyText(); if (!m_bIsNewDoc && !m_xBodyText) { - throw uno::Exception("failed to find body text of the insert position", nullptr); + throw uno::Exception(u"failed to find body text of the insert position"_ustr, nullptr); } uno::Reference< text::XTextAppend > xBodyTextAppend( m_xBodyText, uno::UNO_QUERY ); @@ -451,7 +451,7 @@ writerfilter::ooxml::OOXMLDocument* DomainMapper_Impl::getDocumentReference() co uno::Reference< container::XNameContainer > const & DomainMapper_Impl::GetPageStyles() { if(!m_xPageStyles1.is() && m_xTextDocument) - m_xTextDocument->getStyleFamilies()->getByName("PageStyles") >>= m_xPageStyles1; + m_xTextDocument->getStyleFamilies()->getByName(u"PageStyles"_ustr) >>= m_xPageStyles1; return m_xPageStyles1; } @@ -485,14 +485,14 @@ OUString DomainMapper_Impl::GetUnusedPageStyleName() uno::Reference< container::XNameContainer > const & DomainMapper_Impl::GetCharacterStyles() { if(!m_xCharacterStyles.is() && m_xTextDocument) - m_xTextDocument->getStyleFamilies()->getByName("CharacterStyles") >>= m_xCharacterStyles; + m_xTextDocument->getStyleFamilies()->getByName(u"CharacterStyles"_ustr) >>= m_xCharacterStyles; return m_xCharacterStyles; } uno::Reference<container::XNameContainer> const& DomainMapper_Impl::GetParagraphStyles() { if (!m_xParagraphStyles.is() && m_xTextDocument) - m_xTextDocument->getStyleFamilies()->getByName("ParagraphStyles") >>= m_xParagraphStyles; + m_xTextDocument->getStyleFamilies()->getByName(u"ParagraphStyles"_ustr) >>= m_xParagraphStyles; return m_xParagraphStyles; } @@ -572,7 +572,7 @@ void CopyPageDescNameToNextParagraph(const uno::Reference<lang::XComponent>& xPa return; } - uno::Any aPageDescName = xParagraphProps->getPropertyValue("PageDescName"); + uno::Any aPageDescName = xParagraphProps->getPropertyValue(u"PageDescName"_ustr); OUString sPageDescName; aPageDescName >>= sPageDescName; if (sPageDescName.isEmpty()) @@ -621,14 +621,14 @@ void CopyPageDescNameToNextParagraph(const uno::Reference<lang::XComponent>& xPa // See if there is page style set already: if so, don't touch it. OUString sNextPageDescName; - xNextParagraph->getPropertyValue("PageDescName") >>= sNextPageDescName; + xNextParagraph->getPropertyValue(u"PageDescName"_ustr) >>= sNextPageDescName; if (!sNextPageDescName.isEmpty()) { return; } // Finally copy it over, so it's not lost. - xNextParagraph->setPropertyValue("PageDescName", aPageDescName); + xNextParagraph->setPropertyValue(u"PageDescName"_ustr, aPageDescName); } } @@ -714,12 +714,12 @@ void DomainMapper_Impl::AddDummyParaForTableInSection() while (xRunEnum->hasMoreElements()) { uno::Reference<beans::XPropertySet> xProps(xRunEnum->nextElement(), uno::UNO_QUERY_THROW); - uno::Any aType(xProps->getPropertyValue("TextPortionType")); + uno::Any aType(xProps->getPropertyValue(u"TextPortionType"_ustr)); OUString sType; aType >>= sType; if (sType == "Bookmark") { - uno::Reference<container::XNamed> xBookmark(xProps->getPropertyValue("Bookmark"), + uno::Reference<container::XNamed> xBookmark(xProps->getPropertyValue(u"Bookmark"_ustr), uno::UNO_QUERY_THROW); sName = xBookmark->getName(); // Do not stop the scan here. Maybe there are 2 bookmarks? @@ -1084,88 +1084,88 @@ void DomainMapper_Impl::PopSdt() uno::Reference<beans::XPropertyState> xPropertyState(xCursor, uno::UNO_QUERY); if (xPropertyState.is()) { - xPropertyState->setPropertyToDefault("CharStyleName"); + xPropertyState->setPropertyToDefault(u"CharStyleName"_ustr); } } rtl::Reference<SwXContentControl> xContentControl( m_xTextDocument->createContentControl()); if (m_pSdtHelper->GetShowingPlcHdr()) { - xContentControl->setPropertyValue("ShowingPlaceHolder", + xContentControl->setPropertyValue(u"ShowingPlaceHolder"_ustr, uno::Any(m_pSdtHelper->GetShowingPlcHdr())); } if (!m_pSdtHelper->GetPlaceholderDocPart().isEmpty()) { - xContentControl->setPropertyValue("PlaceholderDocPart", + xContentControl->setPropertyValue(u"PlaceholderDocPart"_ustr, uno::Any(m_pSdtHelper->GetPlaceholderDocPart())); } if (!m_pSdtHelper->GetDataBindingPrefixMapping().isEmpty()) { - xContentControl->setPropertyValue("DataBindingPrefixMappings", + xContentControl->setPropertyValue(u"DataBindingPrefixMappings"_ustr, uno::Any(m_pSdtHelper->GetDataBindingPrefixMapping())); } if (!m_pSdtHelper->GetDataBindingXPath().isEmpty()) { - xContentControl->setPropertyValue("DataBindingXpath", + xContentControl->setPropertyValue(u"DataBindingXpath"_ustr, uno::Any(m_pSdtHelper->GetDataBindingXPath())); } if (!m_pSdtHelper->GetDataBindingStoreItemID().isEmpty()) { - xContentControl->setPropertyValue("DataBindingStoreItemID", + xContentControl->setPropertyValue(u"DataBindingStoreItemID"_ustr, uno::Any(m_pSdtHelper->GetDataBindingStoreItemID())); } if (!m_pSdtHelper->GetColor().isEmpty()) { - xContentControl->setPropertyValue("Color", + xContentControl->setPropertyValue(u"Color"_ustr, uno::Any(m_pSdtHelper->GetColor())); } if (!m_pSdtHelper->GetAppearance().isEmpty()) { - xContentControl->setPropertyValue("Appearance", + xContentControl->setPropertyValue(u"Appearance"_ustr, uno::Any(m_pSdtHelper->GetAppearance())); } if (!m_pSdtHelper->GetAlias().isEmpty()) { - xContentControl->setPropertyValue("Alias", + xContentControl->setPropertyValue(u"Alias"_ustr, uno::Any(m_pSdtHelper->GetAlias())); } if (!m_pSdtHelper->GetTag().isEmpty()) { - xContentControl->setPropertyValue("Tag", + xContentControl->setPropertyValue(u"Tag"_ustr, uno::Any(m_pSdtHelper->GetTag())); } if (m_pSdtHelper->GetId()) { - xContentControl->setPropertyValue("Id", uno::Any(m_pSdtHelper->GetId())); + xContentControl->setPropertyValue(u"Id"_ustr, uno::Any(m_pSdtHelper->GetId())); } if (m_pSdtHelper->GetTabIndex()) { - xContentControl->setPropertyValue("TabIndex", uno::Any(m_pSdtHelper->GetTabIndex())); + xContentControl->setPropertyValue(u"TabIndex"_ustr, uno::Any(m_pSdtHelper->GetTabIndex())); } if (!m_pSdtHelper->GetLock().isEmpty()) { - xContentControl->setPropertyValue("Lock", uno::Any(m_pSdtHelper->GetLock())); + xContentControl->setPropertyValue(u"Lock"_ustr, uno::Any(m_pSdtHelper->GetLock())); } if (m_pSdtHelper->getControlType() == SdtControlType::checkBox) { - xContentControl->setPropertyValue("Checkbox", uno::Any(true)); + xContentControl->setPropertyValue(u"Checkbox"_ustr, uno::Any(true)); - xContentControl->setPropertyValue("Checked", uno::Any(m_pSdtHelper->GetChecked())); + xContentControl->setPropertyValue(u"Checked"_ustr, uno::Any(m_pSdtHelper->GetChecked())); - xContentControl->setPropertyValue("CheckedState", + xContentControl->setPropertyValue(u"CheckedState"_ustr, uno::Any(m_pSdtHelper->GetCheckedState())); - xContentControl->setPropertyValue("UncheckedState", + xContentControl->setPropertyValue(u"UncheckedState"_ustr, uno::Any(m_pSdtHelper->GetUncheckedState())); } @@ -1181,35 +1181,35 @@ void DomainMapper_Impl::PopSdt() for (size_t i = 0; i < rValues.size(); ++i) { pItems[i] = { - comphelper::makePropertyValue("DisplayText", rDisplayTexts[i]), - comphelper::makePropertyValue("Value", rValues[i]) + comphelper::makePropertyValue(u"DisplayText"_ustr, rDisplayTexts[i]), + comphelper::makePropertyValue(u"Value"_ustr, rValues[i]) }; } - xContentControl->setPropertyValue("ListItems", uno::Any(aItems)); + xContentControl->setPropertyValue(u"ListItems"_ustr, uno::Any(aItems)); if (m_pSdtHelper->getControlType() == SdtControlType::dropDown) { - xContentControl->setPropertyValue("DropDown", uno::Any(true)); + xContentControl->setPropertyValue(u"DropDown"_ustr, uno::Any(true)); } else { - xContentControl->setPropertyValue("ComboBox", uno::Any(true)); + xContentControl->setPropertyValue(u"ComboBox"_ustr, uno::Any(true)); } } } if (m_pSdtHelper->getControlType() == SdtControlType::picture) { - xContentControl->setPropertyValue("Picture", uno::Any(true)); + xContentControl->setPropertyValue(u"Picture"_ustr, uno::Any(true)); } bool bDateFromDataBinding = false; if (m_pSdtHelper->getControlType() == SdtControlType::datePicker) { - xContentControl->setPropertyValue("Date", uno::Any(true)); + xContentControl->setPropertyValue(u"Date"_ustr, uno::Any(true)); OUString aDateFormat = m_pSdtHelper->getDateFormat().makeStringAndClear(); - xContentControl->setPropertyValue("DateFormat", + xContentControl->setPropertyValue(u"DateFormat"_ustr, uno::Any(aDateFormat.replaceAll("'", "\""))); - xContentControl->setPropertyValue("DateLanguage", + xContentControl->setPropertyValue(u"DateLanguage"_ustr, uno::Any(m_pSdtHelper->getLocale().makeStringAndClear())); OUString aCurrentDate = m_pSdtHelper->getDate().makeStringAndClear(); if (oData.has_value()) @@ -1217,13 +1217,13 @@ void DomainMapper_Impl::PopSdt() aCurrentDate = *oData; bDateFromDataBinding = true; } - xContentControl->setPropertyValue("CurrentDate", + xContentControl->setPropertyValue(u"CurrentDate"_ustr, uno::Any(aCurrentDate)); } if (m_pSdtHelper->getControlType() == SdtControlType::plainText) { - xContentControl->setPropertyValue("PlainText", uno::Any(true)); + xContentControl->setPropertyValue(u"PlainText"_ustr, uno::Any(true)); } xText->insertTextContent(xCursor, xContentControl, /*bAbsorb=*/true); @@ -1231,7 +1231,7 @@ void DomainMapper_Impl::PopSdt() if (bDateFromDataBinding) { OUString aDateString; - xContentControl->getPropertyValue("DateString") >>= aDateString; + xContentControl->getPropertyValue(u"DateString"_ustr) >>= aDateString; xCursor->setString(aDateString); } @@ -1451,7 +1451,7 @@ OUString DomainMapper_Impl::GetDefaultParaStyleName() return pEntry->m_sConvertedStyleName; } else - return "Standard"; + return u"Standard"_ustr; } return m_sDefaultParaStyleName; } @@ -2020,7 +2020,7 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion(bool bPreventOverlap) } if (bPreventOverlap) - aFrameProperties.push_back(comphelper::makePropertyValue("AllowOverlap", uno::Any(false))); + aFrameProperties.push_back(comphelper::makePropertyValue(u"AllowOverlap"_ustr, uno::Any(false))); // If there is no fill, the Word default is 100% transparency. // Otherwise CellColorHandler has priority, and this setting @@ -2030,7 +2030,7 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion(bool bPreventOverlap) uno::Sequence<beans::PropertyValue> aGrabBag(comphelper::InitPropertySequence( { { "ParaFrameProperties", uno::Any(true) } })); - aFrameProperties.push_back(comphelper::makePropertyValue("FrameInteropGrabBag", aGrabBag)); + aFrameProperties.push_back(comphelper::makePropertyValue(u"FrameInteropGrabBag"_ustr, aGrabBag)); lcl_MoveBorderPropertiesToFrame(aFrameProperties, rAppendContext.pLastParagraphProperties->GetStartingRange(), @@ -2279,8 +2279,8 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con if ( pParentProperties && (oProperty = pParentProperties->getProperty(PROP_PARA_RIGHT_MARGIN)) && (nParaRightMargin = oProperty->second.get<sal_Int32>()) != 0 ) { // If we're setting the right margin, we should set the first / left margin as well from the numbering style. - const sal_Int32 nFirstLineIndent = getNumberingProperty(nListId, nListLevel, "FirstLineIndent"); - const sal_Int32 nParaLeftMargin = getNumberingProperty(nListId, nListLevel, "IndentAt"); + const sal_Int32 nFirstLineIndent = getNumberingProperty(nListId, nListLevel, u"FirstLineIndent"_ustr); + const sal_Int32 nParaLeftMargin = getNumberingProperty(nListId, nListLevel, u"IndentAt"_ustr); if (nFirstLineIndent != 0) pParaContext->Insert(PROP_PARA_FIRST_LINE_INDENT, uno::Any(nFirstLineIndent), /*bOverwrite=*/false); if (nParaLeftMargin != 0) @@ -2302,8 +2302,8 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con { pParaContext->Insert(PROP_PARA_RIGHT_MARGIN, aRightMargin, /*bOverwrite=*/false); - const sal_Int32 nFirstLineIndent = getNumberingProperty(nListId, nListLevel, "FirstLineIndent"); - const sal_Int32 nParaLeftMargin = getNumberingProperty(nListId, nListLevel, "IndentAt"); + const sal_Int32 nFirstLineIndent = getNumberingProperty(nListId, nListLevel, u"FirstLineIndent"_ustr); + const sal_Int32 nParaLeftMargin = getNumberingProperty(nListId, nListLevel, u"IndentAt"_ustr); if (nFirstLineIndent != 0) pParaContext->Insert(PROP_PARA_FIRST_LINE_INDENT, uno::Any(nFirstLineIndent), /*bOverwrite=*/false); if (nParaLeftMargin != 0) @@ -2589,7 +2589,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con } if (!charProperties.empty()) { - aProperties.push_back(beans::PropertyValue("ListAutoFormat", + aProperties.push_back(beans::PropertyValue(u"ListAutoFormat"_ustr, 0, uno::Any(comphelper::containerToSequence(charProperties)), beans::PropertyState_DIRECT_VALUE)); } } @@ -2623,7 +2623,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con if (xCursor.is()) xCursor->gotoEnd(false); PropertyMapPtr pEmpty(new PropertyMap()); - appendTextPortion("X", pEmpty); + appendTextPortion(u"X"_ustr, pEmpty); } // Check if top / bottom margin has to be updated, now that we know the numbering status of both the previous and @@ -2650,7 +2650,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con try { uno::Reference<container::XNamed> xPreviousNumberingRules( - m_StreamStateStack.top().xPreviousParagraph->getPropertyValue("NumberingRules"), + m_StreamStateStack.top().xPreviousParagraph->getPropertyValue(u"NumberingRules"_ustr), uno::UNO_QUERY_THROW); aPreviousNumberingName = xPreviousNumberingRules->getName(); } @@ -2659,13 +2659,13 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con TOOLS_WARN_EXCEPTION("writerfilter", "DomainMapper_Impl::finishParagraph NumberingRules"); } } - else if (m_StreamStateStack.top().xPreviousParagraph->getPropertySetInfo()->hasPropertyByName("NumberingStyleName") + else if (m_StreamStateStack.top().xPreviousParagraph->getPropertySetInfo()->hasPropertyByName(u"NumberingStyleName"_ustr) // don't update before tables && (m_StreamStateStack.top().nTableDepth == 0 || !m_StreamStateStack.top().bFirstParagraphInCell)) { aCurrentNumberingName = GetListStyleName(nListId); - m_StreamStateStack.top().xPreviousParagraph->getPropertyValue("NumberingStyleName") >>= aPreviousNumberingName; + m_StreamStateStack.top().xPreviousParagraph->getPropertyValue(u"NumberingStyleName"_ustr) >>= aPreviousNumberingName; } // tdf#133363: remove extra auto space even for mixed list styles @@ -2674,7 +2674,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con || !isNumberingViaRule)) { uno::Sequence<beans::PropertyValue> aPrevPropertiesSeq; - m_StreamStateStack.top().xPreviousParagraph->getPropertyValue("ParaInteropGrabBag") >>= aPrevPropertiesSeq; + m_StreamStateStack.top().xPreviousParagraph->getPropertyValue(u"ParaInteropGrabBag"_ustr) >>= aPrevPropertiesSeq; const auto & rPrevProperties = aPrevPropertiesSeq; bool bParaAutoBefore = m_StreamStateStack.top().bParaAutoBefore || std::any_of(rPrevProperties.begin(), rPrevProperties.end(), [](const beans::PropertyValue& rValue) @@ -2683,14 +2683,14 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con }); // if style based spacing was set to auto in the previous paragraph, style of the actual paragraph must be the same if (bParaAutoBefore && !m_StreamStateStack.top().bParaAutoBefore - && m_StreamStateStack.top().xPreviousParagraph->getPropertySetInfo()->hasPropertyByName("ParaStyleName")) + && m_StreamStateStack.top().xPreviousParagraph->getPropertySetInfo()->hasPropertyByName(u"ParaStyleName"_ustr)) { auto itParaStyle = std::find_if(aProperties.begin(), aProperties.end(), [](const beans::PropertyValue& rValue) { return rValue.Name == "ParaStyleName"; }); bParaAutoBefore = itParaStyle != aProperties.end() && - m_StreamStateStack.top().xPreviousParagraph->getPropertyValue("ParaStyleName") == itParaStyle->Value; + m_StreamStateStack.top().xPreviousParagraph->getPropertyValue(u"ParaStyleName"_ustr) == itParaStyle->Value; } // There was a previous textnode and it had the same numbering. if (bParaAutoBefore) @@ -2703,7 +2703,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con if (itParaTopMargin != aProperties.end()) itParaTopMargin->Value <<= static_cast<sal_Int32>(0); else - aProperties.push_back(comphelper::makePropertyValue("ParaTopMargin", static_cast<sal_Int32>(0))); + aProperties.push_back(comphelper::makePropertyValue(u"ParaTopMargin"_ustr, static_cast<sal_Int32>(0))); } bool bPrevParaAutoAfter = std::any_of(rPrevProperties.begin(), rPrevProperties.end(), [](const beans::PropertyValue& rValue) @@ -2713,7 +2713,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con if (bPrevParaAutoAfter) { // Previous after spacing is set to auto, set previous after space to 0. - m_StreamStateStack.top().xPreviousParagraph->setPropertyValue("ParaBottomMargin", uno::Any(static_cast<sal_Int32>(0))); + m_StreamStateStack.top().xPreviousParagraph->setPropertyValue(u"ParaBottomMargin"_ustr, uno::Any(static_cast<sal_Int32>(0))); } } } @@ -2749,16 +2749,16 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con pList->GetAbstractDefinition(); if (pAbsList && // SvxUnoTextRange doesn't have ListId - m_StreamStateStack.top().xPreviousParagraph->getPropertySetInfo()->hasPropertyByName("ListId")) + m_StreamStateStack.top().xPreviousParagraph->getPropertySetInfo()->hasPropertyByName(u"ListId"_ustr)) { OUString paraId; - m_StreamStateStack.top().xPreviousParagraph->getPropertyValue("ListId") >>= paraId; + m_StreamStateStack.top().xPreviousParagraph->getPropertyValue(u"ListId"_ustr) >>= paraId; if (!paraId.isEmpty()) // must be on some list? { OUString const listId = pAbsList->MapListId(paraId); if (listId != paraId) { - m_StreamStateStack.top().xPreviousParagraph->setPropertyValue("ListId", uno::Any(listId)); + m_StreamStateStack.top().xPreviousParagraph->setPropertyValue(u"ListId"_ustr, uno::Any(listId)); } } } @@ -2779,8 +2779,8 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con // TODO: Not tested variant with different levels override in different lists. // Probably m_aListOverrideApplied as a set of overridden listids is not sufficient // and we need to register level overrides separately. - m_StreamStateStack.top().xPreviousParagraph->setPropertyValue("ParaIsNumberingRestart", uno::Any(true)); - m_StreamStateStack.top().xPreviousParagraph->setPropertyValue("NumberingStartValue", uno::Any(nOverrideLevel)); + m_StreamStateStack.top().xPreviousParagraph->setPropertyValue(u"ParaIsNumberingRestart"_ustr, uno::Any(true)); + m_StreamStateStack.top().xPreviousParagraph->setPropertyValue(u"NumberingStartValue"_ustr, uno::Any(nOverrideLevel)); m_aListOverrideApplied.insert(nListId); } } @@ -2827,7 +2827,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con { OUString sChar = xCur->getString(); if ( sChar == " " || sChar == "\t" || sChar == OUStringChar(u'\x00A0') ) - xCur->setString(""); + xCur->setString(u""_ustr); else break; } @@ -2906,19 +2906,19 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con { uno::Any aMargin = GetPropertyFromParaStyleSheet(PROP_PARA_TOP_MARGIN); if ( aMargin != uno::Any() ) - xParaProps->setPropertyValue("ParaTopMargin", aMargin); + xParaProps->setPropertyValue(u"ParaTopMargin"_ustr, aMargin); } if ( !bBottomSet ) { uno::Any aMargin = GetPropertyFromParaStyleSheet(PROP_PARA_BOTTOM_MARGIN); if ( aMargin != uno::Any() ) - xParaProps->setPropertyValue("ParaBottomMargin", aMargin); + xParaProps->setPropertyValue(u"ParaBottomMargin"_ustr, aMargin); } if ( !bContextSet ) { uno::Any aMargin = GetPropertyFromParaStyleSheet(PROP_PARA_CONTEXT_MARGIN); if ( aMargin != uno::Any() ) - xParaProps->setPropertyValue("ParaContextMargin", aMargin); + xParaProps->setPropertyValue(u"ParaContextMargin"_ustr, aMargin); } } } @@ -2935,30 +2935,30 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con { uno::Any aMargin = GetPropertyFromParaStyleSheet(PROP_PARA_LEFT_MARGIN); if ( aMargin != uno::Any() ) - xParaProps->setPropertyValue("ParaLeftMargin", aMargin); + xParaProps->setPropertyValue(u"ParaLeftMargin"_ustr, aMargin); else if (isNumberingViaStyle) { - const sal_Int32 nParaLeftMargin = getNumberingProperty(nListId, GetListLevel(pEntry, pPropertyMap), "IndentAt"); + const sal_Int32 nParaLeftMargin = getNumberingProperty(nListId, GetListLevel(pEntry, pPropertyMap), u"IndentAt"_ustr); if (nParaLeftMargin != 0) - xParaProps->setPropertyValue("ParaLeftMargin", uno::Any(nParaLeftMargin)); + xParaProps->setPropertyValue(u"ParaLeftMargin"_ustr, uno::Any(nParaLeftMargin)); } } if ( !bRightSet ) { uno::Any aMargin = GetPropertyFromParaStyleSheet(PROP_PARA_RIGHT_MARGIN); if ( aMargin != uno::Any() ) - xParaProps->setPropertyValue("ParaRightMargin", aMargin); + xParaProps->setPropertyValue(u"ParaRightMargin"_ustr, aMargin); } if ( !bFirstSet ) { uno::Any aMargin = GetPropertyFromParaStyleSheet(PROP_PARA_FIRST_LINE_INDENT); if ( aMargin != uno::Any() ) - xParaProps->setPropertyValue("ParaFirstLineIndent", aMargin); + xParaProps->setPropertyValue(u"ParaFirstLineIndent"_ustr, aMargin); else if (isNumberingViaStyle) { - const sal_Int32 nFirstLineIndent = getNumberingProperty(nListId, GetListLevel(pEntry, pPropertyMap), "FirstLineIndent"); + const sal_Int32 nFirstLineIndent = getNumberingProperty(nListId, GetListLevel(pEntry, pPropertyMap), u"FirstLineIndent"_ustr); if (nFirstLineIndent != 0) - xParaProps->setPropertyValue("ParaFirstLineIndent", uno::Any(nFirstLineIndent)); + xParaProps->setPropertyValue(u"ParaFirstLineIndent"_ustr, uno::Any(nFirstLineIndent)); } } } @@ -3211,10 +3211,10 @@ void DomainMapper_Impl::MergeAtContentImageRedlineWithNext(const css::uno::Refer if ( xCursor->getString() == u"" ) { xCursor->goRight(1, true); - xCursor->setString(""); + xCursor->setString(u""_ustr); xCursor->gotoEnd(false); xCursor->goLeft(1, true); - xCursor->setString(""); + xCursor->setString(u""_ustr); } } @@ -3286,7 +3286,7 @@ void DomainMapper_Impl::MergeAtContentImageRedlineWithNext(const css::uno::Refer xTextRange = xTextAppend->insertTextPortion(rString, aValues, xTOCTextCursor); SAL_WARN_IF(!xTextRange.is(), "writerfilter.dmapper", "insertTextPortion failed"); if (!xTextRange.is()) - throw uno::Exception("insertTextPortion failed", nullptr); + throw uno::Exception(u"insertTextPortion failed"_ustr, nullptr); m_StreamStateStack.top().bTextInserted = true; xTOCTextCursor->gotoRange(xTextRange->getEnd(), true); if (m_nStartGenericField == 0) @@ -3309,7 +3309,7 @@ void DomainMapper_Impl::MergeAtContentImageRedlineWithNext(const css::uno::Refer #if !defined(MACOSX) // TODO: check layout differences and support all platforms, if needed sal_Int32 nPos = 0; OUString sFontName; - OUString sDoubleSpace(" "); + OUString sDoubleSpace(u" "_ustr); PropertyMapPtr pContext = GetTopContextOfType(CONTEXT_CHARACTER); // tdf#123703 workaround for longer space sequences of the old or compatible RTF documents if (GetSettingsTable()->GetLongerSpaceSequence() && !IsOpenFieldCommand() && (nPos = rString.indexOf(sDoubleSpace)) != -1 && @@ -3390,11 +3390,11 @@ void DomainMapper_Impl::appendOLE( const OUString& rStreamName, const std::share xOLE->setPropertyValue(getPropertyName( PROP_STREAM_NAME ), uno::Any( rStreamName )); else - xOLE->setPropertyValue("CLSID", uno::Any(aCLSID)); + xOLE->setPropertyValue(u"CLSID"_ustr, uno::Any(aCLSID)); OUString aDrawAspect = pOLEHandler->GetDrawAspect(); if(!aDrawAspect.isEmpty()) - xOLE->setPropertyValue("DrawAspect", uno::Any(aDrawAspect)); + xOLE->setPropertyValue(u"DrawAspect"_ustr, uno::Any(aDrawAspect)); awt::Size aSize = pOLEHandler->getSize(); if( !aSize.Width ) @@ -3408,11 +3408,11 @@ void DomainMapper_Impl::appendOLE( const OUString& rStreamName, const std::share OUString aVisAreaWidth = pOLEHandler->GetVisAreaWidth(); if(!aVisAreaWidth.isEmpty()) - xOLE->setPropertyValue("VisibleAreaWidth", uno::Any(aVisAreaWidth)); + xOLE->setPropertyValue(u"VisibleAreaWidth"_ustr, uno::Any(aVisAreaWidth)); OUString aVisAreaHeight = pOLEHandler->GetVisAreaHeight(); if(!aVisAreaHeight.isEmpty()) - xOLE->setPropertyValue("VisibleAreaHeight", uno::Any(aVisAreaHeight)); + xOLE->setPropertyValue(u"VisibleAreaHeight"_ustr, uno::Any(aVisAreaHeight)); uno::Reference< graphic::XGraphic > xGraphic = pOLEHandler->getReplacement(); xOLE->setPropertyValue(getPropertyName( PROP_GRAPHIC ), @@ -3421,31 +3421,31 @@ void DomainMapper_Impl::appendOLE( const OUString& rStreamName, const std::share if (xReplacementProperties.is()) { table::BorderLine2 aBorderProps; - xReplacementProperties->getPropertyValue("LineColor") >>= aBorderProps.Color; - xReplacementProperties->getPropertyValue("LineWidth") >>= aBorderProps.LineWidth; - xReplacementProperties->getPropertyValue("LineStyle") >>= aBorderProps.LineStyle; + xReplacementProperties->getPropertyValue(u"LineColor"_ustr) >>= aBorderProps.Color; + xReplacementProperties->getPropertyValue(u"LineWidth"_ustr) >>= aBorderProps.LineWidth; + xReplacementProperties->getPropertyValue(u"LineStyle"_ustr) >>= aBorderProps.LineStyle; if (aBorderProps.LineStyle) // Set line props only if LineStyle is set { - xOLE->setPropertyValue("RightBorder", uno::Any(aBorderProps)); - xOLE->setPropertyValue("TopBorder", uno::Any(aBorderProps)); - xOLE->setPropertyValue("LeftBorder", uno::Any(aBorderProps)); - xOLE->setPropertyValue("BottomBorder", uno::Any(aBorderProps)); + xOLE->setPropertyValue(u"RightBorder"_ustr, uno::Any(aBorderProps)); + xOLE->setPropertyValue(u"TopBorder"_ustr, uno::Any(aBorderProps)); + xOLE->setPropertyValue(u"LeftBorder"_ustr, uno::Any(aBorderProps)); + xOLE->setPropertyValue(u"BottomBorder"_ustr, uno::Any(aBorderProps)); } OUString pProperties[] = { - "AnchorType", - "Surround", - "SurroundContour", - "HoriOrient", - "HoriOrientPosition", - "VertOrient", - "VertOrientPosition", - "VertOrientRelation", - "HoriOrientRelation", - "LeftMargin", - "RightMargin", - "TopMargin", - "BottomMargin" + u"AnchorType"_ustr, + u"Surround"_ustr, + u"SurroundContour"_ustr, + u"HoriOrient"_ustr, + u"HoriOrientPosition"_ustr, + u"VertOrient"_ustr, + u"VertOrientPosition"_ustr, + u"VertOrientRelation"_ustr, + u"HoriOrientRelation"_ustr, + u"LeftMargin"_ustr, + u"RightMargin"_ustr, + u"TopMargin"_ustr, + u"BottomMargin"_ustr }; for (const OUString& s : pProperties) { @@ -3453,15 +3453,15 @@ void DomainMapper_Impl::appendOLE( const OUString& rStreamName, const std::share xOLE->setPropertyValue(s, aVal); } - if (xReplacementProperties->getPropertyValue("FillStyle").get<css::drawing::FillStyle>() + if (xReplacementProperties->getPropertyValue(u"FillStyle"_ustr).get<css::drawing::FillStyle>() != css::drawing::FillStyle::FillStyle_NONE) // Apply fill props if style is set { xOLE->setPropertyValue( - "FillStyle", xReplacementProperties->getPropertyValue("FillStyle")); + u"FillStyle"_ustr, xReplacementProperties->getPropertyValue(u"FillStyle"_ustr)); xOLE->setPropertyValue( - "FillColor", xReplacementProperties->getPropertyValue("FillColor")); + u"FillColor"_ustr, xReplacementProperties->getPropertyValue(u"FillColor"_ustr)); xOLE->setPropertyValue( - "FillColor2", xReplacementProperties->getPropertyValue("FillColor2")); + u"FillColor2"_ustr, xReplacementProperties->getPropertyValue(u"FillColor2"_ustr)); } } else @@ -3742,7 +3742,7 @@ void DomainMapper_Impl::ConvertHeaderFooterToTextFrame(bool bDynamicHeightTop, b std::vector<beans::PropertyValue> aFrameProperties { - comphelper::makePropertyValue("TextWrap", css::text::WrapTextMode_THROUGH), + comphelper::makePropertyValue(u"TextWrap"_ustr, css::text::WrapTextMode_THROUGH), comphelper::makePropertyValue(getPropertyName(PROP_HORI_ORIENT), text::HoriOrientation::LEFT), comphelper::makePropertyValue(getPropertyName(PROP_OPAQUE), false), comphelper::makePropertyValue(getPropertyName(PROP_WIDTH_TYPE), text::SizeType::MIN), @@ -4068,7 +4068,7 @@ void DomainMapper_Impl::CreateRedline(uno::Reference<text::XTextRange> const& xR sType = getPropertyName( PROP_PARAGRAPH_FORMAT ); break; default: - throw lang::IllegalArgumentException("illegal redline token type", nullptr, 0); + throw lang::IllegalArgumentException(u"illegal redline token type"_ustr, nullptr, 0); } beans::PropertyValues aRedlineProperties( 4 ); beans::PropertyValue * pRedlineProperties = aRedlineProperties.getArray( ); @@ -4254,7 +4254,7 @@ void DomainMapper_Impl::PushAnnotation() return; m_xAnnotationField = m_xTextDocument->createFieldAnnotation(); uno::Reference< text::XText > xAnnotationText; - m_xAnnotationField->getPropertyValue("TextRange") >>= xAnnotationText; + m_xAnnotationField->getPropertyValue(u"TextRange"_ustr) >>= xAnnotationText; m_aTextAppendStack.push(TextAppendContext(uno::Reference< text::XTextAppend >( xAnnotationText, uno::UNO_QUERY_THROW ), m_bIsNewDoc ? uno::Reference<text::XTextCursor>() : xAnnotationText->createTextCursorByRange(xAnnotationText->getStart()))); } @@ -4380,14 +4380,14 @@ void DomainMapper_Impl::RemoveTemporaryFootOrEndnotes() uno::Reference< text::XFootnote > xFirstNote; xFootnotes->getByIndex(0) >>= xFirstNote; uno::Reference< text::XText > xText( xFirstNote, uno::UNO_QUERY_THROW ); - xText->setString(""); + xText->setString(u""_ustr); xFootnotes->getByIndex(m_nFirstFootnoteIndex) >>= xNote; CopyTemporaryNotes(xNote, xFirstNote); } for (sal_Int32 i = GetFootnoteCount(); i > 0; --i) { xFootnotes->getByIndex(i) >>= xNote; - xNote->getAnchor()->setString(""); + xNote->getAnchor()->setString(u""_ustr); } } if (GetEndnoteCount() > 0) @@ -4398,14 +4398,14 @@ void DomainMapper_Impl::RemoveTemporaryFootOrEndnotes() uno::Reference< text::XFootnote > xFirstNote; xEndnotes->getByIndex(0) >>= xFirstNote; uno::Reference< text::XText > xText( xFirstNote, uno::UNO_QUERY_THROW ); - xText->setString(""); + xText->setString(u""_ustr); xEndnotes->getByIndex(m_nFirstEndnoteIndex) >>= xNote; CopyTemporaryNotes(xNote, xFirstNote); } for (sal_Int32 i = GetEndnoteCount(); i > 0; --i) { xEndnotes->getByIndex(i) >>= xNote; - xNote->getAnchor()->setString(""); + xNote->getAnchor()->setString(u""_ustr); } } } @@ -4516,10 +4516,10 @@ void DomainMapper_Impl::PopAnnotation() try { if (m_bAnnotationResolved) - m_xAnnotationField->setPropertyValue("Resolved", uno::Any(true)); + m_xAnnotationField->setPropertyValue(u"Resolved"_ustr, uno::Any(true)); - m_xAnnotationField->setPropertyValue("ParaIdParent", uno::Any(m_sAnnotationParent)); - m_xAnnotationField->setPropertyValue("ParaId", uno::Any(m_sAnnotationImportedParaId)); + m_xAnnotationField->setPropertyValue(u"ParaIdParent"_ustr, uno::Any(m_sAnnotationParent)); + m_xAnnotationField->setPropertyValue(u"ParaId"_ustr, uno::Any(m_sAnnotationImportedParaId)); // See if the annotation will be a single position or a range. if (m_nAnnotationId == -1 || !m_aAnnotationPositions[m_nAnnotationId].m_xStart.is() || !m_aAnnotationPositions[m_nAnnotationId].m_xEnd.is()) @@ -4541,7 +4541,7 @@ void DomainMapper_Impl::PopAnnotation() { // Insert a marker so that comment around an anchored image is not collapsed during // insertion. - xText->insertString(xCursor, "x", false); + xText->insertString(xCursor, u"x"_ustr, false); bMarker = true; } @@ -4633,7 +4633,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape try { uno::Reference< lang::XServiceInfo > xSInfo( xShape, uno::UNO_QUERY_THROW ); - if (xSInfo->supportsService("com.sun.star.drawing.GroupShape")) + if (xSInfo->supportsService(u"com.sun.star.drawing.GroupShape"_ustr)) { // Textboxes in shapes do not support styles, so check saved style information and apply properties directly to the child shapes. const uno::Reference<drawing::XShapes> xShapes(xShape, uno::UNO_QUERY); @@ -4648,14 +4648,14 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape xFramePropertySet.set(xFrame, uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xShapePropertySet(xShapes->getByIndex(i), uno::UNO_QUERY_THROW); - comphelper::SequenceAsHashMap aGrabBag( xShapePropertySet->getPropertyValue("CharInteropGrabBag") ); + comphelper::SequenceAsHashMap aGrabBag( xShapePropertySet->getPropertyValue(u"CharInteropGrabBag"_ustr) ); // only VML import has checked for style. Don't apply default parastyle properties to other imported shapes // - except for fontsize - to maintain compatibility with previous versions of LibreOffice. - const bool bOnlyApplyCharHeight = !aGrabBag["mso-pStyle"].hasValue(); + const bool bOnlyApplyCharHeight = !aGrabBag[u"mso-pStyle"_ustr].hasValue(); OUString sStyleName; - aGrabBag["mso-pStyle"] >>= sStyleName; + aGrabBag[u"mso-pStyle"_ustr] >>= sStyleName; StyleSheetEntryPtr pEntry = GetStyleSheetTable()->FindStyleSheetByISTD( sStyleName ); if ( !pEntry ) { @@ -4712,7 +4712,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape uno::Reference<beans::XPropertySet> xShapePropertySet(xShape, uno::UNO_QUERY); uno::Sequence<beans::PropertyValue> aGrabBag; - xShapePropertySet->getPropertyValue("InteropGrabBag") >>= aGrabBag; + xShapePropertySet->getPropertyValue(u"InteropGrabBag"_ustr) >>= aGrabBag; for (const auto& rProp : aGrabBag) { @@ -4739,7 +4739,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape uno::Reference<text::XTextContent> xTxtContent(xShape, uno::UNO_QUERY); m_aAnchoredStack.push(AnchoredContext(xTxtContent)); } - else if (xSInfo->supportsService("com.sun.star.drawing.OLE2Shape")) + else if (xSInfo->supportsService(u"com.sun.star.drawing.OLE2Shape"_ustr)) { // OLE2Shape from oox should be converted to a TextEmbeddedObject for sw. m_aTextAppendStack.push(TextAppendContext(uno::Reference<text::XTextAppend>(xShape, uno::UNO_QUERY), uno::Reference<text::XTextCursor>())); @@ -4781,14 +4781,14 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape text::TextContentAnchorType nAnchorType(text::TextContentAnchorType_AT_PARAGRAPH); xProps->getPropertyValue(getPropertyName( PROP_ANCHOR_TYPE )) >>= nAnchorType; bool checkZOrderStatus = false; - if (xSInfo->supportsService("com.sun.star.text.TextFrame")) + if (xSInfo->supportsService(u"com.sun.star.text.TextFrame"_ustr)) { SetIsTextFrameInserted(true); // Extract the special "btLr text frame" mode, requested by oox, if needed. // Extract vml ZOrder from FrameInteropGrabBag uno::Reference<beans::XPropertySet> xShapePropertySet(xShape, uno::UNO_QUERY); uno::Sequence<beans::PropertyValue> aGrabBag; - xShapePropertySet->getPropertyValue("FrameInteropGrabBag") >>= aGrabBag; + xShapePropertySet->getPropertyValue(u"FrameInteropGrabBag"_ustr) >>= aGrabBag; for (const auto& rProp : aGrabBag) { @@ -4799,7 +4799,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape rProp.Value >>= zOrder; GraphicZOrderHelper::adjustRelativeHeight(zOrder, /*IsZIndex=*/true, zOrder < 0, IsInHeaderFooter()); - xShapePropertySet->setPropertyValue("ZOrder", + xShapePropertySet->setPropertyValue(u"ZOrder"_ustr, uno::Any(rZOrderHelper.findZOrder(zOrder, /*LastDuplicateWins*/true))); rZOrderHelper.addItem(xShapePropertySet, zOrder); xShapePropertySet->setPropertyValue(getPropertyName( PROP_OPAQUE ), uno::Any( zOrder >= 0 ) ); @@ -4821,7 +4821,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape uno::Reference<beans::XPropertySet> xPropertySet(xTextContent, uno::UNO_QUERY); // we need to re-set this value to xTextContent, then only values are preserved. - xPropertySet->setPropertyValue("FrameInteropGrabBag",uno::Any(aGrabBag)); + xPropertySet->setPropertyValue(u"FrameInteropGrabBag"_ustr,uno::Any(aGrabBag)); } else if (nAnchorType == text::TextContentAnchorType_AS_CHARACTER) { @@ -4836,7 +4836,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape { uno::Reference<beans::XPropertySet> xShapePropertySet(xShape, uno::UNO_QUERY); uno::Sequence<beans::PropertyValue> aGrabBag; - xShapePropertySet->getPropertyValue("InteropGrabBag") >>= aGrabBag; + xShapePropertySet->getPropertyValue(u"InteropGrabBag"_ustr) >>= aGrabBag; for (const auto& rProp : aGrabBag) { if (rProp.Name == "VML-Z-ORDER") @@ -4846,7 +4846,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape rProp.Value >>= zOrder; GraphicZOrderHelper::adjustRelativeHeight(zOrder, /*IsZIndex=*/true, zOrder < 0, IsInHeaderFooter()); - xShapePropertySet->setPropertyValue("ZOrder", + xShapePropertySet->setPropertyValue(u"ZOrder"_ustr, uno::Any(rZOrderHelper.findZOrder(zOrder, /*LastDuplicateWins*/true))); rZOrderHelper.addItem(xShapePropertySet, zOrder); xShapePropertySet->setPropertyValue(getPropertyName( PROP_OPAQUE ), uno::Any( zOrder >= 0 ) ); @@ -4868,12 +4868,12 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape if(xShapePropertySet.is()) { xPropSetInfo = xShapePropertySet->getPropertySetInfo(); - if (xPropSetInfo.is() && xPropSetInfo->hasPropertyByName("InteropGrabBag")) + if (xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(u"InteropGrabBag"_ustr)) { uno::Sequence<beans::PropertyValue> aShapeGrabBag( comphelper::InitPropertySequence({ { "SdtEndBefore", uno::Any(true) } })); - xShapePropertySet->setPropertyValue("InteropGrabBag",uno::Any(aShapeGrabBag)); + xShapePropertySet->setPropertyValue(u"InteropGrabBag"_ustr,uno::Any(aShapeGrabBag)); } } } @@ -5035,9 +5035,9 @@ void DomainMapper_Impl::ClearPreviousParagraph() && m_StreamStateStack.top().xPreviousParagraph.is() && hasTableManager() && getTableManager().isCellLastParaAfterAutospacing()) { - uno::Reference<container::XNamed> xPreviousNumberingRules(m_StreamStateStack.top().xPreviousParagraph->getPropertyValue("NumberingRules"), uno::UNO_QUERY); + uno::Reference<container::XNamed> xPreviousNumberingRules(m_StreamStateStack.top().xPreviousParagraph->getPropertyValue(u"NumberingRules"_ustr), uno::UNO_QUERY); if ( !xPreviousNumberingRules.is() || xPreviousNumberingRules->getName().isEmpty() ) - m_StreamStateStack.top().xPreviousParagraph->setPropertyValue("ParaBottomMargin", uno::Any(static_cast<sal_Int32>(0))); + m_StreamStateStack.top().xPreviousParagraph->setPropertyValue(u"ParaBottomMargin"_ustr, uno::Any(static_cast<sal_Int32>(0))); } m_StreamStateStack.top().xPreviousParagraph.clear(); @@ -5054,7 +5054,7 @@ void DomainMapper_Impl::HandleAltChunk(const OUString& rStreamName) uno::Reference<lang::XMultiServiceFactory> xMultiServiceFactory( comphelper::getProcessServiceFactory()); uno::Reference<uno::XInterface> xDocxFilter - = xMultiServiceFactory->createInstance("com.sun.star.comp.Writer.WriterFilter"); + = xMultiServiceFactory->createInstance(u"com.sun.star.comp.Writer.WriterFilter"_ustr); // Set the target document. uno::Reference<document::XImporter> xImporter(xDocxFilter, uno::UNO_QUERY); @@ -5180,14 +5180,14 @@ void DomainMapper_Impl::HandleLineBreak(const PropertyMapPtr& pPropertyMap) { if (!m_StreamStateStack.top().oLineBreakClear.has_value()) { - appendTextPortion("\n", pPropertyMap); + appendTextPortion(u"\n"_ustr, pPropertyMap); return; } if (m_xTextDocument) { rtl::Reference<SwXLineBreak> xLineBreak = m_xTextDocument->createLineBreak(); - xLineBreak->setPropertyValue("Clear", uno::Any(*m_StreamStateStack.top().oLineBreakClear)); + xLineBreak->setPropertyValue(u"Clear"_ustr, uno::Any(*m_StreamStateStack.top().oLineBreakClear)); appendTextContent(xLineBreak, pPropertyMap->GetPropertyValues()); } m_StreamStateStack.top().oLineBreakClear.reset(); @@ -5412,7 +5412,7 @@ static OUString lcl_ExtractToken(std::u16string_view rCommand, { rHaveToken = true; ++rIndex; - return "FORMULA"; + return u"FORMULA"_ustr; } else token.append('='); @@ -5672,7 +5672,7 @@ void DomainMapper_Impl::ChainTextFrames() { ChainMap aTextFramesForChainingHelper; ::std::vector<TextFramesForChaining> chainingWPS; - OUString sChainNextName("ChainNextName"); + OUString sChainNextName(u"ChainNextName"_ustr); //learn about ALL of the textboxes and their chaining values first - because frames are processed in no specific order. for( const auto& rTextFrame : m_vTextFramesForChaining ) @@ -5691,21 +5691,21 @@ void DomainMapper_Impl::ChainTextFrames() //The chaining name and the shape name CAN be different in .docx. //MUST use LinkDisplayName/ChainName as the shape name for establishing links. - if ( xServiceInfo->supportsService("com.sun.star.text.TextFrame") ) + if ( xServiceInfo->supportsService(u"com.sun.star.text.TextFrame"_ustr) ) { - xPropertySet->getPropertyValue("FrameInteropGrabBag") >>= aGrabBag; - xPropertySet->getPropertyValue("LinkDisplayName") >>= sShapeName; + xPropertySet->getPropertyValue(u"FrameInteropGrabBag"_ustr) >>= aGrabBag; + xPropertySet->getPropertyValue(u"LinkDisplayName"_ustr) >>= sShapeName; } else { - xPropertySet->getPropertyValue("InteropGrabBag") >>= aGrabBag; - xPropertySet->getPropertyValue("ChainName") >>= sShapeName; + xPropertySet->getPropertyValue(u"InteropGrabBag"_ustr) >>= aGrabBag; + xPropertySet->getPropertyValue(u"ChainName"_ustr) >>= sShapeName; } - lcl_getGrabBagValue( aGrabBag, "Txbx-Id") >>= aChainStruct.nId; - lcl_getGrabBagValue( aGrabBag, "Txbx-Seq") >>= aChainStruct.nSeq; - lcl_getGrabBagValue( aGrabBag, "LinkChainName") >>= sLinkChainName; - lcl_getGrabBagValue( aGrabBag, "mso-next-textbox") >>= aChainStruct.s_mso_next_textbox; + lcl_getGrabBagValue( aGrabBag, u"Txbx-Id"_ustr) >>= aChainStruct.nId; + lcl_getGrabBagValue( aGrabBag, u"Txbx-Seq"_ustr) >>= aChainStruct.nSeq; + lcl_getGrabBagValue( aGrabBag, u"LinkChainName"_ustr) >>= sLinkChainName; + lcl_getGrabBagValue( aGrabBag, u"mso-next-textbox"_ustr) >>= aChainStruct.s_mso_next_textbox; //Sometimes the shape names have not been imported. If not, we may have a fallback name. //Set name later, only if required for linking. @@ -5863,7 +5863,7 @@ void DomainMapper_Impl::AttachTextBoxContentToShape(css::uno::Reference<css::dra uno::Reference<drawing::XShape>(xGroup->getByIndex(i), uno::UNO_QUERY)); // if this shape has to be a textbox, attach the frame - if (!xProps->getPropertyValue("TextBox").get<bool>()) + if (!xProps->getPropertyValue(u"TextBox"_ustr).get<bool>()) return; // if this is a textbox there must be a waiting frame @@ -5877,7 +5877,7 @@ void DomainMapper_Impl::AttachTextBoxContentToShape(css::uno::Reference<css::dra // Attach the textbox to the shape try { - xProps->setPropertyValue("TextBoxContent", uno::Any(uno::Reference< text::XTextFrame >(xTextBox))); + xProps->setPropertyValue(u"TextBoxContent"_ustr, uno::Any(uno::Reference< text::XTextFrame >(xTextBox))); } catch (...) { @@ -5895,8 +5895,8 @@ void DomainMapper_Impl::AttachTextBoxContentToShape(css::uno::Reference<css::dra // Try to get the grabbag uno::Sequence<beans::PropertyValue> aOldGrabBagSeq; - if (xProps->getPropertySetInfo()->hasPropertyByName("InteropGrabBag")) - xProps->getPropertyValue("InteropGrabBag") >>= aOldGrabBagSeq; + if (xProps->getPropertySetInfo()->hasPropertyByName(u"InteropGrabBag"_ustr)) + xProps->getPropertyValue(u"InteropGrabBag"_ustr) >>= aOldGrabBagSeq; // If the grabbag successfully get... if (!aOldGrabBagSeq.hasElements()) @@ -5905,12 +5905,12 @@ void DomainMapper_Impl::AttachTextBoxContentToShape(css::uno::Reference<css::dra // Check for the existing linking information bool bSuccess = false; beans::PropertyValues aNewGrabBagSeq; - const auto& aHasLink = lcl_getGrabBagValue(aOldGrabBagSeq, "TxbxHasLink"); + const auto& aHasLink = lcl_getGrabBagValue(aOldGrabBagSeq, u"TxbxHasLink"_ustr); // If there must be a link, do it if (aHasLink.hasValue() && aHasLink.get<bool>()) { - auto aLinkProp = comphelper::makePropertyValue("LinkChainName", sTextBoxName); + auto aLinkProp = comphelper::makePropertyValue(u"LinkChainName"_ustr, sTextBoxName); for (sal_uInt32 i = 0; i < aOldGrabBagSeq.size(); ++i) { aNewGrabBagSeq.realloc(i + 1); @@ -5938,7 +5938,7 @@ void DomainMapper_Impl::AttachTextBoxContentToShape(css::uno::Reference<css::dra // If the linking changed the grabbag, apply the modifications if (aNewGrabBagSeq.hasElements() && bSuccess) { - xProps->setPropertyValue("InteropGrabBag", uno::Any(aNewGrabBagSeq)); + xProps->setPropertyValue(u"InteropGrabBag"_ustr, uno::Any(aNewGrabBagSeq)); m_vTextFramesForChaining.push_back(xShape); } } @@ -6071,8 +6071,8 @@ void FieldContext::SetTextField(uno::Reference<text::XTextField> const& xTextFie uno::Reference<lang::XServiceInfo> const xServiceInfo(xTextField, uno::UNO_QUERY); assert(xServiceInfo.is()); // those must be set by SetFormField() - assert(!xServiceInfo->supportsService("com.sun.star.text.Fieldmark") - && !xServiceInfo->supportsService("com.sun.star.text.FormFieldmark")); + assert(!xServiceInfo->supportsService(u"com.sun.star.text.Fieldmark"_ustr) + && !xServiceInfo->supportsService(u"com.sun.star.text.FormFieldmark"_ustr)); } #endif m_xTextField = xTextField; @@ -6273,69 +6273,69 @@ static const FieldConversionMap_t & lcl_GetFieldConversion() { // {"ADDRESSBLOCK", {"", FIELD_ADDRESSBLOCK }}, // {"ADVANCE", {"", FIELD_ADVANCE }}, - {"ASK", {"SetExpression", FIELD_ASK }}, - {"AUTONUM", {"SetExpression", FIELD_AUTONUM }}, - {"AUTONUMLGL", {"SetExpression", FIELD_AUTONUMLGL }}, - {"AUTONUMOUT", {"SetExpression", FIELD_AUTONUMOUT }}, - {"AUTHOR", {"DocInfo.CreateAuthor", FIELD_AUTHOR }}, - {"DATE", {"DateTime", FIELD_DATE }}, - {"COMMENTS", {"DocInfo.Description", FIELD_COMMENTS }}, - {"CREATEDATE", {"DocInfo.CreateDateTime", FIELD_CREATEDATE }}, - {"DOCPROPERTY", {"", FIELD_DOCPROPERTY }}, - {"DOCVARIABLE", {"User", FIELD_DOCVARIABLE }}, - {"EDITTIME", {"DocInfo.EditTime", FIELD_EDITTIME }}, - {"EQ", {"", FIELD_EQ }}, - {"FILLIN", {"Input", FIELD_FILLIN }}, - {"FILENAME", {"FileName", FIELD_FILENAME }}, + {u"ASK"_ustr, {"SetExpression", FIELD_ASK }}, + {u"AUTONUM"_ustr, {"SetExpression", FIELD_AUTONUM }}, + {u"AUTONUMLGL"_ustr, {"SetExpression", FIELD_AUTONUMLGL }}, + {u"AUTONUMOUT"_ustr, {"SetExpression", FIELD_AUTONUMOUT }}, + {u"AUTHOR"_ustr, {"DocInfo.CreateAuthor", FIELD_AUTHOR }}, + {u"DATE"_ustr, {"DateTime", FIELD_DATE }}, + {u"COMMENTS"_ustr, {"DocInfo.Description", FIELD_COMMENTS }}, + {u"CREATEDATE"_ustr, {"DocInfo.CreateDateTime", FIELD_CREATEDATE }}, + {u"DOCPROPERTY"_ustr, {"", FIELD_DOCPROPERTY }}, + {u"DOCVARIABLE"_ustr, {"User", FIELD_DOCVARIABLE }}, + {u"EDITTIME"_ustr, {"DocInfo.EditTime", FIELD_EDITTIME }}, + {u"EQ"_ustr, {"", FIELD_EQ }}, + {u"FILLIN"_ustr, {"Input", FIELD_FILLIN }}, + {u"FILENAME"_ustr, {"FileName", FIELD_FILENAME }}, // {"FILESIZE", {"", FIELD_FILESIZE }}, - {"FORMULA", {"TableFormula", FIELD_FORMULA }}, - {"FORMCHECKBOX", {"", FIELD_FORMCHECKBOX }}, - {"FORMDROPDOWN", {"DropDown", FIELD_FORMDROPDOWN }}, - {"FORMTEXT", {"Input", FIELD_FORMTEXT }}, - {"GOTOBUTTON", {"", FIELD_GOTOBUTTON }}, - {"HYPERLINK", {"", FIELD_HYPERLINK }}, - {"IF", {"ConditionalText", FIELD_IF }}, + {u"FORMULA"_ustr, {"TableFormula", FIELD_FORMULA }}, + {u"FORMCHECKBOX"_ustr, {"", FIELD_FORMCHECKBOX }}, + {u"FORMDROPDOWN"_ustr, {"DropDown", FIELD_FORMDROPDOWN }}, + {u"FORMTEXT"_ustr, {"Input", FIELD_FORMTEXT }}, + {u"GOTOBUTTON"_ustr, {"", FIELD_GOTOBUTTON }}, + {u"HYPERLINK"_ustr, {"", FIELD_HYPERLINK }}, + {u"IF"_ustr, {"ConditionalText", FIELD_IF }}, // {"INFO", {"", FIELD_INFO }}, - {"INCLUDEPICTURE", {"", FIELD_INCLUDEPICTURE}}, - {"KEYWORDS", {"DocInfo.KeyWords", FIELD_KEYWORDS }}, - {"LASTSAVEDBY", {"DocInfo.ChangeAuthor", FIELD_LASTSAVEDBY }}, - {"MACROBUTTON", {"Macro", FIELD_MACROBUTTON }}, - {"MERGEFIELD", {"Database", FIELD_MERGEFIELD }}, - {"MERGEREC", {"DatabaseNumberOfSet", FIELD_MERGEREC }}, + {u"INCLUDEPICTURE"_ustr, {"", FIELD_INCLUDEPICTURE}}, + {u"KEYWORDS"_ustr, {"DocInfo.KeyWords", FIELD_KEYWORDS }}, + {u"LASTSAVEDBY"_ustr, {"DocInfo.ChangeAuthor", FIELD_LASTSAVEDBY }}, + {u"MACROBUTTON"_ustr, {"Macro", FIELD_MACROBUTTON }}, + {u"MERGEFIELD"_ustr, {"Database", FIELD_MERGEFIELD }}, + {u"MERGEREC"_ustr, {"DatabaseNumberOfSet", FIELD_MERGEREC }}, // {"MERGESEQ", {"", FIELD_MERGESEQ }}, - {"NEXT", {"DatabaseNextSet", FIELD_NEXT }}, - {"NEXTIF", {"DatabaseNextSet", FIELD_NEXTIF }}, - {"PAGE", {"PageNumber", FIELD_PAGE }}, - {"PAGEREF", {"GetReference", FIELD_PAGEREF }}, - {"PRINTDATE", {"DocInfo.PrintDateTime", FIELD_PRINTDATE }}, - {"REF", {"GetReference", FIELD_REF }}, - {"REVNUM", {"DocInfo.Revision", FIELD_REVNUM }}, - {"SAVEDATE", {"DocInfo.ChangeDateTime", FIELD_SAVEDATE }}, + {u"NEXT"_ustr, {"DatabaseNextSet", FIELD_NEXT }}, + {u"NEXTIF"_ustr, {"DatabaseNextSet", FIELD_NEXTIF }}, + {u"PAGE"_ustr, {"PageNumber", FIELD_PAGE }}, + {u"PAGEREF"_ustr, {"GetReference", FIELD_PAGEREF }}, + {u"PRINTDATE"_ustr, {"DocInfo.PrintDateTime", FIELD_PRINTDATE }}, + {u"REF"_ustr, {"GetReference", FIELD_REF }}, + {u"REVNUM"_ustr, {"DocInfo.Revision", FIELD_REVNUM }}, + {u"SAVEDATE"_ustr, {"DocInfo.ChangeDateTime", FIELD_SAVEDATE }}, // {"SECTION", {"", FIELD_SECTION }}, // {"SECTIONPAGES", {"", FIELD_SECTIONPAGES }}, - {"SEQ", {"SetExpression", FIELD_SEQ }}, - {"SET", {"SetExpression", FIELD_SET }}, + {u"SEQ"_ustr, {"SetExpression", FIELD_SEQ }}, + {u"SET"_ustr, {"SetExpression", FIELD_SET }}, // {"SKIPIF", {"", FIELD_SKIPIF }}, - {"STYLEREF", {"GetReference", FIELD_STYLEREF }}, - {"SUBJECT", {"DocInfo.Subject", FIELD_SUBJECT }}, - {"SYMBOL", {"", FIELD_SYMBOL }}, - {"TEMPLATE", {"TemplateName", FIELD_TEMPLATE }}, - {"TIME", {"DateTime", FIELD_TIME }}, - {"TITLE", {"DocInfo.Title", FIELD_TITLE }}, - {"USERINITIALS", {"Author", FIELD_USERINITIALS }}, + {u"STYLEREF"_ustr, {"GetReference", FIELD_STYLEREF }}, + {u"SUBJECT"_ustr, {"DocInfo.Subject", FIELD_SUBJECT }}, + {u"SYMBOL"_ustr, {"", FIELD_SYMBOL }}, + {u"TEMPLATE"_ustr, {"TemplateName", FIELD_TEMPLATE }}, + {u"TIME"_ustr, {"DateTime", FIELD_TIME }}, + {u"TITLE"_ustr, {"DocInfo.Title", FIELD_TITLE }}, + {u"USERINITIALS"_ustr, {"Author", FIELD_USERINITIALS }}, // {"USERADDRESS", {"", FIELD_USERADDRESS }}, - {"USERNAME", {"Author", FIELD_USERNAME }}, - - - {"TOC", {"com.sun.star.text.ContentIndex", FIELD_TOC }}, - {"TC", {"com.sun.star.text.ContentIndexMark", FIELD_TC }}, - {"NUMCHARS", {"CharacterCount", FIELD_NUMCHARS }}, - {"NUMWORDS", {"WordCount", FIELD_NUMWORDS }}, - {"NUMPAGES", {"PageCount", FIELD_NUMPAGES }}, - {"INDEX", {"com.sun.star.text.DocumentIndex", FIELD_INDEX }}, - {"XE", {"com.sun.star.text.DocumentIndexMark", FIELD_XE }}, - {"BIBLIOGRAPHY",{"com.sun.star.text.Bibliography", FIELD_BIBLIOGRAPHY }}, - {"CITATION", {"com.sun.star.text.TextField.Bibliography",FIELD_CITATION }}, + {u"USERNAME"_ustr, {"Author", FIELD_USERNAME }}, + + + {u"TOC"_ustr, {"com.sun.star.text.ContentIndex", FIELD_TOC }}, + {u"TC"_ustr, {"com.sun.star.text.ContentIndexMark", FIELD_TC }}, + {u"NUMCHARS"_ustr, {"CharacterCount", FIELD_NUMCHARS }}, + {u"NUMWORDS"_ustr, {"WordCount", FIELD_NUMWORDS }}, + {u"NUMPAGES"_ustr, {"PageCount", FIELD_NUMPAGES }}, + {u"INDEX"_ustr, {"com.sun.star.text.DocumentIndex", FIELD_INDEX }}, + {u"XE"_ustr, {"com.sun.star.text.DocumentIndexMark", FIELD_XE }}, + {u"BIBLIOGRAPHY"_ustr,{"com.sun.star.text.Bibliography", FIELD_BIBLIOGRAPHY }}, + {u"CITATION"_ustr, {"com.sun.star.text.TextField.Bibliography",FIELD_CITATION }}, }; return aFieldConversionMap; @@ -6345,9 +6345,9 @@ static const FieldConversionMap_t & lcl_GetEnhancedFieldConversion() { static const FieldConversionMap_t aEnhancedFieldConversionMap = { - {"FORMCHECKBOX", {"FormFieldmark", FIELD_FORMCHECKBOX}}, - {"FORMDROPDOWN", {"FormFieldmark", FIELD_FORMDROPDOWN}}, - {"FORMTEXT", {"Fieldmark", FIELD_FORMTEXT}}, + {u"FORMCHECKBOX"_ustr, {"FormFieldmark", FIELD_FORMCHECKBOX}}, + {u"FORMDROPDOWN"_ustr, {"FormFieldmark", FIELD_FORMDROPDOWN}}, + {u"FORMTEXT"_ustr, {"Fieldmark", FIELD_FORMTEXT}}, }; return aEnhancedFieldConversionMap; @@ -6544,7 +6544,7 @@ void DomainMapper_Impl::handleFieldFormula xFieldProperties->setPropertyValue(getPropertyName(PROP_CONTENT), uno::Any(formula)); xFieldProperties->setPropertyValue(getPropertyName(PROP_NUMBER_FORMAT), uno::Any(sal_Int32(0))); - xFieldProperties->setPropertyValue("IsShowFormula", uno::Any(false)); + xFieldProperties->setPropertyValue(u"IsShowFormula"_ustr, uno::Any(false)); // grab-bag the original and converted formula if (hasTableManager()) @@ -6644,7 +6644,7 @@ void DomainMapper_Impl::handleAutoNum uno::Reference< beans::XPropertySet > xMaster = FindOrCreateFieldMaster ("com.sun.star.text.FieldMaster.SetExpression", - "AutoNr"); + u"AutoNr"_ustr); xMaster->setPropertyValue( getPropertyName(PROP_SUB_TYPE), uno::Any(text::SetVariableType::SEQUENCE)); @@ -6740,7 +6740,7 @@ void DomainMapper_Impl::handleAuthor else pContext->CacheVariableValue(xUserDefinedProps->getPropertyValue(rFirstParam)); - OUString sServiceName("com.sun.star.text.TextField."); + OUString sServiceName(u"com.sun.star.text.TextField."_ustr); bool bIsCustomField = false; if(sFieldServiceName.isEmpty()) { @@ -6809,10 +6809,10 @@ static uno::Sequence< beans::PropertyValues > lcl_createTOXLevelHyperlinks( bool { // This is an existing page number token; insert the chapter and separator before it aNewLevel.push_back( - { comphelper::makePropertyValue(tokType, OUString("TokenChapterInfo")), - comphelper::makePropertyValue("ChapterFormat", text::ChapterFormat::NUMBER) }); - aNewLevel.push_back({ comphelper::makePropertyValue(tokType, OUString("TokenText")), - comphelper::makePropertyValue("Text", sChapterNoSeparator) }); + { comphelper::makePropertyValue(tokType, u"TokenChapterInfo"_ustr), + comphelper::makePropertyValue(u"ChapterFormat"_ustr, text::ChapterFormat::NUMBER) }); + aNewLevel.push_back({ comphelper::makePropertyValue(tokType, u"TokenText"_ustr), + comphelper::makePropertyValue(u"Text"_ustr, sChapterNoSeparator) }); } aNewLevel.push_back(item); @@ -6821,8 +6821,8 @@ static uno::Sequence< beans::PropertyValues > lcl_createTOXLevelHyperlinks( bool { // There is a fixed tab stop position needed in the level after the numbering aNewLevel.push_back( - { comphelper::makePropertyValue(tokType, OUString("TokenTabStop")), - comphelper::makePropertyValue("TabStopPosition", numtab->Position) }); + { comphelper::makePropertyValue(tokType, u"TokenTabStop"_ustr), + comphelper::makePropertyValue(u"TabStopPosition"_ustr, numtab->Position) }); } } @@ -7088,7 +7088,7 @@ void DomainMapper_Impl::handleToc // Create section before setting m_bStartTOC: finishing paragraph // inside StartIndexSectionChecked could do the wrong thing otherwise - xTOC = StartIndexSectionChecked(bTableOfFigures ? "com.sun.star.text.IllustrationsIndex" + xTOC = StartIndexSectionChecked(bTableOfFigures ? u"com.sun.star.text.IllustrationsIndex"_ustr : sTOCServiceName); const auto xTextCursor = xTextAppend->getText()->createTextCursor(); @@ -7107,7 +7107,7 @@ void DomainMapper_Impl::handleToc m_xTOCMarkerCursor = xText->createTextCursor(); // create header of the TOC with the TOC title inside - createSectionForRange(m_StreamStateStack.top().xSdtEntryStart, xTextRangeEndOfTocHeader, "com.sun.star.text.IndexHeaderSection", true); + createSectionForRange(m_StreamStateStack.top().xSdtEntryStart, xTextRangeEndOfTocHeader, u"com.sun.star.text.IndexHeaderSection"_ustr, true); } } @@ -7223,11 +7223,11 @@ void DomainMapper_Impl::handleToc if (uno::Reference<beans::XPropertyState> xPropState{ xStyle, uno::UNO_QUERY }) { - if (xPropState->getPropertyState("ParaTabStops") + if (xPropState->getPropertyState(u"ParaTabStops"_ustr) == beans::PropertyState_DIRECT_VALUE) { if (uno::Sequence<style::TabStop> tabStops; - xStyle->getPropertyValue("ParaTabStops") >>= tabStops) + xStyle->getPropertyValue(u"ParaTabStops"_ustr) >>= tabStops) { // If the style only has one tab stop, Word uses it for // page number, and generates the other from defaults @@ -7263,7 +7263,7 @@ void DomainMapper_Impl::handleToc if (!sTemplate.isEmpty()) { OUString const sConvertedStyleName(ConvertTOCStyleName(sTemplate)); - xTOC->setPropertyValue("CreateFromParagraphStyle", uno::Any(sConvertedStyleName)); + xTOC->setPropertyValue(u"CreateFromParagraphStyle"_ustr, uno::Any(sConvertedStyleName)); } if ( bHyperlinks ) @@ -7366,7 +7366,7 @@ void DomainMapper_Impl::handleIndex // inside StartIndexSectionChecked could do the wrong thing otherwise const auto xTOC = StartIndexSectionChecked( sUserIndex.isEmpty() ? sTOCServiceName - : "com.sun.star.text.UserIndex"); + : u"com.sun.star.text.UserIndex"_ustr); m_bStartTOC = true; m_bStartIndex = true; @@ -7377,15 +7377,15 @@ void DomainMapper_Impl::handleIndex if( lcl_FindInCommand( pContext->GetCommand(), 'r', sValue )) { - xTOC->setPropertyValue("IsCommaSeparated", uno::Any(true)); + xTOC->setPropertyValue(u"IsCommaSeparated"_ustr, uno::Any(true)); } if( lcl_FindInCommand( pContext->GetCommand(), 'h', sValue )) { - xTOC->setPropertyValue("UseAlphabeticalSeparators", uno::Any(true)); + xTOC->setPropertyValue(u"UseAlphabeticalSeparators"_ustr, uno::Any(true)); } if( !sUserIndex.isEmpty() ) { - xTOC->setPropertyValue("UserIndexName", uno::Any(sUserIndex)); + xTOC->setPropertyValue(u"UserIndexName"_ustr, uno::Any(sUserIndex)); } } pContext->SetTOC( xTOC ); @@ -7596,7 +7596,7 @@ void DomainMapper_Impl::CloseFieldCommand() if( bCreateField || bCreateEnhancedField ) { //add the service prefix - OUString sServiceName("com.sun.star.text."); + OUString sServiceName(u"com.sun.star.text."_ustr); if ( bCreateEnhancedField ) { const FieldConversionMap_t& aEnhancedFieldConversionMap = lcl_GetEnhancedFieldConversion(); @@ -7923,11 +7923,11 @@ void DomainMapper_Impl::CloseFieldCommand() } xFieldProperties->setPropertyValue( - "TrueContent", uno::Any(vArguments[vArguments.size() - 2])); + u"TrueContent"_ustr, uno::Any(vArguments[vArguments.size() - 2])); xFieldProperties->setPropertyValue( - "FalseContent", uno::Any(vArguments[vArguments.size() - 1])); + u"FalseContent"_ustr, uno::Any(vArguments[vArguments.size() - 1])); xFieldProperties->setPropertyValue( - "Condition", uno::Any(sCondition)); + u"Condition"_ustr, uno::Any(sCondition)); } } break; @@ -8082,7 +8082,7 @@ void DomainMapper_Impl::CloseFieldCommand() } else if( m_xTextDocument ) { - xFieldInterface = m_xTextDocument->createInstance("com.sun.star.text.TextField.GetExpression"); + xFieldInterface = m_xTextDocument->createInstance(u"com.sun.star.text.TextField.GetExpression"_ustr); xFieldProperties.set(xFieldInterface, uno::UNO_QUERY); xFieldProperties->setPropertyValue( getPropertyName(PROP_CONTENT), @@ -8245,7 +8245,7 @@ void DomainMapper_Impl::CloseFieldCommand() OUString sUserIndex; OUString sFieldServiceName = lcl_FindInCommand( pContext->GetCommand(), 'f', sUserIndex ) - ? "com.sun.star.text.UserIndexMark" + ? u"com.sun.star.text.UserIndexMark"_ustr : OUString::createFromAscii(aIt->second.cFieldServiceName); uno::Reference< beans::XPropertySet > xTC( m_xTextDocument->createInstance(sFieldServiceName), @@ -8254,15 +8254,15 @@ void DomainMapper_Impl::CloseFieldCommand() if (!sFirstParam.isEmpty()) { xTC->setPropertyValue(sUserIndex.isEmpty() - ? OUString("PrimaryKey") - : OUString("AlternativeText"), + ? u"PrimaryKey"_ustr + : u"AlternativeText"_ustr, uno::Any(sFirstParam)); } sUserIndex = lcl_trim(sUserIndex); if (!sUserIndex.isEmpty()) { - xTC->setPropertyValue("UserIndexName", + xTC->setPropertyValue(u"UserIndexName"_ustr, uno::Any(sUserIndex)); } uno::Reference< text::XTextContent > xToInsert( xTC, uno::UNO_QUERY ); @@ -8293,7 +8293,7 @@ void DomainMapper_Impl::CloseFieldCommand() uno::Sequence<beans::PropertyValue> aValues( comphelper::InitPropertySequence({ { "Identifier", uno::Any(sCmd) } })); - xTC->setPropertyValue("Fields", uno::Any(aValues)); + xTC->setPropertyValue(u"Fields"_ustr, uno::Any(aValues)); } uno::Reference< text::XTextContent > xToInsert( xTC, uno::UNO_QUERY ); @@ -8511,10 +8511,10 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult) // In case of SetExpression, the field result contains the content of the variable. uno::Reference<lang::XServiceInfo> xServiceInfo(xTextField, uno::UNO_QUERY); - bool bIsSetbiblio = xServiceInfo->supportsService("com.sun.star.text.TextField.Bibliography"); + bool bIsSetbiblio = xServiceInfo->supportsService(u"com.sun.star.text.TextField.Bibliography"_ustr); if( bIsSetbiblio ) { - uno::Any aProperty = xFieldProperties->getPropertyValue("Fields"); + uno::Any aProperty = xFieldProperties->getPropertyValue(u"Fields"_ustr); uno::Sequence<beans::PropertyValue> aValues ; aProperty >>= aValues; beans::PropertyValue propertyVal; @@ -8544,7 +8544,7 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult) propertyVal.Value <<= rResult; aValues.getArray()[aValues.getLength() - 1] = propertyVal; } - xFieldProperties->setPropertyValue("Fields", + xFieldProperties->setPropertyValue(u"Fields"_ustr, uno::Any(aValues)); } } @@ -8558,9 +8558,9 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult) uno::Reference< beans::XPropertySet > xFieldProperties( xTextField, uno::UNO_QUERY_THROW); - xFieldProperties->getPropertyValue( "NumberFormat" ) >>= nKey; + xFieldProperties->getPropertyValue( u"NumberFormat"_ustr ) >>= nKey; xFieldProperties->setPropertyValue( - "DateTimeValue", + u"DateTimeValue"_ustr, uno::Any( lcl_dateTimeFromSerial( xFormatter->convertStringToNumber( nKey, rResult ) ) ) ); } else @@ -8571,8 +8571,8 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult) // there are fields with a content property, which aren't working correctly with // a generalized try catch of the content, property, so just restrict content // handling to these explicit services. - const bool bHasContent = xServiceInfo->supportsService("com.sun.star.text.TextField.SetExpression") || - xServiceInfo->supportsService("com.sun.star.text.TextField.Input"); + const bool bHasContent = xServiceInfo->supportsService(u"com.sun.star.text.TextField.SetExpression"_ustr) || + xServiceInfo->supportsService(u"com.sun.star.text.TextField.Input"_ustr); // If we already have content set, then use the current presentation OUString sValue; if (bHasContent) @@ -8599,13 +8599,13 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult) sVariable = sVariable.copy(0, nLen); } bool bCustomFixedField = rResult != sVariable && - xServiceInfo->supportsService("com.sun.star.text.TextField.DocInfo.Custom"); + xServiceInfo->supportsService(u"com.sun.star.text.TextField.DocInfo.Custom"_ustr); if (bCustomFixedField || xServiceInfo->supportsService( - "com.sun.star.text.TextField.DocInfo.CreateDateTime")) + u"com.sun.star.text.TextField.DocInfo.CreateDateTime"_ustr)) { // Creation time is const, don't try to update it. - xFieldProperties->setPropertyValue("IsFixed", uno::Any(true)); + xFieldProperties->setPropertyValue(u"IsFixed"_ustr, uno::Any(true)); } } } @@ -8792,28 +8792,28 @@ void DomainMapper_Impl::PopFieldContext() Any(pContext->GetHyperlinkURL())); if (!pContext->GetHyperlinkTarget().isEmpty()) - xCrsrProperties->setPropertyValue("HyperLinkTarget", uno::Any(pContext->GetHyperlinkTarget())); + xCrsrProperties->setPropertyValue(u"HyperLinkTarget"_ustr, uno::Any(pContext->GetHyperlinkTarget())); if (IsInTOC()) { - OUString sDisplayName("Index Link"); - xCrsrProperties->setPropertyValue("VisitedCharStyleName",uno::Any(sDisplayName)); - xCrsrProperties->setPropertyValue("UnvisitedCharStyleName",uno::Any(sDisplayName)); + OUString sDisplayName(u"Index Link"_ustr); + xCrsrProperties->setPropertyValue(u"VisitedCharStyleName"_ustr,uno::Any(sDisplayName)); + xCrsrProperties->setPropertyValue(u"UnvisitedCharStyleName"_ustr,uno::Any(sDisplayName)); } else if (!pContext->GetHyperlinkStyle().isEmpty()) { - uno::Any aAny = xCrsrProperties->getPropertyValue("CharStyleName"); + uno::Any aAny = xCrsrProperties->getPropertyValue(u"CharStyleName"_ustr); OUString charStyle; if (css::uno::fromAny(aAny, &charStyle)) { if (!charStyle.isEmpty() && charStyle.equalsIgnoreAsciiCase("Internet Link")) { - xCrsrProperties->setPropertyValue("CharStyleName", uno::Any(OUString("Default Style"))); + xCrsrProperties->setPropertyValue(u"CharStyleName"_ustr, uno::Any(u"Default Style"_ustr)); } else { - xCrsrProperties->setPropertyValue("VisitedCharStyleName", uno::Any(pContext->GetHyperlinkStyle())); - xCrsrProperties->setPropertyValue("UnvisitedCharStyleName", uno::Any(pContext->GetHyperlinkStyle())); + xCrsrProperties->setPropertyValue(u"VisitedCharStyleName"_ustr, uno::Any(pContext->GetHyperlinkStyle())); + xCrsrProperties->setPropertyValue(u"UnvisitedCharStyleName"_ustr, uno::Any(pContext->GetHyperlinkStyle())); } } @@ -9194,13 +9194,13 @@ void DomainMapper_Impl::ImportGraphic(const writerfilter::Reference<Properties> if (xPropertySet.is()) { uno::Reference<beans::XPropertySetInfo> xPropertySetInfo = xPropertySet->getPropertySetInfo(); - bHasGrabBag = xPropertySetInfo->hasPropertyByName("FrameInteropGrabBag"); + bHasGrabBag = xPropertySetInfo->hasPropertyByName(u"FrameInteropGrabBag"_ustr); // In case we're outside a paragraph, then the SDT properties are stored in the paragraph grab-bag, not the frame one. if (!m_pSdtHelper->isInteropGrabBagEmpty() && bHasGrabBag && !m_pSdtHelper->isOutsideAParagraph()) { - comphelper::SequenceAsHashMap aFrameGrabBag(xPropertySet->getPropertyValue("FrameInteropGrabBag")); - aFrameGrabBag["SdtPr"] <<= m_pSdtHelper->getInteropGrabBagAndClear(); - xPropertySet->setPropertyValue("FrameInteropGrabBag", uno::Any(aFrameGrabBag.getAsConstPropertyValueList())); + comphelper::SequenceAsHashMap aFrameGrabBag(xPropertySet->getPropertyValue(u"FrameInteropGrabBag"_ustr)); + aFrameGrabBag[u"SdtPr"_ustr] <<= m_pSdtHelper->getInteropGrabBagAndClear(); + xPropertySet->setPropertyValue(u"FrameInteropGrabBag"_ustr, uno::Any(aFrameGrabBag.getAsConstPropertyValueList())); } } @@ -9216,7 +9216,7 @@ void DomainMapper_Impl::ImportGraphic(const writerfilter::Reference<Properties> uno::Sequence<beans::PropertyValue> aFrameGrabBag( comphelper::InitPropertySequence({ { "SdtEndBefore", uno::Any(true) } })); - xPropertySet->setPropertyValue("FrameInteropGrabBag",uno::Any(aFrameGrabBag)); + xPropertySet->setPropertyValue(u"FrameInteropGrabBag"_ustr,uno::Any(aFrameGrabBag)); } } @@ -9233,20 +9233,20 @@ void DomainMapper_Impl::ImportGraphic(const writerfilter::Reference<Properties> if (m_eGraphicImportType == IMPORT_AS_DETECTED_ANCHOR) { rtl::Reference<SwXTextEmbeddedObject> const xEmbedded(m_StreamStateStack.top().xEmbedded); - xEmbedded->setPropertyValue("AnchorType", uno::Any(text::TextContentAnchorType_AT_CHARACTER)); - xEmbedded->setPropertyValue("IsFollowingTextFlow", uno::Any(m_pGraphicImport->GetLayoutInCell())); + xEmbedded->setPropertyValue(u"AnchorType"_ustr, uno::Any(text::TextContentAnchorType_AT_CHARACTER)); + xEmbedded->setPropertyValue(u"IsFollowingTextFlow"_ustr, uno::Any(m_pGraphicImport->GetLayoutInCell())); uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY); - xEmbedded->setPropertyValue("HoriOrient", xShapeProps->getPropertyValue("HoriOrient")); - xEmbedded->setPropertyValue("HoriOrientPosition", xShapeProps->getPropertyValue("HoriOrientPosition")); - xEmbedded->setPropertyValue("HoriOrientRelation", xShapeProps->getPropertyValue("HoriOrientRelation")); - xEmbedded->setPropertyValue("VertOrient", xShapeProps->getPropertyValue("VertOrient")); - xEmbedded->setPropertyValue("VertOrientPosition", xShapeProps->getPropertyValue("VertOrientPosition")); - xEmbedded->setPropertyValue("VertOrientRelation", xShapeProps->getPropertyValue("VertOrientRelation")); + xEmbedded->setPropertyValue(u"HoriOrient"_ustr, xShapeProps->getPropertyValue(u"HoriOrient"_ustr)); + xEmbedded->setPropertyValue(u"HoriOrientPosition"_ustr, xShapeProps->getPropertyValue(u"HoriOrientPosition"_ustr)); + xEmbedded->setPropertyValue(u"HoriOrientRelation"_ustr, xShapeProps->getPropertyValue(u"HoriOrientRelation"_ustr)); + xEmbedded->setPropertyValue(u"VertOrient"_ustr, xShapeProps->getPropertyValue(u"VertOrient"_ustr)); + xEmbedded->setPropertyValue(u"VertOrientPosition"_ustr, xShapeProps->getPropertyValue(u"VertOrientPosition"_ustr)); + xEmbedded->setPropertyValue(u"VertOrientRelation"_ustr, xShapeProps->getPropertyValue(u"VertOrientRelation"_ustr)); //tdf123873 fix missing textwrap import - xEmbedded->setPropertyValue("TextWrap", xShapeProps->getPropertyValue("TextWrap")); + xEmbedded->setPropertyValue(u"TextWrap"_ustr, xShapeProps->getPropertyValue(u"TextWrap"_ustr)); // GraphicZOrderHelper::findZOrder() was called already, so can just copy it over. - xEmbedded->setPropertyValue("ZOrder", xShapeProps->getPropertyValue("ZOrder")); + xEmbedded->setPropertyValue(u"ZOrder"_ustr, xShapeProps->getPropertyValue(u"ZOrder"_ustr)); } } //insert it into the document at the current cursor position @@ -9349,8 +9349,8 @@ void DomainMapper_Impl::SetLineNumbering( sal_Int32 nLnnMod, sal_uInt32 nLnc, sa uno::Reference< container::XNameAccess > xStyleFamilies = m_xTextDocument->getStyleFamilies(); uno::Reference<container::XNameContainer> xStyles; xStyleFamilies->getByName(getPropertyName( PROP_PARAGRAPH_STYLES )) >>= xStyles; - lcl_linenumberingHeaderFooter( xStyles, "Header", this ); - lcl_linenumberingHeaderFooter( xStyles, "Footer", this ); + lcl_linenumberingHeaderFooter( xStyles, u"Header"_ustr, this ); + lcl_linenumberingHeaderFooter( xStyles, u"Footer"_ustr, this ); } @@ -9503,13 +9503,13 @@ void DomainMapper_Impl::SetCurrentRedlineAuthor( const OUString& sAuthor ) SAL_INFO("writerfilter.dmapper", "numberingChange not implemented"); } else - m_xAnnotationField->setPropertyValue("Author", uno::Any(sAuthor)); + m_xAnnotationField->setPropertyValue(u"Author"_ustr, uno::Any(sAuthor)); } void DomainMapper_Impl::SetCurrentRedlineInitials( const OUString& sInitials ) { if (m_xAnnotationField.is()) - m_xAnnotationField->setPropertyValue("Initials", uno::Any(sInitials)); + m_xAnnotationField->setPropertyValue(u"Initials"_ustr, uno::Any(sInitials)); } void DomainMapper_Impl::SetCurrentRedlineDate( const OUString& sDate ) @@ -9522,7 +9522,7 @@ void DomainMapper_Impl::SetCurrentRedlineDate( const OUString& sDate ) SAL_INFO("writerfilter.dmapper", "numberingChange not implemented"); } else - m_xAnnotationField->setPropertyValue("DateTimeValue", uno::Any(ConversionHelper::ConvertDateStringToDateTime(sDate))); + m_xAnnotationField->setPropertyValue(u"DateTimeValue"_ustr, uno::Any(ConversionHelper::ConvertDateStringToDateTime(sDate))); } void DomainMapper_Impl::SetCurrentRedlineId( sal_Int32 sId ) @@ -9562,7 +9562,7 @@ void DomainMapper_Impl::RemoveTopRedline( ) if (GetFootnoteCount() > -1 || GetEndnoteCount() > -1) return; SAL_WARN("writerfilter.dmapper", "RemoveTopRedline called with empty stack"); - throw uno::Exception("RemoveTopRedline failed", nullptr); + throw uno::Exception(u"RemoveTopRedline failed"_ustr, nullptr); } m_aRedlines.top().pop_back( ); m_currentRedline.clear(); @@ -9607,35 +9607,35 @@ void DomainMapper_Impl::ApplySettingsTable() rtl::Reference<SwXDocumentSettings> xSettings(m_xTextDocument->createDocumentSettings()); if (m_pSettingsTable->GetDoNotExpandShiftReturn()) - xSettings->setPropertyValue( "DoNotJustifyLinesWithManualBreak", uno::Any(true) ); + xSettings->setPropertyValue( u"DoNotJustifyLinesWithManualBreak"_ustr, uno::Any(true) ); // new paragraph justification has been introduced in version 15, // breaking text layout interoperability: new line shrinking needs less space // i.e. it typesets the same text with less lines and pages. if (m_pSettingsTable->GetWordCompatibilityMode() >= 15) - xSettings->setPropertyValue("JustifyLinesWithShrinking", uno::Any( true )); + xSettings->setPropertyValue(u"JustifyLinesWithShrinking"_ustr, uno::Any( true )); if (m_pSettingsTable->GetUsePrinterMetrics()) - xSettings->setPropertyValue("PrinterIndependentLayout", uno::Any(document::PrinterIndependentLayout::DISABLED)); + xSettings->setPropertyValue(u"PrinterIndependentLayout"_ustr, uno::Any(document::PrinterIndependentLayout::DISABLED)); if( m_pSettingsTable->GetEmbedTrueTypeFonts()) xSettings->setPropertyValue( getPropertyName( PROP_EMBED_FONTS ), uno::Any(true) ); if( m_pSettingsTable->GetEmbedSystemFonts()) xSettings->setPropertyValue( getPropertyName( PROP_EMBED_SYSTEM_FONTS ), uno::Any(true) ); - xSettings->setPropertyValue("AddParaTableSpacing", uno::Any(m_pSettingsTable->GetDoNotUseHTMLParagraphAutoSpacing())); + xSettings->setPropertyValue(u"AddParaTableSpacing"_ustr, uno::Any(m_pSettingsTable->GetDoNotUseHTMLParagraphAutoSpacing())); if (m_pSettingsTable->GetNoLeading()) { - xSettings->setPropertyValue("AddExternalLeading", uno::Any(!m_pSettingsTable->GetNoLeading())); + xSettings->setPropertyValue(u"AddExternalLeading"_ustr, uno::Any(!m_pSettingsTable->GetNoLeading())); } if( m_pSettingsTable->GetProtectForm() ) - xSettings->setPropertyValue("ProtectForm", uno::Any( true )); + xSettings->setPropertyValue(u"ProtectForm"_ustr, uno::Any( true )); if( m_pSettingsTable->GetReadOnly() ) - xSettings->setPropertyValue("LoadReadonly", uno::Any( true )); + xSettings->setPropertyValue(u"LoadReadonly"_ustr, uno::Any( true )); if (m_pSettingsTable->GetGutterAtTop()) { - xSettings->setPropertyValue("GutterAtTop", uno::Any(true)); + xSettings->setPropertyValue(u"GutterAtTop"_ustr, uno::Any(true)); } uno::Sequence<beans::PropertyValue> aWriteProtection = m_pSettingsTable->GetWriteProtectionSettings(); if (aWriteProtection.hasElements()) - xSettings->setPropertyValue("ModifyPasswordInfo", uno::Any(aWriteProtection)); + xSettings->setPropertyValue(u"ModifyPasswordInfo"_ustr, uno::Any(aWriteProtection)); } catch(const uno::Exception&) { @@ -9688,9 +9688,9 @@ sal_Int32 DomainMapper_Impl::getNumberingProperty(const sal_Int32 nListId, sal_I const OUString aListName = pList->GetStyleName(); const uno::Reference< container::XNameAccess > xStyleFamilies = m_xTextDocument->getStyleFamilies(); uno::Reference<container::XNameAccess> xNumberingStyles; - xStyleFamilies->getByName("NumberingStyles") >>= xNumberingStyles; + xStyleFamilies->getByName(u"NumberingStyles"_ustr) >>= xNumberingStyles; const uno::Reference<beans::XPropertySet> xStyle(xNumberingStyles->getByName(aListName), uno::UNO_QUERY); - const uno::Reference<container::XIndexAccess> xNumberingRules(xStyle->getPropertyValue("NumberingRules"), uno::UNO_QUERY); + const uno::Reference<container::XIndexAccess> xNumberingRules(xStyle->getPropertyValue(u"NumberingRules"_ustr), uno::UNO_QUERY); if (xNumberingRules.is()) { uno::Sequence<beans::PropertyValue> aProps; diff --git a/sw/source/writerfilter/dmapper/FormControlHelper.cxx b/sw/source/writerfilter/dmapper/FormControlHelper.cxx index 4baf7490d2cf..adcda594a6ba 100644 --- a/sw/source/writerfilter/dmapper/FormControlHelper.cxx +++ b/sw/source/writerfilter/dmapper/FormControlHelper.cxx @@ -93,13 +93,13 @@ uno::Reference<form::XForm> const & FormControlHelper::FormControlHelper_Impl::g sFormName = sDOCXForm + OUString::number(nUnique); } - uno::Reference<uno::XInterface> xForm(mxTextDocument->createInstance("com.sun.star.form.component.Form")); + uno::Reference<uno::XInterface> xForm(mxTextDocument->createInstance(u"com.sun.star.form.component.Form"_ustr)); if (xForm.is()) { uno::Reference<beans::XPropertySet> xFormProperties(xForm, uno::UNO_QUERY); uno::Any aAny(sFormName); - xFormProperties->setPropertyValue("Name", aAny); + xFormProperties->setPropertyValue(u"Name"_ustr, aAny); } rForm.set(xForm, uno::UNO_QUERY); @@ -141,7 +141,7 @@ bool FormControlHelper::createCheckbox(uno::Reference<text::XTextRange> const& x if (! m_pImpl->mxTextDocument) return false; - uno::Reference<uno::XInterface> xInterface = m_pImpl->mxTextDocument->createInstance("com.sun.star.form.component.CheckBox"); + uno::Reference<uno::XInterface> xInterface = m_pImpl->mxTextDocument->createInstance(u"com.sun.star.form.component.CheckBox"_ustr); if (!xInterface.is()) return false; @@ -161,7 +161,7 @@ bool FormControlHelper::createCheckbox(uno::Reference<text::XTextRange> const& x try { float fCheckBoxHeight = 0.0; - xTextRangeProps->getPropertyValue("CharHeight") >>= fCheckBoxHeight; + xTextRangeProps->getPropertyValue(u"CharHeight"_ustr) >>= fCheckBoxHeight; nCheckBoxHeight = static_cast<sal_uInt32>(floor(fCheckBoxHeight * 35.3)); } catch (beans::UnknownPropertyException &) @@ -174,17 +174,17 @@ bool FormControlHelper::createCheckbox(uno::Reference<text::XTextRange> const& x if (!m_pFFData->getStatusText().isEmpty()) { - xPropSet->setPropertyValue("HelpText", uno::Any(m_pFFData->getStatusText())); + xPropSet->setPropertyValue(u"HelpText"_ustr, uno::Any(m_pFFData->getStatusText())); } - xPropSet->setPropertyValue("DefaultState", uno::Any(m_pFFData->getCheckboxChecked())); + xPropSet->setPropertyValue(u"DefaultState"_ustr, uno::Any(m_pFFData->getCheckboxChecked())); if (!m_pFFData->getHelpText().isEmpty()) { - xPropSet->setPropertyValue("HelpF1Text", uno::Any(m_pFFData->getHelpText())); + xPropSet->setPropertyValue(u"HelpF1Text"_ustr, uno::Any(m_pFFData->getHelpText())); } - xPropSet->setPropertyValue("Name", uno::Any(rControlName)); + xPropSet->setPropertyValue(u"Name"_ustr, uno::Any(rControlName)); return true; } @@ -212,18 +212,18 @@ void FormControlHelper::processField(uno::Reference<text::XFormField> const& xFo OUString sTmp = m_pFFData->getEntryMacro(); if ( !sTmp.isEmpty() ) - xNameCont->insertByName( "EntryMacro", uno::Any(sTmp) ); + xNameCont->insertByName( u"EntryMacro"_ustr, uno::Any(sTmp) ); sTmp = m_pFFData->getExitMacro(); if ( !sTmp.isEmpty() ) - xNameCont->insertByName( "ExitMacro", uno::Any(sTmp) ); + xNameCont->insertByName( u"ExitMacro"_ustr, uno::Any(sTmp) ); sTmp = m_pFFData->getHelpText(); if ( !sTmp.isEmpty() ) - xNameCont->insertByName( "Help", uno::Any(sTmp) ); + xNameCont->insertByName( u"Help"_ustr, uno::Any(sTmp) ); sTmp = m_pFFData->getStatusText(); if ( !sTmp.isEmpty() ) - xNameCont->insertByName( "Hint", uno::Any(sTmp) ); + xNameCont->insertByName( u"Hint"_ustr, uno::Any(sTmp) ); if (m_pImpl->m_eFieldId == FIELD_FORMTEXT ) { @@ -240,21 +240,21 @@ void FormControlHelper::processField(uno::Reference<text::XFormField> const& xFo sTmp = m_pFFData->getTextType(); if ( !sTmp.isEmpty() ) - xNameCont->insertByName( "Type", uno::Any(sTmp) ); + xNameCont->insertByName( u"Type"_ustr, uno::Any(sTmp) ); const sal_uInt16 nMaxLength = m_pFFData->getTextMaxLength(); if ( nMaxLength ) { - xNameCont->insertByName( "MaxLength", uno::Any(nMaxLength) ); + xNameCont->insertByName( u"MaxLength"_ustr, uno::Any(nMaxLength) ); } sTmp = m_pFFData->getTextDefault(); if ( !sTmp.isEmpty() ) - xNameCont->insertByName( "Content", uno::Any(sTmp) ); + xNameCont->insertByName( u"Content"_ustr, uno::Any(sTmp) ); sTmp = m_pFFData->getTextFormat(); if ( !sTmp.isEmpty() ) - xNameCont->insertByName( "Format", uno::Any(sTmp) ); + xNameCont->insertByName( u"Format"_ustr, uno::Any(sTmp) ); } else if (m_pImpl->m_eFieldId == FIELD_FORMCHECKBOX ) { @@ -262,7 +262,7 @@ void FormControlHelper::processField(uno::Reference<text::XFormField> const& xFo uno::Any aAny; aAny <<= m_pFFData->getCheckboxChecked(); if ( xPropSet.is() ) - xPropSet->setPropertyValue("Checked", aAny); + xPropSet->setPropertyValue(u"Checked"_ustr, aAny); } else if (m_pImpl->m_eFieldId == FIELD_FORMDROPDOWN ) { @@ -332,7 +332,7 @@ void FormControlHelper::insertControl(uno::Reference<text::XTextRange> const& xT if (! m_pImpl->mxTextDocument ) return; - uno::Reference<uno::XInterface> xInterface = m_pImpl->mxTextDocument->createInstance("com.sun.star.drawing.ControlShape"); + uno::Reference<uno::XInterface> xInterface = m_pImpl->mxTextDocument->createInstance(u"com.sun.star.drawing.ControlShape"_ustr); if (! xInterface.is()) return; @@ -347,12 +347,12 @@ void FormControlHelper::insertControl(uno::Reference<text::XTextRange> const& xT uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY); sal_uInt16 nTmp = sal_uInt16(text::TextContentAnchorType_AS_CHARACTER); - xShapeProps->setPropertyValue("AnchorType", uno::Any(sal_uInt16(nTmp))); + xShapeProps->setPropertyValue(u"AnchorType"_ustr, uno::Any(sal_uInt16(nTmp))); nTmp = text::VertOrientation::CENTER; - xShapeProps->setPropertyValue("VertOrient", uno::Any(sal_uInt16(nTmp))); + xShapeProps->setPropertyValue(u"VertOrient"_ustr, uno::Any(sal_uInt16(nTmp))); - xShapeProps->setPropertyValue("TextRange", uno::Any(xTextRange)); + xShapeProps->setPropertyValue(u"TextRange"_ustr, uno::Any(xTextRange)); uno::Reference<drawing::XControlShape> xControlShape(xShape, uno::UNO_QUERY); uno::Reference<awt::XControlModel> xControlModel(m_pImpl->rFormComponent, uno::UNO_QUERY); diff --git a/sw/source/writerfilter/dmapper/GraphicHelpers.cxx b/sw/source/writerfilter/dmapper/GraphicHelpers.cxx index 32e13b04bec8..e7cb6d56f3d2 100644 --- a/sw/source/writerfilter/dmapper/GraphicHelpers.cxx +++ b/sw/source/writerfilter/dmapper/GraphicHelpers.cxx @@ -359,9 +359,9 @@ sal_Int32 GraphicZOrderHelper::findZOrder(sal_Int64 relativeHeight, bool bOldSty bool bTextBox = false; uno::Reference<beans::XPropertySet> xShape = it->second; uno::Reference<beans::XPropertySetInfo> xInfo = xShape->getPropertySetInfo(); - if (xInfo->hasPropertyByName("TextBox")) + if (xInfo->hasPropertyByName(u"TextBox"_ustr)) { - xShape->getPropertyValue("TextBox") >>= bTextBox; + xShape->getPropertyValue(u"TextBox"_ustr) >>= bTextBox; } if (bTextBox) { diff --git a/sw/source/writerfilter/dmapper/GraphicImport.cxx b/sw/source/writerfilter/dmapper/GraphicImport.cxx index 3a60e63dbefb..b7621f776f4e 100644 --- a/sw/source/writerfilter/dmapper/GraphicImport.cxx +++ b/sw/source/writerfilter/dmapper/GraphicImport.cxx @@ -455,15 +455,15 @@ public: { comphelper::SequenceAsHashMap aEffectExtent; if (m_oEffectExtentLeft) - aEffectExtent["l"] <<= *m_oEffectExtentLeft; + aEffectExtent[u"l"_ustr] <<= *m_oEffectExtentLeft; if (m_oEffectExtentTop) - aEffectExtent["t"] <<= *m_oEffectExtentTop; + aEffectExtent[u"t"_ustr] <<= *m_oEffectExtentTop; if (m_oEffectExtentRight) - aEffectExtent["r"] <<= *m_oEffectExtentRight; + aEffectExtent[u"r"_ustr] <<= *m_oEffectExtentRight; if (m_oEffectExtentBottom) - aEffectExtent["b"] <<= *m_oEffectExtentBottom; + aEffectExtent[u"b"_ustr] <<= *m_oEffectExtentBottom; if (!aEffectExtent.empty()) - m_aInteropGrabBag["CT_EffectExtent"] <<= aEffectExtent.getAsConstPropertyValueList(); + m_aInteropGrabBag[u"CT_EffectExtent"_ustr] <<= aEffectExtent.getAsConstPropertyValueList(); return m_aInteropGrabBag; } }; @@ -535,7 +535,7 @@ void GraphicImport::putPropertyToFrameGrabBag( const OUString& sPropertyName, co OUString aGrabBagPropName; uno::Reference<lang::XServiceInfo> xServiceInfo(m_xShape, uno::UNO_QUERY_THROW); - if (xServiceInfo->supportsService("com.sun.star.text.TextFrame")) + if (xServiceInfo->supportsService(u"com.sun.star.text.TextFrame"_ustr)) aGrabBagPropName = "FrameInteropGrabBag"; else aGrabBagPropName = "InteropGrabBag"; @@ -838,13 +838,13 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) ( xShape, uno::UNO_QUERY_THROW ); uno::Reference<graphic::XGraphic> xGraphic; - xShapeProps->getPropertyValue("Graphic") >>= xGraphic; + xShapeProps->getPropertyValue(u"Graphic"_ustr) >>= xGraphic; sal_Int32 nRotation = 0; - xShapeProps->getPropertyValue("RotateAngle") >>= nRotation; + xShapeProps->getPropertyValue(u"RotateAngle"_ustr) >>= nRotation; css::beans::PropertyValues aGrabBag; - xShapeProps->getPropertyValue("InteropGrabBag") >>= aGrabBag; + xShapeProps->getPropertyValue(u"InteropGrabBag"_ustr) >>= aGrabBag; // if the shape contains effects in the grab bag, we should not transform it // in a XTextContent so those effects can be preserved bool bContainsEffects = std::any_of(std::cbegin(aGrabBag), std::cend(aGrabBag), [](const auto& rProp) { @@ -853,18 +853,18 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) || rProp.Name == "ArtisticEffectProperties"; }); - xShapeProps->getPropertyValue("Shadow") >>= m_pImpl->m_bShadow; + xShapeProps->getPropertyValue(u"Shadow"_ustr) >>= m_pImpl->m_bShadow; if (m_pImpl->m_bShadow) { - xShapeProps->getPropertyValue("ShadowXDistance") >>= m_pImpl->m_nShadowXDistance; - xShapeProps->getPropertyValue("ShadowYDistance") >>= m_pImpl->m_nShadowYDistance; - xShapeProps->getPropertyValue("ShadowColor") >>= m_pImpl->m_nShadowColor; - xShapeProps->getPropertyValue("ShadowTransparence") >>= m_pImpl->m_nShadowTransparence; + xShapeProps->getPropertyValue(u"ShadowXDistance"_ustr) >>= m_pImpl->m_nShadowXDistance; + xShapeProps->getPropertyValue(u"ShadowYDistance"_ustr) >>= m_pImpl->m_nShadowYDistance; + xShapeProps->getPropertyValue(u"ShadowColor"_ustr) >>= m_pImpl->m_nShadowColor; + xShapeProps->getPropertyValue(u"ShadowTransparence"_ustr) >>= m_pImpl->m_nShadowTransparence; } - xShapeProps->getPropertyValue("GraphicColorMode") >>= m_pImpl->m_eColorMode; - xShapeProps->getPropertyValue("AdjustLuminance") >>= m_pImpl->m_nBrightness; - xShapeProps->getPropertyValue("AdjustContrast") >>= m_pImpl->m_nContrast; + xShapeProps->getPropertyValue(u"GraphicColorMode"_ustr) >>= m_pImpl->m_eColorMode; + xShapeProps->getPropertyValue(u"AdjustLuminance"_ustr) >>= m_pImpl->m_nBrightness; + xShapeProps->getPropertyValue(u"AdjustContrast"_ustr) >>= m_pImpl->m_nContrast; // fdo#70457: transform XShape into a SwXTextGraphicObject only if there's no rotation if ( nRotation == 0 && !bContainsEffects ) @@ -876,22 +876,22 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) { // Define the object size awt::Size aSize = xShape->getSize( ); - m_xGraphicObject->setPropertyValue("Height", + m_xGraphicObject->setPropertyValue(u"Height"_ustr, uno::Any( aSize.Height ) ); - m_xGraphicObject->setPropertyValue("Width", + m_xGraphicObject->setPropertyValue(u"Width"_ustr, uno::Any( aSize.Width ) ); text::GraphicCrop aGraphicCrop( 0, 0, 0, 0 ); uno::Reference< beans::XPropertySet > xSourceGraphProps( xShape, uno::UNO_QUERY ); - uno::Any aAny = xSourceGraphProps->getPropertyValue("GraphicCrop"); + uno::Any aAny = xSourceGraphProps->getPropertyValue(u"GraphicCrop"_ustr); if (m_pImpl->m_oCrop) { // RTF: RTFValue from resolvePict() - m_xGraphicObject->setPropertyValue("GraphicCrop", + m_xGraphicObject->setPropertyValue(u"GraphicCrop"_ustr, uno::Any(*m_pImpl->m_oCrop)); } else if (aAny >>= aGraphicCrop) { // DOCX: imported in oox BlipFillContext - m_xGraphicObject->setPropertyValue("GraphicCrop", + m_xGraphicObject->setPropertyValue(u"GraphicCrop"_ustr, uno::Any( aGraphicCrop ) ); } @@ -921,7 +921,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) // In Word, if a shape is anchored inline, that // excludes being in the background. - xShapeProps->setPropertyValue("Opaque", uno::Any(true)); + xShapeProps->setPropertyValue(u"Opaque"_ustr, uno::Any(true)); uno::Reference<lang::XServiceInfo> xServiceInfo(m_xShape, uno::UNO_QUERY_THROW); @@ -929,7 +929,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) // make sure that setting size doesn't affect rotation, // that would not match Word's definition of rotation. bool bKeepRotation = false; - if (!xServiceInfo->supportsService("com.sun.star.text.TextFrame")) + if (!xServiceInfo->supportsService(u"com.sun.star.text.TextFrame"_ustr)) { bKeepRotation = true; xShapeProps->setPropertyValue @@ -954,9 +954,9 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) // here, because it returns the rotate angle of the first child for groups // and slope angle for lines, even if line or group had not been rotated. // Import in oox has put the rotation from oox file into InteropGrabBag. - comphelper::SequenceAsHashMap aInteropGrabBag(xShapeProps->getPropertyValue("InteropGrabBag")); + comphelper::SequenceAsHashMap aInteropGrabBag(xShapeProps->getPropertyValue(u"InteropGrabBag"_ustr)); sal_Int32 nOOXAngle(0); - aInteropGrabBag.getValue("mso-rotation-angle") >>= nOOXAngle; // 1/60000 deg + aInteropGrabBag.getValue(u"mso-rotation-angle"_ustr) >>= nOOXAngle; // 1/60000 deg // tdf#143455: A diagram is imported as group, but has no valid object list // and contour wrap is different to Word. As workaround diagrams are excluded // here in various places. @@ -965,12 +965,12 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) // tdf#143476: A lockedCanvas (Word2007) is imported as group, but has not // got size and position. Values from m_Impl has to be used. bool bIsLockedCanvas(false); - aInteropGrabBag.getValue("LockedCanvas") >>= bIsLockedCanvas; + aInteropGrabBag.getValue(u"LockedCanvas"_ustr) >>= bIsLockedCanvas; bool bIsWordprocessingCanvas(false); - aInteropGrabBag.getValue("WordprocessingCanvas") >>= bIsWordprocessingCanvas; - const bool bIsGroupOrLine = (xServiceInfo->supportsService("com.sun.star.drawing.GroupShape") + aInteropGrabBag.getValue(u"WordprocessingCanvas"_ustr) >>= bIsWordprocessingCanvas; + const bool bIsGroupOrLine = (xServiceInfo->supportsService(u"com.sun.star.drawing.GroupShape"_ustr) && !bIsDiagram && !bIsLockedCanvas && !bIsWordprocessingCanvas) - || xServiceInfo->supportsService("com.sun.star.drawing.LineShape"); + || xServiceInfo->supportsService(u"com.sun.star.drawing.LineShape"_ustr); SdrObject* pShape = SdrObject::getSdrObjectFromXShape(m_xShape); if (!bIsGroupOrLine || (!nOOXAngle && !lcl_bHasGroupSlantedChild(pShape))) { @@ -998,14 +998,14 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) if (bKeepRotation) { - xShapeProps->setPropertyValue("RotateAngle", uno::Any(nRotation.get())); + xShapeProps->setPropertyValue(u"RotateAngle"_ustr, uno::Any(nRotation.get())); } m_pImpl->m_bIsGraphic = true; if (!m_pImpl->m_sAnchorId.isEmpty()) { - putPropertyToFrameGrabBag("AnchorId", uno::Any(m_pImpl->m_sAnchorId)); + putPropertyToFrameGrabBag(u"AnchorId"_ustr, uno::Any(m_pImpl->m_sAnchorId)); } // Calculate mso unrotated rectangle and its center, needed below @@ -1051,7 +1051,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) // based on the unrotated image without width-height-swap. We correct this to // those values, which would be calculated if width-height-swap was used. if (m_pImpl->m_rDomainMapper.GetSettingsTable()->GetWordCompatibilityMode() < 14 - && xServiceInfo->supportsService("com.sun.star.drawing.GraphicObjectShape") + && xServiceInfo->supportsService(u"com.sun.star.drawing.GraphicObjectShape"_ustr) && nOOXAngle != 0) { lcl_correctWord2007EffectExtent(nOOXAngle); @@ -1215,25 +1215,25 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) const double fTopDiff = aShapeRange.getMinY() - aB2DWrapRange.getMinY(); m_pImpl->m_nTopMargin += basegfx::fround(fTopDiff); - aAnchorDistDiff["distTDiff"] <<= basegfx::fround( + aAnchorDistDiff[u"distTDiff"_ustr] <<= basegfx::fround( o3tl::convert(fTopDiff, o3tl::Length::mm100, o3tl::Length::twip)); const double fBottomDiff = aB2DWrapRange.getMaxY() - aShapeRange.getMaxY(); m_pImpl->m_nBottomMargin += basegfx::fround(fBottomDiff); - aAnchorDistDiff["distBDiff"] <<= basegfx::fround( + aAnchorDistDiff[u"distBDiff"_ustr] <<= basegfx::fround( o3tl::convert(fBottomDiff, o3tl::Length::mm100, o3tl::Length::twip)); const double fLeftDiff = aShapeRange.getMinX() - aB2DWrapRange.getMinX(); m_pImpl->m_nLeftMargin += basegfx::fround(fLeftDiff); - aAnchorDistDiff["distLDiff"] <<= basegfx::fround( + aAnchorDistDiff[u"distLDiff"_ustr] <<= basegfx::fround( o3tl::convert(fLeftDiff, o3tl::Length::mm100, o3tl::Length::twip)); const double fRightDiff = aB2DWrapRange.getMaxX() - aShapeRange.getMaxX(); m_pImpl->m_nRightMargin += basegfx::fround(fRightDiff); - aAnchorDistDiff["distRDiff"] <<= basegfx::fround( + aAnchorDistDiff[u"distRDiff"_ustr] <<= basegfx::fround( o3tl::convert(fRightDiff, o3tl::Length::mm100, o3tl::Length::twip)); - m_pImpl->m_aInteropGrabBag["AnchorDistDiff"] + m_pImpl->m_aInteropGrabBag[u"AnchorDistDiff"_ustr] <<= aAnchorDistDiff.getAsConstPropertyValueList(); // FixMe: tdf#141880. LibreOffice cannot handle negative horizontal margin in contour wrap @@ -1319,13 +1319,13 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) if (m_pImpl->m_bHidden) { - xShapeProps->setPropertyValue("Visible", uno::Any(false)); - xShapeProps->setPropertyValue("Printable", uno::Any(false)); + xShapeProps->setPropertyValue(u"Visible"_ustr, uno::Any(false)); + xShapeProps->setPropertyValue(u"Printable"_ustr, uno::Any(false)); } // Avoid setting AnchorType for TextBoxes till SwTextBoxHelper::syncProperty() doesn't handle transition. bool bTextBox = false; - xShapeProps->getPropertyValue("TextBox") >>= bTextBox; + xShapeProps->getPropertyValue(u"TextBox"_ustr) >>= bTextBox; // The positioning change caused by LayoutInCell doesn't sync well // in the text / frame duo. So the compatibility fix only correctly @@ -1335,7 +1335,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) if (m_pImpl->m_bLayoutInCell && bTextBox) m_pImpl->m_bLayoutInCell = !m_pImpl->m_bCompatForcedLayoutInCell; - xShapeProps->setPropertyValue("AnchorType", uno::Any(eAnchorType)); + xShapeProps->setPropertyValue(u"AnchorType"_ustr, uno::Any(eAnchorType)); if (m_pImpl->m_nVertRelation == text::RelOrientation::TEXT_LINE) { @@ -1357,8 +1357,8 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) m_pImpl->applyPosition(xShapeProps); uno::Reference<lang::XServiceInfo> xServiceInfo(m_xShape, uno::UNO_QUERY_THROW); - if (xServiceInfo->supportsService("com.sun.star.drawing.GroupShape") || - xServiceInfo->supportsService("com.sun.star.drawing.GraphicObjectShape")) + if (xServiceInfo->supportsService(u"com.sun.star.drawing.GroupShape"_ustr) || + xServiceInfo->supportsService(u"com.sun.star.drawing.GraphicObjectShape"_ustr)) { // You would expect that position and rotation are // independent, but they are not. Till we are not @@ -1367,12 +1367,12 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) // make sure there is no graphic rotation set when we set // the position. sal_Int32 nRotation = 0; - if (xServiceInfo->supportsService("com.sun.star.drawing.GraphicObjectShape")) + if (xServiceInfo->supportsService(u"com.sun.star.drawing.GraphicObjectShape"_ustr)) { - xShapeProps->getPropertyValue("RotateAngle") >>= nRotation; + xShapeProps->getPropertyValue(u"RotateAngle"_ustr) >>= nRotation; } if (nRotation) - xShapeProps->setPropertyValue("RotateAngle", uno::Any(sal_Int32(0))); + xShapeProps->setPropertyValue(u"RotateAngle"_ustr, uno::Any(sal_Int32(0))); // Position of the groupshape should be set after children have been added. // Long-term we should get rid of positioning group @@ -1386,27 +1386,27 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) awt::Point(m_pImpl->m_nLeftPosition, m_pImpl->m_nTopPosition)); if (nRotation) - xShapeProps->setPropertyValue("RotateAngle", uno::Any(nRotation)); + xShapeProps->setPropertyValue(u"RotateAngle"_ustr, uno::Any(nRotation)); } m_pImpl->applyRelativePosition(xShapeProps, /*bRelativeOnly=*/true); - xShapeProps->setPropertyValue("SurroundContour", uno::Any(m_pImpl->m_bContour)); - xShapeProps->setPropertyValue("ContourOutside", uno::Any(m_pImpl->m_bContourOutside)); + xShapeProps->setPropertyValue(u"SurroundContour"_ustr, uno::Any(m_pImpl->m_bContour)); + xShapeProps->setPropertyValue(u"ContourOutside"_ustr, uno::Any(m_pImpl->m_bContourOutside)); m_pImpl->applyMargins(xShapeProps); - xShapeProps->setPropertyValue("Opaque", uno::Any(m_pImpl->m_bOpaque)); - xShapeProps->setPropertyValue("Surround", uno::Any(static_cast<sal_Int32>(m_pImpl->m_nWrap))); + xShapeProps->setPropertyValue(u"Opaque"_ustr, uno::Any(m_pImpl->m_bOpaque)); + xShapeProps->setPropertyValue(u"Surround"_ustr, uno::Any(static_cast<sal_Int32>(m_pImpl->m_nWrap))); m_pImpl->applyZOrder(xShapeProps); m_pImpl->applyName(xShapeProps); m_pImpl->applyHyperlink(xShapeProps, bUseShape); - xShapeProps->setPropertyValue("AllowOverlap", + xShapeProps->setPropertyValue(u"AllowOverlap"_ustr, uno::Any(m_pImpl->m_bAllowOverlap)); // Get the grab-bag set by oox, merge with our one and then put it back. - comphelper::SequenceAsHashMap aInteropGrabBag(xShapeProps->getPropertyValue("InteropGrabBag")); + comphelper::SequenceAsHashMap aInteropGrabBag(xShapeProps->getPropertyValue(u"InteropGrabBag"_ustr)); aInteropGrabBag.update(m_pImpl->getInteropGrabBag()); - xShapeProps->setPropertyValue("InteropGrabBag", uno::Any(aInteropGrabBag.getAsConstPropertyValueList())); + xShapeProps->setPropertyValue(u"InteropGrabBag"_ustr, uno::Any(aInteropGrabBag.getAsConstPropertyValueList())); } else if (bUseShape && m_pImpl->m_rGraphicImportType == IMPORT_AS_DETECTED_INLINE) { @@ -1414,9 +1414,9 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) m_pImpl->applyMargins(xShapeProps); m_pImpl->applyZOrder(xShapeProps); m_pImpl->applyName(xShapeProps); - comphelper::SequenceAsHashMap aInteropGrabBag(xShapeProps->getPropertyValue("InteropGrabBag")); + comphelper::SequenceAsHashMap aInteropGrabBag(xShapeProps->getPropertyValue(u"InteropGrabBag"_ustr)); aInteropGrabBag.update(m_pImpl->getInteropGrabBag()); - xShapeProps->setPropertyValue("InteropGrabBag", uno::Any(aInteropGrabBag.getAsConstPropertyValueList())); + xShapeProps->setPropertyValue(u"InteropGrabBag"_ustr, uno::Any(aInteropGrabBag.getAsConstPropertyValueList())); } } } @@ -1445,7 +1445,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) if (m_xShape.is()) { uno::Reference<beans::XPropertySet> xPropertySet(m_xShape, uno::UNO_QUERY); - xPropertySet->setPropertyValue("RelativeWidthRelation", uno::Any(text::RelOrientation::FRAME)); + xPropertySet->setPropertyValue(u"RelativeWidthRelation"_ustr, uno::Any(text::RelOrientation::FRAME)); } break; case NS_ooxml::LN_ST_SizeRelFromH_leftMargin: @@ -1456,7 +1456,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) // The size of the shape's width is going to be relative to the size of the left margin. // E.g.: (left margin = 8 && relative size = 150%) -> width of some shape = 12. uno::Reference<beans::XPropertySet> xPropertySet(m_xShape, uno::UNO_QUERY); - xPropertySet->setPropertyValue("RelativeWidthRelation", uno::Any(text::RelOrientation::PAGE_LEFT)); + xPropertySet->setPropertyValue(u"RelativeWidthRelation"_ustr, uno::Any(text::RelOrientation::PAGE_LEFT)); } break; case NS_ooxml::LN_ST_SizeRelFromH_rightMargin: @@ -1465,14 +1465,14 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) { // Same as the left margin above. uno::Reference<beans::XPropertySet> xPropertySet(m_xShape, uno::UNO_QUERY); - xPropertySet->setPropertyValue("RelativeWidthRelation", uno::Any(text::RelOrientation::PAGE_RIGHT)); + xPropertySet->setPropertyValue(u"RelativeWidthRelation"_ustr, uno::Any(text::RelOrientation::PAGE_RIGHT)); } break; case NS_ooxml::LN_ST_SizeRelFromH_page: if (m_xShape.is()) { uno::Reference<beans::XPropertySet> xPropertySet(m_xShape, uno::UNO_QUERY); - xPropertySet->setPropertyValue("RelativeWidthRelation", uno::Any(text::RelOrientation::PAGE_FRAME)); + xPropertySet->setPropertyValue(u"RelativeWidthRelation"_ustr, uno::Any(text::RelOrientation::PAGE_FRAME)); } break; default: @@ -1489,28 +1489,28 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) if (m_xShape.is()) { uno::Reference<beans::XPropertySet> xPropertySet(m_xShape, uno::UNO_QUERY); - xPropertySet->setPropertyValue("RelativeHeightRelation", uno::Any(text::RelOrientation::FRAME)); + xPropertySet->setPropertyValue(u"RelativeHeightRelation"_ustr, uno::Any(text::RelOrientation::FRAME)); } break; case NS_ooxml::LN_ST_SizeRelFromV_page: if (m_xShape.is()) { uno::Reference<beans::XPropertySet> xPropertySet(m_xShape, uno::UNO_QUERY); - xPropertySet->setPropertyValue("RelativeHeightRelation", uno::Any(text::RelOrientation::PAGE_FRAME)); + xPropertySet->setPropertyValue(u"RelativeHeightRelation"_ustr, uno::Any(text::RelOrientation::PAGE_FRAME)); } break; case NS_ooxml::LN_ST_SizeRelFromV_topMargin: if (m_xShape.is()) { uno::Reference<beans::XPropertySet> xPropertySet(m_xShape, uno::UNO_QUERY); - xPropertySet->setPropertyValue("RelativeHeightRelation", uno::Any(text::RelOrientation::PAGE_PRINT_AREA)); + xPropertySet->setPropertyValue(u"RelativeHeightRelation"_ustr, uno::Any(text::RelOrientation::PAGE_PRINT_AREA)); } break; case NS_ooxml::LN_ST_SizeRelFromV_bottomMargin: if (m_xShape.is()) { uno::Reference<beans::XPropertySet> xPropertySet(m_xShape, uno::UNO_QUERY); - xPropertySet->setPropertyValue("RelativeHeightRelation", uno::Any(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM)); + xPropertySet->setPropertyValue(u"RelativeHeightRelation"_ustr, uno::Any(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM)); } break; default: @@ -1613,9 +1613,9 @@ void GraphicImport::lcl_sprm(Sprm& rSprm) // We'll map these to PARALLEL, save the original wrap type. if (nSprmId == NS_ooxml::LN_EG_WrapType_wrapTight) - m_pImpl->m_aInteropGrabBag["EG_WrapType"] <<= OUString("wrapTight"); + m_pImpl->m_aInteropGrabBag[u"EG_WrapType"_ustr] <<= u"wrapTight"_ustr; else if (nSprmId == NS_ooxml::LN_EG_WrapType_wrapThrough) - m_pImpl->m_aInteropGrabBag["EG_WrapType"] <<= OUString("wrapThrough"); + m_pImpl->m_aInteropGrabBag[u"EG_WrapType"_ustr] <<= u"wrapThrough"_ustr; switch (nSprmId) { @@ -1642,7 +1642,7 @@ void GraphicImport::lcl_sprm(Sprm& rSprm) m_pImpl->mpWrapPolygon = aHandler.getPolygon(); // Save the wrap path in case we can't handle it natively: drawinglayer shapes, TextFrames. - m_pImpl->m_aInteropGrabBag["CT_WrapPath"] <<= m_pImpl->mpWrapPolygon->getPointSequenceSequence(); + m_pImpl->m_aInteropGrabBag[u"CT_WrapPath"_ustr] <<= m_pImpl->mpWrapPolygon->getPointSequenceSequence(); } break; case NS_ooxml::LN_CT_Anchor_positionH: @@ -1702,17 +1702,17 @@ void GraphicImport::lcl_sprm(Sprm& rSprm) if (nPositivePercentage) { uno::Reference<beans::XPropertySet> xPropertySet(m_xShape, uno::UNO_QUERY); - OUString aProperty = nSprmId == NS_ooxml::LN_CT_SizeRelH_pctWidth ? OUString("RelativeWidth") : OUString("RelativeHeight"); + OUString aProperty = nSprmId == NS_ooxml::LN_CT_SizeRelH_pctWidth ? u"RelativeWidth"_ustr : u"RelativeHeight"_ustr; sal_Int32 nTextPreRotateAngle = 0; uno::Any aAny; if (xPropertySet->getPropertySetInfo()->hasPropertyByName( - "CustomShapeGeometry")) + u"CustomShapeGeometry"_ustr)) { - aAny = xPropertySet->getPropertyValue("CustomShapeGeometry"); + aAny = xPropertySet->getPropertyValue(u"CustomShapeGeometry"_ustr); } comphelper::SequenceAsHashMap aCustomShapeGeometry(aAny); - auto it = aCustomShapeGeometry.find("TextPreRotateAngle"); + auto it = aCustomShapeGeometry.find(u"TextPreRotateAngle"_ustr); if (it != aCustomShapeGeometry.end()) { nTextPreRotateAngle = it->second.get<sal_Int32>(); @@ -1790,13 +1790,13 @@ rtl::Reference<SwXTextGraphicObject> GraphicImport::createGraphicObject(uno::Ref //shapes have only one border table::BorderLine2 aBorderLine; GraphicBorderLine& rBorderLine = m_pImpl->m_aBorders[0]; - if (rBorderLine.isEmpty() && xShapeProps.is() && xShapeProps->getPropertyValue("LineStyle").get<drawing::LineStyle>() != drawing::LineStyle_NONE) + if (rBorderLine.isEmpty() && xShapeProps.is() && xShapeProps->getPropertyValue(u"LineStyle"_ustr).get<drawing::LineStyle>() != drawing::LineStyle_NONE) { // In case we got no border tokens and we have the // original shape, then use its line properties as the // border. - aBorderLine.Color = xShapeProps->getPropertyValue("LineColor").get<sal_Int32>(); - aBorderLine.LineWidth = xShapeProps->getPropertyValue("LineWidth").get<sal_Int32>(); + aBorderLine.Color = xShapeProps->getPropertyValue(u"LineColor"_ustr).get<sal_Int32>(); + aBorderLine.LineWidth = xShapeProps->getPropertyValue(u"LineWidth"_ustr).get<sal_Int32>(); } else { @@ -1980,7 +1980,7 @@ rtl::Reference<SwXTextGraphicObject> GraphicImport::createGraphicObject(uno::Ref } text::GraphicCrop aGraphicCrop; - xShapeProps->getPropertyValue("GraphicCrop") >>= aGraphicCrop; + xShapeProps->getPropertyValue(u"GraphicCrop"_ustr) >>= aGraphicCrop; if (aGraphicCrop.Top != 0 || aGraphicCrop.Bottom != 0 || aGraphicCrop.Left != 0 || aGraphicCrop.Right != 0) { @@ -1997,7 +1997,7 @@ rtl::Reference<SwXTextGraphicObject> GraphicImport::createGraphicObject(uno::Ref // We should bring it to front, even if wp:anchor's behindDoc="1", // because otherwise paragraph background (if set) overlaps the graphic // TODO: if paragraph's background becomes bottommost, then remove this hack - xGraphicObject->setPropertyValue("Opaque", uno::Any(true)); + xGraphicObject->setPropertyValue(u"Opaque"_ustr, uno::Any(true)); } } @@ -2015,12 +2015,12 @@ rtl::Reference<SwXTextGraphicObject> GraphicImport::createGraphicObject(uno::Ref // Handle horizontal flip. bool bMirrored = false; - xShapeProps->getPropertyValue("IsMirrored") >>= bMirrored; + xShapeProps->getPropertyValue(u"IsMirrored"_ustr) >>= bMirrored; if (bMirrored) { - xGraphicObject->setPropertyValue("HoriMirroredOnEvenPages", + xGraphicObject->setPropertyValue(u"HoriMirroredOnEvenPages"_ustr, uno::Any(true)); - xGraphicObject->setPropertyValue("HoriMirroredOnOddPages", + xGraphicObject->setPropertyValue(u"HoriMirroredOnOddPages"_ustr, uno::Any(true)); } } diff --git a/sw/source/writerfilter/dmapper/MeasureHandler.cxx b/sw/source/writerfilter/dmapper/MeasureHandler.cxx index 5eea9a5c613b..85aae7602732 100644 --- a/sw/source/writerfilter/dmapper/MeasureHandler.cxx +++ b/sw/source/writerfilter/dmapper/MeasureHandler.cxx @@ -59,10 +59,10 @@ void MeasureHandler::lcl_attribute(Id rName, Value & rVal) aValue.Name = "type"; switch (nIntValue) { - case NS_ooxml::LN_Value_ST_TblWidth_nil: aValue.Value <<= OUString("nil"); break; - case NS_ooxml::LN_Value_ST_TblWidth_pct: aValue.Value <<= OUString("pct"); break; - case NS_ooxml::LN_Value_ST_TblWidth_dxa: aValue.Value <<= OUString("dxa"); break; - case NS_ooxml::LN_Value_ST_TblWidth_auto: aValue.Value <<= OUString("auto"); break; + case NS_ooxml::LN_Value_ST_TblWidth_nil: aValue.Value <<= u"nil"_ustr; break; + case NS_ooxml::LN_Value_ST_TblWidth_pct: aValue.Value <<= u"pct"_ustr; break; + case NS_ooxml::LN_Value_ST_TblWidth_dxa: aValue.Value <<= u"dxa"_ustr; break; + case NS_ooxml::LN_Value_ST_TblWidth_auto: aValue.Value <<= u"auto"_ustr; break; } m_aInteropGrabBag.push_back(aValue); } diff --git a/sw/source/writerfilter/dmapper/NumberingManager.cxx b/sw/source/writerfilter/dmapper/NumberingManager.cxx index 3b72a2008709..6147af5e0228 100644 --- a/sw/source/writerfilter/dmapper/NumberingManager.cxx +++ b/sw/source/writerfilter/dmapper/NumberingManager.cxx @@ -481,7 +481,7 @@ static uno::Reference< container::XNameContainer > lcl_getUnoNumberingStyles( try { - uno::Any oFamily = xTextDoc->getStyleFamilies( )->getByName("NumberingStyles"); + uno::Any oFamily = xTextDoc->getStyleFamilies( )->getByName(u"NumberingStyles"_ustr); oFamily >>= xStyles; } @@ -875,7 +875,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm ) uno::Reference<beans::XPropertySet> xPropertySet(xShape, uno::UNO_QUERY); try { - uno::Any aAny = xPropertySet->getPropertyValue("Graphic"); + uno::Any aAny = xPropertySet->getPropertyValue(u"Graphic"_ustr); if (aAny.has<uno::Reference<graphic::XGraphic>>() && pCurrentLevel) { auto xGraphic = aAny.get<uno::Reference<graphic::XGraphic>>(); diff --git a/sw/source/writerfilter/dmapper/OLEHandler.cxx b/sw/source/writerfilter/dmapper/OLEHandler.cxx index 3c1d198d74eb..660f1f651259 100644 --- a/sw/source/writerfilter/dmapper/OLEHandler.cxx +++ b/sw/source/writerfilter/dmapper/OLEHandler.cxx @@ -98,7 +98,7 @@ void OLEHandler::lcl_attribute(Id rName, Value & rVal) // Control shape is handled on a different code path uno::Reference< lang::XServiceInfo > xSInfo( xTempShape, uno::UNO_QUERY_THROW ); - if(xSInfo->supportsService("com.sun.star.drawing.ControlShape")) + if(xSInfo->supportsService(u"com.sun.star.drawing.ControlShape"_ustr)) { m_rDomainMapper.hasControls(true); break; @@ -116,7 +116,7 @@ void OLEHandler::lcl_attribute(Id rName, Value & rVal) try { uno::Reference<beans::XPropertySet> xShapeProps(m_xShape, uno::UNO_QUERY); - xShapeProps->setPropertyValue("Opaque", uno::Any(false)); + xShapeProps->setPropertyValue(u"Opaque"_ustr, uno::Any(false)); } catch( const uno::Exception& ) { @@ -183,7 +183,7 @@ void OLEHandler::lcl_sprm(Sprm & rSprm) // Through shapes in the header or footer(that spill into the body) should be in the background. // It is just assumed that all shapes will spill into the body. if( m_rDomainMapper.IsInHeaderFooter() ) - xShapeProps->setPropertyValue("Opaque", uno::Any(m_nWrapMode != text::WrapTextMode_THROUGH)); + xShapeProps->setPropertyValue(u"Opaque"_ustr, uno::Any(m_nWrapMode != text::WrapTextMode_THROUGH)); } catch( const uno::Exception& ) { @@ -227,14 +227,14 @@ void OLEHandler::importStream(const uno::Reference<uno::XComponentContext>& xCom // Import the input stream. utl::MediaDescriptor aMediaDescriptor; - aMediaDescriptor["InputStream"] <<= m_xInputStream; + aMediaDescriptor[u"InputStream"_ustr] <<= m_xInputStream; uno::Reference<document::XFilter> xFilter(xInterface, uno::UNO_QUERY); xFilter->filter(aMediaDescriptor.getAsConstPropertyValueList()); // Now that the data is imported, update the (typically) changed stream name. uno::Reference<beans::XPropertySet> xPropertySet(xOLE, uno::UNO_QUERY); ::oox::ole::SaveInteropProperties(xTextDocument, - xPropertySet->getPropertyValue("StreamName").get<OUString>(), &m_aURL, + xPropertySet->getPropertyValue(u"StreamName"_ustr).get<OUString>(), &m_aURL, m_sProgId); } diff --git a/sw/source/writerfilter/dmapper/PropertyMap.cxx b/sw/source/writerfilter/dmapper/PropertyMap.cxx index 02951c73cbcd..b5c70b6309f8 100644 --- a/sw/source/writerfilter/dmapper/PropertyMap.cxx +++ b/sw/source/writerfilter/dmapper/PropertyMap.cxx @@ -191,16 +191,16 @@ uno::Sequence< beans::PropertyValue > PropertyMap::GetPropertyValues( bool bChar } if ( nCharGrabBag && bCharGrabBag ) - m_aValues.push_back( makePropertyValue( "CharInteropGrabBag", uno::Any( aCharGrabBagValues ) ) ); + m_aValues.push_back( makePropertyValue( u"CharInteropGrabBag"_ustr, uno::Any( aCharGrabBagValues ) ) ); if ( nParaGrabBag ) - m_aValues.push_back( makePropertyValue( "ParaInteropGrabBag", uno::Any( aParaGrabBagValues ) ) ); + m_aValues.push_back( makePropertyValue( u"ParaInteropGrabBag"_ustr, uno::Any( aParaGrabBagValues ) ) ); if ( nCellGrabBag ) - m_aValues.push_back( makePropertyValue( "CellInteropGrabBag", uno::Any( aCellGrabBagValues ) ) ); + m_aValues.push_back( makePropertyValue( u"CellInteropGrabBag"_ustr, uno::Any( aCellGrabBagValues ) ) ); if ( nRowGrabBag ) - m_aValues.push_back( makePropertyValue( "RowInteropGrabBag", uno::Any( aRowGrabBagValues ) ) ); + m_aValues.push_back( makePropertyValue( u"RowInteropGrabBag"_ustr, uno::Any( aRowGrabBagValues ) ) ); return comphelper::containerToSequence( m_aValues ); } @@ -721,7 +721,7 @@ void SectionPropertyMap::SetBorderDistance( const uno::Reference< beans::XProper if (eOffsetFrom == BorderOffsetFrom::Edge) { - uno::Any aGutterMargin = xStyle->getPropertyValue( "GutterMargin" ); + uno::Any aGutterMargin = xStyle->getPropertyValue( u"GutterMargin"_ustr ); sal_Int32 nGutterMargin = 0; aGutterMargin >>= nGutterMargin; @@ -750,7 +750,7 @@ void SectionPropertyMap::DontBalanceTextColumns() try { if ( m_xColumnContainer.is() ) - m_xColumnContainer->setPropertyValue( "DontBalanceTextColumns", uno::Any( true ) ); + m_xColumnContainer->setPropertyValue( u"DontBalanceTextColumns"_ustr, uno::Any( true ) ); } catch ( const uno::Exception& ) { @@ -859,12 +859,12 @@ uno::Reference< text::XTextColumns > SectionPropertyMap::ApplyColumnProperties( if ( m_bSeparatorLineIsOn ) { - xColumnPropSet->setPropertyValue( "SeparatorLineIsOn", uno::Any( true ) ); - xColumnPropSet->setPropertyValue( "SeparatorLineVerticalAlignment", uno::Any( style::VerticalAlignment_TOP ) ); - xColumnPropSet->setPropertyValue( "SeparatorLineRelativeHeight", uno::Any( static_cast<sal_Int8>(100) ) ); - xColumnPropSet->setPropertyValue( "SeparatorLineColor", uno::Any( static_cast<sal_Int32>(COL_BLACK) ) ); + xColumnPropSet->setPropertyValue( u"SeparatorLineIsOn"_ustr, uno::Any( true ) ); + xColumnPropSet->setPropertyValue( u"SeparatorLineVerticalAlignment"_ustr, uno::Any( style::VerticalAlignment_TOP ) ); + xColumnPropSet->setPropertyValue( u"SeparatorLineRelativeHeight"_ustr, uno::Any( static_cast<sal_Int8>(100) ) ); + xColumnPropSet->setPropertyValue( u"SeparatorLineColor"_ustr, uno::Any( static_cast<sal_Int32>(COL_BLACK) ) ); // 1 twip -> 2 mm100. - xColumnPropSet->setPropertyValue( "SeparatorLineWidth", uno::Any( static_cast<sal_Int32>(2) ) ); + xColumnPropSet->setPropertyValue( u"SeparatorLineWidth"_ustr, uno::Any( static_cast<sal_Int32>(2) ) ); } xColumnContainer->setPropertyValue( sTextColumns, uno::Any( xColumns ) ); // Set the columns to be unbalanced if that compatibility option is set or this is the last section. @@ -1180,13 +1180,13 @@ void SectionPropertyMap::HandleMarginsHeaderFooter(DomainMapper_Impl& rDM_Impl) if (rDM_Impl.m_bCopyStandardPageStyleFill && m_sPageStyleName == "Standard") { rDM_Impl.m_bCopyStandardPageStyleFill = false; - m_aPageStyle->setPropertyValue("FillStyle", uno::Any(drawing::FillStyle_NONE)); + m_aPageStyle->setPropertyValue(u"FillStyle"_ustr, uno::Any(drawing::FillStyle_NONE)); } } else if (rDM_Impl.m_bCopyStandardPageStyleFill) // complex fill: graphics/gradients/patterns { uno::Reference<beans::XPropertySet> xDefaultPageStyle( - rDM_Impl.GetPageStyles()->getByName("Standard"), uno::UNO_QUERY_THROW); + rDM_Impl.GetPageStyles()->getByName(u"Standard"_ustr), uno::UNO_QUERY_THROW); for (const beans::Property& rProp : m_aPageStyle->getPropertySetInfo()->getProperties()) { try @@ -1219,10 +1219,10 @@ void SectionPropertyMap::HandleMarginsHeaderFooter(DomainMapper_Impl& rDM_Impl) uno::Reference<container::XNameAccess> xStyleFamilies = rDM_Impl.GetTextDocument()->getStyleFamilies(); uno::Reference<container::XNameAccess> xParagraphStyles; if ( xStyleFamilies.is() ) - xStyleFamilies->getByName("ParagraphStyles") >>= xParagraphStyles; + xStyleFamilies->getByName(u"ParagraphStyles"_ustr) >>= xParagraphStyles; uno::Reference<beans::XPropertySet> xStandard; if ( xParagraphStyles.is() ) - xParagraphStyles->getByName("Standard") >>= xStandard; + xParagraphStyles->getByName(u"Standard"_ustr) >>= xStandard; if ( xStandard.is() ) { sal_Int16 aWritingMode(0); @@ -1299,7 +1299,7 @@ void SectionPropertyMap::HandleIncreasedAnchoredObjectSpacing(DomainMapper_Impl& } bool bOpaque = true; - xShape->getPropertyValue("Opaque") >>= bOpaque; + xShape->getPropertyValue(u"Opaque"_ustr) >>= bOpaque; if (!bOpaque) { ++nOpaqueCount; @@ -1325,7 +1325,7 @@ void SectionPropertyMap::HandleIncreasedAnchoredObjectSpacing(DomainMapper_Impl& // Ignore objects with no wrapping. text::WrapTextMode eWrap = text::WrapTextMode_THROUGH; - xPropertySet->getPropertyValue("Surround") >>= eWrap; + xPropertySet->getPropertyValue(u"Surround"_ustr) >>= eWrap; if (eWrap == text::WrapTextMode_THROUGH) continue; @@ -1333,7 +1333,7 @@ void SectionPropertyMap::HandleIncreasedAnchoredObjectSpacing(DomainMapper_Impl& // one to 0. sal_Int32 nLeftMargin = rAnchored.m_nLeftMargin; sal_Int32 nRightMargin = 0; - xPropertySet->getPropertyValue("RightMargin") >>= nRightMargin; + xPropertySet->getPropertyValue(u"RightMargin"_ustr) >>= nRightMargin; nShapesWidth += xShape->getSize().Width + nLeftMargin + nRightMargin; } @@ -1355,11 +1355,11 @@ void SectionPropertyMap::HandleIncreasedAnchoredObjectSpacing(DomainMapper_Impl& if (xParagraph.is()) { sal_Int32 nTopMargin = 0; - xParagraph->getPropertyValue("ParaTopMargin") >>= nTopMargin; + xParagraph->getPropertyValue(u"ParaTopMargin"_ustr) >>= nTopMargin; // Increase top spacing of the paragraph to match Word layout // behavior. nTopMargin = std::max(nTopMargin, nHeight); - xParagraph->setPropertyValue("ParaTopMargin", uno::Any(nTopMargin)); + xParagraph->setPropertyValue(u"ParaTopMargin"_ustr, uno::Any(nTopMargin)); } } rAnchoredObjectAnchors.clear(); @@ -1379,24 +1379,24 @@ void BeforeConvertToTextFrame(std::deque<css::uno::Any>& rFramedRedlines, std::v OUString sTableName; OUString sCellName; xRangeProperties.set( xRange, uno::UNO_QUERY_THROW ); - if (xRangeProperties->getPropertySetInfo()->hasPropertyByName("TextTable")) + if (xRangeProperties->getPropertySetInfo()->hasPropertyByName(u"TextTable"_ustr)) { - uno::Any aTable = xRangeProperties->getPropertyValue("TextTable"); + uno::Any aTable = xRangeProperties->getPropertyValue(u"TextTable"_ustr); if ( aTable != uno::Any() ) { uno::Reference<text::XTextTable> xTable; aTable >>= xTable; uno::Reference<beans::XPropertySet> xTableProperties(xTable, uno::UNO_QUERY); - xTableProperties->getPropertyValue("TableName") >>= sTableName; + xTableProperties->getPropertyValue(u"TableName"_ustr) >>= sTableName; } - if (xRangeProperties->getPropertySetInfo()->hasPropertyByName("Cell")) + if (xRangeProperties->getPropertySetInfo()->hasPropertyByName(u"Cell"_ustr)) { - uno::Any aCell = xRangeProperties->getPropertyValue("Cell"); + uno::Any aCell = xRangeProperties->getPropertyValue(u"Cell"_ustr); if ( aCell != uno::Any() ) { aCell >>= xCell; uno::Reference<beans::XPropertySet> xCellProperties(xCell, uno::UNO_QUERY); - xCellProperties->getPropertyValue("CellName") >>= sCellName; + xCellProperties->getPropertyValue(u"CellName"_ustr) >>= sCellName; } } } @@ -1484,7 +1484,7 @@ void SectionPropertyMap::CreateEvenOddPageStyleCopy(DomainMapper_Impl& rDM_Impl, } } } - evenOddStyle->setPropertyValue("FollowStyle", uno::Any(m_sPageStyleName)); + evenOddStyle->setPropertyValue(u"FollowStyle"_ustr, uno::Any(m_sPageStyleName)); rDM_Impl.GetPageStyles()->insertByName(evenOddStyleName, uno::Any(uno::Reference<style::XStyle>(evenOddStyle))); @@ -1634,10 +1634,10 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) { uno::Reference<beans::XPropertySet> xElem; xEnum->nextElement() >>= xElem; - if (xElem->getPropertySetInfo()->hasPropertyByName("BreakType")) + if (xElem->getPropertySetInfo()->hasPropertyByName(u"BreakType"_ustr)) { style::BreakType eBreakType; - if ((xElem->getPropertyValue("BreakType") >>= eBreakType) && eBreakType == style::BreakType_PAGE_BEFORE) + if ((xElem->getPropertyValue(u"BreakType"_ustr) >>= eBreakType) && eBreakType == style::BreakType_PAGE_BEFORE) { // tdf#112201: do *not* use m_sFirstPageStyleName here! xElem->setPropertyValue(getPropertyName(PROP_PAGE_DESC_NAME), uno::Any(m_sPageStyleName)); @@ -1654,7 +1654,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) xPCursor->gotoPreviousParagraph(false); uno::Reference<beans::XPropertySet> const xPSCursor(xCursor, uno::UNO_QUERY_THROW); style::BreakType eBreakType; - if ((xPSCursor->getPropertyValue("BreakType") >>= eBreakType) && eBreakType == style::BreakType_PAGE_BEFORE) + if ((xPSCursor->getPropertyValue(u"BreakType"_ustr) >>= eBreakType) && eBreakType == style::BreakType_PAGE_BEFORE) { xPSCursor->setPropertyValue(getPropertyName(PROP_PAGE_DESC_NAME), uno::Any(m_sPageStyleName)); m_aPageStyle->setPropertyValue(getPropertyName(PROP_FIRST_IS_SHARED), uno::Any(true)); @@ -1662,7 +1662,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) } else { - xPSCursor->getPropertyValue("CharHeight") >>= fCharHeight; + xPSCursor->getPropertyValue(u"CharHeight"_ustr) >>= fCharHeight; } } if (!isFound && fCharHeight <= 1.0) @@ -1672,10 +1672,10 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) xPCursor->gotoPreviousParagraph(false); uno::Reference<beans::XPropertySet> xPropertySet(xCursor, uno::UNO_QUERY_THROW); OUString aPageDescName; - if ((xPropertySet->getPropertyValue("PageDescName") >>= aPageDescName) && !aPageDescName.isEmpty()) + if ((xPropertySet->getPropertyValue(u"PageDescName"_ustr) >>= aPageDescName) && !aPageDescName.isEmpty()) { uno::Reference<beans::XPropertySet> xPageStyle(rDM_Impl.GetPageStyles()->getByName(aPageDescName), uno::UNO_QUERY); - xPageStyle->setPropertyValue("FollowStyle", uno::Any(m_sPageStyleName)); + xPageStyle->setPropertyValue(u"FollowStyle"_ustr, uno::Any(m_sPageStyleName)); m_aPageStyle->setPropertyValue(getPropertyName(PROP_FIRST_IS_SHARED), uno::Any(true)); } } @@ -1832,7 +1832,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) if (rDM_Impl.GetTextDocument()) { Insert(PROP_GRID_STANDARD_MODE, uno::Any(true)); - rDM_Impl.GetTextDocument()->setPropertyValue("DefaultPageMode", uno::Any(false)); + rDM_Impl.GetTextDocument()->setPropertyValue(u"DefaultPageMode"_ustr, uno::Any(false)); } } catch ( const uno::Exception& ) @@ -2009,10 +2009,10 @@ void SectionPropertyMap::ApplyProperties_( const uno::Reference< beans::XPropert //Temporarily store the items that are in grab bags uno::Sequence< beans::PropertyValue > vCharVals; uno::Sequence< beans::PropertyValue > vParaVals; - const beans::PropertyValue* pCharGrabBag = std::find_if( vPropVals.begin(), vPropVals.end(), NamedPropertyValue( "CharInteropGrabBag" ) ); + const beans::PropertyValue* pCharGrabBag = std::find_if( vPropVals.begin(), vPropVals.end(), NamedPropertyValue( u"CharInteropGrabBag"_ustr ) ); if ( pCharGrabBag != vPropVals.end() ) (pCharGrabBag->Value) >>= vCharVals; - const beans::PropertyValue* pParaGrabBag = std::find_if( vPropVals.begin(), vPropVals.end(), NamedPropertyValue( "ParaInteropGrabBag" ) ); + const beans::PropertyValue* pParaGrabBag = std::find_if( vPropVals.begin(), vPropVals.end(), NamedPropertyValue( u"ParaInteropGrabBag"_ustr ) ); if ( pParaGrabBag != vPropVals.end() ) (pParaGrabBag->Value) >>= vParaVals; diff --git a/sw/source/writerfilter/dmapper/SdtHelper.cxx b/sw/source/writerfilter/dmapper/SdtHelper.cxx index 5505d698150f..46c818f72015 100644 --- a/sw/source/writerfilter/dmapper/SdtHelper.cxx +++ b/sw/source/writerfilter/dmapper/SdtHelper.cxx @@ -101,7 +101,7 @@ void SdtHelper::loadPropertiesXMLs() // Initialize properties xml storage (m_xPropertiesXMLs) uno::Reference<uno::XInterface> xTemp = m_xComponentContext->getServiceManager()->createInstanceWithContext( - "com.sun.star.document.OOXMLDocumentPropertiesImporter", m_xComponentContext); + u"com.sun.star.document.OOXMLDocumentPropertiesImporter"_ustr, m_xComponentContext); uno::Reference<document::XOOXMLDocumentPropertiesImporter> xImporter(xTemp, uno::UNO_QUERY); if (!xImporter.is()) return; @@ -116,7 +116,7 @@ void SdtHelper::loadPropertiesXMLs() { auto xCorePropsStream = xImporter->getCorePropertiesStream(m_rDM_Impl.m_xDocumentStorage); m_xPropertiesXMLs.insert( - { OUString("{6C3C8BC8-F283-45AE-878A-BAB7291924A1}"), // hardcoded id for core props + { u"{6C3C8BC8-F283-45AE-878A-BAB7291924A1}"_ustr, // hardcoded id for core props xDomBuilder->parse(xCorePropsStream) }); } catch (const uno::Exception&) @@ -131,7 +131,7 @@ void SdtHelper::loadPropertiesXMLs() auto xExtPropsStream = xImporter->getExtendedPropertiesStream(m_rDM_Impl.m_xDocumentStorage); m_xPropertiesXMLs.insert( - { OUString("{6668398D-A668-4E3E-A5EB-62B293D839F1}"), // hardcoded id for extended props + { u"{6668398D-A668-4E3E-A5EB-62B293D839F1}"_ustr, // hardcoded id for extended props xDomBuilder->parse(xExtPropsStream) }); } catch (const uno::Exception&) @@ -150,8 +150,8 @@ void SdtHelper::loadPropertiesXMLs() if (aCustomXmls.getLength()) { uno::Reference<XXPathAPI> xXpathAPI = XPathAPI::create(m_xComponentContext); - xXpathAPI->registerNS("ds", - "http://schemas.openxmlformats.org/officeDocument/2006/customXml"); + xXpathAPI->registerNS( + u"ds"_ustr, u"http://schemas.openxmlformats.org/officeDocument/2006/customXml"_ustr); sal_Int32 nItem = 0; // Hereby we assume that items from getCustomXmlDomList() and getCustomXmlDomPropsList() // are matching each other: @@ -161,8 +161,8 @@ void SdtHelper::loadPropertiesXMLs() { // Retrieve storeid from properties xml OUString aStoreId; - uno::Reference<XXPathObject> xResult - = xXpathAPI->eval(aCustomXmlProps[nItem], "string(/ds:datastoreItem/@ds:itemID)"); + uno::Reference<XXPathObject> xResult = xXpathAPI->eval( + aCustomXmlProps[nItem], u"string(/ds:datastoreItem/@ds:itemID)"_ustr); if (xResult.is() && xResult->getString().getLength()) { @@ -288,7 +288,8 @@ void SdtHelper::createDropDownControl() { // create field uno::Reference<css::text::XTextField> xControlModel( - m_rDM_Impl.GetTextDocument()->createInstance("com.sun.star.text.TextField.DropDown"), + m_rDM_Impl.GetTextDocument()->createInstance( + u"com.sun.star.text.TextField.DropDown"_ustr), uno::UNO_QUERY); const auto it = std::find_if( @@ -302,8 +303,8 @@ void SdtHelper::createDropDownControl() // set properties uno::Reference<beans::XPropertySet> xPropertySet(xControlModel, uno::UNO_QUERY); - xPropertySet->setPropertyValue("SelectedItem", uno::Any(aDefaultText)); - xPropertySet->setPropertyValue("Items", + xPropertySet->setPropertyValue(u"SelectedItem"_ustr, uno::Any(aDefaultText)); + xPropertySet->setPropertyValue(u"Items"_ustr, uno::Any(comphelper::containerToSequence(m_aDropDownItems))); // add it into document @@ -315,14 +316,15 @@ void SdtHelper::createDropDownControl() { // create control uno::Reference<awt::XControlModel> xControlModel( - m_rDM_Impl.GetTextDocument()->createInstance("com.sun.star.form.component.ComboBox"), + m_rDM_Impl.GetTextDocument()->createInstance( + u"com.sun.star.form.component.ComboBox"_ustr), uno::UNO_QUERY); // set properties uno::Reference<beans::XPropertySet> xPropertySet(xControlModel, uno::UNO_QUERY); - xPropertySet->setPropertyValue("DefaultText", uno::Any(aDefaultText)); - xPropertySet->setPropertyValue("Dropdown", uno::Any(true)); - xPropertySet->setPropertyValue("StringItemList", + xPropertySet->setPropertyValue(u"DefaultText"_ustr, uno::Any(aDefaultText)); + xPropertySet->setPropertyValue(u"Dropdown"_ustr, uno::Any(true)); + xPropertySet->setPropertyValue(u"StringItemList"_ustr, uno::Any(comphelper::containerToSequence(m_aDropDownItems))); // add it into document @@ -430,7 +432,7 @@ void SdtHelper::createPlainTextControl() } } - xContentControl->setPropertyValue("PlainText", uno::Any(true)); + xContentControl->setPropertyValue(u"PlainText"_ustr, uno::Any(true)); xText->insertTextContent(xCrsr, xContentControl, /*bAbsorb=*/true); @@ -523,13 +525,13 @@ void SdtHelper::createControlShape(awt::Size aSize, const uno::Sequence<beans::PropertyValue>& rGrabBag) { uno::Reference<drawing::XControlShape> xControlShape( - m_rDM_Impl.GetTextDocument()->createInstance("com.sun.star.drawing.ControlShape"), + m_rDM_Impl.GetTextDocument()->createInstance(u"com.sun.star.drawing.ControlShape"_ustr), uno::UNO_QUERY); xControlShape->setSize(aSize); xControlShape->setControl(xControlModel); uno::Reference<beans::XPropertySet> xPropertySet(xControlShape, uno::UNO_QUERY); - xPropertySet->setPropertyValue("VertOrient", uno::Any(text::VertOrientation::CENTER)); + xPropertySet->setPropertyValue(u"VertOrient"_ustr, uno::Any(text::VertOrientation::CENTER)); if (rGrabBag.hasElements()) xPropertySet->setPropertyValue(UNO_NAME_MISC_OBJ_INTEROPGRABBAG, uno::Any(rGrabBag)); diff --git a/sw/source/writerfilter/dmapper/SettingsTable.cxx b/sw/source/writerfilter/dmapper/SettingsTable.cxx index 57f6566c2135..4003eeed90d2 100644 --- a/sw/source/writerfilter/dmapper/SettingsTable.cxx +++ b/sw/source/writerfilter/dmapper/SettingsTable.cxx @@ -150,8 +150,8 @@ struct SettingsTable_Impl , m_bMirrorMargin(false) , m_bDoNotExpandShiftReturn(false) , m_bDisplayBackgroundShape(false) - , m_sDecimalSymbol(".") - , m_sListSeparator(",") + , m_sDecimalSymbol(u"."_ustr) + , m_sListSeparator(u","_ustr) , m_pThemeFontLangProps(3) , m_pCurrentCompatSetting(3) {} @@ -193,15 +193,15 @@ void SettingsTable::lcl_attribute(Id nName, Value & val) break; case NS_ooxml::LN_CT_Language_val: m_pImpl->m_pThemeFontLangProps.getArray()[0] - = comphelper::makePropertyValue("val", sStringValue); + = comphelper::makePropertyValue(u"val"_ustr, sStringValue); break; case NS_ooxml::LN_CT_Language_eastAsia: m_pImpl->m_pThemeFontLangProps.getArray()[1] - = comphelper::makePropertyValue("eastAsia", sStringValue); + = comphelper::makePropertyValue(u"eastAsia"_ustr, sStringValue); break; case NS_ooxml::LN_CT_Language_bidi: m_pImpl->m_pThemeFontLangProps.getArray()[2] - = comphelper::makePropertyValue("bidi", sStringValue); + = comphelper::makePropertyValue(u"bidi"_ustr, sStringValue); break; case NS_ooxml::LN_CT_View_val: m_pImpl->m_nView = nIntValue; @@ -215,17 +215,17 @@ void SettingsTable::lcl_attribute(Id nName, Value & val) case NS_ooxml::LN_CT_CompatSetting_name: m_pImpl->m_aCurrentCompatSettingName = sStringValue; m_pImpl->m_pCurrentCompatSetting.getArray()[0] - = comphelper::makePropertyValue("name", sStringValue); + = comphelper::makePropertyValue(u"name"_ustr, sStringValue); break; case NS_ooxml::LN_CT_CompatSetting_uri: m_pImpl->m_aCurrentCompatSettingUri = sStringValue; m_pImpl->m_pCurrentCompatSetting.getArray()[1] - = comphelper::makePropertyValue("uri", sStringValue); + = comphelper::makePropertyValue(u"uri"_ustr, sStringValue); break; case NS_ooxml::LN_CT_CompatSetting_val: m_pImpl->m_aCurrentCompatSettingValue = sStringValue; m_pImpl->m_pCurrentCompatSetting.getArray()[2] - = comphelper::makePropertyValue("val", sStringValue); + = comphelper::makePropertyValue(u"val"_ustr, sStringValue); break; case NS_ooxml::LN_CT_TrackChangesView_insDel: m_pImpl->m_bShowInsDelChanges = (nIntValue != 0); @@ -586,9 +586,9 @@ uno::Sequence<beans::PropertyValue> SettingsTable::GetCompatSettings() const { // the default value for an undefined compatibilityMode is 12 (Word 2007) 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("12")) } //12: Use word processing features specified in ECMA-376. This is the default. + { "name", uno::Any(u"compatibilityMode"_ustr) }, + { "uri", uno::Any(u"http://schemas.microsoft.com/office/word"_ustr) }, + { "val", uno::Any(u"12"_ustr) } //12: Use word processing features specified in ECMA-376. This is the default. })); beans::PropertyValue aValue; @@ -628,21 +628,21 @@ void SettingsTable::ApplyProperties(rtl::Reference<SwXTextDocument> const& xDoc) rtl::Reference<SwXDocumentSettings> xDocumentSettings(xDoc->createDocumentSettings()); // Shared between DOCX and RTF, unconditional flags. - xDocumentSettings->setPropertyValue("TableRowKeep", uno::Any(true)); - xDocumentSettings->setPropertyValue("AddVerticalFrameOffsets", uno::Any(true)); + xDocumentSettings->setPropertyValue(u"TableRowKeep"_ustr, uno::Any(true)); + xDocumentSettings->setPropertyValue(u"AddVerticalFrameOffsets"_ustr, uno::Any(true)); if (GetWordCompatibilityMode() <= 14) { - xDocumentSettings->setPropertyValue("MsWordCompMinLineHeightByFly", uno::Any(true)); - xDocumentSettings->setPropertyValue("TabOverMargin", uno::Any(true)); + xDocumentSettings->setPropertyValue(u"MsWordCompMinLineHeightByFly"_ustr, uno::Any(true)); + xDocumentSettings->setPropertyValue(u"TabOverMargin"_ustr, uno::Any(true)); } // Show changes value bool bHideChanges = !m_pImpl->m_bShowInsDelChanges || !m_pImpl->m_bShowMarkupChanges; - xDoc->setPropertyValue("ShowChanges", uno::Any( !bHideChanges || m_pImpl->m_bShowFormattingChanges ) ); + xDoc->setPropertyValue(u"ShowChanges"_ustr, uno::Any( !bHideChanges || m_pImpl->m_bShowFormattingChanges ) ); // Record changes value - xDoc->setPropertyValue("RecordChanges", uno::Any( m_pImpl->m_bRecordChanges ) ); + xDoc->setPropertyValue(u"RecordChanges"_ustr, uno::Any( m_pImpl->m_bRecordChanges ) ); // Password protected Record changes if (m_pImpl->m_bRecordChanges && m_pImpl->m_pDocumentProtection->getRedlineProtection() && m_pImpl->m_pDocumentProtection->getEnforcement()) @@ -650,7 +650,7 @@ void SettingsTable::ApplyProperties(rtl::Reference<SwXTextDocument> const& xDoc) // use dummy protection key to forbid disabling of Record changes without a notice // (extending the recent GrabBag support) TODO support password verification... css::uno::Sequence<sal_Int8> aDummyKey { 1 }; - xDoc->setPropertyValue("RedlineProtectionKey", uno::Any( aDummyKey )); + xDoc->setPropertyValue(u"RedlineProtectionKey"_ustr, uno::Any( aDummyKey )); } // Create or overwrite DocVars based on found in settings @@ -669,10 +669,10 @@ void SettingsTable::ApplyProperties(rtl::Reference<SwXTextDocument> const& xDoc) } else { - xMaster.set(xDoc->createInstance("com.sun.star.text.FieldMaster.User"), uno::UNO_QUERY_THROW); + xMaster.set(xDoc->createInstance(u"com.sun.star.text.FieldMaster.User"_ustr), uno::UNO_QUERY_THROW); xMaster->setPropertyValue(getPropertyName(PROP_NAME), uno::Any(docVar.first)); uno::Reference<text::XDependentTextField> xField( - xDoc->createInstance("com.sun.star.text.TextField.User"), + xDoc->createInstance(u"com.sun.star.text.TextField.User"_ustr), uno::UNO_QUERY); xField->attachTextFieldMaster(xMaster); } @@ -684,12 +684,12 @@ void SettingsTable::ApplyProperties(rtl::Reference<SwXTextDocument> const& xDoc) if (m_pImpl->m_bDoNotBreakWrappedTables) { // Map <w:doNotBreakWrappedTables> to the DoNotBreakWrappedTables compat flag. - xDocumentSettings->setPropertyValue("DoNotBreakWrappedTables", uno::Any(true)); + xDocumentSettings->setPropertyValue(u"DoNotBreakWrappedTables"_ustr, uno::Any(true)); } if (m_pImpl->m_bAllowTextAfterFloatingTableBreak) { - xDocumentSettings->setPropertyValue("AllowTextAfterFloatingTableBreak", uno::Any(true)); + xDocumentSettings->setPropertyValue(u"AllowTextAfterFloatingTableBreak"_ustr, uno::Any(true)); } // Auto hyphenation: turns on hyphenation by default, <w:suppressAutoHyphens/> may still disable it at a paragraph level. @@ -698,36 +698,36 @@ void SettingsTable::ApplyProperties(rtl::Reference<SwXTextDocument> const& xDoc) return; uno::Reference<container::XNameAccess> xStyleFamilies = xDoc->getStyleFamilies(); - uno::Reference<container::XNameContainer> xParagraphStyles = xStyleFamilies->getByName("ParagraphStyles").get< uno::Reference<container::XNameContainer> >(); - uno::Reference<style::XStyle> xDefault = xParagraphStyles->getByName("Standard").get< uno::Reference<style::XStyle> >(); + uno::Reference<container::XNameContainer> xParagraphStyles = xStyleFamilies->getByName(u"ParagraphStyles"_ustr).get< uno::Reference<container::XNameContainer> >(); + uno::Reference<style::XStyle> xDefault = xParagraphStyles->getByName(u"Standard"_ustr).get< uno::Reference<style::XStyle> >(); uno::Reference<beans::XPropertyState> xPropertyState(xDefault, uno::UNO_QUERY); - if (m_pImpl->m_bAutoHyphenation && lcl_isDefault(xPropertyState, "ParaIsHyphenation")) + if (m_pImpl->m_bAutoHyphenation && lcl_isDefault(xPropertyState, u"ParaIsHyphenation"_ustr)) { uno::Reference<beans::XPropertySet> xPropertySet(xDefault, uno::UNO_QUERY); - xPropertySet->setPropertyValue("ParaIsHyphenation", uno::Any(true)); + xPropertySet->setPropertyValue(u"ParaIsHyphenation"_ustr, uno::Any(true)); } if (m_pImpl->m_bNoHyphenateCaps) { uno::Reference<beans::XPropertySet> xPropertySet(xDefault, uno::UNO_QUERY); - xPropertySet->setPropertyValue("ParaHyphenationNoCaps", uno::Any(true)); + xPropertySet->setPropertyValue(u"ParaHyphenationNoCaps"_ustr, uno::Any(true)); } if (m_pImpl->m_nHyphenationZone) { uno::Reference<beans::XPropertySet> xPropertySet(xDefault, uno::UNO_QUERY); - xPropertySet->setPropertyValue("ParaHyphenationZone", uno::Any(GetHyphenationZone())); + xPropertySet->setPropertyValue(u"ParaHyphenationZone"_ustr, uno::Any(GetHyphenationZone())); } - if (m_pImpl->m_bWidowControl && lcl_isDefault(xPropertyState, "ParaWidows") && lcl_isDefault(xPropertyState, "ParaOrphans")) + if (m_pImpl->m_bWidowControl && lcl_isDefault(xPropertyState, u"ParaWidows"_ustr) && lcl_isDefault(xPropertyState, u"ParaOrphans"_ustr)) { uno::Reference<beans::XPropertySet> xPropertySet(xDefault, uno::UNO_QUERY); uno::Any aAny(static_cast<sal_Int8>(2)); - xPropertySet->setPropertyValue("ParaWidows", aAny); - xPropertySet->setPropertyValue("ParaOrphans", aAny); + xPropertySet->setPropertyValue(u"ParaWidows"_ustr, aAny); + xPropertySet->setPropertyValue(u"ParaOrphans"_ustr, aAny); } if ( GetHyphenationKeep() ) { uno::Reference<beans::XPropertySet> xPropertySet(xDefault, uno::UNO_QUERY); - xPropertySet->setPropertyValue("ParaHyphenationKeep", uno::Any(true)); - xPropertySet->setPropertyValue("ParaHyphenationKeepType", uno::Any(text::ParagraphHyphenationKeepType::COLUMN)); + xPropertySet->setPropertyValue(u"ParaHyphenationKeep"_ustr, uno::Any(true)); + xPropertySet->setPropertyValue(u"ParaHyphenationKeepType"_ustr, uno::Any(text::ParagraphHyphenationKeepType::COLUMN)); } } diff --git a/sw/source/writerfilter/dmapper/StyleSheetTable.cxx b/sw/source/writerfilter/dmapper/StyleSheetTable.cxx index 6ee04ee59fa6..29f50ecbcf66 100644 --- a/sw/source/writerfilter/dmapper/StyleSheetTable.cxx +++ b/sw/source/writerfilter/dmapper/StyleSheetTable.cxx @@ -305,7 +305,7 @@ StyleSheetTable_Impl::StyleSheetTable_Impl(DomainMapper& rDMapper, m_xTextDocument(std::move( xTextDocument )), m_pDefaultParaProps(new PropertyMap), m_pDefaultCharProps(new PropertyMap), - m_sDefaultParaStyleName("Normal"), + m_sDefaultParaStyleName(u"Normal"_ustr), m_bHasImportedDefaultParaProps(false), m_bIsNewDoc(bIsNewDoc) { @@ -512,22 +512,22 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val) case NS_ooxml::LN_CT_TblWidth_type: break; case NS_ooxml::LN_CT_LatentStyles_defQFormat: - m_pImpl->AppendLatentStyleProperty("defQFormat", val); + m_pImpl->AppendLatentStyleProperty(u"defQFormat"_ustr, val); break; case NS_ooxml::LN_CT_LatentStyles_defUnhideWhenUsed: - m_pImpl->AppendLatentStyleProperty("defUnhideWhenUsed", val); + m_pImpl->AppendLatentStyleProperty(u"defUnhideWhenUsed"_ustr, val); break; case NS_ooxml::LN_CT_LatentStyles_defSemiHidden: - m_pImpl->AppendLatentStyleProperty("defSemiHidden", val); + m_pImpl->AppendLatentStyleProperty(u"defSemiHidden"_ustr, val); break; case NS_ooxml::LN_CT_LatentStyles_count: - m_pImpl->AppendLatentStyleProperty("count", val); + m_pImpl->AppendLatentStyleProperty(u"count"_ustr, val); break; case NS_ooxml::LN_CT_LatentStyles_defUIPriority: - m_pImpl->AppendLatentStyleProperty("defUIPriority", val); + m_pImpl->AppendLatentStyleProperty(u"defUIPriority"_ustr, val); break; case NS_ooxml::LN_CT_LatentStyles_defLockedState: - m_pImpl->AppendLatentStyleProperty("defLockedState", val); + m_pImpl->AppendLatentStyleProperty(u"defLockedState"_ustr, val); break; default: { @@ -596,7 +596,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm) pProperties->resolve(*pTblStylePrHandler); StyleSheetEntry* pEntry = m_pImpl->m_pCurrentEntry.get(); TableStyleSheetEntry& rTableEntry = dynamic_cast<TableStyleSheetEntry&>(*pEntry); - rTableEntry.AppendInteropGrabBag(pTblStylePrHandler->getInteropGrabBag("tcPr")); + rTableEntry.AppendInteropGrabBag(pTblStylePrHandler->getInteropGrabBag(u"tcPr"_ustr)); // This is a <w:tcPr> directly under <w:style>, so it affects the whole table. rTableEntry.m_pProperties->InsertProps(pTblStylePrHandler->getProperties()); @@ -681,13 +681,13 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm) if (nSprmId == NS_ooxml::LN_CT_Style_tblPr) { if (pTableEntry != nullptr) - pTableEntry->AppendInteropGrabBag(pTblStylePrHandler->getInteropGrabBag("tblPr")); + pTableEntry->AppendInteropGrabBag(pTblStylePrHandler->getInteropGrabBag(u"tblPr"_ustr)); } else if (nSprmId == NS_ooxml::LN_CT_Style_tblStylePr) { - pTblStylePrHandler->appendInteropGrabBag("type", pTblStylePrHandler->getTypeString()); + pTblStylePrHandler->appendInteropGrabBag(u"type"_ustr, pTblStylePrHandler->getTypeString()); if (pTableEntry != nullptr) - pTableEntry->AppendInteropGrabBag(pTblStylePrHandler->getInteropGrabBag("tblStylePr")); + pTableEntry->AppendInteropGrabBag(pTblStylePrHandler->getInteropGrabBag(u"tblStylePr"_ustr)); } } break; @@ -779,9 +779,9 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm) if (m_pImpl->m_pCurrentEntry->m_nStyleTypeCode == STYLE_TYPE_TABLE) { if (nSprmId == NS_ooxml::LN_CT_Style_pPr) - m_pImpl->m_rDMapper.enableInteropGrabBag("pPr"); + m_pImpl->m_rDMapper.enableInteropGrabBag(u"pPr"_ustr); else if (nSprmId == NS_ooxml::LN_CT_Style_rPr) - m_pImpl->m_rDMapper.enableInteropGrabBag("rPr"); + m_pImpl->m_rDMapper.enableInteropGrabBag(u"rPr"_ustr); } m_pImpl->m_rDMapper.sprmWithProps( rSprm, pProps ); if (m_pImpl->m_pCurrentEntry->m_nStyleTypeCode == STYLE_TYPE_TABLE) @@ -843,12 +843,12 @@ void StyleSheetTable::lcl_entry(const writerfilter::Reference<Properties>::Point // We can put all latent style info directly to the document interop // grab bag, as we can be sure that only a single style entry has // latent style info. - auto aGrabBag = comphelper::sequenceToContainer< std::vector<beans::PropertyValue> >(m_pImpl->m_xTextDocument->getPropertyValue("InteropGrabBag").get< uno::Sequence<beans::PropertyValue> >()); + auto aGrabBag = comphelper::sequenceToContainer< std::vector<beans::PropertyValue> >(m_pImpl->m_xTextDocument->getPropertyValue(u"InteropGrabBag"_ustr).get< uno::Sequence<beans::PropertyValue> >()); beans::PropertyValue aValue; aValue.Name = "latentStyles"; aValue.Value <<= aLatentStyles; aGrabBag.push_back(aValue); - m_pImpl->m_xTextDocument->setPropertyValue("InteropGrabBag", uno::Any(comphelper::containerToSequence(aGrabBag))); + m_pImpl->m_xTextDocument->setPropertyValue(u"InteropGrabBag"_ustr, uno::Any(comphelper::containerToSequence(aGrabBag))); } m_pImpl->m_pCurrentEntry = StyleSheetEntryPtr(); @@ -1127,7 +1127,7 @@ void StyleSheetTable::ApplyStyleSheetsImpl(const FontTablePtr& rFontTable, std:: xStyleFamilies->getByName(getPropertyName( PROP_CHARACTER_STYLES )) >>= xCharStyles; xStyleFamilies->getByName(getPropertyName( PROP_PARAGRAPH_STYLES )) >>= xParaStyles; - xStyleFamilies->getByName("NumberingStyles") >>= xNumberingStyles; + xStyleFamilies->getByName(u"NumberingStyles"_ustr) >>= xNumberingStyles; if(xCharStyles.is() && xParaStyles.is()) { std::vector< ::std::pair<OUString, uno::Reference<style::XStyle>> > aMissingParent; @@ -1166,7 +1166,7 @@ void StyleSheetTable::ApplyStyleSheetsImpl(const FontTablePtr& rFontTable, std:: && pEntry->m_sBaseStyleIdentifier.isEmpty() //imported style has no inheritance && !xStyle->getParentStyle().isEmpty() ) //built-in style has a default inheritance { - xStyle->setParentStyle( "" ); + xStyle->setParentStyle( u""_ustr ); } } } @@ -1192,16 +1192,16 @@ void StyleSheetTable::ApplyStyleSheetsImpl(const FontTablePtr& rFontTable, std:: // No properties? Word default is 'none', Writer one is 'arabic', handle this. uno::Reference<beans::XPropertySet> xPropertySet(xStyle, uno::UNO_QUERY_THROW); uno::Reference<container::XIndexReplace> xNumberingRules; - xPropertySet->getPropertyValue("NumberingRules") >>= xNumberingRules; + xPropertySet->getPropertyValue(u"NumberingRules"_ustr) >>= xNumberingRules; uno::Reference<container::XIndexAccess> xIndexAccess(xNumberingRules, uno::UNO_QUERY_THROW); for (sal_Int32 i = 0; i < xIndexAccess->getCount(); ++i) { uno::Sequence< beans::PropertyValue > aLvlProps{ comphelper::makePropertyValue( - "NumberingType", style::NumberingType::NUMBER_NONE) + u"NumberingType"_ustr, style::NumberingType::NUMBER_NONE) }; xNumberingRules->replaceByIndex(i, uno::Any(aLvlProps)); - xPropertySet->setPropertyValue("NumberingRules", uno::Any(xNumberingRules)); + xPropertySet->setPropertyValue(u"NumberingRules"_ustr, uno::Any(xNumberingRules)); } } } @@ -1387,9 +1387,9 @@ void StyleSheetTable::ApplyStyleSheetsImpl(const FontTablePtr& rFontTable, std:: { uno::Reference< style::XStyle > xCopyStyle; if( pEntry->m_sStyleName.equalsIgnoreAsciiCase("footnote reference") ) - xStyles->getByName( "Footnote anchor" ) >>= xCopyStyle; + xStyles->getByName( u"Footnote anchor"_ustr ) >>= xCopyStyle; else - xStyles->getByName( "Endnote anchor" ) >>= xCopyStyle; + xStyles->getByName( u"Endnote anchor"_ustr ) >>= xCopyStyle; xMultiPropertySet.set( xCopyStyle, uno::UNO_QUERY_THROW); xMultiPropertySet->setPropertyValues( aSortedPropVals.getNames(), aSortedPropVals.getValues() ); @@ -1398,7 +1398,7 @@ void StyleSheetTable::ApplyStyleSheetsImpl(const FontTablePtr& rFontTable, std:: catch( const lang::WrappedTargetException& rWrapped) { #ifdef DBG_UTIL - OUString aMessage("StyleSheetTable::ApplyStyleSheets: Some style properties could not be set"); + OUString aMessage(u"StyleSheetTable::ApplyStyleSheets: Some style properties could not be set"_ustr); beans::UnknownPropertyException aUnknownPropertyException; if (rWrapped.TargetException >>= aUnknownPropertyException) @@ -1428,12 +1428,12 @@ void StyleSheetTable::ApplyStyleSheetsImpl(const FontTablePtr& rFontTable, std:: uno::Reference<beans::XPropertySet> xPropertySet(xStyle, uno::UNO_QUERY); if (aGrabBag.hasElements()) { - xPropertySet->setPropertyValue("StyleInteropGrabBag", uno::Any(aGrabBag)); + xPropertySet->setPropertyValue(u"StyleInteropGrabBag"_ustr, uno::Any(aGrabBag)); } // Only paragraph styles support automatic updates. if (pEntry->m_bAutoRedefine && bParaStyle) - xPropertySet->setPropertyValue("IsAutoUpdate", uno::Any(true)); + xPropertySet->setPropertyValue(u"IsAutoUpdate"_ustr, uno::Any(true)); } else if(pEntry->m_nStyleTypeCode == STYLE_TYPE_TABLE) { @@ -1458,7 +1458,7 @@ void StyleSheetTable::ApplyStyleSheetsImpl(const FontTablePtr& rFontTable, std:: try { uno::Reference<beans::XPropertySet> xPropertySet(iter.second, uno::UNO_QUERY); - xPropertySet->setPropertyValue( "FollowStyle", uno::Any(iter.first) ); + xPropertySet->setPropertyValue( u"FollowStyle"_ustr, uno::Any(iter.first) ); } catch( uno::Exception & ) {} } @@ -1470,7 +1470,7 @@ void StyleSheetTable::ApplyStyleSheetsImpl(const FontTablePtr& rFontTable, std:: { uno::Reference<beans::XPropertySet> xPropertySet(rLinked.second, uno::UNO_QUERY); - xPropertySet->setPropertyValue("LinkStyle", uno::Any(rLinked.first)); + xPropertySet->setPropertyValue(u"LinkStyle"_ustr, uno::Any(rLinked.first)); } catch (uno::Exception&) { @@ -1483,13 +1483,13 @@ void StyleSheetTable::ApplyStyleSheetsImpl(const FontTablePtr& rFontTable, std:: if (!aTableStylesVec.empty()) { // If we had any table styles, add a new document-level InteropGrabBag entry for them. - uno::Any aAny = m_pImpl->m_xTextDocument->getPropertyValue("InteropGrabBag"); + uno::Any aAny = m_pImpl->m_xTextDocument->getPropertyValue(u"InteropGrabBag"_ustr); auto aGrabBag = comphelper::sequenceToContainer< std::vector<beans::PropertyValue> >(aAny.get< uno::Sequence<beans::PropertyValue> >()); beans::PropertyValue aValue; aValue.Name = "tableStyles"; aValue.Value <<= comphelper::containerToSequence(aTableStylesVec); aGrabBag.push_back(aValue); - m_pImpl->m_xTextDocument->setPropertyValue("InteropGrabBag", uno::Any(comphelper::containerToSequence(aGrabBag))); + m_pImpl->m_xTextDocument->setPropertyValue(u"InteropGrabBag"_ustr, uno::Any(comphelper::containerToSequence(aGrabBag))); } } } @@ -2081,10 +2081,10 @@ void StyleSheetTable::applyDefaults(bool bParaProperties) uno::Reference<container::XNameAccess> xStyleFamilies = m_pImpl->m_xTextDocument->getStyleFamilies(); uno::Reference<container::XNameAccess> xParagraphStyles; - xStyleFamilies->getByName("ParagraphStyles") >>= xParagraphStyles; + xStyleFamilies->getByName(u"ParagraphStyles"_ustr) >>= xParagraphStyles; uno::Reference<beans::XPropertySet> xDefault; // This is the built-in default style that every style inherits from - xParagraphStyles->getByName("Paragraph style") >>= xDefault; + xParagraphStyles->getByName(u"Paragraph style"_ustr) >>= xDefault; const uno::Sequence< beans::PropertyValue > aPropValues = m_pImpl->m_pDefaultParaProps->GetPropertyValues(); for( const auto& rPropValue : aPropValues ) @@ -2105,7 +2105,7 @@ void StyleSheetTable::applyDefaults(bool bParaProperties) // but that is valid only if DocDefaults_rPrDefault is omitted. // Now that DocDefaults_rPrDefault is known, the defaults should be reset to Times New Roman/10pt. if ( m_pImpl->m_rDMapper.IsOOXMLImport() ) - m_pImpl->m_xTextDefaults->setPropertyValue( getPropertyName(PROP_CHAR_FONT_NAME), css::uno::Any(OUString("Times New Roman")) ); + m_pImpl->m_xTextDefaults->setPropertyValue( getPropertyName(PROP_CHAR_FONT_NAME), css::uno::Any(u"Times New Roman"_ustr) ); const uno::Sequence< beans::PropertyValue > aPropValues = m_pImpl->m_pDefaultCharProps->GetPropertyValues(); for( const auto& rPropValue : aPropValues ) diff --git a/sw/source/writerfilter/dmapper/TDefTableHandler.cxx b/sw/source/writerfilter/dmapper/TDefTableHandler.cxx index 9626beb595bc..e676f2a74b38 100644 --- a/sw/source/writerfilter/dmapper/TDefTableHandler.cxx +++ b/sw/source/writerfilter/dmapper/TDefTableHandler.cxx @@ -47,197 +47,197 @@ OUString TDefTableHandler::getBorderTypeString(sal_Int32 nType) { switch (nType) { - case NS_ooxml::LN_Value_ST_Border_nil: return "nil"; - case NS_ooxml::LN_Value_ST_Border_none: return "none"; - case NS_ooxml::LN_Value_ST_Border_single: return "single"; - case NS_ooxml::LN_Value_ST_Border_thick: return "thick"; - case NS_ooxml::LN_Value_ST_Border_double: return "double"; - case NS_ooxml::LN_Value_ST_Border_dotted: return "dotted"; - case NS_ooxml::LN_Value_ST_Border_dashed: return "dashed"; - case NS_ooxml::LN_Value_ST_Border_dotDash: return "dotDash"; - case NS_ooxml::LN_Value_ST_Border_dotDotDash: return "dotDotDash"; - case NS_ooxml::LN_Value_ST_Border_triple: return "triple"; - case NS_ooxml::LN_Value_ST_Border_thinThickSmallGap: return "thinThickSmallGap"; - case NS_ooxml::LN_Value_ST_Border_thickThinSmallGap: return "thickThinSmallGap"; - case NS_ooxml::LN_Value_ST_Border_thinThickThinSmallGap: return "thinThickThinSmallGap"; - case NS_ooxml::LN_Value_ST_Border_thinThickMediumGap: return "thinThickMediumGap"; - case NS_ooxml::LN_Value_ST_Border_thickThinMediumGap: return "thickThinMediumGap"; - case NS_ooxml::LN_Value_ST_Border_thinThickThinMediumGap: return "thinThickThinMediumGap"; - case NS_ooxml::LN_Value_ST_Border_thinThickLargeGap: return "thinThickLargeGap"; - case NS_ooxml::LN_Value_ST_Border_thickThinLargeGap: return "thickThinLargeGap"; - case NS_ooxml::LN_Value_ST_Border_thinThickThinLargeGap: return "thinThickThinLargeGap"; - case NS_ooxml::LN_Value_ST_Border_wave: return "wave"; - case NS_ooxml::LN_Value_ST_Border_doubleWave: return "doubleWave"; - case NS_ooxml::LN_Value_ST_Border_dashSmallGap: return "dashSmallGap"; - case NS_ooxml::LN_Value_ST_Border_dashDotStroked: return "dashDotStroked"; - case NS_ooxml::LN_Value_ST_Border_threeDEmboss: return "threeDEmboss"; - case NS_ooxml::LN_Value_ST_Border_threeDEngrave: return "threeDEngrave"; - case NS_ooxml::LN_Value_ST_Border_outset: return "outset"; - case NS_ooxml::LN_Value_ST_Border_inset: return "inset"; - case NS_ooxml::LN_Value_ST_Border_apples: return "apples"; - case NS_ooxml::LN_Value_ST_Border_archedScallops: return "archedScallops"; - case NS_ooxml::LN_Value_ST_Border_babyPacifier: return "babyPacifier"; - case NS_ooxml::LN_Value_ST_Border_babyRattle: return "babyRattle"; - case NS_ooxml::LN_Value_ST_Border_balloons3Colors: return "balloons3Colors"; - case NS_ooxml::LN_Value_ST_Border_balloonsHotAir: return "balloonsHotAir"; - case NS_ooxml::LN_Value_ST_Border_basicBlackDashes: return "basicBlackDashes"; - case NS_ooxml::LN_Value_ST_Border_basicBlackDots: return "basicBlackDots"; - case NS_ooxml::LN_Value_ST_Border_basicBlackSquares: return "basicBlackSquares"; - case NS_ooxml::LN_Value_ST_Border_basicThinLines: return "basicThinLines"; - case NS_ooxml::LN_Value_ST_Border_basicWhiteDashes: return "basicWhiteDashes"; - case NS_ooxml::LN_Value_ST_Border_basicWhiteDots: return "basicWhiteDots"; - case NS_ooxml::LN_Value_ST_Border_basicWhiteSquares: return "basicWhiteSquares"; - case NS_ooxml::LN_Value_ST_Border_basicWideInline: return "basicWideInline"; - case NS_ooxml::LN_Value_ST_Border_basicWideMidline: return "basicWideMidline"; - case NS_ooxml::LN_Value_ST_Border_basicWideOutline: return "basicWideOutline"; - case NS_ooxml::LN_Value_ST_Border_bats: return "bats"; - case NS_ooxml::LN_Value_ST_Border_birds: return "birds"; - case NS_ooxml::LN_Value_ST_Border_birdsFlight: return "birdsFlight"; - case NS_ooxml::LN_Value_ST_Border_cabins: return "cabins"; - case NS_ooxml::LN_Value_ST_Border_cakeSlice: return "cakeSlice"; - case NS_ooxml::LN_Value_ST_Border_candyCorn: return "candyCorn"; - case NS_ooxml::LN_Value_ST_Border_celticKnotwork: return "celticKnotwork"; - case NS_ooxml::LN_Value_ST_Border_certificateBanner: return "certificateBanner"; - case NS_ooxml::LN_Value_ST_Border_chainLink: return "chainLink"; - case NS_ooxml::LN_Value_ST_Border_champagneBottle: return "champagneBottle"; - case NS_ooxml::LN_Value_ST_Border_checkedBarBlack: return "checkedBarBlack"; - case NS_ooxml::LN_Value_ST_Border_checkedBarColor: return "checkedBarColor"; - case NS_ooxml::LN_Value_ST_Border_checkered: return "checkered"; - case NS_ooxml::LN_Value_ST_Border_christmasTree: return "christmasTree"; - case NS_ooxml::LN_Value_ST_Border_circlesLines: return "circlesLines"; - case NS_ooxml::LN_Value_ST_Border_circlesRectangles: return "circlesRectangles"; - case NS_ooxml::LN_Value_ST_Border_classicalWave: return "classicalWave"; - case NS_ooxml::LN_Value_ST_Border_clocks: return "clocks"; - case NS_ooxml::LN_Value_ST_Border_compass: return "compass"; - case NS_ooxml::LN_Value_ST_Border_confetti: return "confetti"; - case NS_ooxml::LN_Value_ST_Border_confettiGrays: return "confettiGrays"; - case NS_ooxml::LN_Value_ST_Border_confettiOutline: return "confettiOutline"; - case NS_ooxml::LN_Value_ST_Border_confettiStreamers: return "confettiStreamers"; - case NS_ooxml::LN_Value_ST_Border_confettiWhite: return "confettiWhite"; - case NS_ooxml::LN_Value_ST_Border_cornerTriangles: return "cornerTriangles"; - case NS_ooxml::LN_Value_ST_Border_couponCutoutDashes: return "couponCutoutDashes"; - case NS_ooxml::LN_Value_ST_Border_couponCutoutDots: return "couponCutoutDots"; - case NS_ooxml::LN_Value_ST_Border_crazyMaze: return "crazyMaze"; - case NS_ooxml::LN_Value_ST_Border_creaturesButterfly: return "creaturesButterfly"; - case NS_ooxml::LN_Value_ST_Border_creaturesFish: return "creaturesFish"; - case NS_ooxml::LN_Value_ST_Border_creaturesInsects: return "creaturesInsects"; - case NS_ooxml::LN_Value_ST_Border_creaturesLadyBug: return "creaturesLadyBug"; - case NS_ooxml::LN_Value_ST_Border_crossStitch: return "crossStitch"; - case NS_ooxml::LN_Value_ST_Border_cup: return "cup"; - case NS_ooxml::LN_Value_ST_Border_decoArch: return "decoArch"; - case NS_ooxml::LN_Value_ST_Border_decoArchColor: return "decoArchColor"; - case NS_ooxml::LN_Value_ST_Border_decoBlocks: return "decoBlocks"; - case NS_ooxml::LN_Value_ST_Border_diamondsGray: return "diamondsGray"; - case NS_ooxml::LN_Value_ST_Border_doubleD: return "doubleD"; - case NS_ooxml::LN_Value_ST_Border_doubleDiamonds: return "doubleDiamonds"; - case NS_ooxml::LN_Value_ST_Border_earth1: return "earth1"; - case NS_ooxml::LN_Value_ST_Border_earth2: return "earth2"; - case NS_ooxml::LN_Value_ST_Border_eclipsingSquares1: return "eclipsingSquares1"; - case NS_ooxml::LN_Value_ST_Border_eclipsingSquares2: return "eclipsingSquares2"; - case NS_ooxml::LN_Value_ST_Border_eggsBlack: return "eggsBlack"; - case NS_ooxml::LN_Value_ST_Border_fans: return "fans"; - case NS_ooxml::LN_Value_ST_Border_film: return "film"; - case NS_ooxml::LN_Value_ST_Border_firecrackers: return "firecrackers"; - case NS_ooxml::LN_Value_ST_Border_flowersBlockPrint: return "flowersBlockPrint"; - case NS_ooxml::LN_Value_ST_Border_flowersDaisies: return "flowersDaisies"; - case NS_ooxml::LN_Value_ST_Border_flowersModern1: return "flowersModern1"; - case NS_ooxml::LN_Value_ST_Border_flowersModern2: return "flowersModern2"; - case NS_ooxml::LN_Value_ST_Border_flowersPansy: return "flowersPansy"; - case NS_ooxml::LN_Value_ST_Border_flowersRedRose: return "flowersRedRose"; - case NS_ooxml::LN_Value_ST_Border_flowersRoses: return "flowersRoses"; - case NS_ooxml::LN_Value_ST_Border_flowersTeacup: return "flowersTeacup"; - case NS_ooxml::LN_Value_ST_Border_flowersTiny: return "flowersTiny"; - case NS_ooxml::LN_Value_ST_Border_gems: return "gems"; - case NS_ooxml::LN_Value_ST_Border_gingerbreadMan: return "gingerbreadMan"; - case NS_ooxml::LN_Value_ST_Border_gradient: return "gradient"; - case NS_ooxml::LN_Value_ST_Border_handmade1: return "handmade1"; - case NS_ooxml::LN_Value_ST_Border_handmade2: return "handmade2"; - case NS_ooxml::LN_Value_ST_Border_heartBalloon: return "heartBalloon"; - case NS_ooxml::LN_Value_ST_Border_heartGray: return "heartGray"; - case NS_ooxml::LN_Value_ST_Border_hearts: return "hearts"; - case NS_ooxml::LN_Value_ST_Border_heebieJeebies: return "heebieJeebies"; - case NS_ooxml::LN_Value_ST_Border_holly: return "holly"; - case NS_ooxml::LN_Value_ST_Border_houseFunky: return "houseFunky"; - case NS_ooxml::LN_Value_ST_Border_hypnotic: return "hypnotic"; - case NS_ooxml::LN_Value_ST_Border_iceCreamCones: return "iceCreamCones"; - case NS_ooxml::LN_Value_ST_Border_lightBulb: return "lightBulb"; - case NS_ooxml::LN_Value_ST_Border_lightning1: return "lightning1"; - case NS_ooxml::LN_Value_ST_Border_lightning2: return "lightning2"; - case NS_ooxml::LN_Value_ST_Border_mapPins: return "mapPins"; - case NS_ooxml::LN_Value_ST_Border_mapleLeaf: return "mapleLeaf"; - case NS_ooxml::LN_Value_ST_Border_mapleMuffins: return "mapleMuffins"; - case NS_ooxml::LN_Value_ST_Border_marquee: return "marquee"; - case NS_ooxml::LN_Value_ST_Border_marqueeToothed: return "marqueeToothed"; - case NS_ooxml::LN_Value_ST_Border_moons: return "moons"; - case NS_ooxml::LN_Value_ST_Border_mosaic: return "mosaic"; - case NS_ooxml::LN_Value_ST_Border_musicNotes: return "musicNotes"; - case NS_ooxml::LN_Value_ST_Border_northwest: return "northwest"; - case NS_ooxml::LN_Value_ST_Border_ovals: return "ovals"; - case NS_ooxml::LN_Value_ST_Border_packages: return "packages"; - case NS_ooxml::LN_Value_ST_Border_palmsBlack: return "palmsBlack"; - case NS_ooxml::LN_Value_ST_Border_palmsColor: return "palmsColor"; - case NS_ooxml::LN_Value_ST_Border_paperClips: return "paperClips"; - case NS_ooxml::LN_Value_ST_Border_papyrus: return "papyrus"; - case NS_ooxml::LN_Value_ST_Border_partyFavor: return "partyFavor"; - case NS_ooxml::LN_Value_ST_Border_partyGlass: return "partyGlass"; - case NS_ooxml::LN_Value_ST_Border_pencils: return "pencils"; - case NS_ooxml::LN_Value_ST_Border_people: return "people"; - case NS_ooxml::LN_Value_ST_Border_peopleWaving: return "peopleWaving"; - case NS_ooxml::LN_Value_ST_Border_peopleHats: return "peopleHats"; - case NS_ooxml::LN_Value_ST_Border_poinsettias: return "poinsettias"; - case NS_ooxml::LN_Value_ST_Border_postageStamp: return "postageStamp"; - case NS_ooxml::LN_Value_ST_Border_pumpkin1: return "pumpkin1"; - case NS_ooxml::LN_Value_ST_Border_pushPinNote2: return "pushPinNote2"; - case NS_ooxml::LN_Value_ST_Border_pushPinNote1: return "pushPinNote1"; - case NS_ooxml::LN_Value_ST_Border_pyramids: return "pyramids"; - case NS_ooxml::LN_Value_ST_Border_pyramidsAbove: return "pyramidsAbove"; - case NS_ooxml::LN_Value_ST_Border_quadrants: return "quadrants"; - case NS_ooxml::LN_Value_ST_Border_rings: return "rings"; - case NS_ooxml::LN_Value_ST_Border_safari: return "safari"; - case NS_ooxml::LN_Value_ST_Border_sawtooth: return "sawtooth"; - case NS_ooxml::LN_Value_ST_Border_sawtoothGray: return "sawtoothGray"; - case NS_ooxml::LN_Value_ST_Border_scaredCat: return "scaredCat"; - case NS_ooxml::LN_Value_ST_Border_seattle: return "seattle"; - case NS_ooxml::LN_Value_ST_Border_shadowedSquares: return "shadowedSquares"; - case NS_ooxml::LN_Value_ST_Border_sharksTeeth: return "sharksTeeth"; - case NS_ooxml::LN_Value_ST_Border_shorebirdTracks: return "shorebirdTracks"; - case NS_ooxml::LN_Value_ST_Border_skyrocket: return "skyrocket"; - case NS_ooxml::LN_Value_ST_Border_snowflakeFancy: return "snowflakeFancy"; - case NS_ooxml::LN_Value_ST_Border_snowflakes: return "snowflakes"; - case NS_ooxml::LN_Value_ST_Border_sombrero: return "sombrero"; - case NS_ooxml::LN_Value_ST_Border_southwest: return "southwest"; - case NS_ooxml::LN_Value_ST_Border_stars: return "stars"; - case NS_ooxml::LN_Value_ST_Border_starsTop: return "starsTop"; - case NS_ooxml::LN_Value_ST_Border_stars3d: return "stars3d"; - case NS_ooxml::LN_Value_ST_Border_starsBlack: return "starsBlack"; - case NS_ooxml::LN_Value_ST_Border_starsShadowed: return "starsShadowed"; - case NS_ooxml::LN_Value_ST_Border_sun: return "sun"; - case NS_ooxml::LN_Value_ST_Border_swirligig: return "swirligig"; - case NS_ooxml::LN_Value_ST_Border_tornPaper: return "tornPaper"; - case NS_ooxml::LN_Value_ST_Border_tornPaperBlack: return "tornPaperBlack"; - case NS_ooxml::LN_Value_ST_Border_trees: return "trees"; - case NS_ooxml::LN_Value_ST_Border_triangleParty: return "triangleParty"; - case NS_ooxml::LN_Value_ST_Border_triangles: return "triangles"; - case NS_ooxml::LN_Value_ST_Border_tribal1: return "tribal1"; - case NS_ooxml::LN_Value_ST_Border_tribal2: return "tribal2"; - case NS_ooxml::LN_Value_ST_Border_tribal3: return "tribal3"; - case NS_ooxml::LN_Value_ST_Border_tribal4: return "tribal4"; - case NS_ooxml::LN_Value_ST_Border_tribal5: return "tribal5"; - case NS_ooxml::LN_Value_ST_Border_tribal6: return "tribal6"; - case NS_ooxml::LN_Value_ST_Border_twistedLines1: return "twistedLines1"; - case NS_ooxml::LN_Value_ST_Border_twistedLines2: return "twistedLines2"; - case NS_ooxml::LN_Value_ST_Border_vine: return "vine"; - case NS_ooxml::LN_Value_ST_Border_waveline: return "waveline"; - case NS_ooxml::LN_Value_ST_Border_weavingAngles: return "weavingAngles"; - case NS_ooxml::LN_Value_ST_Border_weavingBraid: return "weavingBraid"; - case NS_ooxml::LN_Value_ST_Border_weavingRibbon: return "weavingRibbon"; - case NS_ooxml::LN_Value_ST_Border_weavingStrips: return "weavingStrips"; - case NS_ooxml::LN_Value_ST_Border_whiteFlowers: return "whiteFlowers"; - case NS_ooxml::LN_Value_ST_Border_woodwork: return "woodwork"; - case NS_ooxml::LN_Value_ST_Border_xIllusions: return "xIllusions"; - case NS_ooxml::LN_Value_ST_Border_zanyTriangles: return "zanyTriangles"; - case NS_ooxml::LN_Value_ST_Border_zigZag: return "zigZag"; - case NS_ooxml::LN_Value_ST_Border_zigZagStitch: return "zigZagStitch"; + case NS_ooxml::LN_Value_ST_Border_nil: return u"nil"_ustr; + case NS_ooxml::LN_Value_ST_Border_none: return u"none"_ustr; + case NS_ooxml::LN_Value_ST_Border_single: return u"single"_ustr; + case NS_ooxml::LN_Value_ST_Border_thick: return u"thick"_ustr; + case NS_ooxml::LN_Value_ST_Border_double: return u"double"_ustr; + case NS_ooxml::LN_Value_ST_Border_dotted: return u"dotted"_ustr; + case NS_ooxml::LN_Value_ST_Border_dashed: return u"dashed"_ustr; + case NS_ooxml::LN_Value_ST_Border_dotDash: return u"dotDash"_ustr; + case NS_ooxml::LN_Value_ST_Border_dotDotDash: return u"dotDotDash"_ustr; + case NS_ooxml::LN_Value_ST_Border_triple: return u"triple"_ustr; + case NS_ooxml::LN_Value_ST_Border_thinThickSmallGap: return u"thinThickSmallGap"_ustr; + case NS_ooxml::LN_Value_ST_Border_thickThinSmallGap: return u"thickThinSmallGap"_ustr; + case NS_ooxml::LN_Value_ST_Border_thinThickThinSmallGap: return u"thinThickThinSmallGap"_ustr; + case NS_ooxml::LN_Value_ST_Border_thinThickMediumGap: return u"thinThickMediumGap"_ustr; + case NS_ooxml::LN_Value_ST_Border_thickThinMediumGap: return u"thickThinMediumGap"_ustr; + case NS_ooxml::LN_Value_ST_Border_thinThickThinMediumGap: return u"thinThickThinMediumGap"_ustr; + case NS_ooxml::LN_Value_ST_Border_thinThickLargeGap: return u"thinThickLargeGap"_ustr; + case NS_ooxml::LN_Value_ST_Border_thickThinLargeGap: return u"thickThinLargeGap"_ustr; + case NS_ooxml::LN_Value_ST_Border_thinThickThinLargeGap: return u"thinThickThinLargeGap"_ustr; + case NS_ooxml::LN_Value_ST_Border_wave: return u"wave"_ustr; + case NS_ooxml::LN_Value_ST_Border_doubleWave: return u"doubleWave"_ustr; + case NS_ooxml::LN_Value_ST_Border_dashSmallGap: return u"dashSmallGap"_ustr; + case NS_ooxml::LN_Value_ST_Border_dashDotStroked: return u"dashDotStroked"_ustr; + case NS_ooxml::LN_Value_ST_Border_threeDEmboss: return u"threeDEmboss"_ustr; + case NS_ooxml::LN_Value_ST_Border_threeDEngrave: return u"threeDEngrave"_ustr; + case NS_ooxml::LN_Value_ST_Border_outset: return u"outset"_ustr; + case NS_ooxml::LN_Value_ST_Border_inset: return u"inset"_ustr; + case NS_ooxml::LN_Value_ST_Border_apples: return u"apples"_ustr; + case NS_ooxml::LN_Value_ST_Border_archedScallops: return u"archedScallops"_ustr; + case NS_ooxml::LN_Value_ST_Border_babyPacifier: return u"babyPacifier"_ustr; + case NS_ooxml::LN_Value_ST_Border_babyRattle: return u"babyRattle"_ustr; + case NS_ooxml::LN_Value_ST_Border_balloons3Colors: return u"balloons3Colors"_ustr; + case NS_ooxml::LN_Value_ST_Border_balloonsHotAir: return u"balloonsHotAir"_ustr; + case NS_ooxml::LN_Value_ST_Border_basicBlackDashes: return u"basicBlackDashes"_ustr; + case NS_ooxml::LN_Value_ST_Border_basicBlackDots: return u"basicBlackDots"_ustr; + case NS_ooxml::LN_Value_ST_Border_basicBlackSquares: return u"basicBlackSquares"_ustr; + case NS_ooxml::LN_Value_ST_Border_basicThinLines: return u"basicThinLines"_ustr; + case NS_ooxml::LN_Value_ST_Border_basicWhiteDashes: return u"basicWhiteDashes"_ustr; + case NS_ooxml::LN_Value_ST_Border_basicWhiteDots: return u"basicWhiteDots"_ustr; + case NS_ooxml::LN_Value_ST_Border_basicWhiteSquares: return u"basicWhiteSquares"_ustr; + case NS_ooxml::LN_Value_ST_Border_basicWideInline: return u"basicWideInline"_ustr; + case NS_ooxml::LN_Value_ST_Border_basicWideMidline: return u"basicWideMidline"_ustr; + case NS_ooxml::LN_Value_ST_Border_basicWideOutline: return u"basicWideOutline"_ustr; + case NS_ooxml::LN_Value_ST_Border_bats: return u"bats"_ustr; + case NS_ooxml::LN_Value_ST_Border_birds: return u"birds"_ustr; + case NS_ooxml::LN_Value_ST_Border_birdsFlight: return u"birdsFlight"_ustr; + case NS_ooxml::LN_Value_ST_Border_cabins: return u"cabins"_ustr; + case NS_ooxml::LN_Value_ST_Border_cakeSlice: return u"cakeSlice"_ustr; + case NS_ooxml::LN_Value_ST_Border_candyCorn: return u"candyCorn"_ustr; + case NS_ooxml::LN_Value_ST_Border_celticKnotwork: return u"celticKnotwork"_ustr; + case NS_ooxml::LN_Value_ST_Border_certificateBanner: return u"certificateBanner"_ustr; + case NS_ooxml::LN_Value_ST_Border_chainLink: return u"chainLink"_ustr; + case NS_ooxml::LN_Value_ST_Border_champagneBottle: return u"champagneBottle"_ustr; + case NS_ooxml::LN_Value_ST_Border_checkedBarBlack: return u"checkedBarBlack"_ustr; + case NS_ooxml::LN_Value_ST_Border_checkedBarColor: return u"checkedBarColor"_ustr; + case NS_ooxml::LN_Value_ST_Border_checkered: return u"checkered"_ustr; + case NS_ooxml::LN_Value_ST_Border_christmasTree: return u"christmasTree"_ustr; + case NS_ooxml::LN_Value_ST_Border_circlesLines: return u"circlesLines"_ustr; + case NS_ooxml::LN_Value_ST_Border_circlesRectangles: return u"circlesRectangles"_ustr; + case NS_ooxml::LN_Value_ST_Border_classicalWave: return u"classicalWave"_ustr; + case NS_ooxml::LN_Value_ST_Border_clocks: return u"clocks"_ustr; + case NS_ooxml::LN_Value_ST_Border_compass: return u"compass"_ustr; + case NS_ooxml::LN_Value_ST_Border_confetti: return u"confetti"_ustr; + case NS_ooxml::LN_Value_ST_Border_confettiGrays: return u"confettiGrays"_ustr; + case NS_ooxml::LN_Value_ST_Border_confettiOutline: return u"confettiOutline"_ustr; + case NS_ooxml::LN_Value_ST_Border_confettiStreamers: return u"confettiStreamers"_ustr; + case NS_ooxml::LN_Value_ST_Border_confettiWhite: return u"confettiWhite"_ustr; + case NS_ooxml::LN_Value_ST_Border_cornerTriangles: return u"cornerTriangles"_ustr; + case NS_ooxml::LN_Value_ST_Border_couponCutoutDashes: return u"couponCutoutDashes"_ustr; + case NS_ooxml::LN_Value_ST_Border_couponCutoutDots: return u"couponCutoutDots"_ustr; + case NS_ooxml::LN_Value_ST_Border_crazyMaze: return u"crazyMaze"_ustr; + case NS_ooxml::LN_Value_ST_Border_creaturesButterfly: return u"creaturesButterfly"_ustr; + case NS_ooxml::LN_Value_ST_Border_creaturesFish: return u"creaturesFish"_ustr; + case NS_ooxml::LN_Value_ST_Border_creaturesInsects: return u"creaturesInsects"_ustr; + case NS_ooxml::LN_Value_ST_Border_creaturesLadyBug: return u"creaturesLadyBug"_ustr; + case NS_ooxml::LN_Value_ST_Border_crossStitch: return u"crossStitch"_ustr; + case NS_ooxml::LN_Value_ST_Border_cup: return u"cup"_ustr; + case NS_ooxml::LN_Value_ST_Border_decoArch: return u"decoArch"_ustr; + case NS_ooxml::LN_Value_ST_Border_decoArchColor: return u"decoArchColor"_ustr; + case NS_ooxml::LN_Value_ST_Border_decoBlocks: return u"decoBlocks"_ustr; + case NS_ooxml::LN_Value_ST_Border_diamondsGray: return u"diamondsGray"_ustr; + case NS_ooxml::LN_Value_ST_Border_doubleD: return u"doubleD"_ustr; + case NS_ooxml::LN_Value_ST_Border_doubleDiamonds: return u"doubleDiamonds"_ustr; + case NS_ooxml::LN_Value_ST_Border_earth1: return u"earth1"_ustr; + case NS_ooxml::LN_Value_ST_Border_earth2: return u"earth2"_ustr; + case NS_ooxml::LN_Value_ST_Border_eclipsingSquares1: return u"eclipsingSquares1"_ustr; + case NS_ooxml::LN_Value_ST_Border_eclipsingSquares2: return u"eclipsingSquares2"_ustr; + case NS_ooxml::LN_Value_ST_Border_eggsBlack: return u"eggsBlack"_ustr; + case NS_ooxml::LN_Value_ST_Border_fans: return u"fans"_ustr; + case NS_ooxml::LN_Value_ST_Border_film: return u"film"_ustr; + case NS_ooxml::LN_Value_ST_Border_firecrackers: return u"firecrackers"_ustr; + case NS_ooxml::LN_Value_ST_Border_flowersBlockPrint: return u"flowersBlockPrint"_ustr; + case NS_ooxml::LN_Value_ST_Border_flowersDaisies: return u"flowersDaisies"_ustr; + case NS_ooxml::LN_Value_ST_Border_flowersModern1: return u"flowersModern1"_ustr; + case NS_ooxml::LN_Value_ST_Border_flowersModern2: return u"flowersModern2"_ustr; + case NS_ooxml::LN_Value_ST_Border_flowersPansy: return u"flowersPansy"_ustr; + case NS_ooxml::LN_Value_ST_Border_flowersRedRose: return u"flowersRedRose"_ustr; + case NS_ooxml::LN_Value_ST_Border_flowersRoses: return u"flowersRoses"_ustr; + case NS_ooxml::LN_Value_ST_Border_flowersTeacup: return u"flowersTeacup"_ustr; + case NS_ooxml::LN_Value_ST_Border_flowersTiny: return u"flowersTiny"_ustr; + case NS_ooxml::LN_Value_ST_Border_gems: return u"gems"_ustr; + case NS_ooxml::LN_Value_ST_Border_gingerbreadMan: return u"gingerbreadMan"_ustr; + case NS_ooxml::LN_Value_ST_Border_gradient: return u"gradient"_ustr; + case NS_ooxml::LN_Value_ST_Border_handmade1: return u"handmade1"_ustr; + case NS_ooxml::LN_Value_ST_Border_handmade2: return u"handmade2"_ustr; + case NS_ooxml::LN_Value_ST_Border_heartBalloon: return u"heartBalloon"_ustr; + case NS_ooxml::LN_Value_ST_Border_heartGray: return u"heartGray"_ustr; + case NS_ooxml::LN_Value_ST_Border_hearts: return u"hearts"_ustr; + case NS_ooxml::LN_Value_ST_Border_heebieJeebies: return u"heebieJeebies"_ustr; + case NS_ooxml::LN_Value_ST_Border_holly: return u"holly"_ustr; + case NS_ooxml::LN_Value_ST_Border_houseFunky: return u"houseFunky"_ustr; + case NS_ooxml::LN_Value_ST_Border_hypnotic: return u"hypnotic"_ustr; + case NS_ooxml::LN_Value_ST_Border_iceCreamCones: return u"iceCreamCones"_ustr; + case NS_ooxml::LN_Value_ST_Border_lightBulb: return u"lightBulb"_ustr; + case NS_ooxml::LN_Value_ST_Border_lightning1: return u"lightning1"_ustr; + case NS_ooxml::LN_Value_ST_Border_lightning2: return u"lightning2"_ustr; + case NS_ooxml::LN_Value_ST_Border_mapPins: return u"mapPins"_ustr; + case NS_ooxml::LN_Value_ST_Border_mapleLeaf: return u"mapleLeaf"_ustr; + case NS_ooxml::LN_Value_ST_Border_mapleMuffins: return u"mapleMuffins"_ustr; + case NS_ooxml::LN_Value_ST_Border_marquee: return u"marquee"_ustr; + case NS_ooxml::LN_Value_ST_Border_marqueeToothed: return u"marqueeToothed"_ustr; + case NS_ooxml::LN_Value_ST_Border_moons: return u"moons"_ustr; + case NS_ooxml::LN_Value_ST_Border_mosaic: return u"mosaic"_ustr; + case NS_ooxml::LN_Value_ST_Border_musicNotes: return u"musicNotes"_ustr; + case NS_ooxml::LN_Value_ST_Border_northwest: return u"northwest"_ustr; + case NS_ooxml::LN_Value_ST_Border_ovals: return u"ovals"_ustr; + case NS_ooxml::LN_Value_ST_Border_packages: return u"packages"_ustr; + case NS_ooxml::LN_Value_ST_Border_palmsBlack: return u"palmsBlack"_ustr; + case NS_ooxml::LN_Value_ST_Border_palmsColor: return u"palmsColor"_ustr; + case NS_ooxml::LN_Value_ST_Border_paperClips: return u"paperClips"_ustr; + case NS_ooxml::LN_Value_ST_Border_papyrus: return u"papyrus"_ustr; + case NS_ooxml::LN_Value_ST_Border_partyFavor: return u"partyFavor"_ustr; + case NS_ooxml::LN_Value_ST_Border_partyGlass: return u"partyGlass"_ustr; + case NS_ooxml::LN_Value_ST_Border_pencils: return u"pencils"_ustr; + case NS_ooxml::LN_Value_ST_Border_people: return u"people"_ustr; + case NS_ooxml::LN_Value_ST_Border_peopleWaving: return u"peopleWaving"_ustr; + case NS_ooxml::LN_Value_ST_Border_peopleHats: return u"peopleHats"_ustr; + case NS_ooxml::LN_Value_ST_Border_poinsettias: return u"poinsettias"_ustr; + case NS_ooxml::LN_Value_ST_Border_postageStamp: return u"postageStamp"_ustr; + case NS_ooxml::LN_Value_ST_Border_pumpkin1: return u"pumpkin1"_ustr; + case NS_ooxml::LN_Value_ST_Border_pushPinNote2: return u"pushPinNote2"_ustr; + case NS_ooxml::LN_Value_ST_Border_pushPinNote1: return u"pushPinNote1"_ustr; + case NS_ooxml::LN_Value_ST_Border_pyramids: return u"pyramids"_ustr; + case NS_ooxml::LN_Value_ST_Border_pyramidsAbove: return u"pyramidsAbove"_ustr; + case NS_ooxml::LN_Value_ST_Border_quadrants: return u"quadrants"_ustr; + case NS_ooxml::LN_Value_ST_Border_rings: return u"rings"_ustr; + case NS_ooxml::LN_Value_ST_Border_safari: return u"safari"_ustr; + case NS_ooxml::LN_Value_ST_Border_sawtooth: return u"sawtooth"_ustr; + case NS_ooxml::LN_Value_ST_Border_sawtoothGray: return u"sawtoothGray"_ustr; + case NS_ooxml::LN_Value_ST_Border_scaredCat: return u"scaredCat"_ustr; + case NS_ooxml::LN_Value_ST_Border_seattle: return u"seattle"_ustr; + case NS_ooxml::LN_Value_ST_Border_shadowedSquares: return u"shadowedSquares"_ustr; + case NS_ooxml::LN_Value_ST_Border_sharksTeeth: return u"sharksTeeth"_ustr; + case NS_ooxml::LN_Value_ST_Border_shorebirdTracks: return u"shorebirdTracks"_ustr; + case NS_ooxml::LN_Value_ST_Border_skyrocket: return u"skyrocket"_ustr; + case NS_ooxml::LN_Value_ST_Border_snowflakeFancy: return u"snowflakeFancy"_ustr; + case NS_ooxml::LN_Value_ST_Border_snowflakes: return u"snowflakes"_ustr; + case NS_ooxml::LN_Value_ST_Border_sombrero: return u"sombrero"_ustr; + case NS_ooxml::LN_Value_ST_Border_southwest: return u"southwest"_ustr; + case NS_ooxml::LN_Value_ST_Border_stars: return u"stars"_ustr; + case NS_ooxml::LN_Value_ST_Border_starsTop: return u"starsTop"_ustr; + case NS_ooxml::LN_Value_ST_Border_stars3d: return u"stars3d"_ustr; + case NS_ooxml::LN_Value_ST_Border_starsBlack: return u"starsBlack"_ustr; + case NS_ooxml::LN_Value_ST_Border_starsShadowed: return u"starsShadowed"_ustr; + case NS_ooxml::LN_Value_ST_Border_sun: return u"sun"_ustr; + case NS_ooxml::LN_Value_ST_Border_swirligig: return u"swirligig"_ustr; + case NS_ooxml::LN_Value_ST_Border_tornPaper: return u"tornPaper"_ustr; + case NS_ooxml::LN_Value_ST_Border_tornPaperBlack: return u"tornPaperBlack"_ustr; + case NS_ooxml::LN_Value_ST_Border_trees: return u"trees"_ustr; + case NS_ooxml::LN_Value_ST_Border_triangleParty: return u"triangleParty"_ustr; + case NS_ooxml::LN_Value_ST_Border_triangles: return u"triangles"_ustr; + case NS_ooxml::LN_Value_ST_Border_tribal1: return u"tribal1"_ustr; + case NS_ooxml::LN_Value_ST_Border_tribal2: return u"tribal2"_ustr; + case NS_ooxml::LN_Value_ST_Border_tribal3: return u"tribal3"_ustr; + case NS_ooxml::LN_Value_ST_Border_tribal4: return u"tribal4"_ustr; + case NS_ooxml::LN_Value_ST_Border_tribal5: return u"tribal5"_ustr; + case NS_ooxml::LN_Value_ST_Border_tribal6: return u"tribal6"_ustr; + case NS_ooxml::LN_Value_ST_Border_twistedLines1: return u"twistedLines1"_ustr; + case NS_ooxml::LN_Value_ST_Border_twistedLines2: return u"twistedLines2"_ustr; + case NS_ooxml::LN_Value_ST_Border_vine: return u"vine"_ustr; + case NS_ooxml::LN_Value_ST_Border_waveline: return u"waveline"_ustr; + case NS_ooxml::LN_Value_ST_Border_weavingAngles: return u"weavingAngles"_ustr; + case NS_ooxml::LN_Value_ST_Border_weavingBraid: return u"weavingBraid"_ustr; + case NS_ooxml::LN_Value_ST_Border_weavingRibbon: return u"weavingRibbon"_ustr; + case NS_ooxml::LN_Value_ST_Border_weavingStrips: return u"weavingStrips"_ustr; + case NS_ooxml::LN_Value_ST_Border_whiteFlowers: return u"whiteFlowers"_ustr; + case NS_ooxml::LN_Value_ST_Border_woodwork: return u"woodwork"_ustr; + case NS_ooxml::LN_Value_ST_Border_xIllusions: return u"xIllusions"_ustr; + case NS_ooxml::LN_Value_ST_Border_zanyTriangles: return u"zanyTriangles"_ustr; + case NS_ooxml::LN_Value_ST_Border_zigZag: return u"zigZag"_ustr; + case NS_ooxml::LN_Value_ST_Border_zigZagStitch: return u"zigZagStitch"_ustr; default: break; } return OUString(); @@ -247,23 +247,23 @@ OUString TDefTableHandler::getThemeColorTypeString(sal_Int32 nType) { switch (nType) { - case NS_ooxml::LN_Value_St_ThemeColor_dark1: return "dark1"; - case NS_ooxml::LN_Value_St_ThemeColor_light1: return "light1"; - case NS_ooxml::LN_Value_St_ThemeColor_dark2: return "dark2"; - case NS_ooxml::LN_Value_St_ThemeColor_light2: return "light2"; - case NS_ooxml::LN_Value_St_ThemeColor_accent1: return "accent1"; - case NS_ooxml::LN_Value_St_ThemeColor_accent2: return "accent2"; - case NS_ooxml::LN_Value_St_ThemeColor_accent3: return "accent3"; - case NS_ooxml::LN_Value_St_ThemeColor_accent4: return "accent4"; - case NS_ooxml::LN_Value_St_ThemeColor_accent5: return "accent5"; - case NS_ooxml::LN_Value_St_ThemeColor_accent6: return "accent6"; - case NS_ooxml::LN_Value_St_ThemeColor_hyperlink: return "hyperlink"; - case NS_ooxml::LN_Value_St_ThemeColor_followedHyperlink: return "followedHyperlink"; - case NS_ooxml::LN_Value_St_ThemeColor_none: return "none"; - case NS_ooxml::LN_Value_St_ThemeColor_background1: return "background1"; - case NS_ooxml::LN_Value_St_ThemeColor_text1: return "text1"; - case NS_ooxml::LN_Value_St_ThemeColor_background2: return "background2"; - case NS_ooxml::LN_Value_St_ThemeColor_text2: return "text2"; + case NS_ooxml::LN_Value_St_ThemeColor_dark1: return u"dark1"_ustr; + case NS_ooxml::LN_Value_St_ThemeColor_light1: return u"light1"_ustr; + case NS_ooxml::LN_Value_St_ThemeColor_dark2: return u"dark2"_ustr; + case NS_ooxml::LN_Value_St_ThemeColor_light2: return u"light2"_ustr; + case NS_ooxml::LN_Value_St_ThemeColor_accent1: return u"accent1"_ustr; + case NS_ooxml::LN_Value_St_ThemeColor_accent2: return u"accent2"_ustr; + case NS_ooxml::LN_Value_St_ThemeColor_accent3: return u"accent3"_ustr; + case NS_ooxml::LN_Value_St_ThemeColor_accent4: return u"accent4"_ustr; + case NS_ooxml::LN_Value_St_ThemeColor_accent5: return u"accent5"_ustr; + case NS_ooxml::LN_Value_St_ThemeColor_accent6: return u"accent6"_ustr; + case NS_ooxml::LN_Value_St_ThemeColor_hyperlink: return u"hyperlink"_ustr; + case NS_ooxml::LN_Value_St_ThemeColor_followedHyperlink: return u"followedHyperlink"_ustr; + case NS_ooxml::LN_Value_St_ThemeColor_none: return u"none"_ustr; + case NS_ooxml::LN_Value_St_ThemeColor_background1: return u"background1"_ustr; + case NS_ooxml::LN_Value_St_ThemeColor_text1: return u"text1"_ustr; + case NS_ooxml::LN_Value_St_ThemeColor_background2: return u"background2"_ustr; + case NS_ooxml::LN_Value_St_ThemeColor_text2: return u"text2"_ustr; default: break; } return OUString(); @@ -337,18 +337,18 @@ void TDefTableHandler::lcl_attribute(Id rName, Value & rVal) case NS_ooxml::LN_CT_Border_sz: // width of a single line in 1/8 pt, max of 32 pt -> twip * 5 / 2. m_nLineWidth = nIntValue * 5 / 2; - appendGrabBag("sz", OUString::number(nIntValue)); + appendGrabBag(u"sz"_ustr, OUString::number(nIntValue)); break; case NS_ooxml::LN_CT_Border_val: m_nLineType = nIntValue; - appendGrabBag("val", TDefTableHandler::getBorderTypeString(nIntValue)); + appendGrabBag(u"val"_ustr, TDefTableHandler::getBorderTypeString(nIntValue)); break; case NS_ooxml::LN_CT_Border_color: - appendGrabBag("color", msfilter::util::ConvertColorOU(Color(ColorTransparency,nIntValue))); + appendGrabBag(u"color"_ustr, msfilter::util::ConvertColorOU(Color(ColorTransparency,nIntValue))); m_nLineColor = nIntValue; break; case NS_ooxml::LN_CT_Border_space: - appendGrabBag("space", OUString::number(nIntValue)); + appendGrabBag(u"space"_ustr, OUString::number(nIntValue)); break; case NS_ooxml::LN_CT_Border_shadow: //if 1 then line has shadow - unsupported @@ -356,7 +356,7 @@ void TDefTableHandler::lcl_attribute(Id rName, Value & rVal) // ignored break; case NS_ooxml::LN_CT_Border_themeColor: - appendGrabBag("themeColor", TDefTableHandler::getThemeColorTypeString(nIntValue)); + appendGrabBag(u"themeColor"_ustr, TDefTableHandler::getThemeColorTypeString(nIntValue)); m_eThemeColorType = TDefTableHandler::getThemeColorTypeIndex(nIntValue); break; case NS_ooxml::LN_CT_Border_themeTint: @@ -392,7 +392,7 @@ void TDefTableHandler::localResolve(Id rName, const writerfilter::Reference<Prop case NS_ooxml::LN_CT_TcBorders_top: m_aTopBorderLines.push_back(aBorderLine); if (!m_aInteropGrabBagName.isEmpty()) - aSavedGrabBag.push_back(getInteropGrabBag("top")); + aSavedGrabBag.push_back(getInteropGrabBag(u"top"_ustr)); break; case NS_ooxml::LN_CT_TcBorders_start: if( rtl ) @@ -400,17 +400,17 @@ void TDefTableHandler::localResolve(Id rName, const writerfilter::Reference<Prop else m_aLeftBorderLines.push_back(aBorderLine); if (!m_aInteropGrabBagName.isEmpty()) - aSavedGrabBag.push_back(getInteropGrabBag("start")); + aSavedGrabBag.push_back(getInteropGrabBag(u"start"_ustr)); break; case NS_ooxml::LN_CT_TcBorders_left: m_aLeftBorderLines.push_back(aBorderLine); if (!m_aInteropGrabBagName.isEmpty()) - aSavedGrabBag.push_back(getInteropGrabBag("left")); + aSavedGrabBag.push_back(getInteropGrabBag(u"left"_ustr)); break; case NS_ooxml::LN_CT_TcBorders_bottom: m_aBottomBorderLines.push_back(aBorderLine); if (!m_aInteropGrabBagName.isEmpty()) - aSavedGrabBag.push_back(getInteropGrabBag("bottom")); + aSavedGrabBag.push_back(getInteropGrabBag(u"bottom"_ustr)); break; case NS_ooxml::LN_CT_TcBorders_end: if( rtl ) @@ -418,30 +418,30 @@ void TDefTableHandler::localResolve(Id rName, const writerfilter::Reference<Prop else m_aRightBorderLines.push_back(aBorderLine); if (!m_aInteropGrabBagName.isEmpty()) - aSavedGrabBag.push_back(getInteropGrabBag("end")); + aSavedGrabBag.push_back(getInteropGrabBag(u"end"_ustr)); break; case NS_ooxml::LN_CT_TcBorders_right: m_aRightBorderLines.push_back(aBorderLine); if (!m_aInteropGrabBagName.isEmpty()) - aSavedGrabBag.push_back(getInteropGrabBag("right")); + aSavedGrabBag.push_back(getInteropGrabBag(u"right"_ustr)); break; case NS_ooxml::LN_CT_TcBorders_insideH: m_aInsideHBorderLines.push_back(aBorderLine); if (!m_aInteropGrabBagName.isEmpty()) - aSavedGrabBag.push_back(getInteropGrabBag("insideH")); + aSavedGrabBag.push_back(getInteropGrabBag(u"insideH"_ustr)); break; case NS_ooxml::LN_CT_TcBorders_insideV: m_aInsideVBorderLines.push_back(aBorderLine); if (!m_aInteropGrabBagName.isEmpty()) - aSavedGrabBag.push_back(getInteropGrabBag("insideV")); + aSavedGrabBag.push_back(getInteropGrabBag(u"insideV"_ustr)); break; case NS_ooxml::LN_CT_TcBorders_tl2br: if (!m_aInteropGrabBagName.isEmpty()) - aSavedGrabBag.push_back(getInteropGrabBag("tl2br")); + aSavedGrabBag.push_back(getInteropGrabBag(u"tl2br"_ustr)); break; case NS_ooxml::LN_CT_TcBorders_tr2bl: if (!m_aInteropGrabBagName.isEmpty()) - aSavedGrabBag.push_back(getInteropGrabBag("tr2bl")); + aSavedGrabBag.push_back(getInteropGrabBag(u"tr2bl"_ustr)); break; default:; } diff --git a/sw/source/writerfilter/dmapper/TablePositionHandler.cxx b/sw/source/writerfilter/dmapper/TablePositionHandler.cxx index 62d423d29515..97b531d2f9af 100644 --- a/sw/source/writerfilter/dmapper/TablePositionHandler.cxx +++ b/sw/source/writerfilter/dmapper/TablePositionHandler.cxx @@ -75,21 +75,23 @@ uno::Sequence<beans::PropertyValue> TablePositionHandler::getTablePosition() con { comphelper::SequenceAsHashMap aFrameProperties; - aFrameProperties["LeftBorderDistance"] <<= sal_Int32(0); - aFrameProperties["RightBorderDistance"] <<= sal_Int32(0); - aFrameProperties["TopBorderDistance"] <<= sal_Int32(0); - aFrameProperties["BottomBorderDistance"] <<= sal_Int32(0); - - aFrameProperties["LeftMargin"] <<= ConversionHelper::convertTwipToMM100(m_nLeftFromText); - aFrameProperties["RightMargin"] <<= ConversionHelper::convertTwipToMM100(m_nRightFromText); - aFrameProperties["TopMargin"] <<= ConversionHelper::convertTwipToMM100(m_nTopFromText); - aFrameProperties["BottomMargin"] <<= ConversionHelper::convertTwipToMM100(m_nBottomFromText); + aFrameProperties[u"LeftBorderDistance"_ustr] <<= sal_Int32(0); + aFrameProperties[u"RightBorderDistance"_ustr] <<= sal_Int32(0); + aFrameProperties[u"TopBorderDistance"_ustr] <<= sal_Int32(0); + aFrameProperties[u"BottomBorderDistance"_ustr] <<= sal_Int32(0); + + aFrameProperties[u"LeftMargin"_ustr] <<= ConversionHelper::convertTwipToMM100(m_nLeftFromText); + aFrameProperties[u"RightMargin"_ustr] + <<= ConversionHelper::convertTwipToMM100(m_nRightFromText); + aFrameProperties[u"TopMargin"_ustr] <<= ConversionHelper::convertTwipToMM100(m_nTopFromText); + aFrameProperties[u"BottomMargin"_ustr] + <<= ConversionHelper::convertTwipToMM100(m_nBottomFromText); table::BorderLine2 aEmptyBorder; - aFrameProperties["TopBorder"] <<= aEmptyBorder; - aFrameProperties["BottomBorder"] <<= aEmptyBorder; - aFrameProperties["LeftBorder"] <<= aEmptyBorder; - aFrameProperties["RightBorder"] <<= aEmptyBorder; + aFrameProperties[u"TopBorder"_ustr] <<= aEmptyBorder; + aFrameProperties[u"BottomBorder"_ustr] <<= aEmptyBorder; + aFrameProperties[u"LeftBorder"_ustr] <<= aEmptyBorder; + aFrameProperties[u"RightBorder"_ustr] <<= aEmptyBorder; // Horizontal positioning sal_Int16 nHoriOrient = text::HoriOrientation::NONE; @@ -112,9 +114,9 @@ uno::Sequence<beans::PropertyValue> TablePositionHandler::getTablePosition() con else if (m_aHorzAnchor == "text") nHoriOrientRelation = text::RelOrientation::FRAME; - aFrameProperties["HoriOrient"] <<= nHoriOrient; - aFrameProperties["HoriOrientRelation"] <<= nHoriOrientRelation; - aFrameProperties["HoriOrientPosition"] <<= ConversionHelper::convertTwipToMM100(m_nX); + aFrameProperties[u"HoriOrient"_ustr] <<= nHoriOrient; + aFrameProperties[u"HoriOrientRelation"_ustr] <<= nHoriOrientRelation; + aFrameProperties[u"HoriOrientPosition"_ustr] <<= ConversionHelper::convertTwipToMM100(m_nX); // Vertical positioning sal_Int16 nVertOrient = text::VertOrientation::NONE; @@ -134,15 +136,15 @@ uno::Sequence<beans::PropertyValue> TablePositionHandler::getTablePosition() con else if (m_aVertAnchor == "text") nVertOrientRelation = text::RelOrientation::FRAME; - aFrameProperties["VertOrient"] <<= nVertOrient; - aFrameProperties["VertOrientRelation"] <<= nVertOrientRelation; - aFrameProperties["VertOrientPosition"] <<= ConversionHelper::convertTwipToMM100(m_nY); - aFrameProperties["FillTransparence"] <<= sal_Int32(100); + aFrameProperties[u"VertOrient"_ustr] <<= nVertOrient; + aFrameProperties[u"VertOrientRelation"_ustr] <<= nVertOrientRelation; + aFrameProperties[u"VertOrientPosition"_ustr] <<= ConversionHelper::convertTwipToMM100(m_nY); + aFrameProperties[u"FillTransparence"_ustr] <<= sal_Int32(100); if (m_nTableOverlap == NS_ooxml::LN_Value_ST_TblOverlap_never) { // NS_ooxml::LN_Value_ST_TblOverlap_overlap is the default, both in OOXML and in Writer. - aFrameProperties["AllowOverlap"] <<= false; + aFrameProperties[u"AllowOverlap"_ustr] <<= false; } return aFrameProperties.getAsConstPropertyValueList(); diff --git a/sw/source/writerfilter/dmapper/TablePositionHandler.hxx b/sw/source/writerfilter/dmapper/TablePositionHandler.hxx index 1b9d9c808391..353c34d169f8 100644 --- a/sw/source/writerfilter/dmapper/TablePositionHandler.hxx +++ b/sw/source/writerfilter/dmapper/TablePositionHandler.hxx @@ -20,9 +20,9 @@ namespace writerfilter::dmapper /// Handler for floating table positioning class TablePositionHandler : public LoggedProperties { - OUString m_aVertAnchor{ "margin" }; + OUString m_aVertAnchor{ u"margin"_ustr }; OUString m_aYSpec; - OUString m_aHorzAnchor{ "text" }; + OUString m_aHorzAnchor{ u"text"_ustr }; OUString m_aXSpec; sal_Int32 m_nY = 0; sal_Int32 m_nX = 0; diff --git a/sw/source/writerfilter/dmapper/TablePropertiesHandler.cxx b/sw/source/writerfilter/dmapper/TablePropertiesHandler.cxx index 8ea3eae5c056..64e88074d9d5 100644 --- a/sw/source/writerfilter/dmapper/TablePropertiesHandler.cxx +++ b/sw/source/writerfilter/dmapper/TablePropertiesHandler.cxx @@ -131,7 +131,7 @@ namespace writerfilter::dmapper { nToken = XML_tableCellDelete; break; default: - throw lang::IllegalArgumentException("illegal redline token type", nullptr, 0); + throw lang::IllegalArgumentException(u"illegal redline token type"_ustr, nullptr, 0); break; } auto pTrackChangesHandler = std::make_shared<TrackChangesHandler>( nToken ); @@ -194,7 +194,7 @@ namespace writerfilter::dmapper { { auto pBorderHandler = std::make_shared<BorderHandler>(true); if (m_pCurrentInteropGrabBag) - pBorderHandler->enableInteropGrabBag("tblBorders"); + pBorderHandler->enableInteropGrabBag(u"tblBorders"_ustr); pProperties->resolve(*pBorderHandler); if (m_pCurrentInteropGrabBag) m_pCurrentInteropGrabBag->push_back(pBorderHandler->getInteropGrabBag()); @@ -241,7 +241,7 @@ namespace writerfilter::dmapper { //in OOXML there's one set of borders at each cell (if there is any) tools::SvRef< TDefTableHandler > pTDefTableHandler( new TDefTableHandler()); if (m_pCurrentInteropGrabBag) - pTDefTableHandler->enableInteropGrabBag("tcBorders"); + pTDefTableHandler->enableInteropGrabBag(u"tcBorders"_ustr); pProperties->resolve( *pTDefTableHandler ); if (m_pCurrentInteropGrabBag) m_pCurrentInteropGrabBag->push_back(pTDefTableHandler->getInteropGrabBag()); @@ -259,7 +259,7 @@ namespace writerfilter::dmapper { { auto pCellMarginHandler = std::make_shared<CellMarginHandler>(); if (m_pCurrentInteropGrabBag) - pCellMarginHandler->enableInteropGrabBag("tcMar"); + pCellMarginHandler->enableInteropGrabBag(u"tcMar"_ustr); pProperties->resolve(*pCellMarginHandler); if (m_pCurrentInteropGrabBag) m_pCurrentInteropGrabBag->push_back(pCellMarginHandler->getInteropGrabBag()); @@ -298,7 +298,7 @@ namespace writerfilter::dmapper { if( pProperties ) { auto pCellColorHandler = std::make_shared<CellColorHandler>(); - pCellColorHandler->enableInteropGrabBag("shd"); //enable to store shd unsupported props in grab bag + pCellColorHandler->enableInteropGrabBag(u"shd"_ustr); //enable to store shd unsupported props in grab bag pProperties->resolve( *pCellColorHandler ); TablePropertyMapPtr pPropertyMap = pCellColorHandler->getProperties(); beans::PropertyValue aGrabBag = pCellColorHandler->getInteropGrabBag(); @@ -319,7 +319,7 @@ namespace writerfilter::dmapper { { auto pCellMarginHandler = std::make_shared<CellMarginHandler>(); if (m_pCurrentInteropGrabBag) - pCellMarginHandler->enableInteropGrabBag("tblCellMar"); + pCellMarginHandler->enableInteropGrabBag(u"tblCellMar"_ustr); pProperties->resolve( *pCellMarginHandler ); if (m_pCurrentInteropGrabBag) m_pCurrentInteropGrabBag->push_back(pCellMarginHandler->getInteropGrabBag()); @@ -343,7 +343,7 @@ namespace writerfilter::dmapper { { MeasureHandlerPtr pHandler(new MeasureHandler); if (m_pCurrentInteropGrabBag) - pHandler->enableInteropGrabBag("tblInd"); + pHandler->enableInteropGrabBag(u"tblInd"_ustr); pProperties->resolve( *pHandler ); if (m_pCurrentInteropGrabBag) m_pCurrentInteropGrabBag->push_back(pHandler->getInteropGrabBag()); diff --git a/sw/source/writerfilter/dmapper/TblStylePrHandler.cxx b/sw/source/writerfilter/dmapper/TblStylePrHandler.cxx index 13656e169ba7..9713e918f8dd 100644 --- a/sw/source/writerfilter/dmapper/TblStylePrHandler.cxx +++ b/sw/source/writerfilter/dmapper/TblStylePrHandler.cxx @@ -47,19 +47,19 @@ OUString TblStylePrHandler::getTypeString() const { switch (m_nType) { - case TBL_STYLE_WHOLETABLE: return "wholeTable"; - case TBL_STYLE_FIRSTROW: return "firstRow"; - case TBL_STYLE_LASTROW: return "lastRow"; - case TBL_STYLE_FIRSTCOL: return "firstCol"; - case TBL_STYLE_LASTCOL: return "lastCol"; - case TBL_STYLE_BAND1VERT: return "band1Vert"; - case TBL_STYLE_BAND2VERT: return "band2Vert"; - case TBL_STYLE_BAND1HORZ: return "band1Horz"; - case TBL_STYLE_BAND2HORZ: return "band2Horz"; - case TBL_STYLE_NECELL: return "neCell"; - case TBL_STYLE_NWCELL: return "nwCell"; - case TBL_STYLE_SECELL: return "seCell"; - case TBL_STYLE_SWCELL: return "swCell"; + case TBL_STYLE_WHOLETABLE: return u"wholeTable"_ustr; + case TBL_STYLE_FIRSTROW: return u"firstRow"_ustr; + case TBL_STYLE_LASTROW: return u"lastRow"_ustr; + case TBL_STYLE_FIRSTCOL: return u"firstCol"_ustr; + case TBL_STYLE_LASTCOL: return u"lastCol"_ustr; + case TBL_STYLE_BAND1VERT: return u"band1Vert"_ustr; + case TBL_STYLE_BAND2VERT: return u"band2Vert"_ustr; + case TBL_STYLE_BAND1HORZ: return u"band1Horz"_ustr; + case TBL_STYLE_BAND2HORZ: return u"band2Horz"_ustr; + case TBL_STYLE_NECELL: return u"neCell"_ustr; + case TBL_STYLE_NWCELL: return u"nwCell"_ustr; + case TBL_STYLE_SECELL: return u"seCell"_ustr; + case TBL_STYLE_SWCELL: return u"swCell"_ustr; default: break; } return OUString(); @@ -148,15 +148,15 @@ void TblStylePrHandler::lcl_sprm(Sprm & rSprm) if (bGrabBag) { if (rSprm.getId() == NS_ooxml::LN_CT_PPrBase) - aSavedGrabBag.push_back(getInteropGrabBag("pPr")); + aSavedGrabBag.push_back(getInteropGrabBag(u"pPr"_ustr)); else if (rSprm.getId() == NS_ooxml::LN_EG_RPrBase) - aSavedGrabBag.push_back(getInteropGrabBag("rPr")); + aSavedGrabBag.push_back(getInteropGrabBag(u"rPr"_ustr)); else if (rSprm.getId() == NS_ooxml::LN_CT_TblPrBase) - aSavedGrabBag.push_back(getInteropGrabBag("tblPr")); + aSavedGrabBag.push_back(getInteropGrabBag(u"tblPr"_ustr)); else if (rSprm.getId() == NS_ooxml::LN_CT_TrPrBase) - aSavedGrabBag.push_back(getInteropGrabBag("trPr")); + aSavedGrabBag.push_back(getInteropGrabBag(u"trPr"_ustr)); else if (rSprm.getId() == NS_ooxml::LN_CT_TcPrBase) - aSavedGrabBag.push_back(getInteropGrabBag("tcPr")); + aSavedGrabBag.push_back(getInteropGrabBag(u"tcPr"_ustr)); std::swap(m_aInteropGrabBag, aSavedGrabBag); } } @@ -190,7 +190,7 @@ void TblStylePrHandler::lcl_sprm(Sprm & rSprm) if ( pProperties ) { auto pCellMarginHandler = std::make_shared<CellMarginHandler>(); - pCellMarginHandler->enableInteropGrabBag("tblCellMar"); + pCellMarginHandler->enableInteropGrabBag(u"tblCellMar"_ustr); pProperties->resolve( *pCellMarginHandler ); m_aInteropGrabBag.push_back(pCellMarginHandler->getInteropGrabBag()); @@ -216,7 +216,7 @@ void TblStylePrHandler::lcl_sprm(Sprm & rSprm) // The DomainMapper can handle some of the properties m_rDMapper.PushStyleSheetProperties( m_pProperties, true ); // Just pass a non-empty string, the array will have a single element anyway. - m_rDMapper.enableInteropGrabBag("TblStylePrHandler"); + m_rDMapper.enableInteropGrabBag(u"TblStylePrHandler"_ustr); m_rDMapper.sprm( rSprm ); uno::Sequence<beans::PropertyValue> aGrabBag = m_rDMapper.getInteropGrabBag().Value.get< uno::Sequence<beans::PropertyValue> >(); if (aGrabBag.hasElements()) diff --git a/sw/source/writerfilter/dmapper/TextEffectsHandler.cxx b/sw/source/writerfilter/dmapper/TextEffectsHandler.cxx index 35d7efbbfee2..612baf34dfa4 100644 --- a/sw/source/writerfilter/dmapper/TextEffectsHandler.cxx +++ b/sw/source/writerfilter/dmapper/TextEffectsHandler.cxx @@ -79,23 +79,23 @@ OUString TextEffectsHandler::getSchemeColorValTypeString(sal_Int32 nType) { switch (nType) { - case NS_ooxml::LN_ST_SchemeColorVal_bg1: return "bg1"; - case NS_ooxml::LN_ST_SchemeColorVal_tx1: return "tx1"; - case NS_ooxml::LN_ST_SchemeColorVal_bg2: return "bg2"; - case NS_ooxml::LN_ST_SchemeColorVal_tx2: return "tx2"; - case NS_ooxml::LN_ST_SchemeColorVal_accent1: return "accent1"; - case NS_ooxml::LN_ST_SchemeColorVal_accent2: return "accent2"; - case NS_ooxml::LN_ST_SchemeColorVal_accent3: return "accent3"; - case NS_ooxml::LN_ST_SchemeColorVal_accent4: return "accent4"; - case NS_ooxml::LN_ST_SchemeColorVal_accent5: return "accent5"; - case NS_ooxml::LN_ST_SchemeColorVal_accent6: return "accent6"; - case NS_ooxml::LN_ST_SchemeColorVal_hlink: return "hlink"; - case NS_ooxml::LN_ST_SchemeColorVal_folHlink: return "folHlink"; - case NS_ooxml::LN_ST_SchemeColorVal_dk1: return "dk1"; - case NS_ooxml::LN_ST_SchemeColorVal_lt1: return "lt1"; - case NS_ooxml::LN_ST_SchemeColorVal_dk2: return "dk2"; - case NS_ooxml::LN_ST_SchemeColorVal_lt2: return "lt2"; - case NS_ooxml::LN_ST_SchemeColorVal_phClr: return "phClr"; + case NS_ooxml::LN_ST_SchemeColorVal_bg1: return u"bg1"_ustr; + case NS_ooxml::LN_ST_SchemeColorVal_tx1: return u"tx1"_ustr; + case NS_ooxml::LN_ST_SchemeColorVal_bg2: return u"bg2"_ustr; + case NS_ooxml::LN_ST_SchemeColorVal_tx2: return u"tx2"_ustr; + case NS_ooxml::LN_ST_SchemeColorVal_accent1: return u"accent1"_ustr; + case NS_ooxml::LN_ST_SchemeColorVal_accent2: return u"accent2"_ustr; + case NS_ooxml::LN_ST_SchemeColorVal_accent3: return u"accent3"_ustr; + case NS_ooxml::LN_ST_SchemeColorVal_accent4: return u"accent4"_ustr; + case NS_ooxml::LN_ST_SchemeColorVal_accent5: return u"accent5"_ustr; + case NS_ooxml::LN_ST_SchemeColorVal_accent6: return u"accent6"_ustr; + case NS_ooxml::LN_ST_SchemeColorVal_hlink: return u"hlink"_ustr; + case NS_ooxml::LN_ST_SchemeColorVal_folHlink: return u"folHlink"_ustr; + case NS_ooxml::LN_ST_SchemeColorVal_dk1: return u"dk1"_ustr; + case NS_ooxml::LN_ST_SchemeColorVal_lt1: return u"lt1"_ustr; + case NS_ooxml::LN_ST_SchemeColorVal_dk2: return u"dk2"_ustr; + case NS_ooxml::LN_ST_SchemeColorVal_lt2: return u"lt2"_ustr; + case NS_ooxml::LN_ST_SchemeColorVal_phClr: return u"phClr"_ustr; default: break; } return OUString(); @@ -105,16 +105,16 @@ OUString TextEffectsHandler::getRectAlignmentString(sal_Int32 nType) { switch (nType) { - case NS_ooxml::LN_ST_RectAlignment_none: return "none"; - case NS_ooxml::LN_ST_RectAlignment_tl: return "tl"; - case NS_ooxml::LN_ST_RectAlignment_t: return "t"; - case NS_ooxml::LN_ST_RectAlignment_tr: return "tr"; - case NS_ooxml::LN_ST_RectAlignment_l: return "l"; - case NS_ooxml::LN_ST_RectAlignment_ctr: return "ctr"; - case NS_ooxml::LN_ST_RectAlignment_r: return "r"; - case NS_ooxml::LN_ST_RectAlignment_bl: return "bl"; - case NS_ooxml::LN_ST_RectAlignment_b: return "b"; - case NS_ooxml::LN_ST_RectAlignment_br: return "br"; + case NS_ooxml::LN_ST_RectAlignment_none: return u"none"_ustr; + case NS_ooxml::LN_ST_RectAlignment_tl: return u"tl"_ustr; + case NS_ooxml::LN_ST_RectAlignment_t: return u"t"_ustr; + case NS_ooxml::LN_ST_RectAlignment_tr: return u"tr"_ustr; + case NS_ooxml::LN_ST_RectAlignment_l: return u"l"_ustr; + case NS_ooxml::LN_ST_RectAlignment_ctr: return u"ctr"_ustr; + case NS_ooxml::LN_ST_RectAlignment_r: return u"r"_ustr; + case NS_ooxml::LN_ST_RectAlignment_bl: return u"bl"_ustr; + case NS_ooxml::LN_ST_RectAlignment_b: return u"b"_ustr; + case NS_ooxml::LN_ST_RectAlignment_br: return u"br"_ustr; default: break; } @@ -125,9 +125,9 @@ OUString TextEffectsHandler::getLineCapString(sal_Int32 nType) { switch (nType) { - case NS_ooxml::LN_ST_LineCap_rnd: return "rnd"; - case NS_ooxml::LN_ST_LineCap_sq: return "sq"; - case NS_ooxml::LN_ST_LineCap_flat: return "flat"; + case NS_ooxml::LN_ST_LineCap_rnd: return u"rnd"_ustr; + case NS_ooxml::LN_ST_LineCap_sq: return u"sq"_ustr; + case NS_ooxml::LN_ST_LineCap_flat: return u"flat"_ustr; default: break; } return OUString(); @@ -137,11 +137,11 @@ OUString TextEffectsHandler::getCompoundLineString(sal_Int32 nType) { switch (nType) { - case NS_ooxml::LN_ST_CompoundLine_sng: return "sng"; - case NS_ooxml::LN_ST_CompoundLine_dbl: return "dbl"; - case NS_ooxml::LN_ST_CompoundLine_thickThin: return "thickThin"; - case NS_ooxml::LN_ST_CompoundLine_thinThick: return "thinThick"; - case NS_ooxml::LN_ST_CompoundLine_tri: return "tri"; + case NS_ooxml::LN_ST_CompoundLine_sng: return u"sng"_ustr; + case NS_ooxml::LN_ST_CompoundLine_dbl: return u"dbl"_ustr; + case NS_ooxml::LN_ST_CompoundLine_thickThin: return u"thickThin"_ustr; + case NS_ooxml::LN_ST_CompoundLine_thinThick: return u"thinThick"_ustr; + case NS_ooxml::LN_ST_CompoundLine_tri: return u"tri"_ustr; default: break; } return OUString(); @@ -151,8 +151,8 @@ OUString TextEffectsHandler::getPenAlignmentString(sal_Int32 nType) { switch (nType) { - case NS_ooxml::LN_ST_PenAlignment_ctr: return "ctr"; - case NS_ooxml::LN_ST_PenAlignment_in: return "in"; + case NS_ooxml::LN_ST_PenAlignment_ctr: return u"ctr"_ustr; + case NS_ooxml::LN_ST_PenAlignment_in: return u"in"_ustr; default: break; } return OUString(); @@ -162,10 +162,10 @@ OUString TextEffectsHandler::getOnOffString(sal_Int32 nType) { switch (nType) { - case NS_ooxml::LN_ST_OnOff_true: return "true"; - case NS_ooxml::LN_ST_OnOff_false: return "false"; - case NS_ooxml::LN_ST_OnOff_1: return "1"; - case NS_ooxml::LN_ST_OnOff_0: return "0"; + case NS_ooxml::LN_ST_OnOff_true: return u"true"_ustr; + case NS_ooxml::LN_ST_OnOff_false: return u"false"_ustr; + case NS_ooxml::LN_ST_OnOff_1: return u"1"_ustr; + case NS_ooxml::LN_ST_OnOff_0: return u"0"_ustr; default: break; } return OUString(); @@ -175,9 +175,9 @@ OUString TextEffectsHandler::getPathShadeTypeString(sal_Int32 nType) { switch (nType) { - case NS_ooxml::LN_ST_PathShadeType_shape: return "shape"; - case NS_ooxml::LN_ST_PathShadeType_circle: return "circle"; - case NS_ooxml::LN_ST_PathShadeType_rect: return "rect"; + case NS_ooxml::LN_ST_PathShadeType_shape: return u"shape"_ustr; + case NS_ooxml::LN_ST_PathShadeType_circle: return u"circle"_ustr; + case NS_ooxml::LN_ST_PathShadeType_rect: return u"rect"_ustr; default: break; } return OUString(); @@ -187,17 +187,17 @@ OUString TextEffectsHandler::getPresetLineDashValString(sal_Int32 nType) { switch (nType) { - case NS_ooxml::LN_ST_PresetLineDashVal_solid: return "solid"; - case NS_ooxml::LN_ST_PresetLineDashVal_dot: return "dot"; - case NS_ooxml::LN_ST_PresetLineDashVal_sysDot: return "sysDot"; - case NS_ooxml::LN_ST_PresetLineDashVal_dash: return "dash"; - case NS_ooxml::LN_ST_PresetLineDashVal_sysDash: return "sysDash"; - case NS_ooxml::LN_ST_PresetLineDashVal_lgDash: return "lgDash"; - case NS_ooxml::LN_ST_PresetLineDashVal_dashDot: return "dashDot"; - case NS_ooxml::LN_ST_PresetLineDashVal_sysDashDot: return "sysDashDot"; - case NS_ooxml::LN_ST_PresetLineDashVal_lgDashDot: return "lgDashDot"; - case NS_ooxml::LN_ST_PresetLineDashVal_lgDashDotDot: return "lgDashDotDot"; - case NS_ooxml::LN_ST_PresetLineDashVal_sysDashDotDot: return "sysDashDotDot"; + case NS_ooxml::LN_ST_PresetLineDashVal_solid: return u"solid"_ustr; + case NS_ooxml::LN_ST_PresetLineDashVal_dot: return u"dot"_ustr; + case NS_ooxml::LN_ST_PresetLineDashVal_sysDot: return u"sysDot"_ustr; + case NS_ooxml::LN_ST_PresetLineDashVal_dash: return u"dash"_ustr; + case NS_ooxml::LN_ST_PresetLineDashVal_sysDash: return u"sysDash"_ustr; + case NS_ooxml::LN_ST_PresetLineDashVal_lgDash: return u"lgDash"_ustr; + case NS_ooxml::LN_ST_PresetLineDashVal_dashDot: return u"dashDot"_ustr; + case NS_ooxml::LN_ST_PresetLineDashVal_sysDashDot: return u"sysDashDot"_ustr; + case NS_ooxml::LN_ST_PresetLineDashVal_lgDashDot: return u"lgDashDot"_ustr; + case NS_ooxml::LN_ST_PresetLineDashVal_lgDashDotDot: return u"lgDashDotDot"_ustr; + case NS_ooxml::LN_ST_PresetLineDashVal_sysDashDotDot: return u"sysDashDotDot"_ustr; default: break; } return OUString(); @@ -207,68 +207,68 @@ OUString TextEffectsHandler::getPresetCameraTypeString(sal_Int32 nType) { switch (nType) { - case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueTopLeft: return "legacyObliqueTopLeft"; - case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueTop: return "legacyObliqueTop"; - case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueTopRight: return "legacyObliqueTopRight"; - case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueLeft: return "legacyObliqueLeft"; - case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueFront: return "legacyObliqueFront"; - case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueRight: return "legacyObliqueRight"; - case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueBottomLeft: return "legacyObliqueBottomLeft"; - case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueBottom: return "legacyObliqueBottom"; - case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueBottomRight: return "legacyObliqueBottomRight"; - case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveTopLeft: return "legacyPerspectiveTopLeft"; - case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveTop: return "legacyPerspectiveTop"; - case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveTopRight: return "legacyPerspectiveTopRight"; - case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveLeft: return "legacyPerspectiveLeft"; - case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveFront: return "legacyPerspectiveFront"; - case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveRight: return "legacyPerspectiveRight"; - case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveBottomLeft: return "legacyPerspectiveBottomLeft"; - case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveBottom: return "legacyPerspectiveBottom"; - case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveBottomRight: return "legacyPerspectiveBottomRight"; - case NS_ooxml::LN_ST_PresetCameraType_orthographicFront: return "orthographicFront"; - case NS_ooxml::LN_ST_PresetCameraType_isometricTopUp: return "isometricTopUp"; - case NS_ooxml::LN_ST_PresetCameraType_isometricTopDown: return "isometricTopDown"; - case NS_ooxml::LN_ST_PresetCameraType_isometricBottomUp: return "isometricBottomUp"; - case NS_ooxml::LN_ST_PresetCameraType_isometricBottomDown: return "isometricBottomDown"; - case NS_ooxml::LN_ST_PresetCameraType_isometricLeftUp: return "isometricLeftUp"; - case NS_ooxml::LN_ST_PresetCameraType_isometricLeftDown: return "isometricLeftDown"; - case NS_ooxml::LN_ST_PresetCameraType_isometricRightUp: return "isometricRightUp"; - case NS_ooxml::LN_ST_PresetCameraType_isometricRightDown: return "isometricRightDown"; - case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis1Left: return "isometricOffAxis1Left"; - case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis1Right: return "isometricOffAxis1Right"; - case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis1Top: return "isometricOffAxis1Top"; - case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis2Left: return "isometricOffAxis2Left"; - case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis2Right: return "isometricOffAxis2Right"; - case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis2Top: return "isometricOffAxis2Top"; - case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis3Left: return "isometricOffAxis3Left"; - case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis3Right: return "isometricOffAxis3Right"; - case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis3Bottom: return "isometricOffAxis3Bottom"; - case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis4Left: return "isometricOffAxis4Left"; - case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis4Right: return "isometricOffAxis4Right"; - case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis4Bottom: return "isometricOffAxis4Bottom"; - case NS_ooxml::LN_ST_PresetCameraType_obliqueTopLeft: return "obliqueTopLeft"; - case NS_ooxml::LN_ST_PresetCameraType_obliqueTop: return "obliqueTop"; - case NS_ooxml::LN_ST_PresetCameraType_obliqueTopRight: return "obliqueTopRight"; - case NS_ooxml::LN_ST_PresetCameraType_obliqueLeft: return "obliqueLeft"; - case NS_ooxml::LN_ST_PresetCameraType_obliqueRight: return "obliqueRight"; - case NS_ooxml::LN_ST_PresetCameraType_obliqueBottomLeft: return "obliqueBottomLeft"; - case NS_ooxml::LN_ST_PresetCameraType_obliqueBottom: return "obliqueBottom"; - case NS_ooxml::LN_ST_PresetCameraType_obliqueBottomRight: return "obliqueBottomRight"; - case NS_ooxml::LN_ST_PresetCameraType_perspectiveFront: return "perspectiveFront"; - case NS_ooxml::LN_ST_PresetCameraType_perspectiveLeft: return "perspectiveLeft"; - case NS_ooxml::LN_ST_PresetCameraType_perspectiveRight: return "perspectiveRight"; - case NS_ooxml::LN_ST_PresetCameraType_perspectiveAbove: return "perspectiveAbove"; - case NS_ooxml::LN_ST_PresetCameraType_perspectiveBelow: return "perspectiveBelow"; - case NS_ooxml::LN_ST_PresetCameraType_perspectiveAboveLeftFacing: return "perspectiveAboveLeftFacing"; - case NS_ooxml::LN_ST_PresetCameraType_perspectiveAboveRightFacing: return "perspectiveAboveRightFacing"; - case NS_ooxml::LN_ST_PresetCameraType_perspectiveContrastingLeftFacing: return "perspectiveContrastingLeftFacing"; - case NS_ooxml::LN_ST_PresetCameraType_perspectiveContrastingRightFacing: return "perspectiveContrastingRightFacing"; - case NS_ooxml::LN_ST_PresetCameraType_perspectiveHeroicLeftFacing: return "perspectiveHeroicLeftFacing"; - case NS_ooxml::LN_ST_PresetCameraType_perspectiveHeroicRightFacing: return "perspectiveHeroicRightFacing"; - case NS_ooxml::LN_ST_PresetCameraType_perspectiveHeroicExtremeLeftFacing: return "perspectiveHeroicExtremeLeftFacing"; - case NS_ooxml::LN_ST_PresetCameraType_perspectiveHeroicExtremeRightFacing: return "perspectiveHeroicExtremeRightFacing"; - case NS_ooxml::LN_ST_PresetCameraType_perspectiveRelaxed: return "perspectiveRelaxed"; - case NS_ooxml::LN_ST_PresetCameraType_perspectiveRelaxedModerately: return "perspectiveRelaxedModerately"; + case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueTopLeft: return u"legacyObliqueTopLeft"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueTop: return u"legacyObliqueTop"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueTopRight: return u"legacyObliqueTopRight"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueLeft: return u"legacyObliqueLeft"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueFront: return u"legacyObliqueFront"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueRight: return u"legacyObliqueRight"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueBottomLeft: return u"legacyObliqueBottomLeft"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueBottom: return u"legacyObliqueBottom"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueBottomRight: return u"legacyObliqueBottomRight"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveTopLeft: return u"legacyPerspectiveTopLeft"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveTop: return u"legacyPerspectiveTop"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveTopRight: return u"legacyPerspectiveTopRight"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveLeft: return u"legacyPerspectiveLeft"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveFront: return u"legacyPerspectiveFront"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveRight: return u"legacyPerspectiveRight"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveBottomLeft: return u"legacyPerspectiveBottomLeft"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveBottom: return u"legacyPerspectiveBottom"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveBottomRight: return u"legacyPerspectiveBottomRight"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_orthographicFront: return u"orthographicFront"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_isometricTopUp: return u"isometricTopUp"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_isometricTopDown: return u"isometricTopDown"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_isometricBottomUp: return u"isometricBottomUp"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_isometricBottomDown: return u"isometricBottomDown"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_isometricLeftUp: return u"isometricLeftUp"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_isometricLeftDown: return u"isometricLeftDown"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_isometricRightUp: return u"isometricRightUp"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_isometricRightDown: return u"isometricRightDown"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis1Left: return u"isometricOffAxis1Left"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis1Right: return u"isometricOffAxis1Right"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis1Top: return u"isometricOffAxis1Top"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis2Left: return u"isometricOffAxis2Left"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis2Right: return u"isometricOffAxis2Right"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis2Top: return u"isometricOffAxis2Top"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis3Left: return u"isometricOffAxis3Left"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis3Right: return u"isometricOffAxis3Right"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis3Bottom: return u"isometricOffAxis3Bottom"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis4Left: return u"isometricOffAxis4Left"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis4Right: return u"isometricOffAxis4Right"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis4Bottom: return u"isometricOffAxis4Bottom"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_obliqueTopLeft: return u"obliqueTopLeft"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_obliqueTop: return u"obliqueTop"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_obliqueTopRight: return u"obliqueTopRight"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_obliqueLeft: return u"obliqueLeft"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_obliqueRight: return u"obliqueRight"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_obliqueBottomLeft: return u"obliqueBottomLeft"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_obliqueBottom: return u"obliqueBottom"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_obliqueBottomRight: return u"obliqueBottomRight"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_perspectiveFront: return u"perspectiveFront"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_perspectiveLeft: return u"perspectiveLeft"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_perspectiveRight: return u"perspectiveRight"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_perspectiveAbove: return u"perspectiveAbove"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_perspectiveBelow: return u"perspectiveBelow"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_perspectiveAboveLeftFacing: return u"perspectiveAboveLeftFacing"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_perspectiveAboveRightFacing: return u"perspectiveAboveRightFacing"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_perspectiveContrastingLeftFacing: return u"perspectiveContrastingLeftFacing"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_perspectiveContrastingRightFacing: return u"perspectiveContrastingRightFacing"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_perspectiveHeroicLeftFacing: return u"perspectiveHeroicLeftFacing"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_perspectiveHeroicRightFacing: return u"perspectiveHeroicRightFacing"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_perspectiveHeroicExtremeLeftFacing: return u"perspectiveHeroicExtremeLeftFacing"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_perspectiveHeroicExtremeRightFacing: return u"perspectiveHeroicExtremeRightFacing"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_perspectiveRelaxed: return u"perspectiveRelaxed"_ustr; + case NS_ooxml::LN_ST_PresetCameraType_perspectiveRelaxedModerately: return u"perspectiveRelaxedModerately"_ustr; default: break; } return OUString(); @@ -279,33 +279,33 @@ OUString TextEffectsHandler::getLightRigTypeString(sal_Int32 nType) { switch (nType) { - case NS_ooxml::LN_ST_LightRigType_legacyFlat1: return "legacyFlat1"; - case NS_ooxml::LN_ST_LightRigType_legacyFlat2: return "legacyFlat2"; - case NS_ooxml::LN_ST_LightRigType_legacyFlat3: return "legacyFlat3"; - case NS_ooxml::LN_ST_LightRigType_legacyFlat4: return "legacyFlat4"; - case NS_ooxml::LN_ST_LightRigType_legacyNormal1: return "legacyNormal1"; - case NS_ooxml::LN_ST_LightRigType_legacyNormal2: return "legacyNormal2"; - case NS_ooxml::LN_ST_LightRigType_legacyNormal3: return "legacyNormal3"; - case NS_ooxml::LN_ST_LightRigType_legacyNormal4: return "legacyNormal4"; - case NS_ooxml::LN_ST_LightRigType_legacyHarsh1: return "legacyHarsh1"; - case NS_ooxml::LN_ST_LightRigType_legacyHarsh2: return "legacyHarsh2"; - case NS_ooxml::LN_ST_LightRigType_legacyHarsh3: return "legacyHarsh3"; - case NS_ooxml::LN_ST_LightRigType_legacyHarsh4: return "legacyHarsh4"; - case NS_ooxml::LN_ST_LightRigType_threePt: return "threePt"; - case NS_ooxml::LN_ST_LightRigType_balanced: return "balanced"; - case NS_ooxml::LN_ST_LightRigType_soft: return "soft"; - case NS_ooxml::LN_ST_LightRigType_harsh: return "harsh"; - case NS_ooxml::LN_ST_LightRigType_flood: return "flood"; - case NS_ooxml::LN_ST_LightRigType_contrasting: return "contrasting"; - case NS_ooxml::LN_ST_LightRigType_morning: return "morning"; - case NS_ooxml::LN_ST_LightRigType_sunrise: return "sunrise"; - case NS_ooxml::LN_ST_LightRigType_sunset: return "sunset"; - case NS_ooxml::LN_ST_LightRigType_chilly: return "chilly"; - case NS_ooxml::LN_ST_LightRigType_freezing: return "freezing"; - case NS_ooxml::LN_ST_LightRigType_flat: return "flat"; - case NS_ooxml::LN_ST_LightRigType_twoPt: return "twoPt"; - case NS_ooxml::LN_ST_LightRigType_glow: return "glow"; - case NS_ooxml::LN_ST_LightRigType_brightRoom: return "brightRoom"; + case NS_ooxml::LN_ST_LightRigType_legacyFlat1: return u"legacyFlat1"_ustr; + case NS_ooxml::LN_ST_LightRigType_legacyFlat2: return u"legacyFlat2"_ustr; + case NS_ooxml::LN_ST_LightRigType_legacyFlat3: return u"legacyFlat3"_ustr; + case NS_ooxml::LN_ST_LightRigType_legacyFlat4: return u"legacyFlat4"_ustr; + case NS_ooxml::LN_ST_LightRigType_legacyNormal1: return u"legacyNormal1"_ustr; + case NS_ooxml::LN_ST_LightRigType_legacyNormal2: return u"legacyNormal2"_ustr; + case NS_ooxml::LN_ST_LightRigType_legacyNormal3: return u"legacyNormal3"_ustr; + case NS_ooxml::LN_ST_LightRigType_legacyNormal4: return u"legacyNormal4"_ustr; + case NS_ooxml::LN_ST_LightRigType_legacyHarsh1: return u"legacyHarsh1"_ustr; + case NS_ooxml::LN_ST_LightRigType_legacyHarsh2: return u"legacyHarsh2"_ustr; + case NS_ooxml::LN_ST_LightRigType_legacyHarsh3: return u"legacyHarsh3"_ustr; + case NS_ooxml::LN_ST_LightRigType_legacyHarsh4: return u"legacyHarsh4"_ustr; + case NS_ooxml::LN_ST_LightRigType_threePt: return u"threePt"_ustr; + case NS_ooxml::LN_ST_LightRigType_balanced: return u"balanced"_ustr; + case NS_ooxml::LN_ST_LightRigType_soft: return u"soft"_ustr; + case NS_ooxml::LN_ST_LightRigType_harsh: return u"harsh"_ustr; + case NS_ooxml::LN_ST_LightRigType_flood: return u"flood"_ustr; + case NS_ooxml::LN_ST_LightRigType_contrasting: return u"contrasting"_ustr; + case NS_ooxml::LN_ST_LightRigType_morning: return u"morning"_ustr; + case NS_ooxml::LN_ST_LightRigType_sunrise: return u"sunrise"_ustr; + case NS_ooxml::LN_ST_LightRigType_sunset: return u"sunset"_ustr; + case NS_ooxml::LN_ST_LightRigType_chilly: return u"chilly"_ustr; + case NS_ooxml::LN_ST_LightRigType_freezing: return u"freezing"_ustr; + case NS_ooxml::LN_ST_LightRigType_flat: return u"flat"_ustr; + case NS_ooxml::LN_ST_LightRigType_twoPt: return u"twoPt"_ustr; + case NS_ooxml::LN_ST_LightRigType_glow: return u"glow"_ustr; + case NS_ooxml::LN_ST_LightRigType_brightRoom: return u"brightRoom"_ustr; default: break; } return OUString(); @@ -315,14 +315,14 @@ OUString TextEffectsHandler::getLightRigDirectionString(sal_Int32 nType) { switch (nType) { - case NS_ooxml::LN_ST_LightRigDirection_tl: return "tl"; - case NS_ooxml::LN_ST_LightRigDirection_t: return "t"; - case NS_ooxml::LN_ST_LightRigDirection_tr: return "tr"; - case NS_ooxml::LN_ST_LightRigDirection_l: return "l"; - case NS_ooxml::LN_ST_LightRigDirection_r: return "r"; - case NS_ooxml::LN_ST_LightRigDirection_bl: return "bl"; - case NS_ooxml::LN_ST_LightRigDirection_b: return "b"; - case NS_ooxml::LN_ST_LightRigDirection_br: return "br"; + case NS_ooxml::LN_ST_LightRigDirection_tl: return u"tl"_ustr; + case NS_ooxml::LN_ST_LightRigDirection_t: return u"t"_ustr; + case NS_ooxml::LN_ST_LightRigDirection_tr: return u"tr"_ustr; + case NS_ooxml::LN_ST_LightRigDirection_l: return u"l"_ustr; + case NS_ooxml::LN_ST_LightRigDirection_r: return u"r"_ustr; + case NS_ooxml::LN_ST_LightRigDirection_bl: return u"bl"_ustr; + case NS_ooxml::LN_ST_LightRigDirection_b: return u"b"_ustr; + case NS_ooxml::LN_ST_LightRigDirection_br: return u"br"_ustr; default: break; } @@ -333,18 +333,18 @@ OUString TextEffectsHandler::getBevelPresetTypeString(sal_Int32 nType) { switch (nType) { - case NS_ooxml::LN_ST_BevelPresetType_relaxedInset: return "relaxedInset"; - case NS_ooxml::LN_ST_BevelPresetType_circle: return "circle"; - case NS_ooxml::LN_ST_BevelPresetType_slope: return "slope"; - case NS_ooxml::LN_ST_BevelPresetType_cross: return "cross"; - case NS_ooxml::LN_ST_BevelPresetType_angle: return "angle"; - case NS_ooxml::LN_ST_BevelPresetType_softRound: return "softRound"; - case NS_ooxml::LN_ST_BevelPresetType_convex: return "convex"; - case NS_ooxml::LN_ST_BevelPresetType_coolSlant: return "coolSlant"; - case NS_ooxml::LN_ST_BevelPresetType_divot: return "divot"; - case NS_ooxml::LN_ST_BevelPresetType_riblet: return "riblet"; - case NS_ooxml::LN_ST_BevelPresetType_hardEdge: return "hardEdge"; - case NS_ooxml::LN_ST_BevelPresetType_artDeco: return "artDeco"; + case NS_ooxml::LN_ST_BevelPresetType_relaxedInset: return u"relaxedInset"_ustr; + case NS_ooxml::LN_ST_BevelPresetType_circle: return u"circle"_ustr; + case NS_ooxml::LN_ST_BevelPresetType_slope: return u"slope"_ustr; + case NS_ooxml::LN_ST_BevelPresetType_cross: return u"cross"_ustr; + case NS_ooxml::LN_ST_BevelPresetType_angle: return u"angle"_ustr; + case NS_ooxml::LN_ST_BevelPresetType_softRound: return u"softRound"_ustr; + case NS_ooxml::LN_ST_BevelPresetType_convex: return u"convex"_ustr; + case NS_ooxml::LN_ST_BevelPresetType_coolSlant: return u"coolSlant"_ustr; + case NS_ooxml::LN_ST_BevelPresetType_divot: return u"divot"_ustr; + case NS_ooxml::LN_ST_BevelPresetType_riblet: return u"riblet"_ustr; + case NS_ooxml::LN_ST_BevelPresetType_hardEdge: return u"hardEdge"_ustr; + case NS_ooxml::LN_ST_BevelPresetType_artDeco: return u"artDeco"_ustr; default: break; } return OUString(); @@ -354,22 +354,22 @@ OUString TextEffectsHandler::getPresetMaterialTypeString(sal_Int32 nType) { switch (nType) { - case NS_ooxml::LN_ST_PresetMaterialType_legacyMatte: return "legacyMatte"; - case NS_ooxml::LN_ST_PresetMaterialType_legacyPlastic: return "legacyPlastic"; - case NS_ooxml::LN_ST_PresetMaterialType_legacyMetal: return "legacyMetal"; - case NS_ooxml::LN_ST_PresetMaterialType_legacyWireframe: return "legacyWireframe"; - case NS_ooxml::LN_ST_PresetMaterialType_matte: return "matte"; - case NS_ooxml::LN_ST_PresetMaterialType_plastic: return "plastic"; - case NS_ooxml::LN_ST_PresetMaterialType_metal: return "metal"; - case NS_ooxml::LN_ST_PresetMaterialType_warmMatte: return "warmMatte"; - case NS_ooxml::LN_ST_PresetMaterialType_translucentPowder: return "translucentPowder"; - case NS_ooxml::LN_ST_PresetMaterialType_powder: return "powder"; - case NS_ooxml::LN_ST_PresetMaterialType_dkEdge: return "dkEdge"; - case NS_ooxml::LN_ST_PresetMaterialType_softEdge: return "softEdge"; - case NS_ooxml::LN_ST_PresetMaterialType_clear: return "clear"; - case NS_ooxml::LN_ST_PresetMaterialType_flat: return "flat"; - case NS_ooxml::LN_ST_PresetMaterialType_softmetal: return "softmetal"; - case NS_ooxml::LN_ST_PresetMaterialType_none: return "none"; + case NS_ooxml::LN_ST_PresetMaterialType_legacyMatte: return u"legacyMatte"_ustr; + case NS_ooxml::LN_ST_PresetMaterialType_legacyPlastic: return u"legacyPlastic"_ustr; + case NS_ooxml::LN_ST_PresetMaterialType_legacyMetal: return u"legacyMetal"_ustr; + case NS_ooxml::LN_ST_PresetMaterialType_legacyWireframe: return u"legacyWireframe"_ustr; + case NS_ooxml::LN_ST_PresetMaterialType_matte: return u"matte"_ustr; + case NS_ooxml::LN_ST_PresetMaterialType_plastic: return u"plastic"_ustr; + case NS_ooxml::LN_ST_PresetMaterialType_metal: return u"metal"_ustr; + case NS_ooxml::LN_ST_PresetMaterialType_warmMatte: return u"warmMatte"_ustr; + case NS_ooxml::LN_ST_PresetMaterialType_translucentPowder: return u"translucentPowder"_ustr; + case NS_ooxml::LN_ST_PresetMaterialType_powder: return u"powder"_ustr; + case NS_ooxml::LN_ST_PresetMaterialType_dkEdge: return u"dkEdge"_ustr; + case NS_ooxml::LN_ST_PresetMaterialType_softEdge: return u"softEdge"_ustr; + case NS_ooxml::LN_ST_PresetMaterialType_clear: return u"clear"_ustr; + case NS_ooxml::LN_ST_PresetMaterialType_flat: return u"flat"_ustr; + case NS_ooxml::LN_ST_PresetMaterialType_softmetal: return u"softmetal"_ustr; + case NS_ooxml::LN_ST_PresetMaterialType_none: return u"none"_ustr; default: break; } return OUString(); @@ -379,22 +379,22 @@ OUString TextEffectsHandler::getLigaturesString(sal_Int32 nType) { switch (nType) { - case NS_ooxml::LN_ST_Ligatures_none: return "none"; - case NS_ooxml::LN_ST_Ligatures_standard: return "standard"; - case NS_ooxml::LN_ST_Ligatures_contextual: return "contextual"; - case NS_ooxml::LN_ST_Ligatures_historical: return "historical"; - case NS_ooxml::LN_ST_Ligatures_discretional: return "discretional"; - case NS_ooxml::LN_ST_Ligatures_standardContextual: return "standardContextual"; - case NS_ooxml::LN_ST_Ligatures_standardHistorical: return "standardHistorical"; - case NS_ooxml::LN_ST_Ligatures_contextualHistorical: return "contextualHistorical"; - case NS_ooxml::LN_ST_Ligatures_standardDiscretional: return "standardDiscretional"; - case NS_ooxml::LN_ST_Ligatures_contextualDiscretional: return "contextualDiscretional"; - case NS_ooxml::LN_ST_Ligatures_historicalDiscretional: return "historicalDiscretional"; - case NS_ooxml::LN_ST_Ligatures_standardContextualHistorical: return "standardContextualHistorical"; - case NS_ooxml::LN_ST_Ligatures_standardContextualDiscretional: return "standardContextualDiscretional"; - case NS_ooxml::LN_ST_Ligatures_standardHistoricalDiscretional: return "standardHistoricalDiscretional"; - case NS_ooxml::LN_ST_Ligatures_contextualHistoricalDiscretional: return "contextualHistoricalDiscretional"; - case NS_ooxml::LN_ST_Ligatures_all: return "all"; + case NS_ooxml::LN_ST_Ligatures_none: return u"none"_ustr; + case NS_ooxml::LN_ST_Ligatures_standard: return u"standard"_ustr; + case NS_ooxml::LN_ST_Ligatures_contextual: return u"contextual"_ustr; + case NS_ooxml::LN_ST_Ligatures_historical: return u"historical"_ustr; + case NS_ooxml::LN_ST_Ligatures_discretional: return u"discretional"_ustr; + case NS_ooxml::LN_ST_Ligatures_standardContextual: return u"standardContextual"_ustr; + case NS_ooxml::LN_ST_Ligatures_standardHistorical: return u"standardHistorical"_ustr; + case NS_ooxml::LN_ST_Ligatures_contextualHistorical: return u"contextualHistorical"_ustr; + case NS_ooxml::LN_ST_Ligatures_standardDiscretional: return u"standardDiscretional"_ustr; + case NS_ooxml::LN_ST_Ligatures_contextualDiscretional: return u"contextualDiscretional"_ustr; + case NS_ooxml::LN_ST_Ligatures_historicalDiscretional: return u"historicalDiscretional"_ustr; + case NS_ooxml::LN_ST_Ligatures_standardContextualHistorical: return u"standardContextualHistorical"_ustr; + case NS_ooxml::LN_ST_Ligatures_standardContextualDiscretional: return u"standardContextualDiscretional"_ustr; + case NS_ooxml::LN_ST_Ligatures_standardHistoricalDiscretional: return u"standardHistoricalDiscretional"_ustr; + case NS_ooxml::LN_ST_Ligatures_contextualHistoricalDiscretional: return u"contextualHistoricalDiscretional"_ustr; + case NS_ooxml::LN_ST_Ligatures_all: return u"all"_ustr; default: break; } return OUString(); @@ -404,9 +404,9 @@ OUString TextEffectsHandler::getNumFormString(sal_Int32 nType) { switch (nType) { - case NS_ooxml::LN_ST_NumForm_default: return "default"; - case NS_ooxml::LN_ST_NumForm_lining: return "lining"; - case NS_ooxml::LN_ST_NumForm_oldStyle: return "oldStyle"; + case NS_ooxml::LN_ST_NumForm_default: return u"default"_ustr; + case NS_ooxml::LN_ST_NumForm_lining: return u"lining"_ustr; + case NS_ooxml::LN_ST_NumForm_oldStyle: return u"oldStyle"_ustr; default: break; } return OUString(); @@ -416,9 +416,9 @@ OUString TextEffectsHandler::getNumSpacingString(sal_Int32 nType) { switch (nType) { - case NS_ooxml::LN_ST_NumSpacing_default: return "default"; - case NS_ooxml::LN_ST_NumSpacing_proportional: return "proportional"; - case NS_ooxml::LN_ST_NumSpacing_tabular: return "tabular"; + case NS_ooxml::LN_ST_NumSpacing_default: return u"default"_ustr; + case NS_ooxml::LN_ST_NumSpacing_proportional: return u"proportional"_ustr; + case NS_ooxml::LN_ST_NumSpacing_tabular: return u"tabular"_ustr; default: break; } return OUString(); @@ -503,15 +503,15 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue) case NS_ooxml::LN_CT_Percentage_val: case NS_ooxml::LN_CT_PositiveFixedPercentage_val: case NS_ooxml::LN_CT_PositivePercentage_val: - mpGrabBagStack->addInt32("val", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"val"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_Glow_rad: - mpGrabBagStack->addInt32("rad", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"rad"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_SchemeColor_val: { OUString aString = getSchemeColorValTypeString(sal_Int32(aValue.getInt())); - mpGrabBagStack->addString("val", aString); + mpGrabBagStack->addString(u"val"_ustr, aString); } break; case NS_ooxml::LN_CT_SRgbColor_val: @@ -520,196 +520,196 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue) OUStringBuffer aString; comphelper::string::padToLength(aString, 6 - aBuffer.getLength(), '0'); aString.append(aBuffer.getStr()); - mpGrabBagStack->addString("val", aString.makeStringAndClear().toAsciiUpperCase()); + mpGrabBagStack->addString(u"val"_ustr, aString.makeStringAndClear().toAsciiUpperCase()); } break; case NS_ooxml::LN_CT_Shadow_blurRad: case NS_ooxml::LN_CT_Reflection_blurRad: - mpGrabBagStack->addInt32("blurRad", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"blurRad"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_Reflection_stA: - mpGrabBagStack->addInt32("stA", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"stA"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_Reflection_stPos: - mpGrabBagStack->addInt32("stPos", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"stPos"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_Reflection_endA: - mpGrabBagStack->addInt32("endA", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"endA"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_Reflection_endPos: - mpGrabBagStack->addInt32("endPos", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"endPos"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_Shadow_dist: case NS_ooxml::LN_CT_Reflection_dist: - mpGrabBagStack->addInt32("dist", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"dist"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_Shadow_dir: case NS_ooxml::LN_CT_Reflection_dir: - mpGrabBagStack->addInt32("dir", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"dir"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_Reflection_fadeDir: - mpGrabBagStack->addInt32("fadeDir", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"fadeDir"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_Shadow_sx: case NS_ooxml::LN_CT_Reflection_sx: - mpGrabBagStack->addInt32("sx", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"sx"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_Shadow_sy: case NS_ooxml::LN_CT_Reflection_sy: - mpGrabBagStack->addInt32("sy", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"sy"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_Shadow_kx: case NS_ooxml::LN_CT_Reflection_kx: - mpGrabBagStack->addInt32("kx", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"kx"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_Shadow_ky: case NS_ooxml::LN_CT_Reflection_ky: - mpGrabBagStack->addInt32("ky", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"ky"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_Shadow_algn: case NS_ooxml::LN_CT_Reflection_algn: { uno::Any aAny(getRectAlignmentString(sal_Int32(aValue.getInt()))); - mpGrabBagStack->appendElement("algn", aAny); + mpGrabBagStack->appendElement(u"algn"_ustr, aAny); } break; case NS_ooxml::LN_CT_TextOutlineEffect_w: - mpGrabBagStack->addInt32("w", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"w"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_TextOutlineEffect_cap: { uno::Any aAny(getLineCapString(sal_Int32(aValue.getInt()))); - mpGrabBagStack->appendElement("cap", aAny); + mpGrabBagStack->appendElement(u"cap"_ustr, aAny); } break; case NS_ooxml::LN_CT_TextOutlineEffect_cmpd: { uno::Any aAny(getCompoundLineString(sal_Int32(aValue.getInt()))); - mpGrabBagStack->appendElement("cmpd", aAny); + mpGrabBagStack->appendElement(u"cmpd"_ustr, aAny); } break; case NS_ooxml::LN_CT_TextOutlineEffect_algn: { uno::Any aAny(getPenAlignmentString(sal_Int32(aValue.getInt()))); - mpGrabBagStack->appendElement("algn", aAny); + mpGrabBagStack->appendElement(u"algn"_ustr, aAny); } break; case NS_ooxml::LN_CT_GradientStop_pos: - mpGrabBagStack->addInt32("pos", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"pos"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_LinearShadeProperties_ang: - mpGrabBagStack->addInt32("ang", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"ang"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_LinearShadeProperties_scaled: { uno::Any aAny(getOnOffString(sal_Int32(aValue.getInt()))); - mpGrabBagStack->appendElement("scaled", aAny); + mpGrabBagStack->appendElement(u"scaled"_ustr, aAny); } break; case NS_ooxml::LN_CT_PathShadeProperties_path: { uno::Any aAny(getPathShadeTypeString(sal_Int32(aValue.getInt()))); - mpGrabBagStack->appendElement("path", aAny); + mpGrabBagStack->appendElement(u"path"_ustr, aAny); } break; case NS_ooxml::LN_CT_RelativeRect_l: - mpGrabBagStack->addInt32("l", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"l"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_RelativeRect_t: - mpGrabBagStack->addInt32("t", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"t"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_RelativeRect_r: - mpGrabBagStack->addInt32("r", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"r"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_RelativeRect_b: - mpGrabBagStack->addInt32("b", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"b"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_PresetLineDashProperties_val: { uno::Any aAny(getPresetLineDashValString(sal_Int32(aValue.getInt()))); - mpGrabBagStack->appendElement("val", aAny); + mpGrabBagStack->appendElement(u"val"_ustr, aAny); } break; case NS_ooxml::LN_CT_LineJoinMiterProperties_lim: - mpGrabBagStack->addInt32("lim", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"lim"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_Camera_prst: { uno::Any aAny(getPresetCameraTypeString(sal_Int32(aValue.getInt()))); - mpGrabBagStack->appendElement("prst", aAny); + mpGrabBagStack->appendElement(u"prst"_ustr, aAny); } break; case NS_ooxml::LN_CT_LightRig_rig: { uno::Any aAny(getLightRigTypeString(sal_Int32(aValue.getInt()))); - mpGrabBagStack->appendElement("rig", aAny); + mpGrabBagStack->appendElement(u"rig"_ustr, aAny); } break; case NS_ooxml::LN_CT_LightRig_dir: { uno::Any aAny(getLightRigDirectionString(sal_Int32(aValue.getInt()))); - mpGrabBagStack->appendElement("dir", aAny); + mpGrabBagStack->appendElement(u"dir"_ustr, aAny); } break; case NS_ooxml::LN_CT_SphereCoords_lat: - mpGrabBagStack->addInt32("lat", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"lat"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_SphereCoords_lon: - mpGrabBagStack->addInt32("lon", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"lon"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_SphereCoords_rev: - mpGrabBagStack->addInt32("rev", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"rev"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_Props3D_extrusionH: - mpGrabBagStack->addInt32("extrusionH", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"extrusionH"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_Props3D_contourW: - mpGrabBagStack->addInt32("contourW", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"contourW"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_Props3D_prstMaterial: { uno::Any aAny(getPresetMaterialTypeString(sal_Int32(aValue.getInt()))); - mpGrabBagStack->appendElement("prstMaterial", aAny); + mpGrabBagStack->appendElement(u"prstMaterial"_ustr, aAny); } break; case NS_ooxml::LN_CT_Bevel_w: - mpGrabBagStack->addInt32("w", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"w"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_Bevel_h: - mpGrabBagStack->addInt32("h", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"h"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_Bevel_prst: { uno::Any aAny(getBevelPresetTypeString(sal_Int32(aValue.getInt()))); - mpGrabBagStack->appendElement("prst", aAny); + mpGrabBagStack->appendElement(u"prst"_ustr, aAny); } break; case NS_ooxml::LN_CT_Ligatures_val: { uno::Any aAny(getLigaturesString(sal_Int32(aValue.getInt()))); - mpGrabBagStack->appendElement("val", aAny); + mpGrabBagStack->appendElement(u"val"_ustr, aAny); } break; case NS_ooxml::LN_CT_NumForm_val: { uno::Any aAny(getNumFormString(sal_Int32(aValue.getInt()))); - mpGrabBagStack->appendElement("val", aAny); + mpGrabBagStack->appendElement(u"val"_ustr, aAny); } break; case NS_ooxml::LN_CT_NumSpacing_val: { uno::Any aAny(getNumSpacingString(sal_Int32(aValue.getInt()))); - mpGrabBagStack->appendElement("val", aAny); + mpGrabBagStack->appendElement(u"val"_ustr, aAny); } break; case NS_ooxml::LN_CT_StyleSet_id: - mpGrabBagStack->addInt32("id", sal_Int32(aValue.getInt())); + mpGrabBagStack->addInt32(u"id"_ustr, sal_Int32(aValue.getInt())); break; case NS_ooxml::LN_CT_StyleSet_val: case NS_ooxml::LN_CT_OnOff_val: { uno::Any aAny(getOnOffString(sal_Int32(aValue.getInt()))); - mpGrabBagStack->appendElement("val", aAny); + mpGrabBagStack->appendElement(u"val"_ustr, aAny); } break; default: @@ -761,37 +761,37 @@ sal_uInt8 TextEffectsHandler::GetTextFillSolidFillAlpha(const css::beans::Proper uno::Sequence<beans::PropertyValue> aPropertyValues; rValue.Value >>= aPropertyValues; comphelper::SequenceAsHashMap aMap(aPropertyValues); - auto it = aMap.find("solidFill"); + auto it = aMap.find(u"solidFill"_ustr); if (it == aMap.end()) { return 0; } comphelper::SequenceAsHashMap aSolidFillMap(it->second); - it = aSolidFillMap.find("srgbClr"); + it = aSolidFillMap.find(u"srgbClr"_ustr); if (it == aSolidFillMap.end()) { - it = aSolidFillMap.find("schemeClr"); + it = aSolidFillMap.find(u"schemeClr"_ustr); if (it == aSolidFillMap.end()) return 0; } comphelper::SequenceAsHashMap aSrgbClrMap(it->second); - it = aSrgbClrMap.find("alpha"); + it = aSrgbClrMap.find(u"alpha"_ustr); if (it == aSrgbClrMap.end()) { return 0; } comphelper::SequenceAsHashMap aAlphaMap(it->second); - it = aAlphaMap.find("attributes"); + it = aAlphaMap.find(u"attributes"_ustr); if (it == aAlphaMap.end()) { return 0; } comphelper::SequenceAsHashMap aAttributesMap(it->second); - it = aAttributesMap.find("val"); + it = aAttributesMap.find(u"val"_ustr); if (it == aAttributesMap.end()) { return 0; diff --git a/sw/source/writerfilter/dmapper/ThemeHandler.cxx b/sw/source/writerfilter/dmapper/ThemeHandler.cxx index 1acd7073f69c..862c191d63df 100644 --- a/sw/source/writerfilter/dmapper/ThemeHandler.cxx +++ b/sw/source/writerfilter/dmapper/ThemeHandler.cxx @@ -48,18 +48,18 @@ OUString fromLCIDToScriptTag(LanguageType lang) case 0x460: // lidKashmiri case 0x463: // lidPashto case 0x48c: // lidDari - return "Arab"; + return u"Arab"_ustr; case 0x42b: // lidArmenian - return "Armn"; + return u"Armn"_ustr; case 0x445: // lidBengali case 0x845: // lidBengaliBangladesh case 0x44d: // lidAssamese case 0x458: // lidManipuri - return "Beng"; + return u"Beng"_ustr; case 0x45d: // lidInuktitut - return "Cans"; + return u"Cans"_ustr; case 0x45c: // lidCherokee - return "Cher"; + return u"Cher"_ustr; case 0x419: // lidRussian case 0x402: // lidBulgarian case 0x281a: // lidSerbianCyrillic @@ -80,7 +80,7 @@ OUString fromLCIDToScriptTag(LanguageType lang) case 0x450: // lidMongolian case 0x46d: // lidBashkir case 0x485: // lidSakha - return "Cyrl"; + return u"Cyrl"_ustr; case 0x439: // lidHindi case 0x44e: // lidMarathi case 0x44f: // lidSanskrit @@ -89,39 +89,39 @@ OUString fromLCIDToScriptTag(LanguageType lang) case 0x860: // lidKashmiriIndia case 0x461: // lidNepali case 0x861: // lidNepaliIndia - return "Deva"; + return u"Deva"_ustr; case 0x45e: // lidAmharic case 0x473: // lidTigrignaEthiopic case 0x873: // lidTigrignaEritrea - return "Ethi"; + return u"Ethi"_ustr; case 0x437: // lidGeorgian - return "Geor"; + return u"Geor"_ustr; case 0x408: // lidGreek - return "Grek"; + return u"Grek"_ustr; case 0x447: // lidGujarati - return "Gujr"; + return u"Gujr"_ustr; case 0x446: // lidPunjabi - return "Guru"; + return u"Guru"_ustr; case 0x412: // lidKoreanExtWansung - return "Hang"; + return u"Hang"_ustr; case 0x804: // lidChineseSimp case 0x1004: // lidSingapore - return "Hans"; + return u"Hans"_ustr; case 0x404: // lidChineseTrad case 0xc04: // lidHongkong case 0x1404: // lidMacau - return "Hant"; + return u"Hant"_ustr; case 0x40d: // lidHebrew case 0x43d: // lidYiddish - return "Hebr"; + return u"Hebr"_ustr; case 0x411: // lidJapanese - return "Jpan"; + return u"Jpan"_ustr; case 0x453: // lidKhmer - return "Khmr"; + return u"Khmr"_ustr; case 0x44b: // lidKannada - return "Knda"; + return u"Knda"_ustr; case 0x454: // lidLao - return "Laoo"; + return u"Laoo"_ustr; case 0x409: // lidAmerican case 0xc09: // lidAustralian case 0x809: // lidBritish @@ -280,36 +280,36 @@ OUString fromLCIDToScriptTag(LanguageType lang) case 0x486: // lidKiche case 0x487: // lidKinyarwanda case 0x488: // lidWolof - return "Latn"; + return u"Latn"_ustr; case 0x44c: // lidMalayalam - return "Mlym"; + return u"Mlym"_ustr; case 0x850: // lidMongolianMongo - return "Mong"; + return u"Mong"_ustr; case 0x455: // lidBurmese - return "Mymr"; + return u"Mymr"_ustr; case 0x448: // lidOriya - return "Orya"; + return u"Orya"_ustr; case 0x45b: // lidSinhalese - return "Sinh"; + return u"Sinh"_ustr; case 0x45a: // lidSyriac - return "Syrc"; + return u"Syrc"_ustr; case 0x449: // lidTamil - return "Taml"; + return u"Taml"_ustr; case 0x44a: // lidTelugu - return "Telu"; + return u"Telu"_ustr; case 0x465: // lidMaldivian - return "Thaa"; + return u"Thaa"_ustr; case 0x41e: // lidThai - return "Thai"; + return u"Thai"_ustr; case 0x451: // lidTibetan case 0x851: // lidBhutanese - return "Tibt"; + return u"Tibt"_ustr; case 0x480: // lidUighur - return "Uigh"; + return u"Uigh"_ustr; case 0x42a: // lidVietnamese - return "Viet"; + return u"Viet"_ustr; case 0x478: // lidYi - return "Yiii"; + return u"Yiii"_ustr; default: return OUString(); } @@ -387,21 +387,21 @@ OUString ThemeHandler::getStringForTheme(const Id id) switch (id) { case NS_ooxml::LN_Value_ST_Theme_majorEastAsia: - return "majorEastAsia"; + return u"majorEastAsia"_ustr; case NS_ooxml::LN_Value_ST_Theme_majorBidi: - return "majorBidi"; + return u"majorBidi"_ustr; case NS_ooxml::LN_Value_ST_Theme_majorAscii: - return "majorAscii"; + return u"majorAscii"_ustr; case NS_ooxml::LN_Value_ST_Theme_majorHAnsi: - return "majorHAnsi"; + return u"majorHAnsi"_ustr; case NS_ooxml::LN_Value_ST_Theme_minorEastAsia: - return "minorEastAsia"; + return u"minorEastAsia"_ustr; case NS_ooxml::LN_Value_ST_Theme_minorBidi: - return "minorBidi"; + return u"minorBidi"_ustr; case NS_ooxml::LN_Value_ST_Theme_minorAscii: - return "minorAscii"; + return u"minorAscii"_ustr; case NS_ooxml::LN_Value_ST_Theme_minorHAnsi: - return "minorHAnsi"; + return u"minorHAnsi"_ustr; } return OUString(); } diff --git a/sw/source/writerfilter/dmapper/WriteProtection.cxx b/sw/source/writerfilter/dmapper/WriteProtection.cxx index c300ab09e303..4ed838474813 100644 --- a/sw/source/writerfilter/dmapper/WriteProtection.cxx +++ b/sw/source/writerfilter/dmapper/WriteProtection.cxx @@ -126,10 +126,10 @@ uno::Sequence<beans::PropertyValue> WriteProtection::toSequence() const if (!m_sAlgorithmName.isEmpty() && !m_sSalt.isEmpty() && !m_sHash.isEmpty() && m_sCryptAlgorithmClass == "hash" && m_sCryptAlgorithmType == "typeAny") { - aResult = { comphelper::makePropertyValue("algorithm-name", m_sAlgorithmName), - comphelper::makePropertyValue("salt", m_sSalt), - comphelper::makePropertyValue("iteration-count", m_CryptSpinCount), - comphelper::makePropertyValue("hash", m_sHash) }; + aResult = { comphelper::makePropertyValue(u"algorithm-name"_ustr, m_sAlgorithmName), + comphelper::makePropertyValue(u"salt"_ustr, m_sSalt), + comphelper::makePropertyValue(u"iteration-count"_ustr, m_CryptSpinCount), + comphelper::makePropertyValue(u"hash"_ustr, m_sHash) }; } return aResult; diff --git a/sw/source/writerfilter/filter/RtfFilter.cxx b/sw/source/writerfilter/filter/RtfFilter.cxx index be2b99ae8a5c..509dedd59c22 100644 --- a/sw/source/writerfilter/filter/RtfFilter.cxx +++ b/sw/source/writerfilter/filter/RtfFilter.cxx @@ -89,7 +89,7 @@ sal_Bool RtfFilter::filter(const uno::Sequence<beans::PropertyValue>& rDescripto uno::Reference<lang::XMultiServiceFactory> xMSF(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW); uno::Reference<uno::XInterface> xIfc( - xMSF->createInstance("com.sun.star.comp.Writer.RtfExport"), uno::UNO_SET_THROW); + xMSF->createInstance(u"com.sun.star.comp.Writer.RtfExport"_ustr), uno::UNO_SET_THROW); uno::Reference<document::XExporter> xExporter(xIfc, uno::UNO_QUERY_THROW); uno::Reference<document::XFilter> xFilter(xIfc, uno::UNO_QUERY_THROW); xExporter->setSourceDocument(m_xSrcDoc); @@ -102,21 +102,21 @@ sal_Bool RtfFilter::filter(const uno::Sequence<beans::PropertyValue>& rDescripto uno::Reference<beans::XPropertySet> xDocProps; if (m_xDstDoc.is()) // not in cppunittest? { - m_xDstDoc->setPropertyValue("UndocumentedWriterfilterHack", uno::Any(true)); + m_xDstDoc->setPropertyValue(u"UndocumentedWriterfilterHack"_ustr, uno::Any(true)); } comphelper::ScopeGuard g([xDocProps] { if (xDocProps.is()) // not in cppunittest? { // note: pStream.clear calls RemoveLastParagraph() - xDocProps->setPropertyValue("UndocumentedWriterfilterHack", uno::Any(false)); + xDocProps->setPropertyValue(u"UndocumentedWriterfilterHack"_ustr, uno::Any(false)); } }); try { utl::MediaDescriptor aMediaDesc(rDescriptor); - bool bRepairStorage = aMediaDesc.getUnpackedValueOrDefault("RepairPackage", false); - bool bIsNewDoc = !aMediaDesc.getUnpackedValueOrDefault("InsertMode", false); + bool bRepairStorage = aMediaDesc.getUnpackedValueOrDefault(u"RepairPackage"_ustr, false); + bool bIsNewDoc = !aMediaDesc.getUnpackedValueOrDefault(u"InsertMode"_ustr, false); uno::Reference<io::XInputStream> xInputStream; aMediaDesc.addInputStream(); @@ -168,7 +168,7 @@ sal_Bool RtfFilter::filter(const uno::Sequence<beans::PropertyValue>& rDescripto { css::uno::Any anyEx = cppu::getCaughtException(); // cannot throw WrongFormatException directly :( - throw lang::WrappedTargetRuntimeException("", getXWeak(), anyEx); + throw lang::WrappedTargetRuntimeException(u""_ustr, getXWeak(), anyEx); } catch (const uno::Exception&) { @@ -199,7 +199,7 @@ void RtfFilter::initialize(const uno::Sequence<uno::Any>& /*aArguments*/) // 'Word Template' but we don't need it for RTF. } -OUString RtfFilter::getImplementationName() { return "com.sun.star.comp.Writer.RtfFilter"; } +OUString RtfFilter::getImplementationName() { return u"com.sun.star.comp.Writer.RtfFilter"_ustr; } sal_Bool RtfFilter::supportsService(const OUString& rServiceName) { @@ -208,8 +208,8 @@ sal_Bool RtfFilter::supportsService(const OUString& rServiceName) uno::Sequence<OUString> RtfFilter::getSupportedServiceNames() { - uno::Sequence<OUString> aRet = { OUString("com.sun.star.document.ImportFilter"), - OUString("com.sun.star.document.ExportFilter") }; + uno::Sequence<OUString> aRet = { u"com.sun.star.document.ImportFilter"_ustr, + u"com.sun.star.document.ExportFilter"_ustr }; return aRet; } diff --git a/sw/source/writerfilter/filter/WriterFilter.cxx b/sw/source/writerfilter/filter/WriterFilter.cxx index 5faeab2badd5..f026a1f35e6c 100644 --- a/sw/source/writerfilter/filter/WriterFilter.cxx +++ b/sw/source/writerfilter/filter/WriterFilter.cxx @@ -134,7 +134,7 @@ sal_Bool WriterFilter::filter(const uno::Sequence<beans::PropertyValue>& rDescri uno::Reference<uno::XInterface> xIfc; try { - xIfc.set(xMSF->createInstance("com.sun.star.comp.Writer.DocxExport"), + xIfc.set(xMSF->createInstance(u"com.sun.star.comp.Writer.DocxExport"_ustr), uno::UNO_SET_THROW); } catch (uno::RuntimeException&) @@ -159,14 +159,14 @@ sal_Bool WriterFilter::filter(const uno::Sequence<beans::PropertyValue>& rDescri } if (m_xDstDoc.is()) { - m_xDstDoc->setPropertyValue("UndocumentedWriterfilterHack", uno::Any(true)); + m_xDstDoc->setPropertyValue(u"UndocumentedWriterfilterHack"_ustr, uno::Any(true)); comphelper::ScopeGuard g([this] { - m_xDstDoc->setPropertyValue("UndocumentedWriterfilterHack", uno::Any(false)); + m_xDstDoc->setPropertyValue(u"UndocumentedWriterfilterHack"_ustr, uno::Any(false)); }); utl::MediaDescriptor aMediaDesc(rDescriptor); - bool bRepairStorage = aMediaDesc.getUnpackedValueOrDefault("RepairPackage", false); - bool bSkipImages - = aMediaDesc.getUnpackedValueOrDefault("FilterOptions", OUString()) == "SkipImages"; + bool bRepairStorage = aMediaDesc.getUnpackedValueOrDefault(u"RepairPackage"_ustr, false); + bool bSkipImages = aMediaDesc.getUnpackedValueOrDefault(u"FilterOptions"_ustr, OUString()) + == "SkipImages"; uno::Reference<io::XInputStream> xInputStream; try @@ -212,13 +212,13 @@ sal_Bool WriterFilter::filter(const uno::Sequence<beans::PropertyValue>& rDescri { // note: SfxObjectShell checks for WrongFormatException io::WrongFormatException wfe(lcl_GetExceptionMessage(e)); - throw lang::WrappedTargetRuntimeException("", getXWeak(), uno::Any(wfe)); + throw lang::WrappedTargetRuntimeException(u""_ustr, getXWeak(), uno::Any(wfe)); } catch (xml::sax::SAXException const& e) { // note: SfxObjectShell checks for WrongFormatException io::WrongFormatException wfe(lcl_GetExceptionMessage(e)); - throw lang::WrappedTargetRuntimeException("", getXWeak(), uno::Any(wfe)); + throw lang::WrappedTargetRuntimeException(u""_ustr, getXWeak(), uno::Any(wfe)); } catch (uno::RuntimeException const&) { @@ -229,25 +229,25 @@ sal_Bool WriterFilter::filter(const uno::Sequence<beans::PropertyValue>& rDescri css::uno::Any anyEx = cppu::getCaughtException(); SAL_WARN("writerfilter", "WriterFilter::filter(): failed with " << exceptionToString(anyEx)); - throw lang::WrappedTargetRuntimeException("", getXWeak(), anyEx); + throw lang::WrappedTargetRuntimeException(u""_ustr, getXWeak(), anyEx); } // Adding some properties to the document's grab bag for interoperability purposes: comphelper::SequenceAsHashMap aGrabBagProperties; // Adding the saved Theme DOM - aGrabBagProperties["OOXTheme"] <<= pDocument->getThemeDom(); + aGrabBagProperties[u"OOXTheme"_ustr] <<= pDocument->getThemeDom(); // Adding the saved custom xml DOM - aGrabBagProperties["OOXCustomXml"] <<= pDocument->getCustomXmlDomList(); - aGrabBagProperties["OOXCustomXmlProps"] <<= pDocument->getCustomXmlDomPropsList(); + aGrabBagProperties[u"OOXCustomXml"_ustr] <<= pDocument->getCustomXmlDomList(); + aGrabBagProperties[u"OOXCustomXmlProps"_ustr] <<= pDocument->getCustomXmlDomPropsList(); // Adding the saved Glossary Document DOM to the document's grab bag - aGrabBagProperties["OOXGlossary"] <<= pDocument->getGlossaryDocDom(); - aGrabBagProperties["OOXGlossaryDom"] <<= pDocument->getGlossaryDomList(); + aGrabBagProperties[u"OOXGlossary"_ustr] <<= pDocument->getGlossaryDocDom(); + aGrabBagProperties[u"OOXGlossaryDom"_ustr] <<= pDocument->getGlossaryDomList(); // Adding the saved embedding document to document's grab bag - aGrabBagProperties["OOXEmbeddings"] <<= pDocument->getEmbeddingsList(); + aGrabBagProperties[u"OOXEmbeddings"_ustr] <<= pDocument->getEmbeddingsList(); oox::core::XmlFilterBase::putPropertiesToDocumentGrabBag( static_cast<SfxBaseModel*>(m_xDstDoc.get()), aGrabBagProperties); @@ -303,25 +303,25 @@ void WriterFilter::setTargetDocument(const uno::Reference<lang::XComponent>& xDo // Set some compatibility options that are valid for the DOCX format rtl::Reference<SwXDocumentSettings> xSettings = m_xDstDoc->createDocumentSettings(); - xSettings->setPropertyValue("UseOldNumbering", uno::Any(false)); - xSettings->setPropertyValue("IgnoreFirstLineIndentInNumbering", uno::Any(false)); + xSettings->setPropertyValue(u"UseOldNumbering"_ustr, uno::Any(false)); + xSettings->setPropertyValue(u"IgnoreFirstLineIndentInNumbering"_ustr, uno::Any(false)); xSettings->setPropertyValue(u"NoGapAfterNoteNumber"_ustr, uno::Any(true)); - xSettings->setPropertyValue("DoNotResetParaAttrsForNumFont", uno::Any(false)); - xSettings->setPropertyValue("UseFormerLineSpacing", uno::Any(false)); - xSettings->setPropertyValue("AddParaSpacingToTableCells", uno::Any(true)); - xSettings->setPropertyValue("AddParaLineSpacingToTableCells", uno::Any(true)); - xSettings->setPropertyValue("UseFormerObjectPositioning", uno::Any(false)); - xSettings->setPropertyValue("ConsiderTextWrapOnObjPos", uno::Any(true)); - xSettings->setPropertyValue("UseFormerTextWrapping", uno::Any(false)); - xSettings->setPropertyValue("IgnoreTabsAndBlanksForLineCalculation", uno::Any(true)); - xSettings->setPropertyValue("InvertBorderSpacing", uno::Any(true)); - xSettings->setPropertyValue("CollapseEmptyCellPara", uno::Any(true)); + xSettings->setPropertyValue(u"DoNotResetParaAttrsForNumFont"_ustr, uno::Any(false)); + xSettings->setPropertyValue(u"UseFormerLineSpacing"_ustr, uno::Any(false)); + xSettings->setPropertyValue(u"AddParaSpacingToTableCells"_ustr, uno::Any(true)); + xSettings->setPropertyValue(u"AddParaLineSpacingToTableCells"_ustr, uno::Any(true)); + xSettings->setPropertyValue(u"UseFormerObjectPositioning"_ustr, uno::Any(false)); + xSettings->setPropertyValue(u"ConsiderTextWrapOnObjPos"_ustr, uno::Any(true)); + xSettings->setPropertyValue(u"UseFormerTextWrapping"_ustr, uno::Any(false)); + xSettings->setPropertyValue(u"IgnoreTabsAndBlanksForLineCalculation"_ustr, uno::Any(true)); + xSettings->setPropertyValue(u"InvertBorderSpacing"_ustr, uno::Any(true)); + xSettings->setPropertyValue(u"CollapseEmptyCellPara"_ustr, uno::Any(true)); // tdf#142404 TabOverSpacing (new for compatibilityMode15/Word2013+) is a subset of TabOverMargin // (which applied to DOCX <= compatibilityMode14). // TabOverMargin looks at tabs beyond the normal text area, // while TabOverSpacing only refers to a tab beyond the paragraph margin. - xSettings->setPropertyValue("TabOverSpacing", uno::Any(true)); - xSettings->setPropertyValue("UnbreakableNumberings", uno::Any(true)); + xSettings->setPropertyValue(u"TabOverSpacing"_ustr, uno::Any(true)); + xSettings->setPropertyValue(u"UnbreakableNumberings"_ustr, uno::Any(true)); xSettings->setPropertyValue("ClippedPictures", uno::Any(true)); xSettings->setPropertyValue("BackgroundParaOverDrawings", uno::Any(true)); @@ -348,7 +348,10 @@ void WriterFilter::initialize(const uno::Sequence<uno::Any>& rArguments) m_xInitializationArguments = rArguments; } -OUString WriterFilter::getImplementationName() { return "com.sun.star.comp.Writer.WriterFilter"; } +OUString WriterFilter::getImplementationName() +{ + return u"com.sun.star.comp.Writer.WriterFilter"_ustr; +} sal_Bool WriterFilter::supportsService(const OUString& rServiceName) { @@ -357,8 +360,8 @@ sal_Bool WriterFilter::supportsService(const OUString& rServiceName) uno::Sequence<OUString> WriterFilter::getSupportedServiceNames() { - uno::Sequence<OUString> aRet = { OUString("com.sun.star.document.ImportFilter"), - OUString("com.sun.star.document.ExportFilter") }; + uno::Sequence<OUString> aRet = { u"com.sun.star.document.ImportFilter"_ustr, + u"com.sun.star.document.ExportFilter"_ustr }; return aRet; } diff --git a/sw/source/writerfilter/ooxml/OOXMLDocumentImpl.cxx b/sw/source/writerfilter/ooxml/OOXMLDocumentImpl.cxx index 0fdf1b927956..fa0e9b809f80 100644 --- a/sw/source/writerfilter/ooxml/OOXMLDocumentImpl.cxx +++ b/sw/source/writerfilter/ooxml/OOXMLDocumentImpl.cxx @@ -63,7 +63,7 @@ OOXMLDocumentImpl::OOXMLDocumentImpl(OOXMLStream::Pointer_t pStream, uno::Refere , mnProgressLastPos(0) , mnProgressCurrentPos(0) , mnProgressEndPos(0) - , m_rBaseURL(utl::MediaDescriptor(rDescriptor).getUnpackedValueOrDefault("DocumentBaseURL", OUString())) + , m_rBaseURL(utl::MediaDescriptor(rDescriptor).getUnpackedValueOrDefault(u"DocumentBaseURL"_ustr, OUString())) , maMediaDescriptor(rDescriptor) , mxGraphicMapper(graphic::GraphicMapper::create(mpStream->getContext())) { @@ -439,7 +439,7 @@ void OOXMLDocumentImpl::resolve(Stream & rStream) { StatusIndicatorGuard aStatusIndicatorGuard(mxStatusIndicator); - if (utl::MediaDescriptor(maMediaDescriptor).getUnpackedValueOrDefault("ReadGlossaries", false)) + if (utl::MediaDescriptor(maMediaDescriptor).getUnpackedValueOrDefault(u"ReadGlossaries"_ustr, false)) { resolveFastSubStream(rStream, OOXMLStream::GLOSSARY); return; @@ -452,10 +452,10 @@ void OOXMLDocumentImpl::resolve(Stream & rStream) uno::Reference<document::XDocumentPropertiesSupplier> xDocumentPropertiesSupplier(mxModel, uno::UNO_QUERY); uno::Reference<document::XDocumentProperties> xDocumentProperties = xDocumentPropertiesSupplier->getDocumentProperties(); comphelper::SequenceAsHashMap aMap(xDocumentProperties->getDocumentStatistics()); - if (aMap.find("ParagraphCount") != aMap.end()) + if (aMap.find(u"ParagraphCount"_ustr) != aMap.end()) { sal_Int32 nValue; - if (aMap["ParagraphCount"] >>= nValue) + if (aMap[u"ParagraphCount"_ustr] >>= nValue) { if (mxStatusIndicator.is()) { @@ -532,7 +532,7 @@ void OOXMLDocumentImpl::resolve(Stream & rStream) { css::uno::Any anyEx = cppu::getCaughtException(); SAL_WARN("writerfilter.ooxml", "OOXMLDocumentImpl::resolve(): " << exceptionToString(anyEx)); - throw lang::WrappedTargetRuntimeException("", nullptr, anyEx); + throw lang::WrappedTargetRuntimeException(u""_ustr, nullptr, anyEx); } catch (...) { diff --git a/sw/source/writerfilter/ooxml/OOXMLFastContextHandler.cxx b/sw/source/writerfilter/ooxml/OOXMLFastContextHandler.cxx index a0881fb9f362..84022cfbe9d9 100644 --- a/sw/source/writerfilter/ooxml/OOXMLFastContextHandler.cxx +++ b/sw/source/writerfilter/ooxml/OOXMLFastContextHandler.cxx @@ -1832,9 +1832,9 @@ void OOXMLFastContextHandlerShape::sendShape( Token_t Element ) if (bForceShapeIntoCell) { text::WrapTextMode nSurround = text::WrapTextMode_NONE; - xShapePropSet->getPropertyValue("Surround") >>= nSurround; + xShapePropSet->getPropertyValue(u"Surround"_ustr) >>= nSurround; sal_Int32 nHoriRelation = -1; - xShapePropSet->getPropertyValue("HoriOrientRelation") >>= nHoriRelation; + xShapePropSet->getPropertyValue(u"HoriOrientRelation"_ustr) >>= nHoriRelation; bForceShapeIntoCell = (nSurround != text::WrapTextMode_THROUGH) || (nHoriRelation != text::RelOrientation::FRAME); } @@ -2312,7 +2312,7 @@ void OOXMLFastContextHandlerMath::process() comphelper::EmbeddedObjectContainer container; OUString aName; uno::Sequence<beans::PropertyValue> objArgs{ comphelper::makePropertyValue( - "DefaultParentBaseURL", getDocument()->GetDocumentBaseURL()) }; + u"DefaultParentBaseURL"_ustr, getDocument()->GetDocumentBaseURL()) }; uno::Reference<embed::XEmbeddedObject> ref = container.CreateEmbeddedObject(name.GetByteSequence(), objArgs, aName); assert(ref.is()); diff --git a/sw/source/writerfilter/rtftok/rtfdispatchdestination.cxx b/sw/source/writerfilter/rtftok/rtfdispatchdestination.cxx index 30b2acb58f80..06fdb8b0f9b0 100644 --- a/sw/source/writerfilter/rtftok/rtfdispatchdestination.cxx +++ b/sw/source/writerfilter/rtftok/rtfdispatchdestination.cxx @@ -613,14 +613,15 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword) if (!aLookahead.hasTable()) { uno::Reference<drawing::XShapes> xGroupShape( - getTextDocument()->createInstance("com.sun.star.drawing.GroupShape"), + getTextDocument()->createInstance(u"com.sun.star.drawing.GroupShape"_ustr), uno::UNO_QUERY); if (m_xDstDoc) { uno::Reference<drawing::XShape> xShape(xGroupShape, uno::UNO_QUERY); // set default VertOrient before inserting uno::Reference<beans::XPropertySet>(xShape, uno::UNO_QUERY_THROW) - ->setPropertyValue("VertOrient", uno::Any(text::VertOrientation::NONE)); + ->setPropertyValue(u"VertOrient"_ustr, + uno::Any(text::VertOrientation::NONE)); m_xDstDoc->getDrawPage()->add(xShape); } m_pSdrImport->pushParent(xGroupShape); diff --git a/sw/source/writerfilter/rtftok/rtfdispatchflag.cxx b/sw/source/writerfilter/rtftok/rtfdispatchflag.cxx index af97b36812f9..dfc5be5b1e05 100644 --- a/sw/source/writerfilter/rtftok/rtfdispatchflag.cxx +++ b/sw/source/writerfilter/rtftok/rtfdispatchflag.cxx @@ -892,13 +892,13 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) if (!m_aStates.top().getCurrentBuffer()) m_aStates.top().setCurrentBuffer(&m_aSuperBuffer); - auto pValue = new RTFValue("superscript"); + auto pValue = new RTFValue(u"superscript"_ustr); m_aStates.top().getCharacterSprms().set(NS_ooxml::LN_EG_RPrBase_vertAlign, pValue); } break; case RTFKeyword::SUB: { - auto pValue = new RTFValue("subscript"); + auto pValue = new RTFValue(u"subscript"_ustr); m_aStates.top().getCharacterSprms().set(NS_ooxml::LN_EG_RPrBase_vertAlign, pValue); } break; @@ -1040,7 +1040,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) case RTFKeyword::DPLINE: { uno::Reference<drawing::XShape> xShape( - getTextDocument()->createInstance("com.sun.star.drawing.LineShape"), + getTextDocument()->createInstance(u"com.sun.star.drawing.LineShape"_ustr), uno::UNO_QUERY); m_aStates.top().getDrawingObject().setShape(xShape); break; @@ -1049,7 +1049,8 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) { // The reason this is not a simple CustomShape is that in the old syntax we have no ViewBox info. uno::Reference<drawing::XShape> xShape( - getTextDocument()->createInstance("com.sun.star.drawing.PolyLineShape"), + getTextDocument()->createInstance( + u"com.sun.star.drawing.PolyLineShape"_ustr), uno::UNO_QUERY); m_aStates.top().getDrawingObject().setShape(xShape); break; @@ -1057,7 +1058,8 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) case RTFKeyword::DPPOLYGON: { uno::Reference<drawing::XShape> xShape( - getTextDocument()->createInstance("com.sun.star.drawing.PolyPolygonShape"), + getTextDocument()->createInstance( + u"com.sun.star.drawing.PolyPolygonShape"_ustr), uno::UNO_QUERY); m_aStates.top().getDrawingObject().setShape(xShape); break; @@ -1065,7 +1067,8 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) case RTFKeyword::DPRECT: { uno::Reference<drawing::XShape> xShape( - getTextDocument()->createInstance("com.sun.star.drawing.RectangleShape"), + getTextDocument()->createInstance( + u"com.sun.star.drawing.RectangleShape"_ustr), uno::UNO_QUERY); m_aStates.top().getDrawingObject().setShape(xShape); break; @@ -1098,7 +1101,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) if (nType) { uno::Reference<drawing::XShape> xShape( - getTextDocument()->createInstance("com.sun.star.drawing.CustomShape"), + getTextDocument()->createInstance(u"com.sun.star.drawing.CustomShape"_ustr), uno::UNO_QUERY); m_aStates.top().getDrawingObject().setShape(xShape); } @@ -1112,7 +1115,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) { // set default VertOrient before inserting m_aStates.top().getDrawingObject().getPropertySet()->setPropertyValue( - "VertOrient", uno::Any(text::VertOrientation::NONE)); + u"VertOrient"_ustr, uno::Any(text::VertOrientation::NONE)); xShapes->add(m_aStates.top().getDrawingObject().getShape()); } } @@ -1230,7 +1233,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) if (m_aStates.top().getDrawingObject().getPropertySet().is()) // Seems this old syntax has no way to specify a custom radius, and this is the default m_aStates.top().getDrawingObject().getPropertySet()->setPropertyValue( - "CornerRadius", uno::Any(sal_Int32(83))); + u"CornerRadius"_ustr, uno::Any(sal_Int32(83))); break; case RTFKeyword::NOWRAP: m_aStates.top().getFrame().setSprm(NS_ooxml::LN_CT_FramePr_wrap, diff --git a/sw/source/writerfilter/rtftok/rtfdispatchsymbol.cxx b/sw/source/writerfilter/rtftok/rtfdispatchsymbol.cxx index b40fd55dde9b..85d730e859c6 100644 --- a/sw/source/writerfilter/rtftok/rtfdispatchsymbol.cxx +++ b/sw/source/writerfilter/rtftok/rtfdispatchsymbol.cxx @@ -220,8 +220,8 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) if (m_aTableBufferStack.size() == 1 || !m_aStates.top().getCurrentBuffer()) { - throw io::WrongFormatException("mismatch between \\itap and number of \\nestrow", - nullptr); + throw io::WrongFormatException( + u"mismatch between \\itap and number of \\nestrow"_ustr, nullptr); } assert(m_aStates.top().getCurrentBuffer() == &m_aTableBufferStack.back()); // note: there may be several states pointing to table buffer! @@ -426,7 +426,7 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) break; case RTFKeyword::CHPGN: { - OUString aStr("PAGE"); + OUString aStr(u"PAGE"_ustr); singleChar(cFieldStart); text(aStr); singleChar(cFieldSep, true); diff --git a/sw/source/writerfilter/rtftok/rtfdispatchvalue.cxx b/sw/source/writerfilter/rtftok/rtfdispatchvalue.cxx index 801aeb2e321b..2344f5d7febe 100644 --- a/sw/source/writerfilter/rtftok/rtfdispatchvalue.cxx +++ b/sw/source/writerfilter/rtftok/rtfdispatchvalue.cxx @@ -458,7 +458,7 @@ bool RTFDocumentImpl::dispatchTableValue(RTFKeyword nKeyword, int nParam) break; case RTFKeyword::TRRH: { - OUString hRule("auto"); + OUString hRule(u"auto"_ustr); if (nParam < 0) { tools::SvRef<RTFValue> pAbsValue(new RTFValue(-nParam)); @@ -1686,7 +1686,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) uno::Sequence<uno::Sequence<awt::Point>> aPointSequenceSequence = { comphelper::containerToSequence(rDrawingObject.getPolyLinePoints()) }; rDrawingObject.getPropertySet()->setPropertyValue( - "PolyPolygon", uno::Any(aPointSequenceSequence)); + u"PolyPolygon"_ustr, uno::Any(aPointSequenceSequence)); } } } diff --git a/sw/source/writerfilter/rtftok/rtfdocumentimpl.cxx b/sw/source/writerfilter/rtftok/rtfdocumentimpl.cxx index a57af7c330e2..ce71589da36e 100644 --- a/sw/source/writerfilter/rtftok/rtfdocumentimpl.cxx +++ b/sw/source/writerfilter/rtftok/rtfdocumentimpl.cxx @@ -325,7 +325,7 @@ RTFDocumentImpl::RTFDocumentImpl(uno::Reference<uno::XComponentContext> const& x , m_bHadSect(false) , m_nCellxMax(0) , m_nListPictureId(0) - , m_bIsNewDoc(!rMediaDescriptor.getUnpackedValueOrDefault("InsertMode", false)) + , m_bIsNewDoc(!rMediaDescriptor.getUnpackedValueOrDefault(u"InsertMode"_ustr, false)) , m_rMediaDescriptor(rMediaDescriptor) , m_hasRHeader(false) , m_hasFHeader(false) @@ -959,7 +959,7 @@ void RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing::XS WmfExternal* pExtHeader = &aExtHeader; uno::Reference<lang::XServiceInfo> xServiceInfo(m_aStates.top().getDrawingObject().getShape(), uno::UNO_QUERY); - if (xServiceInfo.is() && xServiceInfo->supportsService("com.sun.star.text.TextFrame")) + if (xServiceInfo.is() && xServiceInfo->supportsService(u"com.sun.star.text.TextFrame"_ustr)) pExtHeader = nullptr; uno::Reference<graphic::XGraphic> xGraphic @@ -1001,7 +1001,7 @@ void RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing::XS if (xShape.is()) { uno::Reference<lang::XServiceInfo> xSI(xShape, uno::UNO_QUERY_THROW); - if (!xSI->supportsService("com.sun.star.drawing.GraphicObjectShape")) + if (!xSI->supportsService(u"com.sun.star.drawing.GraphicObjectShape"_ustr)) { // it's sometimes an error to get here - but it's possible to have // a \pict inside the \shptxt of a \shp of shapeType 202 "TextBox" @@ -1014,7 +1014,7 @@ void RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing::XS } if (!xShape.is() && m_xDstDoc) { - xShape.set(m_xDstDoc->createInstance("com.sun.star.drawing.GraphicObjectShape"), + xShape.set(m_xDstDoc->createInstance(u"com.sun.star.drawing.GraphicObjectShape"_ustr), uno::UNO_QUERY); uno::Reference<drawing::XShapes> xShapes = m_xDstDoc->getDrawPage(); if (xShapes.is()) @@ -1024,7 +1024,7 @@ void RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing::XS uno::Reference<beans::XPropertySet> xPropertySet(xShape, uno::UNO_QUERY); if (xPropertySet.is()) - xPropertySet->setPropertyValue("Graphic", uno::Any(xGraphic)); + xPropertySet->setPropertyValue(u"Graphic"_ustr, uno::Any(xGraphic)); // check if the picture is in an OLE object and if the \objdata element is used // (see RTFKeyword::OBJECT in RTFDocumentImpl::dispatchDestination) @@ -1041,7 +1041,7 @@ void RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing::XS xShape->setSize(aSize); // Replacement graphic is inline by default, see oox::vml::SimpleShape::implConvertAndInsert(). - xPropertySet->setPropertyValue("AnchorType", + xPropertySet->setPropertyValue(u"AnchorType"_ustr, uno::Any(text::TextContentAnchorType_AS_CHARACTER)); auto pShapeValue = new RTFValue(xShape); @@ -2757,8 +2757,8 @@ RTFError RTFDocumentImpl::beforePopState(RTFParserState& rState) if (&m_aStates.top().getDestinationText() != m_aStates.top().getCurrentDestinationText()) break; // not for nested group - OUString aName = rState.getDestination() == Destination::OPERATOR ? OUString("Operator") - : OUString("Company"); + OUString aName = rState.getDestination() == Destination::OPERATOR ? u"Operator"_ustr + : u"Company"_ustr; uno::Any aValue(m_aStates.top().getCurrentDestinationText()->makeStringAndClear()); if (m_xDocumentProperties.is()) { @@ -2912,17 +2912,18 @@ RTFError RTFDocumentImpl::beforePopState(RTFParserState& rState) const uno::Reference<beans::XPropertySet>& xPropertySet(rDrawing.getPropertySet()); uno::Reference<lang::XServiceInfo> xServiceInfo(xShape, uno::UNO_QUERY); - bool bTextFrame = xServiceInfo->supportsService("com.sun.star.text.TextFrame"); + bool bTextFrame + = xServiceInfo->supportsService(u"com.sun.star.text.TextFrame"_ustr); // The default is certainly not inline, but then what Word supports is just at-character. - xPropertySet->setPropertyValue("AnchorType", + xPropertySet->setPropertyValue(u"AnchorType"_ustr, uno::Any(text::TextContentAnchorType_AT_CHARACTER)); if (bTextFrame) { - xPropertySet->setPropertyValue("HoriOrientPosition", + xPropertySet->setPropertyValue(u"HoriOrientPosition"_ustr, uno::Any(rDrawing.getLeft())); - xPropertySet->setPropertyValue("VertOrientPosition", + xPropertySet->setPropertyValue(u"VertOrientPosition"_ustr, uno::Any(rDrawing.getTop())); } else @@ -2942,12 +2943,13 @@ RTFError RTFDocumentImpl::beforePopState(RTFParserState& rState) } if (rDrawing.getHasFillColor()) xPropertySet->setPropertyValue( - "FillColor", uno::Any(sal_uInt32((rDrawing.getFillColorR() << 16) - + (rDrawing.getFillColorG() << 8) - + rDrawing.getFillColorB()))); + u"FillColor"_ustr, uno::Any(sal_uInt32((rDrawing.getFillColorR() << 16) + + (rDrawing.getFillColorG() << 8) + + rDrawing.getFillColorB()))); else if (!bTextFrame) // If there is no fill, the Word default is 100% transparency. - xPropertySet->setPropertyValue("FillTransparence", uno::Any(sal_Int32(100))); + xPropertySet->setPropertyValue(u"FillTransparence"_ustr, + uno::Any(sal_Int32(100))); RTFSdrImport::resolveFLine(xPropertySet, rDrawing.getFLine()); @@ -3517,14 +3519,16 @@ void RTFDocumentImpl::afterPopState(RTFParserState& rState) else { uno::Reference<beans::XPropertySet> xMaster( - m_xDstDoc->createInstance("com.sun.star.text.FieldMaster.User"), + m_xDstDoc->createInstance(u"com.sun.star.text.FieldMaster.User"_ustr), uno::UNO_QUERY_THROW); - xMaster->setPropertyValue("Name", uno::Any(m_aStates.top().getDocVarName())); + xMaster->setPropertyValue(u"Name"_ustr, + uno::Any(m_aStates.top().getDocVarName())); uno::Reference<text::XDependentTextField> xField( - m_xDstDoc->createInstance("com.sun.star.text.TextField.User"), + m_xDstDoc->createInstance(u"com.sun.star.text.TextField.User"_ustr), uno::UNO_QUERY); xField->attachTextFieldMaster(xMaster); - xField->getTextFieldMaster()->setPropertyValue("Content", uno::Any(docvar)); + xField->getTextFieldMaster()->setPropertyValue(u"Content"_ustr, + uno::Any(docvar)); m_aStates.top().clearDocVarName(); } diff --git a/sw/source/writerfilter/rtftok/rtfdocumentimpl.hxx b/sw/source/writerfilter/rtftok/rtfdocumentimpl.hxx index 775923088497..58e47e9e96e4 100644 --- a/sw/source/writerfilter/rtftok/rtfdocumentimpl.hxx +++ b/sw/source/writerfilter/rtftok/rtfdocumentimpl.hxx @@ -644,14 +644,16 @@ public: { if (m_Impl.empty()) throw css::io::WrongFormatException( - "Parser state is empty! Invalid usage of destination braces in RTF?", nullptr); + u"Parser state is empty! Invalid usage of destination braces in RTF?"_ustr, + nullptr); return m_Impl.back(); } void pop() { if (m_Impl.empty()) throw css::io::WrongFormatException( - "Parser state is empty! Invalid usage of destination braces in RTF?", nullptr); + u"Parser state is empty! Invalid usage of destination braces in RTF?"_ustr, + nullptr); return m_Impl.pop_back(); } void push(RTFParserState const& rState) { return m_Impl.push_back(rState); } diff --git a/sw/source/writerfilter/rtftok/rtfsdrimport.cxx b/sw/source/writerfilter/rtftok/rtfsdrimport.cxx index dff40953d1bd..4efe36cb6b5f 100644 --- a/sw/source/writerfilter/rtftok/rtfsdrimport.cxx +++ b/sw/source/writerfilter/rtftok/rtfsdrimport.cxx @@ -148,7 +148,8 @@ void RTFSdrImport::resolveDhgt(uno::Reference<beans::XPropertySet> const& xPrope if (!m_aGraphicZOrderHelpers.empty()) { writerfilter::dmapper::GraphicZOrderHelper& rHelper = m_aGraphicZOrderHelpers.top(); - xPropertySet->setPropertyValue("ZOrder", uno::Any(rHelper.findZOrder(nZOrder, bOldStyle))); + xPropertySet->setPropertyValue(u"ZOrder"_ustr, + uno::Any(rHelper.findZOrder(nZOrder, bOldStyle))); rHelper.addItem(xPropertySet, nZOrder); } } @@ -159,8 +160,8 @@ void RTFSdrImport::resolveLineColorAndWidth(bool bTextFrame, { if (!bTextFrame) { - xPropertySet->setPropertyValue("LineColor", rLineColor); - xPropertySet->setPropertyValue("LineWidth", rLineWidth); + xPropertySet->setPropertyValue(u"LineColor"_ustr, rLineColor); + xPropertySet->setPropertyValue(u"LineWidth"_ustr, rLineWidth); } else { @@ -182,9 +183,9 @@ void RTFSdrImport::resolveFLine(uno::Reference<beans::XPropertySet> const& xProp sal_Int32 const nFLine) { if (nFLine == 0) - xPropertySet->setPropertyValue("LineStyle", uno::Any(drawing::LineStyle_NONE)); + xPropertySet->setPropertyValue(u"LineStyle"_ustr, uno::Any(drawing::LineStyle_NONE)); else - xPropertySet->setPropertyValue("LineStyle", uno::Any(drawing::LineStyle_SOLID)); + xPropertySet->setPropertyValue(u"LineStyle"_ustr, uno::Any(drawing::LineStyle_SOLID)); } void RTFSdrImport::applyProperty(uno::Reference<drawing::XShape> const& xShape, @@ -246,27 +247,28 @@ void RTFSdrImport::applyProperty(uno::Reference<drawing::XShape> const& xShape, // Additionally, RTF type is 0..360*2^16, our is 0..360*100. sal_Int32 nRotation = o3tl::toInt32(aValue) * 100 / RTF_MULTIPLIER; 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)) xPropertySet->setPropertyValue( - "RotateAngle", uno::Any(NormAngle36000(Degree100(nRotation * -1)).get())); + u"RotateAngle"_ustr, uno::Any(NormAngle36000(Degree100(nRotation * -1)).get())); } if (nHoriOrient != 0 && xPropertySet.is()) - xPropertySet->setPropertyValue("HoriOrient", uno::Any(nHoriOrient)); + xPropertySet->setPropertyValue(u"HoriOrient"_ustr, uno::Any(nHoriOrient)); if (nVertOrient != 0 && xPropertySet.is()) - xPropertySet->setPropertyValue("VertOrient", uno::Any(nVertOrient)); + xPropertySet->setPropertyValue(u"VertOrient"_ustr, uno::Any(nVertOrient)); if (obFitShapeToText.has_value() && xPropertySet.is()) { xPropertySet->setPropertyValue( - "SizeType", uno::Any(*obFitShapeToText ? text::SizeType::MIN : text::SizeType::FIX)); - xPropertySet->setPropertyValue("FrameIsAutomaticHeight", uno::Any(*obFitShapeToText)); + u"SizeType"_ustr, + uno::Any(*obFitShapeToText ? text::SizeType::MIN : text::SizeType::FIX)); + xPropertySet->setPropertyValue(u"FrameIsAutomaticHeight"_ustr, uno::Any(*obFitShapeToText)); } if (!bFilled && xPropertySet.is()) { if (m_bTextFrame) - xPropertySet->setPropertyValue("BackColorTransparency", uno::Any(sal_Int32(100))); + xPropertySet->setPropertyValue(u"BackColorTransparency"_ustr, uno::Any(sal_Int32(100))); else - xPropertySet->setPropertyValue("FillStyle", uno::Any(drawing::FillStyle_NONE)); + xPropertySet->setPropertyValue(u"FillStyle"_ustr, uno::Any(drawing::FillStyle_NONE)); } } @@ -313,18 +315,18 @@ int RTFSdrImport::initShape(uno::Reference<drawing::XShape>& o_xShape, switch (nType) { case ESCHER_ShpInst_PictureFrame: - createShape("com.sun.star.drawing.GraphicObjectShape", o_xShape, o_xPropSet); + createShape(u"com.sun.star.drawing.GraphicObjectShape"_ustr, o_xShape, o_xPropSet); m_bTextGraphicObject = true; break; case ESCHER_ShpInst_Line: - createShape("com.sun.star.drawing.LineShape", o_xShape, o_xPropSet); + createShape(u"com.sun.star.drawing.LineShape"_ustr, o_xShape, o_xPropSet); break; case ESCHER_ShpInst_Rectangle: case ESCHER_ShpInst_TextBox: // If we're inside a groupshape, can't use text frames. if (!bClose && m_aParents.size() == 1) { - createShape("com.sun.star.text.TextFrame", o_xShape, o_xPropSet); + createShape(u"com.sun.star.text.TextFrame"_ustr, o_xShape, o_xPropSet); m_bTextFrame = true; std::vector<beans::PropertyValue> aDefaults = getTextFrameDefaults(true); for (const beans::PropertyValue& i : aDefaults) @@ -333,7 +335,7 @@ int RTFSdrImport::initShape(uno::Reference<drawing::XShape>& o_xShape, } [[fallthrough]]; default: - createShape("com.sun.star.drawing.CustomShape", o_xShape, o_xPropSet); + createShape(u"com.sun.star.drawing.CustomShape"_ustr, o_xShape, o_xPropSet); o_rIsCustomShape = true; break; } @@ -342,9 +344,9 @@ int RTFSdrImport::initShape(uno::Reference<drawing::XShape>& o_xShape, if (o_xPropSet.is() && !m_bTextFrame) { o_xPropSet->setPropertyValue( - "FillColor", + u"FillColor"_ustr, uno::Any(sal_uInt32(0xffffff))); // White in Word, kind of blue in Writer. - o_xPropSet->setPropertyValue("VertOrient", uno::Any(text::VertOrientation::NONE)); + o_xPropSet->setPropertyValue(u"VertOrient"_ustr, uno::Any(text::VertOrientation::NONE)); } return nType; @@ -391,8 +393,8 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap bool obFlipH(false); bool obFlipV(false); - OUString aShapeText = ""; - OUString aFontFamily = ""; + OUString aShapeText = u""_ustr; + OUString aFontFamily = u""_ustr; float nFontSize = 1.0; sal_Int32 nContrast = 0x10000; @@ -402,7 +404,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap int const nType = initShape(xShape, xPropertySet, bCustom, rShape, bClose, shapeOrPict); if (nType == ESCHER_ShpInst_PictureFrame && xPropertySet.is()) { - xPropertySet->setPropertyValue("IsEmptyPresentationObject", uno::Any(true)); + xPropertySet->setPropertyValue(u"IsEmptyPresentationObject"_ustr, uno::Any(true)); } for (auto& rProperty : rShape.getProperties()) @@ -419,10 +421,10 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap xNamed->setName(rProperty.second); } else - xPropertySet->setPropertyValue("Name", uno::Any(rProperty.second)); + xPropertySet->setPropertyValue(u"Name"_ustr, uno::Any(rProperty.second)); } else if (rProperty.first == "wzDescription") - xPropertySet->setPropertyValue("Description", uno::Any(rProperty.second)); + xPropertySet->setPropertyValue(u"Description"_ustr, uno::Any(rProperty.second)); else if (rProperty.first == "gtextUNICODE") aShapeText = rProperty.second; else if (rProperty.first == "gtextFont") @@ -441,9 +443,9 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap { aAny <<= msfilter::util::BGRToRGB(rProperty.second.toUInt32()); if (m_bTextFrame) - xPropertySet->setPropertyValue("BackColor", aAny); + xPropertySet->setPropertyValue(u"BackColor"_ustr, aAny); else - xPropertySet->setPropertyValue("FillColor", aAny); + xPropertySet->setPropertyValue(u"FillColor"_ustr, aAny); // fillType will decide, possible it'll be the start color of a gradient. aFillModel.moColor @@ -477,7 +479,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap else if (rProperty.first == "fillOpacity" && xPropertySet.is()) { int opacity = 100 - (rProperty.second.toInt32()) * 100 / RTF_MULTIPLIER; - xPropertySet->setPropertyValue("FillTransparence", uno::Any(sal_uInt32(opacity))); + xPropertySet->setPropertyValue(u"FillTransparence"_ustr, uno::Any(sal_uInt32(opacity))); } else if (rProperty.first == "lineWidth") aLineWidth <<= rProperty.second.toInt32() / 360; @@ -599,25 +601,25 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap else if (rProperty.first == "dxTextLeft") { if (xPropertySet.is()) - xPropertySet->setPropertyValue("LeftBorderDistance", + xPropertySet->setPropertyValue(u"LeftBorderDistance"_ustr, uno::Any(rProperty.second.toInt32() / 360)); } else if (rProperty.first == "dyTextTop") { if (xPropertySet.is()) - xPropertySet->setPropertyValue("TopBorderDistance", + xPropertySet->setPropertyValue(u"TopBorderDistance"_ustr, uno::Any(rProperty.second.toInt32() / 360)); } else if (rProperty.first == "dxTextRight") { if (xPropertySet.is()) - xPropertySet->setPropertyValue("RightBorderDistance", + xPropertySet->setPropertyValue(u"RightBorderDistance"_ustr, uno::Any(rProperty.second.toInt32() / 360)); } else if (rProperty.first == "dyTextBottom") { if (xPropertySet.is()) - xPropertySet->setPropertyValue("BottomBorderDistance", + xPropertySet->setPropertyValue(u"BottomBorderDistance"_ustr, uno::Any(rProperty.second.toInt32() / 360)); } else if (rProperty.first == "dxWrapDistLeft") @@ -626,7 +628,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap rShape.getAnchorAttributes().set(NS_ooxml::LN_CT_Anchor_distL, new RTFValue(rProperty.second.toInt32())); else if (xPropertySet.is()) - xPropertySet->setPropertyValue("LeftMargin", + xPropertySet->setPropertyValue(u"LeftMargin"_ustr, uno::Any(rProperty.second.toInt32() / 360)); } else if (rProperty.first == "dyWrapDistTop") @@ -635,7 +637,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap rShape.getAnchorAttributes().set(NS_ooxml::LN_CT_Anchor_distT, new RTFValue(rProperty.second.toInt32())); else if (xPropertySet.is()) - xPropertySet->setPropertyValue("TopMargin", + xPropertySet->setPropertyValue(u"TopMargin"_ustr, uno::Any(rProperty.second.toInt32() / 360)); } else if (rProperty.first == "dxWrapDistRight") @@ -644,7 +646,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap rShape.getAnchorAttributes().set(NS_ooxml::LN_CT_Anchor_distR, new RTFValue(rProperty.second.toInt32())); else if (xPropertySet.is()) - xPropertySet->setPropertyValue("RightMargin", + xPropertySet->setPropertyValue(u"RightMargin"_ustr, uno::Any(rProperty.second.toInt32() / 360)); } else if (rProperty.first == "dyWrapDistBottom") @@ -653,7 +655,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap rShape.getAnchorAttributes().set(NS_ooxml::LN_CT_Anchor_distB, new RTFValue(rProperty.second.toInt32())); else if (xPropertySet.is()) - xPropertySet->setPropertyValue("BottomMargin", + xPropertySet->setPropertyValue(u"BottomMargin"_ustr, uno::Any(rProperty.second.toInt32() / 360)); } else if (rProperty.first == "fillType") @@ -791,7 +793,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap if (xPropertySet.is()) { sal_Int16 const nVertOrient = text::VertOrientation::CENTER; - xPropertySet->setPropertyValue("VertOrient", uno::Any(nVertOrient)); + xPropertySet->setPropertyValue(u"VertOrient"_ustr, uno::Any(nVertOrient)); } } else if (rProperty.first == "pctHR") @@ -829,7 +831,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap } if (xPropertySet.is() && text::HoriOrientation::NONE != nHoriOrient) { - xPropertySet->setPropertyValue("HoriOrient", uno::Any(nHoriOrient)); + xPropertySet->setPropertyValue(u"HoriOrient"_ustr, uno::Any(nHoriOrient)); } } else if (rProperty.first == "pWrapPolygonVertices") @@ -902,10 +904,10 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap resolveDhgt(xPropertySet, rShape.getZ(), bOldStyle); } if (m_bTextFrame) - xPropertySet->setPropertyValue("WritingMode", uno::Any(eWritingMode)); + xPropertySet->setPropertyValue(u"WritingMode"_ustr, uno::Any(eWritingMode)); else // Only Writer textframes implement text::WritingMode2. - xPropertySet->setPropertyValue("TextWritingMode", + xPropertySet->setPropertyValue(u"TextWritingMode"_ustr, uno::Any(text::WritingMode(eWritingMode))); } @@ -915,7 +917,8 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap if (nContrast == -70 && nBrightness == 70 && xPropertySet.is()) { // Map MSO 'washout' to our watermark colormode. - xPropertySet->setPropertyValue("GraphicColorMode", uno::Any(drawing::ColorMode_WATERMARK)); + xPropertySet->setPropertyValue(u"GraphicColorMode"_ustr, + uno::Any(drawing::ColorMode_WATERMARK)); } if (bCustom && xShape.is() && !bPib) @@ -931,8 +934,8 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap if (xTextRange.is()) xTextRange->setString(aShapeText); - xPropertySet->setPropertyValue("CharFontName", uno::Any(aFontFamily)); - xPropertySet->setPropertyValue("CharHeight", uno::Any(nFontSize)); + xPropertySet->setPropertyValue(u"CharFontName"_ustr, uno::Any(aFontFamily)); + xPropertySet->setPropertyValue(u"CharHeight"_ustr, uno::Any(nFontSize)); } // Creating CustomShapeGeometry property @@ -940,19 +943,19 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap { bool bChanged = false; comphelper::SequenceAsHashMap aCustomShapeGeometry( - xPropertySet->getPropertyValue("CustomShapeGeometry")); + xPropertySet->getPropertyValue(u"CustomShapeGeometry"_ustr)); if (aViewBox.X || aViewBox.Y || aViewBox.Width || aViewBox.Height) { aViewBox.Width -= aViewBox.X; aViewBox.Height -= aViewBox.Y; - aCustomShapeGeometry["ViewBox"] <<= aViewBox; + aCustomShapeGeometry[u"ViewBox"_ustr] <<= aViewBox; bChanged = true; } if (!aPath.empty()) { - aCustomShapeGeometry["Path"] <<= comphelper::containerToSequence(aPath); + aCustomShapeGeometry[u"Path"_ustr] <<= comphelper::containerToSequence(aPath); bChanged = true; } @@ -961,16 +964,16 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap uno::Sequence<beans::PropertyValue> aSequence(comphelper::InitPropertySequence({ { "TextPath", uno::Any(true) }, })); - aCustomShapeGeometry["TextPath"] <<= aSequence; - xPropertySet->setPropertyValue("TextAutoGrowHeight", uno::Any(false)); - xPropertySet->setPropertyValue("TextAutoGrowWidth", uno::Any(false)); + aCustomShapeGeometry[u"TextPath"_ustr] <<= aSequence; + xPropertySet->setPropertyValue(u"TextAutoGrowHeight"_ustr, uno::Any(false)); + xPropertySet->setPropertyValue(u"TextAutoGrowWidth"_ustr, uno::Any(false)); bChanged = true; } if (bChanged) { xPropertySet->setPropertyValue( - "CustomShapeGeometry", + u"CustomShapeGeometry"_ustr, uno::Any(aCustomShapeGeometry.getAsConstPropertyValueList())); } } @@ -981,7 +984,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap { // Line shape inside group shape: get the polygon sequence and transform it. uno::Sequence<uno::Sequence<awt::Point>> aPolyPolySequence; - if ((xPropertySet->getPropertyValue("PolyPolygon") >>= aPolyPolySequence) + if ((xPropertySet->getPropertyValue(u"PolyPolygon"_ustr) >>= aPolyPolySequence) && aPolyPolySequence.hasElements()) { uno::Sequence<awt::Point>& rPolygon = aPolyPolySequence.getArray()[0]; @@ -1000,7 +1003,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap pPolygon[i] = awt::Point(static_cast<sal_Int32>(aPoint.getX()), static_cast<sal_Int32>(aPoint.getY())); } - xPropertySet->setPropertyValue("PolyPolygon", uno::Any(aPolyPolySequence)); + xPropertySet->setPropertyValue(u"PolyPolygon"_ustr, uno::Any(aPolyPolySequence)); } } } @@ -1034,8 +1037,8 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap if (m_bTextFrame) { - xPropertySet->setPropertyValue("HoriOrientPosition", uno::Any(nLeft)); - xPropertySet->setPropertyValue("VertOrientPosition", uno::Any(nTop)); + xPropertySet->setPropertyValue(u"HoriOrientPosition"_ustr, uno::Any(nLeft)); + xPropertySet->setPropertyValue(u"VertOrientPosition"_ustr, uno::Any(nTop)); } else xShape->setPosition(awt::Point(nLeft, nTop)); @@ -1052,13 +1055,13 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap { // This has to be set after position and size is set, otherwise flip will affect the position. comphelper::SequenceAsHashMap aCustomShapeGeometry( - xPropertySet->getPropertyValue("CustomShapeGeometry")); + xPropertySet->getPropertyValue(u"CustomShapeGeometry"_ustr)); if (obFlipH) - aCustomShapeGeometry["MirroredX"] <<= true; + aCustomShapeGeometry[u"MirroredX"_ustr] <<= true; if (obFlipV) - aCustomShapeGeometry["MirroredY"] <<= true; + aCustomShapeGeometry[u"MirroredY"_ustr] <<= true; xPropertySet->setPropertyValue( - "CustomShapeGeometry", + u"CustomShapeGeometry"_ustr, uno::Any(aCustomShapeGeometry.getAsConstPropertyValueList())); } else if (SdrObject* pObject = SdrObject::getSdrObjectFromXShape(xShape)) @@ -1080,13 +1083,13 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap } if (rShape.getHoriOrientRelation() != 0) - xPropertySet->setPropertyValue("HoriOrientRelation", + xPropertySet->setPropertyValue(u"HoriOrientRelation"_ustr, uno::Any(rShape.getHoriOrientRelation())); if (rShape.getVertOrientRelation() != 0) - xPropertySet->setPropertyValue("VertOrientRelation", + xPropertySet->setPropertyValue(u"VertOrientRelation"_ustr, uno::Any(rShape.getVertOrientRelation())); if (rShape.getWrap() != text::WrapTextMode::WrapTextMode_MAKE_FIXED_SIZE) - xPropertySet->setPropertyValue("Surround", uno::Any(rShape.getWrap())); + xPropertySet->setPropertyValue(u"Surround"_ustr, uno::Any(rShape.getWrap())); oox::ModelObjectHelper aModelObjectHelper(m_rImport.getTextDocument()); if (aFillModel.moType.has_value()) { @@ -1103,19 +1106,19 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap // Sets the ShadowFormat UNO property. oox::PropertySet(xShape).setProperties(aPropMap); } - xPropertySet->setPropertyValue("AnchorType", + xPropertySet->setPropertyValue(u"AnchorType"_ustr, uno::Any(text::TextContentAnchorType_AT_CHARACTER)); - xPropertySet->setPropertyValue("Opaque", uno::Any(bOpaque)); + xPropertySet->setPropertyValue(u"Opaque"_ustr, uno::Any(bOpaque)); if (oRelativeWidth) { - xPropertySet->setPropertyValue("RelativeWidth", uno::Any(*oRelativeWidth)); - xPropertySet->setPropertyValue("RelativeWidthRelation", + xPropertySet->setPropertyValue(u"RelativeWidth"_ustr, uno::Any(*oRelativeWidth)); + xPropertySet->setPropertyValue(u"RelativeWidthRelation"_ustr, uno::Any(nRelativeWidthRelation)); } if (oRelativeHeight) { - xPropertySet->setPropertyValue("RelativeHeight", uno::Any(*oRelativeHeight)); - xPropertySet->setPropertyValue("RelativeHeightRelation", + xPropertySet->setPropertyValue(u"RelativeHeight"_ustr, uno::Any(*oRelativeHeight)); + xPropertySet->setPropertyValue(u"RelativeHeightRelation"_ustr, uno::Any(nRelativeHeightRelation)); } } @@ -1135,7 +1138,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap // Handle horizontal flip. if (obFlipH && xPropertySet.is()) - xPropertySet->setPropertyValue("IsMirrored", uno::Any(true)); + xPropertySet->setPropertyValue(u"IsMirrored"_ustr, uno::Any(true)); return; } diff --git a/sw/source/writerfilter/rtftok/rtfsprm.cxx b/sw/source/writerfilter/rtftok/rtfsprm.cxx index 148d39c2e48b..50035c086e23 100644 --- a/sw/source/writerfilter/rtftok/rtfsprm.cxx +++ b/sw/source/writerfilter/rtftok/rtfsprm.cxx @@ -172,7 +172,7 @@ static RTFValue::Pointer_t getDefaultSPRM(Id const id, Id nStyleType) case NS_ooxml::LN_CT_Fonts_ascii: case NS_ooxml::LN_CT_Fonts_eastAsia: case NS_ooxml::LN_CT_Fonts_cs: - return new RTFValue("Times New Roman"); + return new RTFValue(u"Times New Roman"_ustr); default: break; } |