mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:ostr: automatic rewrite

Browse Source 
Change-Id: I2d09b2b83e1b50493ec88d0b2c323a83c0c86395
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157647
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Jenkins
This commit is contained in:
Stephan Bergmann 2023-10-06 09:42:38 +02:00
parent 9e3da252c3
commit e0c33ec15f
191 changed files with 4952 additions and 4929 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chart2/qa/extras/uichart.cxx
View File

@ -120,7 +120,7 @@ CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf120348)
CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf151091)
{
std::vector<OUString> aExpected
= { u"Ωφέλιμο", u"Επικίνδυνο", u"Απόσταση", u"Μάσκα", u"Εμβόλιο" };
= { u"Ωφέλιμο"_ustr, u"Επικίνδυνο"_ustr, u"Απόσταση"_ustr, u"Μάσκα"_ustr, u"Εμβόλιο"_ustr };
loadFromURL(u"ods/tdf151091.ods");
uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0, 0, mxComponent),

30
chart2/source/tools/ErrorBar.cxx
View File

@ -53,21 +53,21 @@ const SfxItemPropertySet* GetErrorBarPropertySet()
{
static const SfxItemPropertyMapEntry aErrorBarPropertyMap_Impl[] =
{
{u"ShowPositiveError",0,cppu::UnoType<bool>::get(), 0, 0},
{u"ShowNegativeError",1,cppu::UnoType<bool>::get(), 0, 0},
{u"PositiveError",2,cppu::UnoType<double>::get(),0,0},
{u"NegativeError",3,cppu::UnoType<double>::get(), 0, 0},
{u"PercentageError",4,cppu::UnoType<double>::get(), 0, 0},
{u"ErrorBarStyle",5,cppu::UnoType<sal_Int32>::get(),0,0},
{u"ErrorBarRangePositive",6,cppu::UnoType<OUString>::get(),0,0}, // read-only for export
{u"ErrorBarRangeNegative",7,cppu::UnoType<OUString>::get(),0,0}, // read-only for export
{u"Weight",8,cppu::UnoType<double>::get(),0,0},
{u"LineStyle",9,cppu::UnoType<css::drawing::LineStyle>::get(),0,0},
{u"LineDash",10,cppu::UnoType<drawing::LineDash>::get(),0,0},
{u"LineWidth",11,cppu::UnoType<sal_Int32>::get(),0,0},
{u"LineColor",12,cppu::UnoType<css::util::Color>::get(),0,0},
{u"LineTransparence",13,cppu::UnoType<sal_Int16>::get(),0,0},
{u"LineJoint",14,cppu::UnoType<css::drawing::LineJoint>::get(),0,0},
{u"ShowPositiveError"_ustr,0,cppu::UnoType<bool>::get(), 0, 0},
{u"ShowNegativeError"_ustr,1,cppu::UnoType<bool>::get(), 0, 0},
{u"PositiveError"_ustr,2,cppu::UnoType<double>::get(),0,0},
{u"NegativeError"_ustr,3,cppu::UnoType<double>::get(), 0, 0},
{u"PercentageError"_ustr,4,cppu::UnoType<double>::get(), 0, 0},
{u"ErrorBarStyle"_ustr,5,cppu::UnoType<sal_Int32>::get(),0,0},
{u"ErrorBarRangePositive"_ustr,6,cppu::UnoType<OUString>::get(),0,0}, // read-only for export
{u"ErrorBarRangeNegative"_ustr,7,cppu::UnoType<OUString>::get(),0,0}, // read-only for export
{u"Weight"_ustr,8,cppu::UnoType<double>::get(),0,0},
{u"LineStyle"_ustr,9,cppu::UnoType<css::drawing::LineStyle>::get(),0,0},
{u"LineDash"_ustr,10,cppu::UnoType<drawing::LineDash>::get(),0,0},
{u"LineWidth"_ustr,11,cppu::UnoType<sal_Int32>::get(),0,0},
{u"LineColor"_ustr,12,cppu::UnoType<css::util::Color>::get(),0,0},
{u"LineTransparence"_ustr,13,cppu::UnoType<sal_Int16>::get(),0,0},
{u"LineJoint"_ustr,14,cppu::UnoType<css::drawing::LineJoint>::get(),0,0},
};
static SfxItemPropertySet aPropSet( aErrorBarPropertyMap_Impl );
return &aPropSet;

10
comphelper/qa/string/test_string.cxx
View File

@ -73,7 +73,7 @@ void TestString::testDecimalStringToNumber()
s1 += u"\u07C6";
CPPUNIT_ASSERT_EQUAL(sal_uInt32(12346), comphelper::string::decimalStringToNumber(s1));
// Codepoints on 2 16bits words
s1 = u"\U0001D7FE\U0001D7F7"; // MATHEMATICAL MONOSPACE DIGIT EIGHT and ONE
s1 = u"\U0001D7FE\U0001D7F7"_ustr; // MATHEMATICAL MONOSPACE DIGIT EIGHT and ONE
CPPUNIT_ASSERT_EQUAL(sal_uInt32(81), comphelper::string::decimalStringToNumber(s1));
}
@ -192,7 +192,7 @@ void TestString::testReverseString()
comphelper::string::reverseString(u"u\U00010000v\U0010FFFFw"));
static sal_Unicode const malformed[] = {0xDC00, 0xD800};
CPPUNIT_ASSERT_EQUAL(
OUString(u"\U00010000"),
u"\U00010000"_ustr,
comphelper::string::reverseString(std::u16string_view(malformed, std::size(malformed))));
}
@ -200,11 +200,11 @@ void TestString::testReverseCodePoints() {
CPPUNIT_ASSERT_EQUAL(OUString(), comphelper::string::reverseCodePoints(""));
CPPUNIT_ASSERT_EQUAL(OUString("cba"), comphelper::string::reverseCodePoints("abc"));
CPPUNIT_ASSERT_EQUAL(
OUString(u"w\U0010FFFFv\U00010000u"),
comphelper::string::reverseCodePoints(u"u\U00010000v\U0010FFFFw"));
u"w\U0010FFFFv\U00010000u"_ustr,
comphelper::string::reverseCodePoints(u"u\U00010000v\U0010FFFFw"_ustr));
static sal_Unicode const malformed[] = {0xDC00, 0xD800};
CPPUNIT_ASSERT_EQUAL(
OUString(u"\U00010000"),
u"\U00010000"_ustr,
comphelper::string::reverseCodePoints(OUString(malformed, std::size(malformed))));
}

2
comphelper/source/misc/configuration.cxx
View File

@ -148,7 +148,7 @@ comphelper::detail::ConfigurationWrapper::ConfigurationWrapper():
css::uno::Any( css::beans::NamedValue{ "locale", css::uno::Any( OUString("*"))} ) };
css::uno::Reference< css::uno::XInterface > xCfg
= xConfigProvider->createInstanceWithArguments(u"com.sun.star.configuration.ConfigurationAccess",
= xConfigProvider->createInstanceWithArguments(u"com.sun.star.configuration.ConfigurationAccess"_ustr,
params);
maNotifier = css::uno::Reference< css::util::XChangesNotifier >(xCfg, css::uno::UNO_QUERY);

2
connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
View File

@ -623,7 +623,7 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getSchemas()
Reference<XInterface> executed = statement->executeQuery(
u"SELECT SCHEMA_NAME AS TABLE_SCHEM, CATALOG_NAME AS TABLE_CATALOG FROM INFORMATION_SCHEMA.SCHEMATA \
WHERE SCHEMA_NAME NOT IN ('information_schema', 'mysql', 'performance_schema') \
ORDER BY SCHEMA_NAME");
ORDER BY SCHEMA_NAME"_ustr);
Reference<XResultSet> rs(executed, UNO_QUERY_THROW);
Reference<XResultSetMetaDataSupplier> supp(executed, UNO_QUERY_THROW);
Reference<XResultSetMetaData> rs_meta = supp->getMetaData();

4
cppcanvas/qa/unit/test.cxx
View File

@ -120,12 +120,12 @@ CPPUNIT_TEST_FIXTURE(CanvasTest, testTdf155810)
{
ScopedVclPtrInstance<VirtualDevice> pDev;
vcl::Font aFont(u"Noto Naskh Arabic", u"Regular", Size(0, 72));
vcl::Font aFont(u"Noto Naskh Arabic"_ustr, u"Regular"_ustr, Size(0, 72));
pDev->SetFont(aFont);
aInputMetaFile.Record(pDev.get());
OUString aText(u"خالد");
OUString aText(u"خالد"_ustr);
pDev->GetTextArray(aText, &aDXArray);
auto nKashida = 200;

4
cppuhelper/source/factory.cxx
View File

@ -629,9 +629,9 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
{
aActivatorName = aLocation.subView( 0, nPos );
if( aActivatorName == u"java" )
aActivatorName = u"com.sun.star.loader.Java";
aActivatorName = u"com.sun.star.loader.Java"_ustr;
else if( aActivatorName == u"module" )
aActivatorName = u"com.sun.star.loader.SharedLibrary";
aActivatorName = u"com.sun.star.loader.SharedLibrary"_ustr;
aLocation = aLocation.copy( nPos + 3 );
}
}

4
desktop/qa/desktop_lib/test_desktop_lib.cxx
View File

@ -2319,7 +2319,7 @@ void DesktopLOKTest::testPaintPartTileDifferentSchemes()
aValue.bIsVisible = true;
aValue.nColor = aDarkColor;
aColorConfig.SetColorValue(svtools::DOCCOLOR, aValue);
aColorConfig.AddScheme(u"Dark");
aColorConfig.AddScheme(u"Dark"_ustr);
}
// Add a minimal light scheme
@ -2329,7 +2329,7 @@ void DesktopLOKTest::testPaintPartTileDifferentSchemes()
aValue.bIsVisible = true;
aValue.nColor = COL_WHITE;
aColorConfig.SetColorValue(svtools::DOCCOLOR, aValue);
aColorConfig.AddScheme(u"Light");
aColorConfig.AddScheme(u"Light"_ustr);
}
// This view will default to light scheme

4
editeng/source/accessibility/AccessibleEditableTextPara.cxx
View File

@ -92,8 +92,8 @@ namespace accessibility
SVX_UNOEDIT_CHAR_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
SVX_UNOEDIT_NUMBERING_PROPERTY,
{ u"TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
{ u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
{ u"TextUserDefinedAttributes"_ustr, EE_CHAR_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
{ u"ParaUserDefinedAttributes"_ustr, EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
};
static SvxItemPropertySet aPropSet( aPropMap, EditEngine::GetGlobalItemPool() );
return &aPropSet;

12
editeng/source/uno/unotext.cxx
View File

@ -88,10 +88,10 @@ o3tl::span<const SfxItemPropertyMapEntry> ImplGetSvxTextPortionPropertyMap()
SVX_UNOEDIT_FONT_PROPERTIES,
SVX_UNOEDIT_OUTLINER_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
{ u"TextField", EE_FEATURE_FIELD, cppu::UnoType<text::XTextField>::get(), beans::PropertyAttribute::READONLY, 0 },
{ u"TextPortionType", WID_PORTIONTYPE, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 },
{ u"TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
{ u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
{ u"TextField"_ustr, EE_FEATURE_FIELD, cppu::UnoType<text::XTextField>::get(), beans::PropertyAttribute::READONLY, 0 },
{ u"TextPortionType"_ustr, WID_PORTIONTYPE, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 },
{ u"TextUserDefinedAttributes"_ustr, EE_CHAR_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
{ u"ParaUserDefinedAttributes"_ustr, EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
};
return aSvxTextPortionPropertyMap;
}
@ -116,8 +116,8 @@ o3tl::span<const SfxItemPropertyMapEntry> ImplGetSvxUnoOutlinerTextCursorPropert
SVX_UNOEDIT_FONT_PROPERTIES,
SVX_UNOEDIT_OUTLINER_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
{ u"TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
{ u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
{ u"TextUserDefinedAttributes"_ustr, EE_CHAR_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
{ u"ParaUserDefinedAttributes"_ustr, EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
};
return aSvxUnoOutlinerTextCursorPropertyMap;

6
emfio/qa/cppunit/wmf/wmfimporttest.cxx
View File

@ -115,7 +115,7 @@ void WmfTest::testNonPlaceableWmf()
void WmfTest::testTdf88163NonPlaceableWmf()
{
OUString fileName(u"tdf88163-non-placeable.wmf");
OUString fileName(u"tdf88163-non-placeable.wmf"_ustr);
SvFileStream aFileStream(getFullUrl(fileName), StreamMode::READ);
GDIMetaFile aGDIMetaFile;
ReadWindowMetafile(aFileStream, aGDIMetaFile);
@ -150,7 +150,7 @@ void WmfTest::testTdf88163NonPlaceableWmf()
void WmfTest::testTdf88163PlaceableWmf()
{
OUString fileName(u"tdf88163-wrong-font-size.wmf");
OUString fileName(u"tdf88163-wrong-font-size.wmf"_ustr);
SvFileStream aFileStream(getFullUrl(fileName), StreamMode::READ);
GDIMetaFile aGDIMetaFile;
ReadWindowMetafile(aFileStream, aGDIMetaFile);
@ -188,7 +188,7 @@ void WmfTest::testTdf88163PlaceableWmf()
void WmfTest::testSetTextAlignWmf()
{
OUString fileName(u"TestSetTextAlign.wmf");
OUString fileName(u"TestSetTextAlign.wmf"_ustr);
SvFileStream aFileStream(getFullUrl(fileName), StreamMode::READ);
GDIMetaFile aGDIMetaFile;
ReadWindowMetafile(aFileStream, aGDIMetaFile);

2
extensions/source/bibliography/bibload.cxx
View File

@ -515,7 +515,7 @@ Reference< XPropertySetInfo > BibliographyLoader::getPropertySetInfo()
{
static const SfxItemPropertyMapEntry aBibProps_Impl[] =
{
{ u"BibliographyDataFieldNames", 0, cppu::UnoType<Sequence<PropertyValue>>::get(), PropertyAttribute::READONLY, 0},
{ u"BibliographyDataFieldNames"_ustr, 0, cppu::UnoType<Sequence<PropertyValue>>::get(), PropertyAttribute::READONLY, 0},
};
static Reference< XPropertySetInfo > xRet =
SfxItemPropertySet(aBibProps_Impl).getPropertySetInfo();

6
filter/qa/unit/textfilterdetect.cxx
View File

@ -138,7 +138,7 @@ CPPUNIT_TEST_FIXTURE(TextFilterDetectTest, testEmptyFile)
uno::Reference<text::XTextRange> xParagraph(xEnum->nextElement(), uno::UNO_QUERY_THROW);
// Make sure the template's text was loaded
CPPUNIT_ASSERT_EQUAL(OUString(u"Writer template’s first line"), xParagraph->getString());
CPPUNIT_ASSERT_EQUAL(u"Writer template’s first line"_ustr, xParagraph->getString());
}
loadFromURL(u"empty.ods");
@ -148,7 +148,7 @@ CPPUNIT_TEST_FIXTURE(TextFilterDetectTest, testEmptyFile)
uno::Reference<text::XTextRange> xC(xRA->getCellByPosition(0, 0, 0), uno::UNO_QUERY_THROW);
// Make sure the template's text was loaded
CPPUNIT_ASSERT_EQUAL(OUString(u"Calc template’s first cell"), xC->getString());
CPPUNIT_ASSERT_EQUAL(u"Calc template’s first cell"_ustr, xC->getString());
}
loadFromURL(u"empty.odp");
@ -169,7 +169,7 @@ CPPUNIT_TEST_FIXTURE(TextFilterDetectTest, testEmptyFile)
uno::Reference<text::XTextRange> xParagraph(xEnum->nextElement(), uno::UNO_QUERY_THROW);
// Make sure the template's text was loaded
CPPUNIT_ASSERT_EQUAL(OUString(u"Writer template’s first line"), xParagraph->getString());
CPPUNIT_ASSERT_EQUAL(u"Writer template’s first line"_ustr, xParagraph->getString());
}
}
}

2
filter/source/pdf/pdfexport.cxx
View File

@ -958,7 +958,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
else if (aSrcMimetype == "application/vnd.oasis.opendocument.graphics")
aExt = ".odg";
std::unique_ptr<vcl::PDFOutputStream> pStream(new PDFExportStreamDoc(mxSrcDoc, aPreparedPermissionPassword));
aPDFWriter.AddAttachedFile("Original" + aExt, aSrcMimetype, u"Embedded original document of this PDF file", std::move(pStream));
aPDFWriter.AddAttachedFile("Original" + aExt, aSrcMimetype, u"Embedded original document of this PDF file"_ustr, std::move(pStream));
}
if ( pOut )

26
filter/source/svg/svgexport.cxx
View File

@ -308,7 +308,7 @@ public:
OUString sDateTimeFormat = sDateFormat + " " + sTimeFormat;
pSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "date-time-format", sDateTimeFormat );
pSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "date-time-format"_ustr, sDateTimeFormat );
SvXMLElementExport aExp( *pSVGExport, XML_NAMESPACE_NONE, "g", true, true );
}
virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const override
@ -1220,13 +1220,13 @@ void SVGFilter::implGenerateMetaData()
// we wrap all meta presentation info into a svg:defs element
SvXMLElementExport aDefsElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", true, true );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", NSPREFIX "meta_slides" );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "number-of-slides", OUString::number( nCount ) );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "start-slide-number", OUString::number( mnVisiblePage ) );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", NSPREFIX "meta_slides"_ustr );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "number-of-slides"_ustr, OUString::number( nCount ) );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "start-slide-number"_ustr, OUString::number( mnVisiblePage ) );
if( mpSVGExport->IsUsePositionedCharacters() )
{
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "use-positioned-chars", "true" );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "use-positioned-chars"_ustr, "true" );
}
// Add a (global) Page Numbering Type attribute for the document
@ -1267,20 +1267,20 @@ void SVGFilter::implGenerateMetaData()
break;
}
if( !sNumberingType.isEmpty() )
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "page-numbering-type", sNumberingType );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "page-numbering-type"_ustr, sNumberingType );
}
{
SvXMLElementExport aExp( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true );
const OUString aId( NSPREFIX "meta_slide" );
const OUString aId( NSPREFIX "meta_slide"_ustr );
const OUString aElemTextFieldId( aOOOElemTextField );
std::vector< std::unique_ptr<TextField> > aFieldSet;
// dummy slide - used as leaving slide for transition on the first slide
if( mbPresentation )
{
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", NSPREFIX "meta_dummy_slide" );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", NSPREFIX "meta_dummy_slide"_ustr );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrSlide, "dummy-slide" );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrMaster, "dummy-master-page" );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrBackgroundVisibility, "hidden" );
@ -1353,7 +1353,7 @@ void SVGFilter::implGenerateMetaData()
bPageNumberVisibility = bPageNumberVisibility && ( nPageNumberingType != css::style::NumberingType::NUMBER_NONE );
if( bPageNumberVisibility ) // visibility default value: 'hidden'
{
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "page-number-visibility", "visible" );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "page-number-visibility"_ustr, "visible" );
}
// DateTime Field
@ -1377,7 +1377,7 @@ void SVGFilter::implGenerateMetaData()
xPropSet->getPropertyValue( "IsDateTimeVisible" ) >>= bDateTimeVisibility;
if( !bDateTimeVisibility ) // visibility default value: 'visible'
{
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "date-time-visibility", "hidden" );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "date-time-visibility"_ustr, "hidden" );
}
// Footer Field
@ -1390,7 +1390,7 @@ void SVGFilter::implGenerateMetaData()
xPropSet->getPropertyValue( "IsFooterVisible" ) >>= bFooterVisibility;
if( !bFooterVisibility ) // visibility default value: 'visible'
{
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "footer-visibility", "hidden" );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "footer-visibility"_ustr, "hidden" );
}
}
else
@ -1534,7 +1534,7 @@ void SVGFilter::implExportTextShapeIndex()
if( !rPageId.isEmpty() && !sTextShapeIdList.isEmpty() )
{
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrSlide, rPageId );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "id-list", sTextShapeIdList );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "id-list"_ustr, sTextShapeIdList );
SvXMLElementExport aGElem( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true );
}
}
@ -2203,7 +2203,7 @@ bool SVGFilter::implExportShape( const Reference< css::drawing::XShape >& rxShap
default:
break;
}
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "text-adjust", sTextAdjust );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "text-adjust"_ustr, sTextAdjust );
}
}
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", aShapeClass );

4
forms/source/richtext/richtextunowrapper.cxx
View File

@ -49,8 +49,8 @@ namespace frm
SVX_UNOEDIT_CHAR_PROPERTIES,
SVX_UNOEDIT_FONT_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
{ u"TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0 },
{ u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0 },
{ u"TextUserDefinedAttributes"_ustr, EE_CHAR_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0 },
{ u"ParaUserDefinedAttributes"_ustr, EE_PARA_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0 },
};
static SvxItemPropertySet aTextEnginePropertySet( aTextEnginePropertyMap, SdrObject::GetGlobalDrawObjectItemPool() );
return &aTextEnginePropertySet;

2
framework/source/uielement/langselectionstatusbarcontroller.cxx
View File

@ -344,7 +344,7 @@ void SAL_CALL LangSelectionStatusbarController::statusChanged( const FeatureStat
else if ( !Event.State.hasValue() )
{
m_xStatusbarItem->setText( OUString() );
m_xStatusbarItem->setQuickHelpText(u"");
m_xStatusbarItem->setQuickHelpText(u""_ustr);
m_bShowMenu = false; // no language -> no menu
}
}

2
i18nlangtag/source/languagetag/languagetag.cxx
View File

@ -1581,7 +1581,7 @@ const OUString & LanguageTagImpl::getBcp47() const
const OUString & LanguageTag::getBcp47( bool bResolveSystem ) const
{
static const OUString theEmptyBcp47 = u"";
static const OUString theEmptyBcp47 = u""_ustr;
if (!bResolveSystem && mbSystemLocale)
return theEmptyBcp47;

84
i18npool/qa/cppunit/test_characterclassification.cxx
View File

@ -85,33 +85,33 @@ CPPUNIT_TEST_FIXTURE(TestCharacterClassification, testSigma)
{
{
// From upper case
OUString sTest(u"ὈΔΥΣΣΕΎΣ");
OUString sTest(u"ὈΔΥΣΣΕΎΣ"_ustr);
OUString sLowerCase = m_xCC->toLower(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower", OUString(u"ὀδυσσεύς"), sLowerCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower", u"ὀδυσσεύς"_ustr, sLowerCase);
OUString sUpperCase = m_xCC->toUpper(sLowerCase, 0, sLowerCase.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", sTest, sUpperCase);
}
{
// From lower case
OUString sTest(u"ὀδυσσεύς");
OUString sTest(u"ὀδυσσεύς"_ustr);
OUString sTitleCase = m_xCC->toTitle(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be title", OUString(u"Ὀδυσσεύς"), sTitleCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be title", u"Ὀδυσσεύς"_ustr, sTitleCase);
OUString sUpperCase = m_xCC->toUpper(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", OUString(u"ὈΔΥΣΣΕΎΣ"), sUpperCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", u"ὈΔΥΣΣΕΎΣ"_ustr, sUpperCase);
OUString sLowerCase = m_xCC->toLower(sUpperCase, 0, sUpperCase.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower", sTest, sLowerCase);
}
{
// From title case
OUString sTest(u"Ὀδυσσεύς");
OUString sTest(u"Ὀδυσσεύς"_ustr);
OUString sTitleCase = m_xCC->toTitle(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be title", OUString(u"Ὀδυσσεύς"), sTitleCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be title", u"Ὀδυσσεύς"_ustr, sTitleCase);
OUString sUpperCase = m_xCC->toUpper(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", OUString(u"ὈΔΥΣΣΕΎΣ"), sUpperCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", u"ὈΔΥΣΣΕΎΣ"_ustr, sUpperCase);
OUString sLowerCase = m_xCC->toLower(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower", OUString(u"ὀδυσσεύς"), sLowerCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower", u"ὀδυσσεύς"_ustr, sLowerCase);
}
}
@ -119,33 +119,33 @@ CPPUNIT_TEST_FIXTURE(TestCharacterClassification, testTdf96343)
{
{
// From upper case
OUString sTest(u"ꙊꙌꙖ");
OUString sTest(u"ꙊꙌꙖ"_ustr);
OUString sLowerCase = m_xCC->toLower(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower", OUString(u"ꙋꙍꙗ"), sLowerCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower", u"ꙋꙍꙗ"_ustr, sLowerCase);
OUString sUpperCase = m_xCC->toUpper(sLowerCase, 0, sLowerCase.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", sTest, sUpperCase);
}
{
// From lower case
OUString sTest(u"ꙋꙍꙗ");
OUString sTest(u"ꙋꙍꙗ"_ustr);
OUString sTitleCase = m_xCC->toTitle(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be title", OUString(u"Ꙋꙍꙗ"), sTitleCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be title", u"Ꙋꙍꙗ"_ustr, sTitleCase);
OUString sUpperCase = m_xCC->toUpper(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", OUString(u"ꙊꙌꙖ"), sUpperCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", u"ꙊꙌꙖ"_ustr, sUpperCase);
OUString sLowerCase = m_xCC->toLower(sUpperCase, 0, sUpperCase.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower", sTest, sLowerCase);
}
{
// From title case
OUString sTest(u"Ꙋꙍꙗ");
OUString sTest(u"Ꙋꙍꙗ"_ustr);
OUString sTitleCase = m_xCC->toTitle(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be title", OUString(u"Ꙋꙍꙗ"), sTitleCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be title", u"Ꙋꙍꙗ"_ustr, sTitleCase);
OUString sUpperCase = m_xCC->toUpper(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", OUString(u"ꙊꙌꙖ"), sUpperCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", u"ꙊꙌꙖ"_ustr, sUpperCase);
OUString sLowerCase = m_xCC->toLower(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower", OUString(u"ꙋꙍꙗ"), sLowerCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower", u"ꙋꙍꙗ"_ustr, sLowerCase);
}
}
@ -153,33 +153,33 @@ CPPUNIT_TEST_FIXTURE(TestCharacterClassification, testTdf134766)
{
{
// From upper case
OUString sTest(u"QꞋORBꞋAL");
OUString sTest(u"QꞋORBꞋAL"_ustr);
OUString sLowerCase = m_xCC->toLower(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower", OUString(u"qꞌorbꞌal"), sLowerCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower", u"qꞌorbꞌal"_ustr, sLowerCase);
OUString sUpperCase = m_xCC->toUpper(sLowerCase, 0, sLowerCase.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", sTest, sUpperCase);
}
{
// From lower case
OUString sTest(u"qꞌorbꞌal");
OUString sTest(u"qꞌorbꞌal"_ustr);
OUString sTitleCase = m_xCC->toTitle(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be title", OUString(u"Qꞌorbꞌal"), sTitleCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be title", u"Qꞌorbꞌal"_ustr, sTitleCase);
OUString sUpperCase = m_xCC->toUpper(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", OUString(u"QꞋORBꞋAL"), sUpperCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", u"QꞋORBꞋAL"_ustr, sUpperCase);
OUString sLowerCase = m_xCC->toLower(sUpperCase, 0, sUpperCase.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower", sTest, sLowerCase);
}
{
// From title case
OUString sTest(u"Qꞌorbꞌal");
OUString sTest(u"Qꞌorbꞌal"_ustr);
OUString sTitleCase = m_xCC->toTitle(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be title", OUString(u"Qꞌorbꞌal"), sTitleCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be title", u"Qꞌorbꞌal"_ustr, sTitleCase);
OUString sUpperCase = m_xCC->toUpper(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", OUString(u"QꞋORBꞋAL"), sUpperCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", u"QꞋORBꞋAL"_ustr, sUpperCase);
OUString sLowerCase = m_xCC->toLower(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower", OUString(u"qꞌorbꞌal"), sLowerCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower", u"qꞌorbꞌal"_ustr, sLowerCase);
}
}
@ -187,33 +187,33 @@ CPPUNIT_TEST_FIXTURE(TestCharacterClassification, testTdf97152)
{
{
// From upper case
OUString sTest(u"ͲͰϽϾϿͿϏϹ");
OUString sTest(u"ͲͰϽϾϿͿϏϹ"_ustr);
OUString sLowerCase = m_xCC->toLower(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower", OUString(u"ͳͱͻͼͽϳϗϲ"), sLowerCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower", u"ͳͱͻͼͽϳϗϲ"_ustr, sLowerCase);
OUString sUpperCase = m_xCC->toUpper(sLowerCase, 0, sLowerCase.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", sTest, sUpperCase);
}
{
// From lower case
OUString sTest(u"ͳͱͻͼͽϳϗϲ");
OUString sTest(u"ͳͱͻͼͽϳϗϲ"_ustr);
OUString sTitleCase = m_xCC->toTitle(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be title", OUString(u"Ͳͱͻͼͽϳϗϲ"), sTitleCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be title", u"Ͳͱͻͼͽϳϗϲ"_ustr, sTitleCase);
OUString sUpperCase = m_xCC->toUpper(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", OUString(u"ͲͰϽϾϿͿϏϹ"), sUpperCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", u"ͲͰϽϾϿͿϏϹ"_ustr, sUpperCase);
OUString sLowerCase = m_xCC->toLower(sUpperCase, 0, sUpperCase.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower", sTest, sLowerCase);
}
{
// From title case
OUString sTest(u"Ͳͱͻͼͽϳϗϲ");
OUString sTest(u"Ͳͱͻͼͽϳϗϲ"_ustr);
OUString sTitleCase = m_xCC->toTitle(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be title", OUString(u"Ͳͱͻͼͽϳϗϲ"), sTitleCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be title", u"Ͳͱͻͼͽϳϗϲ"_ustr, sTitleCase);
OUString sUpperCase = m_xCC->toUpper(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", OUString(u"ͲͰϽϾϿͿϏϹ"), sUpperCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", u"ͲͰϽϾϿͿϏϹ"_ustr, sUpperCase);
OUString sLowerCase = m_xCC->toLower(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower", OUString(u"ͳͱͻͼͽϳϗϲ"), sLowerCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower", u"ͳͱͻͼͽϳϗϲ"_ustr, sLowerCase);
}
}
@ -221,18 +221,18 @@ CPPUNIT_TEST_FIXTURE(TestCharacterClassification, testSurrogatePairs)
{
{
// No case mapping
OUString sTest(u"\U0001F600");
OUString sTest(u"\U0001F600"_ustr);
OUString sLowerCase = m_xCC->toLower(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower", OUString(u"\U0001F600"), sLowerCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower", u"\U0001F600"_ustr, sLowerCase);
OUString sUpperCase = m_xCC->toUpper(sLowerCase, 0, sLowerCase.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", sTest, sUpperCase);
}
{
// Case mapping
OUString sTest(u"\U00010400");
OUString sTest(u"\U00010400"_ustr);
OUString sLowerCase = m_xCC->toLower(sTest, 0, sTest.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower", OUString(u"\U00010428"), sLowerCase);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower", u"\U00010428"_ustr, sLowerCase);
OUString sUpperCase = m_xCC->toUpper(sLowerCase, 0, sLowerCase.getLength(), {});
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", sTest, sUpperCase);
}
@ -240,8 +240,8 @@ CPPUNIT_TEST_FIXTURE(TestCharacterClassification, testSurrogatePairs)
CPPUNIT_TEST_FIXTURE(TestCharacterClassification, testAdlam)
{
OUString sUpper(u"𞤀𞤁𞤂𞤃𞤄𞤅𞤆𞤇𞤈𞤉𞤊𞤋𞤌𞤍𞤎𞤏𞤐𞤑𞤒𞤓𞤔𞤕𞤖𞤗𞤘𞤙𞤚𞤛𞤜𞤝𞤞𞤟𞤠𞤡");
OUString sLower(u"𞤢𞤣𞤤𞤥𞤦𞤧𞤨𞤩𞤪𞤫𞤬𞤭𞤮𞤯𞤰𞤱𞤲𞤳𞤴𞤵𞤶𞤷𞤸𞤹𞤺𞤻𞤼𞤽𞤾𞤿𞥀𞥁𞥂𞥃");
OUString sUpper(u"𞤀𞤁𞤂𞤃𞤄𞤅𞤆𞤇𞤈𞤉𞤊𞤋𞤌𞤍𞤎𞤏𞤐𞤑𞤒𞤓𞤔𞤕𞤖𞤗𞤘𞤙𞤚𞤛𞤜𞤝𞤞𞤟𞤠𞤡"_ustr);
OUString sLower(u"𞤢𞤣𞤤𞤥𞤦𞤧𞤨𞤩𞤪𞤫𞤬𞤭𞤮𞤯𞤰𞤱𞤲𞤳𞤴𞤵𞤶𞤷𞤸𞤹𞤺𞤻𞤼𞤽𞤾𞤿𞥀𞥁𞥂𞥃"_ustr);
OUString sTitle = sLower; // Adlam doesn’t have title case?
{
// From upper case

56
i18npool/qa/cppunit/test_defaultnumberingprovider.cxx
View File

@ -197,7 +197,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanCounting)
OUString aActual = xFormatter->makeNumberingString(aProperties, aLocale);
// Without the accompanying fix in place, this test would have failed with a
// lang.IllegalArgumentException, support for NUMBER_HANGUL_KO was missing.
CPPUNIT_ASSERT_EQUAL(OUString(u"\uc77c"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\uc77c"_ustr, aActual);
// 10 -> "십"
aProperties = {
@ -206,7 +206,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanCounting)
comphelper::makePropertyValue("Value", static_cast<sal_Int32>(10)),
};
aActual = xFormatter->makeNumberingString(aProperties, aLocale);
CPPUNIT_ASSERT_EQUAL(OUString(u"\uc2ed"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\uc2ed"_ustr, aActual);
// 100 -> "백"
aProperties = {
@ -215,7 +215,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanCounting)
comphelper::makePropertyValue("Value", static_cast<sal_Int32>(100)),
};
aActual = xFormatter->makeNumberingString(aProperties, aLocale);
CPPUNIT_ASSERT_EQUAL(OUString(u"\ubc31"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\ubc31"_ustr, aActual);
}
CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanLegal)
@ -232,7 +232,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanLegal)
OUString aActual = xFormatter->makeNumberingString(aProperties, aLocale);
// Without the accompanying fix in place, this test would have failed with a
// lang.IllegalArgumentException, support for NUMBER_LEGAL_KO was missing.
CPPUNIT_ASSERT_EQUAL(OUString(u"\ud558\ub098"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\ud558\ub098"_ustr, aActual);
// 2 -> "둘"
aProperties = {
@ -241,7 +241,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanLegal)
comphelper::makePropertyValue("Value", static_cast<sal_Int32>(2)),
};
aActual = xFormatter->makeNumberingString(aProperties, aLocale);
CPPUNIT_ASSERT_EQUAL(OUString(u"\ub458"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\ub458"_ustr, aActual);
// 3 -> "셋"
aProperties = {
@ -250,7 +250,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanLegal)
comphelper::makePropertyValue("Value", static_cast<sal_Int32>(3)),
};
aActual = xFormatter->makeNumberingString(aProperties, aLocale);
CPPUNIT_ASSERT_EQUAL(OUString(u"\uc14b"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\uc14b"_ustr, aActual);
// 4 -> "넷"
aProperties = {
@ -259,7 +259,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanLegal)
comphelper::makePropertyValue("Value", static_cast<sal_Int32>(4)),
};
aActual = xFormatter->makeNumberingString(aProperties, aLocale);
CPPUNIT_ASSERT_EQUAL(OUString(u"\ub137"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\ub137"_ustr, aActual);
// 5 -> "다섯"
aProperties = {
@ -268,7 +268,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanLegal)
comphelper::makePropertyValue("Value", static_cast<sal_Int32>(5)),
};
aActual = xFormatter->makeNumberingString(aProperties, aLocale);
CPPUNIT_ASSERT_EQUAL(OUString(u"\ub2e4\uc12f"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\ub2e4\uc12f"_ustr, aActual);
// 6 -> "여섯
aProperties = {
comphelper::makePropertyValue(
@ -276,7 +276,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanLegal)
comphelper::makePropertyValue("Value", static_cast<sal_Int32>(6)),
};
aActual = xFormatter->makeNumberingString(aProperties, aLocale);
CPPUNIT_ASSERT_EQUAL(OUString(u"\uc5ec\uc12f"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\uc5ec\uc12f"_ustr, aActual);
// 7 -> "일곱"
aProperties = {
comphelper::makePropertyValue(
@ -284,7 +284,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanLegal)
comphelper::makePropertyValue("Value", static_cast<sal_Int32>(7)),
};
aActual = xFormatter->makeNumberingString(aProperties, aLocale);
CPPUNIT_ASSERT_EQUAL(OUString(u"\uc77c\uacf1"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\uc77c\uacf1"_ustr, aActual);
// 8 -> "여덟"
aProperties = {
@ -293,7 +293,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanLegal)
comphelper::makePropertyValue("Value", static_cast<sal_Int32>(8)),
};
aActual = xFormatter->makeNumberingString(aProperties, aLocale);
CPPUNIT_ASSERT_EQUAL(OUString(u"\uc5ec\ub35f"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\uc5ec\ub35f"_ustr, aActual);
// 9 -> "아홉"
aProperties = {
@ -302,7 +302,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanLegal)
comphelper::makePropertyValue("Value", static_cast<sal_Int32>(9)),
};
aActual = xFormatter->makeNumberingString(aProperties, aLocale);
CPPUNIT_ASSERT_EQUAL(OUString(u"\uc544\ud649"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\uc544\ud649"_ustr, aActual);
// 10 -> "열"
aProperties = {
@ -311,7 +311,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanLegal)
comphelper::makePropertyValue("Value", static_cast<sal_Int32>(10)),
};
aActual = xFormatter->makeNumberingString(aProperties, aLocale);
CPPUNIT_ASSERT_EQUAL(OUString(u"\uc5f4"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\uc5f4"_ustr, aActual);
// 21 -> "스물하나"
aProperties = {
@ -320,7 +320,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanLegal)
comphelper::makePropertyValue("Value", static_cast<sal_Int32>(21)),
};
aActual = xFormatter->makeNumberingString(aProperties, aLocale);
CPPUNIT_ASSERT_EQUAL(OUString(u"\uc2a4\ubb3c\ud558\ub098"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\uc2a4\ubb3c\ud558\ub098"_ustr, aActual);
// 32 -> "서른둘"
aProperties = {
@ -329,7 +329,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanLegal)
comphelper::makePropertyValue("Value", static_cast<sal_Int32>(32)),
};
aActual = xFormatter->makeNumberingString(aProperties, aLocale);
CPPUNIT_ASSERT_EQUAL(OUString(u"\uc11c\ub978\ub458"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\uc11c\ub978\ub458"_ustr, aActual);
// 43 -> "마흔셋"
aProperties = {
@ -338,7 +338,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanLegal)
comphelper::makePropertyValue("Value", static_cast<sal_Int32>(43)),
};
aActual = xFormatter->makeNumberingString(aProperties, aLocale);
CPPUNIT_ASSERT_EQUAL(OUString(u"\ub9c8\ud754\uc14b"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\ub9c8\ud754\uc14b"_ustr, aActual);
// 54 -> "쉰넷"
aProperties = {
@ -347,7 +347,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanLegal)
comphelper::makePropertyValue("Value", static_cast<sal_Int32>(54)),
};
aActual = xFormatter->makeNumberingString(aProperties, aLocale);
CPPUNIT_ASSERT_EQUAL(OUString(u"\uc270\ub137"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\uc270\ub137"_ustr, aActual);
// 65 -> "예순다섯"
aProperties = {
@ -356,7 +356,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanLegal)
comphelper::makePropertyValue("Value", static_cast<sal_Int32>(65)),
};
aActual = xFormatter->makeNumberingString(aProperties, aLocale);
CPPUNIT_ASSERT_EQUAL(OUString(u"\uc608\uc21c\ub2e4\uc12f"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\uc608\uc21c\ub2e4\uc12f"_ustr, aActual);
// 76 -> "일흔여섯"
aProperties = {
@ -365,7 +365,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanLegal)
comphelper::makePropertyValue("Value", static_cast<sal_Int32>(76)),
};
aActual = xFormatter->makeNumberingString(aProperties, aLocale);
CPPUNIT_ASSERT_EQUAL(OUString(u"\uc77c\ud754\uc5ec\uc12f"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\uc77c\ud754\uc5ec\uc12f"_ustr, aActual);
// 87 -> "여든일곱"
aProperties = {
@ -374,7 +374,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanLegal)
comphelper::makePropertyValue("Value", static_cast<sal_Int32>(87)),
};
aActual = xFormatter->makeNumberingString(aProperties, aLocale);
CPPUNIT_ASSERT_EQUAL(OUString(u"\uc5ec\ub4e0\uc77c\uacf1"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\uc5ec\ub4e0\uc77c\uacf1"_ustr, aActual);
// 98 -> "아흔여덟"
aProperties = {
@ -383,7 +383,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanLegal)
comphelper::makePropertyValue("Value", static_cast<sal_Int32>(98)),
};
aActual = xFormatter->makeNumberingString(aProperties, aLocale);
CPPUNIT_ASSERT_EQUAL(OUString(u"\uc544\ud754\uc5ec\ub35f"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\uc544\ud754\uc5ec\ub35f"_ustr, aActual);
// 99 -> "아흔아홉"
aProperties = {
@ -392,7 +392,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanLegal)
comphelper::makePropertyValue("Value", static_cast<sal_Int32>(99)),
};
aActual = xFormatter->makeNumberingString(aProperties, aLocale);
CPPUNIT_ASSERT_EQUAL(OUString(u"\uc544\ud754\uc544\ud649"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\uc544\ud754\uc544\ud649"_ustr, aActual);
}
CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanDigital)
@ -409,7 +409,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanDigital)
OUString aActual = xFormatter->makeNumberingString(aProperties, aLocale);
// Without the accompanying fix in place, this test would have failed with a
// lang.IllegalArgumentException, support for NUMBER_DIGITAL_KO was missing.
CPPUNIT_ASSERT_EQUAL(OUString(u"\uc77c"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\uc77c"_ustr, aActual);
// 10 -> "일영"
aProperties = {
@ -418,7 +418,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanDigital)
comphelper::makePropertyValue("Value", static_cast<sal_Int32>(10)),
};
aActual = xFormatter->makeNumberingString(aProperties, aLocale);
CPPUNIT_ASSERT_EQUAL(OUString(u"\uc77c\uc601"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\uc77c\uc601"_ustr, aActual);
// 100 -> "일영영"
aProperties = {
@ -427,7 +427,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanDigital)
comphelper::makePropertyValue("Value", static_cast<sal_Int32>(100)),
};
aActual = xFormatter->makeNumberingString(aProperties, aLocale);
CPPUNIT_ASSERT_EQUAL(OUString(u"\uc77c\uc601\uc601"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\uc77c\uc601\uc601"_ustr, aActual);
}
CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanDigital2)
@ -444,7 +444,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanDigital2)
OUString aActual = xFormatter->makeNumberingString(aProperties, aLocale);
// Without the accompanying fix in place, this test would have failed with a
// lang.IllegalArgumentException, support for NUMBER_DIGITAL2_KO was missing.
CPPUNIT_ASSERT_EQUAL(OUString(u"\u4e00"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\u4e00"_ustr, aActual);
// 10 -> "一零"
aProperties = {
@ -453,7 +453,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanDigital2)
comphelper::makePropertyValue("Value", static_cast<sal_Int32>(10)),
};
aActual = xFormatter->makeNumberingString(aProperties, aLocale);
CPPUNIT_ASSERT_EQUAL(OUString(u"\u4e00\u96f6"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\u4e00\u96f6"_ustr, aActual);
// 100 -> "一零零"
aProperties = {
@ -462,7 +462,7 @@ CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testKoreanDigital2)
comphelper::makePropertyValue("Value", static_cast<sal_Int32>(100)),
};
aActual = xFormatter->makeNumberingString(aProperties, aLocale);
CPPUNIT_ASSERT_EQUAL(OUString(u"\u4e00\u96f6\u96f6"), aActual);
CPPUNIT_ASSERT_EQUAL(u"\u4e00\u96f6\u96f6"_ustr, aActual);
}
CPPUNIT_PLUGIN_IMPLEMENT();

18
i18npool/qa/cppunit/test_textsearch.cxx
View File

@ -294,7 +294,7 @@ void TestTextSearch::testWildcardSearch()
void TestTextSearch::testApostropheSearch()
{
// A) find typographic apostrophes also by using ASCII apostrophe in searchString
OUString str( u"It\u2019s an apostrophe." );
OUString str( u"It\u2019s an apostrophe."_ustr );
sal_Int32 startPos = 0, endPos = str.getLength();
// set options
@ -355,7 +355,7 @@ void TestTextSearch::testApostropheSearch()
CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(2), aRes.endOffset[0] );
// C) search typographic apostrophe in a text with ASCII apostrophes (no result)
aOptions.searchString = OUString(u"\u2019");
aOptions.searchString = u"\u2019"_ustr;
m_xSearch->setOptions( aOptions );
aRes = m_xSearch->searchForward( str, startPos, endPos );
@ -380,9 +380,9 @@ void TestTextSearch::testApostropheSearch()
CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(2), aRes.endOffset[0] );
// E) search mixed apostrophes in a text with mixed apostrophes:
aOptions.searchString = OUString(u"'\u2019");
aOptions.searchString = u"'\u2019"_ustr;
m_xSearch->setOptions( aOptions );
str = u"test: \u2019'";
str = u"test: \u2019'"_ustr;
// search forward
aRes = m_xSearch->searchForward( str, startPos, str.getLength());
@ -393,7 +393,7 @@ void TestTextSearch::testApostropheSearch()
CPPUNIT_ASSERT( aRes.subRegExpressions > 0 );
// F) search mixed apostrophes in a text with ASCII apostrophes:
str = u"test: ''";
str = u"test: ''"_ustr;
// search forward
aRes = m_xSearch->searchForward( str, startPos, str.getLength());
@ -406,7 +406,7 @@ void TestTextSearch::testApostropheSearch()
void TestTextSearch::testTdf138410()
{
OUString str(u"\u0643\u064f\u062a\u064f\u0628 \u0643\u062a\u0628");
OUString str(u"\u0643\u064f\u062a\u064f\u0628 \u0643\u062a\u0628"_ustr);
sal_Int32 startPos = 0, endPos = str.getLength();
util::SearchOptions aOptions;
@ -419,7 +419,7 @@ void TestTextSearch::testTdf138410()
// text or not, and whether IGNORE_DIACRITICS_CTL is set or not.
// set options
aOptions.searchString = u"\u0643";
aOptions.searchString = u"\u0643"_ustr;
aOptions.transliterateFlags = 0;
m_xSearch->setOptions(aOptions);
@ -457,7 +457,7 @@ void TestTextSearch::testTdf138410()
// not.
// set options
aOptions.searchString = u"\u0643\u064f";
aOptions.searchString = u"\u0643\u064f"_ustr;
aOptions.transliterateFlags = 0;
m_xSearch->setOptions(aOptions);
@ -494,7 +494,7 @@ void TestTextSearch::testTdf138410()
// set.
// set options
aOptions.searchString = u"\u064f";
aOptions.searchString = u"\u064f"_ustr;
aOptions.transliterateFlags = 0;
m_xSearch->setOptions(aOptions);

10
lingucomponent/source/lingutil/lingutil.cxx
View File

@ -125,11 +125,11 @@ static void GetOldStyleDicsInDir(
if (aLocaleName == u"ar")
aDicEntry.aLocaleNames = {
aLocaleName,
u"ar-AE", u"ar-BH", u"ar-DJ", u"ar-DZ", u"ar-EG",
u"ar-ER", u"ar-IL", u"ar-IQ", u"ar-JO", u"ar-KM",
u"ar-KW", u"ar-LB", u"ar-LY", u"ar-MA", u"ar-MR",
u"ar-OM", u"ar-PS", u"ar-QA", u"ar-SA", u"ar-SD",
u"ar-SO", u"ar-SY", u"ar-TD", u"ar-TN", u"ar-YE"
u"ar-AE"_ustr, u"ar-BH"_ustr, u"ar-DJ"_ustr, u"ar-DZ"_ustr, u"ar-EG"_ustr,
u"ar-ER"_ustr, u"ar-IL"_ustr, u"ar-IQ"_ustr, u"ar-JO"_ustr, u"ar-KM"_ustr,
u"ar-KW"_ustr, u"ar-LB"_ustr, u"ar-LY"_ustr, u"ar-MA"_ustr, u"ar-MR"_ustr,
u"ar-OM"_ustr, u"ar-PS"_ustr, u"ar-QA"_ustr, u"ar-SA"_ustr, u"ar-SD"_ustr,
u"ar-SO"_ustr, u"ar-SY"_ustr, u"ar-TD"_ustr, u"ar-TN"_ustr, u"ar-YE"_ustr
};
else
aDicEntry.aLocaleNames = { aLocaleName };

2
lotuswordpro/source/filter/lwpfribptr.cxx
View File

@ -261,7 +261,7 @@ void LwpFribPtr::XFConvert()
}
break;
case FRIB_TAG_SOFTHYPHEN:
pFrib->ConvertChars(m_pXFPara.get(), u"\x00ad");
pFrib->ConvertChars(m_pXFPara.get(), u"\x00ad"_ustr);
break;
case FRIB_TAG_FRAME:
{

10
lotuswordpro/source/filter/lwpnumericfmt.hxx
View File

@ -193,9 +193,9 @@ private:
m_aCurrencyInfo[nC++]=LwpCurrencyInfo("oS",true, true);//FMT_AUSTRIANSCHILLING = 3,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo("BF",true, true);//FMT_BELGIANFRANC = 4,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo("R$",false, true);//FMT_BRAZILIANCRUZEIRO = 5,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString(u"\uFFE1")); //FMT_BRITISHPOUND = 6,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo(u"\uFFE1"_ustr); //FMT_BRITISHPOUND = 6,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo("C$"); //FMT_CANADIANDOLLAR = 7,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString(u"PRC\uFFE5"),false,true); //FMT_CHINESEYUAN = 8,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo(u"PRC\uFFE5"_ustr,false,true); //FMT_CHINESEYUAN = 8,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Kc",true, true);//FMT_CZECHKORUNA = 9,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Dkr",false, true);//FMT_DANISHKRONE = 10,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo("ECU",true, true);//FMT_ECU = 11,
@ -207,9 +207,9 @@ private:
m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Ft",true, true);//FMT_HUNGARIANFORINT = 17,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Rs",false, true);//FMT_INDIANRUPEE = 18,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Rp",false, true);//FMT_INDONESIANRUPIAH = 19,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString(u"IR\uFFE1")); //FMT_IRISHPUNT = 20,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo(u"IR\uFFE1"_ustr); //FMT_IRISHPUNT = 20,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo("L.",false, true);//FMT_ITALIANLIRA = 21,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString(u"\uFFE5")); //FMT_JAPANESEYEN = 22,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo(u"\uFFE5"_ustr); //FMT_JAPANESEYEN = 22,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo("LF",true, true);//FMT_LUXEMBOURGFRANC = 23,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Rm",false, true);//FMT_MALAYSIANRINGGIT = 24,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Mex$"); //FMT_MEXICANPESO = 25,
@ -233,7 +233,7 @@ private:
m_aCurrencyInfo[nC++]=LwpCurrencyInfo("$"); //FMT_USDOLLAR = 43,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo("OTH",false, true);//FMT_OTHERCURRENCY = 44,
m_aCurrencyInfo[FMT_EURO]=LwpCurrencyInfo(OUString(u"\u20AC")); //FMT_EURO = 52
m_aCurrencyInfo[FMT_EURO]=LwpCurrencyInfo(u"\u20AC"_ustr); //FMT_EURO = 52
}
};

4
o3tl/qa/test-string_view.cxx
View File

@ -699,11 +699,11 @@ private:
}
{
CPPUNIT_ASSERT_MESSAGE("compareToAscii",
OUString(u"aaa").compareToAscii("aa")
u"aaa"_ustr.compareToAscii("aa")
> 0); // just for comparison to following line
CPPUNIT_ASSERT_MESSAGE("compareToAscii", o3tl::compareToAscii(u"aaa", "aa") > 0);
OUString aa(u"aa");
OUString aa(u"aa"_ustr);
CPPUNIT_ASSERT_MESSAGE("compareToAscii",
aa.compareToAscii("aaa")
< 0); // just for comparison to following line

14
oox/qa/unit/drawingml.cxx
View File

@ -351,7 +351,7 @@ CPPUNIT_TEST_FIXTURE(OoxDrawingmlTest, testTdf142605_CurveSize)
CPPUNIT_ASSERT(xShapeProps.is());
uno::Reference<container::XNamed> xShapeNamed(xShape, uno::UNO_QUERY);
CPPUNIT_ASSERT(xShapeNamed.is());
CPPUNIT_ASSERT_EQUAL(OUString(u"Bézier curve 1"), xShapeNamed->getName());
CPPUNIT_ASSERT_EQUAL(u"Bézier curve 1"_ustr, xShapeNamed->getName());
css::awt::Rectangle aBoundRect;
xShapeProps->getPropertyValue("BoundRect") >>= aBoundRect;
@ -671,11 +671,11 @@ CPPUNIT_TEST_FIXTURE(OoxDrawingmlTest, testTdf125085WordArtFontTheme)
// Without the fix some application defaults were used.
OUString sFontName;
xShapeProps->getPropertyValue("CharFontNameComplex") >>= sFontName;
CPPUNIT_ASSERT_EQUAL(OUString(u"Noto Serif Hebrew"), sFontName);
CPPUNIT_ASSERT_EQUAL(u"Noto Serif Hebrew"_ustr, sFontName);
css::lang::Locale aLocal;
xShapeProps->getPropertyValue("CharLocaleComplex") >>= aLocal;
CPPUNIT_ASSERT_EQUAL(OUString(u"IL"), aLocal.Country);
CPPUNIT_ASSERT_EQUAL(OUString(u"he"), aLocal.Language);
CPPUNIT_ASSERT_EQUAL(u"IL"_ustr, aLocal.Country);
CPPUNIT_ASSERT_EQUAL(u"he"_ustr, aLocal.Language);
}
CPPUNIT_TEST_FIXTURE(OoxDrawingmlTest, testTdf125085WordArtFontText)
@ -694,11 +694,11 @@ CPPUNIT_TEST_FIXTURE(OoxDrawingmlTest, testTdf125085WordArtFontText)
// Without the fix some application defaults were used.
OUString sFontName;
xShapeProps->getPropertyValue("CharFontNameComplex") >>= sFontName;
CPPUNIT_ASSERT_EQUAL(OUString(u"Noto Serif Hebrew"), sFontName);
CPPUNIT_ASSERT_EQUAL(u"Noto Serif Hebrew"_ustr, sFontName);
css::lang::Locale aLocal;
xShapeProps->getPropertyValue("CharLocaleComplex") >>= aLocal;
CPPUNIT_ASSERT_EQUAL(OUString(u"IL"), aLocal.Country);
CPPUNIT_ASSERT_EQUAL(OUString(u"he"), aLocal.Language);
CPPUNIT_ASSERT_EQUAL(u"IL"_ustr, aLocal.Country);
CPPUNIT_ASSERT_EQUAL(u"he"_ustr, aLocal.Language);
}
CPPUNIT_PLUGIN_IMPLEMENT();

180
oox/qa/unit/shape.cxx
View File

@ -201,15 +201,17 @@ CPPUNIT_TEST_FIXTURE(OoxShapeTest, testTdf151008VertAnchor)
drawing::TextHorizontalAdjust eAnchorHori;
drawing::TextVerticalAdjust eAnchorVert;
};
anchorDesc aExpected[6] = {
{ u"Right", drawing::TextHorizontalAdjust_RIGHT, drawing::TextVerticalAdjust_TOP },
{ u"Center", drawing::TextHorizontalAdjust_CENTER, drawing::TextVerticalAdjust_TOP },
{ u"Left", drawing::TextHorizontalAdjust_LEFT, drawing::TextVerticalAdjust_TOP },
{ u"RightMiddle", drawing::TextHorizontalAdjust_RIGHT, drawing::TextVerticalAdjust_CENTER },
{ u"CenterMiddle", drawing::TextHorizontalAdjust_CENTER,
drawing::TextVerticalAdjust_CENTER },
{ u"LeftMiddle", drawing::TextHorizontalAdjust_LEFT, drawing::TextVerticalAdjust_CENTER }
};
anchorDesc aExpected[6]
= { { u"Right"_ustr, drawing::TextHorizontalAdjust_RIGHT, drawing::TextVerticalAdjust_TOP },
{ u"Center"_ustr, drawing::TextHorizontalAdjust_CENTER,
drawing::TextVerticalAdjust_TOP },
{ u"Left"_ustr, drawing::TextHorizontalAdjust_LEFT, drawing::TextVerticalAdjust_TOP },
{ u"RightMiddle"_ustr, drawing::TextHorizontalAdjust_RIGHT,
drawing::TextVerticalAdjust_CENTER },
{ u"CenterMiddle"_ustr, drawing::TextHorizontalAdjust_CENTER,
drawing::TextVerticalAdjust_CENTER },
{ u"LeftMiddle"_ustr, drawing::TextHorizontalAdjust_LEFT,
drawing::TextVerticalAdjust_CENTER } };
// without the fix horizontal and vertical anchor positions were exchanged
for (size_t i = 0; i < 6; ++i)
{
@ -247,10 +249,10 @@ CPPUNIT_TEST_FIXTURE(OoxShapeTest, testTdf151518VertAnchor)
sal_Int32 nLowerDistance;
sal_Int32 nUpperDistance;
};
TextDistance aExpected[4] = { { u"Diagram Target List", 2, 2979, 201 },
{ u"Diagram Nested Target", 1, 3203, 127 },
{ u"Diagram Stacked Venn", 1, 3112, -302 },
{ u"Diagram Grouped List", 1, 4106, 196 } };
TextDistance aExpected[4] = { { u"Diagram Target List"_ustr, 2, 2979, 201 },
{ u"Diagram Nested Target"_ustr, 1, 3203, 127 },
{ u"Diagram Stacked Venn"_ustr, 1, 3112, -302 },
{ u"Diagram Grouped List"_ustr, 1, 4106, 196 } };
// without the fix the observed distances were
// {4434, -464}, {4674, -751}, {4620, -1399}, {6152, -744}
for (size_t i = 0; i < 4; ++i)
@ -346,65 +348,66 @@ CPPUNIT_TEST_FIXTURE(OoxShapeTest, testWriterFontwork)
// Is it a Fontwork?
bool bTextBox = bool();
CPPUNIT_ASSERT(xShapeProps->getPropertyValue(u"TextBox") >>= bTextBox);
CPPUNIT_ASSERT(xShapeProps->getPropertyValue(u"TextBox"_ustr) >>= bTextBox);
CPPUNIT_ASSERT(!bTextBox);
uno::Reference<css::text::XTextFrame> xTextFrame;
xShapeProps->getPropertyValue(u"TextBoxContent") >>= xTextFrame;
xShapeProps->getPropertyValue(u"TextBoxContent"_ustr) >>= xTextFrame;
CPPUNIT_ASSERT(!xTextFrame.is());
uno::Sequence<beans::PropertyValue> aGeoPropSeq;
xShapeProps->getPropertyValue(u"CustomShapeGeometry") >>= aGeoPropSeq;
xShapeProps->getPropertyValue(u"CustomShapeGeometry"_ustr) >>= aGeoPropSeq;
CPPUNIT_ASSERT(aGeoPropSeq.getLength() > 0);
comphelper::SequenceAsHashMap aGeoPropMap(aGeoPropSeq);
uno::Sequence<beans::PropertyValue> aTextPathSeq;
aGeoPropMap.getValue(u"TextPath") >>= aTextPathSeq;
aGeoPropMap.getValue(u"TextPath"_ustr) >>= aTextPathSeq;
CPPUNIT_ASSERT(aTextPathSeq.getLength() > 0);
comphelper::SequenceAsHashMap aTextPathPropMap(aTextPathSeq);
bool bTextPathOn = bool();
CPPUNIT_ASSERT(aTextPathPropMap.getValue(u"TextPath") >>= bTextPathOn);
CPPUNIT_ASSERT(aTextPathPropMap.getValue(u"TextPath"_ustr) >>= bTextPathOn);
CPPUNIT_ASSERT(bTextPathOn);
// Is it the correct kind of Fontwork?
uno::Sequence<drawing::EnhancedCustomShapeAdjustmentValue> aAdjustmentSeq;
aGeoPropMap.getValue(u"AdjustmentValues") >>= aAdjustmentSeq;
aGeoPropMap.getValue(u"AdjustmentValues"_ustr) >>= aAdjustmentSeq;
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aAdjustmentSeq.getLength());
uno::Sequence<uno::Sequence<beans::PropertyValue>> aHandleSeq;
aGeoPropMap.getValue(u"Handles") >>= aHandleSeq;
aGeoPropMap.getValue(u"Handles"_ustr) >>= aHandleSeq;
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aHandleSeq.getLength());
awt::Rectangle aViewBox;
aGeoPropMap.getValue(u"ViewBox") >>= aViewBox;
aGeoPropMap.getValue(u"ViewBox"_ustr) >>= aViewBox;
CPPUNIT_ASSERT_EQUAL(sal_Int32(21600), aViewBox.Width);
CPPUNIT_ASSERT_EQUAL(sal_Int32(21600), aViewBox.Height);
CPPUNIT_ASSERT_EQUAL(uno::Any(OUString(u"textDoubleWave1")),
aGeoPropMap.getValue(u"PresetTextWarp"));
CPPUNIT_ASSERT_EQUAL(uno::Any(u"textDoubleWave1"_ustr),
aGeoPropMap.getValue(u"PresetTextWarp"_ustr));
CPPUNIT_ASSERT_EQUAL(uno::Any(OUString(u"mso-spt158")), aGeoPropMap.getValue(u"Type"));
CPPUNIT_ASSERT_EQUAL(uno::Any(u"mso-spt158"_ustr), aGeoPropMap.getValue(u"Type"_ustr));
// Are properties correctly copied to shape?
CPPUNIT_ASSERT_EQUAL(uno::Any(Color(0, 0, 255)), xShapeProps->getPropertyValue(u"FillColor"));
CPPUNIT_ASSERT_EQUAL(uno::Any(Color(0, 0, 255)),
xShapeProps->getPropertyValue(u"FillColor"_ustr));
CPPUNIT_ASSERT_EQUAL(uno::Any(drawing::FillStyle_SOLID),
xShapeProps->getPropertyValue(u"FillStyle"));
xShapeProps->getPropertyValue(u"FillStyle"_ustr));
CPPUNIT_ASSERT_EQUAL(uno::Any(OUString(u"Courier New")),
xShapeProps->getPropertyValue(u"CharFontName"));
CPPUNIT_ASSERT_EQUAL(uno::Any(u"Courier New"_ustr),
xShapeProps->getPropertyValue(u"CharFontName"_ustr));
CPPUNIT_ASSERT_EQUAL(uno::Any(float(awt::FontWeight::BOLD)),
xShapeProps->getPropertyValue("CharWeight"));
lang::Locale aCharLocale;
xShapeProps->getPropertyValue(u"CharLocale") >>= aCharLocale;
xShapeProps->getPropertyValue(u"CharLocale"_ustr) >>= aCharLocale;
CPPUNIT_ASSERT_EQUAL(OUString("en"), aCharLocale.Language);
CPPUNIT_ASSERT_EQUAL(OUString("US"), aCharLocale.Country);
CPPUNIT_ASSERT_EQUAL(uno::Any(drawing::TextHorizontalAdjust_RIGHT),
xShapeProps->getPropertyValue(u"TextHorizontalAdjust"));
xShapeProps->getPropertyValue(u"TextHorizontalAdjust"_ustr));
}
CPPUNIT_TEST_FIXTURE(OoxShapeTest, testWriterFontwork2)
@ -421,35 +424,38 @@ CPPUNIT_TEST_FIXTURE(OoxShapeTest, testWriterFontwork2)
// Fill
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int16(4000)),
xShapeProps->getPropertyValue(u"FillColorLumMod"));
xShapeProps->getPropertyValue(u"FillColorLumMod"_ustr));
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int16(6000)),
xShapeProps->getPropertyValue(u"FillColorLumOff"));
xShapeProps->getPropertyValue(u"FillColorLumOff"_ustr));
// ID "6" for the theme "accent3" is not yet in API, but defined in enum PredefinedClrSchemeID
// in drawingml/clrscheme.hxx.
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int16(6)), xShapeProps->getPropertyValue(u"FillColorTheme"));
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int16(6)),
xShapeProps->getPropertyValue(u"FillColorTheme"_ustr));
CPPUNIT_ASSERT_EQUAL(uno::Any(Color(215, 228, 189)),
xShapeProps->getPropertyValue(u"FillColor"));
xShapeProps->getPropertyValue(u"FillColor"_ustr));
// Stroke
CPPUNIT_ASSERT_EQUAL(uno::Any(drawing::LineCap_ROUND),
xShapeProps->getPropertyValue(u"LineCap"));
xShapeProps->getPropertyValue(u"LineCap"_ustr));
CPPUNIT_ASSERT_EQUAL(uno::Any(drawing::LineStyle_DASH),
xShapeProps->getPropertyValue(u"LineStyle"));
xShapeProps->getPropertyValue(u"LineStyle"_ustr));
// Stroke has only the resulted color, but no reference to the used theme color "accent2".
CPPUNIT_ASSERT_EQUAL(uno::Any(Color(149, 55, 53)), xShapeProps->getPropertyValue(u"LineColor"));
CPPUNIT_ASSERT_EQUAL(uno::Any(Color(149, 55, 53)),
xShapeProps->getPropertyValue(u"LineColor"_ustr));
drawing::LineDash aLineDash;
xShapeProps->getPropertyValue(u"LineDash") >>= aLineDash;
xShapeProps->getPropertyValue(u"LineDash"_ustr) >>= aLineDash;
CPPUNIT_ASSERT_EQUAL(drawing::DashStyle_ROUNDRELATIVE, aLineDash.Style);
CPPUNIT_ASSERT_EQUAL(sal_Int16(1), aLineDash.Dots);
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aLineDash.DotLen);
CPPUNIT_ASSERT_EQUAL(sal_Int16(0), aLineDash.Dashes);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aLineDash.DashLen);
CPPUNIT_ASSERT_EQUAL(sal_Int32(199), aLineDash.Distance);
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(635)), xShapeProps->getPropertyValue(u"LineWidth"));
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(635)),
xShapeProps->getPropertyValue(u"LineWidth"_ustr));
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int16(20)),
xShapeProps->getPropertyValue(u"LineTransparence"));
xShapeProps->getPropertyValue(u"LineTransparence"_ustr));
CPPUNIT_ASSERT_EQUAL(uno::Any(drawing::LineJoint_BEVEL),
xShapeProps->getPropertyValue(u"LineJoint"));
xShapeProps->getPropertyValue(u"LineJoint"_ustr));
}
CPPUNIT_TEST_FIXTURE(OoxShapeTest, testWriterFontwork3)
@ -467,9 +473,9 @@ CPPUNIT_TEST_FIXTURE(OoxShapeTest, testWriterFontwork3)
{
uno::Reference<beans::XPropertySet> xShapeProps(xDrawPage->getByIndex(0), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(uno::Any(drawing::FillStyle_GRADIENT),
xShapeProps->getPropertyValue(u"FillStyle"));
xShapeProps->getPropertyValue(u"FillStyle"_ustr));
awt::Gradient2 aGradient;
xShapeProps->getPropertyValue(u"FillGradient") >>= aGradient;
xShapeProps->getPropertyValue(u"FillGradient"_ustr) >>= aGradient;
// MCGR: Use the completely imported transparency gradient to check for correctness
basegfx::BColorStops aColorStops;
@ -491,9 +497,9 @@ CPPUNIT_TEST_FIXTURE(OoxShapeTest, testWriterFontwork3)
{
uno::Reference<beans::XPropertySet> xShapeProps(xDrawPage->getByIndex(1), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(uno::Any(drawing::FillStyle_GRADIENT),
xShapeProps->getPropertyValue(u"FillStyle"));
xShapeProps->getPropertyValue(u"FillStyle"_ustr));
awt::Gradient2 aGradient;
xShapeProps->getPropertyValue(u"FillGradient") >>= aGradient;
xShapeProps->getPropertyValue(u"FillGradient"_ustr) >>= aGradient;
// MCGR: Use the completely imported transparency gradient to check for correctness
basegfx::BColorStops aColorStops;
@ -515,9 +521,9 @@ CPPUNIT_TEST_FIXTURE(OoxShapeTest, testWriterFontwork3)
{
uno::Reference<beans::XPropertySet> xShapeProps(xDrawPage->getByIndex(2), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(uno::Any(drawing::FillStyle_GRADIENT),
xShapeProps->getPropertyValue(u"FillStyle"));
xShapeProps->getPropertyValue(u"FillStyle"_ustr));
awt::Gradient2 aGradient;
xShapeProps->getPropertyValue(u"FillGradient") >>= aGradient;
xShapeProps->getPropertyValue(u"FillGradient"_ustr) >>= aGradient;
// MCGR: Use the completely imported transparency gradient to check for correctness
basegfx::BColorStops aColorStops;
@ -552,26 +558,31 @@ CPPUNIT_TEST_FIXTURE(OoxShapeTest, testWriterFontworkNonAccentColor)
// background 1 = lt1 = ID 1
uno::Reference<beans::XPropertySet> xShape0Props(xDrawPage->getByIndex(0), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int16(1)), xShape0Props->getPropertyValue(u"FillColorTheme"));
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int16(1)),
xShape0Props->getPropertyValue(u"FillColorTheme"_ustr));
CPPUNIT_ASSERT_EQUAL(uno::Any(Color(255, 204, 153)),
xShape0Props->getPropertyValue(u"FillColor"));
xShape0Props->getPropertyValue(u"FillColor"_ustr));
// text 1 = dk1 = ID 0
uno::Reference<beans::XPropertySet> xShape1Props(xDrawPage->getByIndex(1), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int16(0)), xShape1Props->getPropertyValue(u"FillColorTheme"));
CPPUNIT_ASSERT_EQUAL(uno::Any(Color(255, 0, 0)), xShape1Props->getPropertyValue(u"FillColor"));
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int16(0)),
xShape1Props->getPropertyValue(u"FillColorTheme"_ustr));
CPPUNIT_ASSERT_EQUAL(uno::Any(Color(255, 0, 0)),
xShape1Props->getPropertyValue(u"FillColor"_ustr));
// background 2 = lt2 = ID 3
uno::Reference<beans::XPropertySet> xShape2Props(xDrawPage->getByIndex(2), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int16(3)), xShape2Props->getPropertyValue(u"FillColorTheme"));
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int16(3)),
xShape2Props->getPropertyValue(u"FillColorTheme"_ustr));
CPPUNIT_ASSERT_EQUAL(uno::Any(Color(235, 221, 195)),
xShape2Props->getPropertyValue(u"FillColor"));
xShape2Props->getPropertyValue(u"FillColor"_ustr));
// text 2 = dk2 = ID 2
uno::Reference<beans::XPropertySet> xShape3Props(xDrawPage->getByIndex(3), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int16(2)), xShape3Props->getPropertyValue(u"FillColorTheme"));
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int16(2)),
xShape3Props->getPropertyValue(u"FillColorTheme"_ustr));
CPPUNIT_ASSERT_EQUAL(uno::Any(Color(119, 95, 85)),
xShape3Props->getPropertyValue(u"FillColor"));
xShape3Props->getPropertyValue(u"FillColor"_ustr));
}
CPPUNIT_TEST_FIXTURE(OoxShapeTest, testWriterShapeFillNonAccentColor)
@ -587,13 +598,17 @@ CPPUNIT_TEST_FIXTURE(OoxShapeTest, testWriterShapeFillNonAccentColor)
// The ID for the theme colors is not yet in API, but defined in enum PredefinedClrSchemeID
// in drawingml/clrscheme.hxx. Without fix the ID was -1 meaning no theme is used.
uno::Reference<beans::XPropertySet> xShape0Props(xDrawPage->getByIndex(0), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int16(3)), xShape0Props->getPropertyValue(u"FillColorTheme"));
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int16(3)),
xShape0Props->getPropertyValue(u"FillColorTheme"_ustr));
uno::Reference<beans::XPropertySet> xShape1Props(xDrawPage->getByIndex(1), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int16(1)), xShape1Props->getPropertyValue(u"FillColorTheme"));
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int16(1)),
xShape1Props->getPropertyValue(u"FillColorTheme"_ustr));
uno::Reference<beans::XPropertySet> xShape2Props(xDrawPage->getByIndex(2), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int16(0)), xShape2Props->getPropertyValue(u"FillColorTheme"));
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int16(0)),
xShape2Props->getPropertyValue(u"FillColorTheme"_ustr));
uno::Reference<beans::XPropertySet> xShape3Props(xDrawPage->getByIndex(3), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int16(2)), xShape3Props->getPropertyValue(u"FillColorTheme"));
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int16(2)),
xShape3Props->getPropertyValue(u"FillColorTheme"_ustr));
}
CPPUNIT_TEST_FIXTURE(OoxShapeTest, testWriterFontworkDarkenTransparency)
@ -614,7 +629,7 @@ CPPUNIT_TEST_FIXTURE(OoxShapeTest, testWriterFontworkDarkenTransparency)
// Actual: 11897660 (= 0xB58B3C = rgb(181, 139, 60) => luminance 47.25% )
// The original "Background 2" is 0xEBDDC3 = rgb(235, 221, 195) => luminance 84.31%
CPPUNIT_ASSERT_EQUAL(uno::Any(Color(208, 175, 114)),
xShapeProps->getPropertyValue(u"FillColor"));
xShapeProps->getPropertyValue(u"FillColor"_ustr));
}
CPPUNIT_TEST_FIXTURE(OoxShapeTest, testImportWordArtGradient)
@ -631,9 +646,9 @@ CPPUNIT_TEST_FIXTURE(OoxShapeTest, testImportWordArtGradient)
{
uno::Reference<beans::XPropertySet> xShapeProps(xDrawPage->getByIndex(0), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(uno::Any(drawing::FillStyle_GRADIENT),
xShapeProps->getPropertyValue(u"FillStyle"));
xShapeProps->getPropertyValue(u"FillStyle"_ustr));
awt::Gradient2 aGradient;
xShapeProps->getPropertyValue(u"FillGradient") >>= aGradient;
xShapeProps->getPropertyValue(u"FillGradient"_ustr) >>= aGradient;
// MCGR: Use the completely imported transparency gradient to check for correctness
basegfx::BColorStops aColorStops;
@ -649,12 +664,12 @@ CPPUNIT_TEST_FIXTURE(OoxShapeTest, testImportWordArtGradient)
CPPUNIT_ASSERT_EQUAL(sal_Int16(690), aGradient.Angle);
CPPUNIT_ASSERT_EQUAL(uno::Any(drawing::LineStyle_SOLID),
xShapeProps->getPropertyValue(u"LineStyle"));
xShapeProps->getPropertyValue(u"LineStyle"_ustr));
sal_Int32 nOutlineColor;
xShapeProps->getPropertyValue(u"LineColor") >>= nOutlineColor;
xShapeProps->getPropertyValue(u"LineColor"_ustr) >>= nOutlineColor;
CPPUNIT_ASSERT_EQUAL(sal_Int32(7384391), nOutlineColor);
sal_Int16 nLineTransparence;
xShapeProps->getPropertyValue(u"LineTransparence") >>= nLineTransparence;
xShapeProps->getPropertyValue(u"LineTransparence"_ustr) >>= nLineTransparence;
CPPUNIT_ASSERT_EQUAL(sal_Int16(60), nLineTransparence);
}
@ -663,9 +678,9 @@ CPPUNIT_TEST_FIXTURE(OoxShapeTest, testImportWordArtGradient)
{
uno::Reference<beans::XPropertySet> xShapeProps(xDrawPage->getByIndex(1), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(uno::Any(drawing::FillStyle_GRADIENT),
xShapeProps->getPropertyValue(u"FillStyle"));
xShapeProps->getPropertyValue(u"FillStyle"_ustr));
awt::Gradient2 aGradient;
xShapeProps->getPropertyValue(u"FillGradient") >>= aGradient;
xShapeProps->getPropertyValue(u"FillGradient"_ustr) >>= aGradient;
// MCGR: Use the completely imported transparency gradient to check for correctness
basegfx::BColorStops aColorStops;
@ -681,7 +696,7 @@ CPPUNIT_TEST_FIXTURE(OoxShapeTest, testImportWordArtGradient)
CPPUNIT_ASSERT_EQUAL(sal_Int16(50), aGradient.XOffset);
CPPUNIT_ASSERT_EQUAL(sal_Int16(50), aGradient.YOffset);
xShapeProps->getPropertyValue(u"FillTransparenceGradient") >>= aGradient;
xShapeProps->getPropertyValue(u"FillTransparenceGradient"_ustr) >>= aGradient;
// MCGR: Use the completely imported transparency gradient to check for correctness
aColorStops = model::gradient::getColorStopsFromUno(aGradient.ColorStops);
@ -697,13 +712,13 @@ CPPUNIT_TEST_FIXTURE(OoxShapeTest, testImportWordArtGradient)
CPPUNIT_ASSERT_EQUAL(sal_Int16(50), aGradient.YOffset);
CPPUNIT_ASSERT_EQUAL(uno::Any(drawing::LineStyle_DASH),
xShapeProps->getPropertyValue(u"LineStyle"));
xShapeProps->getPropertyValue(u"LineStyle"_ustr));
CPPUNIT_ASSERT_EQUAL(uno::Any(drawing::LineCap_ROUND),
xShapeProps->getPropertyValue(u"LineCap"));
xShapeProps->getPropertyValue(u"LineCap"_ustr));
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(7384391)),
xShapeProps->getPropertyValue(u"LineColor"));
xShapeProps->getPropertyValue(u"LineColor"_ustr));
drawing::LineDash aLineDash;
xShapeProps->getPropertyValue(u"LineDash") >>= aLineDash;
xShapeProps->getPropertyValue(u"LineDash"_ustr) >>= aLineDash;
CPPUNIT_ASSERT_EQUAL(drawing::DashStyle_ROUNDRELATIVE, aLineDash.Style);
CPPUNIT_ASSERT_EQUAL(sal_Int16(1), aLineDash.Dots);
CPPUNIT_ASSERT_EQUAL(sal_Int16(0), aLineDash.Dashes);
@ -715,9 +730,9 @@ CPPUNIT_TEST_FIXTURE(OoxShapeTest, testImportWordArtGradient)
{
uno::Reference<beans::XPropertySet> xShapeProps(xDrawPage->getByIndex(2), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(uno::Any(drawing::FillStyle_GRADIENT),
xShapeProps->getPropertyValue(u"FillStyle"));
xShapeProps->getPropertyValue(u"FillStyle"_ustr));
awt::Gradient2 aGradient;
xShapeProps->getPropertyValue(u"FillGradient") >>= aGradient;
xShapeProps->getPropertyValue(u"FillGradient"_ustr) >>= aGradient;
// MCGR: Use the completely imported transparency gradient to check for correctness
basegfx::BColorStops aColorStops;
@ -733,7 +748,7 @@ CPPUNIT_TEST_FIXTURE(OoxShapeTest, testImportWordArtGradient)
CPPUNIT_ASSERT_EQUAL(sal_Int16(100), aGradient.XOffset);
CPPUNIT_ASSERT_EQUAL(sal_Int16(0), aGradient.YOffset);
xShapeProps->getPropertyValue(u"FillTransparenceGradient") >>= aGradient;
xShapeProps->getPropertyValue(u"FillTransparenceGradient"_ustr) >>= aGradient;
// MCGR: Use the completely imported transparency gradient to check for correctness
aColorStops = model::gradient::getColorStopsFromUno(aGradient.ColorStops);
@ -749,7 +764,7 @@ CPPUNIT_TEST_FIXTURE(OoxShapeTest, testImportWordArtGradient)
CPPUNIT_ASSERT_EQUAL(sal_Int16(0), aGradient.YOffset);
CPPUNIT_ASSERT_EQUAL(uno::Any(drawing::LineStyle_NONE),
xShapeProps->getPropertyValue(u"LineStyle"));
xShapeProps->getPropertyValue(u"LineStyle"_ustr));
}
}
@ -764,14 +779,14 @@ CPPUNIT_TEST_FIXTURE(OoxShapeTest, testWordArtBitmapFill)
uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xShapeProps(xDrawPage->getByIndex(0), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(uno::Any(drawing::FillStyle_BITMAP),
xShapeProps->getPropertyValue(u"FillStyle"));
xShapeProps->getPropertyValue(u"FillStyle"_ustr));
// Test some bitmap properties
CPPUNIT_ASSERT_EQUAL(uno::Any(drawing::BitmapMode_REPEAT),
xShapeProps->getPropertyValue(u"FillBitmapMode"));
CPPUNIT_ASSERT_EQUAL(uno::Any(true), xShapeProps->getPropertyValue(u"FillBitmapTile"));
xShapeProps->getPropertyValue(u"FillBitmapMode"_ustr));
CPPUNIT_ASSERT_EQUAL(uno::Any(true), xShapeProps->getPropertyValue(u"FillBitmapTile"_ustr));
uno::Reference<awt::XBitmap> xBitmap;
xShapeProps->getPropertyValue(u"FillBitmap") >>= xBitmap;
xShapeProps->getPropertyValue(u"FillBitmap"_ustr) >>= xBitmap;
uno::Reference<graphic::XGraphic> xGraphic;
xGraphic.set(xBitmap, uno::UNO_QUERY);
@ -797,9 +812,10 @@ CPPUNIT_TEST_FIXTURE(OoxShapeTest, testWordArtDefaultColor)
uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xShapeProps(xDrawPage->getByIndex(0), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(uno::Any(drawing::FillStyle_SOLID),
xShapeProps->getPropertyValue(u"FillStyle"));
xShapeProps->getPropertyValue(u"FillStyle"_ustr));
CPPUNIT_ASSERT_EQUAL(uno::Any(Color(3, 74, 144)), xShapeProps->getPropertyValue(u"FillColor"));
CPPUNIT_ASSERT_EQUAL(uno::Any(Color(3, 74, 144)),
xShapeProps->getPropertyValue(u"FillColor"_ustr));
}
CPPUNIT_PLUGIN_IMPLEMENT();

2
oox/source/drawingml/diagram/diagramlayoutatoms.cxx
View File

@ -1826,7 +1826,7 @@ void AlgAtom::layoutShape(const ShapePtr& rShape, const std::vector<Constraint>&
= o3tl::convert(-285750, o3tl::Length::emu, o3tl::Length::mm100);
// It is not possible to change the bullet style for text.
aParagraph->getProperties().getBulletList().setBulletChar(u"•");
aParagraph->getProperties().getBulletList().setBulletChar(u"•"_ustr);
aParagraph->getProperties().getBulletList().setSuffixNone();
isBulletList = true;
}

131
oox/source/drawingml/fontworkhelpers.cxx
View File

@ -160,12 +160,12 @@ void FontworkHelpers::putCustomShapeIntoTextPathMode(
static constexpr OUStringLiteral sAdjustmentValues(u"AdjustmentValues");
static constexpr OUStringLiteral sPresetTextWarp(u"PresetTextWarp");
resetPropertyValueInVec(aGeomPropVec, u"CoordinateSize");
resetPropertyValueInVec(aGeomPropVec, u"Equations");
resetPropertyValueInVec(aGeomPropVec, u"Path");
resetPropertyValueInVec(aGeomPropVec, u"CoordinateSize"_ustr);
resetPropertyValueInVec(aGeomPropVec, u"Equations"_ustr);
resetPropertyValueInVec(aGeomPropVec, u"Path"_ustr);
resetPropertyValueInVec(aGeomPropVec, sAdjustmentValues);
resetPropertyValueInVec(aGeomPropVec, u"ViewBox");
resetPropertyValueInVec(aGeomPropVec, u"Handles");
resetPropertyValueInVec(aGeomPropVec, u"ViewBox"_ustr);
resetPropertyValueInVec(aGeomPropVec, u"Handles"_ustr);
resetPropertyValueInVec(aGeomPropVec, sTextPath);
resetPropertyValueInVec(aGeomPropVec, sPresetTextWarp);
@ -191,7 +191,7 @@ void FontworkHelpers::putCustomShapeIntoTextPathMode(
aGeomPropVec.push_back(comphelper::makePropertyValue(sAdjustmentValues, aAdjustment));
}
xSet->setPropertyValue(u"CustomShapeGeometry",
xSet->setPropertyValue(u"CustomShapeGeometry"_ustr,
uno::Any(comphelper::containerToSequence(aGeomPropVec)));
}
@ -853,8 +853,8 @@ void FontworkHelpers::collectCharColorProps(const uno::Reference<text::XText>& r
// We have found a non-empty run. Collect its simple color properties.
const std::array<OUString, 6> aNamesArray
= { u"CharColor", u"CharLumMod", u"CharLumOff",
u"CharColorTheme", u"CharComplexColor", u"CharTransparence" };
= { u"CharColor"_ustr, u"CharLumMod"_ustr, u"CharLumOff"_ustr,
u"CharColorTheme"_ustr, u"CharComplexColor"_ustr, u"CharTransparence"_ustr };
for (const auto& propName : aNamesArray)
{
if (xRunPropSetInfo->hasPropertyByName(propName))
@ -931,18 +931,18 @@ void FontworkHelpers::createCharFillPropsFromShape(
// CharColor contains the color including all color transformations
// FillColor contains darken and lighten but not transparency
sal_Int32 nColorRGB = 0;
if (xPropSetInfo->hasPropertyByName(u"FillColor")
&& (rXPropSet->getPropertyValue(u"FillColor") >>= nColorRGB))
if (xPropSetInfo->hasPropertyByName(u"FillColor"_ustr)
&& (rXPropSet->getPropertyValue(u"FillColor"_ustr) >>= nColorRGB))
{
::Color aColor(ColorTransparency, nColorRGB);
sal_Int16 nTransPercent = 0;
if (xPropSetInfo->hasPropertyByName(u"FillTransparence")
&& (rXPropSet->getPropertyValue(u"FillTransparence") >>= nTransPercent))
if (xPropSetInfo->hasPropertyByName(u"FillTransparence"_ustr)
&& (rXPropSet->getPropertyValue(u"FillTransparence"_ustr) >>= nTransPercent))
{
sal_uInt8 nAlpha = 255 - sal_uInt8(std::lround(double(nTransPercent) * 2.55));
aColor.SetAlpha(nAlpha);
}
rCharPropVec.push_back(comphelper::makePropertyValue(u"CharColor", sal_Int32(aColor)));
rCharPropVec.push_back(comphelper::makePropertyValue(u"CharColor"_ustr, sal_Int32(aColor)));
}
for (size_t i = 0; i < 5; i++)
@ -984,23 +984,23 @@ bool FontworkHelpers::createPrstDashFromLineDash(const drawing::LineDash& rLineD
bIsConverted = true;
if (nDotLen == 100 && rLineDash.Dashes == 0 && nDashLen == 0 && nDistance == 300)
rsPrstDash = u"dot";
rsPrstDash = u"dot"_ustr;
else if (nDotLen == 400 && rLineDash.Dashes == 0 && nDashLen == 0 && nDistance == 300)
rsPrstDash = u"dash";
rsPrstDash = u"dash"_ustr;
else if (nDotLen == 400 && rLineDash.Dashes == 1 && nDashLen == 100 && nDistance == 300)
rsPrstDash = u"dashDot";
rsPrstDash = u"dashDot"_ustr;
else if (nDotLen == 800 && rLineDash.Dashes == 0 && nDashLen == 0 && nDistance == 300)
rsPrstDash = u"lgDash";
rsPrstDash = u"lgDash"_ustr;
else if (nDotLen == 800 && rLineDash.Dashes == 1 && nDashLen == 100 && nDistance == 300)
rsPrstDash = u"lgDashDot";
rsPrstDash = u"lgDashDot"_ustr;
else if (nDotLen == 800 && rLineDash.Dashes == 2 && nDashLen == 100 && nDistance == 300)
rsPrstDash = u"lgDashDotDot";
rsPrstDash = u"lgDashDotDot"_ustr;
else if (nDotLen == 100 && rLineDash.Dashes == 0 && nDashLen == 0 && nDistance == 100)
rsPrstDash = u"sysDot";
rsPrstDash = u"sysDot"_ustr;
else if (nDotLen == 300 && rLineDash.Dashes == 0 && nDashLen == 0 && nDistance == 100)
rsPrstDash = u"sysDash";
rsPrstDash = u"sysDash"_ustr;
else if (nDotLen == 300 && rLineDash.Dashes == 1 && nDashLen == 100 && nDistance == 100)
rsPrstDash = u"sysDashDot";
rsPrstDash = u"sysDashDot"_ustr;
else if (nDotLen == 300 && rLineDash.Dashes == 2 && nDashLen == 100 && nDistance == 100)
rsPrstDash = "sysDashDotDot";
else
@ -1139,19 +1139,20 @@ void lcl_getGradientsFromShape(const uno::Reference<beans::XPropertySet>& rXProp
{
OUString sColorGradientName;
rbHasColorGradient
= rXPropSetInfo->hasPropertyByName(u"FillGradientName")
&& (rXPropSet->getPropertyValue(u"FillGradientName") >>= sColorGradientName)
&& !sColorGradientName.isEmpty() && rXPropSetInfo->hasPropertyByName(u"FillGradient")
&& (rXPropSet->getPropertyValue(u"FillGradient") >>= rColorGradient);
= rXPropSetInfo->hasPropertyByName(u"FillGradientName"_ustr)
&& (rXPropSet->getPropertyValue(u"FillGradientName"_ustr) >>= sColorGradientName)
&& !sColorGradientName.isEmpty() && rXPropSetInfo->hasPropertyByName(u"FillGradient"_ustr)
&& (rXPropSet->getPropertyValue(u"FillGradient"_ustr) >>= rColorGradient);
OUString sTransparenceGradientName;
rbHasTransparenceGradient
= rXPropSetInfo->hasPropertyByName(u"FillTransparenceGradientName")
&& (rXPropSet->getPropertyValue(u"FillTransparenceGradientName")
= rXPropSetInfo->hasPropertyByName(u"FillTransparenceGradientName"_ustr)
&& (rXPropSet->getPropertyValue(u"FillTransparenceGradientName"_ustr)
>>= sTransparenceGradientName)
&& !sTransparenceGradientName.isEmpty()
&& rXPropSetInfo->hasPropertyByName(u"FillTransparenceGradient")
&& (rXPropSet->getPropertyValue(u"FillTransparenceGradient") >>= rTransparenceGradient);
&& rXPropSetInfo->hasPropertyByName(u"FillTransparenceGradient"_ustr)
&& (rXPropSet->getPropertyValue(u"FillTransparenceGradient"_ustr)
>>= rTransparenceGradient);
}
ColorMapType lcl_createColorMapFromShapeProps(
@ -1185,7 +1186,7 @@ ColorMapType lcl_createColorMapFromShapeProps(
{
sal_Int32 nFillColor(0);
if (rXPropSetInfo->hasPropertyByName("FillColor"))
rXPropSet->getPropertyValue(u"FillColor") >>= nFillColor;
rXPropSet->getPropertyValue(u"FillColor"_ustr) >>= nFillColor;
aSingleColor = ::Color(ColorTransparency, nFillColor).getBColor().clamp();
}
@ -1207,8 +1208,8 @@ ColorMapType lcl_createColorMapFromShapeProps(
else
{
sal_Int16 nAPITrans(0);
if (rXPropSetInfo->hasPropertyByName(u"FillTransparence"))
rXPropSet->getPropertyValue(u"FillTransparence") >>= nAPITrans;
if (rXPropSetInfo->hasPropertyByName(u"FillTransparence"_ustr))
rXPropSet->getPropertyValue(u"FillTransparence"_ustr) >>= nAPITrans;
// API transparency is in range 0..100, BColor in range [0.0, 1.0].
aSingleTrans = basegfx::BColor(nAPITrans * 0.01).clamp();
}
@ -1270,16 +1271,16 @@ void FontworkHelpers::createCharInteropGrabBagUpdatesFromShapeProps(
// CharTextFillTextEffect
pGrabBagStack.reset(new oox::GrabBagStack("textFill"));
drawing::FillStyle eFillStyle = drawing::FillStyle_SOLID;
if (xPropSetInfo->hasPropertyByName(u"FillStyle"))
rXPropSet->getPropertyValue(u"FillStyle") >>= eFillStyle;
if (xPropSetInfo->hasPropertyByName(u"FillStyle"_ustr))
rXPropSet->getPropertyValue(u"FillStyle"_ustr) >>= eFillStyle;
// We might have a solid fill but a transparency gradient. That needs to be exported as gradFill
// too, because Word has transparency not separated but in the color stops in a color gradient.
// A gradient exists, if the GradientName is not empty.
OUString sTransparenceGradientName;
if (eFillStyle == drawing::FillStyle_SOLID
&& xPropSetInfo->hasPropertyByName(u"FillTransparenceGradientName")
&& (rXPropSet->getPropertyValue(u"FillTransparenceGradientName")
&& xPropSetInfo->hasPropertyByName(u"FillTransparenceGradientName"_ustr)
&& (rXPropSet->getPropertyValue(u"FillTransparenceGradientName"_ustr)
>>= sTransparenceGradientName)
&& !sTransparenceGradientName.isEmpty())
eFillStyle = drawing::FillStyle_GRADIENT;
@ -1408,8 +1409,8 @@ void FontworkHelpers::createCharInteropGrabBagUpdatesFromShapeProps(
{
pGrabBagStack->push("srgbClr");
sal_Int32 nFillColor(0);
if (xPropSetInfo->hasPropertyByName(u"FillColor"))
rXPropSet->getPropertyValue(u"FillColor") >>= nFillColor;
if (xPropSetInfo->hasPropertyByName(u"FillColor"_ustr))
rXPropSet->getPropertyValue(u"FillColor"_ustr) >>= nFillColor;
pGrabBagStack->push("attributes");
::Color aColor(ColorTransparency, nFillColor);
pGrabBagStack->addString("val", aColor.AsRGBHexString());
@ -1418,8 +1419,8 @@ void FontworkHelpers::createCharInteropGrabBagUpdatesFromShapeProps(
}
sal_Int16 nFillTransparence(0);
if (xPropSetInfo->hasPropertyByName(u"FillTransparence"))
rXPropSet->getPropertyValue(u"FillTransparence") >>= nFillTransparence;
if (xPropSetInfo->hasPropertyByName(u"FillTransparence"_ustr))
rXPropSet->getPropertyValue(u"FillTransparence"_ustr) >>= nFillTransparence;
if (nFillTransparence != 0)
{
pGrabBagStack->push("alpha");
@ -1446,29 +1447,29 @@ void FontworkHelpers::createCharInteropGrabBagUpdatesFromShapeProps(
pGrabBagStack->push("attributes");
// line width
sal_Int32 nLineWidth(0);
if (xPropSetInfo->hasPropertyByName(u"LineWidth"))
rXPropSet->getPropertyValue(u"LineWidth") >>= nLineWidth;
if (xPropSetInfo->hasPropertyByName(u"LineWidth"_ustr))
rXPropSet->getPropertyValue(u"LineWidth"_ustr) >>= nLineWidth;
pGrabBagStack->addInt32("w", nLineWidth * 360);
// cap for dashes
drawing::LineCap eLineCap = drawing::LineCap_BUTT;
if (xPropSetInfo->hasPropertyByName(u"LineCap"))
rXPropSet->getPropertyValue(u"LineCap") >>= eLineCap;
OUString sCap = u"flat";
if (xPropSetInfo->hasPropertyByName(u"LineCap"_ustr))
rXPropSet->getPropertyValue(u"LineCap"_ustr) >>= eLineCap;
OUString sCap = u"flat"_ustr;
if (eLineCap == drawing::LineCap_ROUND)
sCap = u"rnd";
sCap = u"rnd"_ustr;
else if (eLineCap == drawing::LineCap_SQUARE)
sCap = u"sq";
sCap = u"sq"_ustr;
pGrabBagStack->addString("cap", sCap);
// LO has no compound lines and always centers the lines
pGrabBagStack->addString("cmpd", u"sng");
pGrabBagStack->addString("alng", u"ctr");
pGrabBagStack->addString("cmpd", u"sng"_ustr);
pGrabBagStack->addString("alng", u"ctr"_ustr);
pGrabBagStack->pop();
// maCurrentElement:'textOutline', maPropertyList:'attributes'
// style
drawing::LineStyle eLineStyle = drawing::LineStyle_NONE;
if (xPropSetInfo->hasPropertyByName(u"LineStyle"))
rXPropSet->getPropertyValue(u"LineStyle") >>= eLineStyle;
if (xPropSetInfo->hasPropertyByName(u"LineStyle"_ustr))
rXPropSet->getPropertyValue(u"LineStyle"_ustr) >>= eLineStyle;
// 'dashed' is not a separate style in Word. Word has a style 'gradFill', but that is not yet
// implemented in LO. So only 'noFill' and 'solidFill'.
if (eLineStyle == drawing::LineStyle_NONE)
@ -1494,8 +1495,8 @@ void FontworkHelpers::createCharInteropGrabBagUpdatesFromShapeProps(
pGrabBagStack->push("srgbClr");
pGrabBagStack->push("attributes");
sal_Int32 nLineColor(0);
if (xPropSetInfo->hasPropertyByName(u"LineColor"))
rXPropSet->getPropertyValue(u"LineColor") >>= nLineColor;
if (xPropSetInfo->hasPropertyByName(u"LineColor"_ustr))
rXPropSet->getPropertyValue(u"LineColor"_ustr) >>= nLineColor;
::Color aColor(ColorTransparency, nLineColor);
pGrabBagStack->addString("val", aColor.AsRGBHexString());
pGrabBagStack->pop();
@ -1503,8 +1504,8 @@ void FontworkHelpers::createCharInteropGrabBagUpdatesFromShapeProps(
}
sal_Int16 nLineTransparence(0);
if (xPropSetInfo->hasPropertyByName(u"LineTransparence"))
rXPropSet->getPropertyValue(u"LineTransparence") >>= nLineTransparence;
if (xPropSetInfo->hasPropertyByName(u"LineTransparence"_ustr))
rXPropSet->getPropertyValue(u"LineTransparence"_ustr) >>= nLineTransparence;
if (nLineTransparence != 0)
{
pGrabBagStack->push("alpha");
@ -1523,10 +1524,10 @@ void FontworkHelpers::createCharInteropGrabBagUpdatesFromShapeProps(
if (eLineStyle == drawing::LineStyle_DASH)
{
pGrabBagStack->push("prstDash");
OUString sPrstDash = u"sysDot";
OUString sPrstDash = u"sysDot"_ustr;
drawing::LineDash aLineDash;
if (xPropSetInfo->hasPropertyByName(u"LineDash")
&& (rXPropSet->getPropertyValue(u"LineDash") >>= aLineDash))
if (xPropSetInfo->hasPropertyByName(u"LineDash"_ustr)
&& (rXPropSet->getPropertyValue(u"LineDash"_ustr) >>= aLineDash))
{
// The outline of abc-transform in Word is not able to use custDash. But we know the line
// is dashed. We keep "sysDot" as fallback in case no prstDash is detected.
@ -1547,8 +1548,8 @@ void FontworkHelpers::createCharInteropGrabBagUpdatesFromShapeProps(
// LineJoint, can be 'round', 'bevel' or 'miter' in Word
drawing::LineJoint eLineJoint = drawing::LineJoint_NONE;
if (xPropSetInfo->hasPropertyByName(u"LineJoint"))
rXPropSet->getPropertyValue(u"LineJoint") >>= eLineJoint;
if (xPropSetInfo->hasPropertyByName(u"LineJoint"_ustr))
rXPropSet->getPropertyValue(u"LineJoint"_ustr) >>= eLineJoint;
if (eLineJoint == drawing::LineJoint_NONE || eLineJoint == drawing::LineJoint_BEVEL)
pGrabBagStack->appendElement("bevel", uno::Any());
else if (eLineJoint == drawing::LineJoint_ROUND)
@ -1578,7 +1579,7 @@ void FontworkHelpers::createCharInteropGrabBagUpdatesFromShapeProps(
{
// CharThemeColor
beans::PropertyValue aCharThemeColor;
aCharThemeColor.Name = u"CharThemeColor";
aCharThemeColor.Name = u"CharThemeColor"_ustr;
aCharThemeColor.Value <<= lcl_getWMarkupStringForThemeColor(aComplexColor);
rUpdatePropVec.push_back(aCharThemeColor);
@ -1611,9 +1612,9 @@ void FontworkHelpers::createCharInteropGrabBagUpdatesFromShapeProps(
// CharThemeOriginalColor.
beans::PropertyValue aCharThemeOriginalColor;
sal_Int32 nFillColor(0);
if (xPropSetInfo->hasPropertyByName(u"FillColor"))
rXPropSet->getPropertyValue(u"FillColor") >>= nFillColor;
aCharThemeOriginalColor.Name = u"CharThemeOriginalColor";
if (xPropSetInfo->hasPropertyByName(u"FillColor"_ustr))
rXPropSet->getPropertyValue(u"FillColor"_ustr) >>= nFillColor;
aCharThemeOriginalColor.Name = u"CharThemeOriginalColor"_ustr;
::Color aColor(ColorTransparency, nFillColor);
aCharThemeOriginalColor.Value <<= aColor.AsRGBHEXString();
rUpdatePropVec.push_back(aCharThemeOriginalColor);

42
oox/source/drawingml/shape.cxx
View File

@ -601,13 +601,13 @@ static void lcl_copyCharPropsToShape(const uno::Reference<drawing::XShape>& xSha
switch (MsLangId::getScriptType(aTag.getLanguageType()))
{
case css::i18n::ScriptType::LATIN:
xSet->setPropertyValue(u"CharLocale", uno::Any(aLocale));
xSet->setPropertyValue(u"CharLocale"_ustr, uno::Any(aLocale));
break;
case css::i18n::ScriptType::ASIAN:
xSet->setPropertyValue(u"CharLocaleAsian", uno::Any(aLocale));
xSet->setPropertyValue(u"CharLocaleAsian"_ustr, uno::Any(aLocale));
break;
case css::i18n::ScriptType::COMPLEX:
xSet->setPropertyValue(u"CharLocaleComplex", uno::Any(aLocale));
xSet->setPropertyValue(u"CharLocaleComplex"_ustr, uno::Any(aLocale));
break;
default:;
}
@ -642,9 +642,9 @@ static void lcl_copyCharPropsToShape(const uno::Reference<drawing::XShape>& xSha
bRet = pFont->getFontData(sFontName, nFontPitch, nFontFamily, nullptr, rFilter);
if (bRet)
{
xSet->setPropertyValue(u"CharFontName", uno::Any(sFontName));
xSet->setPropertyValue(u"CharFontPitch", uno::Any(nFontPitch));
xSet->setPropertyValue(u"CharFontFamily", uno::Any(nFontFamily));
xSet->setPropertyValue(u"CharFontName"_ustr, uno::Any(sFontName));
xSet->setPropertyValue(u"CharFontPitch"_ustr, uno::Any(nFontPitch));
xSet->setPropertyValue(u"CharFontFamily"_ustr, uno::Any(nFontFamily));
}
}
// minor Asian
@ -653,9 +653,9 @@ static void lcl_copyCharPropsToShape(const uno::Reference<drawing::XShape>& xSha
bRet = pFont->getFontData(sFontName, nFontPitch, nFontFamily, nullptr, rFilter);
if (bRet)
{
xSet->setPropertyValue(u"CharFontNameAsian", uno::Any(sFontName));
xSet->setPropertyValue(u"CharFontPitchAsian", uno::Any(nFontPitch));
xSet->setPropertyValue(u"CharFontFamilyAsian", uno::Any(nFontFamily));
xSet->setPropertyValue(u"CharFontNameAsian"_ustr, uno::Any(sFontName));
xSet->setPropertyValue(u"CharFontPitchAsian"_ustr, uno::Any(nFontPitch));
xSet->setPropertyValue(u"CharFontFamilyAsian"_ustr, uno::Any(nFontFamily));
}
}
// minor Complex
@ -664,9 +664,9 @@ static void lcl_copyCharPropsToShape(const uno::Reference<drawing::XShape>& xSha
bRet = pFont->getFontData(sFontName, nFontPitch, nFontFamily, nullptr, rFilter);
if (bRet)
{
xSet->setPropertyValue(u"CharFontNameComplex", uno::Any(sFontName));
xSet->setPropertyValue(u"CharFontPitchComplex", uno::Any(nFontPitch));
xSet->setPropertyValue(u"CharFontFamilyComplex", uno::Any(nFontFamily));
xSet->setPropertyValue(u"CharFontNameComplex"_ustr, uno::Any(sFontName));
xSet->setPropertyValue(u"CharFontPitchComplex"_ustr, uno::Any(nFontPitch));
xSet->setPropertyValue(u"CharFontFamilyComplex"_ustr, uno::Any(nFontFamily));
}
}
}
@ -681,9 +681,9 @@ static void lcl_copyCharPropsToShape(const uno::Reference<drawing::XShape>& xSha
if (bRet)
{
xSet->setPropertyValue(u"CharFontName", uno::Any(sFontName));
xSet->setPropertyValue(u"CharFontPitch", uno::Any(nFontPitch));
xSet->setPropertyValue(u"CharFontFamily", uno::Any(nFontFamily));
xSet->setPropertyValue(u"CharFontName"_ustr, uno::Any(sFontName));
xSet->setPropertyValue(u"CharFontPitch"_ustr, uno::Any(nFontPitch));
xSet->setPropertyValue(u"CharFontFamily"_ustr, uno::Any(nFontFamily));
}
// Asian
bRet = rCharProps.maAsianFont.getFontData(sFontName, nFontPitch, nFontFamily, nullptr, rFilter);
@ -693,9 +693,9 @@ static void lcl_copyCharPropsToShape(const uno::Reference<drawing::XShape>& xSha
rFilter);
if (bRet)
{
xSet->setPropertyValue(u"CharFontNameAsian", uno::Any(sFontName));
xSet->setPropertyValue(u"CharFontPitchAsian", uno::Any(nFontPitch));
xSet->setPropertyValue(u"CharFontFamilyAsian", uno::Any(nFontFamily));
xSet->setPropertyValue(u"CharFontNameAsian"_ustr, uno::Any(sFontName));
xSet->setPropertyValue(u"CharFontPitchAsian"_ustr, uno::Any(nFontPitch));
xSet->setPropertyValue(u"CharFontFamilyAsian"_ustr, uno::Any(nFontFamily));
}
// Complex
bRet
@ -706,9 +706,9 @@ static void lcl_copyCharPropsToShape(const uno::Reference<drawing::XShape>& xSha
rFilter);
if (bRet)
{
xSet->setPropertyValue(u"CharFontNameComplex", uno::Any(sFontName));
xSet->setPropertyValue(u"CharFontPitchComplex", uno::Any(nFontPitch));
xSet->setPropertyValue(u"CharFontFamilyComplex", uno::Any(nFontFamily));
xSet->setPropertyValue(u"CharFontNameComplex"_ustr, uno::Any(sFontName));
xSet->setPropertyValue(u"CharFontPitchComplex"_ustr, uno::Any(nFontPitch));
xSet->setPropertyValue(u"CharFontFamilyComplex"_ustr, uno::Any(nFontFamily));
}
// LO uses shape properties, MS Office character properties. Copy them from char to shape.

90
oox/source/export/DMLPresetShapeExport.cxx
View File

@ -427,7 +427,7 @@ bool DMLPresetShapeExporter::WriteShapeWithAVlist()
tools::Long nVal1
= std::lround(*aPoint1.nCurrVal / (*aPoint1.nMaxVal - *aPoint1.nMinVal) * 50000);
return StartAVListWriting()
&& WriteAV(u"adj", OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj"_ustr, OUString(u"val " + OUString::number(nVal1)))
&& EndAVListWriting();
}
if (sShapeType == "blockArc")
@ -449,9 +449,9 @@ bool DMLPresetShapeExporter::WriteShapeWithAVlist()
tools::Long nVal3 = std::lround(
50000 - (*aPointR.nCurrVal / (*aPointR.nMaxVal - *aPointR.nMinVal) * 50000));
return StartAVListWriting()
&& WriteAV(u"adj1", OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj2", OUString(u"val " + OUString::number(nVal2)))
&& WriteAV(u"adj3", OUString(u"val " + OUString::number(nVal3)))
&& WriteAV(u"adj1"_ustr, OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj2"_ustr, OUString(u"val " + OUString::number(nVal2)))
&& WriteAV(u"adj3"_ustr, OUString(u"val " + OUString::number(nVal3)))
&& EndAVListWriting();
}
if (sShapeType == "borderCallout1")
@ -481,7 +481,7 @@ bool DMLPresetShapeExporter::WriteShapeWithAVlist()
tools::Long nVal1
= std::lround(*aPoint1.nCurrVal / (*aPoint1.nMaxVal - *aPoint1.nMinVal) * 25000);
return StartAVListWriting()
&& WriteAV(u"adj", OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj"_ustr, OUString(u"val " + OUString::number(nVal1)))
&& EndAVListWriting();
}
if (sShapeType == "bracketPair")
@ -496,7 +496,7 @@ bool DMLPresetShapeExporter::WriteShapeWithAVlist()
tools::Long nVal1
= std::lround(*aPoint1.nCurrVal / (*aPoint1.nMaxVal - *aPoint1.nMinVal) * 50000);
return StartAVListWriting()
&& WriteAV(u"adj", OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj"_ustr, OUString(u"val " + OUString::number(nVal1)))
&& EndAVListWriting();
}
if (sShapeType == "callout1")
@ -654,8 +654,8 @@ bool DMLPresetShapeExporter::WriteShapeWithAVlist()
tools::Long nVal2 = std::lround((*aPointY.nMaxVal - *aPointY.nCurrVal)
/ (*aPointY.nMaxVal - *aPointY.nMinVal) * nMaxVal2);
return StartAVListWriting()
&& WriteAV(u"adj1", OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj2", OUString(u"val " + OUString::number(nVal2)))
&& WriteAV(u"adj1"_ustr, OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj2"_ustr, OUString(u"val " + OUString::number(nVal2)))
&& EndAVListWriting();
}
if (sShapeType == "downArrowCallout")
@ -694,10 +694,10 @@ bool DMLPresetShapeExporter::WriteShapeWithAVlist()
tools::Long nVal4 = std::lround((*aBoxHeight.nCurrVal - *aBoxHeight.nMinVal)
/ (21600 - *aBoxHeight.nMinVal) * 100000);
return StartAVListWriting()
&& WriteAV(u"adj1", OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj2", OUString(u"val " + OUString::number(nVal2)))
&& WriteAV(u"adj3", OUString(u"val " + OUString::number(nVal3)))
&& WriteAV(u"adj4", OUString(u"val " + OUString::number(nVal4)))
&& WriteAV(u"adj1"_ustr, OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj2"_ustr, OUString(u"val " + OUString::number(nVal2)))
&& WriteAV(u"adj3"_ustr, OUString(u"val " + OUString::number(nVal3)))
&& WriteAV(u"adj4"_ustr, OUString(u"val " + OUString::number(nVal4)))
&& EndAVListWriting();
}
if (sShapeType == "ellipse")
@ -919,8 +919,8 @@ bool DMLPresetShapeExporter::WriteShapeWithAVlist()
tools::Long nVal1
= std::lround(*aPoint1.nCurrVal / (*aPoint1.nMaxVal - *aPoint1.nMinVal) * nMaxVal);
return StartAVListWriting()
&& WriteAV(u"adj", OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"vf", OUString(u"val " + OUString::number(115470)))
&& WriteAV(u"adj"_ustr, OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"vf"_ustr, OUString(u"val " + OUString::number(115470)))
&& EndAVListWriting();
}
if (sShapeType == "homePlate")
@ -964,8 +964,8 @@ bool DMLPresetShapeExporter::WriteShapeWithAVlist()
tools::Long nVal2 = std::lround((*aPointX.nCurrVal - *aPointX.nMinVal)
/ (*aPointX.nMaxVal - *aPointX.nMinVal) * nMaxVal2);
return StartAVListWriting()
&& WriteAV(u"adj1", OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj2", OUString(u"val " + OUString::number(nVal2)))
&& WriteAV(u"adj1"_ustr, OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj2"_ustr, OUString(u"val " + OUString::number(nVal2)))
&& EndAVListWriting();
}
if (sShapeType == "leftArrowCallout")
@ -1003,10 +1003,10 @@ bool DMLPresetShapeExporter::WriteShapeWithAVlist()
tools::Long nVal4 = std::lround((*aBoxWidth.nMaxVal - *aBoxWidth.nCurrVal)
/ (*aBoxWidth.nMaxVal - *aBoxWidth.nMinVal) * 100000);
return StartAVListWriting()
&& WriteAV(u"adj1", OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj2", OUString(u"val " + OUString::number(nVal2)))
&& WriteAV(u"adj3", OUString(u"val " + OUString::number(nVal3)))
&& WriteAV(u"adj4", OUString(u"val " + OUString::number(nVal4)))
&& WriteAV(u"adj1"_ustr, OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj2"_ustr, OUString(u"val " + OUString::number(nVal2)))
&& WriteAV(u"adj3"_ustr, OUString(u"val " + OUString::number(nVal3)))
&& WriteAV(u"adj4"_ustr, OUString(u"val " + OUString::number(nVal4)))
&& EndAVListWriting();
}
if (sShapeType == "leftBrace")
@ -1045,8 +1045,8 @@ bool DMLPresetShapeExporter::WriteShapeWithAVlist()
tools::Long nVal2 = std::lround((*aPointX.nCurrVal - *aPointX.nMinVal)
/ (*aPointX.nMaxVal - *aPointX.nMinVal) * nMaxVal2);
return StartAVListWriting()
&& WriteAV(u"adj1", OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj2", OUString(u"val " + OUString::number(nVal2)))
&& WriteAV(u"adj1"_ustr, OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj2"_ustr, OUString(u"val " + OUString::number(nVal2)))
&& EndAVListWriting();
}
if (sShapeType == "leftRightArrowCallout")
@ -1084,10 +1084,10 @@ bool DMLPresetShapeExporter::WriteShapeWithAVlist()
tools::Long nVal4 = std::lround((*aBoxHeight.nCurrVal - *aBoxHeight.nMinVal)
/ (10800 - *aBoxHeight.nMinVal) * 100000);
return StartAVListWriting()
&& WriteAV(u"adj1", OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj2", OUString(u"val " + OUString::number(nVal2)))
&& WriteAV(u"adj3", OUString(u"val " + OUString::number(nVal3)))
&& WriteAV(u"adj4", OUString(u"val " + OUString::number(nVal4)))
&& WriteAV(u"adj1"_ustr, OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj2"_ustr, OUString(u"val " + OUString::number(nVal2)))
&& WriteAV(u"adj3"_ustr, OUString(u"val " + OUString::number(nVal3)))
&& WriteAV(u"adj4"_ustr, OUString(u"val " + OUString::number(nVal4)))
&& EndAVListWriting();
}
if (sShapeType == "leftRightCircularArrow")
@ -1183,7 +1183,7 @@ bool DMLPresetShapeExporter::WriteShapeWithAVlist()
tools::Long nVal1
= std::lround(*aPoint1.nCurrVal / (*aPoint1.nMaxVal - *aPoint1.nMinVal) * 50000);
return StartAVListWriting()
&& WriteAV(u"adj", OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj"_ustr, OUString(u"val " + OUString::number(nVal1)))
&& EndAVListWriting();
}
if (sShapeType == "parallelogram")
@ -1200,7 +1200,7 @@ bool DMLPresetShapeExporter::WriteShapeWithAVlist()
tools::Long nVal1
= std::lround(*aPoint1.nCurrVal / (*aPoint1.nMaxVal - *aPoint1.nMinVal) * nMaxVal);
return StartAVListWriting()
&& WriteAV(u"adj", OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj"_ustr, OUString(u"val " + OUString::number(nVal1)))
&& EndAVListWriting();
}
if (sShapeType == "pentagon")
@ -1240,7 +1240,7 @@ bool DMLPresetShapeExporter::WriteShapeWithAVlist()
tools::Long nVal1
= std::lround(*aPoint1.nCurrVal / (*aPoint1.nMaxVal - *aPoint1.nMinVal) * 50000);
return StartAVListWriting()
&& WriteAV(u"adj", OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj"_ustr, OUString(u"val " + OUString::number(nVal1)))
&& EndAVListWriting();
}
if (sShapeType == "quadArrow")
@ -1289,8 +1289,8 @@ bool DMLPresetShapeExporter::WriteShapeWithAVlist()
tools::Long nVal2 = std::lround((*aPointX.nMaxVal - *aPointX.nCurrVal)
/ (*aPointX.nMaxVal - *aPointX.nMinVal) * nMaxVal2);
return StartAVListWriting()
&& WriteAV(u"adj1", OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj2", OUString(u"val " + OUString::number(nVal2)))
&& WriteAV(u"adj1"_ustr, OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj2"_ustr, OUString(u"val " + OUString::number(nVal2)))
&& EndAVListWriting();
}
if (sShapeType == "rightArrowCallout")
@ -1329,10 +1329,10 @@ bool DMLPresetShapeExporter::WriteShapeWithAVlist()
tools::Long nVal4 = std::lround((*aBoxWidth.nCurrVal - *aBoxWidth.nMinVal)
/ (21600 - *aBoxWidth.nMinVal) * 100000);
return StartAVListWriting()
&& WriteAV(u"adj1", OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj2", OUString(u"val " + OUString::number(nVal2)))
&& WriteAV(u"adj3", OUString(u"val " + OUString::number(nVal3)))
&& WriteAV(u"adj4", OUString(u"val " + OUString::number(nVal4)))
&& WriteAV(u"adj1"_ustr, OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj2"_ustr, OUString(u"val " + OUString::number(nVal2)))
&& WriteAV(u"adj3"_ustr, OUString(u"val " + OUString::number(nVal3)))
&& WriteAV(u"adj4"_ustr, OUString(u"val " + OUString::number(nVal4)))
&& EndAVListWriting();
}
if (sShapeType == "rightBrace")
@ -1385,7 +1385,7 @@ bool DMLPresetShapeExporter::WriteShapeWithAVlist()
m_pDMLexporter->WriteShapeTransformation(m_xShape, XML_a, IsXFlipped(), IsYFlipped(),
false, false);
return StartAVListWriting()
&& WriteAV(u"adj", OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj"_ustr, OUString(u"val " + OUString::number(nVal1)))
&& EndAVListWriting();
}
if (sShapeType == "rtTriangle")
@ -1516,7 +1516,7 @@ bool DMLPresetShapeExporter::WriteShapeWithAVlist()
tools::Long nVal1
= std::lround(*aPoint1.nCurrVal / (*aPoint1.nMaxVal - *aPoint1.nMinVal) * nMaxVal);
return StartAVListWriting()
&& WriteAV(u"adj", OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj"_ustr, OUString(u"val " + OUString::number(nVal1)))
&& EndAVListWriting();
}
if (sShapeType == "upArrowCallout")
@ -1554,10 +1554,10 @@ bool DMLPresetShapeExporter::WriteShapeWithAVlist()
tools::Long nVal4 = std::lround((*aBoxHeight.nCurrVal - *aBoxHeight.nMinVal)
/ (10800 - *aBoxHeight.nMinVal) * 100000);
return StartAVListWriting()
&& WriteAV(u"adj1", OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj2", OUString(u"val " + OUString::number(nVal2)))
&& WriteAV(u"adj3", OUString(u"val " + OUString::number(nVal3)))
&& WriteAV(u"adj4", OUString(u"val " + OUString::number(nVal4)))
&& WriteAV(u"adj1"_ustr, OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj2"_ustr, OUString(u"val " + OUString::number(nVal2)))
&& WriteAV(u"adj3"_ustr, OUString(u"val " + OUString::number(nVal3)))
&& WriteAV(u"adj4"_ustr, OUString(u"val " + OUString::number(nVal4)))
&& EndAVListWriting();
}
if (sShapeType == "upDownArrow")
@ -1580,8 +1580,8 @@ bool DMLPresetShapeExporter::WriteShapeWithAVlist()
tools::Long nVal2 = std::lround((*aPointY.nCurrVal - *aPointY.nMinVal)
/ (*aPointY.nMaxVal - *aPointY.nMinVal) * nMaxVal2);
return StartAVListWriting()
&& WriteAV(u"adj1", OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj2", OUString(u"val " + OUString::number(nVal2)))
&& WriteAV(u"adj1"_ustr, OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj2"_ustr, OUString(u"val " + OUString::number(nVal2)))
&& EndAVListWriting();
}
if (sShapeType == "upArrow")
@ -1604,8 +1604,8 @@ bool DMLPresetShapeExporter::WriteShapeWithAVlist()
tools::Long nVal2 = std::lround((*aPointY.nCurrVal - *aPointY.nMinVal)
/ (*aPointY.nMaxVal - *aPointY.nMinVal) * nMaxVal2);
return StartAVListWriting()
&& WriteAV(u"adj1", OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj2", OUString(u"val " + OUString::number(nVal2)))
&& WriteAV(u"adj1"_ustr, OUString(u"val " + OUString::number(nVal1)))
&& WriteAV(u"adj2"_ustr, OUString(u"val " + OUString::number(nVal2)))
&& EndAVListWriting();
}
if (sShapeType == "upDownArrowCallout")

8
oox/source/export/drawingml.cxx
View File

@ -511,7 +511,7 @@ void DrawingML::WriteSolidFill( const Reference< XPropertySet >& rXPropSet )
else if ( nFillColor != nOriginalColor )
{
// the user has set a different color for the shape
if (!WriteSchemeColor(u"FillComplexColor", rXPropSet))
if (!WriteSchemeColor(u"FillComplexColor"_ustr, rXPropSet))
{
WriteSolidFill(::Color(ColorTransparency, nFillColor & 0xffffff), nAlpha);
}
@ -1076,7 +1076,7 @@ void DrawingML::WriteOutline( const Reference<XPropertySet>& rXPropSet, Referenc
if( nColor != nOriginalColor )
{
// the user has set a different color for the line
if (!WriteSchemeColor(u"LineComplexColor", rXPropSet))
if (!WriteSchemeColor(u"LineComplexColor"_ustr, rXPropSet))
WriteSolidFill(nColor, nColorAlpha);
}
else if( !sColorFillScheme.isEmpty() )
@ -2596,7 +2596,7 @@ void DrawingML::WriteRunProperties( const Reference< XPropertySet >& rRun, bool
else
{
color.SetAlpha(255);
if (!WriteSchemeColor(u"CharComplexColor", rXPropSet))
if (!WriteSchemeColor(u"CharComplexColor"_ustr, rXPropSet))
WriteSolidFill(color, nTransparency);
}
mpFS->endElementNS(XML_a, XML_ln);
@ -2609,7 +2609,7 @@ void DrawingML::WriteRunProperties( const Reference< XPropertySet >& rRun, bool
{
color.SetAlpha(255);
// TODO: special handle embossed/engraved
if (!WriteSchemeColor(u"CharComplexColor", rXPropSet))
if (!WriteSchemeColor(u"CharComplexColor"_ustr, rXPropSet))
{
WriteSolidFill(color, nTransparency);
}

53
oox/source/shape/WpsContext.cxx
View File

@ -143,7 +143,8 @@ void lcl_getColorTransformationsFromPropSeq(const uno::Sequence<beans::PropertyV
{
uno::Sequence<beans::PropertyValue> aValueSeq;
sal_Int32 nNumber(0); // dummy value to make compiler happy, "val" should exist
if (((*it).Value >>= aValueSeq) && lcl_getAttributeAsNumber(aValueSeq, u"val", nNumber))
if (((*it).Value >>= aValueSeq)
&& lcl_getAttributeAsNumber(aValueSeq, u"val"_ustr, nNumber))
{
// char w14:alpha contains transparency, whereas shape fill a:alpha contains opacity.
if ((*it).Name == u"alpha")
@ -165,10 +166,10 @@ bool lcl_getColorFromPropSeq(const uno::Sequence<beans::PropertyValue>& rPropSeq
bool bColorFound = false;
comphelper::SequenceAsHashMap aPropMap(rPropSeq);
uno::Sequence<beans::PropertyValue> aColorDetailSeq;
if (aPropMap.getValue(u"schemeClr") >>= aColorDetailSeq)
if (aPropMap.getValue(u"schemeClr"_ustr) >>= aColorDetailSeq)
{
OUString sColorString;
bColorFound = lcl_getAttributeAsString(aColorDetailSeq, u"val", sColorString);
bColorFound = lcl_getAttributeAsString(aColorDetailSeq, u"val"_ustr, sColorString);
if (bColorFound)
{
sal_Int32 nColorToken = oox::AttributeConversion::decodeToken(sColorString);
@ -176,10 +177,10 @@ bool lcl_getColorFromPropSeq(const uno::Sequence<beans::PropertyValue>& rPropSeq
rColor.setSchemeName(sColorString);
}
}
if (!bColorFound && (aPropMap.getValue(u"srgbClr") >>= aColorDetailSeq))
if (!bColorFound && (aPropMap.getValue(u"srgbClr"_ustr) >>= aColorDetailSeq))
{
OUString sColorString;
bColorFound = lcl_getAttributeAsString(aColorDetailSeq, u"val", sColorString);
bColorFound = lcl_getAttributeAsString(aColorDetailSeq, u"val"_ustr, sColorString);
if (bColorFound)
{
sal_Int32 nColor = oox::AttributeConversion::decodeIntegerHex(sColorString);
@ -200,21 +201,21 @@ void lcl_getFillDetailsFromPropSeq(const uno::Sequence<beans::PropertyValue>& rT
if (!rTextFillSeq.hasElements())
return;
comphelper::SequenceAsHashMap aTextFillMap(rTextFillSeq);
if (aTextFillMap.find(u"noFill") != aTextFillMap.end())
if (aTextFillMap.find(u"noFill"_ustr) != aTextFillMap.end())
{
rFillProperties.moFillType = oox::XML_noFill;
return;
}
uno::Sequence<beans::PropertyValue> aPropSeq;
if ((aTextFillMap.getValue(u"solidFill") >>= aPropSeq) && aPropSeq.hasElements())
if ((aTextFillMap.getValue(u"solidFill"_ustr) >>= aPropSeq) && aPropSeq.hasElements())
{
rFillProperties.moFillType = oox::XML_solidFill;
lcl_getColorFromPropSeq(aPropSeq, rFillProperties.maFillColor);
return;
}
if ((aTextFillMap.getValue(u"gradFill") >>= aPropSeq) && aPropSeq.hasElements())
if ((aTextFillMap.getValue(u"gradFill"_ustr) >>= aPropSeq) && aPropSeq.hasElements())
{
rFillProperties.moFillType = oox::XML_gradFill;
// aPropSeq should have two items. One is "gsLst" for the stop colors, the other is
@ -233,7 +234,7 @@ void lcl_getFillDetailsFromPropSeq(const uno::Sequence<beans::PropertyValue>& rT
// aColorStopSeq should have an item for the color and an item for the position
sal_Int32 nPos;
oox::drawingml::Color aColor;
if (lcl_getAttributeAsNumber(aColorStopSeq, u"pos", nPos)
if (lcl_getAttributeAsNumber(aColorStopSeq, u"pos"_ustr, nPos)
&& lcl_getColorFromPropSeq(aColorStopSeq, aColor))
{
// The position in maGradientStops is relative, thus in range [0.0;1.0].
@ -274,13 +275,13 @@ void lcl_getFillDetailsFromPropSeq(const uno::Sequence<beans::PropertyValue>& rT
// edge of the bounding box of the shape. This unusual meaning of X1, Y1, X2 and
// Y2 is needed for method pushToPropMap() of FillProperties.
geometry::IntegerRectangle2D aRect;
if (!lcl_getAttributeAsNumber(aFillToRectSeq, u"l", aRect.X1))
if (!lcl_getAttributeAsNumber(aFillToRectSeq, u"l"_ustr, aRect.X1))
aRect.X1 = 0;
if (!lcl_getAttributeAsNumber(aFillToRectSeq, u"t", aRect.Y1))
if (!lcl_getAttributeAsNumber(aFillToRectSeq, u"t"_ustr, aRect.Y1))
aRect.Y1 = 0;
if (!lcl_getAttributeAsNumber(aFillToRectSeq, u"r", aRect.X2))
if (!lcl_getAttributeAsNumber(aFillToRectSeq, u"r"_ustr, aRect.X2))
aRect.X2 = 0;
if (!lcl_getAttributeAsNumber(aFillToRectSeq, u"b", aRect.Y2))
if (!lcl_getAttributeAsNumber(aFillToRectSeq, u"b"_ustr, aRect.Y2))
aRect.Y2 = 0;
rFillProperties.maGradientProps.moFillToRect = aRect;
}
@ -305,11 +306,11 @@ void lcl_getLineDetailsFromPropSeq(const uno::Sequence<beans::PropertyValue>& rT
// LineJoint
comphelper::SequenceAsHashMap aTextOutlineMap(rTextOutlineSeq);
if (aTextOutlineMap.find(u"bevel") != aTextOutlineMap.end())
if (aTextOutlineMap.find(u"bevel"_ustr) != aTextOutlineMap.end())
rLineProperties.moLineJoint = oox::XML_bevel;
else if (aTextOutlineMap.find(u"round") != aTextOutlineMap.end())
else if (aTextOutlineMap.find(u"round"_ustr) != aTextOutlineMap.end())
rLineProperties.moLineJoint = oox::XML_round;
else if (aTextOutlineMap.find(u"miter") != aTextOutlineMap.end())
else if (aTextOutlineMap.find(u"miter"_ustr) != aTextOutlineMap.end())
{
// LineProperties has no member to store a miter limit. Therefore some heuristic is
// added here. 0 is default for attribute "lim" in MS Office. It is rendered same as bevel.
@ -322,25 +323,25 @@ void lcl_getLineDetailsFromPropSeq(const uno::Sequence<beans::PropertyValue>& rT
// Dash
uno::Sequence<beans::PropertyValue> aDashSeq;
if (aTextOutlineMap.getValue(u"prstDash") >>= aDashSeq)
if (aTextOutlineMap.getValue(u"prstDash"_ustr) >>= aDashSeq)
{
// aDashSeq contains the attribute "val" with the kind of dash, e.g. "sysDot"
OUString sDashKind;
if (lcl_getAttributeAsString(aDashSeq, u"val", sDashKind))
if (lcl_getAttributeAsString(aDashSeq, u"val"_ustr, sDashKind))
rLineProperties.moPresetDash = oox::AttributeConversion::decodeToken(sDashKind);
}
OUString sCapKind;
if (lcl_getAttributeAsString(rTextOutlineSeq, u"cap", sCapKind))
if (lcl_getAttributeAsString(rTextOutlineSeq, u"cap"_ustr, sCapKind))
rLineProperties.moLineCap = oox::AttributeConversion::decodeToken(sCapKind);
// Width
sal_Int32 nWidth; // EMU
if (lcl_getAttributeAsNumber(rTextOutlineSeq, u"w", nWidth))
if (lcl_getAttributeAsNumber(rTextOutlineSeq, u"w"_ustr, nWidth))
rLineProperties.moLineWidth = nWidth;
// Compound. LineProperties has a member for it, however Fontwork can currently only render "sng".
OUString sCompoundKind;
if (lcl_getAttributeAsString(rTextOutlineSeq, u"cmpd", sCompoundKind))
if (lcl_getAttributeAsString(rTextOutlineSeq, u"cmpd"_ustr, sCompoundKind))
rLineProperties.moLineCompound = oox::AttributeConversion::decodeToken(sCompoundKind);
// Align. LineProperties has no member for attribute "algn".
@ -356,13 +357,13 @@ lcl_generateLinePropertiesFromTextProps(const comphelper::SequenceAsHashMap& aTe
// Get property "textOutline" from aTextPropMap
uno::Sequence<beans::PropertyValue> aCharInteropGrabBagSeq;
if (!(aTextPropMap.getValue(u"CharInteropGrabBag") >>= aCharInteropGrabBagSeq))
if (!(aTextPropMap.getValue(u"CharInteropGrabBag"_ustr) >>= aCharInteropGrabBagSeq))
return aLineProperties;
if (!aCharInteropGrabBagSeq.hasElements())
return aLineProperties;
comphelper::SequenceAsHashMap aCharInteropGrabBagMap(aCharInteropGrabBagSeq);
beans::PropertyValue aProp;
if (!(aCharInteropGrabBagMap.getValue(u"CharTextOutlineTextEffect") >>= aProp))
if (!(aCharInteropGrabBagMap.getValue(u"CharTextOutlineTextEffect"_ustr) >>= aProp))
return aLineProperties;
uno::Sequence<beans::PropertyValue> aTextOutlineSeq;
if (!(aProp.Name == "textOutline" && (aProp.Value >>= aTextOutlineSeq)
@ -382,13 +383,13 @@ lcl_generateFillPropertiesFromTextProps(const comphelper::SequenceAsHashMap& rTe
// Theme color supersedes direct color. textFill supersedes theme color. Theme color and textFill
// are in CharInteropGrabBag.
uno::Sequence<beans::PropertyValue> aCharInteropGrabBagSeq;
if ((rTextPropMap.getValue(u"CharInteropGrabBag") >>= aCharInteropGrabBagSeq)
if ((rTextPropMap.getValue(u"CharInteropGrabBag"_ustr) >>= aCharInteropGrabBagSeq)
&& aCharInteropGrabBagSeq.hasElements())
{
// Handle case textFill
comphelper::SequenceAsHashMap aCharInteropGrabBagMap(aCharInteropGrabBagSeq);
beans::PropertyValue aProp;
if (aCharInteropGrabBagMap.getValue(u"CharTextFillTextEffect") >>= aProp)
if (aCharInteropGrabBagMap.getValue(u"CharTextFillTextEffect"_ustr) >>= aProp)
{
uno::Sequence<beans::PropertyValue> aTextFillSeq;
if (aProp.Name == "textFill" && (aProp.Value >>= aTextFillSeq)
@ -441,7 +442,7 @@ lcl_generateFillPropertiesFromTextProps(const comphelper::SequenceAsHashMap& rTe
// Neither textFill nor theme color. Look for direct color.
sal_Int32 aCharColor = 0;
if (rTextPropMap.getValue(u"CharColor") >>= aCharColor)
if (rTextPropMap.getValue(u"CharColor"_ustr) >>= aCharColor)
aFillProperties.maFillColor.setSrgbClr(aCharColor);
else
aFillProperties.maFillColor.setUnused();

2
sal/qa/rtl/math/test-rtl-math.cxx
View File

@ -332,7 +332,7 @@ public:
rtl_math_StringFormat_Automatic,
2,
u'٫', aGroups, u'٬', true);
CPPUNIT_ASSERT_EQUAL( OUString(u"1٬23٬456٫78"), aRes);
CPPUNIT_ASSERT_EQUAL( u"1٬23٬456٫78"_ustr, aRes);
fVal = 4503599627370495.0;
aRes = rtl::math::doubleToUString( fVal,

24
sal/qa/rtl/textenc/rtl_textcvt.cxx
View File

@ -2741,7 +2741,7 @@ void Test::testInvalidUtf7() {
| RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT | RTL_TEXTTOUNICODE_FLAGS_FLUSH),
&info, &converted);
CPPUNIT_ASSERT_EQUAL(sal_Size(1), size);
CPPUNIT_ASSERT_EQUAL(OUString(u"\uFFFD"), OUString(buf, sal_Int32(size)));
CPPUNIT_ASSERT_EQUAL(u"\uFFFD"_ustr, OUString(buf, sal_Int32(size)));
CPPUNIT_ASSERT_EQUAL(RTL_TEXTTOUNICODE_INFO_INVALID, info);
CPPUNIT_ASSERT_EQUAL(sal_Size(1), converted);
rtl_destroyTextToUnicodeConverter(converter);
@ -2766,7 +2766,7 @@ void Test::testInvalidUtf8() {
&info, &converted);
CPPUNIT_ASSERT_EQUAL(sal_Size(4), size);
CPPUNIT_ASSERT_EQUAL(
OUString(u"\uFFFD\uFFFD\uFFFD\uFFFD"),
u"\uFFFD\uFFFD\uFFFD\uFFFD"_ustr,
OUString(buf, sal_Int32(size)));
CPPUNIT_ASSERT_EQUAL(RTL_TEXTTOUNICODE_INFO_INVALID, info);
CPPUNIT_ASSERT_EQUAL(sal_Size(4), converted);
@ -2790,7 +2790,7 @@ void Test::testInvalidUtf8() {
&info, &converted);
CPPUNIT_ASSERT_EQUAL(sal_Size(1), size);
CPPUNIT_ASSERT_EQUAL(
OUString(u"\uFFFD"), OUString(buf, sal_Int32(size)));
u"\uFFFD"_ustr, OUString(buf, sal_Int32(size)));
CPPUNIT_ASSERT_EQUAL(RTL_TEXTTOUNICODE_INFO_INVALID, info);
CPPUNIT_ASSERT_EQUAL(sal_Size(2), converted);
rtl_destroyTextToUnicodeConverter(converter);
@ -2833,7 +2833,7 @@ void Test::testInvalidUtf8() {
&info, &converted);
CPPUNIT_ASSERT_EQUAL(sal_Size(1), size);
CPPUNIT_ASSERT_EQUAL(
OUString(u"\uFFFD"), OUString(buf, sal_Int32(size)));
u"\uFFFD"_ustr, OUString(buf, sal_Int32(size)));
CPPUNIT_ASSERT_EQUAL(RTL_TEXTTOUNICODE_INFO_INVALID, info);
CPPUNIT_ASSERT_EQUAL(sal_Size(3), converted);
rtl_destroyTextToUnicodeConverter(converter);
@ -2876,7 +2876,7 @@ void Test::testInvalidUtf8() {
&info, &converted);
CPPUNIT_ASSERT_EQUAL(sal_Size(2), size);
CPPUNIT_ASSERT_EQUAL(
OUString(u"\uFFFD."), OUString(buf, sal_Int32(size)));
u"\uFFFD."_ustr, OUString(buf, sal_Int32(size)));
CPPUNIT_ASSERT_EQUAL(RTL_TEXTTOUNICODE_INFO_INVALID, info);
CPPUNIT_ASSERT_EQUAL(sal_Size(3), converted);
rtl_destroyTextToUnicodeConverter(converter);
@ -2900,7 +2900,7 @@ void Test::testInvalidUtf8() {
&info, &converted);
CPPUNIT_ASSERT_EQUAL(sal_Size(2), size);
CPPUNIT_ASSERT_EQUAL(
OUString(u"\uFFFD\uFFFD"), OUString(buf, sal_Int32(size)));
u"\uFFFD\uFFFD"_ustr, OUString(buf, sal_Int32(size)));
CPPUNIT_ASSERT_EQUAL(RTL_TEXTTOUNICODE_INFO_INVALID, info);
CPPUNIT_ASSERT_EQUAL(sal_Size(6), converted);
rtl_destroyTextToUnicodeConverter(converter);
@ -2923,7 +2923,7 @@ void Test::testInvalidUtf8() {
&info, &converted);
CPPUNIT_ASSERT_EQUAL(sal_Size(1), size);
CPPUNIT_ASSERT_EQUAL(
OUString(u"\uFFFD"), OUString(buf, sal_Int32(size)));
u"\uFFFD"_ustr, OUString(buf, sal_Int32(size)));
CPPUNIT_ASSERT_EQUAL(RTL_TEXTTOUNICODE_INFO_INVALID, info);
CPPUNIT_ASSERT_EQUAL(sal_Size(4), converted);
rtl_destroyTextToUnicodeConverter(converter);
@ -2946,7 +2946,7 @@ void Test::testInvalidUtf8() {
&info, &converted);
CPPUNIT_ASSERT_EQUAL(sal_Size(1), size);
CPPUNIT_ASSERT_EQUAL(
OUString(u"\uFFFD"), OUString(buf, sal_Int32(size)));
u"\uFFFD"_ustr, OUString(buf, sal_Int32(size)));
CPPUNIT_ASSERT_EQUAL(RTL_TEXTTOUNICODE_INFO_INVALID, info);
CPPUNIT_ASSERT_EQUAL(sal_Size(4), converted);
rtl_destroyTextToUnicodeConverter(converter);
@ -2970,7 +2970,7 @@ void Test::testInvalidUtf8() {
&info, &converted);
CPPUNIT_ASSERT_EQUAL(sal_Size(1), size);
CPPUNIT_ASSERT_EQUAL(
OUString(u"\uFFFD"), OUString(buf, sal_Int32(size)));
u"\uFFFD"_ustr, OUString(buf, sal_Int32(size)));
CPPUNIT_ASSERT_EQUAL(RTL_TEXTTOUNICODE_INFO_INVALID, info);
CPPUNIT_ASSERT_EQUAL(sal_Size(5), converted);
rtl_destroyTextToUnicodeConverter(converter);
@ -2994,7 +2994,7 @@ void Test::testInvalidUtf8() {
&info, &converted);
CPPUNIT_ASSERT_EQUAL(sal_Size(1), size);
CPPUNIT_ASSERT_EQUAL(
OUString(u"\uFFFD"), OUString(buf, sal_Int32(size)));
u"\uFFFD"_ustr, OUString(buf, sal_Int32(size)));
CPPUNIT_ASSERT_EQUAL(RTL_TEXTTOUNICODE_INFO_INVALID, info);
CPPUNIT_ASSERT_EQUAL(sal_Size(6), converted);
rtl_destroyTextToUnicodeConverter(converter);
@ -3017,7 +3017,7 @@ void Test::testInvalidUtf8() {
&info, &converted);
CPPUNIT_ASSERT_EQUAL(sal_Size(1), size);
CPPUNIT_ASSERT_EQUAL(
OUString(u"\uFFFD"), OUString(buf, sal_Int32(size)));
u"\uFFFD"_ustr, OUString(buf, sal_Int32(size)));
CPPUNIT_ASSERT_EQUAL(RTL_TEXTTOUNICODE_INFO_INVALID, info);
CPPUNIT_ASSERT_EQUAL(sal_Size(1), converted);
rtl_destroyTextToUnicodeConverter(converter);
@ -3041,7 +3041,7 @@ void Test::testInvalidUtf8() {
&info, &converted);
CPPUNIT_ASSERT_EQUAL(sal_Size(1), size);
CPPUNIT_ASSERT_EQUAL(
OUString(u"\uFFFD"), OUString(buf, sal_Int32(size)));
u"\uFFFD"_ustr, OUString(buf, sal_Int32(size)));
CPPUNIT_ASSERT_EQUAL(RTL_TEXTTOUNICODE_INFO_INVALID, info);
CPPUNIT_ASSERT_EQUAL(sal_Size(4), converted);
rtl_destroyTextToUnicodeConverter(converter);

6
sal/qa/rtl/uri/rtl_testuri.cxx
View File

@ -180,7 +180,7 @@ void Test::test_Uri() {
aText1 = u"\xD800" // %ED%A0%80
u"\U000103FF" // 0xD800,0xDFFF -> %F0%90%8F%BF
u"\xDFFF" // %ED%BF%BF
u"A"; // A
u"A"_ustr; // A
aText2 = "%ED%A0%80" "%F0%90%8F%BF" "%ED%BF%BF" "A";
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"failure 11",
@ -202,7 +202,7 @@ void Test::test_Uri() {
RTL_TEXTENCODING_UTF8));
aText1 = "%ed%a0%80" "%f0%90%8f%bf" "%ed%bf%bf" "A";
aText2 = u"%ED%A0%80" u"\U000103FF" u"%ED%BF%BF" u"A";
aText2 = u"%ED%A0%80" u"\U000103FF" u"%ED%BF%BF" u"A"_ustr;
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"failure 14",
aText2,
@ -238,7 +238,7 @@ void Test::test_Uri() {
// Check IURI handling:
aText1 = "%30%C3%BF";
aText2 = u"%30\u00FF";
aText2 = u"%30\u00FF"_ustr;
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"failure 18",
aText2,

4
sc/qa/extras/accessibility/basics.cxx
View File

@ -27,7 +27,7 @@ using namespace css;
CPPUNIT_TEST_FIXTURE(test::AccessibleTestBase, TestCalcMenu)
{
load(u"private:factory/scalc");
load(u"private:factory/scalc"_ustr);
const Date beforeDate(Date::SYSTEM);
const double beforeTime = tools::Time(tools::Time::SYSTEM).GetTimeInDays();
@ -89,7 +89,7 @@ CPPUNIT_TEST_FIXTURE(test::AccessibleTestBase, TestCalcMenu)
// for the case where 32-bit a11y child indices don't suffice (tdf#150683)
CPPUNIT_TEST_FIXTURE(test::AccessibleTestBase, Test64BitChildIndices)
{
load(u"private:factory/scalc");
load(u"private:factory/scalc"_ustr);
const sal_Int32 nRow = 1048575;
const sal_Int32 nCol = 16383;

6
sc/qa/extras/macros-test.cxx
View File

@ -268,7 +268,7 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf89920)
CPPUNIT_TEST_FIXTURE(ScMacrosTest, testPasswordProtectedUnicodeString)
{
const OUString sCorrectString(u"English Русский 中文");
const OUString sCorrectString(u"English Русский 中文"_ustr);
static constexpr OUStringLiteral sMacroURL(
u"vnd.sun.Star.script:Protected.Module1.TestUnicodeString?language=Basic&location=document");
static constexpr OUStringLiteral sLibName(u"Protected");
@ -499,7 +499,7 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf75263)
pDoc->CalcAll();
// A1 contains formula with user-defined function, and the function is defined in VBA.
CPPUNIT_ASSERT_EQUAL(OUString(u"проба"), pDoc->GetString(ScAddress(0, 0, 0)));
CPPUNIT_ASSERT_EQUAL(u"проба"_ustr, pDoc->GetString(ScAddress(0, 0, 0)));
}
saveAndReload("Calc MS Excel 2007 VBA XML");
@ -511,7 +511,7 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf75263)
// Without the accompanying fix in place, this test would have failed with:
// - Expected: проба (sample)
// - Actual : ?????
CPPUNIT_ASSERT_EQUAL(OUString(u"проба"), pDoc->GetString(ScAddress(0, 0, 0)));
CPPUNIT_ASSERT_EQUAL(u"проба"_ustr, pDoc->GetString(ScAddress(0, 0, 0)));
}
}

3
sc/qa/extras/vba-macro-test.cxx
View File

@ -868,7 +868,8 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testNonAsciiMacroIRI)
CPPUNIT_ASSERT_EQUAL(OUString("bar"), rDoc.GetString(ScAddress(0, 1, 0)));
CPPUNIT_ASSERT_EQUAL(OUString("baz"), rDoc.GetString(ScAddress(0, 2, 0)));
auto ret = dispatchCommand(mxComponent, u"macro://./Standard.Module1.NonAsciiName_αβγ", {});
auto ret
= dispatchCommand(mxComponent, u"macro://./Standard.Module1.NonAsciiName_αβγ"_ustr, {});
css::frame::DispatchResultEvent retEvent;
CPPUNIT_ASSERT(ret >>= retEvent);
// tdf#153752: without the fix, this would fail with

4
sc/qa/unit/subsequent_export_test2.cxx
View File

@ -563,10 +563,10 @@ CPPUNIT_TEST_FIXTURE(ScExportTest2, testEscapeCharInNumberFormatXLSX)
assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[3]", "formatCode",
"00\\.00\\.00\\.000\\.0"); // tdf#81939
// "_-* #,##0\ _€_-;\-* #,##0\ _€_-;_-* "- "_€_-;_-@_-" // tdf#81222
OUString rFormatStrExpected(u"_-* #,##0\\ _€_-;\\-* #,##0\\ _€_-;_-* \"- \"_€_-;_-@_-");
OUString rFormatStrExpected(u"_-* #,##0\\ _€_-;\\-* #,##0\\ _€_-;_-* \"- \"_€_-;_-@_-"_ustr);
assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[4]", "formatCode", rFormatStrExpected);
// "_-* #,##0" €"_-;\-* #,##0" €"_-;_-* "- €"_-;_-@_-");
rFormatStrExpected = u"_-* #,##0\" €\"_-;\\-* #,##0\" €\"_-;_-* \"- €\"_-;_-@_-";
rFormatStrExpected = u"_-* #,##0\" €\"_-;\\-* #,##0\" €\"_-;_-* \"- €\"_-;_-@_-"_ustr;
assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[5]", "formatCode", rFormatStrExpected);
// remove escape char in fraction
assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[6]", "formatCode",

28
sc/qa/unit/subsequent_filters_test3.cxx
View File

@ -361,7 +361,7 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf60673)
// Without the fix in place, this test would have failed with
// - Expected: PL: ĄŚŻŹĆŃŁÓĘ
// - Actual : PL:
CPPUNIT_ASSERT_EQUAL(OUString(u"PL: ĄŚŻŹĆŃŁÓĘ"), sLabel);
CPPUNIT_ASSERT_EQUAL(u"PL: ĄŚŻŹĆŃŁÓĘ"_ustr, sLabel);
}
CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testtdf120301_xmlSpaceParsingXLSX)
@ -519,7 +519,7 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf70455)
// Without the fix in place, this test would have failed with
// - Expected: €780.00
// - Actual : Err:509
CPPUNIT_ASSERT_EQUAL(OUString(u"€780.00"), pDoc->GetString(ScAddress(7, 7, 0)));
CPPUNIT_ASSERT_EQUAL(u"€780.00"_ustr, pDoc->GetString(ScAddress(7, 7, 0)));
}
CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf62268)
@ -571,7 +571,7 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf72470)
ScDocument* pDoc = getScDoc();
CPPUNIT_ASSERT_EQUAL(OUString("name"), pDoc->GetString(ScAddress(0, 0, 0)));
CPPUNIT_ASSERT_EQUAL(OUString(u"أسمي walid"), pDoc->GetString(ScAddress(0, 1, 0)));
CPPUNIT_ASSERT_EQUAL(u"أسمي walid"_ustr, pDoc->GetString(ScAddress(0, 1, 0)));
}
CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf35636)
@ -995,13 +995,13 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf129940)
ScDocument* pDoc = getScDoc();
// Pure text within text:ruby-base
OUString aStr = pDoc->GetString(ScAddress(0, 0, 0));
CPPUNIT_ASSERT_EQUAL(OUString(u"小笠原"), aStr);
CPPUNIT_ASSERT_EQUAL(u"小笠原"_ustr, aStr);
aStr = pDoc->GetString(ScAddress(1, 0, 0));
CPPUNIT_ASSERT_EQUAL(OUString(u"徳彦"), aStr);
CPPUNIT_ASSERT_EQUAL(u"徳彦"_ustr, aStr);
// Multiple text:span within text:ruby-base
aStr = pDoc->GetString(ScAddress(2, 0, 0));
CPPUNIT_ASSERT_EQUAL(OUString(u"注音符號"), aStr);
CPPUNIT_ASSERT_EQUAL(u"注音符號"_ustr, aStr);
}
CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf119190)
@ -1149,32 +1149,32 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testInvalidBareBiff5)
CPPUNIT_ASSERT_EQUAL(OUString(), pDoc->GetString(aPos));
aPos.IncCol();
CPPUNIT_ASSERT_EQUAL(CELLTYPE_STRING, pDoc->GetCellType(aPos));
CPPUNIT_ASSERT_EQUAL(OUString(u"sheetjs"), pDoc->GetString(aPos));
CPPUNIT_ASSERT_EQUAL(u"sheetjs"_ustr, pDoc->GetString(aPos));
// Row 3
aPos = ScAddress(0, 2, 0);
CPPUNIT_ASSERT_EQUAL(CELLTYPE_STRING, pDoc->GetCellType(aPos));
CPPUNIT_ASSERT_EQUAL(OUString(u"foo bar"), pDoc->GetString(aPos));
CPPUNIT_ASSERT_EQUAL(u"foo bar"_ustr, pDoc->GetString(aPos));
aPos.IncCol();
CPPUNIT_ASSERT_EQUAL(CELLTYPE_STRING, pDoc->GetCellType(aPos));
CPPUNIT_ASSERT_EQUAL(OUString(u"baz"), pDoc->GetString(aPos));
CPPUNIT_ASSERT_EQUAL(u"baz"_ustr, pDoc->GetString(aPos));
aPos.IncCol();
CPPUNIT_ASSERT_EQUAL(CELLTYPE_VALUE, pDoc->GetCellType(aPos));
CPPUNIT_ASSERT_EQUAL(41689.4375, pDoc->GetValue(aPos));
aPos.IncCol();
CPPUNIT_ASSERT_EQUAL(CELLTYPE_STRING, pDoc->GetCellType(aPos));
CPPUNIT_ASSERT_EQUAL(OUString(u"0.3"), pDoc->GetString(aPos));
CPPUNIT_ASSERT_EQUAL(u"0.3"_ustr, pDoc->GetString(aPos));
// Row 4
aPos = ScAddress(0, 3, 0);
CPPUNIT_ASSERT_EQUAL(CELLTYPE_STRING, pDoc->GetCellType(aPos));
CPPUNIT_ASSERT_EQUAL(OUString(u"baz"), pDoc->GetString(aPos));
CPPUNIT_ASSERT_EQUAL(u"baz"_ustr, pDoc->GetString(aPos));
aPos.IncCol();
CPPUNIT_ASSERT_EQUAL(CELLTYPE_NONE, pDoc->GetCellType(aPos));
CPPUNIT_ASSERT_EQUAL(OUString(), pDoc->GetString(aPos));
aPos.IncCol();
CPPUNIT_ASSERT_EQUAL(CELLTYPE_STRING, pDoc->GetCellType(aPos));
CPPUNIT_ASSERT_EQUAL(OUString(u"_"), pDoc->GetString(aPos));
CPPUNIT_ASSERT_EQUAL(u"_"_ustr, pDoc->GetString(aPos));
aPos.IncCol();
CPPUNIT_ASSERT_EQUAL(CELLTYPE_VALUE, pDoc->GetCellType(aPos));
CPPUNIT_ASSERT_EQUAL(3.14159, pDoc->GetValue(aPos));
@ -1182,7 +1182,7 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testInvalidBareBiff5)
// Row 5
aPos = ScAddress(0, 4, 0);
CPPUNIT_ASSERT_EQUAL(CELLTYPE_STRING, pDoc->GetCellType(aPos));
CPPUNIT_ASSERT_EQUAL(OUString(u"hidden"), pDoc->GetString(aPos));
CPPUNIT_ASSERT_EQUAL(u"hidden"_ustr, pDoc->GetString(aPos));
aPos.IncCol();
CPPUNIT_ASSERT_EQUAL(CELLTYPE_NONE, pDoc->GetCellType(aPos));
CPPUNIT_ASSERT_EQUAL(OUString(), pDoc->GetString(aPos));
@ -1196,7 +1196,7 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testInvalidBareBiff5)
// Row 6
aPos = ScAddress(0, 5, 0);
CPPUNIT_ASSERT_EQUAL(CELLTYPE_STRING, pDoc->GetCellType(aPos));
CPPUNIT_ASSERT_EQUAL(OUString(u"visible"), pDoc->GetString(aPos));
CPPUNIT_ASSERT_EQUAL(u"visible"_ustr, pDoc->GetString(aPos));
aPos.IncCol();
CPPUNIT_ASSERT_EQUAL(CELLTYPE_NONE, pDoc->GetCellType(aPos));
CPPUNIT_ASSERT_EQUAL(OUString(), pDoc->GetString(aPos));

12
sc/qa/unit/subsequent_filters_test4.cxx
View File

@ -1329,16 +1329,16 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest4, testTdf153444)
ScDocument* pDoc = getScDoc();
CPPUNIT_ASSERT_EQUAL(OUString(u"time, sec"), pDoc->GetString(0, 0, 0));
CPPUNIT_ASSERT_EQUAL(OUString(u"Body_Right_Z, g"), pDoc->GetString(1, 0, 0));
CPPUNIT_ASSERT_EQUAL(OUString(u"Body_Left_Z, g"), pDoc->GetString(2, 0, 0));
CPPUNIT_ASSERT_EQUAL(u"time, sec"_ustr, pDoc->GetString(0, 0, 0));
CPPUNIT_ASSERT_EQUAL(u"Body_Right_Z, g"_ustr, pDoc->GetString(1, 0, 0));
CPPUNIT_ASSERT_EQUAL(u"Body_Left_Z, g"_ustr, pDoc->GetString(2, 0, 0));
// Without the fix in place, this test would have failed with
// - Expected: ÄÖÜ, µm/m
// - Actual : <20><><EFBFBD>, <20>m/m
CPPUNIT_ASSERT_EQUAL(OUString(u"ÄÖÜ, µm/m"), pDoc->GetString(3, 0, 0));
CPPUNIT_ASSERT_EQUAL(OUString(u"äöü, µm/m"), pDoc->GetString(4, 0, 0));
CPPUNIT_ASSERT_EQUAL(OUString(u"ß, µm/m"), pDoc->GetString(5, 0, 0));
CPPUNIT_ASSERT_EQUAL(u"ÄÖÜ, µm/m"_ustr, pDoc->GetString(3, 0, 0));
CPPUNIT_ASSERT_EQUAL(u"äöü, µm/m"_ustr, pDoc->GetString(4, 0, 0));
CPPUNIT_ASSERT_EQUAL(u"ß, µm/m"_ustr, pDoc->GetString(5, 0, 0));
}
CPPUNIT_TEST_FIXTURE(ScFiltersTest4, testTdf151958)

4
sc/qa/unit/tiledrendering/tiledrendering.cxx
View File

@ -3064,8 +3064,8 @@ CPPUNIT_TEST_FIXTURE(ScTiledRenderingTest, testGetViewRenderState)
{
// Add a pair of schemes, last added is the default
svtools::EditableColorConfig aColorConfig;
aColorConfig.AddScheme(u"Dark");
aColorConfig.AddScheme(u"Light");
aColorConfig.AddScheme(u"Dark"_ustr);
aColorConfig.AddScheme(u"Light"_ustr);
ScModelObj* pModelObj = createDoc("empty.ods");
int nFirstViewId = SfxLokHelper::getView();

4
sc/qa/unit/ucalc.cxx
View File

@ -514,14 +514,14 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf114406)
CPPUNIT_TEST_FIXTURE(Test, testTdf93951)
{
CPPUNIT_ASSERT(m_pDoc->InsertTab (0, "Test"));
m_pDoc->SetString(ScAddress(0,0,0), u"=2*§*2");
m_pDoc->SetString(ScAddress(0,0,0), u"=2*§*2"_ustr);
OUString aFormula = m_pDoc->GetFormula(0,0,0);
// Without the fix in place, this test would have failed with
// - Expected: =2*§*2
// - Actual : =2*
CPPUNIT_ASSERT_EQUAL(OUString(u"=2*§*2"), aFormula);
CPPUNIT_ASSERT_EQUAL(u"=2*§*2"_ustr, aFormula);
m_pDoc->DeleteTab(0);
}

8
sc/qa/unit/uicalc/uicalc2.cxx
View File

@ -881,10 +881,10 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest2, testTdf123202)
createScDoc();
ScDocument* pDoc = getScDoc();
insertStringToCell(u"A1", u"1");
insertStringToCell(u"A2", u"2");
insertStringToCell(u"A3", u"3");
insertStringToCell(u"A4", u"4");
insertStringToCell(u"A1"_ustr, u"1");
insertStringToCell(u"A2"_ustr, u"2");
insertStringToCell(u"A3"_ustr, u"3");
insertStringToCell(u"A4"_ustr, u"4");
goToCell("A3");

24
sc/source/filter/xml/SparklineGroupsExport.cxx
View File

@ -88,13 +88,13 @@ OUString convertSparklineType(sc::SparklineType eType)
switch (eType)
{
case sc::SparklineType::Line:
return u"line";
return u"line"_ustr;
case sc::SparklineType::Column:
return u"column";
return u"column"_ustr;
case sc::SparklineType::Stacked:
return u"stacked";
return u"stacked"_ustr;
}
return u"";
return u""_ustr;
}
OUString convertDisplayEmptyCellsAs(sc::DisplayEmptyCellsAs eType)
@ -102,13 +102,13 @@ OUString convertDisplayEmptyCellsAs(sc::DisplayEmptyCellsAs eType)
switch (eType)
{
case sc::DisplayEmptyCellsAs::Zero:
return u"zero";
return u"zero"_ustr;
case sc::DisplayEmptyCellsAs::Gap:
return u"gap";
return u"gap"_ustr;
case sc::DisplayEmptyCellsAs::Span:
return u"span";
return u"span"_ustr;
}
return u"";
return u""_ustr;
}
OUString convertAxisType(sc::AxisType eType)
@ -116,13 +116,13 @@ OUString convertAxisType(sc::AxisType eType)
switch (eType)
{
case sc::AxisType::Individual:
return u"individual";
return u"individual"_ustr;
case sc::AxisType::Group:
return u"group";
return u"group"_ustr;
case sc::AxisType::Custom:
return u"custom";
return u"custom"_ustr;
}
return u"";
return u""_ustr;
}
} // end anonymous ns

2
sc/source/ui/dialogs/SparklineDataRangeDialog.cxx
View File

@ -18,7 +18,7 @@ SparklineDataRangeDialog::SparklineDataRangeDialog(SfxBindings* pBindings,
SfxChildWindow* pChildWindow,
weld::Window* pWindow, ScViewData& rViewData)
: ScAnyRefDlgController(pBindings, pChildWindow, pWindow,
u"modules/scalc/ui/sparklinedatarangedialog.ui",
u"modules/scalc/ui/sparklinedatarangedialog.ui"_ustr,
"SparklineDataRangeDialog")
, mrViewData(rViewData)
, mrDocument(rViewData.GetDocument())

2
sc/source/ui/dialogs/SparklineDialog.cxx
View File

@ -23,7 +23,7 @@ namespace sc
SparklineDialog::SparklineDialog(SfxBindings* pBindings, SfxChildWindow* pChildWindow,
weld::Window* pWindow, ScViewData& rViewData)
: ScAnyRefDlgController(pBindings, pChildWindow, pWindow,
u"modules/scalc/ui/sparklinedialog.ui", "SparklineDialog")
u"modules/scalc/ui/sparklinedialog.ui"_ustr, "SparklineDialog")
, mrViewData(rViewData)
, mrDocument(rViewData.GetDocument())
, mpActiveEdit(nullptr)

46
sc/source/ui/unoobj/condformatuno.cxx
View File

@ -50,8 +50,8 @@ o3tl::span<const SfxItemPropertyMapEntry> getCondFormatPropset()
{
static const SfxItemPropertyMapEntry aCondFormatPropertyMap_Impl[] =
{
{u"ID", ID, cppu::UnoType<sal_Int32>::get(), 0, 0},
{u"Range", CondFormat_Range, cppu::UnoType<sheet::XSheetCellRanges>::get(), 0, 0},
{u"ID"_ustr, ID, cppu::UnoType<sal_Int32>::get(), 0, 0},
{u"Range"_ustr, CondFormat_Range, cppu::UnoType<sheet::XSheetCellRanges>::get(), 0, 0},
};
return aCondFormatPropertyMap_Impl;
}
@ -68,10 +68,10 @@ o3tl::span<const SfxItemPropertyMapEntry> getConditionEntryrPropSet()
{
static const SfxItemPropertyMapEntry aConditionEntryPropertyMap_Impl[] =
{
{u"StyleName", StyleName, cppu::UnoType<OUString>::get(), 0, 0},
{u"Formula1", Formula1, cppu::UnoType<OUString>::get(), 0, 0},
{u"Formula2", Formula2, cppu::UnoType<OUString>::get(), 0, 0},
{u"Operator", Operator, cppu::UnoType<decltype(sheet::ConditionFormatOperator::EQUAL)>::get(), 0, 0 },
{u"StyleName"_ustr, StyleName, cppu::UnoType<OUString>::get(), 0, 0},
{u"Formula1"_ustr, Formula1, cppu::UnoType<OUString>::get(), 0, 0},
{u"Formula2"_ustr, Formula2, cppu::UnoType<OUString>::get(), 0, 0},
{u"Operator"_ustr, Operator, cppu::UnoType<decltype(sheet::ConditionFormatOperator::EQUAL)>::get(), 0, 0 },
};
return aConditionEntryPropertyMap_Impl;
}
@ -121,7 +121,7 @@ o3tl::span<const SfxItemPropertyMapEntry> getColorScalePropSet()
{
static const SfxItemPropertyMapEntry aColorScalePropertyMap_Impl[] =
{
{u"ColorScaleEntries", ColorScaleEntries, cppu::UnoType<uno::Sequence< sheet::XColorScaleEntry >>::get(), 0, 0 },
{u"ColorScaleEntries"_ustr, ColorScaleEntries, cppu::UnoType<uno::Sequence< sheet::XColorScaleEntry >>::get(), 0, 0 },
};
return aColorScalePropertyMap_Impl;
}
@ -160,16 +160,16 @@ o3tl::span<const SfxItemPropertyMapEntry> getDataBarPropSet()
{
static const SfxItemPropertyMapEntry aDataBarPropertyMap_Impl[] =
{
{u"AxisPosition", AxisPosition, cppu::UnoType<decltype(sheet::DataBarAxis::AXIS_AUTOMATIC)>::get(), 0, 0 },
{u"UseGradient", UseGradient, cppu::UnoType<bool>::get(), 0, 0 },
{u"UseNegativeColor", UseNegativeColor, cppu::UnoType<bool>::get(), 0, 0 },
{u"ShowValue", DataBar_ShowValue, cppu::UnoType<bool>::get(), 0, 0 },
{u"Color", DataBar_Color, cppu::UnoType<sal_Int32>::get(), 0, 0},
{u"AxisColor", AxisColor, cppu::UnoType<sal_Int32>::get(), 0, 0},
{u"NegativeColor", NegativeColor, cppu::UnoType<sal_Int32>::get(), 0, 0},
{u"DataBarEntries", DataBarEntries, cppu::UnoType<uno::Sequence< sheet::XDataBarEntry >>::get(), 0, 0 },
{u"MinimumLength", MinimumLength, cppu::UnoType<double>::get(), 0, 0 },
{u"MaximumLength", MaximumLength, cppu::UnoType<double>::get(), 0, 0 },
{u"AxisPosition"_ustr, AxisPosition, cppu::UnoType<decltype(sheet::DataBarAxis::AXIS_AUTOMATIC)>::get(), 0, 0 },
{u"UseGradient"_ustr, UseGradient, cppu::UnoType<bool>::get(), 0, 0 },
{u"UseNegativeColor"_ustr, UseNegativeColor, cppu::UnoType<bool>::get(), 0, 0 },
{u"ShowValue"_ustr, DataBar_ShowValue, cppu::UnoType<bool>::get(), 0, 0 },
{u"Color"_ustr, DataBar_Color, cppu::UnoType<sal_Int32>::get(), 0, 0},
{u"AxisColor"_ustr, AxisColor, cppu::UnoType<sal_Int32>::get(), 0, 0},
{u"NegativeColor"_ustr, NegativeColor, cppu::UnoType<sal_Int32>::get(), 0, 0},
{u"DataBarEntries"_ustr, DataBarEntries, cppu::UnoType<uno::Sequence< sheet::XDataBarEntry >>::get(), 0, 0 },
{u"MinimumLength"_ustr, MinimumLength, cppu::UnoType<double>::get(), 0, 0 },
{u"MaximumLength"_ustr, MaximumLength, cppu::UnoType<double>::get(), 0, 0 },
};
return aDataBarPropertyMap_Impl;
}
@ -216,10 +216,10 @@ o3tl::span<const SfxItemPropertyMapEntry> getIconSetPropSet()
{
static const SfxItemPropertyMapEntry aIconSetPropertyMap_Impl[] =
{
{u"Icons", Icons, cppu::UnoType<decltype(sheet::IconSetType::ICONSET_3SYMBOLS)>::get(), 0, 0 },
{u"Reverse", Reverse, cppu::UnoType<bool>::get(), 0, 0 },
{u"ShowValue", ShowValue, cppu::UnoType<bool>::get(), 0, 0 },
{u"IconSetEntries", IconSetEntries, cppu::UnoType<uno::Sequence< sheet::XIconSetEntry >>::get(), 0, 0 },
{u"Icons"_ustr, Icons, cppu::UnoType<decltype(sheet::IconSetType::ICONSET_3SYMBOLS)>::get(), 0, 0 },
{u"Reverse"_ustr, Reverse, cppu::UnoType<bool>::get(), 0, 0 },
{u"ShowValue"_ustr, ShowValue, cppu::UnoType<bool>::get(), 0, 0 },
{u"IconSetEntries"_ustr, IconSetEntries, cppu::UnoType<uno::Sequence< sheet::XIconSetEntry >>::get(), 0, 0 },
};
return aIconSetPropertyMap_Impl;
}
@ -278,8 +278,8 @@ o3tl::span<const SfxItemPropertyMapEntry> getCondDatePropSet()
{
static const SfxItemPropertyMapEntry aCondDatePropertyMap_Impl[] =
{
{u"StyleName", StyleName, cppu::UnoType<OUString>::get(), 0, 0},
{u"DateType", Icons, cppu::UnoType<decltype(sheet::DateType::TODAY)>::get(), 0, 0 },
{u"StyleName"_ustr, StyleName, cppu::UnoType<OUString>::get(), 0, 0},
{u"DateType"_ustr, Icons, cppu::UnoType<decltype(sheet::DateType::TODAY)>::get(), 0, 0 },
};
return aCondDatePropertyMap_Impl;
}

2
sc/source/ui/unoobj/docuno.cxx
View File

@ -188,7 +188,7 @@ static o3tl::span<const SfxItemPropertyMapEntry> lcl_GetDocOptPropertyMap()
{ SC_UNO_ISEXECUTELINKENABLED, 0, cppu::UnoType<bool>::get(), 0, 0},
{ SC_UNO_ISCHANGEREADONLYENABLED, 0, cppu::UnoType<bool>::get(), 0, 0},
{ SC_UNO_REFERENCEDEVICE, 0, cppu::UnoType<awt::XDevice>::get(), beans::PropertyAttribute::READONLY, 0},
{u"BuildId", 0, ::cppu::UnoType<OUString>::get(), 0, 0},
{u"BuildId"_ustr, 0, ::cppu::UnoType<OUString>::get(), 0, 0},
{ SC_UNO_CODENAME, 0, cppu::UnoType<OUString>::get(), 0, 0},
{ SC_UNO_INTEROPGRABBAG, 0, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get(), 0, 0},
};

12
sd/qa/unit/TextFittingTest.cxx
View File

@ -50,9 +50,9 @@ CPPUNIT_TEST_FIXTURE(TextFittingTest, testTest)
{
OutlinerParaObject* pOutlinerParagraphObject = pTextObject->GetOutlinerParaObject();
const EditTextObject& aEdit = pOutlinerParagraphObject->GetTextObject();
CPPUNIT_ASSERT_EQUAL(OUString(u"D1"), aEdit.GetText(0));
CPPUNIT_ASSERT_EQUAL(OUString(u"D2"), aEdit.GetText(1));
CPPUNIT_ASSERT_EQUAL(OUString(u"D3"), aEdit.GetText(2));
CPPUNIT_ASSERT_EQUAL(u"D1"_ustr, aEdit.GetText(0));
CPPUNIT_ASSERT_EQUAL(u"D2"_ustr, aEdit.GetText(1));
CPPUNIT_ASSERT_EQUAL(u"D3"_ustr, aEdit.GetText(2));
}
sd::ViewShell* pViewShell1 = pXImpressDocument->GetDocShell()->GetViewShell();
@ -70,7 +70,7 @@ CPPUNIT_TEST_FIXTURE(TextFittingTest, testTest)
// Add paragraph 4
rEditView.SetSelection(ESelection(3, 0, 3, 0));
rEditView.InsertText(u"\nD4");
rEditView.InsertText(u"\nD4"_ustr);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(4), pEditEngine->GetParagraphCount());
@ -79,7 +79,7 @@ CPPUNIT_TEST_FIXTURE(TextFittingTest, testTest)
// Add paragraph 5
rEditView.SetSelection(ESelection(4, 0, 4, 0));
rEditView.InsertText(u"\nD5");
rEditView.InsertText(u"\nD5"_ustr);
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), pEditEngine->GetParagraphCount());
CPPUNIT_ASSERT_DOUBLES_EQUAL(54.68, pEditEngine->getGlobalFontScale().getY(), 1E-2);
@ -87,7 +87,7 @@ CPPUNIT_TEST_FIXTURE(TextFittingTest, testTest)
// Add paragraph 6
rEditView.SetSelection(ESelection(5, 0, 5, 0));
rEditView.InsertText(u"\nD6");
rEditView.InsertText(u"\nD6"_ustr);
CPPUNIT_ASSERT_EQUAL(sal_Int32(6), pEditEngine->GetParagraphCount());
// Delete paragraph 6

6
sd/qa/unit/a11y/layout.cxx
View File

@ -20,7 +20,7 @@ using namespace css;
CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, TestImpressDefaultStructure)
{
load(u"private:factory/simpress");
load(u"private:factory/simpress"_ustr);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(rtl::OUString("<SHAPE name=\"PageShape: Slide 1\" description=\" \"/>"
@ -40,7 +40,7 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, TestImpressDefaultStructure)
// a basic check of the content order for https://bugs.documentfoundation.org/show_bug.cgi?id=150064
CPPUNIT_TEST_FIXTURE(test::AccessibleTestBase, TestImpressDefaultLayout)
{
load(u"private:factory/simpress");
load(u"private:factory/simpress"_ustr);
Scheduler::ProcessEventsToIdle();
auto xDocumentContext = getDocumentAccessibleContext();
@ -66,7 +66,7 @@ CPPUNIT_TEST_FIXTURE(test::AccessibleTestBase, TestImpressDefaultLayout)
// test a11y tree order is stable (https://bugs.documentfoundation.org/show_bug.cgi?id=150064)
CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, tdf150064)
{
loadFromSrc(u"/sd/qa/unit/a11y/data/tdf150064.fodp");
loadFromSrc(u"/sd/qa/unit/a11y/data/tdf150064.fodp"_ustr);
Scheduler::ProcessEventsToIdle();
uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(mxDocument,

7
sd/qa/unit/export-tests-ooxml1.cxx
View File

@ -536,9 +536,8 @@ CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testLostPlaceholders)
uno::Reference<drawing::XShape> xShp(pObj->getUnoShape(), uno::UNO_QUERY);
CPPUNIT_ASSERT(xShp);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong ShapeType!",
OUString(u"com.sun.star.presentation.OutlinerShape"),
xShp->getShapeType());
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"Wrong ShapeType!", u"com.sun.star.presentation.OutlinerShape"_ustr, xShp->getShapeType());
uno::Reference<beans::XPropertySet> xShpProps(xShp, uno::UNO_QUERY);
// Without the fix in place there will be the following error:
// Expected: com.sun.star.presentation.OutlinerShape
@ -576,7 +575,7 @@ CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testPlaceholderFillAndOutlineExport)
CPPUNIT_ASSERT(xShp);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong ShapeType!",
OUString(u"com.sun.star.presentation.OutlinerShape"),
u"com.sun.star.presentation.OutlinerShape"_ustr,
xShp->getShapeType());
uno::Reference<beans::XPropertySet> xShpProps(xShp, uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL_MESSAGE(

2
sd/qa/unit/export-tests-ooxml2.cxx
View File

@ -371,7 +371,7 @@ CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest2, testMathObjectPPT2010)
assertXPathContent(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/mc:AlternateContent/mc:Choice/p:sp/p:txBody/a:p/"
"a14:m/m:oMath/m:sSup/m:e/m:r[1]/m:t",
u"\U0001D44E"); // non-BMP char
u"\U0001D44E"_ustr); // non-BMP char
const SdrPage* pPage = GetPage(1);
const SdrObject* pObj = pPage->GetObj(0);

6
sd/qa/unit/import-tests-smartart.cxx
View File

@ -693,7 +693,7 @@ CPPUNIT_TEST_FIXTURE(SdImportTestSmartArt, testAccentProcess)
uno::Reference<container::XIndexAccess> xRules(xPara->getPropertyValue("NumberingRules"),
uno::UNO_QUERY);
comphelper::SequenceAsHashMap aRule(xRules->getByIndex(0));
CPPUNIT_ASSERT_EQUAL(OUString(u"•"), aRule["BulletChar"].get<OUString>());
CPPUNIT_ASSERT_EQUAL(u"•"_ustr, aRule["BulletChar"].get<OUString>());
}
int nFirstChildTop = xFirstChild->getPosition().Y;
@ -1279,13 +1279,13 @@ CPPUNIT_TEST_FIXTURE(SdImportTestSmartArt, testBulletList)
uno::Reference<container::XIndexAccess> xRules1(xPara1->getPropertyValue("NumberingRules"),
uno::UNO_QUERY);
comphelper::SequenceAsHashMap aRule1(xRules1->getByIndex(1));
CPPUNIT_ASSERT_EQUAL(OUString(u"•"), aRule1["BulletChar"].get<OUString>());
CPPUNIT_ASSERT_EQUAL(u"•"_ustr, aRule1["BulletChar"].get<OUString>());
uno::Reference<beans::XPropertySet> xPara2(xParas->nextElement(), uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xRules2(xPara2->getPropertyValue("NumberingRules"),
uno::UNO_QUERY);
comphelper::SequenceAsHashMap aRule2(xRules2->getByIndex(2));
CPPUNIT_ASSERT_EQUAL(OUString(u"•"), aRule2["BulletChar"].get<OUString>());
CPPUNIT_ASSERT_EQUAL(u"•"_ustr, aRule2["BulletChar"].get<OUString>());
}
CPPUNIT_TEST_FIXTURE(SdImportTestSmartArt, testRecursion)

30
sd/qa/unit/import-tests.cxx
View File

@ -122,33 +122,33 @@ CPPUNIT_TEST_FIXTURE(SdImportTest, testDocumentLayout)
std::u16string_view sInput, sDump;
OUString sExportType;
} aFilesToCompare[]
= { { u"odp/shapes-test.odp", u"xml/shapes-test_page", u"" },
{ u"fdo47434.pptx", u"xml/fdo47434_", u"" },
{ u"n758621.ppt", u"xml/n758621_", u"" },
{ u"fdo64586.ppt", u"xml/fdo64586_", u"" },
= { { u"odp/shapes-test.odp", u"xml/shapes-test_page", u""_ustr },
{ u"fdo47434.pptx", u"xml/fdo47434_", u""_ustr },
{ u"n758621.ppt", u"xml/n758621_", u""_ustr },
{ u"fdo64586.ppt", u"xml/fdo64586_", u""_ustr },
// needed to adapt this, the border parameter is no longer
// exported with MCGRs due to oox neither needing nor
// supporting it with now freely definable gradients
{ u"n819614.pptx", u"xml/n819614_", u"" },
{ u"n819614.pptx", u"xml/n819614_", u""_ustr },
{ u"n820786.pptx", u"xml/n820786_", u"" },
{ u"n762695.pptx", u"xml/n762695_", u"" },
{ u"n593612.pptx", u"xml/n593612_", u"" },
{ u"fdo71434.pptx", u"xml/fdo71434_", u"" },
{ u"n902652.pptx", u"xml/n902652_", u"" },
{ u"tdf90403.pptx", u"xml/tdf90403_", u"" },
{ u"tdf90338.odp", u"xml/tdf90338_", u"Impress Office Open XML" },
{ u"tdf92001.odp", u"xml/tdf92001_", u"Impress Office Open XML" },
{ u"n820786.pptx", u"xml/n820786_", u""_ustr },
{ u"n762695.pptx", u"xml/n762695_", u""_ustr },
{ u"n593612.pptx", u"xml/n593612_", u""_ustr },
{ u"fdo71434.pptx", u"xml/fdo71434_", u""_ustr },
{ u"n902652.pptx", u"xml/n902652_", u""_ustr },
{ u"tdf90403.pptx", u"xml/tdf90403_", u""_ustr },
{ u"tdf90338.odp", u"xml/tdf90338_", u"Impress Office Open XML"_ustr },
{ u"tdf92001.odp", u"xml/tdf92001_", u"Impress Office Open XML"_ustr },
// GCC -mfpmath=387 rounding issues in lclPushMarkerProperties
// (oox/source/drawingml/lineproperties.cxx); see mail sub-thread starting at
// <https://lists.freedesktop.org/archives/libreoffice/2016-September/
// 075211.html> "Re: Test File: sc/qa/unit/data/functions/fods/chiinv.fods:
// fails with Assertion" for how "-mfpmath=sse -msse2" would fix that:
#if !(defined LINUX && defined X86)
{ u"tdf100491.pptx", u"xml/tdf100491_", u"" },
{ u"tdf100491.pptx", u"xml/tdf100491_", u""_ustr },
#endif
{ u"tdf109317.pptx", u"xml/tdf109317_", u"impress8" },
{ u"tdf109317.pptx", u"xml/tdf109317_", u"impress8"_ustr },
// { u"pptx/n828390.pptx", u"pptx/xml/n828390_", "Impress Office Open XML" }, // Example
};

3
sd/qa/unit/layout-tests.cxx
View File

@ -367,7 +367,8 @@ CPPUNIT_TEST_FIXTURE(SdLayoutTest, testTdf112594)
// - In <>, attribute 'length' of '/metafile/push[1]/push[1]/textarray[3]' incorrect value.
assertXPath(pXmlDoc, "/metafile/push[1]/push[1]/textarray[3]", "index", "0");
assertXPath(pXmlDoc, "/metafile/push[1]/push[1]/textarray[3]", "length", "4");
assertXPathContent(pXmlDoc, "/metafile/push[1]/push[1]/textarray[3]/text", u"11\u202f\u1824");
assertXPathContent(pXmlDoc, "/metafile/push[1]/push[1]/textarray[3]/text",
u"11\u202f\u1824"_ustr);
}
CPPUNIT_PLUGIN_IMPLEMENT();

6
sd/qa/unit/tiledrendering/tiledrendering.cxx
View File

@ -1598,7 +1598,7 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testTdf81754)
uno::Reference<drawing::XDrawPage> xPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
uno::UNO_QUERY);
uno::Reference<text::XTextRange> xShape(xPage->getByIndex(1), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString(u"Somethingxx"), xShape->getString());
CPPUNIT_ASSERT_EQUAL(u"Somethingxx"_ustr, xShape->getString());
}
CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testTdf105502)
@ -2447,7 +2447,7 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testThemeViewSeparation)
aValue.bIsVisible = true;
aValue.nColor = aDarkColor;
aColorConfig.SetColorValue(svtools::DOCCOLOR, aValue);
aColorConfig.AddScheme(u"Dark");
aColorConfig.AddScheme(u"Dark"_ustr);
}
// Add a minimal light scheme
{
@ -2456,7 +2456,7 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testThemeViewSeparation)
aValue.bIsVisible = true;
aValue.nColor = COL_WHITE;
aColorConfig.SetColorValue(svtools::DOCCOLOR, aValue);
aColorConfig.AddScheme(u"Light");
aColorConfig.AddScheme(u"Light"_ustr);
}
SdXImpressDocument* pXImpressDocument = createDoc("dummy.odp");
int nFirstViewId = SfxLokHelper::getView();

28
sd/qa/unit/uiimpress.cxx
View File

@ -621,7 +621,7 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf148620)
uno::Reference<drawing::XDrawPage> xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
uno::UNO_QUERY);
uno::Reference<text::XTextRange> xShape(xDrawPage->getByIndex(1), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString(u""), xShape->getString());
CPPUNIT_ASSERT_EQUAL(u""_ustr, xShape->getString());
insertStringToObject(1, u"one", /*bUseEscape*/ false);
typeKey(pXImpressDocument, KEY_RETURN);
@ -635,49 +635,49 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf148620)
typeKey(pXImpressDocument, KEY_RETURN);
typeString(pXImpressDocument, u"six");
CPPUNIT_ASSERT_EQUAL(OUString(u"One\nTwo\nThree\nFour\nFive\nsix"), xShape->getString());
CPPUNIT_ASSERT_EQUAL(u"One\nTwo\nThree\nFour\nFive\nsix"_ustr, xShape->getString());
uno::Sequence<beans::PropertyValue> aArgs(
comphelper::InitPropertySequence({ { "KeyModifier", uno::Any(sal_Int32(0)) } }));
dispatchCommand(mxComponent, ".uno:OutlineUp", aArgs);
CPPUNIT_ASSERT_EQUAL(OUString(u"One\nTwo\nThree\nFour\nsix\nFive"), xShape->getString());
CPPUNIT_ASSERT_EQUAL(u"One\nTwo\nThree\nFour\nsix\nFive"_ustr, xShape->getString());
dispatchCommand(mxComponent, ".uno:OutlineUp", aArgs);
CPPUNIT_ASSERT_EQUAL(OUString(u"One\nTwo\nThree\nsix\nFour\nFive"), xShape->getString());
CPPUNIT_ASSERT_EQUAL(u"One\nTwo\nThree\nsix\nFour\nFive"_ustr, xShape->getString());
dispatchCommand(mxComponent, ".uno:OutlineUp", aArgs);
CPPUNIT_ASSERT_EQUAL(OUString(u"One\nTwo\nsix\nThree\nFour\nFive"), xShape->getString());
CPPUNIT_ASSERT_EQUAL(u"One\nTwo\nsix\nThree\nFour\nFive"_ustr, xShape->getString());
dispatchCommand(mxComponent, ".uno:OutlineUp", aArgs);
CPPUNIT_ASSERT_EQUAL(OUString(u"One\nsix\nTwo\nThree\nFour\nFive"), xShape->getString());
CPPUNIT_ASSERT_EQUAL(u"One\nsix\nTwo\nThree\nFour\nFive"_ustr, xShape->getString());
dispatchCommand(mxComponent, ".uno:OutlineUp", aArgs);
CPPUNIT_ASSERT_EQUAL(OUString(u"six\nOne\nTwo\nThree\nFour\nFive"), xShape->getString());
CPPUNIT_ASSERT_EQUAL(u"six\nOne\nTwo\nThree\nFour\nFive"_ustr, xShape->getString());
dispatchCommand(mxComponent, ".uno:OutlineDown", aArgs);
CPPUNIT_ASSERT_EQUAL(OUString(u"One\nsix\nTwo\nThree\nFour\nFive"), xShape->getString());
CPPUNIT_ASSERT_EQUAL(u"One\nsix\nTwo\nThree\nFour\nFive"_ustr, xShape->getString());
dispatchCommand(mxComponent, ".uno:OutlineDown", aArgs);
CPPUNIT_ASSERT_EQUAL(OUString(u"One\nTwo\nsix\nThree\nFour\nFive"), xShape->getString());
CPPUNIT_ASSERT_EQUAL(u"One\nTwo\nsix\nThree\nFour\nFive"_ustr, xShape->getString());
dispatchCommand(mxComponent, ".uno:OutlineDown", aArgs);
CPPUNIT_ASSERT_EQUAL(OUString(u"One\nTwo\nThree\nsix\nFour\nFive"), xShape->getString());
CPPUNIT_ASSERT_EQUAL(u"One\nTwo\nThree\nsix\nFour\nFive"_ustr, xShape->getString());
dispatchCommand(mxComponent, ".uno:OutlineDown", aArgs);
CPPUNIT_ASSERT_EQUAL(OUString(u"One\nTwo\nThree\nFour\nsix\nFive"), xShape->getString());
CPPUNIT_ASSERT_EQUAL(u"One\nTwo\nThree\nFour\nsix\nFive"_ustr, xShape->getString());
dispatchCommand(mxComponent, ".uno:OutlineDown", aArgs);
CPPUNIT_ASSERT_EQUAL(OUString(u"One\nTwo\nThree\nFour\nFive\nsix"), xShape->getString());
CPPUNIT_ASSERT_EQUAL(u"One\nTwo\nThree\nFour\nFive\nsix"_ustr, xShape->getString());
}
CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf141703)
@ -891,7 +891,7 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf38669)
// Without the fix in place, this test would have failed with:
// - Expected: °
// - Actual : ㅀ
CPPUNIT_ASSERT_EQUAL(OUString(u"°"), xShape->getString());
CPPUNIT_ASSERT_EQUAL(u"°"_ustr, xShape->getString());
}
CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf151417)
@ -1005,7 +1005,7 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testCharColorTheme)
uno::Reference<text::XTextRange> xShape(xPage->getByIndex(0), uno::UNO_QUERY);
{
uno::Reference<text::XSimpleText> xText = xShape->getText();
xText->insertString(xText->getStart(), u"test", false);
xText->insertString(xText->getStart(), u"test"_ustr, false);
}
uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY);
uno::Reference<view::XSelectionSupplier> xController(xModel->getCurrentController(),

16
sd/source/core/stlsheet.cxx
View File

@ -89,10 +89,10 @@ static SvxItemPropertySet& GetStylePropertySet()
{
static const SfxItemPropertyMapEntry aFullPropertyMap_Impl[] =
{
{ u"Family", WID_STYLE_FAMILY, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
{ u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<XNameContainer>::get(), 0, 0},
{ u"DisplayName", WID_STYLE_DISPNAME, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
{ u"Hidden", WID_STYLE_HIDDEN, cppu::UnoType<bool>::get(), 0, 0},
{ u"Family"_ustr, WID_STYLE_FAMILY, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
{ u"UserDefinedAttributes"_ustr, SDRATTR_XMLATTRIBUTES, cppu::UnoType<XNameContainer>::get(), 0, 0},
{ u"DisplayName"_ustr, WID_STYLE_DISPNAME, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
{ u"Hidden"_ustr, WID_STYLE_HIDDEN, cppu::UnoType<bool>::get(), 0, 0},
SVX_UNOEDIT_NUMBERING_PROPERTY,
SHADOW_PROPERTIES
@ -103,10 +103,10 @@ static SvxItemPropertySet& GetStylePropertySet()
TEXT_PROPERTIES_DEFAULTS
CONNECTOR_PROPERTIES
SPECIAL_DIMENSIONING_PROPERTIES_DEFAULTS
{ u"TopBorder", SDRATTR_TABLE_BORDER, ::cppu::UnoType<BorderLine>::get(), 0, TOP_BORDER },
{ u"BottomBorder", SDRATTR_TABLE_BORDER, ::cppu::UnoType<BorderLine>::get(), 0, BOTTOM_BORDER },
{ u"LeftBorder", SDRATTR_TABLE_BORDER, ::cppu::UnoType<BorderLine>::get(), 0, LEFT_BORDER },
{ u"RightBorder", SDRATTR_TABLE_BORDER, ::cppu::UnoType<BorderLine>::get(), 0, RIGHT_BORDER },
{ u"TopBorder"_ustr, SDRATTR_TABLE_BORDER, ::cppu::UnoType<BorderLine>::get(), 0, TOP_BORDER },
{ u"BottomBorder"_ustr, SDRATTR_TABLE_BORDER, ::cppu::UnoType<BorderLine>::get(), 0, BOTTOM_BORDER },
{ u"LeftBorder"_ustr, SDRATTR_TABLE_BORDER, ::cppu::UnoType<BorderLine>::get(), 0, LEFT_BORDER },
{ u"RightBorder"_ustr, SDRATTR_TABLE_BORDER, ::cppu::UnoType<BorderLine>::get(), 0, RIGHT_BORDER },
};
static SvxItemPropertySet aPropSet( aFullPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );

8
sd/source/core/text/textapi.cxx
View File

@ -122,10 +122,10 @@ static const SvxItemPropertySet* ImplGetSdTextPortionPropertyMap()
SVX_UNOEDIT_FONT_PROPERTIES,
SVX_UNOEDIT_OUTLINER_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
{u"TextField", EE_FEATURE_FIELD, cppu::UnoType<XTextField>::get(), PropertyAttribute::READONLY, 0 },
{u"TextPortionType", WID_PORTIONTYPE, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0 },
{u"TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0},
{u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0},
{u"TextField"_ustr, EE_FEATURE_FIELD, cppu::UnoType<XTextField>::get(), PropertyAttribute::READONLY, 0 },
{u"TextPortionType"_ustr, WID_PORTIONTYPE, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0 },
{u"TextUserDefinedAttributes"_ustr, EE_CHAR_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0},
{u"ParaUserDefinedAttributes"_ustr, EE_PARA_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0},
};
static SvxItemPropertySet aSdTextPortionPropertyMap( aSdTextPortionPropertyEntries, SdrObject::GetGlobalDrawObjectItemPool() );

32
sd/source/ui/slideshow/slideshow.cxx
View File

@ -109,22 +109,22 @@ static o3tl::span<const SfxItemPropertyMapEntry> ImplGetPresentationPropertyMap(
// NOTE: First member must be sorted
static const SfxItemPropertyMapEntry aPresentationPropertyMap_Impl[] =
{
{ u"AllowAnimations", ATTR_PRESENT_ANIMATION_ALLOWED, cppu::UnoType<bool>::get(), 0, 0 },
{ u"CustomShow", ATTR_PRESENT_CUSTOMSHOW, ::cppu::UnoType<OUString>::get(), 0, 0 },
{ u"Display", ATTR_PRESENT_DISPLAY, ::cppu::UnoType<sal_Int32>::get(), 0, 0 },
{ u"FirstPage", ATTR_PRESENT_DIANAME, ::cppu::UnoType<OUString>::get(), 0, 0 },
{ u"IsAlwaysOnTop", ATTR_PRESENT_ALWAYS_ON_TOP, cppu::UnoType<bool>::get(), 0, 0 },
{ u"IsShowNavigationButtons", ATTR_PRESENT_SHOW_NAVIGATION_BUTTONS, cppu::UnoType<bool>::get(), 0, 0 },
{ u"IsAutomatic", ATTR_PRESENT_MANUEL, cppu::UnoType<bool>::get(), 0, 0 },
{ u"IsEndless", ATTR_PRESENT_ENDLESS, cppu::UnoType<bool>::get(), 0, 0 },
{ u"IsFullScreen", ATTR_PRESENT_FULLSCREEN, cppu::UnoType<bool>::get(), 0, 0 },
{ u"IsShowAll", ATTR_PRESENT_ALL, cppu::UnoType<bool>::get(), 0, 0 },
{ u"IsMouseVisible", ATTR_PRESENT_MOUSE, cppu::UnoType<bool>::get(), 0, 0 },
{ u"IsShowLogo", ATTR_PRESENT_SHOW_PAUSELOGO, cppu::UnoType<bool>::get(), 0, 0 },
{ u"IsTransitionOnClick", ATTR_PRESENT_CHANGE_PAGE, cppu::UnoType<bool>::get(), 0, 0 },
{ u"Pause", ATTR_PRESENT_PAUSE_TIMEOUT, ::cppu::UnoType<sal_Int32>::get(), 0, 0 },
{ u"StartWithNavigator", ATTR_PRESENT_NAVIGATOR, cppu::UnoType<bool>::get(), 0, 0 },
{ u"UsePen", ATTR_PRESENT_PEN, cppu::UnoType<bool>::get(), 0, 0 },
{ u"AllowAnimations"_ustr, ATTR_PRESENT_ANIMATION_ALLOWED, cppu::UnoType<bool>::get(), 0, 0 },
{ u"CustomShow"_ustr, ATTR_PRESENT_CUSTOMSHOW, ::cppu::UnoType<OUString>::get(), 0, 0 },
{ u"Display"_ustr, ATTR_PRESENT_DISPLAY, ::cppu::UnoType<sal_Int32>::get(), 0, 0 },
{ u"FirstPage"_ustr, ATTR_PRESENT_DIANAME, ::cppu::UnoType<OUString>::get(), 0, 0 },
{ u"IsAlwaysOnTop"_ustr, ATTR_PRESENT_ALWAYS_ON_TOP, cppu::UnoType<bool>::get(), 0, 0 },
{ u"IsShowNavigationButtons"_ustr, ATTR_PRESENT_SHOW_NAVIGATION_BUTTONS, cppu::UnoType<bool>::get(), 0, 0 },
{ u"IsAutomatic"_ustr, ATTR_PRESENT_MANUEL, cppu::UnoType<bool>::get(), 0, 0 },
{ u"IsEndless"_ustr, ATTR_PRESENT_ENDLESS, cppu::UnoType<bool>::get(), 0, 0 },
{ u"IsFullScreen"_ustr, ATTR_PRESENT_FULLSCREEN, cppu::UnoType<bool>::get(), 0, 0 },
{ u"IsShowAll"_ustr, ATTR_PRESENT_ALL, cppu::UnoType<bool>::get(), 0, 0 },
{ u"IsMouseVisible"_ustr, ATTR_PRESENT_MOUSE, cppu::UnoType<bool>::get(), 0, 0 },
{ u"IsShowLogo"_ustr, ATTR_PRESENT_SHOW_PAUSELOGO, cppu::UnoType<bool>::get(), 0, 0 },
{ u"IsTransitionOnClick"_ustr, ATTR_PRESENT_CHANGE_PAGE, cppu::UnoType<bool>::get(), 0, 0 },
{ u"Pause"_ustr, ATTR_PRESENT_PAUSE_TIMEOUT, ::cppu::UnoType<sal_Int32>::get(), 0, 0 },
{ u"StartWithNavigator"_ustr, ATTR_PRESENT_NAVIGATOR, cppu::UnoType<bool>::get(), 0, 0 },
{ u"UsePen"_ustr, ATTR_PRESENT_PEN, cppu::UnoType<bool>::get(), 0, 0 },
};
return aPresentationPropertyMap_Impl;

12
sd/source/ui/unoidl/unolayer.cxx
View File

@ -63,12 +63,12 @@ static const SvxItemPropertySet* ImplGetSdLayerPropertySet()
{
static const SfxItemPropertyMapEntry aSdLayerPropertyMap_Impl[] =
{
{ u"" UNO_NAME_LAYER_LOCKED, WID_LAYER_LOCKED, cppu::UnoType<bool>::get(), 0, 0 },
{ u"" UNO_NAME_LAYER_PRINTABLE, WID_LAYER_PRINTABLE,cppu::UnoType<bool>::get(), 0, 0 },
{ u"" UNO_NAME_LAYER_VISIBLE, WID_LAYER_VISIBLE, cppu::UnoType<bool>::get(), 0, 0 },
{ u"" UNO_NAME_LAYER_NAME, WID_LAYER_NAME, ::cppu::UnoType<OUString>::get(), 0, 0 },
{ u"Title", WID_LAYER_TITLE, ::cppu::UnoType<OUString>::get(), 0, 0 },
{ u"Description", WID_LAYER_DESC, ::cppu::UnoType<OUString>::get(), 0, 0 },
{ u"" UNO_NAME_LAYER_LOCKED ""_ustr, WID_LAYER_LOCKED, cppu::UnoType<bool>::get(), 0, 0 },
{ u"" UNO_NAME_LAYER_PRINTABLE ""_ustr, WID_LAYER_PRINTABLE,cppu::UnoType<bool>::get(), 0, 0 },
{ u"" UNO_NAME_LAYER_VISIBLE ""_ustr, WID_LAYER_VISIBLE, cppu::UnoType<bool>::get(), 0, 0 },
{ u"" UNO_NAME_LAYER_NAME ""_ustr, WID_LAYER_NAME, ::cppu::UnoType<OUString>::get(), 0, 0 },
{ u"Title"_ustr, WID_LAYER_TITLE, ::cppu::UnoType<OUString>::get(), 0, 0 },
{ u"Description"_ustr, WID_LAYER_DESC, ::cppu::UnoType<OUString>::get(), 0, 0 },
};
static SvxItemPropertySet aSDLayerPropertySet_Impl( aSdLayerPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
return &aSDLayerPropertySet_Impl;

8
sd/source/ui/unoidl/unomodel.cxx
View File

@ -242,7 +242,7 @@ static const SvxItemPropertySet* ImplGetDrawModelPropertySet()
// Attention: the first parameter HAS TO BE sorted!!!
const static SfxItemPropertyMapEntry aDrawModelPropertyMap_Impl[] =
{
{ u"BuildId", WID_MODEL_BUILDID, ::cppu::UnoType<OUString>::get(), 0, 0},
{ u"BuildId"_ustr, WID_MODEL_BUILDID, ::cppu::UnoType<OUString>::get(), 0, 0},
{ sUNO_Prop_CharLocale, WID_MODEL_LANGUAGE, ::cppu::UnoType<lang::Locale>::get(), 0, 0},
{ sUNO_Prop_TabStop, WID_MODEL_TABSTOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ sUNO_Prop_VisibleArea, WID_MODEL_VISAREA, ::cppu::UnoType<awt::Rectangle>::get(), 0, 0},
@ -250,11 +250,11 @@ static const SvxItemPropertySet* ImplGetDrawModelPropertySet()
{ sUNO_Prop_ForbiddenCharacters, WID_MODEL_FORBCHARS, cppu::UnoType<i18n::XForbiddenCharacters>::get(), beans::PropertyAttribute::READONLY, 0},
{ sUNO_Prop_AutomContFocus, WID_MODEL_CONTFOCUS, cppu::UnoType<bool>::get(), 0, 0},
{ sUNO_Prop_ApplyFrmDsgnMode, WID_MODEL_DSGNMODE, cppu::UnoType<bool>::get(), 0, 0},
{ u"BasicLibraries", WID_MODEL_BASICLIBS, cppu::UnoType<script::XLibraryContainer>::get(), beans::PropertyAttribute::READONLY, 0},
{ u"DialogLibraries", WID_MODEL_DIALOGLIBS, cppu::UnoType<script::XLibraryContainer>::get(), beans::PropertyAttribute::READONLY, 0},
{ u"BasicLibraries"_ustr, WID_MODEL_BASICLIBS, cppu::UnoType<script::XLibraryContainer>::get(), beans::PropertyAttribute::READONLY, 0},
{ u"DialogLibraries"_ustr, WID_MODEL_DIALOGLIBS, cppu::UnoType<script::XLibraryContainer>::get(), beans::PropertyAttribute::READONLY, 0},
{ sUNO_Prop_RuntimeUID, WID_MODEL_RUNTIMEUID, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0},
{ sUNO_Prop_HasValidSignatures, WID_MODEL_HASVALIDSIGNATURES, ::cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::READONLY, 0},
{ u"Fonts", WID_MODEL_FONTS, cppu::UnoType<uno::Sequence<uno::Any>>::get(), beans::PropertyAttribute::READONLY, 0},
{ u"Fonts"_ustr, WID_MODEL_FONTS, cppu::UnoType<uno::Sequence<uno::Any>>::get(), beans::PropertyAttribute::READONLY, 0},
{ sUNO_Prop_InteropGrabBag, WID_MODEL_INTEROPGRABBAG, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get(), 0, 0},
{ sUNO_Prop_Theme, WID_MODEL_THEME, cppu::UnoType<util::XTheme>::get(), 0, 0},
};

4
sd/source/ui/unoidl/unoobj.cxx
View File

@ -133,7 +133,7 @@ using ::com::sun::star::drawing::XShape;
{
static const SfxItemPropertyMapEntry aImpress_SdXShapePropertyGraphicMap_Impl[] =
{
{ u"ImageMap", WID_IMAGEMAP, cppu::UnoType<container::XIndexContainer>::get(), 0, 0 },
{ u"ImageMap"_ustr, WID_IMAGEMAP, cppu::UnoType<container::XIndexContainer>::get(), 0, 0 },
IMPRESS_MAP_ENTRIES
};
return aImpress_SdXShapePropertyGraphicMap_Impl;
@ -166,7 +166,7 @@ using ::com::sun::star::drawing::XShape;
{
static const SfxItemPropertyMapEntry aDraw_SdXShapePropertyGraphicMap_Impl[] =
{
{ u"ImageMap", WID_IMAGEMAP, cppu::UnoType<container::XIndexContainer>::get(), 0, 0 },
{ u"ImageMap"_ustr, WID_IMAGEMAP, cppu::UnoType<container::XIndexContainer>::get(), 0, 0 },
DRAW_MAP_ENTRIES
};
return aDraw_SdXShapePropertyGraphicMap_Impl;

108
sd/source/ui/unoidl/unopage.cxx
View File

@ -159,34 +159,34 @@ static const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, Page
};
#define DRAW_PAGE_NOTES_PROPERTIES \
{ u"" UNO_NAME_PAGE_BOTTOM, WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ u"" UNO_NAME_PAGE_LEFT, WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ u"" UNO_NAME_PAGE_RIGHT, WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ u"" UNO_NAME_PAGE_TOP, WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ u"" UNO_NAME_PAGE_HEIGHT, WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ u"" UNO_NAME_PAGE_LAYOUT, WID_PAGE_LAYOUT, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
{ u"" UNO_NAME_PAGE_BOTTOM ""_ustr, WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ u"" UNO_NAME_PAGE_LEFT ""_ustr, WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ u"" UNO_NAME_PAGE_RIGHT ""_ustr, WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ u"" UNO_NAME_PAGE_TOP ""_ustr, WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ u"" UNO_NAME_PAGE_HEIGHT ""_ustr, WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ u"" UNO_NAME_PAGE_LAYOUT ""_ustr, WID_PAGE_LAYOUT, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
{ UNO_NAME_LINKDISPLAYBITMAP, WID_PAGE_LDBITMAP, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0}, \
{ UNO_NAME_LINKDISPLAYNAME, WID_PAGE_LDNAME, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0}, \
{ u"" UNO_NAME_PAGE_NUMBER, WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, \
{ u"" UNO_NAME_PAGE_ORIENTATION, WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0}, \
{ u"" UNO_NAME_PAGE_WIDTH, WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ u"" UNO_NAME_PAGE_NUMBER ""_ustr, WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, \
{ u"" UNO_NAME_PAGE_ORIENTATION ""_ustr, WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0}, \
{ u"" UNO_NAME_PAGE_WIDTH ""_ustr, WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},\
{ u"IsHeaderVisible", WID_PAGE_HEADERVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, \
{ u"HeaderText", WID_PAGE_HEADERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, \
{ u"IsBackgroundDark", WID_PAGE_ISDARK, cppu::UnoType<bool>::get(), beans::PropertyAttribute::READONLY, 0}, \
{ u"IsFooterVisible", WID_PAGE_FOOTERVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, \
{ u"FooterText", WID_PAGE_FOOTERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, \
{ u"IsPageNumberVisible", WID_PAGE_PAGENUMBERVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, \
{ u"IsDateTimeVisible", WID_PAGE_DATETIMEVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, \
{ u"IsDateTimeFixed", WID_PAGE_DATETIMEFIXED, cppu::UnoType<bool>::get(), 0, 0}, \
{ u"DateTimeText", WID_PAGE_DATETIMETEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, \
{ u"DateTimeFormat", WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ u"NavigationOrder", WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}
{ u"IsHeaderVisible"_ustr, WID_PAGE_HEADERVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, \
{ u"HeaderText"_ustr, WID_PAGE_HEADERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, \
{ u"IsBackgroundDark"_ustr, WID_PAGE_ISDARK, cppu::UnoType<bool>::get(), beans::PropertyAttribute::READONLY, 0}, \
{ u"IsFooterVisible"_ustr, WID_PAGE_FOOTERVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, \
{ u"FooterText"_ustr, WID_PAGE_FOOTERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, \
{ u"IsPageNumberVisible"_ustr, WID_PAGE_PAGENUMBERVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, \
{ u"IsDateTimeVisible"_ustr, WID_PAGE_DATETIMEVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, \
{ u"IsDateTimeFixed"_ustr, WID_PAGE_DATETIMEFIXED, cppu::UnoType<bool>::get(), 0, 0}, \
{ u"DateTimeText"_ustr, WID_PAGE_DATETIMETEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, \
{ u"DateTimeFormat"_ustr, WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ u"NavigationOrder"_ustr, WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}
static const SfxItemPropertyMapEntry aDrawPageNotesHandoutPropertyMap_Impl[] =
{
// this must be the first two entries so they can be excluded for PageKind::Standard
{ u"" UNO_NAME_PAGE_BACKGROUND, WID_PAGE_BACK, cppu::UnoType<beans::XPropertySet>::get(), beans::PropertyAttribute::MAYBEVOID,0},
{ u"" UNO_NAME_PAGE_BACKGROUND ""_ustr, WID_PAGE_BACK, cppu::UnoType<beans::XPropertySet>::get(), beans::PropertyAttribute::MAYBEVOID,0},
DRAW_PAGE_NOTES_PROPERTIES
};
static const SfxItemPropertyMapEntry aDrawPageNotesHandoutPropertyNoBackMap_Impl[] =
@ -215,7 +215,7 @@ static const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, Page
static const SfxItemPropertyMapEntry aGraphicPagePropertyMap_Impl[] =
{
{ u"" UNO_NAME_PAGE_BACKGROUND, WID_PAGE_BACK, cppu::UnoType<beans::XPropertySet>::get(), beans::PropertyAttribute::MAYBEVOID,0},
{ u"" UNO_NAME_PAGE_BACKGROUND ""_ustr, WID_PAGE_BACK, cppu::UnoType<beans::XPropertySet>::get(), beans::PropertyAttribute::MAYBEVOID,0},
GRAPHIC_PAGE_PROPERTIES
};
static const SfxItemPropertyMapEntry aGraphicPagePropertyNoBackMap_Impl[] =
@ -268,47 +268,47 @@ static const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKin
{
static const SfxItemPropertyMapEntry aMasterPagePropertyMap_Impl[] =
{
{ u"" UNO_NAME_PAGE_BACKGROUND, WID_PAGE_BACK, cppu::UnoType<beans::XPropertySet>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_BOTTOM, WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_LEFT, WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_RIGHT, WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_TOP, WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_HEIGHT, WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_BACKGROUND ""_ustr, WID_PAGE_BACK, cppu::UnoType<beans::XPropertySet>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_BOTTOM ""_ustr, WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_LEFT ""_ustr, WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_RIGHT ""_ustr, WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_TOP ""_ustr, WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_HEIGHT ""_ustr, WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ UNO_NAME_LINKDISPLAYBITMAP, WID_PAGE_LDBITMAP, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0},
{ UNO_NAME_LINKDISPLAYNAME, WID_PAGE_LDNAME, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0},
{ u"" UNO_NAME_PAGE_NUMBER, WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0},
{ u"" UNO_NAME_PAGE_ORIENTATION, WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0},
{ u"" UNO_NAME_PAGE_WIDTH, WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ u"BackgroundFullSize", WID_PAGE_BACKFULL, cppu::UnoType<bool>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_NUMBER ""_ustr, WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0},
{ u"" UNO_NAME_PAGE_ORIENTATION ""_ustr, WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0},
{ u"" UNO_NAME_PAGE_WIDTH ""_ustr, WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ u"BackgroundFullSize"_ustr, WID_PAGE_BACKFULL, cppu::UnoType<bool>::get(), 0, 0},
{ sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
{ u"IsBackgroundDark", WID_PAGE_ISDARK, cppu::UnoType<bool>::get(), beans::PropertyAttribute::READONLY, 0},
{ u"Theme", WID_PAGE_THEME, cppu::UnoType<util::XTheme>::get(), 0, 0},
{ u"IsBackgroundDark"_ustr, WID_PAGE_ISDARK, cppu::UnoType<bool>::get(), beans::PropertyAttribute::READONLY, 0},
{ u"Theme"_ustr, WID_PAGE_THEME, cppu::UnoType<util::XTheme>::get(), 0, 0},
// backwards compatible view of the theme for use in tests
{ u"ThemeUnoRepresentation", WID_PAGE_THEME_UNO_REPRESENTATION, cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get(), 0, 0}
{ u"ThemeUnoRepresentation"_ustr, WID_PAGE_THEME_UNO_REPRESENTATION, cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get(), 0, 0}
};
static const SfxItemPropertyMapEntry aHandoutMasterPagePropertyMap_Impl[] =
{
{ u"" UNO_NAME_PAGE_BOTTOM, WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_LEFT, WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_RIGHT, WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_TOP, WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_HEIGHT, WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_ORIENTATION, WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0},
{ u"" UNO_NAME_PAGE_NUMBER, WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0},
{ u"" UNO_NAME_PAGE_WIDTH, WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_LAYOUT, WID_PAGE_LAYOUT, ::cppu::UnoType<sal_Int16>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_BOTTOM ""_ustr, WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_LEFT ""_ustr, WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_RIGHT ""_ustr, WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_TOP ""_ustr, WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_HEIGHT ""_ustr, WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_ORIENTATION ""_ustr, WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0},
{ u"" UNO_NAME_PAGE_NUMBER ""_ustr, WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0},
{ u"" UNO_NAME_PAGE_WIDTH ""_ustr, WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ u"" UNO_NAME_PAGE_LAYOUT ""_ustr, WID_PAGE_LAYOUT, ::cppu::UnoType<sal_Int16>::get(), 0, 0},
{ sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
{ u"IsBackgroundDark", WID_PAGE_ISDARK, cppu::UnoType<bool>::get(), beans::PropertyAttribute::READONLY, 0},
{ u"IsHeaderVisible", WID_PAGE_HEADERVISIBLE, cppu::UnoType<bool>::get(), 0, 0},
{ u"HeaderText", WID_PAGE_HEADERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0},
{ u"IsFooterVisible", WID_PAGE_FOOTERVISIBLE, cppu::UnoType<bool>::get(), 0, 0},
{ u"FooterText", WID_PAGE_FOOTERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0},
{ u"IsPageNumberVisible", WID_PAGE_PAGENUMBERVISIBLE, cppu::UnoType<bool>::get(), 0, 0},
{ u"IsDateTimeVisible", WID_PAGE_DATETIMEVISIBLE, cppu::UnoType<bool>::get(), 0, 0},
{ u"IsDateTimeFixed", WID_PAGE_DATETIMEFIXED, cppu::UnoType<bool>::get(), 0, 0},
{ u"DateTimeText", WID_PAGE_DATETIMETEXT, ::cppu::UnoType<OUString>::get(), 0, 0},
{ u"DateTimeFormat", WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}
{ u"IsBackgroundDark"_ustr, WID_PAGE_ISDARK, cppu::UnoType<bool>::get(), beans::PropertyAttribute::READONLY, 0},
{ u"IsHeaderVisible"_ustr, WID_PAGE_HEADERVISIBLE, cppu::UnoType<bool>::get(), 0, 0},
{ u"HeaderText"_ustr, WID_PAGE_HEADERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0},
{ u"IsFooterVisible"_ustr, WID_PAGE_FOOTERVISIBLE, cppu::UnoType<bool>::get(), 0, 0},
{ u"FooterText"_ustr, WID_PAGE_FOOTERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0},
{ u"IsPageNumberVisible"_ustr, WID_PAGE_PAGENUMBERVISIBLE, cppu::UnoType<bool>::get(), 0, 0},
{ u"IsDateTimeVisible"_ustr, WID_PAGE_DATETIMEVISIBLE, cppu::UnoType<bool>::get(), 0, 0},
{ u"IsDateTimeFixed"_ustr, WID_PAGE_DATETIMEFIXED, cppu::UnoType<bool>::get(), 0, 0},
{ u"DateTimeText"_ustr, WID_PAGE_DATETIMETEXT, ::cppu::UnoType<OUString>::get(), 0, 0},
{ u"DateTimeFormat"_ustr, WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}
};
const SvxItemPropertySet* pRet = nullptr;

6
sd/source/ui/unoidl/unosrch.cxx
View File

@ -45,9 +45,9 @@ static o3tl::span<const SfxItemPropertyMapEntry> ImplGetSearchPropertyMap()
{
static const SfxItemPropertyMapEntry aSearchPropertyMap_Impl[] =
{
{ u"" UNO_NAME_SEARCH_BACKWARDS, WID_SEARCH_BACKWARDS, cppu::UnoType<bool>::get(), 0, 0 },
{ u"" UNO_NAME_SEARCH_CASE, WID_SEARCH_CASE, cppu::UnoType<bool>::get(), 0, 0 },
{ u"" UNO_NAME_SEARCH_WORDS, WID_SEARCH_WORDS, cppu::UnoType<bool>::get(), 0, 0 },
{ u"" UNO_NAME_SEARCH_BACKWARDS ""_ustr, WID_SEARCH_BACKWARDS, cppu::UnoType<bool>::get(), 0, 0 },
{ u"" UNO_NAME_SEARCH_CASE ""_ustr, WID_SEARCH_CASE, cppu::UnoType<bool>::get(), 0, 0 },
{ u"" UNO_NAME_SEARCH_WORDS ""_ustr, WID_SEARCH_WORDS, cppu::UnoType<bool>::get(), 0, 0 },
};
return aSearchPropertyMap_Impl;

20
sdext/qa/unit/pdfimport.cxx
View File

@ -567,10 +567,10 @@ namespace
// This ensures that the imported text contains all of the characters
OString xpath = "//draw:frame[@draw:z-index='3'][1]/draw:text-box/text:p/text:span[1]";
OUString sContent = getXPathContent(pXmlDoc, xpath).replaceAll("\n", "");
CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput.getStr(), OUString(u"敏捷的狐狸跨过慵懒的"), sContent);
CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput.getStr(), u"敏捷的狐狸跨过慵懒的"_ustr, sContent);
xpath = "//draw:frame[@draw:z-index='4'][1]/draw:text-box/text:p/text:span[1]";
sContent = getXPathContent(pXmlDoc, xpath).replaceAll("\n", "");
CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput.getStr(), OUString(u"狗。"), sContent);
CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput.getStr(), u"狗。"_ustr, sContent);
#endif
}
@ -793,30 +793,30 @@ namespace
// Test for امُ عَلَيْكَ
OString xpath = "string(//draw:frame[@draw:transform='matrix(917.222222222222 0 0 917.222222222222 14821.9583333333 2159.23861112778)']/draw:text-box/text:p/text:span)";
OUString sContent = getXPathContent(pXmlDoc, xpath);
CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput.getStr(), OUString(u"امُ عَلَيَْك"), sContent.replaceAll("\n\n", " ").replaceAll("\n", ""));
CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput.getStr(), u"امُ عَلَيَْك"_ustr, sContent.replaceAll("\n\n", " ").replaceAll("\n", ""));
// Test for ٱلسََّل . It appears in the 3rd frame, i.e. after the امُ عَلَيَْك which is in the 2nd frame (from left to right)
// thus these two frames together appear as ٱلسََّل امُ عَلَيْكَ in Draw‬.
// FIXME: Should be ٱلسَّلَامُ عَلَيْكَ (i.e. the two text frames should be merged into one so that the ل and the ا will show as لَا rather than ل ا)
xpath = "string(//draw:frame[@draw:transform='matrix(917.222222222222 0 0 917.222222222222 17420.1666666667 2159.23861112778)']/draw:text-box/text:p/text:span)";
sContent = getXPathContent(pXmlDoc, xpath);
CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput.getStr(), OUString(u"ٱلسََّل"), sContent.replaceAll("\n\n", " ").replaceAll("\n", ""));
CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput.getStr(), u"ٱلسََّل"_ustr, sContent.replaceAll("\n\n", " ").replaceAll("\n", ""));
// Test for "LibreOffice RTL"
xpath = "string(//draw:frame[@draw:transform='matrix(917.222222222222 0 0 917.222222222222 12779.375 5121.79583335)']/draw:text-box/text:p/text:span)";
sContent = getXPathContent(pXmlDoc, xpath);
CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput.getStr(), OUString(u"LibreOffice RTL"), sContent.replaceAll("\n\n", " ").replaceAll("\n", ""));
CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput.getStr(), u"LibreOffice RTL"_ustr, sContent.replaceAll("\n\n", " ").replaceAll("\n", ""));
// Test for "LibreOffice LTR (test)"
xpath = "string(//draw:frame[last()-1]/draw:text-box/text:p/text:span[last()])";
sContent = getXPathContent(pXmlDoc, xpath);
CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput.getStr(), OUString(u"LibreOffice LTR (test)"), sContent.replaceAll("\n\n", " ").replaceAll("\n", ""));
CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput.getStr(), u"LibreOffice LTR (test)"_ustr, sContent.replaceAll("\n\n", " ").replaceAll("\n", ""));
/* Test for Chinese characters */
// Use last() instead of matrix below, because the matrix may be different on different OS due to fallback of Chinese fonts.
xpath = "string(//draw:frame[last()]/draw:text-box/text:p/text:span)";
sContent = getXPathContent(pXmlDoc, xpath);
CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput.getStr(), OUString(u"中文测试，中文"), sContent.replaceAll("\n\n", " ").replaceAll("\n", ""));
CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput.getStr(), u"中文测试，中文"_ustr, sContent.replaceAll("\n\n", " ").replaceAll("\n", ""));
// Test pdf text run in the Writer PDF import filter
xAdaptor->setTreeVisitorFactory(createWriterTreeVisitorFactory());
@ -827,13 +827,13 @@ namespace
xmlDocUniquePtr pXmlDoc2(xmlParseDoc(reinterpret_cast<xmlChar const *>(aOutput2.getStr())));
xpath = "string(//draw:frame[@draw:z-index='3'][1]/draw:text-box/text:p/text:span)";
sContent = getXPathContent(pXmlDoc2, xpath).replaceAll("\n\n", " ").replaceAll("\n", "");
CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput2.getStr(), OUString(u"ٱلسََّل"), sContent);
CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput2.getStr(), u"ٱلسََّل"_ustr, sContent);
xpath = "string(//draw:frame[@draw:z-index='2'][1]/draw:text-box/text:p/text:span)";
sContent = getXPathContent(pXmlDoc2, xpath).replaceAll("\n\n", " ").replaceAll("\n", "");
CPPUNIT_ASSERT_EQUAL(OUString(u"امُ عَلَيَْك"), sContent);
CPPUNIT_ASSERT_EQUAL(u"امُ عَلَيَْك"_ustr, sContent);
xpath = "string(//draw:frame[last()]/draw:text-box/text:p/text:span)";
sContent = getXPathContent(pXmlDoc2, xpath).replaceAll("\n\n", " ").replaceAll("\n", "");
CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput2.getStr(), OUString(u"中文测试，中文"), sContent);
CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput2.getStr(), u"中文测试，中文"_ustr, sContent);
#endif
}

2
sdext/source/pdfimport/inc/contentsink.hxx
View File

@ -65,7 +65,7 @@ namespace pdfi
FontAttributes() :
familyName(),
fontWeight(u"normal"),
fontWeight(u"normal"_ustr),
isItalic(false),
isUnderline(false),
isOutline(false),

2
sdext/source/pdfimport/tree/drawtreevisiting.cxx
View File

@ -719,7 +719,7 @@ void DrawXmlOptimizer::optimizeTextElements(Element& rParent)
{
tempStr = ::comphelper::string::reverseCodePoints(tempStr);
pCur->Text.append(tempStr);
tempStr = u"";
tempStr = u""_ustr;
}
bNeedReverse = false;
}

4
sdext/source/pdfimport/tree/pdfiprocessor.cxx
View File

@ -57,7 +57,7 @@ namespace pdfi
{
FontAttributes aDefFont;
aDefFont.familyName = "Helvetica";
aDefFont.fontWeight = u"normal";
aDefFont.fontWeight = u"normal"_ustr;
aDefFont.isItalic = false;
aDefFont.size = 10*PDFI_OUTDEV_RESOLUTION/72;
m_aIdToFont.insert({0, aDefFont});
@ -151,7 +151,7 @@ void PDFIProcessor::setFont( const FontAttributes& i_rFont )
// Convert to bold instead if the stroke color is the same as the fill color,
// otherwise it should be outline.
if (getCurrentContext().LineColor == getCurrentContext().FillColor)
aChangedFont.fontWeight = u"bold";
aChangedFont.fontWeight = u"bold"_ustr;
else
aChangedFont.isOutline = true;
}

2
sdext/source/pdfimport/tree/writertreevisiting.cxx
View File

@ -899,7 +899,7 @@ void WriterXmlOptimizer::optimizeTextElements(Element& rParent)
{
tempStr = ::comphelper::string::reverseCodePoints(tempStr);
pCur->Text.append(tempStr);
tempStr = u"";
tempStr = u""_ustr;
}
bNeedReverse = false;
}

52
sdext/source/pdfimport/wrapper/wrapper.cxx
View File

@ -481,39 +481,39 @@ void LineParser::parseFontFamilyName( FontAttributes& rResult )
SAL_INFO("sdext.pdfimport", rResult.familyName);
if (fontAttributesSuffix == u"Heavy" || fontAttributesSuffix == u"Black")
{
rResult.fontWeight = u"900";
rResult.fontWeight = u"900"_ustr;
}
else if (fontAttributesSuffix == u"ExtraBold" || fontAttributesSuffix == u"UltraBold")
{
rResult.fontWeight = u"800";
rResult.fontWeight = u"800"_ustr;
}
else if (fontAttributesSuffix == u"Bold")
{
rResult.fontWeight = u"bold";
rResult.fontWeight = u"bold"_ustr;
}
else if (fontAttributesSuffix == u"Semibold")
{
rResult.fontWeight = u"600";
rResult.fontWeight = u"600"_ustr;
}
else if (fontAttributesSuffix == u"Medium")
{
rResult.fontWeight = u"500";
rResult.fontWeight = u"500"_ustr;
}
else if (fontAttributesSuffix == u"Normal" || fontAttributesSuffix == u"Regular" || fontAttributesSuffix == u"Book")
{
rResult.fontWeight = u"400";
rResult.fontWeight = u"400"_ustr;
}
else if (fontAttributesSuffix == u"Light")
{
rResult.fontWeight = u"300";
rResult.fontWeight = u"300"_ustr;
}
else if (fontAttributesSuffix == u"ExtraLight" || fontAttributesSuffix == u"UltraLight")
{
rResult.fontWeight = u"200";
rResult.fontWeight = u"200"_ustr;
}
else if (fontAttributesSuffix == u"Thin")
{
rResult.fontWeight = u"100";
rResult.fontWeight = u"100"_ustr;
}
if ( (fontAttributesSuffix == "Italic") or (fontAttributesSuffix == "Oblique") )
@ -573,23 +573,23 @@ void LineParser::readFont()
// The font is not yet in the map list - get info and add to map
OUString sFontWeight; // font weight name per ODF specifications
if (nFontWeight == 0 or nFontWeight == 4) // WeightNotDefined or W400, map to normal font
sFontWeight = u"normal";
sFontWeight = u"normal"_ustr;
else if (nFontWeight == 1) // W100, Thin
sFontWeight = u"100";
sFontWeight = u"100"_ustr;
else if (nFontWeight == 2) // W200, Extra-Light
sFontWeight = u"200";
sFontWeight = u"200"_ustr;
else if (nFontWeight == 3) // W300, Light
sFontWeight = u"300";
sFontWeight = u"300"_ustr;
else if (nFontWeight == 5) // W500, Medium. Is this supported by ODF?
sFontWeight = u"500";
sFontWeight = u"500"_ustr;
else if (nFontWeight == 6) // W600, Semi-Bold
sFontWeight = u"600";
sFontWeight = u"600"_ustr;
else if (nFontWeight == 7) // W700, Bold
sFontWeight = u"bold";
sFontWeight = u"bold"_ustr;
else if (nFontWeight == 8) // W800, Extra-Bold
sFontWeight = u"800";
sFontWeight = u"800"_ustr;
else if (nFontWeight == 9) // W900, Black
sFontWeight = u"900";
sFontWeight = u"900"_ustr;
SAL_INFO("sdext.pdfimport", "Font weight passed from xpdfimport is: " << sFontWeight);
FontAttributes aResult( OStringToOUString( aFontName, RTL_TEXTENCODING_UTF8 ),
@ -637,22 +637,22 @@ void LineParser::readFont()
// Font weight
if (aFontReadResult.GetWeight() == WEIGHT_THIN)
aResult.fontWeight = u"100";
aResult.fontWeight = u"100"_ustr;
else if (aFontReadResult.GetWeight() == WEIGHT_ULTRALIGHT)
aResult.fontWeight = u"200";
aResult.fontWeight = u"200"_ustr;
else if (aFontReadResult.GetWeight() == WEIGHT_LIGHT)
aResult.fontWeight = u"300";
aResult.fontWeight = u"300"_ustr;
else if (aFontReadResult.GetWeight() == WEIGHT_SEMILIGHT)
aResult.fontWeight = u"350";
aResult.fontWeight = u"350"_ustr;
// no need to check "normal" here as this is default in nFontWeight above
else if (aFontReadResult.GetWeight() == WEIGHT_SEMIBOLD)
aResult.fontWeight = u"600";
aResult.fontWeight = u"600"_ustr;
else if (aFontReadResult.GetWeight() == WEIGHT_BOLD)
aResult.fontWeight = u"bold";
aResult.fontWeight = u"bold"_ustr;
else if (aFontReadResult.GetWeight() == WEIGHT_ULTRABOLD)
aResult.fontWeight = u"800";
aResult.fontWeight = u"800"_ustr;
else if (aFontReadResult.GetWeight() == WEIGHT_BLACK)
aResult.fontWeight = u"900";
aResult.fontWeight = u"900"_ustr;
SAL_INFO("sdext.pdfimport", aResult.fontWeight);
// Italic

16
sfx2/source/doc/iframe.cxx
View File

@ -137,14 +137,14 @@ o3tl::span<const SfxItemPropertyMapEntry> lcl_GetIFramePropertyMap_Impl()
{
static const SfxItemPropertyMapEntry aIFramePropertyMap_Impl[] =
{
{ u"FrameIsAutoBorder", WID_FRAME_IS_AUTO_BORDER, cppu::UnoType<bool>::get(), PROPERTY_UNBOUND, 0 },
{ u"FrameIsAutoScroll", WID_FRAME_IS_AUTO_SCROLL, cppu::UnoType<bool>::get(), PROPERTY_UNBOUND, 0 },
{ u"FrameIsBorder", WID_FRAME_IS_BORDER, cppu::UnoType<bool>::get(), PROPERTY_UNBOUND, 0 },
{ u"FrameIsScrollingMode", WID_FRAME_IS_SCROLLING_MODE,cppu::UnoType<bool>::get(), PROPERTY_UNBOUND, 0 },
{ u"FrameMarginHeight", WID_FRAME_MARGIN_HEIGHT, cppu::UnoType<sal_Int32>::get(), PROPERTY_UNBOUND, 0 },
{ u"FrameMarginWidth", WID_FRAME_MARGIN_WIDTH, cppu::UnoType<sal_Int32>::get(), PROPERTY_UNBOUND, 0 },
{ u"FrameName", WID_FRAME_NAME, cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 },
{ u"FrameURL", WID_FRAME_URL, cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 },
{ u"FrameIsAutoBorder"_ustr, WID_FRAME_IS_AUTO_BORDER, cppu::UnoType<bool>::get(), PROPERTY_UNBOUND, 0 },
{ u"FrameIsAutoScroll"_ustr, WID_FRAME_IS_AUTO_SCROLL, cppu::UnoType<bool>::get(), PROPERTY_UNBOUND, 0 },
{ u"FrameIsBorder"_ustr, WID_FRAME_IS_BORDER, cppu::UnoType<bool>::get(), PROPERTY_UNBOUND, 0 },
{ u"FrameIsScrollingMode"_ustr, WID_FRAME_IS_SCROLLING_MODE,cppu::UnoType<bool>::get(), PROPERTY_UNBOUND, 0 },
{ u"FrameMarginHeight"_ustr, WID_FRAME_MARGIN_HEIGHT, cppu::UnoType<sal_Int32>::get(), PROPERTY_UNBOUND, 0 },
{ u"FrameMarginWidth"_ustr, WID_FRAME_MARGIN_WIDTH, cppu::UnoType<sal_Int32>::get(), PROPERTY_UNBOUND, 0 },
{ u"FrameName"_ustr, WID_FRAME_NAME, cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 },
{ u"FrameURL"_ustr, WID_FRAME_URL, cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 },
};
return aIFramePropertyMap_Impl;
}

4
sfx2/source/view/viewfrm.cxx
View File

@ -840,9 +840,9 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
auto sModule = vcl::CommandInfoProvider::GetModuleIdentifier(GetFrame().GetFrameInterface());
OUString sReloadNotebookBar;
if (sModule == "com.sun.star.text.TextDocument")
sReloadNotebookBar = u"modules/swriter/ui/";
sReloadNotebookBar = u"modules/swriter/ui/"_ustr;
else if (sModule == "com.sun.star.sheet.SpreadsheetDocument")
sReloadNotebookBar = u"modules/scalc/ui/";
sReloadNotebookBar = u"modules/scalc/ui/"_ustr;
else if (sfx2::SfxNotebookBar::IsActive()
&& sModule != "presentation.PresentationDocument"
&& sModule != "com.sun.star.drawing.DrawingDocument")

4
starmath/inc/mathml/element.hxx
View File

@ -21,7 +21,7 @@ class SmMlElement final : public SmRect
public:
SmMlElement()
: m_aElementType(SmMlElementType::NMlEmpty)
, m_aText(u"")
, m_aText(u""_ustr)
, m_aESelection(0, 0, 0, 0)
, m_aAttributeList(0)
, m_aAttributePosList(0)
@ -36,7 +36,7 @@ public:
public:
SmMlElement(SmMlElementType aElementType)
: m_aElementType(aElementType)
, m_aText(u"\u00B6")
, m_aText(u"\u00B6"_ustr)
, m_aESelection(0, 0, 0, 0)
, m_aSubElements(0)
, m_aParentElement(nullptr)

6
starmath/inc/token.hxx
View File

@ -257,7 +257,7 @@ struct SmToken
void operator=(const SmColorTokenTableEntry& aTokenTableEntry)
{
aText = u"";
aText = u""_ustr;
eType = aTokenTableEntry.eType;
cMathChar = OUString::number(static_cast<sal_uInt32>(aTokenTableEntry.cColor), 16);
nGroup = TG::Color;
@ -266,7 +266,7 @@ struct SmToken
void operator=(const SmColorTokenTableEntry* aTokenTableEntry)
{
aText = u"";
aText = u""_ustr;
eType = aTokenTableEntry->eType;
cMathChar = OUString::number(static_cast<sal_uInt32>(aTokenTableEntry->cColor), 16);
nGroup = TG::Color;
@ -275,7 +275,7 @@ struct SmToken
void operator=(const std::unique_ptr<SmColorTokenTableEntry>& aTokenTableEntry)
{
aText = u"";
aText = u""_ustr;
eType = aTokenTableEntry->eType;
cMathChar = OUString::number(static_cast<sal_uInt32>(aTokenTableEntry->cColor), 16);
nGroup = TG::Color;

4
starmath/qa/cppunit/test_cursor.cxx
View File

@ -176,7 +176,7 @@ void Test::testCutSelectPaste()
void Test::testSelectSurrogatePairs()
{
auto xTree = SmParser5().Parse(u"\U0001EE4E");
auto xTree = SmParser5().Parse(u"\U0001EE4E"_ustr);
xTree->Prepare(xDocShRef->GetFormat(), *xDocShRef, 0);
SmCursor aCursor(xTree.get(), xDocShRef.get());
@ -188,7 +188,7 @@ void Test::testSelectSurrogatePairs()
aCursor.Paste();
#ifndef _WIN32 // FIXME: on Windows clipboard does not work in tests for some reason
CPPUNIT_ASSERT_EQUAL(OUString(u"\U0001EE4E"), xDocShRef->GetText());
CPPUNIT_ASSERT_EQUAL(u"\U0001EE4E"_ustr, xDocShRef->GetText());
#endif
}

4
starmath/qa/cppunit/test_nodetotextvisitors.cxx
View File

@ -655,10 +655,10 @@ void Test::testMiscEquivalent()
void Test::testParser()
{
OUString sOutput;
auto pNode = SmParser5().ParseExpression(u"{ \U0001D44E }"); // non-BMP Unicode
auto pNode = SmParser5().ParseExpression(u"{ \U0001D44E }"_ustr); // non-BMP Unicode
pNode->Prepare(xDocShRef->GetFormat(), *xDocShRef, 0);
SmNodeToTextVisitor(pNode.get(), sOutput);
CPPUNIT_ASSERT_EQUAL(OUString(u"\U0001D44E"), sOutput);
CPPUNIT_ASSERT_EQUAL(u"\U0001D44E"_ustr, sOutput);
}
CPPUNIT_TEST_SUITE_REGISTRATION(Test);

8
starmath/qa/extras/mmlexport-test.cxx
View File

@ -126,12 +126,12 @@ void MathMLExportTest::testMaj()
SfxBaseModel* pModel = dynamic_cast<SfxBaseModel*>(mxComponent.get());
SmDocShell* pDocShell = static_cast<SmDocShell*>(pModel->GetObjectShell());
pDocShell->SetText(
u"maj to { \u0661 } from { \U0001EE0A = \u0660 } { \u0661 over \U0001EE0A }");
u"maj to { \u0661 } from { \U0001EE0A = \u0660 } { \u0661 over \U0001EE0A }"_ustr);
save("MathML XML (Math)");
xmlDocUniquePtr pDoc = parseXml(maTempFile);
CPPUNIT_ASSERT(pDoc);
assertXPath(pDoc, "/m:math/m:semantics/m:mrow/m:munderover/m:mo", "stretchy", "false");
assertXPathContent(pDoc, "/m:math/m:semantics/m:mrow/m:munderover/m:mo", u"\U0001EEF0");
assertXPathContent(pDoc, "/m:math/m:semantics/m:mrow/m:munderover/m:mo", u"\U0001EEF0"_ustr);
}
void MathMLExportTest::testHadd()
@ -139,11 +139,11 @@ void MathMLExportTest::testHadd()
mxComponent = loadFromDesktop("private:factory/smath");
SfxBaseModel* pModel = dynamic_cast<SfxBaseModel*>(mxComponent.get());
SmDocShell* pDocShell = static_cast<SmDocShell*>(pModel->GetObjectShell());
pDocShell->SetText(u"hadd to { \U0001EE4E } from { \U0001EE4E } \U0001EE4E");
pDocShell->SetText(u"hadd to { \U0001EE4E } from { \U0001EE4E } \U0001EE4E"_ustr);
save("MathML XML (Math)");
xmlDocUniquePtr pDoc = parseXml(maTempFile);
CPPUNIT_ASSERT(pDoc);
assertXPathContent(pDoc, "/m:math/m:semantics/m:mrow/m:munderover/m:mi", u"\U0001EEF1");
assertXPathContent(pDoc, "/m:math/m:semantics/m:mrow/m:munderover/m:mi", u"\U0001EEF1"_ustr);
}
CPPUNIT_TEST_SUITE_REGISTRATION(MathMLExportTest);

10
starmath/qa/extras/mmlimport-test.cxx
View File

@ -178,7 +178,7 @@ void Test::testMathmlEntities()
loadFromURL(u"mthmlentities.mml");
SfxBaseModel* pModel = dynamic_cast<SfxBaseModel*>(mxComponent.get());
SmDocShell* pDocShell = static_cast<SmDocShell*>(pModel->GetObjectShell());
CPPUNIT_ASSERT_EQUAL(OUString(u"{ \u03C3 \u221E \u221E \u03C3 }"), pDocShell->GetText());
CPPUNIT_ASSERT_EQUAL(u"{ \u03C3 \u221E \u221E \u03C3 }"_ustr, pDocShell->GetText());
}
void Test::testMaj()
@ -188,8 +188,8 @@ void Test::testMaj()
CPPUNIT_ASSERT(pModel);
SmDocShell* pDocShell = static_cast<SmDocShell*>(pModel->GetObjectShell());
CPPUNIT_ASSERT(pDocShell);
CPPUNIT_ASSERT_EQUAL(OUString(u"{ maj csup \u0661 csub { nitalic \U0001EE0A = \u0660 } { frac "
u"{ \u0661 } { nitalic \U0001EE0A } } }"),
CPPUNIT_ASSERT_EQUAL(u"{ maj csup \u0661 csub { nitalic \U0001EE0A = \u0660 } { frac "
u"{ \u0661 } { nitalic \U0001EE0A } } }"_ustr,
pDocShell->GetText());
}
@ -200,8 +200,8 @@ void Test::testHadd()
CPPUNIT_ASSERT(pModel);
SmDocShell* pDocShell = static_cast<SmDocShell*>(pModel->GetObjectShell());
CPPUNIT_ASSERT(pDocShell);
CPPUNIT_ASSERT_EQUAL(OUString(u"{ nitalic \U0001EEF1 csup nitalic \U0001EE4E csub nitalic "
u"\U0001EE4E nitalic \U0001EE4E }"),
CPPUNIT_ASSERT_EQUAL(u"{ nitalic \U0001EEF1 csup nitalic \U0001EE4E csub nitalic "
u"\U0001EE4E nitalic \U0001EE4E }"_ustr,
pDocShell->GetText());
}

4
starmath/source/cursor.cxx
View File

@ -880,7 +880,7 @@ void SmCursor::InsertText(const OUString& aString)
SmToken token;
token.eType = TIDENT;
token.cMathChar = u"";
token.cMathChar = u""_ustr;
token.nGroup = TG::NONE;
token.nLevel = 5;
token.aText = aString;
@ -1009,7 +1009,7 @@ void SmCursor::InsertSpecial(std::u16string_view _aString)
//Create instance of special node
SmToken token;
token.eType = TSPECIAL;
token.cMathChar = u"";
token.cMathChar = u""_ustr;
token.nGroup = TG::NONE;
token.nLevel = 5;
token.aText = aString;

16
starmath/source/mathml/attribute.cxx
View File

@ -68,12 +68,13 @@ void SmMlAttribute::setDefaultAttributeValue()
break;
case SmMlAttributeValueType::MlHref:
m_aAttributeValue.m_aHref.m_aHref = SmMlAttributeValueHref::NMlEmpty;
m_aAttributeValue.m_aHref.m_aLnk = new OUString(u"");
m_aAttributeValue.m_aHref.m_aLnk = new OUString(u""_ustr);
break;
case SmMlAttributeValueType::MlLspace:
m_aAttributeValue.m_aLspace.m_aLengthValue.m_aLengthUnit = SmLengthUnit::MlEm;
m_aAttributeValue.m_aLspace.m_aLengthValue.m_aLengthValue = 5.0 / 18;
m_aAttributeValue.m_aLspace.m_aLengthValue.m_aOriginalText = new OUString(u"5/18em");
m_aAttributeValue.m_aLspace.m_aLengthValue.m_aOriginalText
= new OUString(u"5/18em"_ustr);
break;
case SmMlAttributeValueType::MlMathbackground:
m_aAttributeValue.m_aMathbackground.m_aMathbackground
@ -85,7 +86,8 @@ void SmMlAttribute::setDefaultAttributeValue()
case SmMlAttributeValueType::MlMathsize:
m_aAttributeValue.m_aMathsize.m_aLengthValue.m_aLengthUnit = SmLengthUnit::MlP;
m_aAttributeValue.m_aMathsize.m_aLengthValue.m_aLengthValue = 100;
m_aAttributeValue.m_aMathsize.m_aLengthValue.m_aOriginalText = new OUString(u"100%");
m_aAttributeValue.m_aMathsize.m_aLengthValue.m_aOriginalText
= new OUString(u"100%"_ustr);
break;
case SmMlAttributeValueType::MlMathvariant:
m_aAttributeValue.m_aMathvariant.m_aMathvariant = SmMlAttributeValueMathvariant::normal;
@ -94,12 +96,13 @@ void SmMlAttribute::setDefaultAttributeValue()
m_aAttributeValue.m_aMaxsize.m_aMaxsize = SmMlAttributeValueMaxsize::MlInfinity;
m_aAttributeValue.m_aMaxsize.m_aLengthValue.m_aLengthUnit = SmLengthUnit::MlP;
m_aAttributeValue.m_aMaxsize.m_aLengthValue.m_aLengthValue = 10000;
m_aAttributeValue.m_aMaxsize.m_aLengthValue.m_aOriginalText = new OUString(u"10000%");
m_aAttributeValue.m_aMaxsize.m_aLengthValue.m_aOriginalText
= new OUString(u"10000%"_ustr);
break;
case SmMlAttributeValueType::MlMinsize:
m_aAttributeValue.m_aMinsize.m_aLengthValue.m_aLengthUnit = SmLengthUnit::MlP;
m_aAttributeValue.m_aMinsize.m_aLengthValue.m_aLengthValue = 1;
m_aAttributeValue.m_aMinsize.m_aLengthValue.m_aOriginalText = new OUString(u"1%");
m_aAttributeValue.m_aMinsize.m_aLengthValue.m_aOriginalText = new OUString(u"1%"_ustr);
break;
case SmMlAttributeValueType::MlMovablelimits:
m_aAttributeValue.m_aMovablelimits.m_aMovablelimits
@ -108,7 +111,8 @@ void SmMlAttribute::setDefaultAttributeValue()
case SmMlAttributeValueType::MlRspace:
m_aAttributeValue.m_aRspace.m_aLengthValue.m_aLengthUnit = SmLengthUnit::MlEm;
m_aAttributeValue.m_aRspace.m_aLengthValue.m_aLengthValue = 5.0 / 18;
m_aAttributeValue.m_aRspace.m_aLengthValue.m_aOriginalText = new OUString(u"5/18em");
m_aAttributeValue.m_aRspace.m_aLengthValue.m_aOriginalText
= new OUString(u"5/18em"_ustr);
break;
case SmMlAttributeValueType::MlSeparator:
m_aAttributeValue.m_aSeparator.m_aSeparator = SmMlAttributeValueSeparator::MlFalse;

14
starmath/source/mathml/export.cxx
View File

@ -136,7 +136,7 @@ bool SmMLExportWrapper::Export(SfxMedium& rMedium)
xInfoSet->setPropertyValue("UsePrettyPrinting", Any(true));
// Set base URI
xInfoSet->setPropertyValue(u"BaseURI", Any(rMedium.GetBaseURL(true)));
xInfoSet->setPropertyValue(u"BaseURI"_ustr, Any(rMedium.GetBaseURL(true)));
if (!m_bFlat) //Storage (Package) of Stream
{
@ -235,7 +235,7 @@ OUString SmMLExportWrapper::Export(SmMlElement* pElementTree)
SAL_WARN_IF(m_xModel == nullptr, "starmath", "Missing model");
SAL_WARN_IF(xContext == nullptr, "starmath", "Missing context");
if (m_xModel == nullptr || xContext == nullptr)
return u"";
return u""_ustr;
//Get model
uno::Reference<lang::XComponent> xModelComp = m_xModel;
@ -243,14 +243,14 @@ OUString SmMLExportWrapper::Export(SmMlElement* pElementTree)
SmModel* pModel = m_xModel.get();
SAL_WARN_IF(pModel == nullptr, "starmath", "Failed to get threw uno tunnel");
if (xModelComp == nullptr || pModel == nullptr)
return u"";
return u""_ustr;
// Get doc shell
SmDocShell* pDocShell = static_cast<SmDocShell*>(pModel->GetObjectShell());
if (pDocShell == nullptr)
{
SAL_WARN("starmath", "Failed to fetch sm document");
return u"";
return u""_ustr;
}
// create XPropertySet with three properties for status indicator
@ -381,7 +381,7 @@ bool SmMLExportWrapper::WriteThroughComponentS(const Reference<embed::XStorage>&
// Set stream as text / xml
uno::Reference<beans::XPropertySet> xSet(xStream, uno::UNO_QUERY);
xSet->setPropertyValue("MediaType", Any(OUString(u"text/xml")));
xSet->setPropertyValue("MediaType", Any(u"text/xml"_ustr));
// all streams must be encrypted in encrypted document
xSet->setPropertyValue("UseCommonStoragePasswordEncryption", Any(true));
@ -420,7 +420,7 @@ SmMLExportWrapper::WriteThroughComponentMS(const Reference<XComponent>& xCompone
// We don't want to read uninitialized data
if (!bOk)
return u"";
return u""_ustr;
// Recover data and generate string
OString aString(static_cast<const char*>(aMemoryStream.GetData()),
@ -501,7 +501,7 @@ ErrCode SmMLExport::exportDoc(enum XMLTokenEnum eClass)
// make use of a default namespace
// Math doesn't need namespaces from xmloff, since it now uses default namespaces
// Because that is common with current MathML usage in the web -> ResetNamespaceMap();
GetNamespaceMap_().Add(OUString(u""), GetXMLToken(XML_N_MATH), XML_NAMESPACE_MATH);
GetNamespaceMap_().Add(u""_ustr, GetXMLToken(XML_N_MATH), XML_NAMESPACE_MATH);
// Add xmlns line
if (m_bUseExportTag)

25
starmath/source/mathml/import.cxx
View File

@ -129,13 +129,13 @@ ErrCode SmMLImportWrapper::Import(SfxMedium& rMedium)
// Create property list
static const comphelper::PropertyMapEntry aInfoMap[]
= { { u"PrivateData", 0, cppu::UnoType<XInterface>::get(),
= { { u"PrivateData"_ustr, 0, cppu::UnoType<XInterface>::get(),
beans::PropertyAttribute::MAYBEVOID, 0 },
{ u"BaseURI", 0, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID,
0 },
{ u"StreamRelPath", 0, ::cppu::UnoType<OUString>::get(),
{ u"BaseURI"_ustr, 0, ::cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID, 0 },
{ u"StreamName", 0, ::cppu::UnoType<OUString>::get(),
{ u"StreamRelPath"_ustr, 0, ::cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID, 0 },
{ u"StreamName"_ustr, 0, ::cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID, 0 } };
uno::Reference<beans::XPropertySet> xInfoSet(
comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(aInfoMap)));
@ -159,7 +159,7 @@ ErrCode SmMLImportWrapper::Import(SfxMedium& rMedium)
// TODO/LATER: handle the case of embedded links gracefully
if (bEmbedded) // && !rMedium.GetStorage()->IsRoot() )
{
OUString aName(u"dummyObjName");
OUString aName(u"dummyObjName"_ustr);
const SfxStringItem* pDocHierarchItem
= rMedium.GetItemSet().GetItem(SID_DOC_HIERARCHICALNAME);
if (pDocHierarchItem != nullptr)
@ -325,13 +325,13 @@ ErrCode SmMLImportWrapper::Import(std::u16string_view aSource)
// Create property list
static const comphelper::PropertyMapEntry aInfoMap[]
= { { u"PrivateData", 0, cppu::UnoType<XInterface>::get(),
= { { u"PrivateData"_ustr, 0, cppu::UnoType<XInterface>::get(),
beans::PropertyAttribute::MAYBEVOID, 0 },
{ u"BaseURI", 0, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID,
0 },
{ u"StreamRelPath", 0, ::cppu::UnoType<OUString>::get(),
{ u"BaseURI"_ustr, 0, ::cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID, 0 },
{ u"StreamName", 0, ::cppu::UnoType<OUString>::get(),
{ u"StreamRelPath"_ustr, 0, ::cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID, 0 },
{ u"StreamName"_ustr, 0, ::cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID, 0 } };
uno::Reference<beans::XPropertySet> xInfoSet(
comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(aInfoMap)));
@ -1031,7 +1031,8 @@ void SmMLImportContext::handleAttributes(const Reference<XFastAttributeList>& aA
if (IsXMLToken(aIter, XML_INFINITY))
{
aMaxsize.m_aMaxsize = SmMlAttributeValueMaxsize::MlInfinity;
aMaxsize.m_aLengthValue = { SmLengthUnit::MlP, 10000, new OUString(u"10000%") };
aMaxsize.m_aLengthValue
= { SmLengthUnit::MlP, 10000, new OUString(u"10000%"_ustr) };
}
else
{

2201
starmath/source/mathml/mathmlMo.cxx
View File

File diff suppressed because it is too large Load Diff

42
starmath/source/mathml/mathmlimport.cxx
View File

@ -605,7 +605,7 @@ void SmXMLContext_Helper::ApplyAttrs()
return;
SmToken aToken;
aToken.cMathChar = u"";
aToken.cMathChar = u""_ustr;
aToken.nLevel = 5;
if (nIsBold != -1)
@ -795,7 +795,7 @@ void SmXMLTokenAttrHelper::ApplyAttrs(MathMLMathvariantValue eDefaultMv)
{
SmToken aToken;
aToken.eType = eType;
aToken.cMathChar = u"";
aToken.cMathChar = u""_ustr;
aToken.nLevel = 5;
std::unique_ptr<SmFontNode> pFontNode(new SmFontNode(aToken));
pFontNode->SetSubNodes(nullptr, popOrZero(rNodeStack));
@ -991,7 +991,7 @@ void SmXMLPhantomContext_Impl::endFastElement(sal_Int32 nElement)
SmXMLRowContext_Impl::endFastElement(nElement);
SmToken aToken;
aToken.cMathChar = u"";
aToken.cMathChar = u""_ustr;
aToken.nLevel = 5;
aToken.eType = TPHANTOM;
@ -1053,7 +1053,7 @@ void SmXMLFencedContext_Impl::startFastElement(
void SmXMLFencedContext_Impl::endFastElement(sal_Int32 /*nElement*/)
{
SmToken aToken;
aToken.cMathChar = u"";
aToken.cMathChar = u""_ustr;
aToken.aText = ",";
aToken.nLevel = 5;
@ -1075,7 +1075,7 @@ void SmXMLFencedContext_Impl::endFastElement(sal_Int32 /*nElement*/)
SmNodeArray aRelationArray;
SmNodeStack& rNodeStack = GetSmImport().GetNodeStack();
aToken.cMathChar = u"";
aToken.cMathChar = u""_ustr;
aToken.eType = TIDENT;
auto i = rNodeStack.size() - nElementCount;
@ -1143,7 +1143,7 @@ public:
SmXMLNumberContext_Impl(SmXMLImport& rImport)
: SmXMLImportContext(rImport)
{
aToken.cMathChar = u"";
aToken.cMathChar = u""_ustr;
aToken.nLevel = 5;
aToken.eType = TNUMBER;
}
@ -1220,7 +1220,7 @@ public:
SmXMLTextContext_Impl(SmXMLImport& rImport)
: SmXMLImportContext(rImport)
{
aToken.cMathChar = u"";
aToken.cMathChar = u""_ustr;
aToken.nLevel = 5;
aToken.eType = TTEXT;
}
@ -1249,7 +1249,7 @@ public:
SmXMLStringContext_Impl(SmXMLImport& rImport)
: SmXMLImportContext(rImport)
{
aToken.cMathChar = u"";
aToken.cMathChar = u""_ustr;
aToken.nLevel = 5;
aToken.eType = TTEXT;
}
@ -1294,7 +1294,7 @@ public:
, maTokenAttrHelper(*this)
, aStyleHelper(*this)
{
aToken.cMathChar = u"";
aToken.cMathChar = u""_ustr;
aToken.nLevel = 5;
aToken.eType = TIDENT;
}
@ -1508,7 +1508,7 @@ void SmXMLSpaceContext_Impl::startFastElement(
}
SmToken aToken;
aToken.eType = TBLANK;
aToken.cMathChar = u"";
aToken.cMathChar = u""_ustr;
aToken.nGroup = TG::Blank;
aToken.nLevel = 5;
std::unique_ptr<SmBlankNode> pBlank(new SmBlankNode(aToken));
@ -1548,7 +1548,7 @@ void SmXMLSubContext_Impl::GenericEndElement(SmTokenType eType, SmSubSup eSubSup
return;
SmToken aToken;
aToken.cMathChar = u"";
aToken.cMathChar = u""_ustr;
aToken.eType = eType;
std::unique_ptr<SmSubSupNode> pNode(new SmSubSupNode(aToken));
SmNodeStack& rNodeStack = GetSmImport().GetNodeStack();
@ -1602,7 +1602,7 @@ void SmXMLSubSupContext_Impl::GenericEndElement(SmTokenType eType, SmSubSup aSub
return;
SmToken aToken;
aToken.cMathChar = u"";
aToken.cMathChar = u""_ustr;
aToken.eType = eType;
std::unique_ptr<SmSubSupNode> pNode(new SmSubSupNode(aToken));
SmNodeStack& rNodeStack = GetSmImport().GetNodeStack();
@ -1660,7 +1660,7 @@ void SmXMLUnderContext_Impl::HandleAccent()
SmNodeStack& rNodeStack = GetSmImport().GetNodeStack();
std::unique_ptr<SmNode> pTest = popOrZero(rNodeStack);
SmToken aToken;
aToken.cMathChar = u"";
aToken.cMathChar = u""_ustr;
aToken.eType = TUNDERLINE;
std::unique_ptr<SmNode> pFirst;
@ -1731,7 +1731,7 @@ void SmXMLOverContext_Impl::HandleAccent()
return;
SmToken aToken;
aToken.cMathChar = u"";
aToken.cMathChar = u""_ustr;
aToken.eType = TACUTE;
std::unique_ptr<SmAttributeNode> pNode(new SmAttributeNode(aToken));
@ -1790,7 +1790,7 @@ public:
void SmXMLNoneContext_Impl::endFastElement(sal_Int32)
{
SmToken aToken;
aToken.cMathChar = u"";
aToken.cMathChar = u""_ustr;
aToken.aText.clear();
aToken.nLevel = 5;
aToken.eType = TIDENT;
@ -2055,7 +2055,7 @@ void SmXMLFracContext_Impl::endFastElement(sal_Int32)
return;
SmToken aToken;
aToken.cMathChar = u"";
aToken.cMathChar = u""_ustr;
aToken.eType = TFRAC;
std::unique_ptr<SmStructureNode> pSNode(new SmBinVerNode(aToken));
std::unique_ptr<SmNode> pOper(new SmRectangleNode(aToken));
@ -2133,7 +2133,7 @@ void SmXMLRowContext_Impl::endFastElement(sal_Int32)
&& (aRelationArray[nSize - 1]->GetType() == SmNodeType::Math)))
{
SmToken aToken;
aToken.cMathChar = u"";
aToken.cMathChar = u""_ustr;
aToken.nLevel = 5;
int nLeft = 0, nRight = 0;
@ -2144,7 +2144,7 @@ void SmXMLRowContext_Impl::endFastElement(sal_Int32)
nLeft = 1;
}
else
aToken.cMathChar = u"";
aToken.cMathChar = u""_ustr;
aToken.eType = TLPARENT;
std::unique_ptr<SmNode> pLeft(new SmMathSymbolNode(aToken));
@ -2156,7 +2156,7 @@ void SmXMLRowContext_Impl::endFastElement(sal_Int32)
nRight = 1;
}
else
aToken.cMathChar = u"";
aToken.cMathChar = u""_ustr;
aToken.eType = TRPARENT;
std::unique_ptr<SmNode> pRight(new SmMathSymbolNode(aToken));
@ -2312,7 +2312,7 @@ void SmXMLMultiScriptsContext_Impl::ProcessSubSupPairs(bool bIsPrescript)
if (nCount % 2 == 0)
{
SmToken aToken;
aToken.cMathChar = u"";
aToken.cMathChar = u""_ustr;
aToken.eType = bIsPrescript ? TLSUB : TRSUB;
SmNodeStack aReverseStack;
@ -2420,7 +2420,7 @@ void SmXMLTableContext_Impl::endFastElement(sal_Int32)
aReverseStack.clear();
SmToken aToken;
aToken.cMathChar = u"";
aToken.cMathChar = u""_ustr;
aToken.eType = TMATRIX;
std::unique_ptr<SmMatrixNode> pSNode(new SmMatrixNode(aToken));
pSNode->SetSubNodes(std::move(aExpressionArray));

4254
starmath/source/mathml/xparsmlbase.cxx
View File

File diff suppressed because it is too large Load Diff

538
starmath/source/parse5.cxx
View File

@ -39,255 +39,255 @@ using namespace ::com::sun::star::i18n;
//Definition of math keywords
const SmTokenTableEntry aTokenTable[]
= { { u"abs", TABS, '\0', TG::UnOper, 13 },
{ u"acute", TACUTE, MS_ACUTE, TG::Attribute, 5 },
{ u"aleph", TALEPH, MS_ALEPH, TG::Standalone, 5 },
{ u"alignb", TALIGNC, '\0', TG::Align, 0 },
{ u"alignc", TALIGNC, '\0', TG::Align, 0 },
{ u"alignl", TALIGNL, '\0', TG::Align, 0 },
{ u"alignm", TALIGNC, '\0', TG::Align, 0 },
{ u"alignr", TALIGNR, '\0', TG::Align, 0 },
{ u"alignt", TALIGNC, '\0', TG::Align, 0 },
{ u"and", TAND, MS_AND, TG::Product, 0 },
{ u"approx", TAPPROX, MS_APPROX, TG::Relation, 0 },
{ u"arccos", TACOS, '\0', TG::Function, 5 },
{ u"arccot", TACOT, '\0', TG::Function, 5 },
{ u"arcosh", TACOSH, '\0', TG::Function, 5 },
{ u"arcoth", TACOTH, '\0', TG::Function, 5 },
{ u"arcsin", TASIN, '\0', TG::Function, 5 },
{ u"arctan", TATAN, '\0', TG::Function, 5 },
{ u"arsinh", TASINH, '\0', TG::Function, 5 },
{ u"artanh", TATANH, '\0', TG::Function, 5 },
{ u"backepsilon", TBACKEPSILON, MS_BACKEPSILON, TG::Standalone, 5 },
{ u"bar", TBAR, MS_BAR, TG::Attribute, 5 },
{ u"binom", TBINOM, '\0', TG::NONE, 5 },
{ u"bold", TBOLD, '\0', TG::FontAttr, 5 },
{ u"boper", TBOPER, '\0', TG::Product, 0 },
{ u"breve", TBREVE, MS_BREVE, TG::Attribute, 5 },
{ u"bslash", TBACKSLASH, MS_BACKSLASH, TG::Product, 0 },
{ u"cdot", TCDOT, MS_CDOT, TG::Product, 0 },
{ u"check", TCHECK, MS_CHECK, TG::Attribute, 5 },
{ u"circ", TCIRC, MS_CIRC, TG::Standalone, 5 },
{ u"circle", TCIRCLE, MS_CIRCLE, TG::Attribute, 5 },
{ u"color", TCOLOR, '\0', TG::FontAttr, 5 },
{ u"coprod", TCOPROD, MS_COPROD, TG::Oper, 5 },
{ u"cos", TCOS, '\0', TG::Function, 5 },
{ u"cosh", TCOSH, '\0', TG::Function, 5 },
{ u"cot", TCOT, '\0', TG::Function, 5 },
{ u"coth", TCOTH, '\0', TG::Function, 5 },
{ u"csub", TCSUB, '\0', TG::Power, 0 },
{ u"csup", TCSUP, '\0', TG::Power, 0 },
{ u"dddot", TDDDOT, MS_DDDOT, TG::Attribute, 5 },
{ u"ddot", TDDOT, MS_DDOT, TG::Attribute, 5 },
{ u"def", TDEF, MS_DEF, TG::Relation, 0 },
{ u"div", TDIV, MS_DIV, TG::Product, 0 },
{ u"divides", TDIVIDES, MS_LINE, TG::Relation, 0 },
{ u"dlarrow", TDLARROW, MS_DLARROW, TG::Standalone, 5 },
{ u"dlrarrow", TDLRARROW, MS_DLRARROW, TG::Standalone, 5 },
{ u"dot", TDOT, MS_DOT, TG::Attribute, 5 },
{ u"dotsaxis", TDOTSAXIS, MS_DOTSAXIS, TG::Standalone, 5 }, // 5 to continue expression
{ u"dotsdiag", TDOTSDIAG, MS_DOTSUP, TG::Standalone, 5 },
{ u"dotsdown", TDOTSDOWN, MS_DOTSDOWN, TG::Standalone, 5 },
{ u"dotslow", TDOTSLOW, MS_DOTSLOW, TG::Standalone, 5 },
{ u"dotsup", TDOTSUP, MS_DOTSUP, TG::Standalone, 5 },
{ u"dotsvert", TDOTSVERT, MS_DOTSVERT, TG::Standalone, 5 },
{ u"downarrow", TDOWNARROW, MS_DOWNARROW, TG::Standalone, 5 },
{ u"drarrow", TDRARROW, MS_DRARROW, TG::Standalone, 5 },
{ u"emptyset", TEMPTYSET, MS_EMPTYSET, TG::Standalone, 5 },
{ u"equiv", TEQUIV, MS_EQUIV, TG::Relation, 0 },
{ u"evaluate", TEVALUATE, '\0', TG::NONE, 0 },
{ u"exists", TEXISTS, MS_EXISTS, TG::Standalone, 5 },
{ u"exp", TEXP, '\0', TG::Function, 5 },
{ u"fact", TFACT, MS_FACT, TG::UnOper, 5 },
{ u"fixed", TFIXED, '\0', TG::Font, 0 },
{ u"font", TFONT, '\0', TG::FontAttr, 5 },
{ u"forall", TFORALL, MS_FORALL, TG::Standalone, 5 },
{ u"fourier", TFOURIER, MS_FOURIER, TG::Standalone, 5 },
{ u"frac", TFRAC, '\0', TG::NONE, 5 },
{ u"from", TFROM, '\0', TG::Limit, 0 },
{ u"func", TFUNC, '\0', TG::Function, 5 },
{ u"ge", TGE, MS_GE, TG::Relation, 0 },
{ u"geslant", TGESLANT, MS_GESLANT, TG::Relation, 0 },
{ u"gg", TGG, MS_GG, TG::Relation, 0 },
{ u"grave", TGRAVE, MS_GRAVE, TG::Attribute, 5 },
{ u"gt", TGT, MS_GT, TG::Relation, 0 },
{ u"hadd", THADD, MS_HADD, TG::Oper, 5 },
{ u"harpoon", THARPOON, MS_HARPOON, TG::Attribute, 5 },
{ u"hat", THAT, MS_HAT, TG::Attribute, 5 },
{ u"hbar", THBAR, MS_HBAR, TG::Standalone, 5 },
{ u"hex", THEX, '\0', TG::NONE, 5 },
{ u"iiint", TIIINT, MS_IIINT, TG::Oper, 5 },
{ u"iint", TIINT, MS_IINT, TG::Oper, 5 },
{ u"im", TIM, MS_IM, TG::Standalone, 5 },
{ u"in", TIN, MS_IN, TG::Relation, 0 },
{ u"infinity", TINFINITY, MS_INFINITY, TG::Standalone, 5 },
{ u"infty", TINFINITY, MS_INFINITY, TG::Standalone, 5 },
{ u"int", TINT, MS_INT, TG::Oper, 5 },
{ u"intd", TINTD, MS_INT, TG::Oper, 5 },
{ u"intersection", TINTERSECT, MS_INTERSECT, TG::Product, 0 },
{ u"it", TIT, '\0', TG::Product, 0 },
{ u"ital", TITALIC, '\0', TG::FontAttr, 5 },
{ u"italic", TITALIC, '\0', TG::FontAttr, 5 },
{ u"lambdabar", TLAMBDABAR, MS_LAMBDABAR, TG::Standalone, 5 },
{ u"langle", TLANGLE, MS_LMATHANGLE, TG::LBrace, 5 },
{ u"laplace", TLAPLACE, MS_LAPLACE, TG::Standalone, 5 },
{ u"lbrace", TLBRACE, MS_LBRACE, TG::LBrace, 5 },
{ u"lceil", TLCEIL, MS_LCEIL, TG::LBrace, 5 },
{ u"ldbracket", TLDBRACKET, MS_LDBRACKET, TG::LBrace, 5 },
{ u"ldline", TLDLINE, MS_DVERTLINE, TG::LBrace, 5 },
{ u"le", TLE, MS_LE, TG::Relation, 0 },
{ u"left", TLEFT, '\0', TG::NONE, 5 },
{ u"leftarrow", TLEFTARROW, MS_LEFTARROW, TG::Standalone, 5 },
{ u"leslant", TLESLANT, MS_LESLANT, TG::Relation, 0 },
{ u"lfloor", TLFLOOR, MS_LFLOOR, TG::LBrace, 5 },
{ u"lim", TLIM, '\0', TG::Oper, 5 },
{ u"liminf", TLIMINF, '\0', TG::Oper, 5 },
{ u"limsup", TLIMSUP, '\0', TG::Oper, 5 },
{ u"lint", TLINT, MS_LINT, TG::Oper, 5 },
{ u"ll", TLL, MS_LL, TG::Relation, 0 },
{ u"lline", TLLINE, MS_VERTLINE, TG::LBrace, 5 },
{ u"llint", TLLINT, MS_LLINT, TG::Oper, 5 },
{ u"lllint", TLLLINT, MS_LLLINT, TG::Oper, 5 },
{ u"ln", TLN, '\0', TG::Function, 5 },
{ u"log", TLOG, '\0', TG::Function, 5 },
{ u"lrline", TLRLINE, MS_VERTLINE, TG::LBrace | TG::RBrace, 5 },
{ u"lrdline", TLRDLINE, MS_VERTLINE, TG::LBrace | TG::RBrace, 5 },
{ u"lsub", TLSUB, '\0', TG::Power, 0 },
{ u"lsup", TLSUP, '\0', TG::Power, 0 },
{ u"lt", TLT, MS_LT, TG::Relation, 0 },
{ u"maj", TSUM, MS_MAJ, TG::Oper, 5 },
{ u"matrix", TMATRIX, '\0', TG::NONE, 5 },
{ u"minusplus", TMINUSPLUS, MS_MINUSPLUS, TG::UnOper | TG::Sum, 5 },
{ u"mline", TMLINE, MS_VERTLINE, TG::NONE, 0 }, //! not in TG::RBrace, Level 0
{ u"nabla", TNABLA, MS_NABLA, TG::Standalone, 5 },
{ u"nbold", TNBOLD, '\0', TG::FontAttr, 5 },
{ u"ndivides", TNDIVIDES, MS_NDIVIDES, TG::Relation, 0 },
{ u"neg", TNEG, MS_NEG, TG::UnOper, 5 },
{ u"neq", TNEQ, MS_NEQ, TG::Relation, 0 },
{ u"newline", TNEWLINE, '\0', TG::NONE, 0 },
{ u"ni", TNI, MS_NI, TG::Relation, 0 },
{ u"nitalic", TNITALIC, '\0', TG::FontAttr, 5 },
{ u"none", TNONE, '\0', TG::LBrace | TG::RBrace, 0 },
{ u"nospace", TNOSPACE, '\0', TG::Standalone, 5 },
{ u"notexists", TNOTEXISTS, MS_NOTEXISTS, TG::Standalone, 5 },
{ u"notin", TNOTIN, MS_NOTIN, TG::Relation, 0 },
{ u"nprec", TNOTPRECEDES, MS_NOTPRECEDES, TG::Relation, 0 },
{ u"nroot", TNROOT, MS_SQRT, TG::UnOper, 5 },
{ u"nsubset", TNSUBSET, MS_NSUBSET, TG::Relation, 0 },
{ u"nsubseteq", TNSUBSETEQ, MS_NSUBSETEQ, TG::Relation, 0 },
{ u"nsucc", TNOTSUCCEEDS, MS_NOTSUCCEEDS, TG::Relation, 0 },
{ u"nsupset", TNSUPSET, MS_NSUPSET, TG::Relation, 0 },
{ u"nsupseteq", TNSUPSETEQ, MS_NSUPSETEQ, TG::Relation, 0 },
{ u"odivide", TODIVIDE, MS_ODIVIDE, TG::Product, 0 },
{ u"odot", TODOT, MS_ODOT, TG::Product, 0 },
{ u"ominus", TOMINUS, MS_OMINUS, TG::Sum, 0 },
{ u"oper", TOPER, '\0', TG::Oper, 5 },
{ u"oplus", TOPLUS, MS_OPLUS, TG::Sum, 0 },
{ u"or", TOR, MS_OR, TG::Sum, 0 },
{ u"ortho", TORTHO, MS_ORTHO, TG::Relation, 0 },
{ u"otimes", TOTIMES, MS_OTIMES, TG::Product, 0 },
{ u"over", TOVER, '\0', TG::Product, 0 },
{ u"overbrace", TOVERBRACE, MS_OVERBRACE, TG::Product, 5 },
{ u"overline", TOVERLINE, '\0', TG::Attribute, 5 },
{ u"overstrike", TOVERSTRIKE, '\0', TG::Attribute, 5 },
{ u"owns", TNI, MS_NI, TG::Relation, 0 },
{ u"parallel", TPARALLEL, MS_DLINE, TG::Relation, 0 },
{ u"partial", TPARTIAL, MS_PARTIAL, TG::Standalone, 5 },
{ u"phantom", TPHANTOM, '\0', TG::FontAttr, 5 },
{ u"plusminus", TPLUSMINUS, MS_PLUSMINUS, TG::UnOper | TG::Sum, 5 },
{ u"prec", TPRECEDES, MS_PRECEDES, TG::Relation, 0 },
{ u"preccurlyeq", TPRECEDESEQUAL, MS_PRECEDESEQUAL, TG::Relation, 0 },
{ u"precsim", TPRECEDESEQUIV, MS_PRECEDESEQUIV, TG::Relation, 0 },
{ u"prod", TPROD, MS_PROD, TG::Oper, 5 },
{ u"prop", TPROP, MS_PROP, TG::Relation, 0 },
{ u"rangle", TRANGLE, MS_RMATHANGLE, TG::RBrace, 0 }, //! 0 to terminate expression
{ u"rbrace", TRBRACE, MS_RBRACE, TG::RBrace, 0 },
{ u"rceil", TRCEIL, MS_RCEIL, TG::RBrace, 0 },
{ u"rdbracket", TRDBRACKET, MS_RDBRACKET, TG::RBrace, 0 },
{ u"rdline", TRDLINE, MS_DVERTLINE, TG::RBrace, 0 },
{ u"re", TRE, MS_RE, TG::Standalone, 5 },
{ u"rfloor", TRFLOOR, MS_RFLOOR, TG::RBrace, 0 }, //! 0 to terminate expression
{ u"right", TRIGHT, '\0', TG::NONE, 0 },
{ u"rightarrow", TRIGHTARROW, MS_RIGHTARROW, TG::Standalone, 5 },
{ u"rline", TRLINE, MS_VERTLINE, TG::RBrace, 0 }, //! 0 to terminate expression
{ u"rsub", TRSUB, '\0', TG::Power, 0 },
{ u"rsup", TRSUP, '\0', TG::Power, 0 },
{ u"sans", TSANS, '\0', TG::Font, 0 },
{ u"serif", TSERIF, '\0', TG::Font, 0 },
{ u"setC", TSETC, MS_SETC, TG::Standalone, 5 },
{ u"setminus", TSETMINUS, MS_BACKSLASH, TG::Product, 0 },
{ u"setN", TSETN, MS_SETN, TG::Standalone, 5 },
{ u"setQ", TSETQ, MS_SETQ, TG::Standalone, 5 },
{ u"setquotient", TSETQUOTIENT, MS_SLASH, TG::Product, 0 },
{ u"setR", TSETR, MS_SETR, TG::Standalone, 5 },
{ u"setZ", TSETZ, MS_SETZ, TG::Standalone, 5 },
{ u"sim", TSIM, MS_SIM, TG::Relation, 0 },
{ u"simeq", TSIMEQ, MS_SIMEQ, TG::Relation, 0 },
{ u"sin", TSIN, '\0', TG::Function, 5 },
{ u"sinh", TSINH, '\0', TG::Function, 5 },
{ u"size", TSIZE, '\0', TG::FontAttr, 5 },
{ u"slash", TSLASH, MS_SLASH, TG::Product, 0 },
{ u"sqrt", TSQRT, MS_SQRT, TG::UnOper, 5 },
{ u"stack", TSTACK, '\0', TG::NONE, 5 },
{ u"sub", TRSUB, '\0', TG::Power, 0 },
{ u"subset", TSUBSET, MS_SUBSET, TG::Relation, 0 },
{ u"subseteq", TSUBSETEQ, MS_SUBSETEQ, TG::Relation, 0 },
{ u"succ", TSUCCEEDS, MS_SUCCEEDS, TG::Relation, 0 },
{ u"succcurlyeq", TSUCCEEDSEQUAL, MS_SUCCEEDSEQUAL, TG::Relation, 0 },
{ u"succsim", TSUCCEEDSEQUIV, MS_SUCCEEDSEQUIV, TG::Relation, 0 },
{ u"sum", TSUM, MS_SUM, TG::Oper, 5 },
{ u"sup", TRSUP, '\0', TG::Power, 0 },
{ u"supset", TSUPSET, MS_SUPSET, TG::Relation, 0 },
{ u"supseteq", TSUPSETEQ, MS_SUPSETEQ, TG::Relation, 0 },
{ u"tan", TTAN, '\0', TG::Function, 5 },
{ u"tanh", TTANH, '\0', TG::Function, 5 },
{ u"tilde", TTILDE, MS_TILDE, TG::Attribute, 5 },
{ u"times", TTIMES, MS_TIMES, TG::Product, 0 },
{ u"to", TTO, '\0', TG::Limit, 0 },
{ u"toward", TTOWARD, MS_RIGHTARROW, TG::Relation, 0 },
{ u"transl", TTRANSL, MS_TRANSL, TG::Relation, 0 },
{ u"transr", TTRANSR, MS_TRANSR, TG::Relation, 0 },
{ u"underbrace", TUNDERBRACE, MS_UNDERBRACE, TG::Product, 5 },
{ u"underline", TUNDERLINE, '\0', TG::Attribute, 5 },
{ u"union", TUNION, MS_UNION, TG::Sum, 0 },
{ u"uoper", TUOPER, '\0', TG::UnOper, 5 },
{ u"uparrow", TUPARROW, MS_UPARROW, TG::Standalone, 5 },
{ u"vec", TVEC, MS_VEC, TG::Attribute, 5 },
{ u"widebslash", TWIDEBACKSLASH, MS_BACKSLASH, TG::Product, 0 },
{ u"wideharpoon", TWIDEHARPOON, MS_HARPOON, TG::Attribute, 5 },
{ u"widehat", TWIDEHAT, MS_HAT, TG::Attribute, 5 },
{ u"wideslash", TWIDESLASH, MS_SLASH, TG::Product, 0 },
{ u"widetilde", TWIDETILDE, MS_TILDE, TG::Attribute, 5 },
{ u"widevec", TWIDEVEC, MS_VEC, TG::Attribute, 5 },
{ u"wp", TWP, MS_WP, TG::Standalone, 5 },
{ u"جا", TSIN, '\0', TG::Function, 5 },
{ u"جاز", TSINH, '\0', TG::Function, 5 },
{ u"جتا", TCOS, '\0', TG::Function, 5 },
{ u"جتاز", TCOSH, '\0', TG::Function, 5 },
{ u"حا", TSIN, '\0', TG::Function, 5 },
{ u"حاز", TSINH, '\0', TG::Function, 5 },
{ u"حتا", TCOS, '\0', TG::Function, 5 },
{ u"حتاز", TCOSH, '\0', TG::Function, 5 },
{ u"حد", THADD, MS_HADD, TG::Oper, 5 },
{ u"طا", TTAN, '\0', TG::Function, 5 },
{ u"طاز", TTANH, '\0', TG::Function, 5 },
{ u"طتا", TCOT, '\0', TG::Function, 5 },
{ u"طتاز", TCOTH, '\0', TG::Function, 5 },
{ u"ظا", TTAN, '\0', TG::Function, 5 },
{ u"ظاز", TTANH, '\0', TG::Function, 5 },
{ u"ظتا", TCOT, '\0', TG::Function, 5 },
{ u"ظتاز", TCOTH, '\0', TG::Function, 5 },
{ u"قا", TSEC, '\0', TG::Function, 5 },
{ u"قاز", TSECH, '\0', TG::Function, 5 },
{ u"قتا", TCSC, '\0', TG::Function, 5 },
{ u"قتاز", TCSCH, '\0', TG::Function, 5 },
{ u"لو", TLOG, '\0', TG::Function, 5 },
{ u"مجـ", TSUM, MS_MAJ, TG::Oper, 5 },
{ u"نها", TNAHA, '\0', TG::Oper, 5 },
{ u"ٯا", TSEC, '\0', TG::Function, 5 },
{ u"ٯاز", TSECH, '\0', TG::Function, 5 },
{ u"ٯتا", TCSC, '\0', TG::Function, 5 },
{ u"ٯتاز", TCSCH, '\0', TG::Function, 5 } };
= { { u"abs"_ustr, TABS, '\0', TG::UnOper, 13 },
{ u"acute"_ustr, TACUTE, MS_ACUTE, TG::Attribute, 5 },
{ u"aleph"_ustr, TALEPH, MS_ALEPH, TG::Standalone, 5 },
{ u"alignb"_ustr, TALIGNC, '\0', TG::Align, 0 },
{ u"alignc"_ustr, TALIGNC, '\0', TG::Align, 0 },
{ u"alignl"_ustr, TALIGNL, '\0', TG::Align, 0 },
{ u"alignm"_ustr, TALIGNC, '\0', TG::Align, 0 },
{ u"alignr"_ustr, TALIGNR, '\0', TG::Align, 0 },
{ u"alignt"_ustr, TALIGNC, '\0', TG::Align, 0 },
{ u"and"_ustr, TAND, MS_AND, TG::Product, 0 },
{ u"approx"_ustr, TAPPROX, MS_APPROX, TG::Relation, 0 },
{ u"arccos"_ustr, TACOS, '\0', TG::Function, 5 },
{ u"arccot"_ustr, TACOT, '\0', TG::Function, 5 },
{ u"arcosh"_ustr, TACOSH, '\0', TG::Function, 5 },
{ u"arcoth"_ustr, TACOTH, '\0', TG::Function, 5 },
{ u"arcsin"_ustr, TASIN, '\0', TG::Function, 5 },
{ u"arctan"_ustr, TATAN, '\0', TG::Function, 5 },
{ u"arsinh"_ustr, TASINH, '\0', TG::Function, 5 },
{ u"artanh"_ustr, TATANH, '\0', TG::Function, 5 },
{ u"backepsilon"_ustr, TBACKEPSILON, MS_BACKEPSILON, TG::Standalone, 5 },
{ u"bar"_ustr, TBAR, MS_BAR, TG::Attribute, 5 },
{ u"binom"_ustr, TBINOM, '\0', TG::NONE, 5 },
{ u"bold"_ustr, TBOLD, '\0', TG::FontAttr, 5 },
{ u"boper"_ustr, TBOPER, '\0', TG::Product, 0 },
{ u"breve"_ustr, TBREVE, MS_BREVE, TG::Attribute, 5 },
{ u"bslash"_ustr, TBACKSLASH, MS_BACKSLASH, TG::Product, 0 },
{ u"cdot"_ustr, TCDOT, MS_CDOT, TG::Product, 0 },
{ u"check"_ustr, TCHECK, MS_CHECK, TG::Attribute, 5 },
{ u"circ"_ustr, TCIRC, MS_CIRC, TG::Standalone, 5 },
{ u"circle"_ustr, TCIRCLE, MS_CIRCLE, TG::Attribute, 5 },
{ u"color"_ustr, TCOLOR, '\0', TG::FontAttr, 5 },
{ u"coprod"_ustr, TCOPROD, MS_COPROD, TG::Oper, 5 },
{ u"cos"_ustr, TCOS, '\0', TG::Function, 5 },
{ u"cosh"_ustr, TCOSH, '\0', TG::Function, 5 },
{ u"cot"_ustr, TCOT, '\0', TG::Function, 5 },
{ u"coth"_ustr, TCOTH, '\0', TG::Function, 5 },
{ u"csub"_ustr, TCSUB, '\0', TG::Power, 0 },
{ u"csup"_ustr, TCSUP, '\0', TG::Power, 0 },
{ u"dddot"_ustr, TDDDOT, MS_DDDOT, TG::Attribute, 5 },
{ u"ddot"_ustr, TDDOT, MS_DDOT, TG::Attribute, 5 },
{ u"def"_ustr, TDEF, MS_DEF, TG::Relation, 0 },
{ u"div"_ustr, TDIV, MS_DIV, TG::Product, 0 },
{ u"divides"_ustr, TDIVIDES, MS_LINE, TG::Relation, 0 },
{ u"dlarrow"_ustr, TDLARROW, MS_DLARROW, TG::Standalone, 5 },
{ u"dlrarrow"_ustr, TDLRARROW, MS_DLRARROW, TG::Standalone, 5 },
{ u"dot"_ustr, TDOT, MS_DOT, TG::Attribute, 5 },
{ u"dotsaxis"_ustr, TDOTSAXIS, MS_DOTSAXIS, TG::Standalone, 5 }, // 5 to continue expression
{ u"dotsdiag"_ustr, TDOTSDIAG, MS_DOTSUP, TG::Standalone, 5 },
{ u"dotsdown"_ustr, TDOTSDOWN, MS_DOTSDOWN, TG::Standalone, 5 },
{ u"dotslow"_ustr, TDOTSLOW, MS_DOTSLOW, TG::Standalone, 5 },
{ u"dotsup"_ustr, TDOTSUP, MS_DOTSUP, TG::Standalone, 5 },
{ u"dotsvert"_ustr, TDOTSVERT, MS_DOTSVERT, TG::Standalone, 5 },
{ u"downarrow"_ustr, TDOWNARROW, MS_DOWNARROW, TG::Standalone, 5 },
{ u"drarrow"_ustr, TDRARROW, MS_DRARROW, TG::Standalone, 5 },
{ u"emptyset"_ustr, TEMPTYSET, MS_EMPTYSET, TG::Standalone, 5 },
{ u"equiv"_ustr, TEQUIV, MS_EQUIV, TG::Relation, 0 },
{ u"evaluate"_ustr, TEVALUATE, '\0', TG::NONE, 0 },
{ u"exists"_ustr, TEXISTS, MS_EXISTS, TG::Standalone, 5 },
{ u"exp"_ustr, TEXP, '\0', TG::Function, 5 },
{ u"fact"_ustr, TFACT, MS_FACT, TG::UnOper, 5 },
{ u"fixed"_ustr, TFIXED, '\0', TG::Font, 0 },
{ u"font"_ustr, TFONT, '\0', TG::FontAttr, 5 },
{ u"forall"_ustr, TFORALL, MS_FORALL, TG::Standalone, 5 },
{ u"fourier"_ustr, TFOURIER, MS_FOURIER, TG::Standalone, 5 },
{ u"frac"_ustr, TFRAC, '\0', TG::NONE, 5 },
{ u"from"_ustr, TFROM, '\0', TG::Limit, 0 },
{ u"func"_ustr, TFUNC, '\0', TG::Function, 5 },
{ u"ge"_ustr, TGE, MS_GE, TG::Relation, 0 },
{ u"geslant"_ustr, TGESLANT, MS_GESLANT, TG::Relation, 0 },
{ u"gg"_ustr, TGG, MS_GG, TG::Relation, 0 },
{ u"grave"_ustr, TGRAVE, MS_GRAVE, TG::Attribute, 5 },
{ u"gt"_ustr, TGT, MS_GT, TG::Relation, 0 },
{ u"hadd"_ustr, THADD, MS_HADD, TG::Oper, 5 },
{ u"harpoon"_ustr, THARPOON, MS_HARPOON, TG::Attribute, 5 },
{ u"hat"_ustr, THAT, MS_HAT, TG::Attribute, 5 },
{ u"hbar"_ustr, THBAR, MS_HBAR, TG::Standalone, 5 },
{ u"hex"_ustr, THEX, '\0', TG::NONE, 5 },
{ u"iiint"_ustr, TIIINT, MS_IIINT, TG::Oper, 5 },
{ u"iint"_ustr, TIINT, MS_IINT, TG::Oper, 5 },
{ u"im"_ustr, TIM, MS_IM, TG::Standalone, 5 },
{ u"in"_ustr, TIN, MS_IN, TG::Relation, 0 },
{ u"infinity"_ustr, TINFINITY, MS_INFINITY, TG::Standalone, 5 },
{ u"infty"_ustr, TINFINITY, MS_INFINITY, TG::Standalone, 5 },
{ u"int"_ustr, TINT, MS_INT, TG::Oper, 5 },
{ u"intd"_ustr, TINTD, MS_INT, TG::Oper, 5 },
{ u"intersection"_ustr, TINTERSECT, MS_INTERSECT, TG::Product, 0 },
{ u"it"_ustr, TIT, '\0', TG::Product, 0 },
{ u"ital"_ustr, TITALIC, '\0', TG::FontAttr, 5 },
{ u"italic"_ustr, TITALIC, '\0', TG::FontAttr, 5 },
{ u"lambdabar"_ustr, TLAMBDABAR, MS_LAMBDABAR, TG::Standalone, 5 },
{ u"langle"_ustr, TLANGLE, MS_LMATHANGLE, TG::LBrace, 5 },
{ u"laplace"_ustr, TLAPLACE, MS_LAPLACE, TG::Standalone, 5 },
{ u"lbrace"_ustr, TLBRACE, MS_LBRACE, TG::LBrace, 5 },
{ u"lceil"_ustr, TLCEIL, MS_LCEIL, TG::LBrace, 5 },
{ u"ldbracket"_ustr, TLDBRACKET, MS_LDBRACKET, TG::LBrace, 5 },
{ u"ldline"_ustr, TLDLINE, MS_DVERTLINE, TG::LBrace, 5 },
{ u"le"_ustr, TLE, MS_LE, TG::Relation, 0 },
{ u"left"_ustr, TLEFT, '\0', TG::NONE, 5 },
{ u"leftarrow"_ustr, TLEFTARROW, MS_LEFTARROW, TG::Standalone, 5 },
{ u"leslant"_ustr, TLESLANT, MS_LESLANT, TG::Relation, 0 },
{ u"lfloor"_ustr, TLFLOOR, MS_LFLOOR, TG::LBrace, 5 },
{ u"lim"_ustr, TLIM, '\0', TG::Oper, 5 },
{ u"liminf"_ustr, TLIMINF, '\0', TG::Oper, 5 },
{ u"limsup"_ustr, TLIMSUP, '\0', TG::Oper, 5 },
{ u"lint"_ustr, TLINT, MS_LINT, TG::Oper, 5 },
{ u"ll"_ustr, TLL, MS_LL, TG::Relation, 0 },
{ u"lline"_ustr, TLLINE, MS_VERTLINE, TG::LBrace, 5 },
{ u"llint"_ustr, TLLINT, MS_LLINT, TG::Oper, 5 },
{ u"lllint"_ustr, TLLLINT, MS_LLLINT, TG::Oper, 5 },
{ u"ln"_ustr, TLN, '\0', TG::Function, 5 },
{ u"log"_ustr, TLOG, '\0', TG::Function, 5 },
{ u"lrline"_ustr, TLRLINE, MS_VERTLINE, TG::LBrace | TG::RBrace, 5 },
{ u"lrdline"_ustr, TLRDLINE, MS_VERTLINE, TG::LBrace | TG::RBrace, 5 },
{ u"lsub"_ustr, TLSUB, '\0', TG::Power, 0 },
{ u"lsup"_ustr, TLSUP, '\0', TG::Power, 0 },
{ u"lt"_ustr, TLT, MS_LT, TG::Relation, 0 },
{ u"maj"_ustr, TSUM, MS_MAJ, TG::Oper, 5 },
{ u"matrix"_ustr, TMATRIX, '\0', TG::NONE, 5 },
{ u"minusplus"_ustr, TMINUSPLUS, MS_MINUSPLUS, TG::UnOper | TG::Sum, 5 },
{ u"mline"_ustr, TMLINE, MS_VERTLINE, TG::NONE, 0 }, //! not in TG::RBrace, Level 0
{ u"nabla"_ustr, TNABLA, MS_NABLA, TG::Standalone, 5 },
{ u"nbold"_ustr, TNBOLD, '\0', TG::FontAttr, 5 },
{ u"ndivides"_ustr, TNDIVIDES, MS_NDIVIDES, TG::Relation, 0 },
{ u"neg"_ustr, TNEG, MS_NEG, TG::UnOper, 5 },
{ u"neq"_ustr, TNEQ, MS_NEQ, TG::Relation, 0 },
{ u"newline"_ustr, TNEWLINE, '\0', TG::NONE, 0 },
{ u"ni"_ustr, TNI, MS_NI, TG::Relation, 0 },
{ u"nitalic"_ustr, TNITALIC, '\0', TG::FontAttr, 5 },
{ u"none"_ustr, TNONE, '\0', TG::LBrace | TG::RBrace, 0 },
{ u"nospace"_ustr, TNOSPACE, '\0', TG::Standalone, 5 },
{ u"notexists"_ustr, TNOTEXISTS, MS_NOTEXISTS, TG::Standalone, 5 },
{ u"notin"_ustr, TNOTIN, MS_NOTIN, TG::Relation, 0 },
{ u"nprec"_ustr, TNOTPRECEDES, MS_NOTPRECEDES, TG::Relation, 0 },
{ u"nroot"_ustr, TNROOT, MS_SQRT, TG::UnOper, 5 },
{ u"nsubset"_ustr, TNSUBSET, MS_NSUBSET, TG::Relation, 0 },
{ u"nsubseteq"_ustr, TNSUBSETEQ, MS_NSUBSETEQ, TG::Relation, 0 },
{ u"nsucc"_ustr, TNOTSUCCEEDS, MS_NOTSUCCEEDS, TG::Relation, 0 },
{ u"nsupset"_ustr, TNSUPSET, MS_NSUPSET, TG::Relation, 0 },
{ u"nsupseteq"_ustr, TNSUPSETEQ, MS_NSUPSETEQ, TG::Relation, 0 },
{ u"odivide"_ustr, TODIVIDE, MS_ODIVIDE, TG::Product, 0 },
{ u"odot"_ustr, TODOT, MS_ODOT, TG::Product, 0 },
{ u"ominus"_ustr, TOMINUS, MS_OMINUS, TG::Sum, 0 },
{ u"oper"_ustr, TOPER, '\0', TG::Oper, 5 },
{ u"oplus"_ustr, TOPLUS, MS_OPLUS, TG::Sum, 0 },
{ u"or"_ustr, TOR, MS_OR, TG::Sum, 0 },
{ u"ortho"_ustr, TORTHO, MS_ORTHO, TG::Relation, 0 },
{ u"otimes"_ustr, TOTIMES, MS_OTIMES, TG::Product, 0 },
{ u"over"_ustr, TOVER, '\0', TG::Product, 0 },
{ u"overbrace"_ustr, TOVERBRACE, MS_OVERBRACE, TG::Product, 5 },
{ u"overline"_ustr, TOVERLINE, '\0', TG::Attribute, 5 },
{ u"overstrike"_ustr, TOVERSTRIKE, '\0', TG::Attribute, 5 },
{ u"owns"_ustr, TNI, MS_NI, TG::Relation, 0 },
{ u"parallel"_ustr, TPARALLEL, MS_DLINE, TG::Relation, 0 },
{ u"partial"_ustr, TPARTIAL, MS_PARTIAL, TG::Standalone, 5 },
{ u"phantom"_ustr, TPHANTOM, '\0', TG::FontAttr, 5 },
{ u"plusminus"_ustr, TPLUSMINUS, MS_PLUSMINUS, TG::UnOper | TG::Sum, 5 },
{ u"prec"_ustr, TPRECEDES, MS_PRECEDES, TG::Relation, 0 },
{ u"preccurlyeq"_ustr, TPRECEDESEQUAL, MS_PRECEDESEQUAL, TG::Relation, 0 },
{ u"precsim"_ustr, TPRECEDESEQUIV, MS_PRECEDESEQUIV, TG::Relation, 0 },
{ u"prod"_ustr, TPROD, MS_PROD, TG::Oper, 5 },
{ u"prop"_ustr, TPROP, MS_PROP, TG::Relation, 0 },
{ u"rangle"_ustr, TRANGLE, MS_RMATHANGLE, TG::RBrace, 0 }, //! 0 to terminate expression
{ u"rbrace"_ustr, TRBRACE, MS_RBRACE, TG::RBrace, 0 },
{ u"rceil"_ustr, TRCEIL, MS_RCEIL, TG::RBrace, 0 },
{ u"rdbracket"_ustr, TRDBRACKET, MS_RDBRACKET, TG::RBrace, 0 },
{ u"rdline"_ustr, TRDLINE, MS_DVERTLINE, TG::RBrace, 0 },
{ u"re"_ustr, TRE, MS_RE, TG::Standalone, 5 },
{ u"rfloor"_ustr, TRFLOOR, MS_RFLOOR, TG::RBrace, 0 }, //! 0 to terminate expression
{ u"right"_ustr, TRIGHT, '\0', TG::NONE, 0 },
{ u"rightarrow"_ustr, TRIGHTARROW, MS_RIGHTARROW, TG::Standalone, 5 },
{ u"rline"_ustr, TRLINE, MS_VERTLINE, TG::RBrace, 0 }, //! 0 to terminate expression
{ u"rsub"_ustr, TRSUB, '\0', TG::Power, 0 },
{ u"rsup"_ustr, TRSUP, '\0', TG::Power, 0 },
{ u"sans"_ustr, TSANS, '\0', TG::Font, 0 },
{ u"serif"_ustr, TSERIF, '\0', TG::Font, 0 },
{ u"setC"_ustr, TSETC, MS_SETC, TG::Standalone, 5 },
{ u"setminus"_ustr, TSETMINUS, MS_BACKSLASH, TG::Product, 0 },
{ u"setN"_ustr, TSETN, MS_SETN, TG::Standalone, 5 },
{ u"setQ"_ustr, TSETQ, MS_SETQ, TG::Standalone, 5 },
{ u"setquotient"_ustr, TSETQUOTIENT, MS_SLASH, TG::Product, 0 },
{ u"setR"_ustr, TSETR, MS_SETR, TG::Standalone, 5 },
{ u"setZ"_ustr, TSETZ, MS_SETZ, TG::Standalone, 5 },
{ u"sim"_ustr, TSIM, MS_SIM, TG::Relation, 0 },
{ u"simeq"_ustr, TSIMEQ, MS_SIMEQ, TG::Relation, 0 },
{ u"sin"_ustr, TSIN, '\0', TG::Function, 5 },
{ u"sinh"_ustr, TSINH, '\0', TG::Function, 5 },
{ u"size"_ustr, TSIZE, '\0', TG::FontAttr, 5 },
{ u"slash"_ustr, TSLASH, MS_SLASH, TG::Product, 0 },
{ u"sqrt"_ustr, TSQRT, MS_SQRT, TG::UnOper, 5 },
{ u"stack"_ustr, TSTACK, '\0', TG::NONE, 5 },
{ u"sub"_ustr, TRSUB, '\0', TG::Power, 0 },
{ u"subset"_ustr, TSUBSET, MS_SUBSET, TG::Relation, 0 },
{ u"subseteq"_ustr, TSUBSETEQ, MS_SUBSETEQ, TG::Relation, 0 },
{ u"succ"_ustr, TSUCCEEDS, MS_SUCCEEDS, TG::Relation, 0 },
{ u"succcurlyeq"_ustr, TSUCCEEDSEQUAL, MS_SUCCEEDSEQUAL, TG::Relation, 0 },
{ u"succsim"_ustr, TSUCCEEDSEQUIV, MS_SUCCEEDSEQUIV, TG::Relation, 0 },
{ u"sum"_ustr, TSUM, MS_SUM, TG::Oper, 5 },
{ u"sup"_ustr, TRSUP, '\0', TG::Power, 0 },
{ u"supset"_ustr, TSUPSET, MS_SUPSET, TG::Relation, 0 },
{ u"supseteq"_ustr, TSUPSETEQ, MS_SUPSETEQ, TG::Relation, 0 },
{ u"tan"_ustr, TTAN, '\0', TG::Function, 5 },
{ u"tanh"_ustr, TTANH, '\0', TG::Function, 5 },
{ u"tilde"_ustr, TTILDE, MS_TILDE, TG::Attribute, 5 },
{ u"times"_ustr, TTIMES, MS_TIMES, TG::Product, 0 },
{ u"to"_ustr, TTO, '\0', TG::Limit, 0 },
{ u"toward"_ustr, TTOWARD, MS_RIGHTARROW, TG::Relation, 0 },
{ u"transl"_ustr, TTRANSL, MS_TRANSL, TG::Relation, 0 },
{ u"transr"_ustr, TTRANSR, MS_TRANSR, TG::Relation, 0 },
{ u"underbrace"_ustr, TUNDERBRACE, MS_UNDERBRACE, TG::Product, 5 },
{ u"underline"_ustr, TUNDERLINE, '\0', TG::Attribute, 5 },
{ u"union"_ustr, TUNION, MS_UNION, TG::Sum, 0 },
{ u"uoper"_ustr, TUOPER, '\0', TG::UnOper, 5 },
{ u"uparrow"_ustr, TUPARROW, MS_UPARROW, TG::Standalone, 5 },
{ u"vec"_ustr, TVEC, MS_VEC, TG::Attribute, 5 },
{ u"widebslash"_ustr, TWIDEBACKSLASH, MS_BACKSLASH, TG::Product, 0 },
{ u"wideharpoon"_ustr, TWIDEHARPOON, MS_HARPOON, TG::Attribute, 5 },
{ u"widehat"_ustr, TWIDEHAT, MS_HAT, TG::Attribute, 5 },
{ u"wideslash"_ustr, TWIDESLASH, MS_SLASH, TG::Product, 0 },
{ u"widetilde"_ustr, TWIDETILDE, MS_TILDE, TG::Attribute, 5 },
{ u"widevec"_ustr, TWIDEVEC, MS_VEC, TG::Attribute, 5 },
{ u"wp"_ustr, TWP, MS_WP, TG::Standalone, 5 },
{ u"جا"_ustr, TSIN, '\0', TG::Function, 5 },
{ u"جاز"_ustr, TSINH, '\0', TG::Function, 5 },
{ u"جتا"_ustr, TCOS, '\0', TG::Function, 5 },
{ u"جتاز"_ustr, TCOSH, '\0', TG::Function, 5 },
{ u"حا"_ustr, TSIN, '\0', TG::Function, 5 },
{ u"حاز"_ustr, TSINH, '\0', TG::Function, 5 },
{ u"حتا"_ustr, TCOS, '\0', TG::Function, 5 },
{ u"حتاز"_ustr, TCOSH, '\0', TG::Function, 5 },
{ u"حد"_ustr, THADD, MS_HADD, TG::Oper, 5 },
{ u"طا"_ustr, TTAN, '\0', TG::Function, 5 },
{ u"طاز"_ustr, TTANH, '\0', TG::Function, 5 },
{ u"طتا"_ustr, TCOT, '\0', TG::Function, 5 },
{ u"طتاز"_ustr, TCOTH, '\0', TG::Function, 5 },
{ u"ظا"_ustr, TTAN, '\0', TG::Function, 5 },
{ u"ظاز"_ustr, TTANH, '\0', TG::Function, 5 },
{ u"ظتا"_ustr, TCOT, '\0', TG::Function, 5 },
{ u"ظتاز"_ustr, TCOTH, '\0', TG::Function, 5 },
{ u"قا"_ustr, TSEC, '\0', TG::Function, 5 },
{ u"قاز"_ustr, TSECH, '\0', TG::Function, 5 },
{ u"قتا"_ustr, TCSC, '\0', TG::Function, 5 },
{ u"قتاز"_ustr, TCSCH, '\0', TG::Function, 5 },
{ u"لو"_ustr, TLOG, '\0', TG::Function, 5 },
{ u"مجـ"_ustr, TSUM, MS_MAJ, TG::Oper, 5 },
{ u"نها"_ustr, TNAHA, '\0', TG::Oper, 5 },
{ u"ٯا"_ustr, TSEC, '\0', TG::Function, 5 },
{ u"ٯاز"_ustr, TSECH, '\0', TG::Function, 5 },
{ u"ٯتا"_ustr, TCSC, '\0', TG::Function, 5 },
{ u"ٯتاز"_ustr, TCSCH, '\0', TG::Function, 5 } };
// First character may be any alphabetic
const sal_Int32 coStartFlags = KParseTokens::ANY_LETTER | KParseTokens::IGNORE_LEADING_WS;
@ -474,7 +474,7 @@ void SmParser5::NextToken() //Central part of the parser
if (nRealStart >= nBufLen)
{
m_aCurToken.eType = TEND;
m_aCurToken.cMathChar = u"";
m_aCurToken.cMathChar = u""_ustr;
m_aCurToken.nGroup = TG::NONE;
m_aCurToken.nLevel = 0;
m_aCurToken.aText.clear();
@ -491,7 +491,7 @@ void SmParser5::NextToken() //Central part of the parser
sal_Int32 n = aRes.EndPos - nRealStart;
assert(n >= 0);
m_aCurToken.eType = TNUMBER;
m_aCurToken.cMathChar = u"";
m_aCurToken.cMathChar = u""_ustr;
m_aCurToken.nGroup = TG::NONE;
m_aCurToken.nLevel = 5;
m_aCurToken.aText = m_aBufferString.copy(nRealStart, n);
@ -502,7 +502,7 @@ void SmParser5::NextToken() //Central part of the parser
else if (aRes.TokenType & KParseType::DOUBLE_QUOTE_STRING)
{
m_aCurToken.eType = TTEXT;
m_aCurToken.cMathChar = u"";
m_aCurToken.cMathChar = u""_ustr;
m_aCurToken.nGroup = TG::NONE;
m_aCurToken.nLevel = 5;
m_aCurToken.aText = aRes.DequotedNameOrString;
@ -526,7 +526,7 @@ void SmParser5::NextToken() //Central part of the parser
else
{
m_aCurToken.eType = TIDENT;
m_aCurToken.cMathChar = u"";
m_aCurToken.cMathChar = u""_ustr;
m_aCurToken.nGroup = TG::NONE;
m_aCurToken.nLevel = 5;
m_aCurToken.aText = aName;
@ -538,7 +538,7 @@ void SmParser5::NextToken() //Central part of the parser
else if (aRes.TokenType == 0 && '_' == m_aBufferString[nRealStart])
{
m_aCurToken.eType = TRSUB;
m_aCurToken.cMathChar = u"";
m_aCurToken.cMathChar = u""_ustr;
m_aCurToken.nGroup = TG::Power;
m_aCurToken.nLevel = 0;
m_aCurToken.aText = "_";
@ -678,7 +678,7 @@ void SmParser5::NextToken() //Central part of the parser
// i.e. a valid symbol-name is following the '%'
// character
m_aCurToken.eType = TTEXT;
m_aCurToken.cMathChar = u"";
m_aCurToken.cMathChar = u""_ustr;
m_aCurToken.nGroup = TG::NONE;
m_aCurToken.nLevel = 5;
m_aCurToken.aText = "%";
@ -713,7 +713,7 @@ void SmParser5::NextToken() //Central part of the parser
case '\\':
{
m_aCurToken.eType = TESCAPE;
m_aCurToken.cMathChar = u"";
m_aCurToken.cMathChar = u""_ustr;
m_aCurToken.nGroup = TG::NONE;
m_aCurToken.nLevel = 5;
m_aCurToken.aText = "\\";
@ -731,7 +731,7 @@ void SmParser5::NextToken() //Central part of the parser
case '^':
{
m_aCurToken.eType = TRSUP;
m_aCurToken.cMathChar = u"";
m_aCurToken.cMathChar = u""_ustr;
m_aCurToken.nGroup = TG::Power;
m_aCurToken.nLevel = 0;
m_aCurToken.aText = "^";
@ -740,7 +740,7 @@ void SmParser5::NextToken() //Central part of the parser
case '`':
{
m_aCurToken.eType = TSBLANK;
m_aCurToken.cMathChar = u"";
m_aCurToken.cMathChar = u""_ustr;
m_aCurToken.nGroup = TG::Blank;
m_aCurToken.nLevel = 5;
m_aCurToken.aText = "`";
@ -776,7 +776,7 @@ void SmParser5::NextToken() //Central part of the parser
case '~':
{
m_aCurToken.eType = TBLANK;
m_aCurToken.cMathChar = u"";
m_aCurToken.cMathChar = u""_ustr;
m_aCurToken.nGroup = TG::Blank;
m_aCurToken.nLevel = 5;
m_aCurToken.aText = "~";
@ -787,7 +787,7 @@ void SmParser5::NextToken() //Central part of the parser
if (m_aBufferString.match("##", nRealStart))
{
m_aCurToken.eType = TDPOUND;
m_aCurToken.cMathChar = u"";
m_aCurToken.cMathChar = u""_ustr;
m_aCurToken.nGroup = TG::NONE;
m_aCurToken.nLevel = 0;
m_aCurToken.aText = "##";
@ -797,7 +797,7 @@ void SmParser5::NextToken() //Central part of the parser
else
{
m_aCurToken.eType = TPOUND;
m_aCurToken.cMathChar = u"";
m_aCurToken.cMathChar = u""_ustr;
m_aCurToken.nGroup = TG::NONE;
m_aCurToken.nLevel = 0;
m_aCurToken.aText = "#";
@ -903,7 +903,7 @@ void SmParser5::NextToken() //Central part of the parser
// texts like .34 ...56 ... h ...78..90
// will be treated as numbers
m_aCurToken.eType = TNUMBER;
m_aCurToken.cMathChar = u"";
m_aCurToken.cMathChar = u""_ustr;
m_aCurToken.nGroup = TG::NONE;
m_aCurToken.nLevel = 5;
@ -953,7 +953,7 @@ void SmParser5::NextToken() //Central part of the parser
if (!bHandled)
{
m_aCurToken.eType = TCHARACTER;
m_aCurToken.cMathChar = u"";
m_aCurToken.cMathChar = u""_ustr;
m_aCurToken.nGroup = TG::NONE;
m_aCurToken.nLevel = 5;
@ -1038,7 +1038,7 @@ void SmParser5::NextTokenColor(SmTokenType dvipload)
if (m_aBufferString[nRealStart] == '#' && !m_aBufferString.match("##", nRealStart))
{
m_aCurToken.eType = THEX;
m_aCurToken.cMathChar = u"";
m_aCurToken.cMathChar = u""_ustr;
m_aCurToken.nGroup = TG::Color;
m_aCurToken.nLevel = 0;
m_aCurToken.aText = "hex";
@ -1153,7 +1153,7 @@ void SmParser5::NextTokenFontSize()
sal_Int32 n = aRes.EndPos - nRealStart;
assert(n >= 0);
m_aCurToken.eType = THEX;
m_aCurToken.cMathChar = u"";
m_aCurToken.cMathChar = u""_ustr;
m_aCurToken.nGroup = TG::NONE;
m_aCurToken.nLevel = 5;
m_aCurToken.aText = m_aBufferString.copy(nRealStart, n);
@ -1930,15 +1930,15 @@ std::unique_ptr<SmNode> SmParser5::DoOper()
case THADD:
case TNAHA:
if (eType == TLIMSUP)
m_aCurToken.aText = u"lim sup";
m_aCurToken.aText = u"lim sup"_ustr;
else if (eType == TLIMINF)
m_aCurToken.aText = u"lim inf";
m_aCurToken.aText = u"lim inf"_ustr;
else if (eType == TNAHA)
m_aCurToken.aText = u"نها";
m_aCurToken.aText = u"نها"_ustr;
else if (eType == THADD)
m_aCurToken.aText = OUString(&MS_HADD, 1);
else
m_aCurToken.aText = u"lim";
m_aCurToken.aText = u"lim"_ustr;
pNode.reset(new SmTextNode(m_aCurToken, FNT_TEXT));
pNode->SetSelection(m_aCurESelection);
break;

2
starmath/source/smediteng.cxx
View File

@ -27,7 +27,7 @@ SmEditEngine::SmEditEngine(SfxItemPool* pItemPool)
, m_nDefaultFontSize(0)
, m_aAllSelection(0, 0, 0, 0)
{
SetText(u"");
SetText(u""_ustr);
// Add external text leading
SetAddExtLeading(true);

26
svl/qa/unit/svl.cxx
View File

@ -565,10 +565,10 @@ void Test::testTdf103060()
sExpected = "H"; // Heisei era
checkPreviewString(aFormatter, sCode, fPreviewNumber, eLang, sExpected);
sCode = "GG";
sExpected = u"\u5E73";
sExpected = u"\u5E73"_ustr;
checkPreviewString(aFormatter, sCode, fPreviewNumber, eLang, sExpected);
sCode = "GGG";
sExpected = u"\u5E73\u6210";
sExpected = u"\u5E73\u6210"_ustr;
checkPreviewString(aFormatter, sCode, fPreviewNumber, eLang, sExpected);
}
@ -1522,7 +1522,7 @@ void Test::testUserDefinedNumberFormats()
{ // tdf#79399 tdf#101462 Native Number Formats
sCode = "[NatNum5][$-0404]General\\ ";
// Chinese upper case number characters for 120
sExpected = u"\u58F9\u4F70\u8CB3\u62FE ";
sExpected = u"\u58F9\u4F70\u8CB3\u62FE "_ustr;
checkPreviewString(aFormatter, sCode, 120, eLang, sExpected);
sCode = "[DBNum2][$-0404]General\\ ";
checkPreviewString(aFormatter, sCode, 120, eLang, sExpected);
@ -1582,7 +1582,7 @@ void Test::testUserDefinedNumberFormats()
// DBNum1 -> NatNum4: Chinese lower case text for 123456789
// 一億二千三百四十五萬六千七百八十九
sExpected = u"\u4e00\u5104\u4e8c\u5343\u4e09\u767e\u56db\u5341\u4e94\u842c\u516d\u5343"
u"\u4e03\u767e\u516b\u5341\u4e5d ";
u"\u4e03\u767e\u516b\u5341\u4e5d "_ustr;
sCode = "[NatNum4][$-0404]General\\ ";
checkPreviewString(aFormatter, sCode, 123456789, eLang, sExpected);
sCode = "[DBNum1][$-0404]General\\ ";
@ -1591,7 +1591,7 @@ void Test::testUserDefinedNumberFormats()
// DBNum2 -> NatNum5: Chinese upper case text
// 壹億貳仟參佰肆拾伍萬陸仟柒佰捌拾玖
sExpected = u"\u58f9\u5104\u8cb3\u4edf\u53c3\u4f70\u8086\u62fe\u4f0d\u842c\u9678\u4edf"
u"\u67d2\u4f70\u634c\u62fe\u7396 ";
u"\u67d2\u4f70\u634c\u62fe\u7396 "_ustr;
sCode = "[NatNum5][$-0404]General\\ ";
checkPreviewString(aFormatter, sCode, 123456789, eLang, sExpected);
sCode = "[DBNum2][$-0404]General\\ ";
@ -1599,7 +1599,7 @@ void Test::testUserDefinedNumberFormats()
// DBNum3 -> NatNum3: fullwidth text
// １２３４５６７８９
sExpected = u"\uff11\uff12\uff13\uff14\uff15\uff16\uff17\uff18\uff19 ";
sExpected = u"\uff11\uff12\uff13\uff14\uff15\uff16\uff17\uff18\uff19 "_ustr;
sCode = "[NatNum3][$-0404]General\\ ";
checkPreviewString(aFormatter, sCode, 123456789, eLang, sExpected);
sCode = "[DBNum3][$-0404]General\\ ";
@ -1610,7 +1610,7 @@ void Test::testUserDefinedNumberFormats()
// DBNum1 -> NatNum4: Japanese modern long Kanji text for 123456789
// 一億二千三百四十五万六千七百八十九
sExpected = u"\u4e00\u5104\u4e8c\u5343\u4e09\u767e\u56db\u5341\u4e94\u4e07\u516d\u5343"
u"\u4e03\u767e\u516b\u5341\u4e5d ";
u"\u4e03\u767e\u516b\u5341\u4e5d "_ustr;
sCode = "[NatNum4][$-0411]General\\ ";
checkPreviewString(aFormatter, sCode, 123456789, eLang, sExpected);
sCode = "[DBNum1][$-0411]General\\ ";
@ -1619,7 +1619,7 @@ void Test::testUserDefinedNumberFormats()
// DBNum2 -> NatNum5: traditional long Kanji text
// 壱億弐阡参百四拾伍萬六阡七百八拾九
sExpected = u"\u58f1\u5104\u5f10\u9621\u53c2\u767e\u56db\u62fe\u4f0d\u842c\u516d\u9621"
u"\u4e03\u767e\u516b\u62fe\u4e5d ";
u"\u4e03\u767e\u516b\u62fe\u4e5d "_ustr;
sCode = "[NatNum5][$-0411]General\\ ";
checkPreviewString(aFormatter, sCode, 123456789, eLang, sExpected);
sCode = "[DBNum2][$-0411]General\\ ";
@ -1627,7 +1627,7 @@ void Test::testUserDefinedNumberFormats()
// DBNum3 -> NatNum3: fullwidth Arabic digits
// １２３４５６７８９
sExpected = u"\uff11\uff12\uff13\uff14\uff15\uff16\uff17\uff18\uff19 ";
sExpected = u"\uff11\uff12\uff13\uff14\uff15\uff16\uff17\uff18\uff19 "_ustr;
sCode = "[NatNum3][$-0411]General\\ ";
checkPreviewString(aFormatter, sCode, 123456789, eLang, sExpected);
sCode = "[DBNum3][$-0411]General\\ ";
@ -1637,7 +1637,7 @@ void Test::testUserDefinedNumberFormats()
// DBNum1 -> NatNum4: Korean lower case characters
// 一億二千三百四十五万六千七百八十九
sExpected = u"\u4e00\u5104\u4e8c\u5343\u4e09\u767e\u56db\u5341\u4e94\u4e07\u516d\u5343\u4e03\u767e\u516b\u5341\u4e5d ";
sExpected = u"\u4e00\u5104\u4e8c\u5343\u4e09\u767e\u56db\u5341\u4e94\u4e07\u516d\u5343\u4e03\u767e\u516b\u5341\u4e5d "_ustr;
sCode = "[NatNum4][$-0412]General\\ ";
checkPreviewString(aFormatter, sCode, 123456789, eLang, sExpected);
sCode = "[DBNum1][$-0412]General\\ ";
@ -1645,7 +1645,7 @@ void Test::testUserDefinedNumberFormats()
// DBNum2 -> NatNum5: Korean upper case characters
// 壹億貳阡參佰四拾伍萬六阡七佰八拾九
sExpected = u"\u58f9\u5104\u8cb3\u9621\u53c3\u4f70\u56db\u62fe\u4f0d\u842c\u516d\u9621\u4e03\u4f70\u516b\u62fe\u4e5d ";
sExpected = u"\u58f9\u5104\u8cb3\u9621\u53c3\u4f70\u56db\u62fe\u4f0d\u842c\u516d\u9621\u4e03\u4f70\u516b\u62fe\u4e5d "_ustr;
sCode = "[NatNum5][$-0412]General\\ ";
checkPreviewString(aFormatter, sCode, 123456789, eLang, sExpected);
sCode = "[DBNum2][$-0412]General\\ ";
@ -1653,7 +1653,7 @@ void Test::testUserDefinedNumberFormats()
// DBNum3 -> NatNum6: fullwidth Arabic digits
// １억２천３백４십５만６천７백８십９
sExpected = u"\uff11\uc5b5\uff12\ucc9c\uff13\ubc31\uff14\uc2ed\uff15\ub9cc\uff16\ucc9c\uff17\ubc31\uff18\uc2ed\uff19 ";
sExpected = u"\uff11\uc5b5\uff12\ucc9c\uff13\ubc31\uff14\uc2ed\uff15\ub9cc\uff16\ucc9c\uff17\ubc31\uff18\uc2ed\uff19 "_ustr;
sCode = "[NatNum6][$-0412]General\\ ";
checkPreviewString(aFormatter, sCode, 123456789, eLang, sExpected);
sCode = "[DBNum3][$-0412]General\\ ";
@ -1661,7 +1661,7 @@ void Test::testUserDefinedNumberFormats()
// DBNum4 -> NatNum10: Hangul characters
// 일억이천삼백사십오만육천칠백팔십구
sExpected = u"\uc77c\uc5b5\uc774\ucc9c\uc0bc\ubc31\uc0ac\uc2ed\uc624\ub9cc\uc721\ucc9c\uce60\ubc31\ud314\uc2ed\uad6c ";
sExpected = u"\uc77c\uc5b5\uc774\ucc9c\uc0bc\ubc31\uc0ac\uc2ed\uc624\ub9cc\uc721\ucc9c\uce60\ubc31\ud314\uc2ed\uad6c "_ustr;
sCode = "[NatNum10][$-0412]General\\ ";
checkPreviewString(aFormatter, sCode, 123456789, eLang, sExpected);
sCode = "[DBNum4][$-0412]General\\ ";

38
svl/qa/unit/test_URIHelper.cxx
View File

@ -454,67 +454,67 @@ void Test::testResolveIdnaHost() {
input.clear();
CPPUNIT_ASSERT_EQUAL(input, URIHelper::resolveIdnaHost(input));
input = u"Foo.M\u00FCnchen.de";
input = u"Foo.M\u00FCnchen.de"_ustr;
CPPUNIT_ASSERT_EQUAL(input, URIHelper::resolveIdnaHost(input));
input = "foo://Muenchen.de";
CPPUNIT_ASSERT_EQUAL(input, URIHelper::resolveIdnaHost(input));
input = u"foo://-M\u00FCnchen.de";
input = u"foo://-M\u00FCnchen.de"_ustr;
CPPUNIT_ASSERT_EQUAL(input, URIHelper::resolveIdnaHost(input));
input = u"foo://M\u00FCnchen-.de";
input = u"foo://M\u00FCnchen-.de"_ustr;
CPPUNIT_ASSERT_EQUAL(input, URIHelper::resolveIdnaHost(input));
input = u"foo://xn--M\u00FCnchen.de";
input = u"foo://xn--M\u00FCnchen.de"_ustr;
CPPUNIT_ASSERT_EQUAL(input, URIHelper::resolveIdnaHost(input));
input = u"foo://xy--M\u00FCnchen.de";
input = u"foo://xy--M\u00FCnchen.de"_ustr;
CPPUNIT_ASSERT_EQUAL(input, URIHelper::resolveIdnaHost(input));
input = u"foo://.M\u00FCnchen.de";
input = u"foo://.M\u00FCnchen.de"_ustr;
CPPUNIT_ASSERT_EQUAL(input, URIHelper::resolveIdnaHost(input));
input = u"foo://-bar.M\u00FCnchen.de";
input = u"foo://-bar.M\u00FCnchen.de"_ustr;
CPPUNIT_ASSERT_EQUAL(input, URIHelper::resolveIdnaHost(input));
input = u"foo://bar-.M\u00FCnchen.de";
input = u"foo://bar-.M\u00FCnchen.de"_ustr;
CPPUNIT_ASSERT_EQUAL(input, URIHelper::resolveIdnaHost(input));
input = u"foo://xn--bar.M\u00FCnchen.de";
input = u"foo://xn--bar.M\u00FCnchen.de"_ustr;
CPPUNIT_ASSERT_EQUAL(input, URIHelper::resolveIdnaHost(input));
input = u"foo://xy--bar.M\u00FCnchen.de";
input = u"foo://xy--bar.M\u00FCnchen.de"_ustr;
CPPUNIT_ASSERT_EQUAL(input, URIHelper::resolveIdnaHost(input));
CPPUNIT_ASSERT_EQUAL(
OUString(u"foo://M\u00FCnchen@xn--mnchen-3ya.de"),
URIHelper::resolveIdnaHost(u"foo://M\u00FCnchen@M\u00FCnchen.de"));
u"foo://M\u00FCnchen@xn--mnchen-3ya.de"_ustr,
URIHelper::resolveIdnaHost(u"foo://M\u00FCnchen@M\u00FCnchen.de"_ustr));
CPPUNIT_ASSERT_EQUAL(
OUString("foo://xn--mnchen-3ya.de."),
URIHelper::resolveIdnaHost(u"foo://M\u00FCnchen.de."));
URIHelper::resolveIdnaHost(u"foo://M\u00FCnchen.de."_ustr));
CPPUNIT_ASSERT_EQUAL(
OUString("Foo://bar@xn--mnchen-3ya.de:123/?bar#baz"),
URIHelper::resolveIdnaHost(u"Foo://bar@M\u00FCnchen.de:123/?bar#baz"));
URIHelper::resolveIdnaHost(u"Foo://bar@M\u00FCnchen.de:123/?bar#baz"_ustr));
CPPUNIT_ASSERT_EQUAL(
OUString("foo://xn--mnchen-3ya.de"),
URIHelper::resolveIdnaHost(u"foo://Mu\u0308nchen.de"));
URIHelper::resolveIdnaHost(u"foo://Mu\u0308nchen.de"_ustr));
CPPUNIT_ASSERT_EQUAL(
OUString("foo://example.xn--m-eha"), URIHelper::resolveIdnaHost(u"foo://example.mü"));
OUString("foo://example.xn--m-eha"), URIHelper::resolveIdnaHost(u"foo://example.mü"_ustr));
CPPUNIT_ASSERT_EQUAL(
OUString("foo://example.xn--m-eha:0"), URIHelper::resolveIdnaHost(u"foo://example.mü:0"));
OUString("foo://example.xn--m-eha:0"), URIHelper::resolveIdnaHost(u"foo://example.mü:0"_ustr));
CPPUNIT_ASSERT_EQUAL(
OUString("foo://xn--e1afmkfd.xn--p1ai"), URIHelper::resolveIdnaHost(u"foo://пример.рф"));
OUString("foo://xn--e1afmkfd.xn--p1ai"), URIHelper::resolveIdnaHost(u"foo://пример.рф"_ustr));
CPPUNIT_ASSERT_EQUAL(
OUString("foo://xn--e1afmkfd.xn--p1ai:0"),
URIHelper::resolveIdnaHost(u"foo://пример.рф:0"));
URIHelper::resolveIdnaHost(u"foo://пример.рф:0"_ustr));
}
css::uno::Reference< css::uno::XComponentContext > Test::m_context;

6
svl/source/numbers/zforfind.cxx
View File

@ -658,7 +658,7 @@ short ImpSvNumberInputScan::GetMonth( const OUString& rString, sal_Int32& nPos )
res = sal::static_int_cast< short >(-(i+1)); // negative
break; // for
}
else if (pUpperAbbrevMonthText[i] == "MRZ" && StringContainsWord( u"M\u00C4R", rString, nPos))
else if (pUpperAbbrevMonthText[i] == "MRZ" && StringContainsWord( u"M\u00C4R"_ustr, rString, nPos))
{ // And vice versa, accept MÄR for MRZ
nPos = nPos + 3;
res = sal::static_int_cast< short >(-(i+1)); // negative
@ -711,12 +711,12 @@ short ImpSvNumberInputScan::GetMonth( const OUString& rString, sal_Int32& nPos )
{
// Locale data has Januar/Jan
assert(pUpperMonthText[0] == "JANUAR");
if (StringContainsWord( u"J\u00C4NNER", rString, nPos))
if (StringContainsWord( u"J\u00C4NNER"_ustr, rString, nPos))
{
nPos += 6;
res = 1;
}
else if (StringContainsWord( u"J\u00C4N", rString, nPos))
else if (StringContainsWord( u"J\u00C4N"_ustr, rString, nPos))
{
nPos += 3;
res = -1;

4
svx/qa/unit/svdraw.cxx
View File

@ -386,8 +386,8 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testFontWorks)
CPPUNIT_TEST_FIXTURE(SvdrawTest, testTdf148000_EOLinCurvedText)
{
std::vector<OUString> aFilenames
= { u"tdf148000_EOLinCurvedText.pptx", u"tdf148000_EOLinCurvedText_New.odp",
u"tdf148000_EOLinCurvedText_Legacy.odp" };
= { u"tdf148000_EOLinCurvedText.pptx"_ustr, u"tdf148000_EOLinCurvedText_New.odp"_ustr,
u"tdf148000_EOLinCurvedText_Legacy.odp"_ustr };
for (int i = 0; i < 3; i++)
{

2
svx/source/dialog/dlgunit.hxx
View File

@ -39,7 +39,7 @@ inline OUString GetUnitString(tools::Long nVal_100, FieldUnit eFieldUnit, sal_Un
aVal.append(" ");
if (eFieldUnit == FieldUnit::INCH)
{
OUString sDoublePrime = u"\u2033";
OUString sDoublePrime = u"\u2033"_ustr;
if (aSuffix != "\"" && aSuffix != sDoublePrime)
aVal.append(" ");
else

2
svx/source/stbctrls/selctrl.cxx
View File

@ -110,7 +110,7 @@ SvxSelectionModeControl::SvxSelectionModeControl( sal_uInt16 _nSlotId,
Image(StockImage::Yes, RID_SVXBMP_BLOCK_SELECTION)},
mbFeatureEnabled(false)
{
GetStatusBar().SetQuickHelpText(GetId(), u"");
GetStatusBar().SetQuickHelpText(GetId(), u""_ustr);
}
void SvxSelectionModeControl::StateChangedAtStatusBarControl( sal_uInt16, SfxItemState eState,

4
svx/source/svdraw/svdoashp.cxx
View File

@ -512,7 +512,7 @@ double SdrObjCustomShape::GetExtraTextRotation( const bool bPreRotation ) const
// textPreRotateAngle might be set by macro or diagram (SmartArt) import
const uno::Any* pAny;
const SdrCustomShapeGeometryItem& rGeometryItem = GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
pAny = rGeometryItem.GetPropertyValueByName(u"TextPreRotateAngle");
pAny = rGeometryItem.GetPropertyValueByName(u"TextPreRotateAngle"_ustr);
if ( pAny )
*pAny >>= fExtraTextRotateAngle;
@ -528,7 +528,7 @@ double SdrObjCustomShape::GetExtraTextRotation( const bool bPreRotation ) const
{
const uno::Any* pAny;
const SdrCustomShapeGeometryItem& rGeometryItem = GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
pAny = rGeometryItem.GetPropertyValueByName(u"TextRotateAngle");
pAny = rGeometryItem.GetPropertyValueByName(u"TextRotateAngle"_ustr);
if ( pAny )
*pAny >>= fExtraTextRotateAngle;
}

2
svx/source/svdraw/svdobj.cxx
View File

@ -769,7 +769,7 @@ void SdrObject::SetName(const OUString& rStr, const bool bSetChanged)
const OUString & SdrObject::GetName() const
{
static const OUString EMPTY = u"";
static const OUString EMPTY = u""_ustr;
if(m_pPlusData)
{

16
svx/source/table/cell.cxx
View File

@ -82,7 +82,7 @@ static const SvxItemPropertySet* ImplGetSvxCellPropertySet()
{
FILL_PROPERTIES
// { "HasLevels", OWN_ATTR_HASLEVELS, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY, 0},
{ u"Style", OWN_ATTR_STYLE, cppu::UnoType< css::style::XStyle >::get(), css::beans::PropertyAttribute::MAYBEVOID, 0},
{ u"Style"_ustr, OWN_ATTR_STYLE, cppu::UnoType< css::style::XStyle >::get(), css::beans::PropertyAttribute::MAYBEVOID, 0},
{ UNO_NAME_TEXT_WRITINGMODE, SDRATTR_TEXTDIRECTION, cppu::UnoType<css::text::WritingMode>::get(), 0, 0},
{ UNO_NAME_TEXT_HORZADJUST, SDRATTR_TEXT_HORZADJUST, cppu::UnoType<css::drawing::TextHorizontalAdjust>::get(), 0, 0},
{ UNO_NAME_TEXT_LEFTDIST, SDRATTR_TEXT_LEFTDIST, cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM},
@ -92,13 +92,13 @@ static const SvxItemPropertySet* ImplGetSvxCellPropertySet()
{ UNO_NAME_TEXT_VERTADJUST, SDRATTR_TEXT_VERTADJUST, cppu::UnoType<css::drawing::TextVerticalAdjust>::get(), 0, 0},
{ UNO_NAME_TEXT_WORDWRAP, SDRATTR_TEXT_WORDWRAP, cppu::UnoType<bool>::get(), 0, 0},
{ u"TableBorder", OWN_ATTR_TABLEBORDER, cppu::UnoType<TableBorder>::get(), 0, 0 },
{ u"TopBorder", SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, TOP_BORDER },
{ u"BottomBorder", SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, BOTTOM_BORDER },
{ u"LeftBorder", SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, LEFT_BORDER },
{ u"RightBorder", SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, RIGHT_BORDER },
{ u"RotateAngle", SDRATTR_TABLE_TEXT_ROTATION, cppu::UnoType<sal_Int32>::get(), 0, 0 },
{ u"CellInteropGrabBag", SDRATTR_TABLE_CELL_GRABBAG, cppu::UnoType<css::uno::Sequence<css::beans::PropertyValue>>::get(), 0, 0 },
{ u"TableBorder"_ustr, OWN_ATTR_TABLEBORDER, cppu::UnoType<TableBorder>::get(), 0, 0 },
{ u"TopBorder"_ustr, SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, TOP_BORDER },
{ u"BottomBorder"_ustr, SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, BOTTOM_BORDER },
{ u"LeftBorder"_ustr, SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, LEFT_BORDER },
{ u"RightBorder"_ustr, SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, RIGHT_BORDER },
{ u"RotateAngle"_ustr, SDRATTR_TABLE_TEXT_ROTATION, cppu::UnoType<sal_Int32>::get(), 0, 0 },
{ u"CellInteropGrabBag"_ustr, SDRATTR_TABLE_CELL_GRABBAG, cppu::UnoType<css::uno::Sequence<css::beans::PropertyValue>>::get(), 0, 0 },
SVX_UNOEDIT_OUTLINER_PROPERTIES,
SVX_UNOEDIT_CHAR_PROPERTIES,

18
svx/source/toolbars/extrusionbar.cxx
View File

@ -152,11 +152,11 @@ static void impl_execute( SfxRequest const & rReq, SdrCustomShapeGeometryItem& r
// the extrusion off and on.
if (bOn)
{
pAny = rGeometryItem.GetPropertyValueByName(sExtrusion, u"Diffusion");
pAny = rGeometryItem.GetPropertyValueByName(sExtrusion, u"Diffusion"_ustr);
if (!pAny)
{
css::beans::PropertyValue aPropValue;
aPropValue.Name = u"Diffusion";
aPropValue.Name = u"Diffusion"_ustr;
aPropValue.Value <<= 100.0;
rGeometryItem.SetPropertyValue( sExtrusion, aPropValue );
}
@ -345,7 +345,7 @@ static void impl_execute( SfxRequest const & rReq, SdrCustomShapeGeometryItem& r
// Set ShadeMode only when changing from or to wireframe, otherwise keep existing value.
ShadeMode eOldShadeMode(ShadeMode_FLAT);
css::uno::Any* pAny = rGeometryItem.GetPropertyValueByName(sExtrusion, u"ShadeMode");
css::uno::Any* pAny = rGeometryItem.GetPropertyValueByName(sExtrusion, u"ShadeMode"_ustr);
if (pAny)
*pAny >>= eOldShadeMode;
ShadeMode eShadeMode(eOldShadeMode);
@ -367,7 +367,7 @@ static void impl_execute( SfxRequest const & rReq, SdrCustomShapeGeometryItem& r
// c3DSpecularAmt to distinguish between 'matte' (=0) and 'plastic'.
// We do the same.
double fOldSpecularity = 0.0;
pAny = rGeometryItem.GetPropertyValueByName(sExtrusion, u"Specularity");
pAny = rGeometryItem.GetPropertyValueByName(sExtrusion, u"Specularity"_ustr);
if (pAny)
*pAny >>= fOldSpecularity;
double fSpecularity = fOldSpecularity;
@ -393,7 +393,7 @@ static void impl_execute( SfxRequest const & rReq, SdrCustomShapeGeometryItem& r
// We toggle between 100 and 43712.0 / 655.36 here, to get better ODF -> MSO binary.
// We keep other values, those might be set outside regular UI, e.g by macro.
double fOldDiffusion = 100.0;
pAny = rGeometryItem.GetPropertyValueByName(sExtrusion, u"Diffusion");
pAny = rGeometryItem.GetPropertyValueByName(sExtrusion, u"Diffusion"_ustr);
if (pAny)
*pAny >>= fOldDiffusion;
double fDiffusion = fOldDiffusion;
@ -916,14 +916,14 @@ static void getExtrusionSurfaceState( SdrView const * pSdrView, SfxItemSet& rSet
sal_Int32 nSurface = 0; // wire frame
ShadeMode eShadeMode( ShadeMode_FLAT );
pAny = rGeometryItem.GetPropertyValueByName( sExtrusion, u"ShadeMode" );
pAny = rGeometryItem.GetPropertyValueByName( sExtrusion, u"ShadeMode"_ustr );
if( pAny )
*pAny >>= eShadeMode;
if (eShadeMode != ShadeMode_DRAFT)
{
bool bMetal = false;
pAny = rGeometryItem.GetPropertyValueByName( sExtrusion, u"Metal" );
pAny = rGeometryItem.GetPropertyValueByName( sExtrusion, u"Metal"_ustr );
if( pAny )
*pAny >>= bMetal;
@ -931,7 +931,7 @@ static void getExtrusionSurfaceState( SdrView const * pSdrView, SfxItemSet& rSet
{
nSurface = 3; // metal ODF
sal_Int16 eMetalType = EnhancedCustomShapeMetalType::MetalODF;
pAny = rGeometryItem.GetPropertyValueByName( sExtrusion, u"MetalType" );
pAny = rGeometryItem.GetPropertyValueByName( sExtrusion, u"MetalType"_ustr );
if (pAny)
{
*pAny >>= eMetalType;
@ -942,7 +942,7 @@ static void getExtrusionSurfaceState( SdrView const * pSdrView, SfxItemSet& rSet
else
{
double fSpecularity = 0;
pAny = rGeometryItem.GetPropertyValueByName( sExtrusion, u"Specularity" );
pAny = rGeometryItem.GetPropertyValueByName( sExtrusion, u"Specularity"_ustr );
if( pAny )
*pAny >>= fSpecularity;

Some files were not shown because too many files have changed in this diff Show More