sw/source/writerfilter/dmapper/BorderHandler.cxx | 16
sw/source/writerfilter/dmapper/CellColorHandler.cxx | 20
sw/source/writerfilter/dmapper/CellMarginHandler.cxx | 12
sw/source/writerfilter/dmapper/DocumentProtection.cxx | 22
sw/source/writerfilter/dmapper/DomainMapper.cxx | 220 ++--
sw/source/writerfilter/dmapper/DomainMapperTableHandler.cxx | 76 -
sw/source/writerfilter/dmapper/DomainMapperTableManager.cxx | 14
sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx | 598 ++++++------
sw/source/writerfilter/dmapper/FormControlHelper.cxx | 42
sw/source/writerfilter/dmapper/GraphicHelpers.cxx | 4
sw/source/writerfilter/dmapper/GraphicImport.cxx | 160 +--
sw/source/writerfilter/dmapper/MeasureHandler.cxx | 8
sw/source/writerfilter/dmapper/NumberingManager.cxx | 4
sw/source/writerfilter/dmapper/OLEHandler.cxx | 10
sw/source/writerfilter/dmapper/PropertyMap.cxx | 72 -
sw/source/writerfilter/dmapper/SdtHelper.cxx | 36
sw/source/writerfilter/dmapper/SettingsTable.cxx | 66 -
sw/source/writerfilter/dmapper/StyleSheetTable.cxx | 64 -
sw/source/writerfilter/dmapper/TDefTableHandler.cxx | 446 ++++----
sw/source/writerfilter/dmapper/TablePositionHandler.cxx | 44
sw/source/writerfilter/dmapper/TablePositionHandler.hxx | 4
sw/source/writerfilter/dmapper/TablePropertiesHandler.cxx | 14
sw/source/writerfilter/dmapper/TblStylePrHandler.cxx | 40
sw/source/writerfilter/dmapper/TextEffectsHandler.cxx | 512 +++++-----
sw/source/writerfilter/dmapper/ThemeHandler.cxx | 86 -
sw/source/writerfilter/dmapper/WriteProtection.cxx | 8
sw/source/writerfilter/filter/RtfFilter.cxx | 18
sw/source/writerfilter/filter/WriterFilter.cxx | 67 -
sw/source/writerfilter/ooxml/OOXMLDocumentImpl.cxx | 10
sw/source/writerfilter/ooxml/OOXMLFastContextHandler.cxx | 6
sw/source/writerfilter/rtftok/rtfdispatchdestination.cxx | 5
sw/source/writerfilter/rtftok/rtfdispatchflag.cxx | 21
sw/source/writerfilter/rtftok/rtfdispatchsymbol.cxx | 6
sw/source/writerfilter/rtftok/rtfdispatchvalue.cxx | 4
sw/source/writerfilter/rtftok/rtfdocumentimpl.cxx | 44
sw/source/writerfilter/rtftok/rtfdocumentimpl.hxx | 6
sw/source/writerfilter/rtftok/rtfsdrimport.cxx | 137 +-
sw/source/writerfilter/rtftok/rtfsprm.cxx | 2
38 files changed, 1472 insertions(+), 1452 deletions(-)
New commits:
commit 5edbc4fd99db9fa568143aa4fa15b29de4bcc48b
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu May 16 13:32:29 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed May 29 12:55:31 2024 +0200
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.gran...@collabora.co.uk>
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("
", m_pImpl->GetTopContext());
+ m_pImpl->appendTextPortion(u"
"_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("
", pContext);
+ m_pImpl->appendTextPortion(u"
"_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("
", m_pImpl->GetTopContext());
+ m_pImpl->appendTextPortion(u"
"_ustr, m_pImpl->GetTopContext());
}
}
else if (len == 1 && sText[0] == ' ' )
@@ -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("
", m_pImpl->GetTopContext());
+ m_pImpl->appendTextPortion(u"
"_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)
-e
... etc. - the rest is truncated
