diff options
191 files changed, 4949 insertions, 4926 deletions
diff --git a/chart2/qa/extras/uichart.cxx b/chart2/qa/extras/uichart.cxx index 2f5aee857e80..229c7f21f0f7 100644 --- a/chart2/qa/extras/uichart.cxx +++ b/chart2/qa/extras/uichart.cxx @@ -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), diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index 4c10502d4186..f8581580dfc2 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -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; diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx index 58f9c3f63c16..7a97736c1e74 100644 --- a/comphelper/qa/string/test_string.cxx +++ b/comphelper/qa/string/test_string.cxx @@ -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)))); } diff --git a/comphelper/source/misc/configuration.cxx b/comphelper/source/misc/configuration.cxx index 2c99e64e46d9..6e500f619232 100644 --- a/comphelper/source/misc/configuration.cxx +++ b/comphelper/source/misc/configuration.cxx @@ -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); diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx index 43d277fe0097..1bc934af57a9 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx @@ -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(); diff --git a/cppcanvas/qa/unit/test.cxx b/cppcanvas/qa/unit/test.cxx index 5d30509db94b..ad278f10834b 100644 --- a/cppcanvas/qa/unit/test.cxx +++ b/cppcanvas/qa/unit/test.cxx @@ -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; diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index 9a08674d7bdd..d039e43824a8 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -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 ); } } diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 8f90f3198b27..186a18b0a03b 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -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 diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index d1e9e5baab52..a4d0ca950b92 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -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; diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index df4d615f0979..be92bb4d89d3 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -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; diff --git a/emfio/qa/cppunit/wmf/wmfimporttest.cxx b/emfio/qa/cppunit/wmf/wmfimporttest.cxx index de9be9ba0a52..a42e7f0dd7c3 100644 --- a/emfio/qa/cppunit/wmf/wmfimporttest.cxx +++ b/emfio/qa/cppunit/wmf/wmfimporttest.cxx @@ -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); diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index f686c4205855..c8d88d8d0160 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -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(); diff --git a/filter/qa/unit/textfilterdetect.cxx b/filter/qa/unit/textfilterdetect.cxx index 293f211a46e3..e8de97a8df61 100644 --- a/filter/qa/unit/textfilterdetect.cxx +++ b/filter/qa/unit/textfilterdetect.cxx @@ -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()); } } } diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index a9a717a56cc5..bfa67aea1787 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -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 ) diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 98a21eeed5c1..1e7756b8657a 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -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 ); diff --git a/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx index fbf4b875e3af..f75b9a7943c3 100644 --- a/forms/source/richtext/richtextunowrapper.cxx +++ b/forms/source/richtext/richtextunowrapper.cxx @@ -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; diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index 8ea7cb5eccc6..cd1f13c2149d 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -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 } } diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx index 63462e3e6a3a..b57186d49367 100644 --- a/i18nlangtag/source/languagetag/languagetag.cxx +++ b/i18nlangtag/source/languagetag/languagetag.cxx @@ -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; diff --git a/i18npool/qa/cppunit/test_characterclassification.cxx b/i18npool/qa/cppunit/test_characterclassification.cxx index 78397029b71f..a7689aa1559f 100644 --- a/i18npool/qa/cppunit/test_characterclassification.cxx +++ b/i18npool/qa/cppunit/test_characterclassification.cxx @@ -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 diff --git a/i18npool/qa/cppunit/test_defaultnumberingprovider.cxx b/i18npool/qa/cppunit/test_defaultnumberingprovider.cxx index 1bf0ab521079..69ac73d41a89 100644 --- a/i18npool/qa/cppunit/test_defaultnumberingprovider.cxx +++ b/i18npool/qa/cppunit/test_defaultnumberingprovider.cxx @@ -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(); diff --git a/i18npool/qa/cppunit/test_textsearch.cxx b/i18npool/qa/cppunit/test_textsearch.cxx index f224e58c3809..2efb2b9cdc37 100644 --- a/i18npool/qa/cppunit/test_textsearch.cxx +++ b/i18npool/qa/cppunit/test_textsearch.cxx @@ -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); diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx index e5ea427eda1c..781e91725e03 100644 --- a/lingucomponent/source/lingutil/lingutil.cxx +++ b/lingucomponent/source/lingutil/lingutil.cxx @@ -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 }; diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx b/lotuswordpro/source/filter/lwpfribptr.cxx index 746aac854cb7..b1cd449765a1 100644 --- a/lotuswordpro/source/filter/lwpfribptr.cxx +++ b/lotuswordpro/source/filter/lwpfribptr.cxx @@ -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: { diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx b/lotuswordpro/source/filter/lwpnumericfmt.hxx index cc3b8f5d0ee2..c3b6bfb2b187 100644 --- a/lotuswordpro/source/filter/lwpnumericfmt.hxx +++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx @@ -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 } }; diff --git a/o3tl/qa/test-string_view.cxx b/o3tl/qa/test-string_view.cxx index c534adbd945f..021c8decf431 100644 --- a/o3tl/qa/test-string_view.cxx +++ b/o3tl/qa/test-string_view.cxx @@ -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 diff --git a/oox/qa/unit/drawingml.cxx b/oox/qa/unit/drawingml.cxx index b9e4066876dc..89658e0874fc 100644 --- a/oox/qa/unit/drawingml.cxx +++ b/oox/qa/unit/drawingml.cxx @@ -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(); diff --git a/oox/qa/unit/shape.cxx b/oox/qa/unit/shape.cxx index efcc6591cf86..565ac39b52ad 100644 --- a/oox/qa/unit/shape.cxx +++ b/oox/qa/unit/shape.cxx @@ -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(); diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index 225c0a1e6e3c..f9fce3b1f837 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -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; } diff --git a/oox/source/drawingml/fontworkhelpers.cxx b/oox/source/drawingml/fontworkhelpers.cxx index 591caf104ecb..3aacfaf378b1 100644 --- a/oox/source/drawingml/fontworkhelpers.cxx +++ b/oox/source/drawingml/fontworkhelpers.cxx @@ -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); diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index b4e0a05ba7a6..03a22dc441b4 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -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. diff --git a/oox/source/export/DMLPresetShapeExport.cxx b/oox/source/export/DMLPresetShapeExport.cxx index 1eaef29927fa..0ed099ee57b4 100644 --- a/oox/source/export/DMLPresetShapeExport.cxx +++ b/oox/source/export/DMLPresetShapeExport.cxx @@ -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") diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index a74dc8b35b81..0d1b8a5e1eda 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -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); } diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx index beaefc33fbbc..1861f5aef7c3 100644 --- a/oox/source/shape/WpsContext.cxx +++ b/oox/source/shape/WpsContext.cxx @@ -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(); diff --git a/sal/qa/rtl/math/test-rtl-math.cxx b/sal/qa/rtl/math/test-rtl-math.cxx index d6851b76aafa..bab2774a414c 100644 --- a/sal/qa/rtl/math/test-rtl-math.cxx +++ b/sal/qa/rtl/math/test-rtl-math.cxx @@ -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, diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx b/sal/qa/rtl/textenc/rtl_textcvt.cxx index 37ba5e658462..b2d4591065dd 100644 --- a/sal/qa/rtl/textenc/rtl_textcvt.cxx +++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx @@ -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); diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx index 0b529112adea..6389f0222418 100644 --- a/sal/qa/rtl/uri/rtl_testuri.cxx +++ b/sal/qa/rtl/uri/rtl_testuri.cxx @@ -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, diff --git a/sc/qa/extras/accessibility/basics.cxx b/sc/qa/extras/accessibility/basics.cxx index f07a24d1a353..8e04c87dacda 100644 --- a/sc/qa/extras/accessibility/basics.cxx +++ b/sc/qa/extras/accessibility/basics.cxx @@ -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; diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index 5adf672a7915..d8590804a165 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -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))); } } diff --git a/sc/qa/extras/vba-macro-test.cxx b/sc/qa/extras/vba-macro-test.cxx index 7e92dd681110..570d6520a92c 100644 --- a/sc/qa/extras/vba-macro-test.cxx +++ b/sc/qa/extras/vba-macro-test.cxx @@ -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 diff --git a/sc/qa/unit/subsequent_export_test2.cxx b/sc/qa/unit/subsequent_export_test2.cxx index 91309d9e5491..49ef48e80e37 100644 --- a/sc/qa/unit/subsequent_export_test2.cxx +++ b/sc/qa/unit/subsequent_export_test2.cxx @@ -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", diff --git a/sc/qa/unit/subsequent_filters_test3.cxx b/sc/qa/unit/subsequent_filters_test3.cxx index 3a46b9926bf6..cd9acf90bece 100644 --- a/sc/qa/unit/subsequent_filters_test3.cxx +++ b/sc/qa/unit/subsequent_filters_test3.cxx @@ -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)); diff --git a/sc/qa/unit/subsequent_filters_test4.cxx b/sc/qa/unit/subsequent_filters_test4.cxx index 4439b3d9ba97..4a7401e84337 100644 --- a/sc/qa/unit/subsequent_filters_test4.cxx +++ b/sc/qa/unit/subsequent_filters_test4.cxx @@ -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 : ���, �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) diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx index 76286912a698..ab25340e8c3e 100644 --- a/sc/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx @@ -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(); diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index afbe5b8432a0..83ec9c63986e 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -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); } diff --git a/sc/qa/unit/uicalc/uicalc2.cxx b/sc/qa/unit/uicalc/uicalc2.cxx index c5207a03c3d8..d90e3bb3d3e2 100644 --- a/sc/qa/unit/uicalc/uicalc2.cxx +++ b/sc/qa/unit/uicalc/uicalc2.cxx @@ -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"); diff --git a/sc/source/filter/xml/SparklineGroupsExport.cxx b/sc/source/filter/xml/SparklineGroupsExport.cxx index f5600494d7d8..0a652c225630 100644 --- a/sc/source/filter/xml/SparklineGroupsExport.cxx +++ b/sc/source/filter/xml/SparklineGroupsExport.cxx @@ -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 diff --git a/sc/source/ui/dialogs/SparklineDataRangeDialog.cxx b/sc/source/ui/dialogs/SparklineDataRangeDialog.cxx index f085e737c77c..0e91051db44c 100644 --- a/sc/source/ui/dialogs/SparklineDataRangeDialog.cxx +++ b/sc/source/ui/dialogs/SparklineDataRangeDialog.cxx @@ -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()) diff --git a/sc/source/ui/dialogs/SparklineDialog.cxx b/sc/source/ui/dialogs/SparklineDialog.cxx index 2490ae41da2f..ff56e629e684 100644 --- a/sc/source/ui/dialogs/SparklineDialog.cxx +++ b/sc/source/ui/dialogs/SparklineDialog.cxx @@ -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) diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx index 57234b2a47ed..ff94ba224d60 100644 --- a/sc/source/ui/unoobj/condformatuno.cxx +++ b/sc/source/ui/unoobj/condformatuno.cxx @@ -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; } diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index edd08b4c1151..d720630a8a38 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -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}, }; diff --git a/sd/qa/unit/TextFittingTest.cxx b/sd/qa/unit/TextFittingTest.cxx index 588d3f0ddd54..069825a8e620 100644 --- a/sd/qa/unit/TextFittingTest.cxx +++ b/sd/qa/unit/TextFittingTest.cxx @@ -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 diff --git a/sd/qa/unit/a11y/layout.cxx b/sd/qa/unit/a11y/layout.cxx index 342590b31fba..51ad0743730b 100644 --- a/sd/qa/unit/a11y/layout.cxx +++ b/sd/qa/unit/a11y/layout.cxx @@ -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, diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx index 0a9f82a27e59..28cba427ce26 100644 --- a/sd/qa/unit/export-tests-ooxml1.cxx +++ b/sd/qa/unit/export-tests-ooxml1.cxx @@ -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( diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index 43e27b6255e8..c075d54d7ca4 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -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); diff --git a/sd/qa/unit/import-tests-smartart.cxx b/sd/qa/unit/import-tests-smartart.cxx index 0a519c117b52..2382ed4a9f22 100644 --- a/sd/qa/unit/import-tests-smartart.cxx +++ b/sd/qa/unit/import-tests-smartart.cxx @@ -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) diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index adc7c12e4632..0003e8b408b1 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -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"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"n819614.pptx", u"xml/n819614_", u""_ustr }, + + { 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 }; diff --git a/sd/qa/unit/layout-tests.cxx b/sd/qa/unit/layout-tests.cxx index f501d0873f7d..7fdcfe19f90d 100644 --- a/sd/qa/unit/layout-tests.cxx +++ b/sd/qa/unit/layout-tests.cxx @@ -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(); diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index 91a929a11d07..8bf43891b697 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -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(); diff --git a/sd/qa/unit/uiimpress.cxx b/sd/qa/unit/uiimpress.cxx index 61ab0c301ed6..41c685feef36 100644 --- a/sd/qa/unit/uiimpress.cxx +++ b/sd/qa/unit/uiimpress.cxx @@ -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(), diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 3084d494b454..391cd8eada8a 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -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() ); diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx index 8c342f1fda63..e35b051d25f5 100644 --- a/sd/source/core/text/textapi.cxx +++ b/sd/source/core/text/textapi.cxx @@ -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() ); diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 348bc606b800..52df32b41954 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -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; diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index 0db58c58e5a4..1f1880f81527 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -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; diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 197c13283324..f5a7f112ca6e 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -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}, }; diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 93b46db9d798..2f463f101a4a 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -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; diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 6af81c77aaa5..d39b0ea596b1 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -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; diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx index 2fa57012349d..5a071f1fde4f 100644 --- a/sd/source/ui/unoidl/unosrch.cxx +++ b/sd/source/ui/unoidl/unosrch.cxx @@ -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; diff --git a/sdext/qa/unit/pdfimport.cxx b/sdext/qa/unit/pdfimport.cxx index c344394ab1c3..2d7cee1295a4 100644 --- a/sdext/qa/unit/pdfimport.cxx +++ b/sdext/qa/unit/pdfimport.cxx @@ -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 } diff --git a/sdext/source/pdfimport/inc/contentsink.hxx b/sdext/source/pdfimport/inc/contentsink.hxx index 5f1517e8c4c2..44f609c3caaa 100644 --- a/sdext/source/pdfimport/inc/contentsink.hxx +++ b/sdext/source/pdfimport/inc/contentsink.hxx @@ -65,7 +65,7 @@ namespace pdfi FontAttributes() : familyName(), - fontWeight(u"normal"), + fontWeight(u"normal"_ustr), isItalic(false), isUnderline(false), isOutline(false), diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx index c1fa22d19100..58a55451a379 100644 --- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx +++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx @@ -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; } diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx index 46a85a753854..7967a74a67cf 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx @@ -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; } diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx index a8331b87bfd2..98d2c9572b9b 100644 --- a/sdext/source/pdfimport/tree/writertreevisiting.cxx +++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx @@ -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; } diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index f75821788d0f..ad25f85ebc09 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -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 diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index 507256aadf17..0569fcd3dc61 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -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; } diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index f6077147157e..b15689e87b9d 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -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") diff --git a/starmath/inc/mathml/element.hxx b/starmath/inc/mathml/element.hxx index ce5d7073b606..97d7299e5df2 100644 --- a/starmath/inc/mathml/element.hxx +++ b/starmath/inc/mathml/element.hxx @@ -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) diff --git a/starmath/inc/token.hxx b/starmath/inc/token.hxx index eb0de6d23875..e22b8cdc1d63 100644 --- a/starmath/inc/token.hxx +++ b/starmath/inc/token.hxx @@ -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; diff --git a/starmath/qa/cppunit/test_cursor.cxx b/starmath/qa/cppunit/test_cursor.cxx index 114ea791fbd3..12e63626eee3 100644 --- a/starmath/qa/cppunit/test_cursor.cxx +++ b/starmath/qa/cppunit/test_cursor.cxx @@ -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 } diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx index aba582e281d3..1b8c0292ba31 100644 --- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx +++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx @@ -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); diff --git a/starmath/qa/extras/mmlexport-test.cxx b/starmath/qa/extras/mmlexport-test.cxx index 615dcd7dfa98..98607dbec3f2 100644 --- a/starmath/qa/extras/mmlexport-test.cxx +++ b/starmath/qa/extras/mmlexport-test.cxx @@ -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); diff --git a/starmath/qa/extras/mmlimport-test.cxx b/starmath/qa/extras/mmlimport-test.cxx index c6edd0b6481e..f691fdbef64c 100644 --- a/starmath/qa/extras/mmlimport-test.cxx +++ b/starmath/qa/extras/mmlimport-test.cxx @@ -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()); } diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx index c127c35f56c3..6f8e9b0af042 100644 --- a/starmath/source/cursor.cxx +++ b/starmath/source/cursor.cxx @@ -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; diff --git a/starmath/source/mathml/attribute.cxx b/starmath/source/mathml/attribute.cxx index a1be708ae656..ca4a86290d05 100644 --- a/starmath/source/mathml/attribute.cxx +++ b/starmath/source/mathml/attribute.cxx @@ -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; diff --git a/starmath/source/mathml/export.cxx b/starmath/source/mathml/export.cxx index ea662541b60c..923668f45425 100644 --- a/starmath/source/mathml/export.cxx +++ b/starmath/source/mathml/export.cxx @@ -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) diff --git a/starmath/source/mathml/import.cxx b/starmath/source/mathml/import.cxx index ac14bd997bc9..d857e56930d6 100644 --- a/starmath/source/mathml/import.cxx +++ b/starmath/source/mathml/import.cxx @@ -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"_ustr, 0, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, - { u"BaseURI", 0, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, - 0 }, - { u"StreamRelPath", 0, ::cppu::UnoType<OUString>::get(), + { u"StreamRelPath"_ustr, 0, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, - { u"StreamName", 0, ::cppu::UnoType<OUString>::get(), + { 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 { diff --git a/starmath/source/mathml/mathmlMo.cxx b/starmath/source/mathml/mathmlMo.cxx index fb76b070ea47..8ee7536e1c58 100644 --- a/starmath/source/mathml/mathmlMo.cxx +++ b/starmath/source/mathml/mathmlMo.cxx @@ -20,1106 +20,1107 @@ #include <mathmlMo.hxx> static moOperatorData moOperatorDataDictionaryData[starmathdatabase::MATHML_MO_COUNT] - = { { u"\u2018", moOpDF::prefix, 10, 0, 0, moOpDP::fence | moOpDP::nonedp }, - { u"\u2019", moOpDF::postfix, 10, 0, 0, moOpDP::fence | moOpDP::nonedp }, - { u"\u201C", moOpDF::prefix, 10, 0, 0, moOpDP::fence | moOpDP::nonedp }, - { u"\u201D", moOpDF::postfix, 10, 0, 0, moOpDP::fence | moOpDP::nonedp }, - { u"(", moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u")", moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"[", moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"]", moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"{", moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"|", moOpDF::prepostfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"||", moOpDF::prepostfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"|||", moOpDF::prepostfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"}", moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u2016", moOpDF::prepostfix, 20, 0, 0, moOpDP::stretchyfence }, - { u"\u2308", moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u2309", moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u230A", moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u230B", moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u2329", moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u232A", moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u2772", moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u2773", moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u27E6", moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u27E7", moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u27E8", moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u27E9", moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u27EA", moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u27EB", moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u27EC", moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u27ED", moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u27EE", moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u27EF", moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u2980", moOpDF::prepostfix, 20, 0, 0, moOpDP::stretchyfence }, - { u"\u2983", moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u2984", moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u2985", moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u2986", moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u2987", moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u2988", moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u2989", moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u298A", moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u298B", moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u298C", moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u298D", moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u298E", moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u298F", moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u2990", moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u2991", moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u2992", moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u2993", moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u2994", moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u2995", moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u2996", moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u2997", moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u2998", moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u29FC", moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u29FD", moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, - { u";", moOpDF::infix, 30, 0, 3, moOpDP::separator | moOpDP::linebreakstyleAfter }, - { u",", moOpDF::infix, 40, 0, 3, moOpDP::separator | moOpDP::linebreakstyleAfter }, - { u"\u2063", moOpDF::infix, 40, 0, 0, moOpDP::separator | moOpDP::linebreakstyleAfter }, - { u"\u2234", moOpDF::infix, 70, 5, 5, moOpDP::nonedp }, - { u"\u2235", moOpDF::infix, 70, 5, 5, moOpDP::nonedp }, - { u"->", moOpDF::infix, 90, 5, 5, moOpDP::nonedp }, - { u"..", moOpDF::postfix, 100, 0, 0, moOpDP::nonedp }, - { u"...", moOpDF::postfix, 100, 0, 0, moOpDP::nonedp }, - { u":", moOpDF::infix, 100, 1, 2, moOpDP::nonedp }, - { u"\u03F6", moOpDF::infix, 110, 5, 5, moOpDP::nonedp }, - { u"\u2026", moOpDF::infix, 150, 0, 0, moOpDP::nonedp }, - { u"\u22EE", moOpDF::infix, 150, 5, 5, moOpDP::nonedp }, - { u"\u22EF", moOpDF::infix, 150, 0, 0, moOpDP::nonedp }, - { u"\u22F1", moOpDF::infix, 150, 5, 5, moOpDP::nonedp }, - { u"\u220B", moOpDF::infix, 160, 5, 5, moOpDP::nonedp }, - { u"\u22A2", moOpDF::infix, 170, 5, 5, moOpDP::nonedp }, - { u"\u22A3", moOpDF::infix, 170, 5, 5, moOpDP::nonedp }, - { u"\u22A4", moOpDF::infix, 170, 5, 5, moOpDP::nonedp }, - { u"\u22A8", moOpDF::infix, 170, 5, 5, moOpDP::nonedp }, - { u"\u22A9", moOpDF::infix, 170, 5, 5, moOpDP::nonedp }, - { u"\u22AC", moOpDF::infix, 170, 5, 5, moOpDP::nonedp }, - { u"\u22AD", moOpDF::infix, 170, 5, 5, moOpDP::nonedp }, - { u"\u22AE", moOpDF::infix, 170, 5, 5, moOpDP::nonedp }, - { u"\u22AF", moOpDF::infix, 170, 5, 5, moOpDP::nonedp }, - { u"\u2228", moOpDF::infix, 190, 4, 4, moOpDP::nonedp }, - { u"&&", moOpDF::infix, 200, 4, 4, moOpDP::nonedp }, - { u"\u2227", moOpDF::infix, 200, 4, 4, moOpDP::nonedp }, - { u"\u2200", moOpDF::prefix, 230, 2, 1, moOpDP::nonedp }, - { u"\u2203", moOpDF::prefix, 230, 2, 1, moOpDP::nonedp }, - { u"\u2204", moOpDF::prefix, 230, 2, 1, moOpDP::nonedp }, - { u"\u2201", moOpDF::infix, 240, 1, 2, moOpDP::nonedp }, - { u"\u2208", moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, - { u"\u2209", moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, - { u"\u220C", moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, - { u"\u2282", moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, - { u"\u2282\u20D2", moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, - { u"\u2283", moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, - { u"\u2283\u20D2", moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, - { u"\u2284", moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, - { u"\u2285", moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, - { u"\u2286", moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, - { u"\u2287", moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, - { u"\u2288", moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, - { u"\u2289", moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, - { u"\u228A", moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, - { u"\u228B", moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, - { u"<=", moOpDF::infix, 241, 5, 5, moOpDP::nonedp }, - { u"\u2264", moOpDF::infix, 241, 5, 5, moOpDP::nonedp }, - { u"\u2265", moOpDF::infix, 242, 5, 5, moOpDP::nonedp }, - { u">", moOpDF::infix, 243, 5, 5, moOpDP::nonedp }, - { u">=", moOpDF::infix, 243, 5, 5, moOpDP::nonedp }, - { u"\u226F", moOpDF::infix, 244, 5, 5, moOpDP::nonedp }, - { u"<", moOpDF::infix, 245, 5, 5, moOpDP::nonedp }, - { u"\u226E", moOpDF::infix, 246, 5, 5, moOpDP::nonedp }, - { u"\u2248", moOpDF::infix, 247, 5, 5, moOpDP::nonedp }, - { u"\u223C", moOpDF::infix, 250, 5, 5, moOpDP::nonedp }, - { u"\u2249", moOpDF::infix, 250, 5, 5, moOpDP::nonedp }, - { u"\u2262", moOpDF::infix, 252, 5, 5, moOpDP::nonedp }, - { u"\u2260", moOpDF::infix, 255, 5, 5, moOpDP::nonedp }, - { u"!=", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"*=", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"+=", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"-=", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"/=", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u":=", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"=", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"==", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u221D", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2224", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2225", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2226", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2241", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2243", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2244", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2245", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2246", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2247", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u224D", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2254", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2257", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2259", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u225A", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u225B", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u225C", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u225F", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2261", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2268", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2269", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u226A", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u226A\u0338", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u226B", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u226B\u0338", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u226D", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2270", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2271", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u227A", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u227B", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u227C", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u227D", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2280", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2281", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u22A5", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u22B4", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u22B5", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u22C9", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u22CA", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u22CB", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u22CC", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u22D4", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u22D6", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u22D7", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u22D8", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u22D9", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u22EA", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u22EB", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u22EC", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u22ED", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u25A0", moOpDF::infix, 260, 3, 3, moOpDP::nonedp }, - { u"\u25A1", moOpDF::infix, 260, 3, 3, moOpDP::nonedp }, - { u"\u25AA", moOpDF::infix, 260, 3, 3, moOpDP::nonedp }, - { u"\u25AB", moOpDF::infix, 260, 3, 3, moOpDP::nonedp }, - { u"\u25AD", moOpDF::infix, 260, 3, 3, moOpDP::nonedp }, - { u"\u25AE", moOpDF::infix, 260, 3, 3, moOpDP::nonedp }, - { u"\u25AF", moOpDF::infix, 260, 3, 3, moOpDP::nonedp }, - { u"\u25B0", moOpDF::infix, 260, 3, 3, moOpDP::nonedp }, - { u"\u25B1", moOpDF::infix, 260, 3, 3, moOpDP::nonedp }, - { u"\u25B3", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25B4", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25B5", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25B6", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25B7", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25B8", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25B9", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25BC", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25BD", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25BE", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25BF", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25C0", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25C1", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25C2", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25C3", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25C4", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25C5", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25C6", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25C7", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25C8", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25C9", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25CC", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25CD", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25CE", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25CF", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25D6", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25D7", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u25E6", moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, - { u"\u29C0", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u29C1", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u29E3", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u29E4", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u29E5", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u29E6", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u29F3", moOpDF::infix, 260, 3, 3, moOpDP::nonedp }, - { u"\u2A87", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2A88", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2AAF", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2AAF\u0338", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2AB0", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2AB0\u0338", moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, - { u"\u2044", moOpDF::infix, 265, 4, 4, moOpDP::stretchy }, - { u"\u2206", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u220A", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u220D", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u220E", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u2215", moOpDF::infix, 265, 4, 4, moOpDP::stretchy }, - { u"\u2217", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2218", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2219", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u221F", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2223", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2236", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2237", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2238", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2239", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u223A", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u223B", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u223D", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u223D\u0331", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u223E", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u223F", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u2242", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2242\u0338", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u224A", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u224B", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u224C", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u224E", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u224E\u0338", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u224F", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u224F\u0338", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2250", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2251", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2252", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2253", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2255", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2256", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2258", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u225D", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u225E", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2263", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2266", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2266\u0338", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2267", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u226C", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2272", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2273", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2274", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2275", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2276", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2277", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2278", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2279", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u227E", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u227F", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u227F\u0338", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u228C", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u228D", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u228E", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u228F", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u228F\u0338", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2290", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2290\u0338", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2291", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2292", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2293", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2294", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u229A", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u229B", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u229C", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u229D", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u22A6", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22A7", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22AA", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22AB", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22B0", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22B1", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22B2", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22B3", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22B6", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22B7", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22B9", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22BA", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u22BB", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u22BC", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u22BD", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u22BE", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u22BF", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u22C4", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u22C6", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u22C7", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u22C8", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22CD", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22CE", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u22CF", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u22D0", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22D1", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22D2", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u22D3", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u22D5", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22DA", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22DB", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22DC", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22DD", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22DE", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22DF", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22E0", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22E1", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22E2", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22E3", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22E4", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22E5", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22E6", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22E7", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22E8", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22E9", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22F0", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22F2", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22F3", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22F4", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22F5", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22F6", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22F7", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22F8", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22F9", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22FA", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22FB", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22FC", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22FD", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22FE", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u22FF", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u25B2", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2758", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2981", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u2982", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29A0", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29A1", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29A2", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29A3", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29A4", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29A5", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29A6", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29A7", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29A8", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29A9", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29AA", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29AB", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29AC", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29AD", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29AE", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29AF", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29B0", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29B1", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29B2", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29B3", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29B4", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29B5", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29B6", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u29B7", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u29B8", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u29B9", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u29BA", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u29BB", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u29BC", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u29BD", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u29BE", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u29BF", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u29C2", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29C3", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29C4", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u29C5", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u29C6", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u29C7", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u29C8", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u29C9", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29CA", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29CB", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29CC", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29CD", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29CE", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u29CF", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u29CF\u0338", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u29D0", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u29D0\u0338", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u29D1", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u29D2", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u29D3", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u29D4", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u29D5", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u29D6", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u29D7", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u29D8", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29D9", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29DB", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29DC", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29DD", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29DE", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u29E0", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29E1", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u29E2", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u29E7", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29E8", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29E9", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29EA", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29EB", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29EC", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29ED", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29EE", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29F0", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29F1", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29F2", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29F5", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u29F6", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u29F7", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u29F8", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29F9", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29FA", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29FB", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u29FE", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u29FF", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A1D", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u2A1E", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u2A1F", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u2A20", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u2A21", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"\u2A22", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A23", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A24", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A25", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A26", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A27", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A28", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A29", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A2A", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A2B", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A2C", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A2D", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A2E", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A30", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A31", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A32", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A33", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A34", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A35", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A36", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A37", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A38", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A39", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A3A", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A3B", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A3C", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A3D", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A3E", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A40", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A41", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A42", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A43", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A44", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A45", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A46", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A47", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A48", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A49", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A4A", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A4B", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A4C", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A4D", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A4E", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A4F", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A50", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A51", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A52", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A53", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A54", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A55", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A56", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A57", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A58", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A59", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A5A", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A5B", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A5C", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A5D", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A5E", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A5F", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A60", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A61", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A62", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A63", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A64", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A65", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A66", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A67", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A68", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A69", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A6A", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A6B", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A6C", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A6D", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A6E", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A6F", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A70", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A71", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A72", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2A73", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A74", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A75", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A76", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A77", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A78", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A79", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A7A", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A7B", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A7C", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A7D", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A7D\u0338", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A7E", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A7E\u0338", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A7F", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A80", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A81", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A82", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A83", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A84", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A85", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A86", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A89", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A8A", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A8B", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A8C", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A8D", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A8E", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A8F", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A90", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A91", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A92", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A93", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A94", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A95", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A96", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A97", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A98", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A99", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A9A", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A9B", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A9C", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A9D", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A9E", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2A9F", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AA0", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AA1", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AA1\u0338", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AA2", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AA2\u0338", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AA3", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AA4", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AA5", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AA6", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AA7", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AA8", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AA9", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AAA", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AAB", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AAC", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AAD", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AAE", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AB1", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AB2", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AB3", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AB4", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AB5", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AB6", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AB7", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AB8", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AB9", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2ABA", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2ABB", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2ABC", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2ABD", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2ABE", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2ABF", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AC0", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AC1", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AC2", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AC3", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AC4", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AC5", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AC6", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AC7", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AC8", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AC9", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2ACA", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2ACB", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2ACC", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2ACD", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2ACE", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2ACF", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AD0", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AD1", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AD2", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AD3", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AD4", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AD5", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AD6", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AD7", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AD8", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AD9", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2ADA", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2ADB", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2ADD", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2ADD\u0338", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2ADE", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2ADF", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AE0", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AE1", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AE2", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AE3", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AE4", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AE5", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AE6", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AE7", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AE8", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AE9", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AEA", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AEB", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AEC", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AED", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AEE", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AEF", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AF0", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AF1", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AF2", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AF3", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AF4", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2AF5", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2AF6", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2AF7", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AF8", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AF9", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AFA", moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, - { u"\u2AFB", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2AFD", moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, - { u"\u2AFE", moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, - { u"|", moOpDF::infix, 270, 2, 2, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"||", moOpDF::infix, 270, 2, 2, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"|||", moOpDF::infix, 270, 2, 2, moOpDP::stretchyfence | moOpDP::symmetric }, - { u"\u2190", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u2191", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u2192", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u2193", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u2194", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u2195", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u2196", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u2197", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u2198", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u2199", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u219A", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u219B", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u219C", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u219D", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u219E", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u219F", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21A0", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21A1", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21A2", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21A3", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21A4", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21A5", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21A6", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21A7", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21A8", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21A9", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21AA", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21AB", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21AC", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21AD", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21AE", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u21AF", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21B0", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21B1", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21B2", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21B3", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21B4", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21B5", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21B6", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u21B7", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u21B8", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u21B9", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21BA", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u21BB", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u21BC", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21BD", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21BE", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21BF", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21C0", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21C1", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21C2", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21C3", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21C4", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21C5", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21C6", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21C7", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21C8", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21C9", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21CA", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21CB", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21CC", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21CD", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u21CE", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u21CF", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u21D0", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21D1", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21D2", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21D3", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21D4", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21D5", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21D6", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21D7", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21D8", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21D9", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21DA", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21DB", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21DC", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21DD", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21DE", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u21DF", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u21E0", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21E1", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21E2", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21E3", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21E4", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21E5", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21E6", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21E7", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21E8", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21E9", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21EA", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21EB", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21EC", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21ED", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21EE", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21EF", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21F0", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21F1", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u21F2", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u21F3", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21F4", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u21F5", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u21F6", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21F7", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u21F8", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u21F9", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u21FA", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u21FB", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u21FC", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u21FD", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21FE", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u21FF", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u22B8", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u27F0", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u27F1", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u27F5", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u27F6", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u27F7", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u27F8", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u27F9", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u27FA", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u27FB", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u27FC", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u27FD", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u27FE", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u27FF", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u2900", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2901", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2902", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2903", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2904", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2905", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2906", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2907", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2908", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u2909", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u290A", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u290B", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u290C", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u290D", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u290E", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u290F", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u2910", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u2911", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2912", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u2913", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u2914", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2915", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2916", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2917", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2918", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2919", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u291A", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u291B", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u291C", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u291D", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u291E", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u291F", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2920", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2921", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u2922", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u2923", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u2924", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u2925", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u2926", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u2927", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u2928", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u2929", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u292A", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u292B", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u292C", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u292D", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u292E", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u292F", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u2930", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u2931", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u2932", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u2933", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2934", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u2935", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u2936", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u2937", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u2938", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u2939", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u293A", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u293B", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u293C", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u293D", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u293E", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u293F", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u2940", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u2941", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u2942", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2943", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2944", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2945", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2946", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2947", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2948", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2949", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u294A", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u294B", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u294C", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u294D", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u294E", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u294F", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u2950", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u2951", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u2952", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u2953", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u2954", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u2955", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u2956", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u2957", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u2958", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u2959", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u295A", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u295B", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u295C", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u295D", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u295E", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u295F", moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, - { u"\u2960", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u2961", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u2962", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2963", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u2964", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2965", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u2966", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2967", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2968", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2969", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u296A", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u296B", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u296C", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u296D", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u296E", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u296F", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u2970", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2971", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2972", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2973", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2974", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2975", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2976", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2977", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2978", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u2979", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u297A", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u297B", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u297C", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u297D", moOpDF::infix, 270, 5, 5, moOpDP::accent }, - { u"\u297E", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u297F", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u2999", moOpDF::infix, 270, 3, 3, moOpDP::nonedp }, - { u"\u299A", moOpDF::infix, 270, 3, 3, moOpDP::nonedp }, - { u"\u299B", moOpDF::infix, 270, 3, 3, moOpDP::nonedp }, - { u"\u299C", moOpDF::infix, 270, 3, 3, moOpDP::nonedp }, - { u"\u299D", moOpDF::infix, 270, 3, 3, moOpDP::nonedp }, - { u"\u299E", moOpDF::infix, 270, 3, 3, moOpDP::nonedp }, - { u"\u299F", moOpDF::infix, 270, 3, 3, moOpDP::nonedp }, - { u"\u29DF", moOpDF::infix, 270, 3, 3, moOpDP::nonedp }, - { u"\u29EF", moOpDF::infix, 270, 3, 3, moOpDP::nonedp }, - { u"\u29F4", moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, - { u"\u2B45", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"\u2B46", moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, - { u"+", moOpDF::infix, 275, 4, 4, moOpDP::nonedp }, - { u"+", moOpDF::prefix, 275, 0, 1, moOpDP::nonedp }, - { u"-", moOpDF::infix, 275, 4, 4, moOpDP::nonedp }, - { u"-", moOpDF::prefix, 275, 0, 1, moOpDP::nonedp }, - { u"\u00B1", moOpDF::infix, 275, 4, 4, moOpDP::nonedp }, - { u"\u00B1", moOpDF::prefix, 275, 0, 1, moOpDP::nonedp }, - { u"\u2212", moOpDF::infix, 275, 4, 4, moOpDP::nonedp }, - { u"\u2212", moOpDF::prefix, 275, 0, 1, moOpDP::nonedp }, - { u"\u2213", moOpDF::infix, 275, 4, 4, moOpDP::nonedp }, - { u"\u2213", moOpDF::prefix, 275, 0, 1, moOpDP::nonedp }, - { u"\u2214", moOpDF::infix, 275, 4, 4, moOpDP::nonedp }, - { u"\u229E", moOpDF::infix, 275, 4, 4, moOpDP::nonedp }, - { u"\u229F", moOpDF::infix, 275, 4, 4, moOpDP::nonedp }, - { u"\u2211", moOpDF::prefix, 290, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u2A0A", moOpDF::prefix, 290, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u2A0B", moOpDF::prefix, 290, 1, 2, moOpDP::largeop | moOpDP::symmetric }, - { u"\u222C", moOpDF::prefix, 300, 0, 1, moOpDP::largeop | moOpDP::symmetric }, - { u"\u222D", moOpDF::prefix, 300, 0, 1, moOpDP::largeop | moOpDP::symmetric }, - { u"\u2295", moOpDF::infix, 300, 4, 4, moOpDP::nonedp }, - { u"\u2296", moOpDF::infix, 300, 4, 4, moOpDP::nonedp }, - { u"\u2298", moOpDF::infix, 300, 4, 4, moOpDP::nonedp }, - { u"\u2A01", moOpDF::prefix, 300, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u222B", moOpDF::prefix, 310, 0, 1, moOpDP::largeop | moOpDP::symmetric }, - { u"\u222E", moOpDF::prefix, 310, 0, 1, moOpDP::largeop | moOpDP::symmetric }, - { u"\u222F", moOpDF::prefix, 310, 0, 1, moOpDP::largeop | moOpDP::symmetric }, - { u"\u2230", moOpDF::prefix, 310, 0, 1, moOpDP::largeop | moOpDP::symmetric }, - { u"\u2231", moOpDF::prefix, 310, 0, 1, moOpDP::largeop | moOpDP::symmetric }, - { u"\u2232", moOpDF::prefix, 310, 0, 1, moOpDP::largeop | moOpDP::symmetric }, - { u"\u2233", moOpDF::prefix, 310, 0, 1, moOpDP::largeop | moOpDP::symmetric }, - { u"\u2A0C", moOpDF::prefix, 310, 0, 1, moOpDP::largeop | moOpDP::symmetric }, - { u"\u2A0D", moOpDF::prefix, 310, 1, 2, moOpDP::largeop | moOpDP::symmetric }, - { u"\u2A0E", moOpDF::prefix, 310, 1, 2, moOpDP::largeop | moOpDP::symmetric }, - { u"\u2A0F", moOpDF::prefix, 310, 1, 2, moOpDP::largeop | moOpDP::symmetric }, - { u"\u2A10", moOpDF::prefix, 310, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u2A11", moOpDF::prefix, 310, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u2A12", moOpDF::prefix, 310, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u2A13", moOpDF::prefix, 310, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u2A14", moOpDF::prefix, 310, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u2A15", moOpDF::prefix, 310, 1, 2, moOpDP::largeop | moOpDP::symmetric }, - { u"\u2A16", moOpDF::prefix, 310, 1, 2, moOpDP::largeop | moOpDP::symmetric }, - { u"\u2A17", moOpDF::prefix, 310, 1, 2, moOpDP::largeop | moOpDP::symmetric }, - { u"\u2A18", moOpDF::prefix, 310, 1, 2, moOpDP::largeop | moOpDP::symmetric }, - { u"\u2A19", moOpDF::prefix, 310, 1, 2, moOpDP::largeop | moOpDP::symmetric }, - { u"\u2A1A", moOpDF::prefix, 310, 1, 2, moOpDP::largeop | moOpDP::symmetric }, - { u"\u2A1B", moOpDF::prefix, 310, 1, 2, moOpDP::largeop | moOpDP::symmetric }, - { u"\u2A1C", moOpDF::prefix, 310, 1, 2, moOpDP::largeop | moOpDP::symmetric }, - { u"\u22C3", moOpDF::prefix, 320, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u2A03", moOpDF::prefix, 320, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u2A04", moOpDF::prefix, 320, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u22C0", moOpDF::prefix, 330, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u22C1", moOpDF::prefix, 330, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u22C2", moOpDF::prefix, 330, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u2A00", moOpDF::prefix, 330, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u2A02", moOpDF::prefix, 330, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u2A05", moOpDF::prefix, 330, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u2A06", moOpDF::prefix, 330, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u2A07", moOpDF::prefix, 330, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u2A08", moOpDF::prefix, 330, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u2A09", moOpDF::prefix, 330, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u2AFC", moOpDF::prefix, 330, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u2AFF", moOpDF::prefix, 330, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u2240", moOpDF::infix, 340, 4, 4, moOpDP::nonedp }, - { u"\u220F", moOpDF::prefix, 350, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u2210", moOpDF::prefix, 350, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, - { u"\u2229", moOpDF::infix, 350, 4, 4, moOpDP::nonedp }, - { u"\u222A", moOpDF::infix, 350, 4, 4, moOpDP::nonedp }, - { u"*", moOpDF::infix, 390, 3, 3, moOpDP::nonedp }, - { u".", moOpDF::infix, 390, 3, 3, moOpDP::nonedp }, - { u"\u00D7", moOpDF::infix, 390, 4, 4, moOpDP::nonedp }, - { u"\u2022", moOpDF::infix, 390, 4, 4, moOpDP::nonedp }, - { u"\u2043", moOpDF::infix, 390, 4, 4, moOpDP::nonedp }, - { u"\u2062", moOpDF::infix, 390, 0, 0, moOpDP::nonedp }, - { u"\u22A0", moOpDF::infix, 390, 4, 4, moOpDP::nonedp }, - { u"\u22A1", moOpDF::infix, 390, 4, 4, moOpDP::nonedp }, - { u"\u22C5", moOpDF::infix, 390, 4, 4, moOpDP::nonedp }, - { u"\u2A2F", moOpDF::infix, 390, 4, 4, moOpDP::nonedp }, - { u"\u2A3F", moOpDF::infix, 390, 4, 4, moOpDP::nonedp }, - { u"\u00B7", moOpDF::infix, 400, 4, 4, moOpDP::nonedp }, - { u"\u2297", moOpDF::infix, 410, 4, 4, moOpDP::nonedp }, - { u"%", moOpDF::infix, 640, 3, 3, moOpDP::nonedp }, - { u"\\", moOpDF::infix, 650, 0, 0, moOpDP::nonedp }, - { u"\u2216", moOpDF::infix, 650, 4, 4, moOpDP::nonedp }, - { u"/", moOpDF::infix, 660, 1, 1, moOpDP::nonedp }, - { u"\u00F7", moOpDF::infix, 660, 4, 4, moOpDP::nonedp }, - { u"\u2220", moOpDF::prefix, 670, 0, 0, moOpDP::nonedp }, - { u"\u2221", moOpDF::prefix, 670, 0, 0, moOpDP::nonedp }, - { u"\u2222", moOpDF::prefix, 670, 0, 0, moOpDP::nonedp }, - { u"\u00AC", moOpDF::prefix, 680, 2, 1, moOpDP::nonedp }, - { u"\u2299", moOpDF::infix, 710, 4, 4, moOpDP::nonedp }, - { u"\u2202", moOpDF::prefix, 740, 2, 1, moOpDP::nonedp }, - { u"\u2207", moOpDF::prefix, 740, 2, 1, moOpDP::nonedp }, - { u"**", moOpDF::infix, 780, 1, 1, moOpDP::nonedp }, - { u"<>", moOpDF::infix, 780, 1, 1, moOpDP::nonedp }, - { u"^", moOpDF::infix, 780, 1, 1, moOpDP::nonedp }, - { u"\u2032", moOpDF::postfix, 800, 0, 0, moOpDP::nonedp }, - { u"\u266D", moOpDF::postfix, 800, 0, 2, moOpDP::nonedp }, - { u"\u266E", moOpDF::postfix, 800, 0, 2, moOpDP::nonedp }, - { u"\u266F", moOpDF::postfix, 800, 0, 2, moOpDP::nonedp }, - { u"!", moOpDF::postfix, 810, 1, 0, moOpDP::nonedp }, - { u"!!", moOpDF::postfix, 810, 1, 0, moOpDP::nonedp }, - { u"//", moOpDF::infix, 820, 1, 1, moOpDP::nonedp }, - { u"@", moOpDF::infix, 825, 1, 1, moOpDP::nonedp }, - { u"?", moOpDF::infix, 835, 1, 1, moOpDP::nonedp }, - { u"\u2145", moOpDF::prefix, 845, 2, 1, moOpDP::nonedp }, - { u"\u2146", moOpDF::prefix, 845, 2, 0, moOpDP::nonedp }, - { u"\u221A", moOpDF::prefix, 845, 1, 1, moOpDP::stretchy }, - { u"\u221B", moOpDF::prefix, 845, 1, 1, moOpDP::nonedp }, - { u"\u221C", moOpDF::prefix, 845, 1, 1, moOpDP::nonedp }, - { u"\u2061", moOpDF::infix, 850, 0, 0, moOpDP::nonedp }, - { u"\"", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"&", moOpDF::postfix, 880, 0, 0, moOpDP::nonedp }, - { u"\'", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"++", moOpDF::postfix, 880, 0, 0, moOpDP::nonedp }, - { u"--", moOpDF::postfix, 880, 0, 0, moOpDP::nonedp }, - { u"^", moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, - { u"_", moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, - { u"`", moOpDF::postfix, 880, 0, 00, moOpDP::accent }, - { u"~", moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, - { u"\u00A8", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u00AA", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u00AF", moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, - { u"\u00B0", moOpDF::postfix, 880, 0, 0, moOpDP::nonedp }, - { u"\u00B2", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u00B3", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u00B4", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u00B8", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u00B9", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u00BA", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u02C6", moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, - { u"\u02C7", moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, - { u"\u02C9", moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, - { u"\u02CA", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u02CB", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u02CD", moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, - { u"\u02D8", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u02D9", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u02DA", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u02DC", moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, - { u"\u02DD", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u02F7", moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, - { u"\u0302", moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, - { u"\u0311", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u201A", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u201B", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u201E", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u201F", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u2033", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u2034", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u2035", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u2036", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u2037", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u203E", moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, - { u"\u2057", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u2064", moOpDF::infix, 880, 0, 0, moOpDP::nonedp }, - { u"\u20DB", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u20DC", moOpDF::postfix, 880, 0, 0, moOpDP::accent }, - { u"\u23B4", moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, - { u"\u23B5", moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, - { u"\u23DC", moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, - { u"\u23DD", moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, - { u"\u23DE", moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, - { u"\u23DF", moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, - { u"\u23E0", moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, - { u"\u23E1", moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, - { u"_", moOpDF::infix, 900, 1, 1, moOpDP::nonedp } }; + = { { u"\u2018"_ustr, moOpDF::prefix, 10, 0, 0, moOpDP::fence | moOpDP::nonedp }, + { u"\u2019"_ustr, moOpDF::postfix, 10, 0, 0, moOpDP::fence | moOpDP::nonedp }, + { u"\u201C"_ustr, moOpDF::prefix, 10, 0, 0, moOpDP::fence | moOpDP::nonedp }, + { u"\u201D"_ustr, moOpDF::postfix, 10, 0, 0, moOpDP::fence | moOpDP::nonedp }, + { u"("_ustr, moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u")"_ustr, moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"["_ustr, moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"]"_ustr, moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"{"_ustr, moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"|"_ustr, moOpDF::prepostfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"||"_ustr, moOpDF::prepostfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"|||"_ustr, moOpDF::prepostfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"}"_ustr, moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u2016"_ustr, moOpDF::prepostfix, 20, 0, 0, moOpDP::stretchyfence }, + { u"\u2308"_ustr, moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u2309"_ustr, moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u230A"_ustr, moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u230B"_ustr, moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u2329"_ustr, moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u232A"_ustr, moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u2772"_ustr, moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u2773"_ustr, moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u27E6"_ustr, moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u27E7"_ustr, moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u27E8"_ustr, moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u27E9"_ustr, moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u27EA"_ustr, moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u27EB"_ustr, moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u27EC"_ustr, moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u27ED"_ustr, moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u27EE"_ustr, moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u27EF"_ustr, moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u2980"_ustr, moOpDF::prepostfix, 20, 0, 0, moOpDP::stretchyfence }, + { u"\u2983"_ustr, moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u2984"_ustr, moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u2985"_ustr, moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u2986"_ustr, moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u2987"_ustr, moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u2988"_ustr, moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u2989"_ustr, moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u298A"_ustr, moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u298B"_ustr, moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u298C"_ustr, moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u298D"_ustr, moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u298E"_ustr, moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u298F"_ustr, moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u2990"_ustr, moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u2991"_ustr, moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u2992"_ustr, moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u2993"_ustr, moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u2994"_ustr, moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u2995"_ustr, moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u2996"_ustr, moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u2997"_ustr, moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u2998"_ustr, moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u29FC"_ustr, moOpDF::prefix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u29FD"_ustr, moOpDF::postfix, 20, 0, 0, moOpDP::stretchyfence | moOpDP::symmetric }, + { u";"_ustr, moOpDF::infix, 30, 0, 3, moOpDP::separator | moOpDP::linebreakstyleAfter }, + { u","_ustr, moOpDF::infix, 40, 0, 3, moOpDP::separator | moOpDP::linebreakstyleAfter }, + { u"\u2063"_ustr, moOpDF::infix, 40, 0, 0, + moOpDP::separator | moOpDP::linebreakstyleAfter }, + { u"\u2234"_ustr, moOpDF::infix, 70, 5, 5, moOpDP::nonedp }, + { u"\u2235"_ustr, moOpDF::infix, 70, 5, 5, moOpDP::nonedp }, + { u"->"_ustr, moOpDF::infix, 90, 5, 5, moOpDP::nonedp }, + { u".."_ustr, moOpDF::postfix, 100, 0, 0, moOpDP::nonedp }, + { u"..."_ustr, moOpDF::postfix, 100, 0, 0, moOpDP::nonedp }, + { u":"_ustr, moOpDF::infix, 100, 1, 2, moOpDP::nonedp }, + { u"\u03F6"_ustr, moOpDF::infix, 110, 5, 5, moOpDP::nonedp }, + { u"\u2026"_ustr, moOpDF::infix, 150, 0, 0, moOpDP::nonedp }, + { u"\u22EE"_ustr, moOpDF::infix, 150, 5, 5, moOpDP::nonedp }, + { u"\u22EF"_ustr, moOpDF::infix, 150, 0, 0, moOpDP::nonedp }, + { u"\u22F1"_ustr, moOpDF::infix, 150, 5, 5, moOpDP::nonedp }, + { u"\u220B"_ustr, moOpDF::infix, 160, 5, 5, moOpDP::nonedp }, + { u"\u22A2"_ustr, moOpDF::infix, 170, 5, 5, moOpDP::nonedp }, + { u"\u22A3"_ustr, moOpDF::infix, 170, 5, 5, moOpDP::nonedp }, + { u"\u22A4"_ustr, moOpDF::infix, 170, 5, 5, moOpDP::nonedp }, + { u"\u22A8"_ustr, moOpDF::infix, 170, 5, 5, moOpDP::nonedp }, + { u"\u22A9"_ustr, moOpDF::infix, 170, 5, 5, moOpDP::nonedp }, + { u"\u22AC"_ustr, moOpDF::infix, 170, 5, 5, moOpDP::nonedp }, + { u"\u22AD"_ustr, moOpDF::infix, 170, 5, 5, moOpDP::nonedp }, + { u"\u22AE"_ustr, moOpDF::infix, 170, 5, 5, moOpDP::nonedp }, + { u"\u22AF"_ustr, moOpDF::infix, 170, 5, 5, moOpDP::nonedp }, + { u"\u2228"_ustr, moOpDF::infix, 190, 4, 4, moOpDP::nonedp }, + { u"&&"_ustr, moOpDF::infix, 200, 4, 4, moOpDP::nonedp }, + { u"\u2227"_ustr, moOpDF::infix, 200, 4, 4, moOpDP::nonedp }, + { u"\u2200"_ustr, moOpDF::prefix, 230, 2, 1, moOpDP::nonedp }, + { u"\u2203"_ustr, moOpDF::prefix, 230, 2, 1, moOpDP::nonedp }, + { u"\u2204"_ustr, moOpDF::prefix, 230, 2, 1, moOpDP::nonedp }, + { u"\u2201"_ustr, moOpDF::infix, 240, 1, 2, moOpDP::nonedp }, + { u"\u2208"_ustr, moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, + { u"\u2209"_ustr, moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, + { u"\u220C"_ustr, moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, + { u"\u2282"_ustr, moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, + { u"\u2282\u20D2"_ustr, moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, + { u"\u2283"_ustr, moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, + { u"\u2283\u20D2"_ustr, moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, + { u"\u2284"_ustr, moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, + { u"\u2285"_ustr, moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, + { u"\u2286"_ustr, moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, + { u"\u2287"_ustr, moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, + { u"\u2288"_ustr, moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, + { u"\u2289"_ustr, moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, + { u"\u228A"_ustr, moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, + { u"\u228B"_ustr, moOpDF::infix, 240, 5, 5, moOpDP::nonedp }, + { u"<="_ustr, moOpDF::infix, 241, 5, 5, moOpDP::nonedp }, + { u"\u2264"_ustr, moOpDF::infix, 241, 5, 5, moOpDP::nonedp }, + { u"\u2265"_ustr, moOpDF::infix, 242, 5, 5, moOpDP::nonedp }, + { u">"_ustr, moOpDF::infix, 243, 5, 5, moOpDP::nonedp }, + { u">="_ustr, moOpDF::infix, 243, 5, 5, moOpDP::nonedp }, + { u"\u226F"_ustr, moOpDF::infix, 244, 5, 5, moOpDP::nonedp }, + { u"<"_ustr, moOpDF::infix, 245, 5, 5, moOpDP::nonedp }, + { u"\u226E"_ustr, moOpDF::infix, 246, 5, 5, moOpDP::nonedp }, + { u"\u2248"_ustr, moOpDF::infix, 247, 5, 5, moOpDP::nonedp }, + { u"\u223C"_ustr, moOpDF::infix, 250, 5, 5, moOpDP::nonedp }, + { u"\u2249"_ustr, moOpDF::infix, 250, 5, 5, moOpDP::nonedp }, + { u"\u2262"_ustr, moOpDF::infix, 252, 5, 5, moOpDP::nonedp }, + { u"\u2260"_ustr, moOpDF::infix, 255, 5, 5, moOpDP::nonedp }, + { u"!="_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"*="_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"+="_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"-="_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"/="_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u":="_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"="_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"=="_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u221D"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2224"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2225"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2226"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2241"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2243"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2244"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2245"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2246"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2247"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u224D"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2254"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2257"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2259"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u225A"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u225B"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u225C"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u225F"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2261"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2268"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2269"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u226A"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u226A\u0338"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u226B"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u226B\u0338"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u226D"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2270"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2271"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u227A"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u227B"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u227C"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u227D"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2280"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2281"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u22A5"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u22B4"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u22B5"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u22C9"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u22CA"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u22CB"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u22CC"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u22D4"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u22D6"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u22D7"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u22D8"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u22D9"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u22EA"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u22EB"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u22EC"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u22ED"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u25A0"_ustr, moOpDF::infix, 260, 3, 3, moOpDP::nonedp }, + { u"\u25A1"_ustr, moOpDF::infix, 260, 3, 3, moOpDP::nonedp }, + { u"\u25AA"_ustr, moOpDF::infix, 260, 3, 3, moOpDP::nonedp }, + { u"\u25AB"_ustr, moOpDF::infix, 260, 3, 3, moOpDP::nonedp }, + { u"\u25AD"_ustr, moOpDF::infix, 260, 3, 3, moOpDP::nonedp }, + { u"\u25AE"_ustr, moOpDF::infix, 260, 3, 3, moOpDP::nonedp }, + { u"\u25AF"_ustr, moOpDF::infix, 260, 3, 3, moOpDP::nonedp }, + { u"\u25B0"_ustr, moOpDF::infix, 260, 3, 3, moOpDP::nonedp }, + { u"\u25B1"_ustr, moOpDF::infix, 260, 3, 3, moOpDP::nonedp }, + { u"\u25B3"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25B4"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25B5"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25B6"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25B7"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25B8"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25B9"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25BC"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25BD"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25BE"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25BF"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25C0"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25C1"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25C2"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25C3"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25C4"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25C5"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25C6"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25C7"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25C8"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25C9"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25CC"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25CD"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25CE"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25CF"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25D6"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25D7"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u25E6"_ustr, moOpDF::infix, 260, 4, 4, moOpDP::nonedp }, + { u"\u29C0"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u29C1"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u29E3"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u29E4"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u29E5"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u29E6"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u29F3"_ustr, moOpDF::infix, 260, 3, 3, moOpDP::nonedp }, + { u"\u2A87"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2A88"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2AAF"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2AAF\u0338"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2AB0"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2AB0\u0338"_ustr, moOpDF::infix, 260, 5, 5, moOpDP::nonedp }, + { u"\u2044"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::stretchy }, + { u"\u2206"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u220A"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u220D"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u220E"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u2215"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::stretchy }, + { u"\u2217"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2218"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2219"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u221F"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2223"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2236"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2237"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2238"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2239"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u223A"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u223B"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u223D"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u223D\u0331"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u223E"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u223F"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u2242"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2242\u0338"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u224A"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u224B"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u224C"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u224E"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u224E\u0338"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u224F"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u224F\u0338"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2250"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2251"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2252"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2253"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2255"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2256"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2258"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u225D"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u225E"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2263"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2266"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2266\u0338"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2267"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u226C"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2272"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2273"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2274"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2275"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2276"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2277"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2278"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2279"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u227E"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u227F"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u227F\u0338"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u228C"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u228D"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u228E"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u228F"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u228F\u0338"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2290"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2290\u0338"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2291"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2292"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2293"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2294"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u229A"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u229B"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u229C"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u229D"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u22A6"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22A7"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22AA"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22AB"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22B0"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22B1"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22B2"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22B3"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22B6"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22B7"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22B9"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22BA"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u22BB"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u22BC"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u22BD"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u22BE"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u22BF"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u22C4"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u22C6"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u22C7"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u22C8"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22CD"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22CE"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u22CF"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u22D0"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22D1"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22D2"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u22D3"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u22D5"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22DA"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22DB"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22DC"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22DD"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22DE"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22DF"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22E0"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22E1"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22E2"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22E3"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22E4"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22E5"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22E6"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22E7"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22E8"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22E9"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22F0"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22F2"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22F3"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22F4"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22F5"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22F6"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22F7"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22F8"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22F9"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22FA"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22FB"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22FC"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22FD"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22FE"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u22FF"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u25B2"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2758"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2981"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u2982"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29A0"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29A1"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29A2"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29A3"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29A4"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29A5"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29A6"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29A7"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29A8"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29A9"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29AA"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29AB"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29AC"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29AD"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29AE"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29AF"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29B0"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29B1"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29B2"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29B3"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29B4"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29B5"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29B6"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u29B7"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u29B8"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u29B9"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u29BA"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u29BB"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u29BC"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u29BD"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u29BE"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u29BF"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u29C2"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29C3"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29C4"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u29C5"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u29C6"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u29C7"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u29C8"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u29C9"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29CA"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29CB"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29CC"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29CD"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29CE"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u29CF"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u29CF\u0338"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u29D0"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u29D0\u0338"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u29D1"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u29D2"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u29D3"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u29D4"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u29D5"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u29D6"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u29D7"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u29D8"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29D9"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29DB"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29DC"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29DD"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29DE"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u29E0"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29E1"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u29E2"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u29E7"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29E8"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29E9"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29EA"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29EB"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29EC"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29ED"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29EE"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29F0"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29F1"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29F2"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29F5"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u29F6"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u29F7"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u29F8"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29F9"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29FA"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29FB"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u29FE"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u29FF"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A1D"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u2A1E"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u2A1F"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u2A20"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u2A21"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"\u2A22"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A23"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A24"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A25"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A26"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A27"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A28"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A29"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A2A"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A2B"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A2C"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A2D"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A2E"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A30"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A31"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A32"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A33"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A34"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A35"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A36"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A37"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A38"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A39"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A3A"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A3B"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A3C"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A3D"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A3E"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A40"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A41"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A42"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A43"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A44"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A45"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A46"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A47"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A48"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A49"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A4A"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A4B"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A4C"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A4D"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A4E"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A4F"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A50"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A51"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A52"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A53"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A54"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A55"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A56"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A57"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A58"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A59"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A5A"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A5B"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A5C"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A5D"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A5E"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A5F"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A60"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A61"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A62"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A63"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A64"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A65"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A66"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A67"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A68"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A69"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A6A"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A6B"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A6C"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A6D"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A6E"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A6F"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A70"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A71"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A72"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2A73"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A74"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A75"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A76"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A77"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A78"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A79"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A7A"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A7B"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A7C"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A7D"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A7D\u0338"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A7E"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A7E\u0338"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A7F"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A80"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A81"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A82"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A83"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A84"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A85"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A86"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A89"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A8A"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A8B"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A8C"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A8D"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A8E"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A8F"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A90"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A91"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A92"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A93"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A94"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A95"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A96"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A97"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A98"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A99"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A9A"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A9B"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A9C"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A9D"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A9E"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2A9F"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AA0"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AA1"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AA1\u0338"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AA2"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AA2\u0338"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AA3"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AA4"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AA5"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AA6"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AA7"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AA8"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AA9"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AAA"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AAB"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AAC"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AAD"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AAE"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AB1"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AB2"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AB3"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AB4"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AB5"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AB6"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AB7"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AB8"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AB9"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2ABA"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2ABB"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2ABC"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2ABD"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2ABE"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2ABF"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AC0"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AC1"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AC2"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AC3"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AC4"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AC5"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AC6"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AC7"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AC8"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AC9"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2ACA"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2ACB"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2ACC"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2ACD"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2ACE"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2ACF"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AD0"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AD1"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AD2"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AD3"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AD4"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AD5"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AD6"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AD7"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AD8"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AD9"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2ADA"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2ADB"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2ADD"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2ADD\u0338"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2ADE"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2ADF"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AE0"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AE1"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AE2"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AE3"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AE4"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AE5"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AE6"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AE7"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AE8"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AE9"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AEA"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AEB"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AEC"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AED"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AEE"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AEF"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AF0"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AF1"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AF2"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AF3"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AF4"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2AF5"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2AF6"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2AF7"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AF8"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AF9"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AFA"_ustr, moOpDF::infix, 265, 5, 5, moOpDP::nonedp }, + { u"\u2AFB"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2AFD"_ustr, moOpDF::infix, 265, 4, 4, moOpDP::nonedp }, + { u"\u2AFE"_ustr, moOpDF::infix, 265, 3, 3, moOpDP::nonedp }, + { u"|"_ustr, moOpDF::infix, 270, 2, 2, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"||"_ustr, moOpDF::infix, 270, 2, 2, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"|||"_ustr, moOpDF::infix, 270, 2, 2, moOpDP::stretchyfence | moOpDP::symmetric }, + { u"\u2190"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u2191"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u2192"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u2193"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u2194"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u2195"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u2196"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u2197"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u2198"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u2199"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u219A"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u219B"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u219C"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u219D"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u219E"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u219F"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21A0"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21A1"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21A2"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21A3"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21A4"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21A5"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21A6"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21A7"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21A8"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21A9"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21AA"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21AB"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21AC"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21AD"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21AE"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u21AF"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21B0"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21B1"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21B2"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21B3"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21B4"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21B5"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21B6"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u21B7"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u21B8"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u21B9"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21BA"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u21BB"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u21BC"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21BD"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21BE"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21BF"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21C0"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21C1"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21C2"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21C3"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21C4"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21C5"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21C6"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21C7"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21C8"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21C9"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21CA"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21CB"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21CC"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21CD"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u21CE"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u21CF"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u21D0"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21D1"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21D2"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21D3"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21D4"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21D5"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21D6"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21D7"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21D8"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21D9"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21DA"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21DB"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21DC"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21DD"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21DE"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u21DF"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u21E0"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21E1"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21E2"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21E3"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21E4"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21E5"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21E6"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21E7"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21E8"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21E9"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21EA"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21EB"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21EC"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21ED"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21EE"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21EF"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21F0"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21F1"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u21F2"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u21F3"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21F4"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u21F5"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u21F6"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21F7"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u21F8"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u21F9"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u21FA"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u21FB"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u21FC"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u21FD"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21FE"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u21FF"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u22B8"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u27F0"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u27F1"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u27F5"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u27F6"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u27F7"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u27F8"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u27F9"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u27FA"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u27FB"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u27FC"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u27FD"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u27FE"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u27FF"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u2900"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2901"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2902"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2903"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2904"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2905"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2906"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2907"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2908"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u2909"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u290A"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u290B"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u290C"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u290D"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u290E"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u290F"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u2910"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u2911"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2912"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u2913"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u2914"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2915"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2916"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2917"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2918"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2919"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u291A"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u291B"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u291C"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u291D"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u291E"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u291F"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2920"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2921"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u2922"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u2923"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u2924"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u2925"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u2926"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u2927"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u2928"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u2929"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u292A"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u292B"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u292C"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u292D"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u292E"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u292F"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u2930"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u2931"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u2932"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u2933"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2934"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u2935"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u2936"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u2937"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u2938"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u2939"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u293A"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u293B"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u293C"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u293D"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u293E"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u293F"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u2940"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u2941"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u2942"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2943"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2944"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2945"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2946"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2947"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2948"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2949"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u294A"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u294B"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u294C"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u294D"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u294E"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u294F"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u2950"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u2951"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u2952"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u2953"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u2954"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u2955"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u2956"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u2957"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u2958"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u2959"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u295A"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u295B"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u295C"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u295D"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u295E"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u295F"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy | moOpDP::accent }, + { u"\u2960"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u2961"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u2962"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2963"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u2964"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2965"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u2966"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2967"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2968"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2969"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u296A"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u296B"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u296C"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u296D"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u296E"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u296F"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u2970"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2971"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2972"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2973"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2974"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2975"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2976"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2977"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2978"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u2979"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u297A"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u297B"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u297C"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u297D"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::accent }, + { u"\u297E"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u297F"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u2999"_ustr, moOpDF::infix, 270, 3, 3, moOpDP::nonedp }, + { u"\u299A"_ustr, moOpDF::infix, 270, 3, 3, moOpDP::nonedp }, + { u"\u299B"_ustr, moOpDF::infix, 270, 3, 3, moOpDP::nonedp }, + { u"\u299C"_ustr, moOpDF::infix, 270, 3, 3, moOpDP::nonedp }, + { u"\u299D"_ustr, moOpDF::infix, 270, 3, 3, moOpDP::nonedp }, + { u"\u299E"_ustr, moOpDF::infix, 270, 3, 3, moOpDP::nonedp }, + { u"\u299F"_ustr, moOpDF::infix, 270, 3, 3, moOpDP::nonedp }, + { u"\u29DF"_ustr, moOpDF::infix, 270, 3, 3, moOpDP::nonedp }, + { u"\u29EF"_ustr, moOpDF::infix, 270, 3, 3, moOpDP::nonedp }, + { u"\u29F4"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::nonedp }, + { u"\u2B45"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"\u2B46"_ustr, moOpDF::infix, 270, 5, 5, moOpDP::stretchy }, + { u"+"_ustr, moOpDF::infix, 275, 4, 4, moOpDP::nonedp }, + { u"+"_ustr, moOpDF::prefix, 275, 0, 1, moOpDP::nonedp }, + { u"-"_ustr, moOpDF::infix, 275, 4, 4, moOpDP::nonedp }, + { u"-"_ustr, moOpDF::prefix, 275, 0, 1, moOpDP::nonedp }, + { u"\u00B1"_ustr, moOpDF::infix, 275, 4, 4, moOpDP::nonedp }, + { u"\u00B1"_ustr, moOpDF::prefix, 275, 0, 1, moOpDP::nonedp }, + { u"\u2212"_ustr, moOpDF::infix, 275, 4, 4, moOpDP::nonedp }, + { u"\u2212"_ustr, moOpDF::prefix, 275, 0, 1, moOpDP::nonedp }, + { u"\u2213"_ustr, moOpDF::infix, 275, 4, 4, moOpDP::nonedp }, + { u"\u2213"_ustr, moOpDF::prefix, 275, 0, 1, moOpDP::nonedp }, + { u"\u2214"_ustr, moOpDF::infix, 275, 4, 4, moOpDP::nonedp }, + { u"\u229E"_ustr, moOpDF::infix, 275, 4, 4, moOpDP::nonedp }, + { u"\u229F"_ustr, moOpDF::infix, 275, 4, 4, moOpDP::nonedp }, + { u"\u2211"_ustr, moOpDF::prefix, 290, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u2A0A"_ustr, moOpDF::prefix, 290, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u2A0B"_ustr, moOpDF::prefix, 290, 1, 2, moOpDP::largeop | moOpDP::symmetric }, + { u"\u222C"_ustr, moOpDF::prefix, 300, 0, 1, moOpDP::largeop | moOpDP::symmetric }, + { u"\u222D"_ustr, moOpDF::prefix, 300, 0, 1, moOpDP::largeop | moOpDP::symmetric }, + { u"\u2295"_ustr, moOpDF::infix, 300, 4, 4, moOpDP::nonedp }, + { u"\u2296"_ustr, moOpDF::infix, 300, 4, 4, moOpDP::nonedp }, + { u"\u2298"_ustr, moOpDF::infix, 300, 4, 4, moOpDP::nonedp }, + { u"\u2A01"_ustr, moOpDF::prefix, 300, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u222B"_ustr, moOpDF::prefix, 310, 0, 1, moOpDP::largeop | moOpDP::symmetric }, + { u"\u222E"_ustr, moOpDF::prefix, 310, 0, 1, moOpDP::largeop | moOpDP::symmetric }, + { u"\u222F"_ustr, moOpDF::prefix, 310, 0, 1, moOpDP::largeop | moOpDP::symmetric }, + { u"\u2230"_ustr, moOpDF::prefix, 310, 0, 1, moOpDP::largeop | moOpDP::symmetric }, + { u"\u2231"_ustr, moOpDF::prefix, 310, 0, 1, moOpDP::largeop | moOpDP::symmetric }, + { u"\u2232"_ustr, moOpDF::prefix, 310, 0, 1, moOpDP::largeop | moOpDP::symmetric }, + { u"\u2233"_ustr, moOpDF::prefix, 310, 0, 1, moOpDP::largeop | moOpDP::symmetric }, + { u"\u2A0C"_ustr, moOpDF::prefix, 310, 0, 1, moOpDP::largeop | moOpDP::symmetric }, + { u"\u2A0D"_ustr, moOpDF::prefix, 310, 1, 2, moOpDP::largeop | moOpDP::symmetric }, + { u"\u2A0E"_ustr, moOpDF::prefix, 310, 1, 2, moOpDP::largeop | moOpDP::symmetric }, + { u"\u2A0F"_ustr, moOpDF::prefix, 310, 1, 2, moOpDP::largeop | moOpDP::symmetric }, + { u"\u2A10"_ustr, moOpDF::prefix, 310, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u2A11"_ustr, moOpDF::prefix, 310, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u2A12"_ustr, moOpDF::prefix, 310, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u2A13"_ustr, moOpDF::prefix, 310, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u2A14"_ustr, moOpDF::prefix, 310, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u2A15"_ustr, moOpDF::prefix, 310, 1, 2, moOpDP::largeop | moOpDP::symmetric }, + { u"\u2A16"_ustr, moOpDF::prefix, 310, 1, 2, moOpDP::largeop | moOpDP::symmetric }, + { u"\u2A17"_ustr, moOpDF::prefix, 310, 1, 2, moOpDP::largeop | moOpDP::symmetric }, + { u"\u2A18"_ustr, moOpDF::prefix, 310, 1, 2, moOpDP::largeop | moOpDP::symmetric }, + { u"\u2A19"_ustr, moOpDF::prefix, 310, 1, 2, moOpDP::largeop | moOpDP::symmetric }, + { u"\u2A1A"_ustr, moOpDF::prefix, 310, 1, 2, moOpDP::largeop | moOpDP::symmetric }, + { u"\u2A1B"_ustr, moOpDF::prefix, 310, 1, 2, moOpDP::largeop | moOpDP::symmetric }, + { u"\u2A1C"_ustr, moOpDF::prefix, 310, 1, 2, moOpDP::largeop | moOpDP::symmetric }, + { u"\u22C3"_ustr, moOpDF::prefix, 320, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u2A03"_ustr, moOpDF::prefix, 320, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u2A04"_ustr, moOpDF::prefix, 320, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u22C0"_ustr, moOpDF::prefix, 330, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u22C1"_ustr, moOpDF::prefix, 330, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u22C2"_ustr, moOpDF::prefix, 330, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u2A00"_ustr, moOpDF::prefix, 330, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u2A02"_ustr, moOpDF::prefix, 330, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u2A05"_ustr, moOpDF::prefix, 330, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u2A06"_ustr, moOpDF::prefix, 330, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u2A07"_ustr, moOpDF::prefix, 330, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u2A08"_ustr, moOpDF::prefix, 330, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u2A09"_ustr, moOpDF::prefix, 330, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u2AFC"_ustr, moOpDF::prefix, 330, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u2AFF"_ustr, moOpDF::prefix, 330, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u2240"_ustr, moOpDF::infix, 340, 4, 4, moOpDP::nonedp }, + { u"\u220F"_ustr, moOpDF::prefix, 350, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u2210"_ustr, moOpDF::prefix, 350, 1, 2, moOpDP::movablelargeop | moOpDP::symmetric }, + { u"\u2229"_ustr, moOpDF::infix, 350, 4, 4, moOpDP::nonedp }, + { u"\u222A"_ustr, moOpDF::infix, 350, 4, 4, moOpDP::nonedp }, + { u"*"_ustr, moOpDF::infix, 390, 3, 3, moOpDP::nonedp }, + { u"."_ustr, moOpDF::infix, 390, 3, 3, moOpDP::nonedp }, + { u"\u00D7"_ustr, moOpDF::infix, 390, 4, 4, moOpDP::nonedp }, + { u"\u2022"_ustr, moOpDF::infix, 390, 4, 4, moOpDP::nonedp }, + { u"\u2043"_ustr, moOpDF::infix, 390, 4, 4, moOpDP::nonedp }, + { u"\u2062"_ustr, moOpDF::infix, 390, 0, 0, moOpDP::nonedp }, + { u"\u22A0"_ustr, moOpDF::infix, 390, 4, 4, moOpDP::nonedp }, + { u"\u22A1"_ustr, moOpDF::infix, 390, 4, 4, moOpDP::nonedp }, + { u"\u22C5"_ustr, moOpDF::infix, 390, 4, 4, moOpDP::nonedp }, + { u"\u2A2F"_ustr, moOpDF::infix, 390, 4, 4, moOpDP::nonedp }, + { u"\u2A3F"_ustr, moOpDF::infix, 390, 4, 4, moOpDP::nonedp }, + { u"\u00B7"_ustr, moOpDF::infix, 400, 4, 4, moOpDP::nonedp }, + { u"\u2297"_ustr, moOpDF::infix, 410, 4, 4, moOpDP::nonedp }, + { u"%"_ustr, moOpDF::infix, 640, 3, 3, moOpDP::nonedp }, + { u"\\"_ustr, moOpDF::infix, 650, 0, 0, moOpDP::nonedp }, + { u"\u2216"_ustr, moOpDF::infix, 650, 4, 4, moOpDP::nonedp }, + { u"/"_ustr, moOpDF::infix, 660, 1, 1, moOpDP::nonedp }, + { u"\u00F7"_ustr, moOpDF::infix, 660, 4, 4, moOpDP::nonedp }, + { u"\u2220"_ustr, moOpDF::prefix, 670, 0, 0, moOpDP::nonedp }, + { u"\u2221"_ustr, moOpDF::prefix, 670, 0, 0, moOpDP::nonedp }, + { u"\u2222"_ustr, moOpDF::prefix, 670, 0, 0, moOpDP::nonedp }, + { u"\u00AC"_ustr, moOpDF::prefix, 680, 2, 1, moOpDP::nonedp }, + { u"\u2299"_ustr, moOpDF::infix, 710, 4, 4, moOpDP::nonedp }, + { u"\u2202"_ustr, moOpDF::prefix, 740, 2, 1, moOpDP::nonedp }, + { u"\u2207"_ustr, moOpDF::prefix, 740, 2, 1, moOpDP::nonedp }, + { u"**"_ustr, moOpDF::infix, 780, 1, 1, moOpDP::nonedp }, + { u"<>"_ustr, moOpDF::infix, 780, 1, 1, moOpDP::nonedp }, + { u"^"_ustr, moOpDF::infix, 780, 1, 1, moOpDP::nonedp }, + { u"\u2032"_ustr, moOpDF::postfix, 800, 0, 0, moOpDP::nonedp }, + { u"\u266D"_ustr, moOpDF::postfix, 800, 0, 2, moOpDP::nonedp }, + { u"\u266E"_ustr, moOpDF::postfix, 800, 0, 2, moOpDP::nonedp }, + { u"\u266F"_ustr, moOpDF::postfix, 800, 0, 2, moOpDP::nonedp }, + { u"!"_ustr, moOpDF::postfix, 810, 1, 0, moOpDP::nonedp }, + { u"!!"_ustr, moOpDF::postfix, 810, 1, 0, moOpDP::nonedp }, + { u"//"_ustr, moOpDF::infix, 820, 1, 1, moOpDP::nonedp }, + { u"@"_ustr, moOpDF::infix, 825, 1, 1, moOpDP::nonedp }, + { u"?"_ustr, moOpDF::infix, 835, 1, 1, moOpDP::nonedp }, + { u"\u2145"_ustr, moOpDF::prefix, 845, 2, 1, moOpDP::nonedp }, + { u"\u2146"_ustr, moOpDF::prefix, 845, 2, 0, moOpDP::nonedp }, + { u"\u221A"_ustr, moOpDF::prefix, 845, 1, 1, moOpDP::stretchy }, + { u"\u221B"_ustr, moOpDF::prefix, 845, 1, 1, moOpDP::nonedp }, + { u"\u221C"_ustr, moOpDF::prefix, 845, 1, 1, moOpDP::nonedp }, + { u"\u2061"_ustr, moOpDF::infix, 850, 0, 0, moOpDP::nonedp }, + { u"\""_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"&"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::nonedp }, + { u"\'"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"++"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::nonedp }, + { u"--"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::nonedp }, + { u"^"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, + { u"_"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, + { u"`"_ustr, moOpDF::postfix, 880, 0, 00, moOpDP::accent }, + { u"~"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, + { u"\u00A8"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u00AA"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u00AF"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, + { u"\u00B0"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::nonedp }, + { u"\u00B2"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u00B3"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u00B4"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u00B8"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u00B9"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u00BA"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u02C6"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, + { u"\u02C7"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, + { u"\u02C9"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, + { u"\u02CA"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u02CB"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u02CD"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, + { u"\u02D8"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u02D9"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u02DA"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u02DC"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, + { u"\u02DD"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u02F7"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, + { u"\u0302"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, + { u"\u0311"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u201A"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u201B"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u201E"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u201F"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u2033"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u2034"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u2035"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u2036"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u2037"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u203E"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, + { u"\u2057"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u2064"_ustr, moOpDF::infix, 880, 0, 0, moOpDP::nonedp }, + { u"\u20DB"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u20DC"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::accent }, + { u"\u23B4"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, + { u"\u23B5"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, + { u"\u23DC"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, + { u"\u23DD"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, + { u"\u23DE"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, + { u"\u23DF"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, + { u"\u23E0"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, + { u"\u23E1"_ustr, moOpDF::postfix, 880, 0, 0, moOpDP::stretchy | moOpDP::accent }, + { u"_"_ustr, moOpDF::infix, 900, 1, 1, moOpDP::nonedp } }; std::vector<moOperatorData> starmathdatabase::moOperatorDataDictionary( moOperatorDataDictionaryData, moOperatorDataDictionaryData + starmathdatabase::MATHML_MO_COUNT); diff --git a/starmath/source/mathml/mathmlimport.cxx b/starmath/source/mathml/mathmlimport.cxx index b4d0b0ac8470..7bc3e5b913e3 100644 --- a/starmath/source/mathml/mathmlimport.cxx +++ b/starmath/source/mathml/mathmlimport.cxx @@ -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)); diff --git a/starmath/source/mathml/xparsmlbase.cxx b/starmath/source/mathml/xparsmlbase.cxx index 7e0e93ab7390..ccfcf0049e77 100644 --- a/starmath/source/mathml/xparsmlbase.cxx +++ b/starmath/source/mathml/xparsmlbase.cxx @@ -21,2131 +21,2131 @@ static ::css::beans::Pair<::rtl::OUString, ::rtl::OUString> icustomMathmlHtmlEntitiesData[starmathdatabase::STARMATH_MATHMLHTML_ENTITY_NUMBER] = { // clang-format off - { u"AElig", u"\u00C6" }, - { u"AMP", u"\u0026" }, - { u"Aacute", u"\u00C1" }, - { u"Abreve", u"\u0102" }, - { u"Acirc", u"\u00C2" }, - { u"Acy", u"\u0410" }, - { u"Afr", u"\U0001D504" }, - { u"Agrave", u"\u00C0" }, - { u"Alpha", u"\u0391" }, - { u"Amacr", u"\u0100" }, - { u"And", u"\u2A53" }, - { u"Aogon", u"\u0104" }, - { u"Aopf", u"\U0001D538" }, - { u"ApplyFunction", u"\u2061" }, - { u"Aring", u"\u00C5" }, - { u"Ascr", u"\U0001D49C" }, - { u"Assign", u"\u2254" }, - { u"Atilde", u"\u00C3" }, - { u"Auml", u"\u00C4" }, - { u"Backslash", u"\u2216" }, - { u"Barv", u"\u2AE7" }, - { u"Barwed", u"\u2306" }, - { u"Bcy", u"\u0411" }, - { u"Because", u"\u2235" }, - { u"Bernoullis", u"\u212C" }, - { u"Beta", u"\u0392" }, - { u"Bfr", u"\U0001D505" }, - { u"Bopf", u"\U0001D539" }, - { u"Breve", u"\u02D8" }, - { u"Bscr", u"\u212C" }, - { u"Bumpeq", u"\u224E" }, - { u"CHcy", u"\u0427" }, - { u"COPY", u"\u00A9" }, - { u"Cacute", u"\u0106" }, - { u"Cap", u"\u22D2" }, - { u"CapitalDifferentialD", u"\u2145" }, - { u"Cayleys", u"\u212D" }, - { u"Ccaron", u"\u010C" }, - { u"Ccedil", u"\u00C7" }, - { u"Ccirc", u"\u0108" }, - { u"Cconint", u"\u2230" }, - { u"Cdot", u"\u010A" }, - { u"Cedilla", u"\u00B8" }, - { u"CenterDot", u"\u00B7" }, - { u"Cfr", u"\u212D" }, - { u"Chi", u"\u03A7" }, - { u"CircleDot", u"\u2299" }, - { u"CircleMinus", u"\u2296" }, - { u"CirclePlus", u"\u2295" }, - { u"CircleTimes", u"\u2297" }, - { u"ClockwiseContourIntegral", u"\u2232" }, - { u"CloseCurlyDoubleQuote", u"\u201D" }, - { u"CloseCurlyQuote", u"\u2019" }, - { u"Colon", u"\u2237" }, - { u"Colone", u"\u2A74" }, - { u"Congruent", u"\u2261" }, - { u"Conint", u"\u222F" }, - { u"ContourIntegral", u"\u222E" }, - { u"Copf", u"\u2102" }, - { u"Coproduct", u"\u2210" }, - { u"CounterClockwiseContourIntegral", u"\u2233" }, - { u"Cross", u"\u2A2F" }, - { u"Cscr", u"\U0001D49E" }, - { u"Cup", u"\u22D3" }, - { u"CupCap", u"\u224D" }, - { u"DD", u"\u2145" }, - { u"DDotrahd", u"\u2911" }, - { u"DJcy", u"\u0402" }, - { u"DScy", u"\u0405" }, - { u"DZcy", u"\u040F" }, - { u"Dagger", u"\u2021" }, - { u"Darr", u"\u21A1" }, - { u"Dashv", u"\u2AE4" }, - { u"Dcaron", u"\u010E" }, - { u"Dcy", u"\u0414" }, - { u"Del", u"\u2207" }, - { u"Delta", u"\u0394" }, - { u"Dfr", u"\U0001D507" }, - { u"DiacriticalAcute", u"\u00B4" }, - { u"DiacriticalDot", u"\u02D9" }, - { u"DiacriticalDoubleAcute", u"\u02DD" }, - { u"DiacriticalGrave", u"\u0060" }, - { u"DiacriticalTilde", u"\u02DC" }, - { u"Diamond", u"\u22C4" }, - { u"DifferentialD", u"\u2146" }, - { u"Dopf", u"\U0001D53B" }, - { u"Dot", u"\u00A8" }, - { u"DotDot", u"\u20DC" }, - { u"DotEqual", u"\u2250" }, - { u"DoubleContourIntegral", u"\u222F" }, - { u"DoubleDot", u"\u00A8" }, - { u"DoubleDownArrow", u"\u21D3" }, - { u"DoubleLeftArrow", u"\u21D0" }, - { u"DoubleLeftRightArrow", u"\u21D4" }, - { u"DoubleLeftTee", u"\u2AE4" }, - { u"DoubleLongLeftArrow", u"\u27F8" }, - { u"DoubleLongLeftRightArrow", u"\u27FA" }, - { u"DoubleLongRightArrow", u"\u27F9" }, - { u"DoubleRightArrow", u"\u21D2" }, - { u"DoubleRightTee", u"\u22A8" }, - { u"DoubleUpArrow", u"\u21D1" }, - { u"DoubleUpDownArrow", u"\u21D5" }, - { u"DoubleVerticalBar", u"\u2225" }, - { u"DownArrow", u"\u2193" }, - { u"DownArrowBar", u"\u2913" }, - { u"DownArrowUpArrow", u"\u21F5" }, - { u"DownBreve", u"\u0311" }, - { u"DownLeftRightVector", u"\u2950" }, - { u"DownLeftTeeVector", u"\u295E" }, - { u"DownLeftVector", u"\u21BD" }, - { u"DownLeftVectorBar", u"\u2956" }, - { u"DownRightTeeVector", u"\u295F" }, - { u"DownRightVector", u"\u21C1" }, - { u"DownRightVectorBar", u"\u2957" }, - { u"DownTee", u"\u22A4" }, - { u"DownTeeArrow", u"\u21A7" }, - { u"Downarrow", u"\u21D3" }, - { u"Dscr", u"\U0001D49F" }, - { u"Dstrok", u"\u0110" }, - { u"ENG", u"\u014A" }, - { u"ETH", u"\u00D0" }, - { u"Eacute", u"\u00C9" }, - { u"Ecaron", u"\u011A" }, - { u"Ecirc", u"\u00CA" }, - { u"Ecy", u"\u042D" }, - { u"Edot", u"\u0116" }, - { u"Efr", u"\U0001D508" }, - { u"Egrave", u"\u00C8" }, - { u"Element", u"\u2208" }, - { u"Emacr", u"\u0112" }, - { u"EmptySmallSquare", u"\u25FB" }, - { u"EmptyVerySmallSquare", u"\u25AB" }, - { u"Eogon", u"\u0118" }, - { u"Eopf", u"\U0001D53C" }, - { u"Epsilon", u"\u0395" }, - { u"Equal", u"\u2A75" }, - { u"EqualTilde", u"\u2242" }, - { u"Equilibrium", u"\u21CC" }, - { u"Escr", u"\u2130" }, - { u"Esim", u"\u2A73" }, - { u"Eta", u"\u0397" }, - { u"Euml", u"\u00CB" }, - { u"Exists", u"\u2203" }, - { u"ExponentialE", u"\u2147" }, - { u"Fcy", u"\u0424" }, - { u"Ffr", u"\U0001D509" }, - { u"FilledSmallSquare", u"\u25FC" }, - { u"FilledVerySmallSquare", u"\u25AA" }, - { u"Fopf", u"\U0001D53D" }, - { u"ForAll", u"\u2200" }, - { u"Fouriertrf", u"\u2131" }, - { u"Fscr", u"\u2131" }, - { u"GJcy", u"\u0403" }, - { u"GT", u"\u003E" }, - { u"Gamma", u"\u0393" }, - { u"Gammad", u"\u03DC" }, - { u"Gbreve", u"\u011E" }, - { u"Gcedil", u"\u0122" }, - { u"Gcirc", u"\u011C" }, - { u"Gcy", u"\u0413" }, - { u"Gdot", u"\u0120" }, - { u"Gfr", u"\U0001D50A" }, - { u"Gg", u"\u22D9" }, - { u"Gopf", u"\U0001D53E" }, - { u"GreaterEqual", u"\u2265" }, - { u"GreaterEqualLess", u"\u22DB" }, - { u"GreaterFullEqual", u"\u2267" }, - { u"GreaterGreater", u"\u2AA2" }, - { u"GreaterLess", u"\u2277" }, - { u"GreaterSlantEqual", u"\u2A7E" }, - { u"GreaterTilde", u"\u2273" }, - { u"Gscr", u"\U0001D4A2" }, - { u"Gt", u"\u226B" }, - { u"HARDcy", u"\u042A" }, - { u"Hacek", u"\u02C7" }, - { u"Hat", u"\u005E" }, - { u"Hcirc", u"\u0124" }, - { u"Hfr", u"\u210C" }, - { u"HilbertSpace", u"\u210B" }, - { u"Hopf", u"\u210D" }, - { u"HorizontalLine", u"\u2500" }, - { u"Hscr", u"\u210B" }, - { u"Hstrok", u"\u0126" }, - { u"HumpDownHump", u"\u224E" }, - { u"HumpEqual", u"\u224F" }, - { u"IEcy", u"\u0415" }, - { u"IJlig", u"\u0132" }, - { u"IOcy", u"\u0401" }, - { u"Iacute", u"\u00CD" }, - { u"Icirc", u"\u00CE" }, - { u"Icy", u"\u0418" }, - { u"Idot", u"\u0130" }, - { u"Ifr", u"\u2111" }, - { u"Igrave", u"\u00CC" }, - { u"Im", u"\u2111" }, - { u"Imacr", u"\u012A" }, - { u"ImaginaryI", u"\u2148" }, - { u"Implies", u"\u21D2" }, - { u"Int", u"\u222C" }, - { u"Integral", u"\u222B" }, - { u"Intersection", u"\u22C2" }, - { u"InvisibleComma", u"\u2063" }, - { u"InvisibleTimes", u"\u2062" }, - { u"Iogon", u"\u012E" }, - { u"Iopf", u"\U0001D540" }, - { u"Iota", u"\u0399" }, - { u"Iscr", u"\u2110" }, - { u"Itilde", u"\u0128" }, - { u"Iukcy", u"\u0406" }, - { u"Iuml", u"\u00CF" }, - { u"Jcirc", u"\u0134" }, - { u"Jcy", u"\u0419" }, - { u"Jfr", u"\U0001D50D" }, - { u"Jopf", u"\U0001D541" }, - { u"Jscr", u"\U0001D4A5" }, - { u"Jsercy", u"\u0408" }, - { u"Jukcy", u"\u0404" }, - { u"KHcy", u"\u0425" }, - { u"KJcy", u"\u040C" }, - { u"Kappa", u"\u039A" }, - { u"Kcedil", u"\u0136" }, - { u"Kcy", u"\u041A" }, - { u"Kfr", u"\U0001D50E" }, - { u"Kopf", u"\U0001D542" }, - { u"Kscr", u"\U0001D4A6" }, - { u"LJcy", u"\u0409" }, - { u"LT", u"\u003C" }, - { u"Lacute", u"\u0139" }, - { u"Lambda", u"\u039B" }, - { u"Lang", u"\u27EA" }, - { u"Laplacetrf", u"\u2112" }, - { u"Larr", u"\u219E" }, - { u"Lcaron", u"\u013D" }, - { u"Lcedil", u"\u013B" }, - { u"Lcy", u"\u041B" }, - { u"LeftAngleBracket", u"\u27E8" }, - { u"LeftArrow", u"\u2190" }, - { u"LeftArrowBar", u"\u21E4" }, - { u"LeftArrowRightArrow", u"\u21C6" }, - { u"LeftCeiling", u"\u2308" }, - { u"LeftDoubleBracket", u"\u27E6" }, - { u"LeftDownTeeVector", u"\u2961" }, - { u"LeftDownVector", u"\u21C3" }, - { u"LeftDownVectorBar", u"\u2959" }, - { u"LeftFloor", u"\u230A" }, - { u"LeftRightArrow", u"\u2194" }, - { u"LeftRightVector", u"\u294E" }, - { u"LeftTee", u"\u22A3" }, - { u"LeftTeeArrow", u"\u21A4" }, - { u"LeftTeeVector", u"\u295A" }, - { u"LeftTriangle", u"\u22B2" }, - { u"LeftTriangleBar", u"\u29CF" }, - { u"LeftTriangleEqual", u"\u22B4" }, - { u"LeftUpDownVector", u"\u2951" }, - { u"LeftUpTeeVector", u"\u2960" }, - { u"LeftUpVector", u"\u21BF" }, - { u"LeftUpVectorBar", u"\u2958" }, - { u"LeftVector", u"\u21BC" }, - { u"LeftVectorBar", u"\u2952" }, - { u"Leftarrow", u"\u21D0" }, - { u"Leftrightarrow", u"\u21D4" }, - { u"LessEqualGreater", u"\u22DA" }, - { u"LessFullEqual", u"\u2266" }, - { u"LessGreater", u"\u2276" }, - { u"LessLess", u"\u2AA1" }, - { u"LessSlantEqual", u"\u2A7D" }, - { u"LessTilde", u"\u2272" }, - { u"Lfr", u"\U0001D50F" }, - { u"Ll", u"\u22D8" }, - { u"Lleftarrow", u"\u21DA" }, - { u"Lmidot", u"\u013F" }, - { u"LongLeftArrow", u"\u27F5" }, - { u"LongLeftRightArrow", u"\u27F7" }, - { u"LongRightArrow", u"\u27F6" }, - { u"Longleftarrow", u"\u27F8" }, - { u"Longleftrightarrow", u"\u27FA" }, - { u"Longrightarrow", u"\u27F9" }, - { u"Lopf", u"\U0001D543" }, - { u"LowerLeftArrow", u"\u2199" }, - { u"LowerRightArrow", u"\u2198" }, - { u"Lscr", u"\u2112" }, - { u"Lsh", u"\u21B0" }, - { u"Lstrok", u"\u0141" }, - { u"Lt", u"\u226A" }, - { u"Map", u"\u2905" }, - { u"Mcy", u"\u041C" }, - { u"MediumSpace", u"\u205F" }, - { u"Mellintrf", u"\u2133" }, - { u"Mfr", u"\U0001D510" }, - { u"MinusPlus", u"\u2213" }, - { u"Mopf", u"\U0001D544" }, - { u"Mscr", u"\u2133" }, - { u"Mu", u"\u039C" }, - { u"NJcy", u"\u040A" }, - { u"Nacute", u"\u0143" }, - { u"Ncaron", u"\u0147" }, - { u"Ncedil", u"\u0145" }, - { u"Ncy", u"\u041D" }, - { u"NegativeMediumSpace", u"\u200B" }, - { u"NegativeThickSpace", u"\u200B" }, - { u"NegativeThinSpace", u"\u200B" }, - { u"NegativeVeryThinSpace", u"\u200B" }, - { u"NestedGreaterGreater", u"\u226B" }, - { u"NestedLessLess", u"\u226A" }, - { u"NewLine", u"\u000A" }, - { u"Nfr", u"\U0001D511" }, - { u"NoBreak", u"\u2060" }, - { u"NonBreakingSpace", u"\u00A0" }, - { u"Nopf", u"\u2115" }, - { u"Not", u"\u2AEC" }, - { u"NotCongruent", u"\u2262" }, - { u"NotCupCap", u"\u226D" }, - { u"NotDoubleVerticalBar", u"\u2226" }, - { u"NotElement", u"\u2209" }, - { u"NotEqual", u"\u2260" }, - { u"NotEqualTilde", u"\u2242\u0338" }, - { u"NotExists", u"\u2204" }, - { u"NotGreater", u"\u226F" }, - { u"NotGreaterEqual", u"\u2271" }, - { u"NotGreaterFullEqual", u"\u2267\u0338" }, - { u"NotGreaterGreater", u"\u226B\u0338" }, - { u"NotGreaterLess", u"\u2279" }, - { u"NotGreaterSlantEqual", u"\u2A7E\u0338" }, - { u"NotGreaterTilde", u"\u2275" }, - { u"NotHumpDownHump", u"\u224E\u0338" }, - { u"NotHumpEqual", u"\u224F\u0338" }, - { u"NotLeftTriangle", u"\u22EA" }, - { u"NotLeftTriangleBar", u"\u29CF\u0338" }, - { u"NotLeftTriangleEqual", u"\u22EC" }, - { u"NotLess", u"\u226E" }, - { u"NotLessEqual", u"\u2270" }, - { u"NotLessGreater", u"\u2278" }, - { u"NotLessLess", u"\u226A\u0338" }, - { u"NotLessSlantEqual", u"\u2A7D\u0338" }, - { u"NotLessTilde", u"\u2274" }, - { u"NotNestedGreaterGreater", u"\u2AA2\u0338" }, - { u"NotNestedLessLess", u"\u2AA1\u0338" }, - { u"NotPrecedes", u"\u2280" }, - { u"NotPrecedesEqual", u"\u2AAF\u0338" }, - { u"NotPrecedesSlantEqual", u"\u22E0" }, - { u"NotReverseElement", u"\u220C" }, - { u"NotRightTriangle", u"\u22EB" }, - { u"NotRightTriangleBar", u"\u29D0\u0338" }, - { u"NotRightTriangleEqual", u"\u22ED" }, - { u"NotSquareSubset", u"\u228F\u0338" }, - { u"NotSquareSubsetEqual", u"\u22E2" }, - { u"NotSquareSuperset", u"\u2290\u0338" }, - { u"NotSquareSupersetEqual", u"\u22E3" }, - { u"NotSubset", u"\u2282\u20D2" }, - { u"NotSubsetEqual", u"\u2288" }, - { u"NotSucceeds", u"\u2281" }, - { u"NotSucceedsEqual", u"\u2AB0\u0338" }, - { u"NotSucceedsSlantEqual", u"\u22E1" }, - { u"NotSucceedsTilde", u"\u227F\u0338" }, - { u"NotSuperset", u"\u2283\u20D2" }, - { u"NotSupersetEqual", u"\u2289" }, - { u"NotTilde", u"\u2241" }, - { u"NotTildeEqual", u"\u2244" }, - { u"NotTildeFullEqual", u"\u2247" }, - { u"NotTildeTilde", u"\u2249" }, - { u"NotVerticalBar", u"\u2224" }, - { u"Nscr", u"\U0001D4A9" }, - { u"Ntilde", u"\u00D1" }, - { u"Nu", u"\u039D" }, - { u"OElig", u"\u0152" }, - { u"Oacute", u"\u00D3" }, - { u"Ocirc", u"\u00D4" }, - { u"Ocy", u"\u041E" }, - { u"Odblac", u"\u0150" }, - { u"Ofr", u"\U0001D512" }, - { u"Ograve", u"\u00D2" }, - { u"Omacr", u"\u014C" }, - { u"Omega", u"\u03A9" }, - { u"Omicron", u"\u039F" }, - { u"Oopf", u"\U0001D546" }, - { u"OpenCurlyDoubleQuote", u"\u201C" }, - { u"OpenCurlyQuote", u"\u2018" }, - { u"Or", u"\u2A54" }, - { u"Oscr", u"\U0001D4AA" }, - { u"Oslash", u"\u00D8" }, - { u"Otilde", u"\u00D5" }, - { u"Otimes", u"\u2A37" }, - { u"Ouml", u"\u00D6" }, - { u"OverBar", u"\u203E" }, - { u"OverBrace", u"\u23DE" }, - { u"OverBracket", u"\u23B4" }, - { u"OverParenthesis", u"\u23DC" }, - { u"PartialD", u"\u2202" }, - { u"Pcy", u"\u041F" }, - { u"Pfr", u"\U0001D513" }, - { u"Phi", u"\u03A6" }, - { u"Pi", u"\u03A0" }, - { u"PlusMinus", u"\u00B1" }, - { u"Poincareplane", u"\u210C" }, - { u"Popf", u"\u2119" }, - { u"Pr", u"\u2ABB" }, - { u"Precedes", u"\u227A" }, - { u"PrecedesEqual", u"\u2AAF" }, - { u"PrecedesSlantEqual", u"\u227C" }, - { u"PrecedesTilde", u"\u227E" }, - { u"Prime", u"\u2033" }, - { u"Product", u"\u220F" }, - { u"Proportion", u"\u2237" }, - { u"Proportional", u"\u221D" }, - { u"Pscr", u"\U0001D4AB" }, - { u"Psi", u"\u03A8" }, - { u"QUOT", u"\u0022" }, - { u"Qfr", u"\U0001D514" }, - { u"Qopf", u"\u211A" }, - { u"Qscr", u"\U0001D4AC" }, - { u"RBarr", u"\u2910" }, - { u"REG", u"\u00AE" }, - { u"Racute", u"\u0154" }, - { u"Rang", u"\u27EB" }, - { u"Rarr", u"\u21A0" }, - { u"Rarrtl", u"\u2916" }, - { u"Rcaron", u"\u0158" }, - { u"Rcedil", u"\u0156" }, - { u"Rcy", u"\u0420" }, - { u"Re", u"\u211C" }, - { u"ReverseElement", u"\u220B" }, - { u"ReverseEquilibrium", u"\u21CB" }, - { u"ReverseUpEquilibrium", u"\u296F" }, - { u"Rfr", u"\u211C" }, - { u"Rho", u"\u03A1" }, - { u"RightAngleBracket", u"\u27E9" }, - { u"RightArrow", u"\u2192" }, - { u"RightArrowBar", u"\u21E5" }, - { u"RightArrowLeftArrow", u"\u21C4" }, - { u"RightCeiling", u"\u2309" }, - { u"RightDoubleBracket", u"\u27E7" }, - { u"RightDownTeeVector", u"\u295D" }, - { u"RightDownVector", u"\u21C2" }, - { u"RightDownVectorBar", u"\u2955" }, - { u"RightFloor", u"\u230B" }, - { u"RightTee", u"\u22A2" }, - { u"RightTeeArrow", u"\u21A6" }, - { u"RightTeeVector", u"\u295B" }, - { u"RightTriangle", u"\u22B3" }, - { u"RightTriangleBar", u"\u29D0" }, - { u"RightTriangleEqual", u"\u22B5" }, - { u"RightUpDownVector", u"\u294F" }, - { u"RightUpTeeVector", u"\u295C" }, - { u"RightUpVector", u"\u21BE" }, - { u"RightUpVectorBar", u"\u2954" }, - { u"RightVector", u"\u21C0" }, - { u"RightVectorBar", u"\u2953" }, - { u"Rightarrow", u"\u21D2" }, - { u"Ropf", u"\u211D" }, - { u"RoundImplies", u"\u2970" }, - { u"Rrightarrow", u"\u21DB" }, - { u"Rscr", u"\u211B" }, - { u"Rsh", u"\u21B1" }, - { u"RuleDelayed", u"\u29F4" }, - { u"SHCHcy", u"\u0429" }, - { u"SHcy", u"\u0428" }, - { u"SOFTcy", u"\u042C" }, - { u"Sacute", u"\u015A" }, - { u"Sc", u"\u2ABC" }, - { u"Scaron", u"\u0160" }, - { u"Scedil", u"\u015E" }, - { u"Scirc", u"\u015C" }, - { u"Scy", u"\u0421" }, - { u"Sfr", u"\U0001D516" }, - { u"ShortDownArrow", u"\u2193" }, - { u"ShortLeftArrow", u"\u2190" }, - { u"ShortRightArrow", u"\u2192" }, - { u"ShortUpArrow", u"\u2191" }, - { u"Sigma", u"\u03A3" }, - { u"SmallCircle", u"\u2218" }, - { u"Sopf", u"\U0001D54A" }, - { u"Sqrt", u"\u221A" }, - { u"Square", u"\u25A1" }, - { u"SquareIntersection", u"\u2293" }, - { u"SquareSubset", u"\u228F" }, - { u"SquareSubsetEqual", u"\u2291" }, - { u"SquareSuperset", u"\u2290" }, - { u"SquareSupersetEqual", u"\u2292" }, - { u"SquareUnion", u"\u2294" }, - { u"Sscr", u"\U0001D4AE" }, - { u"Star", u"\u22C6" }, - { u"Sub", u"\u22D0" }, - { u"Subset", u"\u22D0" }, - { u"SubsetEqual", u"\u2286" }, - { u"Succeeds", u"\u227B" }, - { u"SucceedsEqual", u"\u2AB0" }, - { u"SucceedsSlantEqual", u"\u227D" }, - { u"SucceedsTilde", u"\u227F" }, - { u"SuchThat", u"\u220B" }, - { u"Sum", u"\u2211" }, - { u"Sup", u"\u22D1" }, - { u"Superset", u"\u2283" }, - { u"SupersetEqual", u"\u2287" }, - { u"Supset", u"\u22D1" }, - { u"THORN", u"\u00DE" }, - { u"TRADE", u"\u2122" }, - { u"TSHcy", u"\u040B" }, - { u"TScy", u"\u0426" }, - { u"Tab", u"\u0009" }, - { u"Tau", u"\u03A4" }, - { u"Tcaron", u"\u0164" }, - { u"Tcedil", u"\u0162" }, - { u"Tcy", u"\u0422" }, - { u"Tfr", u"\U0001D517" }, - { u"Therefore", u"\u2234" }, - { u"Theta", u"\u0398" }, - { u"ThickSpace", u"\u205F\u200A" }, - { u"ThinSpace", u"\u2009" }, - { u"Tilde", u"\u223C" }, - { u"TildeEqual", u"\u2243" }, - { u"TildeFullEqual", u"\u2245" }, - { u"TildeTilde", u"\u2248" }, - { u"Topf", u"\U0001D54B" }, - { u"TripleDot", u"\u20DB" }, - { u"Tscr", u"\U0001D4AF" }, - { u"Tstrok", u"\u0166" }, - { u"Uacute", u"\u00DA" }, - { u"Uarr", u"\u219F" }, - { u"Uarrocir", u"\u2949" }, - { u"Ubrcy", u"\u040E" }, - { u"Ubreve", u"\u016C" }, - { u"Ucirc", u"\u00DB" }, - { u"Ucy", u"\u0423" }, - { u"Udblac", u"\u0170" }, - { u"Ufr", u"\U0001D518" }, - { u"Ugrave", u"\u00D9" }, - { u"Umacr", u"\u016A" }, - { u"UnderBar", u"\u005F" }, - { u"UnderBrace", u"\u23DF" }, - { u"UnderBracket", u"\u23B5" }, - { u"UnderParenthesis", u"\u23DD" }, - { u"Union", u"\u22C3" }, - { u"UnionPlus", u"\u228E" }, - { u"Uogon", u"\u0172" }, - { u"Uopf", u"\U0001D54C" }, - { u"UpArrow", u"\u2191" }, - { u"UpArrowBar", u"\u2912" }, - { u"UpArrowDownArrow", u"\u21C5" }, - { u"UpDownArrow", u"\u2195" }, - { u"UpEquilibrium", u"\u296E" }, - { u"UpTee", u"\u22A5" }, - { u"UpTeeArrow", u"\u21A5" }, - { u"Uparrow", u"\u21D1" }, - { u"Updownarrow", u"\u21D5" }, - { u"UpperLeftArrow", u"\u2196" }, - { u"UpperRightArrow", u"\u2197" }, - { u"Upsi", u"\u03D2" }, - { u"Upsilon", u"\u03A5" }, - { u"Uring", u"\u016E" }, - { u"Uscr", u"\U0001D4B0" }, - { u"Utilde", u"\u0168" }, - { u"Uuml", u"\u00DC" }, - { u"VDash", u"\u22AB" }, - { u"Vbar", u"\u2AEB" }, - { u"Vcy", u"\u0412" }, - { u"Vdash", u"\u22A9" }, - { u"Vdashl", u"\u2AE6" }, - { u"Vee", u"\u22C1" }, - { u"Verbar", u"\u2016" }, - { u"Vert", u"\u2016" }, - { u"VerticalBar", u"\u2223" }, - { u"VerticalLine", u"\u007C" }, - { u"VerticalSeparator", u"\u2758" }, - { u"VerticalTilde", u"\u2240" }, - { u"VeryThinSpace", u"\u200A" }, - { u"Vfr", u"\U0001D519" }, - { u"Vopf", u"\U0001D54D" }, - { u"Vscr", u"\U0001D4B1" }, - { u"Vvdash", u"\u22AA" }, - { u"Wcirc", u"\u0174" }, - { u"Wedge", u"\u22C0" }, - { u"Wfr", u"\U0001D51A" }, - { u"Wopf", u"\U0001D54E" }, - { u"Wscr", u"\U0001D4B2" }, - { u"Xfr", u"\U0001D51B" }, - { u"Xi", u"\u039E" }, - { u"Xopf", u"\U0001D54F" }, - { u"Xscr", u"\U0001D4B3" }, - { u"YAcy", u"\u042F" }, - { u"YIcy", u"\u0407" }, - { u"YUcy", u"\u042E" }, - { u"Yacute", u"\u00DD" }, - { u"Ycirc", u"\u0176" }, - { u"Ycy", u"\u042B" }, - { u"Yfr", u"\U0001D51C" }, - { u"Yopf", u"\U0001D550" }, - { u"Yscr", u"\U0001D4B4" }, - { u"Yuml", u"\u0178" }, - { u"ZHcy", u"\u0416" }, - { u"Zacute", u"\u0179" }, - { u"Zcaron", u"\u017D" }, - { u"Zcy", u"\u0417" }, - { u"Zdot", u"\u017B" }, - { u"ZeroWidthSpace", u"\u200B" }, - { u"Zeta", u"\u0396" }, - { u"Zfr", u"\u2128" }, - { u"Zopf", u"\u2124" }, - { u"Zscr", u"\U0001D4B5" }, - { u"aacute", u"\u00E1" }, - { u"abreve", u"\u0103" }, - { u"ac", u"\u223E" }, - { u"acE", u"\u223E\u0333" }, - { u"acd", u"\u223F" }, - { u"acirc", u"\u00E2" }, - { u"acute", u"\u00B4" }, - { u"acy", u"\u0430" }, - { u"aelig", u"\u00E6" }, - { u"af", u"\u2061" }, - { u"afr", u"\U0001D51E" }, - { u"agrave", u"\u00E0" }, - { u"alefsym", u"\u2135" }, - { u"aleph", u"\u2135" }, - { u"alpha", u"\u03B1" }, - { u"amacr", u"\u0101" }, - { u"amalg", u"\u2A3F" }, - { u"amp", u"\u0026" }, - { u"and", u"\u2227" }, - { u"andand", u"\u2A55" }, - { u"andd", u"\u2A5C" }, - { u"andslope", u"\u2A58" }, - { u"andv", u"\u2A5A" }, - { u"ang", u"\u2220" }, - { u"ange", u"\u29A4" }, - { u"angle", u"\u2220" }, - { u"angmsd", u"\u2221" }, - { u"angmsdaa", u"\u29A8" }, - { u"angmsdab", u"\u29A9" }, - { u"angmsdac", u"\u29AA" }, - { u"angmsdad", u"\u29AB" }, - { u"angmsdae", u"\u29AC" }, - { u"angmsdaf", u"\u29AD" }, - { u"angmsdag", u"\u29AE" }, - { u"angmsdah", u"\u29AF" }, - { u"angrt", u"\u221F" }, - { u"angrtvb", u"\u22BE" }, - { u"angrtvbd", u"\u299D" }, - { u"angsph", u"\u2222" }, - { u"angst", u"\u00C5" }, - { u"angzarr", u"\u237C" }, - { u"aogon", u"\u0105" }, - { u"aopf", u"\U0001D552" }, - { u"ap", u"\u2248" }, - { u"apE", u"\u2A70" }, - { u"apacir", u"\u2A6F" }, - { u"ape", u"\u224A" }, - { u"apid", u"\u224B" }, - { u"apos", u"\u0027" }, - { u"approx", u"\u2248" }, - { u"approxeq", u"\u224A" }, - { u"aring", u"\u00E5" }, - { u"ascr", u"\U0001D4B6" }, - { u"ast", u"\u002A" }, - { u"asymp", u"\u2248" }, - { u"asympeq", u"\u224D" }, - { u"atilde", u"\u00E3" }, - { u"auml", u"\u00E4" }, - { u"awconint", u"\u2233" }, - { u"awint", u"\u2A11" }, - { u"bNot", u"\u2AED" }, - { u"backcong", u"\u224C" }, - { u"backepsilon", u"\u03F6" }, - { u"backprime", u"\u2035" }, - { u"backsim", u"\u223D" }, - { u"backsimeq", u"\u22CD" }, - { u"barvee", u"\u22BD" }, - { u"barwed", u"\u2305" }, - { u"barwedge", u"\u2305" }, - { u"bbrk", u"\u23B5" }, - { u"bbrktbrk", u"\u23B6" }, - { u"bcong", u"\u224C" }, - { u"bcy", u"\u0431" }, - { u"bdquo", u"\u201E" }, - { u"becaus", u"\u2235" }, - { u"because", u"\u2235" }, - { u"bemptyv", u"\u29B0" }, - { u"bepsi", u"\u03F6" }, - { u"bernou", u"\u212C" }, - { u"beta", u"\u03B2" }, - { u"beth", u"\u2136" }, - { u"between", u"\u226C" }, - { u"bfr", u"\U0001D51F" }, - { u"bigcap", u"\u22C2" }, - { u"bigcirc", u"\u25EF" }, - { u"bigcup", u"\u22C3" }, - { u"bigodot", u"\u2A00" }, - { u"bigoplus", u"\u2A01" }, - { u"bigotimes", u"\u2A02" }, - { u"bigsqcup", u"\u2A06" }, - { u"bigstar", u"\u2605" }, - { u"bigtriangledown", u"\u25BD" }, - { u"bigtriangleup", u"\u25B3" }, - { u"biguplus", u"\u2A04" }, - { u"bigvee", u"\u22C1" }, - { u"bigwedge", u"\u22C0" }, - { u"bkarow", u"\u290D" }, - { u"blacklozenge", u"\u29EB" }, - { u"blacksquare", u"\u25AA" }, - { u"blacktriangle", u"\u25B4" }, - { u"blacktriangledown", u"\u25BE" }, - { u"blacktriangleleft", u"\u25C2" }, - { u"blacktriangleright", u"\u25B8" }, - { u"blank", u"\u2423" }, - { u"blk12", u"\u2592" }, - { u"blk14", u"\u2591" }, - { u"blk34", u"\u2593" }, - { u"block", u"\u2588" }, - { u"bne", u"\u003D\u20E5" }, - { u"bnequiv", u"\u2261\u20E5" }, - { u"bnot", u"\u2310" }, - { u"bopf", u"\U0001D553" }, - { u"bot", u"\u22A5" }, - { u"bottom", u"\u22A5" }, - { u"bowtie", u"\u22C8" }, - { u"boxDL", u"\u2557" }, - { u"boxDR", u"\u2554" }, - { u"boxDl", u"\u2556" }, - { u"boxDr", u"\u2553" }, - { u"boxH", u"\u2550" }, - { u"boxHD", u"\u2566" }, - { u"boxHU", u"\u2569" }, - { u"boxHd", u"\u2564" }, - { u"boxHu", u"\u2567" }, - { u"boxUL", u"\u255D" }, - { u"boxUR", u"\u255A" }, - { u"boxUl", u"\u255C" }, - { u"boxUr", u"\u2559" }, - { u"boxV", u"\u2551" }, - { u"boxVH", u"\u256C" }, - { u"boxVL", u"\u2563" }, - { u"boxVR", u"\u2560" }, - { u"boxVh", u"\u256B" }, - { u"boxVl", u"\u2562" }, - { u"boxVr", u"\u255F" }, - { u"boxbox", u"\u29C9" }, - { u"boxdL", u"\u2555" }, - { u"boxdR", u"\u2552" }, - { u"boxdl", u"\u2510" }, - { u"boxdr", u"\u250C" }, - { u"boxh", u"\u2500" }, - { u"boxhD", u"\u2565" }, - { u"boxhU", u"\u2568" }, - { u"boxhd", u"\u252C" }, - { u"boxhu", u"\u2534" }, - { u"boxminus", u"\u229F" }, - { u"boxplus", u"\u229E" }, - { u"boxtimes", u"\u22A0" }, - { u"boxuL", u"\u255B" }, - { u"boxuR", u"\u2558" }, - { u"boxul", u"\u2518" }, - { u"boxur", u"\u2514" }, - { u"boxv", u"\u2502" }, - { u"boxvH", u"\u256A" }, - { u"boxvL", u"\u2561" }, - { u"boxvR", u"\u255E" }, - { u"boxvh", u"\u253C" }, - { u"boxvl", u"\u2524" }, - { u"boxvr", u"\u251C" }, - { u"bprime", u"\u2035" }, - { u"breve", u"\u02D8" }, - { u"brvbar", u"\u00A6" }, - { u"bscr", u"\U0001D4B7" }, - { u"bsemi", u"\u204F" }, - { u"bsim", u"\u223D" }, - { u"bsime", u"\u22CD" }, - { u"bsol", u"\u005C" }, - { u"bsolb", u"\u29C5" }, - { u"bsolhsub", u"\u27C8" }, - { u"bull", u"\u2022" }, - { u"bullet", u"\u2022" }, - { u"bump", u"\u224E" }, - { u"bumpE", u"\u2AAE" }, - { u"bumpe", u"\u224F" }, - { u"bumpeq", u"\u224F" }, - { u"cacute", u"\u0107" }, - { u"cap", u"\u2229" }, - { u"capand", u"\u2A44" }, - { u"capbrcup", u"\u2A49" }, - { u"capcap", u"\u2A4B" }, - { u"capcup", u"\u2A47" }, - { u"capdot", u"\u2A40" }, - { u"caps", u"\u2229\uFE00" }, - { u"caret", u"\u2041" }, - { u"caron", u"\u02C7" }, - { u"ccaps", u"\u2A4D" }, - { u"ccaron", u"\u010D" }, - { u"ccedil", u"\u00E7" }, - { u"ccirc", u"\u0109" }, - { u"ccups", u"\u2A4C" }, - { u"ccupssm", u"\u2A50" }, - { u"cdot", u"\u010B" }, - { u"cedil", u"\u00B8" }, - { u"cemptyv", u"\u29B2" }, - { u"cent", u"\u00A2" }, - { u"centerdot", u"\u00B7" }, - { u"cfr", u"\U0001D520" }, - { u"chcy", u"\u0447" }, - { u"check", u"\u2713" }, - { u"checkmark", u"\u2713" }, - { u"chi", u"\u03C7" }, - { u"cir", u"\u25CB" }, - { u"cirE", u"\u29C3" }, - { u"circ", u"\u02C6" }, - { u"circeq", u"\u2257" }, - { u"circlearrowleft", u"\u21BA" }, - { u"circlearrowright", u"\u21BB" }, - { u"circledR", u"\u00AE" }, - { u"circledS", u"\u24C8" }, - { u"circledast", u"\u229B" }, - { u"circledcirc", u"\u229A" }, - { u"circleddash", u"\u229D" }, - { u"cire", u"\u2257" }, - { u"cirfnint", u"\u2A10" }, - { u"cirmid", u"\u2AEF" }, - { u"cirscir", u"\u29C2" }, - { u"clubs", u"\u2663" }, - { u"clubsuit", u"\u2663" }, - { u"colon", u"\u003A" }, - { u"colone", u"\u2254" }, - { u"coloneq", u"\u2254" }, - { u"comma", u"\u002C" }, - { u"commat", u"\u0040" }, - { u"comp", u"\u2201" }, - { u"compfn", u"\u2218" }, - { u"complement", u"\u2201" }, - { u"complexes", u"\u2102" }, - { u"cong", u"\u2245" }, - { u"congdot", u"\u2A6D" }, - { u"conint", u"\u222E" }, - { u"copf", u"\U0001D554" }, - { u"coprod", u"\u2210" }, - { u"copy", u"\u00A9" }, - { u"copysr", u"\u2117" }, - { u"crarr", u"\u21B5" }, - { u"cross", u"\u2717" }, - { u"cscr", u"\U0001D4B8" }, - { u"csub", u"\u2ACF" }, - { u"csube", u"\u2AD1" }, - { u"csup", u"\u2AD0" }, - { u"csupe", u"\u2AD2" }, - { u"ctdot", u"\u22EF" }, - { u"cudarrl", u"\u2938" }, - { u"cudarrr", u"\u2935" }, - { u"cuepr", u"\u22DE" }, - { u"cuesc", u"\u22DF" }, - { u"cularr", u"\u21B6" }, - { u"cularrp", u"\u293D" }, - { u"cup", u"\u222A" }, - { u"cupbrcap", u"\u2A48" }, - { u"cupcap", u"\u2A46" }, - { u"cupcup", u"\u2A4A" }, - { u"cupdot", u"\u228D" }, - { u"cupor", u"\u2A45" }, - { u"cups", u"\u222A\uFE00" }, - { u"curarr", u"\u21B7" }, - { u"curarrm", u"\u293C" }, - { u"curlyeqprec", u"\u22DE" }, - { u"curlyeqsucc", u"\u22DF" }, - { u"curlyvee", u"\u22CE" }, - { u"curlywedge", u"\u22CF" }, - { u"curren", u"\u00A4" }, - { u"curvearrowleft", u"\u21B6" }, - { u"curvearrowright", u"\u21B7" }, - { u"cuvee", u"\u22CE" }, - { u"cuwed", u"\u22CF" }, - { u"cwconint", u"\u2232" }, - { u"cwint", u"\u2231" }, - { u"cylcty", u"\u232D" }, - { u"dArr", u"\u21D3" }, - { u"dHar", u"\u2965" }, - { u"dagger", u"\u2020" }, - { u"daleth", u"\u2138" }, - { u"darr", u"\u2193" }, - { u"dash", u"\u2010" }, - { u"dashv", u"\u22A3" }, - { u"dbkarow", u"\u290F" }, - { u"dblac", u"\u02DD" }, - { u"dcaron", u"\u010F" }, - { u"dcy", u"\u0434" }, - { u"dd", u"\u2146" }, - { u"ddagger", u"\u2021" }, - { u"ddarr", u"\u21CA" }, - { u"ddotseq", u"\u2A77" }, - { u"deg", u"\u00B0" }, - { u"delta", u"\u03B4" }, - { u"demptyv", u"\u29B1" }, - { u"dfisht", u"\u297F" }, - { u"dfr", u"\U0001D521" }, - { u"dharl", u"\u21C3" }, - { u"dharr", u"\u21C2" }, - { u"diam", u"\u22C4" }, - { u"diamond", u"\u22C4" }, - { u"diamondsuit", u"\u2666" }, - { u"diams", u"\u2666" }, - { u"die", u"\u00A8" }, - { u"digamma", u"\u03DD" }, - { u"disin", u"\u22F2" }, - { u"div", u"\u00F7" }, - { u"divide", u"\u00F7" }, - { u"divideontimes", u"\u22C7" }, - { u"divonx", u"\u22C7" }, - { u"djcy", u"\u0452" }, - { u"dlcorn", u"\u231E" }, - { u"dlcrop", u"\u230D" }, - { u"dollar", u"\u0024" }, - { u"dopf", u"\U0001D555" }, - { u"dot", u"\u02D9" }, - { u"doteq", u"\u2250" }, - { u"doteqdot", u"\u2251" }, - { u"dotminus", u"\u2238" }, - { u"dotplus", u"\u2214" }, - { u"dotsquare", u"\u22A1" }, - { u"doublebarwedge", u"\u2306" }, - { u"downarrow", u"\u2193" }, - { u"downdownarrows", u"\u21CA" }, - { u"downharpoonleft", u"\u21C3" }, - { u"downharpoonright", u"\u21C2" }, - { u"drbkarow", u"\u2910" }, - { u"drcorn", u"\u231F" }, - { u"drcrop", u"\u230C" }, - { u"dscr", u"\U0001D4B9" }, - { u"dscy", u"\u0455" }, - { u"dsol", u"\u29F6" }, - { u"dstrok", u"\u0111" }, - { u"dtdot", u"\u22F1" }, - { u"dtri", u"\u25BF" }, - { u"dtrif", u"\u25BE" }, - { u"duarr", u"\u21F5" }, - { u"duhar", u"\u296F" }, - { u"dwangle", u"\u29A6" }, - { u"dzcy", u"\u045F" }, - { u"dzigrarr", u"\u27FF" }, - { u"eDDot", u"\u2A77" }, - { u"eDot", u"\u2251" }, - { u"eacute", u"\u00E9" }, - { u"easter", u"\u2A6E" }, - { u"ecaron", u"\u011B" }, - { u"ecir", u"\u2256" }, - { u"ecirc", u"\u00EA" }, - { u"ecolon", u"\u2255" }, - { u"ecy", u"\u044D" }, - { u"edot", u"\u0117" }, - { u"ee", u"\u2147" }, - { u"efDot", u"\u2252" }, - { u"efr", u"\U0001D522" }, - { u"eg", u"\u2A9A" }, - { u"egrave", u"\u00E8" }, - { u"egs", u"\u2A96" }, - { u"egsdot", u"\u2A98" }, - { u"el", u"\u2A99" }, - { u"elinters", u"\u23E7" }, - { u"ell", u"\u2113" }, - { u"els", u"\u2A95" }, - { u"elsdot", u"\u2A97" }, - { u"emacr", u"\u0113" }, - { u"empty", u"\u2205" }, - { u"emptyset", u"\u2205" }, - { u"emptyv", u"\u2205" }, - { u"emsp", u"\u2003" }, - { u"emsp13", u"\u2004" }, - { u"emsp14", u"\u2005" }, - { u"eng", u"\u014B" }, - { u"ensp", u"\u2002" }, - { u"eogon", u"\u0119" }, - { u"eopf", u"\U0001D556" }, - { u"epar", u"\u22D5" }, - { u"eparsl", u"\u29E3" }, - { u"eplus", u"\u2A71" }, - { u"epsi", u"\u03B5" }, - { u"epsilon", u"\u03B5" }, - { u"epsiv", u"\u03F5" }, - { u"eqcirc", u"\u2256" }, - { u"eqcolon", u"\u2255" }, - { u"eqsim", u"\u2242" }, - { u"eqslantgtr", u"\u2A96" }, - { u"eqslantless", u"\u2A95" }, - { u"equals", u"\u003D" }, - { u"equest", u"\u225F" }, - { u"equiv", u"\u2261" }, - { u"equivDD", u"\u2A78" }, - { u"eqvparsl", u"\u29E5" }, - { u"erDot", u"\u2253" }, - { u"erarr", u"\u2971" }, - { u"escr", u"\u212F" }, - { u"esdot", u"\u2250" }, - { u"esim", u"\u2242" }, - { u"eta", u"\u03B7" }, - { u"eth", u"\u00F0" }, - { u"euml", u"\u00EB" }, - { u"euro", u"\u20AC" }, - { u"excl", u"\u0021" }, - { u"exist", u"\u2203" }, - { u"expectation", u"\u2130" }, - { u"exponentiale", u"\u2147" }, - { u"fallingdotseq", u"\u2252" }, - { u"fcy", u"\u0444" }, - { u"female", u"\u2640" }, - { u"ffilig", u"\uFB03" }, - { u"fflig", u"\uFB00" }, - { u"ffllig", u"\uFB04" }, - { u"ffr", u"\U0001D523" }, - { u"filig", u"\uFB01" }, - { u"fjlig", u"\u0066\u006A" }, - { u"flat", u"\u266D" }, - { u"fllig", u"\uFB02" }, - { u"fltns", u"\u25B1" }, - { u"fnof", u"\u0192" }, - { u"fopf", u"\U0001D557" }, - { u"forall", u"\u2200" }, - { u"fork", u"\u22D4" }, - { u"forkv", u"\u2AD9" }, - { u"fpartint", u"\u2A0D" }, - { u"frac12", u"\u00BD" }, - { u"frac13", u"\u2153" }, - { u"frac14", u"\u00BC" }, - { u"frac15", u"\u2155" }, - { u"frac16", u"\u2159" }, - { u"frac18", u"\u215B" }, - { u"frac23", u"\u2154" }, - { u"frac25", u"\u2156" }, - { u"frac34", u"\u00BE" }, - { u"frac35", u"\u2157" }, - { u"frac38", u"\u215C" }, - { u"frac45", u"\u2158" }, - { u"frac56", u"\u215A" }, - { u"frac58", u"\u215D" }, - { u"frac78", u"\u215E" }, - { u"frasl", u"\u2044" }, - { u"frown", u"\u2322" }, - { u"fscr", u"\U0001D4BB" }, - { u"gE", u"\u2267" }, - { u"gEl", u"\u2A8C" }, - { u"gacute", u"\u01F5" }, - { u"gamma", u"\u03B3" }, - { u"gammad", u"\u03DD" }, - { u"gap", u"\u2A86" }, - { u"gbreve", u"\u011F" }, - { u"gcirc", u"\u011D" }, - { u"gcy", u"\u0433" }, - { u"gdot", u"\u0121" }, - { u"ge", u"\u2265" }, - { u"gel", u"\u22DB" }, - { u"geq", u"\u2265" }, - { u"geqq", u"\u2267" }, - { u"geqslant", u"\u2A7E" }, - { u"ges", u"\u2A7E" }, - { u"gescc", u"\u2AA9" }, - { u"gesdot", u"\u2A80" }, - { u"gesdoto", u"\u2A82" }, - { u"gesdotol", u"\u2A84" }, - { u"gesl", u"\u22DB\uFE00" }, - { u"gesles", u"\u2A94" }, - { u"gfr", u"\U0001D524" }, - { u"gg", u"\u226B" }, - { u"ggg", u"\u22D9" }, - { u"gimel", u"\u2137" }, - { u"gjcy", u"\u0453" }, - { u"gl", u"\u2277" }, - { u"glE", u"\u2A92" }, - { u"gla", u"\u2AA5" }, - { u"glj", u"\u2AA4" }, - { u"gnE", u"\u2269" }, - { u"gnap", u"\u2A8A" }, - { u"gnapprox", u"\u2A8A" }, - { u"gne", u"\u2A88" }, - { u"gneq", u"\u2A88" }, - { u"gneqq", u"\u2269" }, - { u"gnsim", u"\u22E7" }, - { u"gopf", u"\U0001D558" }, - { u"grave", u"\u0060" }, - { u"gscr", u"\u210A" }, - { u"gsim", u"\u2273" }, - { u"gsime", u"\u2A8E" }, - { u"gsiml", u"\u2A90" }, - { u"gt", u"\u003E" }, - { u"gtcc", u"\u2AA7" }, - { u"gtcir", u"\u2A7A" }, - { u"gtdot", u"\u22D7" }, - { u"gtlPar", u"\u2995" }, - { u"gtquest", u"\u2A7C" }, - { u"gtrapprox", u"\u2A86" }, - { u"gtrarr", u"\u2978" }, - { u"gtrdot", u"\u22D7" }, - { u"gtreqless", u"\u22DB" }, - { u"gtreqqless", u"\u2A8C" }, - { u"gtrless", u"\u2277" }, - { u"gtrsim", u"\u2273" }, - { u"gvertneqq", u"\u2269\uFE00" }, - { u"gvnE", u"\u2269\uFE00" }, - { u"hArr", u"\u21D4" }, - { u"hairsp", u"\u200A" }, - { u"half", u"\u00BD" }, - { u"hamilt", u"\u210B" }, - { u"hardcy", u"\u044A" }, - { u"harr", u"\u2194" }, - { u"harrcir", u"\u2948" }, - { u"harrw", u"\u21AD" }, - { u"hbar", u"\u210F" }, - { u"hcirc", u"\u0125" }, - { u"hearts", u"\u2665" }, - { u"heartsuit", u"\u2665" }, - { u"hellip", u"\u2026" }, - { u"hercon", u"\u22B9" }, - { u"hfr", u"\U0001D525" }, - { u"hksearow", u"\u2925" }, - { u"hkswarow", u"\u2926" }, - { u"hoarr", u"\u21FF" }, - { u"homtht", u"\u223B" }, - { u"hookleftarrow", u"\u21A9" }, - { u"hookrightarrow", u"\u21AA" }, - { u"hopf", u"\U0001D559" }, - { u"horbar", u"\u2015" }, - { u"hscr", u"\U0001D4BD" }, - { u"hslash", u"\u210F" }, - { u"hstrok", u"\u0127" }, - { u"hybull", u"\u2043" }, - { u"hyphen", u"\u2010" }, - { u"iacute", u"\u00ED" }, - { u"ic", u"\u2063" }, - { u"icirc", u"\u00EE" }, - { u"icy", u"\u0438" }, - { u"iecy", u"\u0435" }, - { u"iexcl", u"\u00A1" }, - { u"iff", u"\u21D4" }, - { u"ifr", u"\U0001D526" }, - { u"igrave", u"\u00EC" }, - { u"ii", u"\u2148" }, - { u"iiiint", u"\u2A0C" }, - { u"iiint", u"\u222D" }, - { u"iinfin", u"\u29DC" }, - { u"iiota", u"\u2129" }, - { u"ijlig", u"\u0133" }, - { u"imacr", u"\u012B" }, - { u"image", u"\u2111" }, - { u"imagline", u"\u2110" }, - { u"imagpart", u"\u2111" }, - { u"imath", u"\u0131" }, - { u"imof", u"\u22B7" }, - { u"imped", u"\u01B5" }, - { u"in", u"\u2208" }, - { u"incare", u"\u2105" }, - { u"infin", u"\u221E" }, - { u"infintie", u"\u29DD" }, - { u"inodot", u"\u0131" }, - { u"int", u"\u222B" }, - { u"intcal", u"\u22BA" }, - { u"integers", u"\u2124" }, - { u"intercal", u"\u22BA" }, - { u"intlarhk", u"\u2A17" }, - { u"intprod", u"\u2A3C" }, - { u"iocy", u"\u0451" }, - { u"iogon", u"\u012F" }, - { u"iopf", u"\U0001D55A" }, - { u"iota", u"\u03B9" }, - { u"iprod", u"\u2A3C" }, - { u"iquest", u"\u00BF" }, - { u"iscr", u"\U0001D4BE" }, - { u"isin", u"\u2208" }, - { u"isinE", u"\u22F9" }, - { u"isindot", u"\u22F5" }, - { u"isins", u"\u22F4" }, - { u"isinsv", u"\u22F3" }, - { u"isinv", u"\u2208" }, - { u"it", u"\u2062" }, - { u"itilde", u"\u0129" }, - { u"iukcy", u"\u0456" }, - { u"iuml", u"\u00EF" }, - { u"jcirc", u"\u0135" }, - { u"jcy", u"\u0439" }, - { u"jfr", u"\U0001D527" }, - { u"jmath", u"\u0237" }, - { u"jopf", u"\U0001D55B" }, - { u"jscr", u"\U0001D4BF" }, - { u"jsercy", u"\u0458" }, - { u"jukcy", u"\u0454" }, - { u"kappa", u"\u03BA" }, - { u"kappav", u"\u03F0" }, - { u"kcedil", u"\u0137" }, - { u"kcy", u"\u043A" }, - { u"kfr", u"\U0001D528" }, - { u"kgreen", u"\u0138" }, - { u"khcy", u"\u0445" }, - { u"kjcy", u"\u045C" }, - { u"kopf", u"\U0001D55C" }, - { u"kscr", u"\U0001D4C0" }, - { u"lAarr", u"\u21DA" }, - { u"lArr", u"\u21D0" }, - { u"lAtail", u"\u291B" }, - { u"lBarr", u"\u290E" }, - { u"lE", u"\u2266" }, - { u"lEg", u"\u2A8B" }, - { u"lHar", u"\u2962" }, - { u"lacute", u"\u013A" }, - { u"laemptyv", u"\u29B4" }, - { u"lagran", u"\u2112" }, - { u"lambda", u"\u03BB" }, - { u"lang", u"\u27E8" }, - { u"langd", u"\u2991" }, - { u"langle", u"\u27E8" }, - { u"lap", u"\u2A85" }, - { u"laquo", u"\u00AB" }, - { u"larr", u"\u2190" }, - { u"larrb", u"\u21E4" }, - { u"larrbfs", u"\u291F" }, - { u"larrfs", u"\u291D" }, - { u"larrhk", u"\u21A9" }, - { u"larrlp", u"\u21AB" }, - { u"larrpl", u"\u2939" }, - { u"larrsim", u"\u2973" }, - { u"larrtl", u"\u21A2" }, - { u"lat", u"\u2AAB" }, - { u"latail", u"\u2919" }, - { u"late", u"\u2AAD" }, - { u"lates", u"\u2AAD\uFE00" }, - { u"lbarr", u"\u290C" }, - { u"lbbrk", u"\u2772" }, - { u"lbrace", u"\u007B" }, - { u"lbrack", u"\u005B" }, - { u"lbrke", u"\u298B" }, - { u"lbrksld", u"\u298F" }, - { u"lbrkslu", u"\u298D" }, - { u"lcaron", u"\u013E" }, - { u"lcedil", u"\u013C" }, - { u"lceil", u"\u2308" }, - { u"lcub", u"\u007B" }, - { u"lcy", u"\u043B" }, - { u"ldca", u"\u2936" }, - { u"ldquo", u"\u201C" }, - { u"ldquor", u"\u201E" }, - { u"ldrdhar", u"\u2967" }, - { u"ldrushar", u"\u294B" }, - { u"ldsh", u"\u21B2" }, - { u"le", u"\u2264" }, - { u"leftarrow", u"\u2190" }, - { u"leftarrowtail", u"\u21A2" }, - { u"leftharpoondown", u"\u21BD" }, - { u"leftharpoonup", u"\u21BC" }, - { u"leftleftarrows", u"\u21C7" }, - { u"leftrightarrow", u"\u2194" }, - { u"leftrightarrows", u"\u21C6" }, - { u"leftrightharpoons", u"\u21CB" }, - { u"leftrightsquigarrow", u"\u21AD" }, - { u"leftthreetimes", u"\u22CB" }, - { u"leg", u"\u22DA" }, - { u"leq", u"\u2264" }, - { u"leqq", u"\u2266" }, - { u"leqslant", u"\u2A7D" }, - { u"les", u"\u2A7D" }, - { u"lescc", u"\u2AA8" }, - { u"lesdot", u"\u2A7F" }, - { u"lesdoto", u"\u2A81" }, - { u"lesdotor", u"\u2A83" }, - { u"lesg", u"\u22DA\uFE00" }, - { u"lesges", u"\u2A93" }, - { u"lessapprox", u"\u2A85" }, - { u"lessdot", u"\u22D6" }, - { u"lesseqgtr", u"\u22DA" }, - { u"lesseqqgtr", u"\u2A8B" }, - { u"lessgtr", u"\u2276" }, - { u"lesssim", u"\u2272" }, - { u"lfisht", u"\u297C" }, - { u"lfloor", u"\u230A" }, - { u"lfr", u"\U0001D529" }, - { u"lg", u"\u2276" }, - { u"lgE", u"\u2A91" }, - { u"lhard", u"\u21BD" }, - { u"lharu", u"\u21BC" }, - { u"lharul", u"\u296A" }, - { u"lhblk", u"\u2584" }, - { u"ljcy", u"\u0459" }, - { u"ll", u"\u226A" }, - { u"llarr", u"\u21C7" }, - { u"llcorner", u"\u231E" }, - { u"llhard", u"\u296B" }, - { u"lltri", u"\u25FA" }, - { u"lmidot", u"\u0140" }, - { u"lmoust", u"\u23B0" }, - { u"lmoustache", u"\u23B0" }, - { u"lnE", u"\u2268" }, - { u"lnap", u"\u2A89" }, - { u"lnapprox", u"\u2A89" }, - { u"lne", u"\u2A87" }, - { u"lneq", u"\u2A87" }, - { u"lneqq", u"\u2268" }, - { u"lnsim", u"\u22E6" }, - { u"loang", u"\u27EC" }, - { u"loarr", u"\u21FD" }, - { u"lobrk", u"\u27E6" }, - { u"longleftarrow", u"\u27F5" }, - { u"longleftrightarrow", u"\u27F7" }, - { u"longmapsto", u"\u27FC" }, - { u"longrightarrow", u"\u27F6" }, - { u"looparrowleft", u"\u21AB" }, - { u"looparrowright", u"\u21AC" }, - { u"lopar", u"\u2985" }, - { u"lopf", u"\U0001D55D" }, - { u"loplus", u"\u2A2D" }, - { u"lotimes", u"\u2A34" }, - { u"lowast", u"\u2217" }, - { u"lowbar", u"\u005F" }, - { u"loz", u"\u25CA" }, - { u"lozenge", u"\u25CA" }, - { u"lozf", u"\u29EB" }, - { u"lpar", u"\u0028" }, - { u"lparlt", u"\u2993" }, - { u"lrarr", u"\u21C6" }, - { u"lrcorner", u"\u231F" }, - { u"lrhar", u"\u21CB" }, - { u"lrhard", u"\u296D" }, - { u"lrm", u"\u200E" }, - { u"lrtri", u"\u22BF" }, - { u"lsaquo", u"\u2039" }, - { u"lscr", u"\U0001D4C1" }, - { u"lsh", u"\u21B0" }, - { u"lsim", u"\u2272" }, - { u"lsime", u"\u2A8D" }, - { u"lsimg", u"\u2A8F" }, - { u"lsqb", u"\u005B" }, - { u"lsquo", u"\u2018" }, - { u"lsquor", u"\u201A" }, - { u"lstrok", u"\u0142" }, - { u"lt", u"\u003C" }, - { u"ltcc", u"\u2AA6" }, - { u"ltcir", u"\u2A79" }, - { u"ltdot", u"\u22D6" }, - { u"lthree", u"\u22CB" }, - { u"ltimes", u"\u22C9" }, - { u"ltlarr", u"\u2976" }, - { u"ltquest", u"\u2A7B" }, - { u"ltrPar", u"\u2996" }, - { u"ltri", u"\u25C3" }, - { u"ltrie", u"\u22B4" }, - { u"ltrif", u"\u25C2" }, - { u"lurdshar", u"\u294A" }, - { u"luruhar", u"\u2966" }, - { u"lvertneqq", u"\u2268\uFE00" }, - { u"lvnE", u"\u2268\uFE00" }, - { u"mDDot", u"\u223A" }, - { u"macr", u"\u00AF" }, - { u"male", u"\u2642" }, - { u"malt", u"\u2720" }, - { u"maltese", u"\u2720" }, - { u"map", u"\u21A6" }, - { u"mapsto", u"\u21A6" }, - { u"mapstodown", u"\u21A7" }, - { u"mapstoleft", u"\u21A4" }, - { u"mapstoup", u"\u21A5" }, - { u"marker", u"\u25AE" }, - { u"mcomma", u"\u2A29" }, - { u"mcy", u"\u043C" }, - { u"mdash", u"\u2014" }, - { u"measuredangle", u"\u2221" }, - { u"mfr", u"\U0001D52A" }, - { u"mho", u"\u2127" }, - { u"micro", u"\u00B5" }, - { u"mid", u"\u2223" }, - { u"midast", u"\u002A" }, - { u"midcir", u"\u2AF0" }, - { u"middot", u"\u00B7" }, - { u"minus", u"\u2212" }, - { u"minusb", u"\u229F" }, - { u"minusd", u"\u2238" }, - { u"minusdu", u"\u2A2A" }, - { u"mlcp", u"\u2ADB" }, - { u"mldr", u"\u2026" }, - { u"mnplus", u"\u2213" }, - { u"models", u"\u22A7" }, - { u"mopf", u"\U0001D55E" }, - { u"mp", u"\u2213" }, - { u"mscr", u"\U0001D4C2" }, - { u"mstpos", u"\u223E" }, - { u"mu", u"\u03BC" }, - { u"multimap", u"\u22B8" }, - { u"mumap", u"\u22B8" }, - { u"nGg", u"\u22D9\u0338" }, - { u"nGt", u"\u226B\u20D2" }, - { u"nGtv", u"\u226B\u0338" }, - { u"nLeftarrow", u"\u21CD" }, - { u"nLeftrightarrow", u"\u21CE" }, - { u"nLl", u"\u22D8\u0338" }, - { u"nLt", u"\u226A\u20D2" }, - { u"nLtv", u"\u226A\u0338" }, - { u"nRightarrow", u"\u21CF" }, - { u"nVDash", u"\u22AF" }, - { u"nVdash", u"\u22AE" }, - { u"nabla", u"\u2207" }, - { u"nacute", u"\u0144" }, - { u"nang", u"\u2220\u20D2" }, - { u"nap", u"\u2249" }, - { u"napE", u"\u2A70\u0338" }, - { u"napid", u"\u224B\u0338" }, - { u"napos", u"\u0149" }, - { u"napprox", u"\u2249" }, - { u"natur", u"\u266E" }, - { u"natural", u"\u266E" }, - { u"naturals", u"\u2115" }, - { u"nbsp", u"\u00A0" }, - { u"nbump", u"\u224E\u0338" }, - { u"nbumpe", u"\u224F\u0338" }, - { u"ncap", u"\u2A43" }, - { u"ncaron", u"\u0148" }, - { u"ncedil", u"\u0146" }, - { u"ncong", u"\u2247" }, - { u"ncongdot", u"\u2A6D\u0338" }, - { u"ncup", u"\u2A42" }, - { u"ncy", u"\u043D" }, - { u"ndash", u"\u2013" }, - { u"ne", u"\u2260" }, - { u"neArr", u"\u21D7" }, - { u"nearhk", u"\u2924" }, - { u"nearr", u"\u2197" }, - { u"nearrow", u"\u2197" }, - { u"nedot", u"\u2250\u0338" }, - { u"nequiv", u"\u2262" }, - { u"nesear", u"\u2928" }, - { u"nesim", u"\u2242\u0338" }, - { u"nexist", u"\u2204" }, - { u"nexists", u"\u2204" }, - { u"nfr", u"\U0001D52B" }, - { u"ngE", u"\u2267\u0338" }, - { u"nge", u"\u2271" }, - { u"ngeq", u"\u2271" }, - { u"ngeqq", u"\u2267\u0338" }, - { u"ngeqslant", u"\u2A7E\u0338" }, - { u"nges", u"\u2A7E\u0338" }, - { u"ngsim", u"\u2275" }, - { u"ngt", u"\u226F" }, - { u"ngtr", u"\u226F" }, - { u"nhArr", u"\u21CE" }, - { u"nharr", u"\u21AE" }, - { u"nhpar", u"\u2AF2" }, - { u"ni", u"\u220B" }, - { u"nis", u"\u22FC" }, - { u"nisd", u"\u22FA" }, - { u"niv", u"\u220B" }, - { u"njcy", u"\u045A" }, - { u"nlArr", u"\u21CD" }, - { u"nlE", u"\u2266\u0338" }, - { u"nlarr", u"\u219A" }, - { u"nldr", u"\u2025" }, - { u"nle", u"\u2270" }, - { u"nleftarrow", u"\u219A" }, - { u"nleftrightarrow", u"\u21AE" }, - { u"nleq", u"\u2270" }, - { u"nleqq", u"\u2266\u0338" }, - { u"nleqslant", u"\u2A7D\u0338" }, - { u"nles", u"\u2A7D\u0338" }, - { u"nless", u"\u226E" }, - { u"nlsim", u"\u2274" }, - { u"nlt", u"\u226E" }, - { u"nltri", u"\u22EA" }, - { u"nltrie", u"\u22EC" }, - { u"nmid", u"\u2224" }, - { u"nopf", u"\U0001D55F" }, - { u"not", u"\u00AC" }, - { u"notin", u"\u2209" }, - { u"notinE", u"\u22F9\u0338" }, - { u"notindot", u"\u22F5\u0338" }, - { u"notinva", u"\u2209" }, - { u"notinvb", u"\u22F7" }, - { u"notinvc", u"\u22F6" }, - { u"notni", u"\u220C" }, - { u"notniva", u"\u220C" }, - { u"notnivb", u"\u22FE" }, - { u"notnivc", u"\u22FD" }, - { u"npar", u"\u2226" }, - { u"nparallel", u"\u2226" }, - { u"nparsl", u"\u2AFD\u20E5" }, - { u"npart", u"\u2202\u0338" }, - { u"npolint", u"\u2A14" }, - { u"npr", u"\u2280" }, - { u"nprcue", u"\u22E0" }, - { u"npre", u"\u2AAF\u0338" }, - { u"nprec", u"\u2280" }, - { u"npreceq", u"\u2AAF\u0338" }, - { u"nrArr", u"\u21CF" }, - { u"nrarr", u"\u219B" }, - { u"nrarrc", u"\u2933\u0338" }, - { u"nrarrw", u"\u219D\u0338" }, - { u"nrightarrow", u"\u219B" }, - { u"nrtri", u"\u22EB" }, - { u"nrtrie", u"\u22ED" }, - { u"nsc", u"\u2281" }, - { u"nsccue", u"\u22E1" }, - { u"nsce", u"\u2AB0\u0338" }, - { u"nscr", u"\U0001D4C3" }, - { u"nshortmid", u"\u2224" }, - { u"nshortparallel", u"\u2226" }, - { u"nsim", u"\u2241" }, - { u"nsime", u"\u2244" }, - { u"nsimeq", u"\u2244" }, - { u"nsmid", u"\u2224" }, - { u"nspar", u"\u2226" }, - { u"nsqsube", u"\u22E2" }, - { u"nsqsupe", u"\u22E3" }, - { u"nsub", u"\u2284" }, - { u"nsubE", u"\u2AC5\u0338" }, - { u"nsube", u"\u2288" }, - { u"nsubset", u"\u2282\u20D2" }, - { u"nsubseteq", u"\u2288" }, - { u"nsubseteqq", u"\u2AC5\u0338" }, - { u"nsucc", u"\u2281" }, - { u"nsucceq", u"\u2AB0\u0338" }, - { u"nsup", u"\u2285" }, - { u"nsupE", u"\u2AC6\u0338" }, - { u"nsupe", u"\u2289" }, - { u"nsupset", u"\u2283\u20D2" }, - { u"nsupseteq", u"\u2289" }, - { u"nsupseteqq", u"\u2AC6\u0338" }, - { u"ntgl", u"\u2279" }, - { u"ntilde", u"\u00F1" }, - { u"ntlg", u"\u2278" }, - { u"ntriangleleft", u"\u22EA" }, - { u"ntrianglelefteq", u"\u22EC" }, - { u"ntriangleright", u"\u22EB" }, - { u"ntrianglerighteq", u"\u22ED" }, - { u"nu", u"\u03BD" }, - { u"num", u"\u0023" }, - { u"numero", u"\u2116" }, - { u"numsp", u"\u2007" }, - { u"nvDash", u"\u22AD" }, - { u"nvHarr", u"\u2904" }, - { u"nvap", u"\u224D\u20D2" }, - { u"nvdash", u"\u22AC" }, - { u"nvge", u"\u2265\u20D2" }, - { u"nvgt", u"\u003E\u20D2" }, - { u"nvinfin", u"\u29DE" }, - { u"nvlArr", u"\u2902" }, - { u"nvle", u"\u2264\u20D2" }, - { u"nvlt", u"\u003C\u20D2" }, - { u"nvltrie", u"\u22B4\u20D2" }, - { u"nvrArr", u"\u2903" }, - { u"nvrtrie", u"\u22B5\u20D2" }, - { u"nvsim", u"\u223C\u20D2" }, - { u"nwArr", u"\u21D6" }, - { u"nwarhk", u"\u2923" }, - { u"nwarr", u"\u2196" }, - { u"nwarrow", u"\u2196" }, - { u"nwnear", u"\u2927" }, - { u"oS", u"\u24C8" }, - { u"oacute", u"\u00F3" }, - { u"oast", u"\u229B" }, - { u"ocir", u"\u229A" }, - { u"ocirc", u"\u00F4" }, - { u"ocy", u"\u043E" }, - { u"odash", u"\u229D" }, - { u"odblac", u"\u0151" }, - { u"odiv", u"\u2A38" }, - { u"odot", u"\u2299" }, - { u"odsold", u"\u29BC" }, - { u"oelig", u"\u0153" }, - { u"ofcir", u"\u29BF" }, - { u"ofr", u"\U0001D52C" }, - { u"ogon", u"\u02DB" }, - { u"ograve", u"\u00F2" }, - { u"ogt", u"\u29C1" }, - { u"ohbar", u"\u29B5" }, - { u"ohm", u"\u03A9" }, - { u"oint", u"\u222E" }, - { u"olarr", u"\u21BA" }, - { u"olcir", u"\u29BE" }, - { u"olcross", u"\u29BB" }, - { u"oline", u"\u203E" }, - { u"olt", u"\u29C0" }, - { u"omacr", u"\u014D" }, - { u"omega", u"\u03C9" }, - { u"omicron", u"\u03BF" }, - { u"omid", u"\u29B6" }, - { u"ominus", u"\u2296" }, - { u"oopf", u"\U0001D560" }, - { u"opar", u"\u29B7" }, - { u"operp", u"\u29B9" }, - { u"oplus", u"\u2295" }, - { u"or", u"\u2228" }, - { u"orarr", u"\u21BB" }, - { u"ord", u"\u2A5D" }, - { u"order", u"\u2134" }, - { u"orderof", u"\u2134" }, - { u"ordf", u"\u00AA" }, - { u"ordm", u"\u00BA" }, - { u"origof", u"\u22B6" }, - { u"oror", u"\u2A56" }, - { u"orslope", u"\u2A57" }, - { u"orv", u"\u2A5B" }, - { u"oscr", u"\u2134" }, - { u"oslash", u"\u00F8" }, - { u"osol", u"\u2298" }, - { u"otilde", u"\u00F5" }, - { u"otimes", u"\u2297" }, - { u"otimesas", u"\u2A36" }, - { u"ouml", u"\u00F6" }, - { u"ovbar", u"\u233D" }, - { u"par", u"\u2225" }, - { u"para", u"\u00B6" }, - { u"parallel", u"\u2225" }, - { u"parsim", u"\u2AF3" }, - { u"parsl", u"\u2AFD" }, - { u"part", u"\u2202" }, - { u"pcy", u"\u043F" }, - { u"percnt", u"\u0025" }, - { u"period", u"\u002E" }, - { u"permil", u"\u2030" }, - { u"perp", u"\u22A5" }, - { u"pertenk", u"\u2031" }, - { u"pfr", u"\U0001D52D" }, - { u"phi", u"\u03C6" }, - { u"phiv", u"\u03D5" }, - { u"phmmat", u"\u2133" }, - { u"phone", u"\u260E" }, - { u"pi", u"\u03C0" }, - { u"pitchfork", u"\u22D4" }, - { u"piv", u"\u03D6" }, - { u"planck", u"\u210F" }, - { u"planckh", u"\u210E" }, - { u"plankv", u"\u210F" }, - { u"plus", u"\u002B" }, - { u"plusacir", u"\u2A23" }, - { u"plusb", u"\u229E" }, - { u"pluscir", u"\u2A22" }, - { u"plusdo", u"\u2214" }, - { u"plusdu", u"\u2A25" }, - { u"pluse", u"\u2A72" }, - { u"plusmn", u"\u00B1" }, - { u"plussim", u"\u2A26" }, - { u"plustwo", u"\u2A27" }, - { u"pm", u"\u00B1" }, - { u"pointint", u"\u2A15" }, - { u"popf", u"\U0001D561" }, - { u"pound", u"\u00A3" }, - { u"pr", u"\u227A" }, - { u"prE", u"\u2AB3" }, - { u"prap", u"\u2AB7" }, - { u"prcue", u"\u227C" }, - { u"pre", u"\u2AAF" }, - { u"prec", u"\u227A" }, - { u"precapprox", u"\u2AB7" }, - { u"preccurlyeq", u"\u227C" }, - { u"preceq", u"\u2AAF" }, - { u"precnapprox", u"\u2AB9" }, - { u"precneqq", u"\u2AB5" }, - { u"precnsim", u"\u22E8" }, - { u"precsim", u"\u227E" }, - { u"prime", u"\u2032" }, - { u"primes", u"\u2119" }, - { u"prnE", u"\u2AB5" }, - { u"prnap", u"\u2AB9" }, - { u"prnsim", u"\u22E8" }, - { u"prod", u"\u220F" }, - { u"profalar", u"\u232E" }, - { u"profline", u"\u2312" }, - { u"profsurf", u"\u2313" }, - { u"prop", u"\u221D" }, - { u"propto", u"\u221D" }, - { u"prsim", u"\u227E" }, - { u"prurel", u"\u22B0" }, - { u"pscr", u"\U0001D4C5" }, - { u"psi", u"\u03C8" }, - { u"puncsp", u"\u2008" }, - { u"qfr", u"\U0001D52E" }, - { u"qint", u"\u2A0C" }, - { u"qopf", u"\U0001D562" }, - { u"qprime", u"\u2057" }, - { u"qscr", u"\U0001D4C6" }, - { u"quaternions", u"\u210D" }, - { u"quatint", u"\u2A16" }, - { u"quest", u"\u003F" }, - { u"questeq", u"\u225F" }, - { u"quot", u"\u0022" }, - { u"rAarr", u"\u21DB" }, - { u"rArr", u"\u21D2" }, - { u"rAtail", u"\u291C" }, - { u"rBarr", u"\u290F" }, - { u"rHar", u"\u2964" }, - { u"race", u"\u223D\u0331" }, - { u"racute", u"\u0155" }, - { u"radic", u"\u221A" }, - { u"raemptyv", u"\u29B3" }, - { u"rang", u"\u27E9" }, - { u"rangd", u"\u2992" }, - { u"range", u"\u29A5" }, - { u"rangle", u"\u27E9" }, - { u"raquo", u"\u00BB" }, - { u"rarr", u"\u2192" }, - { u"rarrap", u"\u2975" }, - { u"rarrb", u"\u21E5" }, - { u"rarrbfs", u"\u2920" }, - { u"rarrc", u"\u2933" }, - { u"rarrfs", u"\u291E" }, - { u"rarrhk", u"\u21AA" }, - { u"rarrlp", u"\u21AC" }, - { u"rarrpl", u"\u2945" }, - { u"rarrsim", u"\u2974" }, - { u"rarrtl", u"\u21A3" }, - { u"rarrw", u"\u219D" }, - { u"ratail", u"\u291A" }, - { u"ratio", u"\u2236" }, - { u"rationals", u"\u211A" }, - { u"rbarr", u"\u290D" }, - { u"rbbrk", u"\u2773" }, - { u"rbrace", u"\u007D" }, - { u"rbrack", u"\u005D" }, - { u"rbrke", u"\u298C" }, - { u"rbrksld", u"\u298E" }, - { u"rbrkslu", u"\u2990" }, - { u"rcaron", u"\u0159" }, - { u"rcedil", u"\u0157" }, - { u"rceil", u"\u2309" }, - { u"rcub", u"\u007D" }, - { u"rcy", u"\u0440" }, - { u"rdca", u"\u2937" }, - { u"rdldhar", u"\u2969" }, - { u"rdquo", u"\u201D" }, - { u"rdquor", u"\u201D" }, - { u"rdsh", u"\u21B3" }, - { u"real", u"\u211C" }, - { u"realine", u"\u211B" }, - { u"realpart", u"\u211C" }, - { u"reals", u"\u211D" }, - { u"rect", u"\u25AD" }, - { u"reg", u"\u00AE" }, - { u"rfisht", u"\u297D" }, - { u"rfloor", u"\u230B" }, - { u"rfr", u"\U0001D52F" }, - { u"rhard", u"\u21C1" }, - { u"rharu", u"\u21C0" }, - { u"rharul", u"\u296C" }, - { u"rho", u"\u03C1" }, - { u"rhov", u"\u03F1" }, - { u"rightarrow", u"\u2192" }, - { u"rightarrowtail", u"\u21A3" }, - { u"rightharpoondown", u"\u21C1" }, - { u"rightharpoonup", u"\u21C0" }, - { u"rightleftarrows", u"\u21C4" }, - { u"rightleftharpoons", u"\u21CC" }, - { u"rightrightarrows", u"\u21C9" }, - { u"rightsquigarrow", u"\u219D" }, - { u"rightthreetimes", u"\u22CC" }, - { u"ring", u"\u02DA" }, - { u"risingdotseq", u"\u2253" }, - { u"rlarr", u"\u21C4" }, - { u"rlhar", u"\u21CC" }, - { u"rlm", u"\u200F" }, - { u"rmoust", u"\u23B1" }, - { u"rmoustache", u"\u23B1" }, - { u"rnmid", u"\u2AEE" }, - { u"roang", u"\u27ED" }, - { u"roarr", u"\u21FE" }, - { u"robrk", u"\u27E7" }, - { u"ropar", u"\u2986" }, - { u"ropf", u"\U0001D563" }, - { u"roplus", u"\u2A2E" }, - { u"rotimes", u"\u2A35" }, - { u"rpar", u"\u0029" }, - { u"rpargt", u"\u2994" }, - { u"rppolint", u"\u2A12" }, - { u"rrarr", u"\u21C9" }, - { u"rsaquo", u"\u203A" }, - { u"rscr", u"\U0001D4C7" }, - { u"rsh", u"\u21B1" }, - { u"rsqb", u"\u005D" }, - { u"rsquo", u"\u2019" }, - { u"rsquor", u"\u2019" }, - { u"rthree", u"\u22CC" }, - { u"rtimes", u"\u22CA" }, - { u"rtri", u"\u25B9" }, - { u"rtrie", u"\u22B5" }, - { u"rtrif", u"\u25B8" }, - { u"rtriltri", u"\u29CE" }, - { u"ruluhar", u"\u2968" }, - { u"rx", u"\u211E" }, - { u"sacute", u"\u015B" }, - { u"sbquo", u"\u201A" }, - { u"sc", u"\u227B" }, - { u"scE", u"\u2AB4" }, - { u"scap", u"\u2AB8" }, - { u"scaron", u"\u0161" }, - { u"sccue", u"\u227D" }, - { u"sce", u"\u2AB0" }, - { u"scedil", u"\u015F" }, - { u"scirc", u"\u015D" }, - { u"scnE", u"\u2AB6" }, - { u"scnap", u"\u2ABA" }, - { u"scnsim", u"\u22E9" }, - { u"scpolint", u"\u2A13" }, - { u"scsim", u"\u227F" }, - { u"scy", u"\u0441" }, - { u"sdot", u"\u22C5" }, - { u"sdotb", u"\u22A1" }, - { u"sdote", u"\u2A66" }, - { u"seArr", u"\u21D8" }, - { u"searhk", u"\u2925" }, - { u"searr", u"\u2198" }, - { u"searrow", u"\u2198" }, - { u"sect", u"\u00A7" }, - { u"semi", u"\u003B" }, - { u"seswar", u"\u2929" }, - { u"setminus", u"\u2216" }, - { u"setmn", u"\u2216" }, - { u"sext", u"\u2736" }, - { u"sfr", u"\U0001D530" }, - { u"sfrown", u"\u2322" }, - { u"sharp", u"\u266F" }, - { u"shchcy", u"\u0449" }, - { u"shcy", u"\u0448" }, - { u"shortmid", u"\u2223" }, - { u"shortparallel", u"\u2225" }, - { u"shy", u"\u00AD" }, - { u"sigma", u"\u03C3" }, - { u"sigmaf", u"\u03C2" }, - { u"sigmav", u"\u03C2" }, - { u"sim", u"\u223C" }, - { u"simdot", u"\u2A6A" }, - { u"sime", u"\u2243" }, - { u"simeq", u"\u2243" }, - { u"simg", u"\u2A9E" }, - { u"simgE", u"\u2AA0" }, - { u"siml", u"\u2A9D" }, - { u"simlE", u"\u2A9F" }, - { u"simne", u"\u2246" }, - { u"simplus", u"\u2A24" }, - { u"simrarr", u"\u2972" }, - { u"slarr", u"\u2190" }, - { u"smallsetminus", u"\u2216" }, - { u"smashp", u"\u2A33" }, - { u"smeparsl", u"\u29E4" }, - { u"smid", u"\u2223" }, - { u"smile", u"\u2323" }, - { u"smt", u"\u2AAA" }, - { u"smte", u"\u2AAC" }, - { u"smtes", u"\u2AAC\uFE00" }, - { u"softcy", u"\u044C" }, - { u"sol", u"\u002F" }, - { u"solb", u"\u29C4" }, - { u"solbar", u"\u233F" }, - { u"sopf", u"\U0001D564" }, - { u"spades", u"\u2660" }, - { u"spadesuit", u"\u2660" }, - { u"spar", u"\u2225" }, - { u"sqcap", u"\u2293" }, - { u"sqcaps", u"\u2293\uFE00" }, - { u"sqcup", u"\u2294" }, - { u"sqcups", u"\u2294\uFE00" }, - { u"sqsub", u"\u228F" }, - { u"sqsube", u"\u2291" }, - { u"sqsubset", u"\u228F" }, - { u"sqsubseteq", u"\u2291" }, - { u"sqsup", u"\u2290" }, - { u"sqsupe", u"\u2292" }, - { u"sqsupset", u"\u2290" }, - { u"sqsupseteq", u"\u2292" }, - { u"squ", u"\u25A1" }, - { u"square", u"\u25A1" }, - { u"squarf", u"\u25AA" }, - { u"squf", u"\u25AA" }, - { u"srarr", u"\u2192" }, - { u"sscr", u"\U0001D4C8" }, - { u"ssetmn", u"\u2216" }, - { u"ssmile", u"\u2323" }, - { u"sstarf", u"\u22C6" }, - { u"star", u"\u2606" }, - { u"starf", u"\u2605" }, - { u"straightepsilon", u"\u03F5" }, - { u"straightphi", u"\u03D5" }, - { u"strns", u"\u00AF" }, - { u"sub", u"\u2282" }, - { u"subE", u"\u2AC5" }, - { u"subdot", u"\u2ABD" }, - { u"sube", u"\u2286" }, - { u"subedot", u"\u2AC3" }, - { u"submult", u"\u2AC1" }, - { u"subnE", u"\u2ACB" }, - { u"subne", u"\u228A" }, - { u"subplus", u"\u2ABF" }, - { u"subrarr", u"\u2979" }, - { u"subset", u"\u2282" }, - { u"subseteq", u"\u2286" }, - { u"subseteqq", u"\u2AC5" }, - { u"subsetneq", u"\u228A" }, - { u"subsetneqq", u"\u2ACB" }, - { u"subsim", u"\u2AC7" }, - { u"subsub", u"\u2AD5" }, - { u"subsup", u"\u2AD3" }, - { u"succ", u"\u227B" }, - { u"succapprox", u"\u2AB8" }, - { u"succcurlyeq", u"\u227D" }, - { u"succeq", u"\u2AB0" }, - { u"succnapprox", u"\u2ABA" }, - { u"succneqq", u"\u2AB6" }, - { u"succnsim", u"\u22E9" }, - { u"succsim", u"\u227F" }, - { u"sum", u"\u2211" }, - { u"sung", u"\u266A" }, - { u"sup", u"\u2283" }, - { u"sup1", u"\u00B9" }, - { u"sup2", u"\u00B2" }, - { u"sup3", u"\u00B3" }, - { u"supE", u"\u2AC6" }, - { u"supdot", u"\u2ABE" }, - { u"supdsub", u"\u2AD8" }, - { u"supe", u"\u2287" }, - { u"supedot", u"\u2AC4" }, - { u"suphsol", u"\u27C9" }, - { u"suphsub", u"\u2AD7" }, - { u"suplarr", u"\u297B" }, - { u"supmult", u"\u2AC2" }, - { u"supnE", u"\u2ACC" }, - { u"supne", u"\u228B" }, - { u"supplus", u"\u2AC0" }, - { u"supset", u"\u2283" }, - { u"supseteq", u"\u2287" }, - { u"supseteqq", u"\u2AC6" }, - { u"supsetneq", u"\u228B" }, - { u"supsetneqq", u"\u2ACC" }, - { u"supsim", u"\u2AC8" }, - { u"supsub", u"\u2AD4" }, - { u"supsup", u"\u2AD6" }, - { u"swArr", u"\u21D9" }, - { u"swarhk", u"\u2926" }, - { u"swarr", u"\u2199" }, - { u"swarrow", u"\u2199" }, - { u"swnwar", u"\u292A" }, - { u"szlig", u"\u00DF" }, - { u"target", u"\u2316" }, - { u"tau", u"\u03C4" }, - { u"tbrk", u"\u23B4" }, - { u"tcaron", u"\u0165" }, - { u"tcedil", u"\u0163" }, - { u"tcy", u"\u0442" }, - { u"tdot", u"\u20DB" }, - { u"telrec", u"\u2315" }, - { u"tfr", u"\U0001D531" }, - { u"there4", u"\u2234" }, - { u"therefore", u"\u2234" }, - { u"theta", u"\u03B8" }, - { u"thetasym", u"\u03D1" }, - { u"thetav", u"\u03D1" }, - { u"thickapprox", u"\u2248" }, - { u"thicksim", u"\u223C" }, - { u"thinsp", u"\u2009" }, - { u"thkap", u"\u2248" }, - { u"thksim", u"\u223C" }, - { u"thorn", u"\u00FE" }, - { u"tilde", u"\u02DC" }, - { u"times", u"\u00D7" }, - { u"timesb", u"\u22A0" }, - { u"timesbar", u"\u2A31" }, - { u"timesd", u"\u2A30" }, - { u"tint", u"\u222D" }, - { u"toea", u"\u2928" }, - { u"top", u"\u22A4" }, - { u"topbot", u"\u2336" }, - { u"topcir", u"\u2AF1" }, - { u"topf", u"\U0001D565" }, - { u"topfork", u"\u2ADA" }, - { u"tosa", u"\u2929" }, - { u"tprime", u"\u2034" }, - { u"trade", u"\u2122" }, - { u"triangle", u"\u25B5" }, - { u"triangledown", u"\u25BF" }, - { u"triangleleft", u"\u25C3" }, - { u"trianglelefteq", u"\u22B4" }, - { u"triangleq", u"\u225C" }, - { u"triangleright", u"\u25B9" }, - { u"trianglerighteq", u"\u22B5" }, - { u"tridot", u"\u25EC" }, - { u"trie", u"\u225C" }, - { u"triminus", u"\u2A3A" }, - { u"triplus", u"\u2A39" }, - { u"trisb", u"\u29CD" }, - { u"tritime", u"\u2A3B" }, - { u"trpezium", u"\u23E2" }, - { u"tscr", u"\U0001D4C9" }, - { u"tscy", u"\u0446" }, - { u"tshcy", u"\u045B" }, - { u"tstrok", u"\u0167" }, - { u"twixt", u"\u226C" }, - { u"twoheadleftarrow", u"\u219E" }, - { u"twoheadrightarrow", u"\u21A0" }, - { u"uArr", u"\u21D1" }, - { u"uHar", u"\u2963" }, - { u"uacute", u"\u00FA" }, - { u"uarr", u"\u2191" }, - { u"ubrcy", u"\u045E" }, - { u"ubreve", u"\u016D" }, - { u"ucirc", u"\u00FB" }, - { u"ucy", u"\u0443" }, - { u"udarr", u"\u21C5" }, - { u"udblac", u"\u0171" }, - { u"udhar", u"\u296E" }, - { u"ufisht", u"\u297E" }, - { u"ufr", u"\U0001D532" }, - { u"ugrave", u"\u00F9" }, - { u"uharl", u"\u21BF" }, - { u"uharr", u"\u21BE" }, - { u"uhblk", u"\u2580" }, - { u"ulcorn", u"\u231C" }, - { u"ulcorner", u"\u231C" }, - { u"ulcrop", u"\u230F" }, - { u"ultri", u"\u25F8" }, - { u"umacr", u"\u016B" }, - { u"uml", u"\u00A8" }, - { u"uogon", u"\u0173" }, - { u"uopf", u"\U0001D566" }, - { u"uparrow", u"\u2191" }, - { u"updownarrow", u"\u2195" }, - { u"upharpoonleft", u"\u21BF" }, - { u"upharpoonright", u"\u21BE" }, - { u"uplus", u"\u228E" }, - { u"upsi", u"\u03C5" }, - { u"upsih", u"\u03D2" }, - { u"upsilon", u"\u03C5" }, - { u"upuparrows", u"\u21C8" }, - { u"urcorn", u"\u231D" }, - { u"urcorner", u"\u231D" }, - { u"urcrop", u"\u230E" }, - { u"uring", u"\u016F" }, - { u"urtri", u"\u25F9" }, - { u"uscr", u"\U0001D4CA" }, - { u"utdot", u"\u22F0" }, - { u"utilde", u"\u0169" }, - { u"utri", u"\u25B5" }, - { u"utrif", u"\u25B4" }, - { u"uuarr", u"\u21C8" }, - { u"uuml", u"\u00FC" }, - { u"uwangle", u"\u29A7" }, - { u"vArr", u"\u21D5" }, - { u"vBar", u"\u2AE8" }, - { u"vBarv", u"\u2AE9" }, - { u"vDash", u"\u22A8" }, - { u"vangrt", u"\u299C" }, - { u"varepsilon", u"\u03F5" }, - { u"varkappa", u"\u03F0" }, - { u"varnothing", u"\u2205" }, - { u"varphi", u"\u03D5" }, - { u"varpi", u"\u03D6" }, - { u"varpropto", u"\u221D" }, - { u"varr", u"\u2195" }, - { u"varrho", u"\u03F1" }, - { u"varsigma", u"\u03C2" }, - { u"varsubsetneq", u"\u228A\uFE00" }, - { u"varsubsetneqq", u"\u2ACB\uFE00" }, - { u"varsupsetneq", u"\u228B\uFE00" }, - { u"varsupsetneqq", u"\u2ACC\uFE00" }, - { u"vartheta", u"\u03D1" }, - { u"vartriangleleft", u"\u22B2" }, - { u"vartriangleright", u"\u22B3" }, - { u"vcy", u"\u0432" }, - { u"vdash", u"\u22A2" }, - { u"vee", u"\u2228" }, - { u"veebar", u"\u22BB" }, - { u"veeeq", u"\u225A" }, - { u"vellip", u"\u22EE" }, - { u"verbar", u"\u007C" }, - { u"vert", u"\u007C" }, - { u"vfr", u"\U0001D533" }, - { u"vltri", u"\u22B2" }, - { u"vnsub", u"\u2282\u20D2" }, - { u"vnsup", u"\u2283\u20D2" }, - { u"vopf", u"\U0001D567" }, - { u"vprop", u"\u221D" }, - { u"vrtri", u"\u22B3" }, - { u"vscr", u"\U0001D4CB" }, - { u"vsubnE", u"\u2ACB\uFE00" }, - { u"vsubne", u"\u228A\uFE00" }, - { u"vsupnE", u"\u2ACC\uFE00" }, - { u"vsupne", u"\u228B\uFE00" }, - { u"vzigzag", u"\u299A" }, - { u"wcirc", u"\u0175" }, - { u"wedbar", u"\u2A5F" }, - { u"wedge", u"\u2227" }, - { u"wedgeq", u"\u2259" }, - { u"weierp", u"\u2118" }, - { u"wfr", u"\U0001D534" }, - { u"wopf", u"\U0001D568" }, - { u"wp", u"\u2118" }, - { u"wr", u"\u2240" }, - { u"wreath", u"\u2240" }, - { u"wscr", u"\U0001D4CC" }, - { u"xcap", u"\u22C2" }, - { u"xcirc", u"\u25EF" }, - { u"xcup", u"\u22C3" }, - { u"xdtri", u"\u25BD" }, - { u"xfr", u"\U0001D535" }, - { u"xhArr", u"\u27FA" }, - { u"xharr", u"\u27F7" }, - { u"xi", u"\u03BE" }, - { u"xlArr", u"\u27F8" }, - { u"xlarr", u"\u27F5" }, - { u"xmap", u"\u27FC" }, - { u"xnis", u"\u22FB" }, - { u"xodot", u"\u2A00" }, - { u"xopf", u"\U0001D569" }, - { u"xoplus", u"\u2A01" }, - { u"xotime", u"\u2A02" }, - { u"xrArr", u"\u27F9" }, - { u"xrarr", u"\u27F6" }, - { u"xscr", u"\U0001D4CD" }, - { u"xsqcup", u"\u2A06" }, - { u"xuplus", u"\u2A04" }, - { u"xutri", u"\u25B3" }, - { u"xvee", u"\u22C1" }, - { u"xwedge", u"\u22C0" }, - { u"yacute", u"\u00FD" }, - { u"yacy", u"\u044F" }, - { u"ycirc", u"\u0177" }, - { u"ycy", u"\u044B" }, - { u"yen", u"\u00A5" }, - { u"yfr", u"\U0001D536" }, - { u"yicy", u"\u0457" }, - { u"yopf", u"\U0001D56A" }, - { u"yscr", u"\U0001D4CE" }, - { u"yucy", u"\u044E" }, - { u"yuml", u"\u00FF" }, - { u"zacute", u"\u017A" }, - { u"zcaron", u"\u017E" }, - { u"zcy", u"\u0437" }, - { u"zdot", u"\u017C" }, - { u"zeetrf", u"\u2128" }, - { u"zeta", u"\u03B6" }, - { u"zfr", u"\U0001D537" }, - { u"zhcy", u"\u0436" }, - { u"zigrarr", u"\u21DD" }, - { u"zopf", u"\U0001D56B" }, - { u"zscr", u"\U0001D4CF" }, - { u"zwj", u"\u200D" }, - { u"zwnj", u"\u200C" } + { u"AElig"_ustr, u"\u00C6"_ustr }, + { u"AMP"_ustr, u"\u0026"_ustr }, + { u"Aacute"_ustr, u"\u00C1"_ustr }, + { u"Abreve"_ustr, u"\u0102"_ustr }, + { u"Acirc"_ustr, u"\u00C2"_ustr }, + { u"Acy"_ustr, u"\u0410"_ustr }, + { u"Afr"_ustr, u"\U0001D504"_ustr }, + { u"Agrave"_ustr, u"\u00C0"_ustr }, + { u"Alpha"_ustr, u"\u0391"_ustr }, + { u"Amacr"_ustr, u"\u0100"_ustr }, + { u"And"_ustr, u"\u2A53"_ustr }, + { u"Aogon"_ustr, u"\u0104"_ustr }, + { u"Aopf"_ustr, u"\U0001D538"_ustr }, + { u"ApplyFunction"_ustr, u"\u2061"_ustr }, + { u"Aring"_ustr, u"\u00C5"_ustr }, + { u"Ascr"_ustr, u"\U0001D49C"_ustr }, + { u"Assign"_ustr, u"\u2254"_ustr }, + { u"Atilde"_ustr, u"\u00C3"_ustr }, + { u"Auml"_ustr, u"\u00C4"_ustr }, + { u"Backslash"_ustr, u"\u2216"_ustr }, + { u"Barv"_ustr, u"\u2AE7"_ustr }, + { u"Barwed"_ustr, u"\u2306"_ustr }, + { u"Bcy"_ustr, u"\u0411"_ustr }, + { u"Because"_ustr, u"\u2235"_ustr }, + { u"Bernoullis"_ustr, u"\u212C"_ustr }, + { u"Beta"_ustr, u"\u0392"_ustr }, + { u"Bfr"_ustr, u"\U0001D505"_ustr }, + { u"Bopf"_ustr, u"\U0001D539"_ustr }, + { u"Breve"_ustr, u"\u02D8"_ustr }, + { u"Bscr"_ustr, u"\u212C"_ustr }, + { u"Bumpeq"_ustr, u"\u224E"_ustr }, + { u"CHcy"_ustr, u"\u0427"_ustr }, + { u"COPY"_ustr, u"\u00A9"_ustr }, + { u"Cacute"_ustr, u"\u0106"_ustr }, + { u"Cap"_ustr, u"\u22D2"_ustr }, + { u"CapitalDifferentialD"_ustr, u"\u2145"_ustr }, + { u"Cayleys"_ustr, u"\u212D"_ustr }, + { u"Ccaron"_ustr, u"\u010C"_ustr }, + { u"Ccedil"_ustr, u"\u00C7"_ustr }, + { u"Ccirc"_ustr, u"\u0108"_ustr }, + { u"Cconint"_ustr, u"\u2230"_ustr }, + { u"Cdot"_ustr, u"\u010A"_ustr }, + { u"Cedilla"_ustr, u"\u00B8"_ustr }, + { u"CenterDot"_ustr, u"\u00B7"_ustr }, + { u"Cfr"_ustr, u"\u212D"_ustr }, + { u"Chi"_ustr, u"\u03A7"_ustr }, + { u"CircleDot"_ustr, u"\u2299"_ustr }, + { u"CircleMinus"_ustr, u"\u2296"_ustr }, + { u"CirclePlus"_ustr, u"\u2295"_ustr }, + { u"CircleTimes"_ustr, u"\u2297"_ustr }, + { u"ClockwiseContourIntegral"_ustr, u"\u2232"_ustr }, + { u"CloseCurlyDoubleQuote"_ustr, u"\u201D"_ustr }, + { u"CloseCurlyQuote"_ustr, u"\u2019"_ustr }, + { u"Colon"_ustr, u"\u2237"_ustr }, + { u"Colone"_ustr, u"\u2A74"_ustr }, + { u"Congruent"_ustr, u"\u2261"_ustr }, + { u"Conint"_ustr, u"\u222F"_ustr }, + { u"ContourIntegral"_ustr, u"\u222E"_ustr }, + { u"Copf"_ustr, u"\u2102"_ustr }, + { u"Coproduct"_ustr, u"\u2210"_ustr }, + { u"CounterClockwiseContourIntegral"_ustr, u"\u2233"_ustr }, + { u"Cross"_ustr, u"\u2A2F"_ustr }, + { u"Cscr"_ustr, u"\U0001D49E"_ustr }, + { u"Cup"_ustr, u"\u22D3"_ustr }, + { u"CupCap"_ustr, u"\u224D"_ustr }, + { u"DD"_ustr, u"\u2145"_ustr }, + { u"DDotrahd"_ustr, u"\u2911"_ustr }, + { u"DJcy"_ustr, u"\u0402"_ustr }, + { u"DScy"_ustr, u"\u0405"_ustr }, + { u"DZcy"_ustr, u"\u040F"_ustr }, + { u"Dagger"_ustr, u"\u2021"_ustr }, + { u"Darr"_ustr, u"\u21A1"_ustr }, + { u"Dashv"_ustr, u"\u2AE4"_ustr }, + { u"Dcaron"_ustr, u"\u010E"_ustr }, + { u"Dcy"_ustr, u"\u0414"_ustr }, + { u"Del"_ustr, u"\u2207"_ustr }, + { u"Delta"_ustr, u"\u0394"_ustr }, + { u"Dfr"_ustr, u"\U0001D507"_ustr }, + { u"DiacriticalAcute"_ustr, u"\u00B4"_ustr }, + { u"DiacriticalDot"_ustr, u"\u02D9"_ustr }, + { u"DiacriticalDoubleAcute"_ustr, u"\u02DD"_ustr }, + { u"DiacriticalGrave"_ustr, u"\u0060"_ustr }, + { u"DiacriticalTilde"_ustr, u"\u02DC"_ustr }, + { u"Diamond"_ustr, u"\u22C4"_ustr }, + { u"DifferentialD"_ustr, u"\u2146"_ustr }, + { u"Dopf"_ustr, u"\U0001D53B"_ustr }, + { u"Dot"_ustr, u"\u00A8"_ustr }, + { u"DotDot"_ustr, u"\u20DC"_ustr }, + { u"DotEqual"_ustr, u"\u2250"_ustr }, + { u"DoubleContourIntegral"_ustr, u"\u222F"_ustr }, + { u"DoubleDot"_ustr, u"\u00A8"_ustr }, + { u"DoubleDownArrow"_ustr, u"\u21D3"_ustr }, + { u"DoubleLeftArrow"_ustr, u"\u21D0"_ustr }, + { u"DoubleLeftRightArrow"_ustr, u"\u21D4"_ustr }, + { u"DoubleLeftTee"_ustr, u"\u2AE4"_ustr }, + { u"DoubleLongLeftArrow"_ustr, u"\u27F8"_ustr }, + { u"DoubleLongLeftRightArrow"_ustr, u"\u27FA"_ustr }, + { u"DoubleLongRightArrow"_ustr, u"\u27F9"_ustr }, + { u"DoubleRightArrow"_ustr, u"\u21D2"_ustr }, + { u"DoubleRightTee"_ustr, u"\u22A8"_ustr }, + { u"DoubleUpArrow"_ustr, u"\u21D1"_ustr }, + { u"DoubleUpDownArrow"_ustr, u"\u21D5"_ustr }, + { u"DoubleVerticalBar"_ustr, u"\u2225"_ustr }, + { u"DownArrow"_ustr, u"\u2193"_ustr }, + { u"DownArrowBar"_ustr, u"\u2913"_ustr }, + { u"DownArrowUpArrow"_ustr, u"\u21F5"_ustr }, + { u"DownBreve"_ustr, u"\u0311"_ustr }, + { u"DownLeftRightVector"_ustr, u"\u2950"_ustr }, + { u"DownLeftTeeVector"_ustr, u"\u295E"_ustr }, + { u"DownLeftVector"_ustr, u"\u21BD"_ustr }, + { u"DownLeftVectorBar"_ustr, u"\u2956"_ustr }, + { u"DownRightTeeVector"_ustr, u"\u295F"_ustr }, + { u"DownRightVector"_ustr, u"\u21C1"_ustr }, + { u"DownRightVectorBar"_ustr, u"\u2957"_ustr }, + { u"DownTee"_ustr, u"\u22A4"_ustr }, + { u"DownTeeArrow"_ustr, u"\u21A7"_ustr }, + { u"Downarrow"_ustr, u"\u21D3"_ustr }, + { u"Dscr"_ustr, u"\U0001D49F"_ustr }, + { u"Dstrok"_ustr, u"\u0110"_ustr }, + { u"ENG"_ustr, u"\u014A"_ustr }, + { u"ETH"_ustr, u"\u00D0"_ustr }, + { u"Eacute"_ustr, u"\u00C9"_ustr }, + { u"Ecaron"_ustr, u"\u011A"_ustr }, + { u"Ecirc"_ustr, u"\u00CA"_ustr }, + { u"Ecy"_ustr, u"\u042D"_ustr }, + { u"Edot"_ustr, u"\u0116"_ustr }, + { u"Efr"_ustr, u"\U0001D508"_ustr }, + { u"Egrave"_ustr, u"\u00C8"_ustr }, + { u"Element"_ustr, u"\u2208"_ustr }, + { u"Emacr"_ustr, u"\u0112"_ustr }, + { u"EmptySmallSquare"_ustr, u"\u25FB"_ustr }, + { u"EmptyVerySmallSquare"_ustr, u"\u25AB"_ustr }, + { u"Eogon"_ustr, u"\u0118"_ustr }, + { u"Eopf"_ustr, u"\U0001D53C"_ustr }, + { u"Epsilon"_ustr, u"\u0395"_ustr }, + { u"Equal"_ustr, u"\u2A75"_ustr }, + { u"EqualTilde"_ustr, u"\u2242"_ustr }, + { u"Equilibrium"_ustr, u"\u21CC"_ustr }, + { u"Escr"_ustr, u"\u2130"_ustr }, + { u"Esim"_ustr, u"\u2A73"_ustr }, + { u"Eta"_ustr, u"\u0397"_ustr }, + { u"Euml"_ustr, u"\u00CB"_ustr }, + { u"Exists"_ustr, u"\u2203"_ustr }, + { u"ExponentialE"_ustr, u"\u2147"_ustr }, + { u"Fcy"_ustr, u"\u0424"_ustr }, + { u"Ffr"_ustr, u"\U0001D509"_ustr }, + { u"FilledSmallSquare"_ustr, u"\u25FC"_ustr }, + { u"FilledVerySmallSquare"_ustr, u"\u25AA"_ustr }, + { u"Fopf"_ustr, u"\U0001D53D"_ustr }, + { u"ForAll"_ustr, u"\u2200"_ustr }, + { u"Fouriertrf"_ustr, u"\u2131"_ustr }, + { u"Fscr"_ustr, u"\u2131"_ustr }, + { u"GJcy"_ustr, u"\u0403"_ustr }, + { u"GT"_ustr, u"\u003E"_ustr }, + { u"Gamma"_ustr, u"\u0393"_ustr }, + { u"Gammad"_ustr, u"\u03DC"_ustr }, + { u"Gbreve"_ustr, u"\u011E"_ustr }, + { u"Gcedil"_ustr, u"\u0122"_ustr }, + { u"Gcirc"_ustr, u"\u011C"_ustr }, + { u"Gcy"_ustr, u"\u0413"_ustr }, + { u"Gdot"_ustr, u"\u0120"_ustr }, + { u"Gfr"_ustr, u"\U0001D50A"_ustr }, + { u"Gg"_ustr, u"\u22D9"_ustr }, + { u"Gopf"_ustr, u"\U0001D53E"_ustr }, + { u"GreaterEqual"_ustr, u"\u2265"_ustr }, + { u"GreaterEqualLess"_ustr, u"\u22DB"_ustr }, + { u"GreaterFullEqual"_ustr, u"\u2267"_ustr }, + { u"GreaterGreater"_ustr, u"\u2AA2"_ustr }, + { u"GreaterLess"_ustr, u"\u2277"_ustr }, + { u"GreaterSlantEqual"_ustr, u"\u2A7E"_ustr }, + { u"GreaterTilde"_ustr, u"\u2273"_ustr }, + { u"Gscr"_ustr, u"\U0001D4A2"_ustr }, + { u"Gt"_ustr, u"\u226B"_ustr }, + { u"HARDcy"_ustr, u"\u042A"_ustr }, + { u"Hacek"_ustr, u"\u02C7"_ustr }, + { u"Hat"_ustr, u"\u005E"_ustr }, + { u"Hcirc"_ustr, u"\u0124"_ustr }, + { u"Hfr"_ustr, u"\u210C"_ustr }, + { u"HilbertSpace"_ustr, u"\u210B"_ustr }, + { u"Hopf"_ustr, u"\u210D"_ustr }, + { u"HorizontalLine"_ustr, u"\u2500"_ustr }, + { u"Hscr"_ustr, u"\u210B"_ustr }, + { u"Hstrok"_ustr, u"\u0126"_ustr }, + { u"HumpDownHump"_ustr, u"\u224E"_ustr }, + { u"HumpEqual"_ustr, u"\u224F"_ustr }, + { u"IEcy"_ustr, u"\u0415"_ustr }, + { u"IJlig"_ustr, u"\u0132"_ustr }, + { u"IOcy"_ustr, u"\u0401"_ustr }, + { u"Iacute"_ustr, u"\u00CD"_ustr }, + { u"Icirc"_ustr, u"\u00CE"_ustr }, + { u"Icy"_ustr, u"\u0418"_ustr }, + { u"Idot"_ustr, u"\u0130"_ustr }, + { u"Ifr"_ustr, u"\u2111"_ustr }, + { u"Igrave"_ustr, u"\u00CC"_ustr }, + { u"Im"_ustr, u"\u2111"_ustr }, + { u"Imacr"_ustr, u"\u012A"_ustr }, + { u"ImaginaryI"_ustr, u"\u2148"_ustr }, + { u"Implies"_ustr, u"\u21D2"_ustr }, + { u"Int"_ustr, u"\u222C"_ustr }, + { u"Integral"_ustr, u"\u222B"_ustr }, + { u"Intersection"_ustr, u"\u22C2"_ustr }, + { u"InvisibleComma"_ustr, u"\u2063"_ustr }, + { u"InvisibleTimes"_ustr, u"\u2062"_ustr }, + { u"Iogon"_ustr, u"\u012E"_ustr }, + { u"Iopf"_ustr, u"\U0001D540"_ustr }, + { u"Iota"_ustr, u"\u0399"_ustr }, + { u"Iscr"_ustr, u"\u2110"_ustr }, + { u"Itilde"_ustr, u"\u0128"_ustr }, + { u"Iukcy"_ustr, u"\u0406"_ustr }, + { u"Iuml"_ustr, u"\u00CF"_ustr }, + { u"Jcirc"_ustr, u"\u0134"_ustr }, + { u"Jcy"_ustr, u"\u0419"_ustr }, + { u"Jfr"_ustr, u"\U0001D50D"_ustr }, + { u"Jopf"_ustr, u"\U0001D541"_ustr }, + { u"Jscr"_ustr, u"\U0001D4A5"_ustr }, + { u"Jsercy"_ustr, u"\u0408"_ustr }, + { u"Jukcy"_ustr, u"\u0404"_ustr }, + { u"KHcy"_ustr, u"\u0425"_ustr }, + { u"KJcy"_ustr, u"\u040C"_ustr }, + { u"Kappa"_ustr, u"\u039A"_ustr }, + { u"Kcedil"_ustr, u"\u0136"_ustr }, + { u"Kcy"_ustr, u"\u041A"_ustr }, + { u"Kfr"_ustr, u"\U0001D50E"_ustr }, + { u"Kopf"_ustr, u"\U0001D542"_ustr }, + { u"Kscr"_ustr, u"\U0001D4A6"_ustr }, + { u"LJcy"_ustr, u"\u0409"_ustr }, + { u"LT"_ustr, u"\u003C"_ustr }, + { u"Lacute"_ustr, u"\u0139"_ustr }, + { u"Lambda"_ustr, u"\u039B"_ustr }, + { u"Lang"_ustr, u"\u27EA"_ustr }, + { u"Laplacetrf"_ustr, u"\u2112"_ustr }, + { u"Larr"_ustr, u"\u219E"_ustr }, + { u"Lcaron"_ustr, u"\u013D"_ustr }, + { u"Lcedil"_ustr, u"\u013B"_ustr }, + { u"Lcy"_ustr, u"\u041B"_ustr }, + { u"LeftAngleBracket"_ustr, u"\u27E8"_ustr }, + { u"LeftArrow"_ustr, u"\u2190"_ustr }, + { u"LeftArrowBar"_ustr, u"\u21E4"_ustr }, + { u"LeftArrowRightArrow"_ustr, u"\u21C6"_ustr }, + { u"LeftCeiling"_ustr, u"\u2308"_ustr }, + { u"LeftDoubleBracket"_ustr, u"\u27E6"_ustr }, + { u"LeftDownTeeVector"_ustr, u"\u2961"_ustr }, + { u"LeftDownVector"_ustr, u"\u21C3"_ustr }, + { u"LeftDownVectorBar"_ustr, u"\u2959"_ustr }, + { u"LeftFloor"_ustr, u"\u230A"_ustr }, + { u"LeftRightArrow"_ustr, u"\u2194"_ustr }, + { u"LeftRightVector"_ustr, u"\u294E"_ustr }, + { u"LeftTee"_ustr, u"\u22A3"_ustr }, + { u"LeftTeeArrow"_ustr, u"\u21A4"_ustr }, + { u"LeftTeeVector"_ustr, u"\u295A"_ustr }, + { u"LeftTriangle"_ustr, u"\u22B2"_ustr }, + { u"LeftTriangleBar"_ustr, u"\u29CF"_ustr }, + { u"LeftTriangleEqual"_ustr, u"\u22B4"_ustr }, + { u"LeftUpDownVector"_ustr, u"\u2951"_ustr }, + { u"LeftUpTeeVector"_ustr, u"\u2960"_ustr }, + { u"LeftUpVector"_ustr, u"\u21BF"_ustr }, + { u"LeftUpVectorBar"_ustr, u"\u2958"_ustr }, + { u"LeftVector"_ustr, u"\u21BC"_ustr }, + { u"LeftVectorBar"_ustr, u"\u2952"_ustr }, + { u"Leftarrow"_ustr, u"\u21D0"_ustr }, + { u"Leftrightarrow"_ustr, u"\u21D4"_ustr }, + { u"LessEqualGreater"_ustr, u"\u22DA"_ustr }, + { u"LessFullEqual"_ustr, u"\u2266"_ustr }, + { u"LessGreater"_ustr, u"\u2276"_ustr }, + { u"LessLess"_ustr, u"\u2AA1"_ustr }, + { u"LessSlantEqual"_ustr, u"\u2A7D"_ustr }, + { u"LessTilde"_ustr, u"\u2272"_ustr }, + { u"Lfr"_ustr, u"\U0001D50F"_ustr }, + { u"Ll"_ustr, u"\u22D8"_ustr }, + { u"Lleftarrow"_ustr, u"\u21DA"_ustr }, + { u"Lmidot"_ustr, u"\u013F"_ustr }, + { u"LongLeftArrow"_ustr, u"\u27F5"_ustr }, + { u"LongLeftRightArrow"_ustr, u"\u27F7"_ustr }, + { u"LongRightArrow"_ustr, u"\u27F6"_ustr }, + { u"Longleftarrow"_ustr, u"\u27F8"_ustr }, + { u"Longleftrightarrow"_ustr, u"\u27FA"_ustr }, + { u"Longrightarrow"_ustr, u"\u27F9"_ustr }, + { u"Lopf"_ustr, u"\U0001D543"_ustr }, + { u"LowerLeftArrow"_ustr, u"\u2199"_ustr }, + { u"LowerRightArrow"_ustr, u"\u2198"_ustr }, + { u"Lscr"_ustr, u"\u2112"_ustr }, + { u"Lsh"_ustr, u"\u21B0"_ustr }, + { u"Lstrok"_ustr, u"\u0141"_ustr }, + { u"Lt"_ustr, u"\u226A"_ustr }, + { u"Map"_ustr, u"\u2905"_ustr }, + { u"Mcy"_ustr, u"\u041C"_ustr }, + { u"MediumSpace"_ustr, u"\u205F"_ustr }, + { u"Mellintrf"_ustr, u"\u2133"_ustr }, + { u"Mfr"_ustr, u"\U0001D510"_ustr }, + { u"MinusPlus"_ustr, u"\u2213"_ustr }, + { u"Mopf"_ustr, u"\U0001D544"_ustr }, + { u"Mscr"_ustr, u"\u2133"_ustr }, + { u"Mu"_ustr, u"\u039C"_ustr }, + { u"NJcy"_ustr, u"\u040A"_ustr }, + { u"Nacute"_ustr, u"\u0143"_ustr }, + { u"Ncaron"_ustr, u"\u0147"_ustr }, + { u"Ncedil"_ustr, u"\u0145"_ustr }, + { u"Ncy"_ustr, u"\u041D"_ustr }, + { u"NegativeMediumSpace"_ustr, u"\u200B"_ustr }, + { u"NegativeThickSpace"_ustr, u"\u200B"_ustr }, + { u"NegativeThinSpace"_ustr, u"\u200B"_ustr }, + { u"NegativeVeryThinSpace"_ustr, u"\u200B"_ustr }, + { u"NestedGreaterGreater"_ustr, u"\u226B"_ustr }, + { u"NestedLessLess"_ustr, u"\u226A"_ustr }, + { u"NewLine"_ustr, u"\u000A"_ustr }, + { u"Nfr"_ustr, u"\U0001D511"_ustr }, + { u"NoBreak"_ustr, u"\u2060"_ustr }, + { u"NonBreakingSpace"_ustr, u"\u00A0"_ustr }, + { u"Nopf"_ustr, u"\u2115"_ustr }, + { u"Not"_ustr, u"\u2AEC"_ustr }, + { u"NotCongruent"_ustr, u"\u2262"_ustr }, + { u"NotCupCap"_ustr, u"\u226D"_ustr }, + { u"NotDoubleVerticalBar"_ustr, u"\u2226"_ustr }, + { u"NotElement"_ustr, u"\u2209"_ustr }, + { u"NotEqual"_ustr, u"\u2260"_ustr }, + { u"NotEqualTilde"_ustr, u"\u2242\u0338"_ustr }, + { u"NotExists"_ustr, u"\u2204"_ustr }, + { u"NotGreater"_ustr, u"\u226F"_ustr }, + { u"NotGreaterEqual"_ustr, u"\u2271"_ustr }, + { u"NotGreaterFullEqual"_ustr, u"\u2267\u0338"_ustr }, + { u"NotGreaterGreater"_ustr, u"\u226B\u0338"_ustr }, + { u"NotGreaterLess"_ustr, u"\u2279"_ustr }, + { u"NotGreaterSlantEqual"_ustr, u"\u2A7E\u0338"_ustr }, + { u"NotGreaterTilde"_ustr, u"\u2275"_ustr }, + { u"NotHumpDownHump"_ustr, u"\u224E\u0338"_ustr }, + { u"NotHumpEqual"_ustr, u"\u224F\u0338"_ustr }, + { u"NotLeftTriangle"_ustr, u"\u22EA"_ustr }, + { u"NotLeftTriangleBar"_ustr, u"\u29CF\u0338"_ustr }, + { u"NotLeftTriangleEqual"_ustr, u"\u22EC"_ustr }, + { u"NotLess"_ustr, u"\u226E"_ustr }, + { u"NotLessEqual"_ustr, u"\u2270"_ustr }, + { u"NotLessGreater"_ustr, u"\u2278"_ustr }, + { u"NotLessLess"_ustr, u"\u226A\u0338"_ustr }, + { u"NotLessSlantEqual"_ustr, u"\u2A7D\u0338"_ustr }, + { u"NotLessTilde"_ustr, u"\u2274"_ustr }, + { u"NotNestedGreaterGreater"_ustr, u"\u2AA2\u0338"_ustr }, + { u"NotNestedLessLess"_ustr, u"\u2AA1\u0338"_ustr }, + { u"NotPrecedes"_ustr, u"\u2280"_ustr }, + { u"NotPrecedesEqual"_ustr, u"\u2AAF\u0338"_ustr }, + { u"NotPrecedesSlantEqual"_ustr, u"\u22E0"_ustr }, + { u"NotReverseElement"_ustr, u"\u220C"_ustr }, + { u"NotRightTriangle"_ustr, u"\u22EB"_ustr }, + { u"NotRightTriangleBar"_ustr, u"\u29D0\u0338"_ustr }, + { u"NotRightTriangleEqual"_ustr, u"\u22ED"_ustr }, + { u"NotSquareSubset"_ustr, u"\u228F\u0338"_ustr }, + { u"NotSquareSubsetEqual"_ustr, u"\u22E2"_ustr }, + { u"NotSquareSuperset"_ustr, u"\u2290\u0338"_ustr }, + { u"NotSquareSupersetEqual"_ustr, u"\u22E3"_ustr }, + { u"NotSubset"_ustr, u"\u2282\u20D2"_ustr }, + { u"NotSubsetEqual"_ustr, u"\u2288"_ustr }, + { u"NotSucceeds"_ustr, u"\u2281"_ustr }, + { u"NotSucceedsEqual"_ustr, u"\u2AB0\u0338"_ustr }, + { u"NotSucceedsSlantEqual"_ustr, u"\u22E1"_ustr }, + { u"NotSucceedsTilde"_ustr, u"\u227F\u0338"_ustr }, + { u"NotSuperset"_ustr, u"\u2283\u20D2"_ustr }, + { u"NotSupersetEqual"_ustr, u"\u2289"_ustr }, + { u"NotTilde"_ustr, u"\u2241"_ustr }, + { u"NotTildeEqual"_ustr, u"\u2244"_ustr }, + { u"NotTildeFullEqual"_ustr, u"\u2247"_ustr }, + { u"NotTildeTilde"_ustr, u"\u2249"_ustr }, + { u"NotVerticalBar"_ustr, u"\u2224"_ustr }, + { u"Nscr"_ustr, u"\U0001D4A9"_ustr }, + { u"Ntilde"_ustr, u"\u00D1"_ustr }, + { u"Nu"_ustr, u"\u039D"_ustr }, + { u"OElig"_ustr, u"\u0152"_ustr }, + { u"Oacute"_ustr, u"\u00D3"_ustr }, + { u"Ocirc"_ustr, u"\u00D4"_ustr }, + { u"Ocy"_ustr, u"\u041E"_ustr }, + { u"Odblac"_ustr, u"\u0150"_ustr }, + { u"Ofr"_ustr, u"\U0001D512"_ustr }, + { u"Ograve"_ustr, u"\u00D2"_ustr }, + { u"Omacr"_ustr, u"\u014C"_ustr }, + { u"Omega"_ustr, u"\u03A9"_ustr }, + { u"Omicron"_ustr, u"\u039F"_ustr }, + { u"Oopf"_ustr, u"\U0001D546"_ustr }, + { u"OpenCurlyDoubleQuote"_ustr, u"\u201C"_ustr }, + { u"OpenCurlyQuote"_ustr, u"\u2018"_ustr }, + { u"Or"_ustr, u"\u2A54"_ustr }, + { u"Oscr"_ustr, u"\U0001D4AA"_ustr }, + { u"Oslash"_ustr, u"\u00D8"_ustr }, + { u"Otilde"_ustr, u"\u00D5"_ustr }, + { u"Otimes"_ustr, u"\u2A37"_ustr }, + { u"Ouml"_ustr, u"\u00D6"_ustr }, + { u"OverBar"_ustr, u"\u203E"_ustr }, + { u"OverBrace"_ustr, u"\u23DE"_ustr }, + { u"OverBracket"_ustr, u"\u23B4"_ustr }, + { u"OverParenthesis"_ustr, u"\u23DC"_ustr }, + { u"PartialD"_ustr, u"\u2202"_ustr }, + { u"Pcy"_ustr, u"\u041F"_ustr }, + { u"Pfr"_ustr, u"\U0001D513"_ustr }, + { u"Phi"_ustr, u"\u03A6"_ustr }, + { u"Pi"_ustr, u"\u03A0"_ustr }, + { u"PlusMinus"_ustr, u"\u00B1"_ustr }, + { u"Poincareplane"_ustr, u"\u210C"_ustr }, + { u"Popf"_ustr, u"\u2119"_ustr }, + { u"Pr"_ustr, u"\u2ABB"_ustr }, + { u"Precedes"_ustr, u"\u227A"_ustr }, + { u"PrecedesEqual"_ustr, u"\u2AAF"_ustr }, + { u"PrecedesSlantEqual"_ustr, u"\u227C"_ustr }, + { u"PrecedesTilde"_ustr, u"\u227E"_ustr }, + { u"Prime"_ustr, u"\u2033"_ustr }, + { u"Product"_ustr, u"\u220F"_ustr }, + { u"Proportion"_ustr, u"\u2237"_ustr }, + { u"Proportional"_ustr, u"\u221D"_ustr }, + { u"Pscr"_ustr, u"\U0001D4AB"_ustr }, + { u"Psi"_ustr, u"\u03A8"_ustr }, + { u"QUOT"_ustr, u"\u0022"_ustr }, + { u"Qfr"_ustr, u"\U0001D514"_ustr }, + { u"Qopf"_ustr, u"\u211A"_ustr }, + { u"Qscr"_ustr, u"\U0001D4AC"_ustr }, + { u"RBarr"_ustr, u"\u2910"_ustr }, + { u"REG"_ustr, u"\u00AE"_ustr }, + { u"Racute"_ustr, u"\u0154"_ustr }, + { u"Rang"_ustr, u"\u27EB"_ustr }, + { u"Rarr"_ustr, u"\u21A0"_ustr }, + { u"Rarrtl"_ustr, u"\u2916"_ustr }, + { u"Rcaron"_ustr, u"\u0158"_ustr }, + { u"Rcedil"_ustr, u"\u0156"_ustr }, + { u"Rcy"_ustr, u"\u0420"_ustr }, + { u"Re"_ustr, u"\u211C"_ustr }, + { u"ReverseElement"_ustr, u"\u220B"_ustr }, + { u"ReverseEquilibrium"_ustr, u"\u21CB"_ustr }, + { u"ReverseUpEquilibrium"_ustr, u"\u296F"_ustr }, + { u"Rfr"_ustr, u"\u211C"_ustr }, + { u"Rho"_ustr, u"\u03A1"_ustr }, + { u"RightAngleBracket"_ustr, u"\u27E9"_ustr }, + { u"RightArrow"_ustr, u"\u2192"_ustr }, + { u"RightArrowBar"_ustr, u"\u21E5"_ustr }, + { u"RightArrowLeftArrow"_ustr, u"\u21C4"_ustr }, + { u"RightCeiling"_ustr, u"\u2309"_ustr }, + { u"RightDoubleBracket"_ustr, u"\u27E7"_ustr }, + { u"RightDownTeeVector"_ustr, u"\u295D"_ustr }, + { u"RightDownVector"_ustr, u"\u21C2"_ustr }, + { u"RightDownVectorBar"_ustr, u"\u2955"_ustr }, + { u"RightFloor"_ustr, u"\u230B"_ustr }, + { u"RightTee"_ustr, u"\u22A2"_ustr }, + { u"RightTeeArrow"_ustr, u"\u21A6"_ustr }, + { u"RightTeeVector"_ustr, u"\u295B"_ustr }, + { u"RightTriangle"_ustr, u"\u22B3"_ustr }, + { u"RightTriangleBar"_ustr, u"\u29D0"_ustr }, + { u"RightTriangleEqual"_ustr, u"\u22B5"_ustr }, + { u"RightUpDownVector"_ustr, u"\u294F"_ustr }, + { u"RightUpTeeVector"_ustr, u"\u295C"_ustr }, + { u"RightUpVector"_ustr, u"\u21BE"_ustr }, + { u"RightUpVectorBar"_ustr, u"\u2954"_ustr }, + { u"RightVector"_ustr, u"\u21C0"_ustr }, + { u"RightVectorBar"_ustr, u"\u2953"_ustr }, + { u"Rightarrow"_ustr, u"\u21D2"_ustr }, + { u"Ropf"_ustr, u"\u211D"_ustr }, + { u"RoundImplies"_ustr, u"\u2970"_ustr }, + { u"Rrightarrow"_ustr, u"\u21DB"_ustr }, + { u"Rscr"_ustr, u"\u211B"_ustr }, + { u"Rsh"_ustr, u"\u21B1"_ustr }, + { u"RuleDelayed"_ustr, u"\u29F4"_ustr }, + { u"SHCHcy"_ustr, u"\u0429"_ustr }, + { u"SHcy"_ustr, u"\u0428"_ustr }, + { u"SOFTcy"_ustr, u"\u042C"_ustr }, + { u"Sacute"_ustr, u"\u015A"_ustr }, + { u"Sc"_ustr, u"\u2ABC"_ustr }, + { u"Scaron"_ustr, u"\u0160"_ustr }, + { u"Scedil"_ustr, u"\u015E"_ustr }, + { u"Scirc"_ustr, u"\u015C"_ustr }, + { u"Scy"_ustr, u"\u0421"_ustr }, + { u"Sfr"_ustr, u"\U0001D516"_ustr }, + { u"ShortDownArrow"_ustr, u"\u2193"_ustr }, + { u"ShortLeftArrow"_ustr, u"\u2190"_ustr }, + { u"ShortRightArrow"_ustr, u"\u2192"_ustr }, + { u"ShortUpArrow"_ustr, u"\u2191"_ustr }, + { u"Sigma"_ustr, u"\u03A3"_ustr }, + { u"SmallCircle"_ustr, u"\u2218"_ustr }, + { u"Sopf"_ustr, u"\U0001D54A"_ustr }, + { u"Sqrt"_ustr, u"\u221A"_ustr }, + { u"Square"_ustr, u"\u25A1"_ustr }, + { u"SquareIntersection"_ustr, u"\u2293"_ustr }, + { u"SquareSubset"_ustr, u"\u228F"_ustr }, + { u"SquareSubsetEqual"_ustr, u"\u2291"_ustr }, + { u"SquareSuperset"_ustr, u"\u2290"_ustr }, + { u"SquareSupersetEqual"_ustr, u"\u2292"_ustr }, + { u"SquareUnion"_ustr, u"\u2294"_ustr }, + { u"Sscr"_ustr, u"\U0001D4AE"_ustr }, + { u"Star"_ustr, u"\u22C6"_ustr }, + { u"Sub"_ustr, u"\u22D0"_ustr }, + { u"Subset"_ustr, u"\u22D0"_ustr }, + { u"SubsetEqual"_ustr, u"\u2286"_ustr }, + { u"Succeeds"_ustr, u"\u227B"_ustr }, + { u"SucceedsEqual"_ustr, u"\u2AB0"_ustr }, + { u"SucceedsSlantEqual"_ustr, u"\u227D"_ustr }, + { u"SucceedsTilde"_ustr, u"\u227F"_ustr }, + { u"SuchThat"_ustr, u"\u220B"_ustr }, + { u"Sum"_ustr, u"\u2211"_ustr }, + { u"Sup"_ustr, u"\u22D1"_ustr }, + { u"Superset"_ustr, u"\u2283"_ustr }, + { u"SupersetEqual"_ustr, u"\u2287"_ustr }, + { u"Supset"_ustr, u"\u22D1"_ustr }, + { u"THORN"_ustr, u"\u00DE"_ustr }, + { u"TRADE"_ustr, u"\u2122"_ustr }, + { u"TSHcy"_ustr, u"\u040B"_ustr }, + { u"TScy"_ustr, u"\u0426"_ustr }, + { u"Tab"_ustr, u"\u0009"_ustr }, + { u"Tau"_ustr, u"\u03A4"_ustr }, + { u"Tcaron"_ustr, u"\u0164"_ustr }, + { u"Tcedil"_ustr, u"\u0162"_ustr }, + { u"Tcy"_ustr, u"\u0422"_ustr }, + { u"Tfr"_ustr, u"\U0001D517"_ustr }, + { u"Therefore"_ustr, u"\u2234"_ustr }, + { u"Theta"_ustr, u"\u0398"_ustr }, + { u"ThickSpace"_ustr, u"\u205F\u200A"_ustr }, + { u"ThinSpace"_ustr, u"\u2009"_ustr }, + { u"Tilde"_ustr, u"\u223C"_ustr }, + { u"TildeEqual"_ustr, u"\u2243"_ustr }, + { u"TildeFullEqual"_ustr, u"\u2245"_ustr }, + { u"TildeTilde"_ustr, u"\u2248"_ustr }, + { u"Topf"_ustr, u"\U0001D54B"_ustr }, + { u"TripleDot"_ustr, u"\u20DB"_ustr }, + { u"Tscr"_ustr, u"\U0001D4AF"_ustr }, + { u"Tstrok"_ustr, u"\u0166"_ustr }, + { u"Uacute"_ustr, u"\u00DA"_ustr }, + { u"Uarr"_ustr, u"\u219F"_ustr }, + { u"Uarrocir"_ustr, u"\u2949"_ustr }, + { u"Ubrcy"_ustr, u"\u040E"_ustr }, + { u"Ubreve"_ustr, u"\u016C"_ustr }, + { u"Ucirc"_ustr, u"\u00DB"_ustr }, + { u"Ucy"_ustr, u"\u0423"_ustr }, + { u"Udblac"_ustr, u"\u0170"_ustr }, + { u"Ufr"_ustr, u"\U0001D518"_ustr }, + { u"Ugrave"_ustr, u"\u00D9"_ustr }, + { u"Umacr"_ustr, u"\u016A"_ustr }, + { u"UnderBar"_ustr, u"\u005F"_ustr }, + { u"UnderBrace"_ustr, u"\u23DF"_ustr }, + { u"UnderBracket"_ustr, u"\u23B5"_ustr }, + { u"UnderParenthesis"_ustr, u"\u23DD"_ustr }, + { u"Union"_ustr, u"\u22C3"_ustr }, + { u"UnionPlus"_ustr, u"\u228E"_ustr }, + { u"Uogon"_ustr, u"\u0172"_ustr }, + { u"Uopf"_ustr, u"\U0001D54C"_ustr }, + { u"UpArrow"_ustr, u"\u2191"_ustr }, + { u"UpArrowBar"_ustr, u"\u2912"_ustr }, + { u"UpArrowDownArrow"_ustr, u"\u21C5"_ustr }, + { u"UpDownArrow"_ustr, u"\u2195"_ustr }, + { u"UpEquilibrium"_ustr, u"\u296E"_ustr }, + { u"UpTee"_ustr, u"\u22A5"_ustr }, + { u"UpTeeArrow"_ustr, u"\u21A5"_ustr }, + { u"Uparrow"_ustr, u"\u21D1"_ustr }, + { u"Updownarrow"_ustr, u"\u21D5"_ustr }, + { u"UpperLeftArrow"_ustr, u"\u2196"_ustr }, + { u"UpperRightArrow"_ustr, u"\u2197"_ustr }, + { u"Upsi"_ustr, u"\u03D2"_ustr }, + { u"Upsilon"_ustr, u"\u03A5"_ustr }, + { u"Uring"_ustr, u"\u016E"_ustr }, + { u"Uscr"_ustr, u"\U0001D4B0"_ustr }, + { u"Utilde"_ustr, u"\u0168"_ustr }, + { u"Uuml"_ustr, u"\u00DC"_ustr }, + { u"VDash"_ustr, u"\u22AB"_ustr }, + { u"Vbar"_ustr, u"\u2AEB"_ustr }, + { u"Vcy"_ustr, u"\u0412"_ustr }, + { u"Vdash"_ustr, u"\u22A9"_ustr }, + { u"Vdashl"_ustr, u"\u2AE6"_ustr }, + { u"Vee"_ustr, u"\u22C1"_ustr }, + { u"Verbar"_ustr, u"\u2016"_ustr }, + { u"Vert"_ustr, u"\u2016"_ustr }, + { u"VerticalBar"_ustr, u"\u2223"_ustr }, + { u"VerticalLine"_ustr, u"\u007C"_ustr }, + { u"VerticalSeparator"_ustr, u"\u2758"_ustr }, + { u"VerticalTilde"_ustr, u"\u2240"_ustr }, + { u"VeryThinSpace"_ustr, u"\u200A"_ustr }, + { u"Vfr"_ustr, u"\U0001D519"_ustr }, + { u"Vopf"_ustr, u"\U0001D54D"_ustr }, + { u"Vscr"_ustr, u"\U0001D4B1"_ustr }, + { u"Vvdash"_ustr, u"\u22AA"_ustr }, + { u"Wcirc"_ustr, u"\u0174"_ustr }, + { u"Wedge"_ustr, u"\u22C0"_ustr }, + { u"Wfr"_ustr, u"\U0001D51A"_ustr }, + { u"Wopf"_ustr, u"\U0001D54E"_ustr }, + { u"Wscr"_ustr, u"\U0001D4B2"_ustr }, + { u"Xfr"_ustr, u"\U0001D51B"_ustr }, + { u"Xi"_ustr, u"\u039E"_ustr }, + { u"Xopf"_ustr, u"\U0001D54F"_ustr }, + { u"Xscr"_ustr, u"\U0001D4B3"_ustr }, + { u"YAcy"_ustr, u"\u042F"_ustr }, + { u"YIcy"_ustr, u"\u0407"_ustr }, + { u"YUcy"_ustr, u"\u042E"_ustr }, + { u"Yacute"_ustr, u"\u00DD"_ustr }, + { u"Ycirc"_ustr, u"\u0176"_ustr }, + { u"Ycy"_ustr, u"\u042B"_ustr }, + { u"Yfr"_ustr, u"\U0001D51C"_ustr }, + { u"Yopf"_ustr, u"\U0001D550"_ustr }, + { u"Yscr"_ustr, u"\U0001D4B4"_ustr }, + { u"Yuml"_ustr, u"\u0178"_ustr }, + { u"ZHcy"_ustr, u"\u0416"_ustr }, + { u"Zacute"_ustr, u"\u0179"_ustr }, + { u"Zcaron"_ustr, u"\u017D"_ustr }, + { u"Zcy"_ustr, u"\u0417"_ustr }, + { u"Zdot"_ustr, u"\u017B"_ustr }, + { u"ZeroWidthSpace"_ustr, u"\u200B"_ustr }, + { u"Zeta"_ustr, u"\u0396"_ustr }, + { u"Zfr"_ustr, u"\u2128"_ustr }, + { u"Zopf"_ustr, u"\u2124"_ustr }, + { u"Zscr"_ustr, u"\U0001D4B5"_ustr }, + { u"aacute"_ustr, u"\u00E1"_ustr }, + { u"abreve"_ustr, u"\u0103"_ustr }, + { u"ac"_ustr, u"\u223E"_ustr }, + { u"acE"_ustr, u"\u223E\u0333"_ustr }, + { u"acd"_ustr, u"\u223F"_ustr }, + { u"acirc"_ustr, u"\u00E2"_ustr }, + { u"acute"_ustr, u"\u00B4"_ustr }, + { u"acy"_ustr, u"\u0430"_ustr }, + { u"aelig"_ustr, u"\u00E6"_ustr }, + { u"af"_ustr, u"\u2061"_ustr }, + { u"afr"_ustr, u"\U0001D51E"_ustr }, + { u"agrave"_ustr, u"\u00E0"_ustr }, + { u"alefsym"_ustr, u"\u2135"_ustr }, + { u"aleph"_ustr, u"\u2135"_ustr }, + { u"alpha"_ustr, u"\u03B1"_ustr }, + { u"amacr"_ustr, u"\u0101"_ustr }, + { u"amalg"_ustr, u"\u2A3F"_ustr }, + { u"amp"_ustr, u"\u0026"_ustr }, + { u"and"_ustr, u"\u2227"_ustr }, + { u"andand"_ustr, u"\u2A55"_ustr }, + { u"andd"_ustr, u"\u2A5C"_ustr }, + { u"andslope"_ustr, u"\u2A58"_ustr }, + { u"andv"_ustr, u"\u2A5A"_ustr }, + { u"ang"_ustr, u"\u2220"_ustr }, + { u"ange"_ustr, u"\u29A4"_ustr }, + { u"angle"_ustr, u"\u2220"_ustr }, + { u"angmsd"_ustr, u"\u2221"_ustr }, + { u"angmsdaa"_ustr, u"\u29A8"_ustr }, + { u"angmsdab"_ustr, u"\u29A9"_ustr }, + { u"angmsdac"_ustr, u"\u29AA"_ustr }, + { u"angmsdad"_ustr, u"\u29AB"_ustr }, + { u"angmsdae"_ustr, u"\u29AC"_ustr }, + { u"angmsdaf"_ustr, u"\u29AD"_ustr }, + { u"angmsdag"_ustr, u"\u29AE"_ustr }, + { u"angmsdah"_ustr, u"\u29AF"_ustr }, + { u"angrt"_ustr, u"\u221F"_ustr }, + { u"angrtvb"_ustr, u"\u22BE"_ustr }, + { u"angrtvbd"_ustr, u"\u299D"_ustr }, + { u"angsph"_ustr, u"\u2222"_ustr }, + { u"angst"_ustr, u"\u00C5"_ustr }, + { u"angzarr"_ustr, u"\u237C"_ustr }, + { u"aogon"_ustr, u"\u0105"_ustr }, + { u"aopf"_ustr, u"\U0001D552"_ustr }, + { u"ap"_ustr, u"\u2248"_ustr }, + { u"apE"_ustr, u"\u2A70"_ustr }, + { u"apacir"_ustr, u"\u2A6F"_ustr }, + { u"ape"_ustr, u"\u224A"_ustr }, + { u"apid"_ustr, u"\u224B"_ustr }, + { u"apos"_ustr, u"\u0027"_ustr }, + { u"approx"_ustr, u"\u2248"_ustr }, + { u"approxeq"_ustr, u"\u224A"_ustr }, + { u"aring"_ustr, u"\u00E5"_ustr }, + { u"ascr"_ustr, u"\U0001D4B6"_ustr }, + { u"ast"_ustr, u"\u002A"_ustr }, + { u"asymp"_ustr, u"\u2248"_ustr }, + { u"asympeq"_ustr, u"\u224D"_ustr }, + { u"atilde"_ustr, u"\u00E3"_ustr }, + { u"auml"_ustr, u"\u00E4"_ustr }, + { u"awconint"_ustr, u"\u2233"_ustr }, + { u"awint"_ustr, u"\u2A11"_ustr }, + { u"bNot"_ustr, u"\u2AED"_ustr }, + { u"backcong"_ustr, u"\u224C"_ustr }, + { u"backepsilon"_ustr, u"\u03F6"_ustr }, + { u"backprime"_ustr, u"\u2035"_ustr }, + { u"backsim"_ustr, u"\u223D"_ustr }, + { u"backsimeq"_ustr, u"\u22CD"_ustr }, + { u"barvee"_ustr, u"\u22BD"_ustr }, + { u"barwed"_ustr, u"\u2305"_ustr }, + { u"barwedge"_ustr, u"\u2305"_ustr }, + { u"bbrk"_ustr, u"\u23B5"_ustr }, + { u"bbrktbrk"_ustr, u"\u23B6"_ustr }, + { u"bcong"_ustr, u"\u224C"_ustr }, + { u"bcy"_ustr, u"\u0431"_ustr }, + { u"bdquo"_ustr, u"\u201E"_ustr }, + { u"becaus"_ustr, u"\u2235"_ustr }, + { u"because"_ustr, u"\u2235"_ustr }, + { u"bemptyv"_ustr, u"\u29B0"_ustr }, + { u"bepsi"_ustr, u"\u03F6"_ustr }, + { u"bernou"_ustr, u"\u212C"_ustr }, + { u"beta"_ustr, u"\u03B2"_ustr }, + { u"beth"_ustr, u"\u2136"_ustr }, + { u"between"_ustr, u"\u226C"_ustr }, + { u"bfr"_ustr, u"\U0001D51F"_ustr }, + { u"bigcap"_ustr, u"\u22C2"_ustr }, + { u"bigcirc"_ustr, u"\u25EF"_ustr }, + { u"bigcup"_ustr, u"\u22C3"_ustr }, + { u"bigodot"_ustr, u"\u2A00"_ustr }, + { u"bigoplus"_ustr, u"\u2A01"_ustr }, + { u"bigotimes"_ustr, u"\u2A02"_ustr }, + { u"bigsqcup"_ustr, u"\u2A06"_ustr }, + { u"bigstar"_ustr, u"\u2605"_ustr }, + { u"bigtriangledown"_ustr, u"\u25BD"_ustr }, + { u"bigtriangleup"_ustr, u"\u25B3"_ustr }, + { u"biguplus"_ustr, u"\u2A04"_ustr }, + { u"bigvee"_ustr, u"\u22C1"_ustr }, + { u"bigwedge"_ustr, u"\u22C0"_ustr }, + { u"bkarow"_ustr, u"\u290D"_ustr }, + { u"blacklozenge"_ustr, u"\u29EB"_ustr }, + { u"blacksquare"_ustr, u"\u25AA"_ustr }, + { u"blacktriangle"_ustr, u"\u25B4"_ustr }, + { u"blacktriangledown"_ustr, u"\u25BE"_ustr }, + { u"blacktriangleleft"_ustr, u"\u25C2"_ustr }, + { u"blacktriangleright"_ustr, u"\u25B8"_ustr }, + { u"blank"_ustr, u"\u2423"_ustr }, + { u"blk12"_ustr, u"\u2592"_ustr }, + { u"blk14"_ustr, u"\u2591"_ustr }, + { u"blk34"_ustr, u"\u2593"_ustr }, + { u"block"_ustr, u"\u2588"_ustr }, + { u"bne"_ustr, u"\u003D\u20E5"_ustr }, + { u"bnequiv"_ustr, u"\u2261\u20E5"_ustr }, + { u"bnot"_ustr, u"\u2310"_ustr }, + { u"bopf"_ustr, u"\U0001D553"_ustr }, + { u"bot"_ustr, u"\u22A5"_ustr }, + { u"bottom"_ustr, u"\u22A5"_ustr }, + { u"bowtie"_ustr, u"\u22C8"_ustr }, + { u"boxDL"_ustr, u"\u2557"_ustr }, + { u"boxDR"_ustr, u"\u2554"_ustr }, + { u"boxDl"_ustr, u"\u2556"_ustr }, + { u"boxDr"_ustr, u"\u2553"_ustr }, + { u"boxH"_ustr, u"\u2550"_ustr }, + { u"boxHD"_ustr, u"\u2566"_ustr }, + { u"boxHU"_ustr, u"\u2569"_ustr }, + { u"boxHd"_ustr, u"\u2564"_ustr }, + { u"boxHu"_ustr, u"\u2567"_ustr }, + { u"boxUL"_ustr, u"\u255D"_ustr }, + { u"boxUR"_ustr, u"\u255A"_ustr }, + { u"boxUl"_ustr, u"\u255C"_ustr }, + { u"boxUr"_ustr, u"\u2559"_ustr }, + { u"boxV"_ustr, u"\u2551"_ustr }, + { u"boxVH"_ustr, u"\u256C"_ustr }, + { u"boxVL"_ustr, u"\u2563"_ustr }, + { u"boxVR"_ustr, u"\u2560"_ustr }, + { u"boxVh"_ustr, u"\u256B"_ustr }, + { u"boxVl"_ustr, u"\u2562"_ustr }, + { u"boxVr"_ustr, u"\u255F"_ustr }, + { u"boxbox"_ustr, u"\u29C9"_ustr }, + { u"boxdL"_ustr, u"\u2555"_ustr }, + { u"boxdR"_ustr, u"\u2552"_ustr }, + { u"boxdl"_ustr, u"\u2510"_ustr }, + { u"boxdr"_ustr, u"\u250C"_ustr }, + { u"boxh"_ustr, u"\u2500"_ustr }, + { u"boxhD"_ustr, u"\u2565"_ustr }, + { u"boxhU"_ustr, u"\u2568"_ustr }, + { u"boxhd"_ustr, u"\u252C"_ustr }, + { u"boxhu"_ustr, u"\u2534"_ustr }, + { u"boxminus"_ustr, u"\u229F"_ustr }, + { u"boxplus"_ustr, u"\u229E"_ustr }, + { u"boxtimes"_ustr, u"\u22A0"_ustr }, + { u"boxuL"_ustr, u"\u255B"_ustr }, + { u"boxuR"_ustr, u"\u2558"_ustr }, + { u"boxul"_ustr, u"\u2518"_ustr }, + { u"boxur"_ustr, u"\u2514"_ustr }, + { u"boxv"_ustr, u"\u2502"_ustr }, + { u"boxvH"_ustr, u"\u256A"_ustr }, + { u"boxvL"_ustr, u"\u2561"_ustr }, + { u"boxvR"_ustr, u"\u255E"_ustr }, + { u"boxvh"_ustr, u"\u253C"_ustr }, + { u"boxvl"_ustr, u"\u2524"_ustr }, + { u"boxvr"_ustr, u"\u251C"_ustr }, + { u"bprime"_ustr, u"\u2035"_ustr }, + { u"breve"_ustr, u"\u02D8"_ustr }, + { u"brvbar"_ustr, u"\u00A6"_ustr }, + { u"bscr"_ustr, u"\U0001D4B7"_ustr }, + { u"bsemi"_ustr, u"\u204F"_ustr }, + { u"bsim"_ustr, u"\u223D"_ustr }, + { u"bsime"_ustr, u"\u22CD"_ustr }, + { u"bsol"_ustr, u"\u005C"_ustr }, + { u"bsolb"_ustr, u"\u29C5"_ustr }, + { u"bsolhsub"_ustr, u"\u27C8"_ustr }, + { u"bull"_ustr, u"\u2022"_ustr }, + { u"bullet"_ustr, u"\u2022"_ustr }, + { u"bump"_ustr, u"\u224E"_ustr }, + { u"bumpE"_ustr, u"\u2AAE"_ustr }, + { u"bumpe"_ustr, u"\u224F"_ustr }, + { u"bumpeq"_ustr, u"\u224F"_ustr }, + { u"cacute"_ustr, u"\u0107"_ustr }, + { u"cap"_ustr, u"\u2229"_ustr }, + { u"capand"_ustr, u"\u2A44"_ustr }, + { u"capbrcup"_ustr, u"\u2A49"_ustr }, + { u"capcap"_ustr, u"\u2A4B"_ustr }, + { u"capcup"_ustr, u"\u2A47"_ustr }, + { u"capdot"_ustr, u"\u2A40"_ustr }, + { u"caps"_ustr, u"\u2229\uFE00"_ustr }, + { u"caret"_ustr, u"\u2041"_ustr }, + { u"caron"_ustr, u"\u02C7"_ustr }, + { u"ccaps"_ustr, u"\u2A4D"_ustr }, + { u"ccaron"_ustr, u"\u010D"_ustr }, + { u"ccedil"_ustr, u"\u00E7"_ustr }, + { u"ccirc"_ustr, u"\u0109"_ustr }, + { u"ccups"_ustr, u"\u2A4C"_ustr }, + { u"ccupssm"_ustr, u"\u2A50"_ustr }, + { u"cdot"_ustr, u"\u010B"_ustr }, + { u"cedil"_ustr, u"\u00B8"_ustr }, + { u"cemptyv"_ustr, u"\u29B2"_ustr }, + { u"cent"_ustr, u"\u00A2"_ustr }, + { u"centerdot"_ustr, u"\u00B7"_ustr }, + { u"cfr"_ustr, u"\U0001D520"_ustr }, + { u"chcy"_ustr, u"\u0447"_ustr }, + { u"check"_ustr, u"\u2713"_ustr }, + { u"checkmark"_ustr, u"\u2713"_ustr }, + { u"chi"_ustr, u"\u03C7"_ustr }, + { u"cir"_ustr, u"\u25CB"_ustr }, + { u"cirE"_ustr, u"\u29C3"_ustr }, + { u"circ"_ustr, u"\u02C6"_ustr }, + { u"circeq"_ustr, u"\u2257"_ustr }, + { u"circlearrowleft"_ustr, u"\u21BA"_ustr }, + { u"circlearrowright"_ustr, u"\u21BB"_ustr }, + { u"circledR"_ustr, u"\u00AE"_ustr }, + { u"circledS"_ustr, u"\u24C8"_ustr }, + { u"circledast"_ustr, u"\u229B"_ustr }, + { u"circledcirc"_ustr, u"\u229A"_ustr }, + { u"circleddash"_ustr, u"\u229D"_ustr }, + { u"cire"_ustr, u"\u2257"_ustr }, + { u"cirfnint"_ustr, u"\u2A10"_ustr }, + { u"cirmid"_ustr, u"\u2AEF"_ustr }, + { u"cirscir"_ustr, u"\u29C2"_ustr }, + { u"clubs"_ustr, u"\u2663"_ustr }, + { u"clubsuit"_ustr, u"\u2663"_ustr }, + { u"colon"_ustr, u"\u003A"_ustr }, + { u"colone"_ustr, u"\u2254"_ustr }, + { u"coloneq"_ustr, u"\u2254"_ustr }, + { u"comma"_ustr, u"\u002C"_ustr }, + { u"commat"_ustr, u"\u0040"_ustr }, + { u"comp"_ustr, u"\u2201"_ustr }, + { u"compfn"_ustr, u"\u2218"_ustr }, + { u"complement"_ustr, u"\u2201"_ustr }, + { u"complexes"_ustr, u"\u2102"_ustr }, + { u"cong"_ustr, u"\u2245"_ustr }, + { u"congdot"_ustr, u"\u2A6D"_ustr }, + { u"conint"_ustr, u"\u222E"_ustr }, + { u"copf"_ustr, u"\U0001D554"_ustr }, + { u"coprod"_ustr, u"\u2210"_ustr }, + { u"copy"_ustr, u"\u00A9"_ustr }, + { u"copysr"_ustr, u"\u2117"_ustr }, + { u"crarr"_ustr, u"\u21B5"_ustr }, + { u"cross"_ustr, u"\u2717"_ustr }, + { u"cscr"_ustr, u"\U0001D4B8"_ustr }, + { u"csub"_ustr, u"\u2ACF"_ustr }, + { u"csube"_ustr, u"\u2AD1"_ustr }, + { u"csup"_ustr, u"\u2AD0"_ustr }, + { u"csupe"_ustr, u"\u2AD2"_ustr }, + { u"ctdot"_ustr, u"\u22EF"_ustr }, + { u"cudarrl"_ustr, u"\u2938"_ustr }, + { u"cudarrr"_ustr, u"\u2935"_ustr }, + { u"cuepr"_ustr, u"\u22DE"_ustr }, + { u"cuesc"_ustr, u"\u22DF"_ustr }, + { u"cularr"_ustr, u"\u21B6"_ustr }, + { u"cularrp"_ustr, u"\u293D"_ustr }, + { u"cup"_ustr, u"\u222A"_ustr }, + { u"cupbrcap"_ustr, u"\u2A48"_ustr }, + { u"cupcap"_ustr, u"\u2A46"_ustr }, + { u"cupcup"_ustr, u"\u2A4A"_ustr }, + { u"cupdot"_ustr, u"\u228D"_ustr }, + { u"cupor"_ustr, u"\u2A45"_ustr }, + { u"cups"_ustr, u"\u222A\uFE00"_ustr }, + { u"curarr"_ustr, u"\u21B7"_ustr }, + { u"curarrm"_ustr, u"\u293C"_ustr }, + { u"curlyeqprec"_ustr, u"\u22DE"_ustr }, + { u"curlyeqsucc"_ustr, u"\u22DF"_ustr }, + { u"curlyvee"_ustr, u"\u22CE"_ustr }, + { u"curlywedge"_ustr, u"\u22CF"_ustr }, + { u"curren"_ustr, u"\u00A4"_ustr }, + { u"curvearrowleft"_ustr, u"\u21B6"_ustr }, + { u"curvearrowright"_ustr, u"\u21B7"_ustr }, + { u"cuvee"_ustr, u"\u22CE"_ustr }, + { u"cuwed"_ustr, u"\u22CF"_ustr }, + { u"cwconint"_ustr, u"\u2232"_ustr }, + { u"cwint"_ustr, u"\u2231"_ustr }, + { u"cylcty"_ustr, u"\u232D"_ustr }, + { u"dArr"_ustr, u"\u21D3"_ustr }, + { u"dHar"_ustr, u"\u2965"_ustr }, + { u"dagger"_ustr, u"\u2020"_ustr }, + { u"daleth"_ustr, u"\u2138"_ustr }, + { u"darr"_ustr, u"\u2193"_ustr }, + { u"dash"_ustr, u"\u2010"_ustr }, + { u"dashv"_ustr, u"\u22A3"_ustr }, + { u"dbkarow"_ustr, u"\u290F"_ustr }, + { u"dblac"_ustr, u"\u02DD"_ustr }, + { u"dcaron"_ustr, u"\u010F"_ustr }, + { u"dcy"_ustr, u"\u0434"_ustr }, + { u"dd"_ustr, u"\u2146"_ustr }, + { u"ddagger"_ustr, u"\u2021"_ustr }, + { u"ddarr"_ustr, u"\u21CA"_ustr }, + { u"ddotseq"_ustr, u"\u2A77"_ustr }, + { u"deg"_ustr, u"\u00B0"_ustr }, + { u"delta"_ustr, u"\u03B4"_ustr }, + { u"demptyv"_ustr, u"\u29B1"_ustr }, + { u"dfisht"_ustr, u"\u297F"_ustr }, + { u"dfr"_ustr, u"\U0001D521"_ustr }, + { u"dharl"_ustr, u"\u21C3"_ustr }, + { u"dharr"_ustr, u"\u21C2"_ustr }, + { u"diam"_ustr, u"\u22C4"_ustr }, + { u"diamond"_ustr, u"\u22C4"_ustr }, + { u"diamondsuit"_ustr, u"\u2666"_ustr }, + { u"diams"_ustr, u"\u2666"_ustr }, + { u"die"_ustr, u"\u00A8"_ustr }, + { u"digamma"_ustr, u"\u03DD"_ustr }, + { u"disin"_ustr, u"\u22F2"_ustr }, + { u"div"_ustr, u"\u00F7"_ustr }, + { u"divide"_ustr, u"\u00F7"_ustr }, + { u"divideontimes"_ustr, u"\u22C7"_ustr }, + { u"divonx"_ustr, u"\u22C7"_ustr }, + { u"djcy"_ustr, u"\u0452"_ustr }, + { u"dlcorn"_ustr, u"\u231E"_ustr }, + { u"dlcrop"_ustr, u"\u230D"_ustr }, + { u"dollar"_ustr, u"\u0024"_ustr }, + { u"dopf"_ustr, u"\U0001D555"_ustr }, + { u"dot"_ustr, u"\u02D9"_ustr }, + { u"doteq"_ustr, u"\u2250"_ustr }, + { u"doteqdot"_ustr, u"\u2251"_ustr }, + { u"dotminus"_ustr, u"\u2238"_ustr }, + { u"dotplus"_ustr, u"\u2214"_ustr }, + { u"dotsquare"_ustr, u"\u22A1"_ustr }, + { u"doublebarwedge"_ustr, u"\u2306"_ustr }, + { u"downarrow"_ustr, u"\u2193"_ustr }, + { u"downdownarrows"_ustr, u"\u21CA"_ustr }, + { u"downharpoonleft"_ustr, u"\u21C3"_ustr }, + { u"downharpoonright"_ustr, u"\u21C2"_ustr }, + { u"drbkarow"_ustr, u"\u2910"_ustr }, + { u"drcorn"_ustr, u"\u231F"_ustr }, + { u"drcrop"_ustr, u"\u230C"_ustr }, + { u"dscr"_ustr, u"\U0001D4B9"_ustr }, + { u"dscy"_ustr, u"\u0455"_ustr }, + { u"dsol"_ustr, u"\u29F6"_ustr }, + { u"dstrok"_ustr, u"\u0111"_ustr }, + { u"dtdot"_ustr, u"\u22F1"_ustr }, + { u"dtri"_ustr, u"\u25BF"_ustr }, + { u"dtrif"_ustr, u"\u25BE"_ustr }, + { u"duarr"_ustr, u"\u21F5"_ustr }, + { u"duhar"_ustr, u"\u296F"_ustr }, + { u"dwangle"_ustr, u"\u29A6"_ustr }, + { u"dzcy"_ustr, u"\u045F"_ustr }, + { u"dzigrarr"_ustr, u"\u27FF"_ustr }, + { u"eDDot"_ustr, u"\u2A77"_ustr }, + { u"eDot"_ustr, u"\u2251"_ustr }, + { u"eacute"_ustr, u"\u00E9"_ustr }, + { u"easter"_ustr, u"\u2A6E"_ustr }, + { u"ecaron"_ustr, u"\u011B"_ustr }, + { u"ecir"_ustr, u"\u2256"_ustr }, + { u"ecirc"_ustr, u"\u00EA"_ustr }, + { u"ecolon"_ustr, u"\u2255"_ustr }, + { u"ecy"_ustr, u"\u044D"_ustr }, + { u"edot"_ustr, u"\u0117"_ustr }, + { u"ee"_ustr, u"\u2147"_ustr }, + { u"efDot"_ustr, u"\u2252"_ustr }, + { u"efr"_ustr, u"\U0001D522"_ustr }, + { u"eg"_ustr, u"\u2A9A"_ustr }, + { u"egrave"_ustr, u"\u00E8"_ustr }, + { u"egs"_ustr, u"\u2A96"_ustr }, + { u"egsdot"_ustr, u"\u2A98"_ustr }, + { u"el"_ustr, u"\u2A99"_ustr }, + { u"elinters"_ustr, u"\u23E7"_ustr }, + { u"ell"_ustr, u"\u2113"_ustr }, + { u"els"_ustr, u"\u2A95"_ustr }, + { u"elsdot"_ustr, u"\u2A97"_ustr }, + { u"emacr"_ustr, u"\u0113"_ustr }, + { u"empty"_ustr, u"\u2205"_ustr }, + { u"emptyset"_ustr, u"\u2205"_ustr }, + { u"emptyv"_ustr, u"\u2205"_ustr }, + { u"emsp"_ustr, u"\u2003"_ustr }, + { u"emsp13"_ustr, u"\u2004"_ustr }, + { u"emsp14"_ustr, u"\u2005"_ustr }, + { u"eng"_ustr, u"\u014B"_ustr }, + { u"ensp"_ustr, u"\u2002"_ustr }, + { u"eogon"_ustr, u"\u0119"_ustr }, + { u"eopf"_ustr, u"\U0001D556"_ustr }, + { u"epar"_ustr, u"\u22D5"_ustr }, + { u"eparsl"_ustr, u"\u29E3"_ustr }, + { u"eplus"_ustr, u"\u2A71"_ustr }, + { u"epsi"_ustr, u"\u03B5"_ustr }, + { u"epsilon"_ustr, u"\u03B5"_ustr }, + { u"epsiv"_ustr, u"\u03F5"_ustr }, + { u"eqcirc"_ustr, u"\u2256"_ustr }, + { u"eqcolon"_ustr, u"\u2255"_ustr }, + { u"eqsim"_ustr, u"\u2242"_ustr }, + { u"eqslantgtr"_ustr, u"\u2A96"_ustr }, + { u"eqslantless"_ustr, u"\u2A95"_ustr }, + { u"equals"_ustr, u"\u003D"_ustr }, + { u"equest"_ustr, u"\u225F"_ustr }, + { u"equiv"_ustr, u"\u2261"_ustr }, + { u"equivDD"_ustr, u"\u2A78"_ustr }, + { u"eqvparsl"_ustr, u"\u29E5"_ustr }, + { u"erDot"_ustr, u"\u2253"_ustr }, + { u"erarr"_ustr, u"\u2971"_ustr }, + { u"escr"_ustr, u"\u212F"_ustr }, + { u"esdot"_ustr, u"\u2250"_ustr }, + { u"esim"_ustr, u"\u2242"_ustr }, + { u"eta"_ustr, u"\u03B7"_ustr }, + { u"eth"_ustr, u"\u00F0"_ustr }, + { u"euml"_ustr, u"\u00EB"_ustr }, + { u"euro"_ustr, u"\u20AC"_ustr }, + { u"excl"_ustr, u"\u0021"_ustr }, + { u"exist"_ustr, u"\u2203"_ustr }, + { u"expectation"_ustr, u"\u2130"_ustr }, + { u"exponentiale"_ustr, u"\u2147"_ustr }, + { u"fallingdotseq"_ustr, u"\u2252"_ustr }, + { u"fcy"_ustr, u"\u0444"_ustr }, + { u"female"_ustr, u"\u2640"_ustr }, + { u"ffilig"_ustr, u"\uFB03"_ustr }, + { u"fflig"_ustr, u"\uFB00"_ustr }, + { u"ffllig"_ustr, u"\uFB04"_ustr }, + { u"ffr"_ustr, u"\U0001D523"_ustr }, + { u"filig"_ustr, u"\uFB01"_ustr }, + { u"fjlig"_ustr, u"\u0066\u006A"_ustr }, + { u"flat"_ustr, u"\u266D"_ustr }, + { u"fllig"_ustr, u"\uFB02"_ustr }, + { u"fltns"_ustr, u"\u25B1"_ustr }, + { u"fnof"_ustr, u"\u0192"_ustr }, + { u"fopf"_ustr, u"\U0001D557"_ustr }, + { u"forall"_ustr, u"\u2200"_ustr }, + { u"fork"_ustr, u"\u22D4"_ustr }, + { u"forkv"_ustr, u"\u2AD9"_ustr }, + { u"fpartint"_ustr, u"\u2A0D"_ustr }, + { u"frac12"_ustr, u"\u00BD"_ustr }, + { u"frac13"_ustr, u"\u2153"_ustr }, + { u"frac14"_ustr, u"\u00BC"_ustr }, + { u"frac15"_ustr, u"\u2155"_ustr }, + { u"frac16"_ustr, u"\u2159"_ustr }, + { u"frac18"_ustr, u"\u215B"_ustr }, + { u"frac23"_ustr, u"\u2154"_ustr }, + { u"frac25"_ustr, u"\u2156"_ustr }, + { u"frac34"_ustr, u"\u00BE"_ustr }, + { u"frac35"_ustr, u"\u2157"_ustr }, + { u"frac38"_ustr, u"\u215C"_ustr }, + { u"frac45"_ustr, u"\u2158"_ustr }, + { u"frac56"_ustr, u"\u215A"_ustr }, + { u"frac58"_ustr, u"\u215D"_ustr }, + { u"frac78"_ustr, u"\u215E"_ustr }, + { u"frasl"_ustr, u"\u2044"_ustr }, + { u"frown"_ustr, u"\u2322"_ustr }, + { u"fscr"_ustr, u"\U0001D4BB"_ustr }, + { u"gE"_ustr, u"\u2267"_ustr }, + { u"gEl"_ustr, u"\u2A8C"_ustr }, + { u"gacute"_ustr, u"\u01F5"_ustr }, + { u"gamma"_ustr, u"\u03B3"_ustr }, + { u"gammad"_ustr, u"\u03DD"_ustr }, + { u"gap"_ustr, u"\u2A86"_ustr }, + { u"gbreve"_ustr, u"\u011F"_ustr }, + { u"gcirc"_ustr, u"\u011D"_ustr }, + { u"gcy"_ustr, u"\u0433"_ustr }, + { u"gdot"_ustr, u"\u0121"_ustr }, + { u"ge"_ustr, u"\u2265"_ustr }, + { u"gel"_ustr, u"\u22DB"_ustr }, + { u"geq"_ustr, u"\u2265"_ustr }, + { u"geqq"_ustr, u"\u2267"_ustr }, + { u"geqslant"_ustr, u"\u2A7E"_ustr }, + { u"ges"_ustr, u"\u2A7E"_ustr }, + { u"gescc"_ustr, u"\u2AA9"_ustr }, + { u"gesdot"_ustr, u"\u2A80"_ustr }, + { u"gesdoto"_ustr, u"\u2A82"_ustr }, + { u"gesdotol"_ustr, u"\u2A84"_ustr }, + { u"gesl"_ustr, u"\u22DB\uFE00"_ustr }, + { u"gesles"_ustr, u"\u2A94"_ustr }, + { u"gfr"_ustr, u"\U0001D524"_ustr }, + { u"gg"_ustr, u"\u226B"_ustr }, + { u"ggg"_ustr, u"\u22D9"_ustr }, + { u"gimel"_ustr, u"\u2137"_ustr }, + { u"gjcy"_ustr, u"\u0453"_ustr }, + { u"gl"_ustr, u"\u2277"_ustr }, + { u"glE"_ustr, u"\u2A92"_ustr }, + { u"gla"_ustr, u"\u2AA5"_ustr }, + { u"glj"_ustr, u"\u2AA4"_ustr }, + { u"gnE"_ustr, u"\u2269"_ustr }, + { u"gnap"_ustr, u"\u2A8A"_ustr }, + { u"gnapprox"_ustr, u"\u2A8A"_ustr }, + { u"gne"_ustr, u"\u2A88"_ustr }, + { u"gneq"_ustr, u"\u2A88"_ustr }, + { u"gneqq"_ustr, u"\u2269"_ustr }, + { u"gnsim"_ustr, u"\u22E7"_ustr }, + { u"gopf"_ustr, u"\U0001D558"_ustr }, + { u"grave"_ustr, u"\u0060"_ustr }, + { u"gscr"_ustr, u"\u210A"_ustr }, + { u"gsim"_ustr, u"\u2273"_ustr }, + { u"gsime"_ustr, u"\u2A8E"_ustr }, + { u"gsiml"_ustr, u"\u2A90"_ustr }, + { u"gt"_ustr, u"\u003E"_ustr }, + { u"gtcc"_ustr, u"\u2AA7"_ustr }, + { u"gtcir"_ustr, u"\u2A7A"_ustr }, + { u"gtdot"_ustr, u"\u22D7"_ustr }, + { u"gtlPar"_ustr, u"\u2995"_ustr }, + { u"gtquest"_ustr, u"\u2A7C"_ustr }, + { u"gtrapprox"_ustr, u"\u2A86"_ustr }, + { u"gtrarr"_ustr, u"\u2978"_ustr }, + { u"gtrdot"_ustr, u"\u22D7"_ustr }, + { u"gtreqless"_ustr, u"\u22DB"_ustr }, + { u"gtreqqless"_ustr, u"\u2A8C"_ustr }, + { u"gtrless"_ustr, u"\u2277"_ustr }, + { u"gtrsim"_ustr, u"\u2273"_ustr }, + { u"gvertneqq"_ustr, u"\u2269\uFE00"_ustr }, + { u"gvnE"_ustr, u"\u2269\uFE00"_ustr }, + { u"hArr"_ustr, u"\u21D4"_ustr }, + { u"hairsp"_ustr, u"\u200A"_ustr }, + { u"half"_ustr, u"\u00BD"_ustr }, + { u"hamilt"_ustr, u"\u210B"_ustr }, + { u"hardcy"_ustr, u"\u044A"_ustr }, + { u"harr"_ustr, u"\u2194"_ustr }, + { u"harrcir"_ustr, u"\u2948"_ustr }, + { u"harrw"_ustr, u"\u21AD"_ustr }, + { u"hbar"_ustr, u"\u210F"_ustr }, + { u"hcirc"_ustr, u"\u0125"_ustr }, + { u"hearts"_ustr, u"\u2665"_ustr }, + { u"heartsuit"_ustr, u"\u2665"_ustr }, + { u"hellip"_ustr, u"\u2026"_ustr }, + { u"hercon"_ustr, u"\u22B9"_ustr }, + { u"hfr"_ustr, u"\U0001D525"_ustr }, + { u"hksearow"_ustr, u"\u2925"_ustr }, + { u"hkswarow"_ustr, u"\u2926"_ustr }, + { u"hoarr"_ustr, u"\u21FF"_ustr }, + { u"homtht"_ustr, u"\u223B"_ustr }, + { u"hookleftarrow"_ustr, u"\u21A9"_ustr }, + { u"hookrightarrow"_ustr, u"\u21AA"_ustr }, + { u"hopf"_ustr, u"\U0001D559"_ustr }, + { u"horbar"_ustr, u"\u2015"_ustr }, + { u"hscr"_ustr, u"\U0001D4BD"_ustr }, + { u"hslash"_ustr, u"\u210F"_ustr }, + { u"hstrok"_ustr, u"\u0127"_ustr }, + { u"hybull"_ustr, u"\u2043"_ustr }, + { u"hyphen"_ustr, u"\u2010"_ustr }, + { u"iacute"_ustr, u"\u00ED"_ustr }, + { u"ic"_ustr, u"\u2063"_ustr }, + { u"icirc"_ustr, u"\u00EE"_ustr }, + { u"icy"_ustr, u"\u0438"_ustr }, + { u"iecy"_ustr, u"\u0435"_ustr }, + { u"iexcl"_ustr, u"\u00A1"_ustr }, + { u"iff"_ustr, u"\u21D4"_ustr }, + { u"ifr"_ustr, u"\U0001D526"_ustr }, + { u"igrave"_ustr, u"\u00EC"_ustr }, + { u"ii"_ustr, u"\u2148"_ustr }, + { u"iiiint"_ustr, u"\u2A0C"_ustr }, + { u"iiint"_ustr, u"\u222D"_ustr }, + { u"iinfin"_ustr, u"\u29DC"_ustr }, + { u"iiota"_ustr, u"\u2129"_ustr }, + { u"ijlig"_ustr, u"\u0133"_ustr }, + { u"imacr"_ustr, u"\u012B"_ustr }, + { u"image"_ustr, u"\u2111"_ustr }, + { u"imagline"_ustr, u"\u2110"_ustr }, + { u"imagpart"_ustr, u"\u2111"_ustr }, + { u"imath"_ustr, u"\u0131"_ustr }, + { u"imof"_ustr, u"\u22B7"_ustr }, + { u"imped"_ustr, u"\u01B5"_ustr }, + { u"in"_ustr, u"\u2208"_ustr }, + { u"incare"_ustr, u"\u2105"_ustr }, + { u"infin"_ustr, u"\u221E"_ustr }, + { u"infintie"_ustr, u"\u29DD"_ustr }, + { u"inodot"_ustr, u"\u0131"_ustr }, + { u"int"_ustr, u"\u222B"_ustr }, + { u"intcal"_ustr, u"\u22BA"_ustr }, + { u"integers"_ustr, u"\u2124"_ustr }, + { u"intercal"_ustr, u"\u22BA"_ustr }, + { u"intlarhk"_ustr, u"\u2A17"_ustr }, + { u"intprod"_ustr, u"\u2A3C"_ustr }, + { u"iocy"_ustr, u"\u0451"_ustr }, + { u"iogon"_ustr, u"\u012F"_ustr }, + { u"iopf"_ustr, u"\U0001D55A"_ustr }, + { u"iota"_ustr, u"\u03B9"_ustr }, + { u"iprod"_ustr, u"\u2A3C"_ustr }, + { u"iquest"_ustr, u"\u00BF"_ustr }, + { u"iscr"_ustr, u"\U0001D4BE"_ustr }, + { u"isin"_ustr, u"\u2208"_ustr }, + { u"isinE"_ustr, u"\u22F9"_ustr }, + { u"isindot"_ustr, u"\u22F5"_ustr }, + { u"isins"_ustr, u"\u22F4"_ustr }, + { u"isinsv"_ustr, u"\u22F3"_ustr }, + { u"isinv"_ustr, u"\u2208"_ustr }, + { u"it"_ustr, u"\u2062"_ustr }, + { u"itilde"_ustr, u"\u0129"_ustr }, + { u"iukcy"_ustr, u"\u0456"_ustr }, + { u"iuml"_ustr, u"\u00EF"_ustr }, + { u"jcirc"_ustr, u"\u0135"_ustr }, + { u"jcy"_ustr, u"\u0439"_ustr }, + { u"jfr"_ustr, u"\U0001D527"_ustr }, + { u"jmath"_ustr, u"\u0237"_ustr }, + { u"jopf"_ustr, u"\U0001D55B"_ustr }, + { u"jscr"_ustr, u"\U0001D4BF"_ustr }, + { u"jsercy"_ustr, u"\u0458"_ustr }, + { u"jukcy"_ustr, u"\u0454"_ustr }, + { u"kappa"_ustr, u"\u03BA"_ustr }, + { u"kappav"_ustr, u"\u03F0"_ustr }, + { u"kcedil"_ustr, u"\u0137"_ustr }, + { u"kcy"_ustr, u"\u043A"_ustr }, + { u"kfr"_ustr, u"\U0001D528"_ustr }, + { u"kgreen"_ustr, u"\u0138"_ustr }, + { u"khcy"_ustr, u"\u0445"_ustr }, + { u"kjcy"_ustr, u"\u045C"_ustr }, + { u"kopf"_ustr, u"\U0001D55C"_ustr }, + { u"kscr"_ustr, u"\U0001D4C0"_ustr }, + { u"lAarr"_ustr, u"\u21DA"_ustr }, + { u"lArr"_ustr, u"\u21D0"_ustr }, + { u"lAtail"_ustr, u"\u291B"_ustr }, + { u"lBarr"_ustr, u"\u290E"_ustr }, + { u"lE"_ustr, u"\u2266"_ustr }, + { u"lEg"_ustr, u"\u2A8B"_ustr }, + { u"lHar"_ustr, u"\u2962"_ustr }, + { u"lacute"_ustr, u"\u013A"_ustr }, + { u"laemptyv"_ustr, u"\u29B4"_ustr }, + { u"lagran"_ustr, u"\u2112"_ustr }, + { u"lambda"_ustr, u"\u03BB"_ustr }, + { u"lang"_ustr, u"\u27E8"_ustr }, + { u"langd"_ustr, u"\u2991"_ustr }, + { u"langle"_ustr, u"\u27E8"_ustr }, + { u"lap"_ustr, u"\u2A85"_ustr }, + { u"laquo"_ustr, u"\u00AB"_ustr }, + { u"larr"_ustr, u"\u2190"_ustr }, + { u"larrb"_ustr, u"\u21E4"_ustr }, + { u"larrbfs"_ustr, u"\u291F"_ustr }, + { u"larrfs"_ustr, u"\u291D"_ustr }, + { u"larrhk"_ustr, u"\u21A9"_ustr }, + { u"larrlp"_ustr, u"\u21AB"_ustr }, + { u"larrpl"_ustr, u"\u2939"_ustr }, + { u"larrsim"_ustr, u"\u2973"_ustr }, + { u"larrtl"_ustr, u"\u21A2"_ustr }, + { u"lat"_ustr, u"\u2AAB"_ustr }, + { u"latail"_ustr, u"\u2919"_ustr }, + { u"late"_ustr, u"\u2AAD"_ustr }, + { u"lates"_ustr, u"\u2AAD\uFE00"_ustr }, + { u"lbarr"_ustr, u"\u290C"_ustr }, + { u"lbbrk"_ustr, u"\u2772"_ustr }, + { u"lbrace"_ustr, u"\u007B"_ustr }, + { u"lbrack"_ustr, u"\u005B"_ustr }, + { u"lbrke"_ustr, u"\u298B"_ustr }, + { u"lbrksld"_ustr, u"\u298F"_ustr }, + { u"lbrkslu"_ustr, u"\u298D"_ustr }, + { u"lcaron"_ustr, u"\u013E"_ustr }, + { u"lcedil"_ustr, u"\u013C"_ustr }, + { u"lceil"_ustr, u"\u2308"_ustr }, + { u"lcub"_ustr, u"\u007B"_ustr }, + { u"lcy"_ustr, u"\u043B"_ustr }, + { u"ldca"_ustr, u"\u2936"_ustr }, + { u"ldquo"_ustr, u"\u201C"_ustr }, + { u"ldquor"_ustr, u"\u201E"_ustr }, + { u"ldrdhar"_ustr, u"\u2967"_ustr }, + { u"ldrushar"_ustr, u"\u294B"_ustr }, + { u"ldsh"_ustr, u"\u21B2"_ustr }, + { u"le"_ustr, u"\u2264"_ustr }, + { u"leftarrow"_ustr, u"\u2190"_ustr }, + { u"leftarrowtail"_ustr, u"\u21A2"_ustr }, + { u"leftharpoondown"_ustr, u"\u21BD"_ustr }, + { u"leftharpoonup"_ustr, u"\u21BC"_ustr }, + { u"leftleftarrows"_ustr, u"\u21C7"_ustr }, + { u"leftrightarrow"_ustr, u"\u2194"_ustr }, + { u"leftrightarrows"_ustr, u"\u21C6"_ustr }, + { u"leftrightharpoons"_ustr, u"\u21CB"_ustr }, + { u"leftrightsquigarrow"_ustr, u"\u21AD"_ustr }, + { u"leftthreetimes"_ustr, u"\u22CB"_ustr }, + { u"leg"_ustr, u"\u22DA"_ustr }, + { u"leq"_ustr, u"\u2264"_ustr }, + { u"leqq"_ustr, u"\u2266"_ustr }, + { u"leqslant"_ustr, u"\u2A7D"_ustr }, + { u"les"_ustr, u"\u2A7D"_ustr }, + { u"lescc"_ustr, u"\u2AA8"_ustr }, + { u"lesdot"_ustr, u"\u2A7F"_ustr }, + { u"lesdoto"_ustr, u"\u2A81"_ustr }, + { u"lesdotor"_ustr, u"\u2A83"_ustr }, + { u"lesg"_ustr, u"\u22DA\uFE00"_ustr }, + { u"lesges"_ustr, u"\u2A93"_ustr }, + { u"lessapprox"_ustr, u"\u2A85"_ustr }, + { u"lessdot"_ustr, u"\u22D6"_ustr }, + { u"lesseqgtr"_ustr, u"\u22DA"_ustr }, + { u"lesseqqgtr"_ustr, u"\u2A8B"_ustr }, + { u"lessgtr"_ustr, u"\u2276"_ustr }, + { u"lesssim"_ustr, u"\u2272"_ustr }, + { u"lfisht"_ustr, u"\u297C"_ustr }, + { u"lfloor"_ustr, u"\u230A"_ustr }, + { u"lfr"_ustr, u"\U0001D529"_ustr }, + { u"lg"_ustr, u"\u2276"_ustr }, + { u"lgE"_ustr, u"\u2A91"_ustr }, + { u"lhard"_ustr, u"\u21BD"_ustr }, + { u"lharu"_ustr, u"\u21BC"_ustr }, + { u"lharul"_ustr, u"\u296A"_ustr }, + { u"lhblk"_ustr, u"\u2584"_ustr }, + { u"ljcy"_ustr, u"\u0459"_ustr }, + { u"ll"_ustr, u"\u226A"_ustr }, + { u"llarr"_ustr, u"\u21C7"_ustr }, + { u"llcorner"_ustr, u"\u231E"_ustr }, + { u"llhard"_ustr, u"\u296B"_ustr }, + { u"lltri"_ustr, u"\u25FA"_ustr }, + { u"lmidot"_ustr, u"\u0140"_ustr }, + { u"lmoust"_ustr, u"\u23B0"_ustr }, + { u"lmoustache"_ustr, u"\u23B0"_ustr }, + { u"lnE"_ustr, u"\u2268"_ustr }, + { u"lnap"_ustr, u"\u2A89"_ustr }, + { u"lnapprox"_ustr, u"\u2A89"_ustr }, + { u"lne"_ustr, u"\u2A87"_ustr }, + { u"lneq"_ustr, u"\u2A87"_ustr }, + { u"lneqq"_ustr, u"\u2268"_ustr }, + { u"lnsim"_ustr, u"\u22E6"_ustr }, + { u"loang"_ustr, u"\u27EC"_ustr }, + { u"loarr"_ustr, u"\u21FD"_ustr }, + { u"lobrk"_ustr, u"\u27E6"_ustr }, + { u"longleftarrow"_ustr, u"\u27F5"_ustr }, + { u"longleftrightarrow"_ustr, u"\u27F7"_ustr }, + { u"longmapsto"_ustr, u"\u27FC"_ustr }, + { u"longrightarrow"_ustr, u"\u27F6"_ustr }, + { u"looparrowleft"_ustr, u"\u21AB"_ustr }, + { u"looparrowright"_ustr, u"\u21AC"_ustr }, + { u"lopar"_ustr, u"\u2985"_ustr }, + { u"lopf"_ustr, u"\U0001D55D"_ustr }, + { u"loplus"_ustr, u"\u2A2D"_ustr }, + { u"lotimes"_ustr, u"\u2A34"_ustr }, + { u"lowast"_ustr, u"\u2217"_ustr }, + { u"lowbar"_ustr, u"\u005F"_ustr }, + { u"loz"_ustr, u"\u25CA"_ustr }, + { u"lozenge"_ustr, u"\u25CA"_ustr }, + { u"lozf"_ustr, u"\u29EB"_ustr }, + { u"lpar"_ustr, u"\u0028"_ustr }, + { u"lparlt"_ustr, u"\u2993"_ustr }, + { u"lrarr"_ustr, u"\u21C6"_ustr }, + { u"lrcorner"_ustr, u"\u231F"_ustr }, + { u"lrhar"_ustr, u"\u21CB"_ustr }, + { u"lrhard"_ustr, u"\u296D"_ustr }, + { u"lrm"_ustr, u"\u200E"_ustr }, + { u"lrtri"_ustr, u"\u22BF"_ustr }, + { u"lsaquo"_ustr, u"\u2039"_ustr }, + { u"lscr"_ustr, u"\U0001D4C1"_ustr }, + { u"lsh"_ustr, u"\u21B0"_ustr }, + { u"lsim"_ustr, u"\u2272"_ustr }, + { u"lsime"_ustr, u"\u2A8D"_ustr }, + { u"lsimg"_ustr, u"\u2A8F"_ustr }, + { u"lsqb"_ustr, u"\u005B"_ustr }, + { u"lsquo"_ustr, u"\u2018"_ustr }, + { u"lsquor"_ustr, u"\u201A"_ustr }, + { u"lstrok"_ustr, u"\u0142"_ustr }, + { u"lt"_ustr, u"\u003C"_ustr }, + { u"ltcc"_ustr, u"\u2AA6"_ustr }, + { u"ltcir"_ustr, u"\u2A79"_ustr }, + { u"ltdot"_ustr, u"\u22D6"_ustr }, + { u"lthree"_ustr, u"\u22CB"_ustr }, + { u"ltimes"_ustr, u"\u22C9"_ustr }, + { u"ltlarr"_ustr, u"\u2976"_ustr }, + { u"ltquest"_ustr, u"\u2A7B"_ustr }, + { u"ltrPar"_ustr, u"\u2996"_ustr }, + { u"ltri"_ustr, u"\u25C3"_ustr }, + { u"ltrie"_ustr, u"\u22B4"_ustr }, + { u"ltrif"_ustr, u"\u25C2"_ustr }, + { u"lurdshar"_ustr, u"\u294A"_ustr }, + { u"luruhar"_ustr, u"\u2966"_ustr }, + { u"lvertneqq"_ustr, u"\u2268\uFE00"_ustr }, + { u"lvnE"_ustr, u"\u2268\uFE00"_ustr }, + { u"mDDot"_ustr, u"\u223A"_ustr }, + { u"macr"_ustr, u"\u00AF"_ustr }, + { u"male"_ustr, u"\u2642"_ustr }, + { u"malt"_ustr, u"\u2720"_ustr }, + { u"maltese"_ustr, u"\u2720"_ustr }, + { u"map"_ustr, u"\u21A6"_ustr }, + { u"mapsto"_ustr, u"\u21A6"_ustr }, + { u"mapstodown"_ustr, u"\u21A7"_ustr }, + { u"mapstoleft"_ustr, u"\u21A4"_ustr }, + { u"mapstoup"_ustr, u"\u21A5"_ustr }, + { u"marker"_ustr, u"\u25AE"_ustr }, + { u"mcomma"_ustr, u"\u2A29"_ustr }, + { u"mcy"_ustr, u"\u043C"_ustr }, + { u"mdash"_ustr, u"\u2014"_ustr }, + { u"measuredangle"_ustr, u"\u2221"_ustr }, + { u"mfr"_ustr, u"\U0001D52A"_ustr }, + { u"mho"_ustr, u"\u2127"_ustr }, + { u"micro"_ustr, u"\u00B5"_ustr }, + { u"mid"_ustr, u"\u2223"_ustr }, + { u"midast"_ustr, u"\u002A"_ustr }, + { u"midcir"_ustr, u"\u2AF0"_ustr }, + { u"middot"_ustr, u"\u00B7"_ustr }, + { u"minus"_ustr, u"\u2212"_ustr }, + { u"minusb"_ustr, u"\u229F"_ustr }, + { u"minusd"_ustr, u"\u2238"_ustr }, + { u"minusdu"_ustr, u"\u2A2A"_ustr }, + { u"mlcp"_ustr, u"\u2ADB"_ustr }, + { u"mldr"_ustr, u"\u2026"_ustr }, + { u"mnplus"_ustr, u"\u2213"_ustr }, + { u"models"_ustr, u"\u22A7"_ustr }, + { u"mopf"_ustr, u"\U0001D55E"_ustr }, + { u"mp"_ustr, u"\u2213"_ustr }, + { u"mscr"_ustr, u"\U0001D4C2"_ustr }, + { u"mstpos"_ustr, u"\u223E"_ustr }, + { u"mu"_ustr, u"\u03BC"_ustr }, + { u"multimap"_ustr, u"\u22B8"_ustr }, + { u"mumap"_ustr, u"\u22B8"_ustr }, + { u"nGg"_ustr, u"\u22D9\u0338"_ustr }, + { u"nGt"_ustr, u"\u226B\u20D2"_ustr }, + { u"nGtv"_ustr, u"\u226B\u0338"_ustr }, + { u"nLeftarrow"_ustr, u"\u21CD"_ustr }, + { u"nLeftrightarrow"_ustr, u"\u21CE"_ustr }, + { u"nLl"_ustr, u"\u22D8\u0338"_ustr }, + { u"nLt"_ustr, u"\u226A\u20D2"_ustr }, + { u"nLtv"_ustr, u"\u226A\u0338"_ustr }, + { u"nRightarrow"_ustr, u"\u21CF"_ustr }, + { u"nVDash"_ustr, u"\u22AF"_ustr }, + { u"nVdash"_ustr, u"\u22AE"_ustr }, + { u"nabla"_ustr, u"\u2207"_ustr }, + { u"nacute"_ustr, u"\u0144"_ustr }, + { u"nang"_ustr, u"\u2220\u20D2"_ustr }, + { u"nap"_ustr, u"\u2249"_ustr }, + { u"napE"_ustr, u"\u2A70\u0338"_ustr }, + { u"napid"_ustr, u"\u224B\u0338"_ustr }, + { u"napos"_ustr, u"\u0149"_ustr }, + { u"napprox"_ustr, u"\u2249"_ustr }, + { u"natur"_ustr, u"\u266E"_ustr }, + { u"natural"_ustr, u"\u266E"_ustr }, + { u"naturals"_ustr, u"\u2115"_ustr }, + { u"nbsp"_ustr, u"\u00A0"_ustr }, + { u"nbump"_ustr, u"\u224E\u0338"_ustr }, + { u"nbumpe"_ustr, u"\u224F\u0338"_ustr }, + { u"ncap"_ustr, u"\u2A43"_ustr }, + { u"ncaron"_ustr, u"\u0148"_ustr }, + { u"ncedil"_ustr, u"\u0146"_ustr }, + { u"ncong"_ustr, u"\u2247"_ustr }, + { u"ncongdot"_ustr, u"\u2A6D\u0338"_ustr }, + { u"ncup"_ustr, u"\u2A42"_ustr }, + { u"ncy"_ustr, u"\u043D"_ustr }, + { u"ndash"_ustr, u"\u2013"_ustr }, + { u"ne"_ustr, u"\u2260"_ustr }, + { u"neArr"_ustr, u"\u21D7"_ustr }, + { u"nearhk"_ustr, u"\u2924"_ustr }, + { u"nearr"_ustr, u"\u2197"_ustr }, + { u"nearrow"_ustr, u"\u2197"_ustr }, + { u"nedot"_ustr, u"\u2250\u0338"_ustr }, + { u"nequiv"_ustr, u"\u2262"_ustr }, + { u"nesear"_ustr, u"\u2928"_ustr }, + { u"nesim"_ustr, u"\u2242\u0338"_ustr }, + { u"nexist"_ustr, u"\u2204"_ustr }, + { u"nexists"_ustr, u"\u2204"_ustr }, + { u"nfr"_ustr, u"\U0001D52B"_ustr }, + { u"ngE"_ustr, u"\u2267\u0338"_ustr }, + { u"nge"_ustr, u"\u2271"_ustr }, + { u"ngeq"_ustr, u"\u2271"_ustr }, + { u"ngeqq"_ustr, u"\u2267\u0338"_ustr }, + { u"ngeqslant"_ustr, u"\u2A7E\u0338"_ustr }, + { u"nges"_ustr, u"\u2A7E\u0338"_ustr }, + { u"ngsim"_ustr, u"\u2275"_ustr }, + { u"ngt"_ustr, u"\u226F"_ustr }, + { u"ngtr"_ustr, u"\u226F"_ustr }, + { u"nhArr"_ustr, u"\u21CE"_ustr }, + { u"nharr"_ustr, u"\u21AE"_ustr }, + { u"nhpar"_ustr, u"\u2AF2"_ustr }, + { u"ni"_ustr, u"\u220B"_ustr }, + { u"nis"_ustr, u"\u22FC"_ustr }, + { u"nisd"_ustr, u"\u22FA"_ustr }, + { u"niv"_ustr, u"\u220B"_ustr }, + { u"njcy"_ustr, u"\u045A"_ustr }, + { u"nlArr"_ustr, u"\u21CD"_ustr }, + { u"nlE"_ustr, u"\u2266\u0338"_ustr }, + { u"nlarr"_ustr, u"\u219A"_ustr }, + { u"nldr"_ustr, u"\u2025"_ustr }, + { u"nle"_ustr, u"\u2270"_ustr }, + { u"nleftarrow"_ustr, u"\u219A"_ustr }, + { u"nleftrightarrow"_ustr, u"\u21AE"_ustr }, + { u"nleq"_ustr, u"\u2270"_ustr }, + { u"nleqq"_ustr, u"\u2266\u0338"_ustr }, + { u"nleqslant"_ustr, u"\u2A7D\u0338"_ustr }, + { u"nles"_ustr, u"\u2A7D\u0338"_ustr }, + { u"nless"_ustr, u"\u226E"_ustr }, + { u"nlsim"_ustr, u"\u2274"_ustr }, + { u"nlt"_ustr, u"\u226E"_ustr }, + { u"nltri"_ustr, u"\u22EA"_ustr }, + { u"nltrie"_ustr, u"\u22EC"_ustr }, + { u"nmid"_ustr, u"\u2224"_ustr }, + { u"nopf"_ustr, u"\U0001D55F"_ustr }, + { u"not"_ustr, u"\u00AC"_ustr }, + { u"notin"_ustr, u"\u2209"_ustr }, + { u"notinE"_ustr, u"\u22F9\u0338"_ustr }, + { u"notindot"_ustr, u"\u22F5\u0338"_ustr }, + { u"notinva"_ustr, u"\u2209"_ustr }, + { u"notinvb"_ustr, u"\u22F7"_ustr }, + { u"notinvc"_ustr, u"\u22F6"_ustr }, + { u"notni"_ustr, u"\u220C"_ustr }, + { u"notniva"_ustr, u"\u220C"_ustr }, + { u"notnivb"_ustr, u"\u22FE"_ustr }, + { u"notnivc"_ustr, u"\u22FD"_ustr }, + { u"npar"_ustr, u"\u2226"_ustr }, + { u"nparallel"_ustr, u"\u2226"_ustr }, + { u"nparsl"_ustr, u"\u2AFD\u20E5"_ustr }, + { u"npart"_ustr, u"\u2202\u0338"_ustr }, + { u"npolint"_ustr, u"\u2A14"_ustr }, + { u"npr"_ustr, u"\u2280"_ustr }, + { u"nprcue"_ustr, u"\u22E0"_ustr }, + { u"npre"_ustr, u"\u2AAF\u0338"_ustr }, + { u"nprec"_ustr, u"\u2280"_ustr }, + { u"npreceq"_ustr, u"\u2AAF\u0338"_ustr }, + { u"nrArr"_ustr, u"\u21CF"_ustr }, + { u"nrarr"_ustr, u"\u219B"_ustr }, + { u"nrarrc"_ustr, u"\u2933\u0338"_ustr }, + { u"nrarrw"_ustr, u"\u219D\u0338"_ustr }, + { u"nrightarrow"_ustr, u"\u219B"_ustr }, + { u"nrtri"_ustr, u"\u22EB"_ustr }, + { u"nrtrie"_ustr, u"\u22ED"_ustr }, + { u"nsc"_ustr, u"\u2281"_ustr }, + { u"nsccue"_ustr, u"\u22E1"_ustr }, + { u"nsce"_ustr, u"\u2AB0\u0338"_ustr }, + { u"nscr"_ustr, u"\U0001D4C3"_ustr }, + { u"nshortmid"_ustr, u"\u2224"_ustr }, + { u"nshortparallel"_ustr, u"\u2226"_ustr }, + { u"nsim"_ustr, u"\u2241"_ustr }, + { u"nsime"_ustr, u"\u2244"_ustr }, + { u"nsimeq"_ustr, u"\u2244"_ustr }, + { u"nsmid"_ustr, u"\u2224"_ustr }, + { u"nspar"_ustr, u"\u2226"_ustr }, + { u"nsqsube"_ustr, u"\u22E2"_ustr }, + { u"nsqsupe"_ustr, u"\u22E3"_ustr }, + { u"nsub"_ustr, u"\u2284"_ustr }, + { u"nsubE"_ustr, u"\u2AC5\u0338"_ustr }, + { u"nsube"_ustr, u"\u2288"_ustr }, + { u"nsubset"_ustr, u"\u2282\u20D2"_ustr }, + { u"nsubseteq"_ustr, u"\u2288"_ustr }, + { u"nsubseteqq"_ustr, u"\u2AC5\u0338"_ustr }, + { u"nsucc"_ustr, u"\u2281"_ustr }, + { u"nsucceq"_ustr, u"\u2AB0\u0338"_ustr }, + { u"nsup"_ustr, u"\u2285"_ustr }, + { u"nsupE"_ustr, u"\u2AC6\u0338"_ustr }, + { u"nsupe"_ustr, u"\u2289"_ustr }, + { u"nsupset"_ustr, u"\u2283\u20D2"_ustr }, + { u"nsupseteq"_ustr, u"\u2289"_ustr }, + { u"nsupseteqq"_ustr, u"\u2AC6\u0338"_ustr }, + { u"ntgl"_ustr, u"\u2279"_ustr }, + { u"ntilde"_ustr, u"\u00F1"_ustr }, + { u"ntlg"_ustr, u"\u2278"_ustr }, + { u"ntriangleleft"_ustr, u"\u22EA"_ustr }, + { u"ntrianglelefteq"_ustr, u"\u22EC"_ustr }, + { u"ntriangleright"_ustr, u"\u22EB"_ustr }, + { u"ntrianglerighteq"_ustr, u"\u22ED"_ustr }, + { u"nu"_ustr, u"\u03BD"_ustr }, + { u"num"_ustr, u"\u0023"_ustr }, + { u"numero"_ustr, u"\u2116"_ustr }, + { u"numsp"_ustr, u"\u2007"_ustr }, + { u"nvDash"_ustr, u"\u22AD"_ustr }, + { u"nvHarr"_ustr, u"\u2904"_ustr }, + { u"nvap"_ustr, u"\u224D\u20D2"_ustr }, + { u"nvdash"_ustr, u"\u22AC"_ustr }, + { u"nvge"_ustr, u"\u2265\u20D2"_ustr }, + { u"nvgt"_ustr, u"\u003E\u20D2"_ustr }, + { u"nvinfin"_ustr, u"\u29DE"_ustr }, + { u"nvlArr"_ustr, u"\u2902"_ustr }, + { u"nvle"_ustr, u"\u2264\u20D2"_ustr }, + { u"nvlt"_ustr, u"\u003C\u20D2"_ustr }, + { u"nvltrie"_ustr, u"\u22B4\u20D2"_ustr }, + { u"nvrArr"_ustr, u"\u2903"_ustr }, + { u"nvrtrie"_ustr, u"\u22B5\u20D2"_ustr }, + { u"nvsim"_ustr, u"\u223C\u20D2"_ustr }, + { u"nwArr"_ustr, u"\u21D6"_ustr }, + { u"nwarhk"_ustr, u"\u2923"_ustr }, + { u"nwarr"_ustr, u"\u2196"_ustr }, + { u"nwarrow"_ustr, u"\u2196"_ustr }, + { u"nwnear"_ustr, u"\u2927"_ustr }, + { u"oS"_ustr, u"\u24C8"_ustr }, + { u"oacute"_ustr, u"\u00F3"_ustr }, + { u"oast"_ustr, u"\u229B"_ustr }, + { u"ocir"_ustr, u"\u229A"_ustr }, + { u"ocirc"_ustr, u"\u00F4"_ustr }, + { u"ocy"_ustr, u"\u043E"_ustr }, + { u"odash"_ustr, u"\u229D"_ustr }, + { u"odblac"_ustr, u"\u0151"_ustr }, + { u"odiv"_ustr, u"\u2A38"_ustr }, + { u"odot"_ustr, u"\u2299"_ustr }, + { u"odsold"_ustr, u"\u29BC"_ustr }, + { u"oelig"_ustr, u"\u0153"_ustr }, + { u"ofcir"_ustr, u"\u29BF"_ustr }, + { u"ofr"_ustr, u"\U0001D52C"_ustr }, + { u"ogon"_ustr, u"\u02DB"_ustr }, + { u"ograve"_ustr, u"\u00F2"_ustr }, + { u"ogt"_ustr, u"\u29C1"_ustr }, + { u"ohbar"_ustr, u"\u29B5"_ustr }, + { u"ohm"_ustr, u"\u03A9"_ustr }, + { u"oint"_ustr, u"\u222E"_ustr }, + { u"olarr"_ustr, u"\u21BA"_ustr }, + { u"olcir"_ustr, u"\u29BE"_ustr }, + { u"olcross"_ustr, u"\u29BB"_ustr }, + { u"oline"_ustr, u"\u203E"_ustr }, + { u"olt"_ustr, u"\u29C0"_ustr }, + { u"omacr"_ustr, u"\u014D"_ustr }, + { u"omega"_ustr, u"\u03C9"_ustr }, + { u"omicron"_ustr, u"\u03BF"_ustr }, + { u"omid"_ustr, u"\u29B6"_ustr }, + { u"ominus"_ustr, u"\u2296"_ustr }, + { u"oopf"_ustr, u"\U0001D560"_ustr }, + { u"opar"_ustr, u"\u29B7"_ustr }, + { u"operp"_ustr, u"\u29B9"_ustr }, + { u"oplus"_ustr, u"\u2295"_ustr }, + { u"or"_ustr, u"\u2228"_ustr }, + { u"orarr"_ustr, u"\u21BB"_ustr }, + { u"ord"_ustr, u"\u2A5D"_ustr }, + { u"order"_ustr, u"\u2134"_ustr }, + { u"orderof"_ustr, u"\u2134"_ustr }, + { u"ordf"_ustr, u"\u00AA"_ustr }, + { u"ordm"_ustr, u"\u00BA"_ustr }, + { u"origof"_ustr, u"\u22B6"_ustr }, + { u"oror"_ustr, u"\u2A56"_ustr }, + { u"orslope"_ustr, u"\u2A57"_ustr }, + { u"orv"_ustr, u"\u2A5B"_ustr }, + { u"oscr"_ustr, u"\u2134"_ustr }, + { u"oslash"_ustr, u"\u00F8"_ustr }, + { u"osol"_ustr, u"\u2298"_ustr }, + { u"otilde"_ustr, u"\u00F5"_ustr }, + { u"otimes"_ustr, u"\u2297"_ustr }, + { u"otimesas"_ustr, u"\u2A36"_ustr }, + { u"ouml"_ustr, u"\u00F6"_ustr }, + { u"ovbar"_ustr, u"\u233D"_ustr }, + { u"par"_ustr, u"\u2225"_ustr }, + { u"para"_ustr, u"\u00B6"_ustr }, + { u"parallel"_ustr, u"\u2225"_ustr }, + { u"parsim"_ustr, u"\u2AF3"_ustr }, + { u"parsl"_ustr, u"\u2AFD"_ustr }, + { u"part"_ustr, u"\u2202"_ustr }, + { u"pcy"_ustr, u"\u043F"_ustr }, + { u"percnt"_ustr, u"\u0025"_ustr }, + { u"period"_ustr, u"\u002E"_ustr }, + { u"permil"_ustr, u"\u2030"_ustr }, + { u"perp"_ustr, u"\u22A5"_ustr }, + { u"pertenk"_ustr, u"\u2031"_ustr }, + { u"pfr"_ustr, u"\U0001D52D"_ustr }, + { u"phi"_ustr, u"\u03C6"_ustr }, + { u"phiv"_ustr, u"\u03D5"_ustr }, + { u"phmmat"_ustr, u"\u2133"_ustr }, + { u"phone"_ustr, u"\u260E"_ustr }, + { u"pi"_ustr, u"\u03C0"_ustr }, + { u"pitchfork"_ustr, u"\u22D4"_ustr }, + { u"piv"_ustr, u"\u03D6"_ustr }, + { u"planck"_ustr, u"\u210F"_ustr }, + { u"planckh"_ustr, u"\u210E"_ustr }, + { u"plankv"_ustr, u"\u210F"_ustr }, + { u"plus"_ustr, u"\u002B"_ustr }, + { u"plusacir"_ustr, u"\u2A23"_ustr }, + { u"plusb"_ustr, u"\u229E"_ustr }, + { u"pluscir"_ustr, u"\u2A22"_ustr }, + { u"plusdo"_ustr, u"\u2214"_ustr }, + { u"plusdu"_ustr, u"\u2A25"_ustr }, + { u"pluse"_ustr, u"\u2A72"_ustr }, + { u"plusmn"_ustr, u"\u00B1"_ustr }, + { u"plussim"_ustr, u"\u2A26"_ustr }, + { u"plustwo"_ustr, u"\u2A27"_ustr }, + { u"pm"_ustr, u"\u00B1"_ustr }, + { u"pointint"_ustr, u"\u2A15"_ustr }, + { u"popf"_ustr, u"\U0001D561"_ustr }, + { u"pound"_ustr, u"\u00A3"_ustr }, + { u"pr"_ustr, u"\u227A"_ustr }, + { u"prE"_ustr, u"\u2AB3"_ustr }, + { u"prap"_ustr, u"\u2AB7"_ustr }, + { u"prcue"_ustr, u"\u227C"_ustr }, + { u"pre"_ustr, u"\u2AAF"_ustr }, + { u"prec"_ustr, u"\u227A"_ustr }, + { u"precapprox"_ustr, u"\u2AB7"_ustr }, + { u"preccurlyeq"_ustr, u"\u227C"_ustr }, + { u"preceq"_ustr, u"\u2AAF"_ustr }, + { u"precnapprox"_ustr, u"\u2AB9"_ustr }, + { u"precneqq"_ustr, u"\u2AB5"_ustr }, + { u"precnsim"_ustr, u"\u22E8"_ustr }, + { u"precsim"_ustr, u"\u227E"_ustr }, + { u"prime"_ustr, u"\u2032"_ustr }, + { u"primes"_ustr, u"\u2119"_ustr }, + { u"prnE"_ustr, u"\u2AB5"_ustr }, + { u"prnap"_ustr, u"\u2AB9"_ustr }, + { u"prnsim"_ustr, u"\u22E8"_ustr }, + { u"prod"_ustr, u"\u220F"_ustr }, + { u"profalar"_ustr, u"\u232E"_ustr }, + { u"profline"_ustr, u"\u2312"_ustr }, + { u"profsurf"_ustr, u"\u2313"_ustr }, + { u"prop"_ustr, u"\u221D"_ustr }, + { u"propto"_ustr, u"\u221D"_ustr }, + { u"prsim"_ustr, u"\u227E"_ustr }, + { u"prurel"_ustr, u"\u22B0"_ustr }, + { u"pscr"_ustr, u"\U0001D4C5"_ustr }, + { u"psi"_ustr, u"\u03C8"_ustr }, + { u"puncsp"_ustr, u"\u2008"_ustr }, + { u"qfr"_ustr, u"\U0001D52E"_ustr }, + { u"qint"_ustr, u"\u2A0C"_ustr }, + { u"qopf"_ustr, u"\U0001D562"_ustr }, + { u"qprime"_ustr, u"\u2057"_ustr }, + { u"qscr"_ustr, u"\U0001D4C6"_ustr }, + { u"quaternions"_ustr, u"\u210D"_ustr }, + { u"quatint"_ustr, u"\u2A16"_ustr }, + { u"quest"_ustr, u"\u003F"_ustr }, + { u"questeq"_ustr, u"\u225F"_ustr }, + { u"quot"_ustr, u"\u0022"_ustr }, + { u"rAarr"_ustr, u"\u21DB"_ustr }, + { u"rArr"_ustr, u"\u21D2"_ustr }, + { u"rAtail"_ustr, u"\u291C"_ustr }, + { u"rBarr"_ustr, u"\u290F"_ustr }, + { u"rHar"_ustr, u"\u2964"_ustr }, + { u"race"_ustr, u"\u223D\u0331"_ustr }, + { u"racute"_ustr, u"\u0155"_ustr }, + { u"radic"_ustr, u"\u221A"_ustr }, + { u"raemptyv"_ustr, u"\u29B3"_ustr }, + { u"rang"_ustr, u"\u27E9"_ustr }, + { u"rangd"_ustr, u"\u2992"_ustr }, + { u"range"_ustr, u"\u29A5"_ustr }, + { u"rangle"_ustr, u"\u27E9"_ustr }, + { u"raquo"_ustr, u"\u00BB"_ustr }, + { u"rarr"_ustr, u"\u2192"_ustr }, + { u"rarrap"_ustr, u"\u2975"_ustr }, + { u"rarrb"_ustr, u"\u21E5"_ustr }, + { u"rarrbfs"_ustr, u"\u2920"_ustr }, + { u"rarrc"_ustr, u"\u2933"_ustr }, + { u"rarrfs"_ustr, u"\u291E"_ustr }, + { u"rarrhk"_ustr, u"\u21AA"_ustr }, + { u"rarrlp"_ustr, u"\u21AC"_ustr }, + { u"rarrpl"_ustr, u"\u2945"_ustr }, + { u"rarrsim"_ustr, u"\u2974"_ustr }, + { u"rarrtl"_ustr, u"\u21A3"_ustr }, + { u"rarrw"_ustr, u"\u219D"_ustr }, + { u"ratail"_ustr, u"\u291A"_ustr }, + { u"ratio"_ustr, u"\u2236"_ustr }, + { u"rationals"_ustr, u"\u211A"_ustr }, + { u"rbarr"_ustr, u"\u290D"_ustr }, + { u"rbbrk"_ustr, u"\u2773"_ustr }, + { u"rbrace"_ustr, u"\u007D"_ustr }, + { u"rbrack"_ustr, u"\u005D"_ustr }, + { u"rbrke"_ustr, u"\u298C"_ustr }, + { u"rbrksld"_ustr, u"\u298E"_ustr }, + { u"rbrkslu"_ustr, u"\u2990"_ustr }, + { u"rcaron"_ustr, u"\u0159"_ustr }, + { u"rcedil"_ustr, u"\u0157"_ustr }, + { u"rceil"_ustr, u"\u2309"_ustr }, + { u"rcub"_ustr, u"\u007D"_ustr }, + { u"rcy"_ustr, u"\u0440"_ustr }, + { u"rdca"_ustr, u"\u2937"_ustr }, + { u"rdldhar"_ustr, u"\u2969"_ustr }, + { u"rdquo"_ustr, u"\u201D"_ustr }, + { u"rdquor"_ustr, u"\u201D"_ustr }, + { u"rdsh"_ustr, u"\u21B3"_ustr }, + { u"real"_ustr, u"\u211C"_ustr }, + { u"realine"_ustr, u"\u211B"_ustr }, + { u"realpart"_ustr, u"\u211C"_ustr }, + { u"reals"_ustr, u"\u211D"_ustr }, + { u"rect"_ustr, u"\u25AD"_ustr }, + { u"reg"_ustr, u"\u00AE"_ustr }, + { u"rfisht"_ustr, u"\u297D"_ustr }, + { u"rfloor"_ustr, u"\u230B"_ustr }, + { u"rfr"_ustr, u"\U0001D52F"_ustr }, + { u"rhard"_ustr, u"\u21C1"_ustr }, + { u"rharu"_ustr, u"\u21C0"_ustr }, + { u"rharul"_ustr, u"\u296C"_ustr }, + { u"rho"_ustr, u"\u03C1"_ustr }, + { u"rhov"_ustr, u"\u03F1"_ustr }, + { u"rightarrow"_ustr, u"\u2192"_ustr }, + { u"rightarrowtail"_ustr, u"\u21A3"_ustr }, + { u"rightharpoondown"_ustr, u"\u21C1"_ustr }, + { u"rightharpoonup"_ustr, u"\u21C0"_ustr }, + { u"rightleftarrows"_ustr, u"\u21C4"_ustr }, + { u"rightleftharpoons"_ustr, u"\u21CC"_ustr }, + { u"rightrightarrows"_ustr, u"\u21C9"_ustr }, + { u"rightsquigarrow"_ustr, u"\u219D"_ustr }, + { u"rightthreetimes"_ustr, u"\u22CC"_ustr }, + { u"ring"_ustr, u"\u02DA"_ustr }, + { u"risingdotseq"_ustr, u"\u2253"_ustr }, + { u"rlarr"_ustr, u"\u21C4"_ustr }, + { u"rlhar"_ustr, u"\u21CC"_ustr }, + { u"rlm"_ustr, u"\u200F"_ustr }, + { u"rmoust"_ustr, u"\u23B1"_ustr }, + { u"rmoustache"_ustr, u"\u23B1"_ustr }, + { u"rnmid"_ustr, u"\u2AEE"_ustr }, + { u"roang"_ustr, u"\u27ED"_ustr }, + { u"roarr"_ustr, u"\u21FE"_ustr }, + { u"robrk"_ustr, u"\u27E7"_ustr }, + { u"ropar"_ustr, u"\u2986"_ustr }, + { u"ropf"_ustr, u"\U0001D563"_ustr }, + { u"roplus"_ustr, u"\u2A2E"_ustr }, + { u"rotimes"_ustr, u"\u2A35"_ustr }, + { u"rpar"_ustr, u"\u0029"_ustr }, + { u"rpargt"_ustr, u"\u2994"_ustr }, + { u"rppolint"_ustr, u"\u2A12"_ustr }, + { u"rrarr"_ustr, u"\u21C9"_ustr }, + { u"rsaquo"_ustr, u"\u203A"_ustr }, + { u"rscr"_ustr, u"\U0001D4C7"_ustr }, + { u"rsh"_ustr, u"\u21B1"_ustr }, + { u"rsqb"_ustr, u"\u005D"_ustr }, + { u"rsquo"_ustr, u"\u2019"_ustr }, + { u"rsquor"_ustr, u"\u2019"_ustr }, + { u"rthree"_ustr, u"\u22CC"_ustr }, + { u"rtimes"_ustr, u"\u22CA"_ustr }, + { u"rtri"_ustr, u"\u25B9"_ustr }, + { u"rtrie"_ustr, u"\u22B5"_ustr }, + { u"rtrif"_ustr, u"\u25B8"_ustr }, + { u"rtriltri"_ustr, u"\u29CE"_ustr }, + { u"ruluhar"_ustr, u"\u2968"_ustr }, + { u"rx"_ustr, u"\u211E"_ustr }, + { u"sacute"_ustr, u"\u015B"_ustr }, + { u"sbquo"_ustr, u"\u201A"_ustr }, + { u"sc"_ustr, u"\u227B"_ustr }, + { u"scE"_ustr, u"\u2AB4"_ustr }, + { u"scap"_ustr, u"\u2AB8"_ustr }, + { u"scaron"_ustr, u"\u0161"_ustr }, + { u"sccue"_ustr, u"\u227D"_ustr }, + { u"sce"_ustr, u"\u2AB0"_ustr }, + { u"scedil"_ustr, u"\u015F"_ustr }, + { u"scirc"_ustr, u"\u015D"_ustr }, + { u"scnE"_ustr, u"\u2AB6"_ustr }, + { u"scnap"_ustr, u"\u2ABA"_ustr }, + { u"scnsim"_ustr, u"\u22E9"_ustr }, + { u"scpolint"_ustr, u"\u2A13"_ustr }, + { u"scsim"_ustr, u"\u227F"_ustr }, + { u"scy"_ustr, u"\u0441"_ustr }, + { u"sdot"_ustr, u"\u22C5"_ustr }, + { u"sdotb"_ustr, u"\u22A1"_ustr }, + { u"sdote"_ustr, u"\u2A66"_ustr }, + { u"seArr"_ustr, u"\u21D8"_ustr }, + { u"searhk"_ustr, u"\u2925"_ustr }, + { u"searr"_ustr, u"\u2198"_ustr }, + { u"searrow"_ustr, u"\u2198"_ustr }, + { u"sect"_ustr, u"\u00A7"_ustr }, + { u"semi"_ustr, u"\u003B"_ustr }, + { u"seswar"_ustr, u"\u2929"_ustr }, + { u"setminus"_ustr, u"\u2216"_ustr }, + { u"setmn"_ustr, u"\u2216"_ustr }, + { u"sext"_ustr, u"\u2736"_ustr }, + { u"sfr"_ustr, u"\U0001D530"_ustr }, + { u"sfrown"_ustr, u"\u2322"_ustr }, + { u"sharp"_ustr, u"\u266F"_ustr }, + { u"shchcy"_ustr, u"\u0449"_ustr }, + { u"shcy"_ustr, u"\u0448"_ustr }, + { u"shortmid"_ustr, u"\u2223"_ustr }, + { u"shortparallel"_ustr, u"\u2225"_ustr }, + { u"shy"_ustr, u"\u00AD"_ustr }, + { u"sigma"_ustr, u"\u03C3"_ustr }, + { u"sigmaf"_ustr, u"\u03C2"_ustr }, + { u"sigmav"_ustr, u"\u03C2"_ustr }, + { u"sim"_ustr, u"\u223C"_ustr }, + { u"simdot"_ustr, u"\u2A6A"_ustr }, + { u"sime"_ustr, u"\u2243"_ustr }, + { u"simeq"_ustr, u"\u2243"_ustr }, + { u"simg"_ustr, u"\u2A9E"_ustr }, + { u"simgE"_ustr, u"\u2AA0"_ustr }, + { u"siml"_ustr, u"\u2A9D"_ustr }, + { u"simlE"_ustr, u"\u2A9F"_ustr }, + { u"simne"_ustr, u"\u2246"_ustr }, + { u"simplus"_ustr, u"\u2A24"_ustr }, + { u"simrarr"_ustr, u"\u2972"_ustr }, + { u"slarr"_ustr, u"\u2190"_ustr }, + { u"smallsetminus"_ustr, u"\u2216"_ustr }, + { u"smashp"_ustr, u"\u2A33"_ustr }, + { u"smeparsl"_ustr, u"\u29E4"_ustr }, + { u"smid"_ustr, u"\u2223"_ustr }, + { u"smile"_ustr, u"\u2323"_ustr }, + { u"smt"_ustr, u"\u2AAA"_ustr }, + { u"smte"_ustr, u"\u2AAC"_ustr }, + { u"smtes"_ustr, u"\u2AAC\uFE00"_ustr }, + { u"softcy"_ustr, u"\u044C"_ustr }, + { u"sol"_ustr, u"\u002F"_ustr }, + { u"solb"_ustr, u"\u29C4"_ustr }, + { u"solbar"_ustr, u"\u233F"_ustr }, + { u"sopf"_ustr, u"\U0001D564"_ustr }, + { u"spades"_ustr, u"\u2660"_ustr }, + { u"spadesuit"_ustr, u"\u2660"_ustr }, + { u"spar"_ustr, u"\u2225"_ustr }, + { u"sqcap"_ustr, u"\u2293"_ustr }, + { u"sqcaps"_ustr, u"\u2293\uFE00"_ustr }, + { u"sqcup"_ustr, u"\u2294"_ustr }, + { u"sqcups"_ustr, u"\u2294\uFE00"_ustr }, + { u"sqsub"_ustr, u"\u228F"_ustr }, + { u"sqsube"_ustr, u"\u2291"_ustr }, + { u"sqsubset"_ustr, u"\u228F"_ustr }, + { u"sqsubseteq"_ustr, u"\u2291"_ustr }, + { u"sqsup"_ustr, u"\u2290"_ustr }, + { u"sqsupe"_ustr, u"\u2292"_ustr }, + { u"sqsupset"_ustr, u"\u2290"_ustr }, + { u"sqsupseteq"_ustr, u"\u2292"_ustr }, + { u"squ"_ustr, u"\u25A1"_ustr }, + { u"square"_ustr, u"\u25A1"_ustr }, + { u"squarf"_ustr, u"\u25AA"_ustr }, + { u"squf"_ustr, u"\u25AA"_ustr }, + { u"srarr"_ustr, u"\u2192"_ustr }, + { u"sscr"_ustr, u"\U0001D4C8"_ustr }, + { u"ssetmn"_ustr, u"\u2216"_ustr }, + { u"ssmile"_ustr, u"\u2323"_ustr }, + { u"sstarf"_ustr, u"\u22C6"_ustr }, + { u"star"_ustr, u"\u2606"_ustr }, + { u"starf"_ustr, u"\u2605"_ustr }, + { u"straightepsilon"_ustr, u"\u03F5"_ustr }, + { u"straightphi"_ustr, u"\u03D5"_ustr }, + { u"strns"_ustr, u"\u00AF"_ustr }, + { u"sub"_ustr, u"\u2282"_ustr }, + { u"subE"_ustr, u"\u2AC5"_ustr }, + { u"subdot"_ustr, u"\u2ABD"_ustr }, + { u"sube"_ustr, u"\u2286"_ustr }, + { u"subedot"_ustr, u"\u2AC3"_ustr }, + { u"submult"_ustr, u"\u2AC1"_ustr }, + { u"subnE"_ustr, u"\u2ACB"_ustr }, + { u"subne"_ustr, u"\u228A"_ustr }, + { u"subplus"_ustr, u"\u2ABF"_ustr }, + { u"subrarr"_ustr, u"\u2979"_ustr }, + { u"subset"_ustr, u"\u2282"_ustr }, + { u"subseteq"_ustr, u"\u2286"_ustr }, + { u"subseteqq"_ustr, u"\u2AC5"_ustr }, + { u"subsetneq"_ustr, u"\u228A"_ustr }, + { u"subsetneqq"_ustr, u"\u2ACB"_ustr }, + { u"subsim"_ustr, u"\u2AC7"_ustr }, + { u"subsub"_ustr, u"\u2AD5"_ustr }, + { u"subsup"_ustr, u"\u2AD3"_ustr }, + { u"succ"_ustr, u"\u227B"_ustr }, + { u"succapprox"_ustr, u"\u2AB8"_ustr }, + { u"succcurlyeq"_ustr, u"\u227D"_ustr }, + { u"succeq"_ustr, u"\u2AB0"_ustr }, + { u"succnapprox"_ustr, u"\u2ABA"_ustr }, + { u"succneqq"_ustr, u"\u2AB6"_ustr }, + { u"succnsim"_ustr, u"\u22E9"_ustr }, + { u"succsim"_ustr, u"\u227F"_ustr }, + { u"sum"_ustr, u"\u2211"_ustr }, + { u"sung"_ustr, u"\u266A"_ustr }, + { u"sup"_ustr, u"\u2283"_ustr }, + { u"sup1"_ustr, u"\u00B9"_ustr }, + { u"sup2"_ustr, u"\u00B2"_ustr }, + { u"sup3"_ustr, u"\u00B3"_ustr }, + { u"supE"_ustr, u"\u2AC6"_ustr }, + { u"supdot"_ustr, u"\u2ABE"_ustr }, + { u"supdsub"_ustr, u"\u2AD8"_ustr }, + { u"supe"_ustr, u"\u2287"_ustr }, + { u"supedot"_ustr, u"\u2AC4"_ustr }, + { u"suphsol"_ustr, u"\u27C9"_ustr }, + { u"suphsub"_ustr, u"\u2AD7"_ustr }, + { u"suplarr"_ustr, u"\u297B"_ustr }, + { u"supmult"_ustr, u"\u2AC2"_ustr }, + { u"supnE"_ustr, u"\u2ACC"_ustr }, + { u"supne"_ustr, u"\u228B"_ustr }, + { u"supplus"_ustr, u"\u2AC0"_ustr }, + { u"supset"_ustr, u"\u2283"_ustr }, + { u"supseteq"_ustr, u"\u2287"_ustr }, + { u"supseteqq"_ustr, u"\u2AC6"_ustr }, + { u"supsetneq"_ustr, u"\u228B"_ustr }, + { u"supsetneqq"_ustr, u"\u2ACC"_ustr }, + { u"supsim"_ustr, u"\u2AC8"_ustr }, + { u"supsub"_ustr, u"\u2AD4"_ustr }, + { u"supsup"_ustr, u"\u2AD6"_ustr }, + { u"swArr"_ustr, u"\u21D9"_ustr }, + { u"swarhk"_ustr, u"\u2926"_ustr }, + { u"swarr"_ustr, u"\u2199"_ustr }, + { u"swarrow"_ustr, u"\u2199"_ustr }, + { u"swnwar"_ustr, u"\u292A"_ustr }, + { u"szlig"_ustr, u"\u00DF"_ustr }, + { u"target"_ustr, u"\u2316"_ustr }, + { u"tau"_ustr, u"\u03C4"_ustr }, + { u"tbrk"_ustr, u"\u23B4"_ustr }, + { u"tcaron"_ustr, u"\u0165"_ustr }, + { u"tcedil"_ustr, u"\u0163"_ustr }, + { u"tcy"_ustr, u"\u0442"_ustr }, + { u"tdot"_ustr, u"\u20DB"_ustr }, + { u"telrec"_ustr, u"\u2315"_ustr }, + { u"tfr"_ustr, u"\U0001D531"_ustr }, + { u"there4"_ustr, u"\u2234"_ustr }, + { u"therefore"_ustr, u"\u2234"_ustr }, + { u"theta"_ustr, u"\u03B8"_ustr }, + { u"thetasym"_ustr, u"\u03D1"_ustr }, + { u"thetav"_ustr, u"\u03D1"_ustr }, + { u"thickapprox"_ustr, u"\u2248"_ustr }, + { u"thicksim"_ustr, u"\u223C"_ustr }, + { u"thinsp"_ustr, u"\u2009"_ustr }, + { u"thkap"_ustr, u"\u2248"_ustr }, + { u"thksim"_ustr, u"\u223C"_ustr }, + { u"thorn"_ustr, u"\u00FE"_ustr }, + { u"tilde"_ustr, u"\u02DC"_ustr }, + { u"times"_ustr, u"\u00D7"_ustr }, + { u"timesb"_ustr, u"\u22A0"_ustr }, + { u"timesbar"_ustr, u"\u2A31"_ustr }, + { u"timesd"_ustr, u"\u2A30"_ustr }, + { u"tint"_ustr, u"\u222D"_ustr }, + { u"toea"_ustr, u"\u2928"_ustr }, + { u"top"_ustr, u"\u22A4"_ustr }, + { u"topbot"_ustr, u"\u2336"_ustr }, + { u"topcir"_ustr, u"\u2AF1"_ustr }, + { u"topf"_ustr, u"\U0001D565"_ustr }, + { u"topfork"_ustr, u"\u2ADA"_ustr }, + { u"tosa"_ustr, u"\u2929"_ustr }, + { u"tprime"_ustr, u"\u2034"_ustr }, + { u"trade"_ustr, u"\u2122"_ustr }, + { u"triangle"_ustr, u"\u25B5"_ustr }, + { u"triangledown"_ustr, u"\u25BF"_ustr }, + { u"triangleleft"_ustr, u"\u25C3"_ustr }, + { u"trianglelefteq"_ustr, u"\u22B4"_ustr }, + { u"triangleq"_ustr, u"\u225C"_ustr }, + { u"triangleright"_ustr, u"\u25B9"_ustr }, + { u"trianglerighteq"_ustr, u"\u22B5"_ustr }, + { u"tridot"_ustr, u"\u25EC"_ustr }, + { u"trie"_ustr, u"\u225C"_ustr }, + { u"triminus"_ustr, u"\u2A3A"_ustr }, + { u"triplus"_ustr, u"\u2A39"_ustr }, + { u"trisb"_ustr, u"\u29CD"_ustr }, + { u"tritime"_ustr, u"\u2A3B"_ustr }, + { u"trpezium"_ustr, u"\u23E2"_ustr }, + { u"tscr"_ustr, u"\U0001D4C9"_ustr }, + { u"tscy"_ustr, u"\u0446"_ustr }, + { u"tshcy"_ustr, u"\u045B"_ustr }, + { u"tstrok"_ustr, u"\u0167"_ustr }, + { u"twixt"_ustr, u"\u226C"_ustr }, + { u"twoheadleftarrow"_ustr, u"\u219E"_ustr }, + { u"twoheadrightarrow"_ustr, u"\u21A0"_ustr }, + { u"uArr"_ustr, u"\u21D1"_ustr }, + { u"uHar"_ustr, u"\u2963"_ustr }, + { u"uacute"_ustr, u"\u00FA"_ustr }, + { u"uarr"_ustr, u"\u2191"_ustr }, + { u"ubrcy"_ustr, u"\u045E"_ustr }, + { u"ubreve"_ustr, u"\u016D"_ustr }, + { u"ucirc"_ustr, u"\u00FB"_ustr }, + { u"ucy"_ustr, u"\u0443"_ustr }, + { u"udarr"_ustr, u"\u21C5"_ustr }, + { u"udblac"_ustr, u"\u0171"_ustr }, + { u"udhar"_ustr, u"\u296E"_ustr }, + { u"ufisht"_ustr, u"\u297E"_ustr }, + { u"ufr"_ustr, u"\U0001D532"_ustr }, + { u"ugrave"_ustr, u"\u00F9"_ustr }, + { u"uharl"_ustr, u"\u21BF"_ustr }, + { u"uharr"_ustr, u"\u21BE"_ustr }, + { u"uhblk"_ustr, u"\u2580"_ustr }, + { u"ulcorn"_ustr, u"\u231C"_ustr }, + { u"ulcorner"_ustr, u"\u231C"_ustr }, + { u"ulcrop"_ustr, u"\u230F"_ustr }, + { u"ultri"_ustr, u"\u25F8"_ustr }, + { u"umacr"_ustr, u"\u016B"_ustr }, + { u"uml"_ustr, u"\u00A8"_ustr }, + { u"uogon"_ustr, u"\u0173"_ustr }, + { u"uopf"_ustr, u"\U0001D566"_ustr }, + { u"uparrow"_ustr, u"\u2191"_ustr }, + { u"updownarrow"_ustr, u"\u2195"_ustr }, + { u"upharpoonleft"_ustr, u"\u21BF"_ustr }, + { u"upharpoonright"_ustr, u"\u21BE"_ustr }, + { u"uplus"_ustr, u"\u228E"_ustr }, + { u"upsi"_ustr, u"\u03C5"_ustr }, + { u"upsih"_ustr, u"\u03D2"_ustr }, + { u"upsilon"_ustr, u"\u03C5"_ustr }, + { u"upuparrows"_ustr, u"\u21C8"_ustr }, + { u"urcorn"_ustr, u"\u231D"_ustr }, + { u"urcorner"_ustr, u"\u231D"_ustr }, + { u"urcrop"_ustr, u"\u230E"_ustr }, + { u"uring"_ustr, u"\u016F"_ustr }, + { u"urtri"_ustr, u"\u25F9"_ustr }, + { u"uscr"_ustr, u"\U0001D4CA"_ustr }, + { u"utdot"_ustr, u"\u22F0"_ustr }, + { u"utilde"_ustr, u"\u0169"_ustr }, + { u"utri"_ustr, u"\u25B5"_ustr }, + { u"utrif"_ustr, u"\u25B4"_ustr }, + { u"uuarr"_ustr, u"\u21C8"_ustr }, + { u"uuml"_ustr, u"\u00FC"_ustr }, + { u"uwangle"_ustr, u"\u29A7"_ustr }, + { u"vArr"_ustr, u"\u21D5"_ustr }, + { u"vBar"_ustr, u"\u2AE8"_ustr }, + { u"vBarv"_ustr, u"\u2AE9"_ustr }, + { u"vDash"_ustr, u"\u22A8"_ustr }, + { u"vangrt"_ustr, u"\u299C"_ustr }, + { u"varepsilon"_ustr, u"\u03F5"_ustr }, + { u"varkappa"_ustr, u"\u03F0"_ustr }, + { u"varnothing"_ustr, u"\u2205"_ustr }, + { u"varphi"_ustr, u"\u03D5"_ustr }, + { u"varpi"_ustr, u"\u03D6"_ustr }, + { u"varpropto"_ustr, u"\u221D"_ustr }, + { u"varr"_ustr, u"\u2195"_ustr }, + { u"varrho"_ustr, u"\u03F1"_ustr }, + { u"varsigma"_ustr, u"\u03C2"_ustr }, + { u"varsubsetneq"_ustr, u"\u228A\uFE00"_ustr }, + { u"varsubsetneqq"_ustr, u"\u2ACB\uFE00"_ustr }, + { u"varsupsetneq"_ustr, u"\u228B\uFE00"_ustr }, + { u"varsupsetneqq"_ustr, u"\u2ACC\uFE00"_ustr }, + { u"vartheta"_ustr, u"\u03D1"_ustr }, + { u"vartriangleleft"_ustr, u"\u22B2"_ustr }, + { u"vartriangleright"_ustr, u"\u22B3"_ustr }, + { u"vcy"_ustr, u"\u0432"_ustr }, + { u"vdash"_ustr, u"\u22A2"_ustr }, + { u"vee"_ustr, u"\u2228"_ustr }, + { u"veebar"_ustr, u"\u22BB"_ustr }, + { u"veeeq"_ustr, u"\u225A"_ustr }, + { u"vellip"_ustr, u"\u22EE"_ustr }, + { u"verbar"_ustr, u"\u007C"_ustr }, + { u"vert"_ustr, u"\u007C"_ustr }, + { u"vfr"_ustr, u"\U0001D533"_ustr }, + { u"vltri"_ustr, u"\u22B2"_ustr }, + { u"vnsub"_ustr, u"\u2282\u20D2"_ustr }, + { u"vnsup"_ustr, u"\u2283\u20D2"_ustr }, + { u"vopf"_ustr, u"\U0001D567"_ustr }, + { u"vprop"_ustr, u"\u221D"_ustr }, + { u"vrtri"_ustr, u"\u22B3"_ustr }, + { u"vscr"_ustr, u"\U0001D4CB"_ustr }, + { u"vsubnE"_ustr, u"\u2ACB\uFE00"_ustr }, + { u"vsubne"_ustr, u"\u228A\uFE00"_ustr }, + { u"vsupnE"_ustr, u"\u2ACC\uFE00"_ustr }, + { u"vsupne"_ustr, u"\u228B\uFE00"_ustr }, + { u"vzigzag"_ustr, u"\u299A"_ustr }, + { u"wcirc"_ustr, u"\u0175"_ustr }, + { u"wedbar"_ustr, u"\u2A5F"_ustr }, + { u"wedge"_ustr, u"\u2227"_ustr }, + { u"wedgeq"_ustr, u"\u2259"_ustr }, + { u"weierp"_ustr, u"\u2118"_ustr }, + { u"wfr"_ustr, u"\U0001D534"_ustr }, + { u"wopf"_ustr, u"\U0001D568"_ustr }, + { u"wp"_ustr, u"\u2118"_ustr }, + { u"wr"_ustr, u"\u2240"_ustr }, + { u"wreath"_ustr, u"\u2240"_ustr }, + { u"wscr"_ustr, u"\U0001D4CC"_ustr }, + { u"xcap"_ustr, u"\u22C2"_ustr }, + { u"xcirc"_ustr, u"\u25EF"_ustr }, + { u"xcup"_ustr, u"\u22C3"_ustr }, + { u"xdtri"_ustr, u"\u25BD"_ustr }, + { u"xfr"_ustr, u"\U0001D535"_ustr }, + { u"xhArr"_ustr, u"\u27FA"_ustr }, + { u"xharr"_ustr, u"\u27F7"_ustr }, + { u"xi"_ustr, u"\u03BE"_ustr }, + { u"xlArr"_ustr, u"\u27F8"_ustr }, + { u"xlarr"_ustr, u"\u27F5"_ustr }, + { u"xmap"_ustr, u"\u27FC"_ustr }, + { u"xnis"_ustr, u"\u22FB"_ustr }, + { u"xodot"_ustr, u"\u2A00"_ustr }, + { u"xopf"_ustr, u"\U0001D569"_ustr }, + { u"xoplus"_ustr, u"\u2A01"_ustr }, + { u"xotime"_ustr, u"\u2A02"_ustr }, + { u"xrArr"_ustr, u"\u27F9"_ustr }, + { u"xrarr"_ustr, u"\u27F6"_ustr }, + { u"xscr"_ustr, u"\U0001D4CD"_ustr }, + { u"xsqcup"_ustr, u"\u2A06"_ustr }, + { u"xuplus"_ustr, u"\u2A04"_ustr }, + { u"xutri"_ustr, u"\u25B3"_ustr }, + { u"xvee"_ustr, u"\u22C1"_ustr }, + { u"xwedge"_ustr, u"\u22C0"_ustr }, + { u"yacute"_ustr, u"\u00FD"_ustr }, + { u"yacy"_ustr, u"\u044F"_ustr }, + { u"ycirc"_ustr, u"\u0177"_ustr }, + { u"ycy"_ustr, u"\u044B"_ustr }, + { u"yen"_ustr, u"\u00A5"_ustr }, + { u"yfr"_ustr, u"\U0001D536"_ustr }, + { u"yicy"_ustr, u"\u0457"_ustr }, + { u"yopf"_ustr, u"\U0001D56A"_ustr }, + { u"yscr"_ustr, u"\U0001D4CE"_ustr }, + { u"yucy"_ustr, u"\u044E"_ustr }, + { u"yuml"_ustr, u"\u00FF"_ustr }, + { u"zacute"_ustr, u"\u017A"_ustr }, + { u"zcaron"_ustr, u"\u017E"_ustr }, + { u"zcy"_ustr, u"\u0437"_ustr }, + { u"zdot"_ustr, u"\u017C"_ustr }, + { u"zeetrf"_ustr, u"\u2128"_ustr }, + { u"zeta"_ustr, u"\u03B6"_ustr }, + { u"zfr"_ustr, u"\U0001D537"_ustr }, + { u"zhcy"_ustr, u"\u0436"_ustr }, + { u"zigrarr"_ustr, u"\u21DD"_ustr }, + { u"zopf"_ustr, u"\U0001D56B"_ustr }, + { u"zscr"_ustr, u"\U0001D4CF"_ustr }, + { u"zwj"_ustr, u"\u200D"_ustr }, + { u"zwnj"_ustr, u"\u200C"_ustr } // clang-format on }; @@ -2156,8 +2156,8 @@ const ::css::uno::Sequence<::css::beans::Pair<OUString, OUString>> static ::css::beans::Pair<::rtl::OUString, ::rtl::OUString> icustomMathmlHtmlEntitiesNamesExportData[2] = { // clang-format off - { u"σ", u"\u03C3"}, - { u"∞", u"\u221E"} + { u"σ"_ustr, u"\u03C3"_ustr}, + { u"∞"_ustr, u"\u221E"_ustr} // clang-format on }; const ::css::uno::Sequence<::css::beans::Pair<::rtl::OUString, ::rtl::OUString>> diff --git a/starmath/source/parse5.cxx b/starmath/source/parse5.cxx index d2742b27afa6..8f2815c3c3b4 100644 --- a/starmath/source/parse5.cxx +++ b/starmath/source/parse5.cxx @@ -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; diff --git a/starmath/source/smediteng.cxx b/starmath/source/smediteng.cxx index 5560d501ef5a..9eac0863e3de 100644 --- a/starmath/source/smediteng.cxx +++ b/starmath/source/smediteng.cxx @@ -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); diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx index 05b5155054d9..f43cfb9e437e 100644 --- a/svl/qa/unit/svl.cxx +++ b/svl/qa/unit/svl.cxx @@ -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\\ "; diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx index 3f2624785f24..516f4eb4fd04 100644 --- a/svl/qa/unit/test_URIHelper.cxx +++ b/svl/qa/unit/test_URIHelper.cxx @@ -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; diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index b99f32c1e5b2..d29a6a025cd8 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -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; diff --git a/svx/qa/unit/svdraw.cxx b/svx/qa/unit/svdraw.cxx index d61dde7734cd..1284fa6305bf 100644 --- a/svx/qa/unit/svdraw.cxx +++ b/svx/qa/unit/svdraw.cxx @@ -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++) { diff --git a/svx/source/dialog/dlgunit.hxx b/svx/source/dialog/dlgunit.hxx index bb8ac83d28d5..a1e79b1182b1 100644 --- a/svx/source/dialog/dlgunit.hxx +++ b/svx/source/dialog/dlgunit.hxx @@ -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 diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index 9287bd51aa44..50bc47f3a4df 100644 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -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, diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 69ff73cad760..aa562e37d616 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -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; } diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index c0d4c15d0096..b6f40386faab 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -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) { diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 4e1253493323..93d6ea938cc7 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -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, diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 5b0b18c8f12a..44b13708f879 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -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; diff --git a/svx/source/unodraw/SvxXTextColumns.cxx b/svx/source/unodraw/SvxXTextColumns.cxx index 3103019adacc..a33073910e22 100644 --- a/svx/source/unodraw/SvxXTextColumns.cxx +++ b/svx/source/unodraw/SvxXTextColumns.cxx @@ -55,18 +55,18 @@ enum : sal_uInt16 }; SfxItemPropertyMapEntry const saTextColumns_Impl[] = { - { u"IsAutomatic", WID_TXTCOL_IS_AUTOMATIC, cppu::UnoType<bool>::get(), + { u"IsAutomatic"_ustr, WID_TXTCOL_IS_AUTOMATIC, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY, 0 }, - { u"AutomaticDistance", WID_TXTCOL_AUTO_DISTANCE, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { u"SeparatorLineWidth", WID_TXTCOL_LINE_WIDTH, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { u"SeparatorLineColor", WID_TXTCOL_LINE_COLOR, + { u"AutomaticDistance"_ustr, WID_TXTCOL_AUTO_DISTANCE, cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { u"SeparatorLineWidth"_ustr, WID_TXTCOL_LINE_WIDTH, cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { u"SeparatorLineColor"_ustr, WID_TXTCOL_LINE_COLOR, cppu::UnoType<com::sun::star::util::Color>::get(), 0, 0 }, - { u"SeparatorLineRelativeHeight", WID_TXTCOL_LINE_REL_HGT, cppu::UnoType<sal_Int32>::get(), 0, - 0 }, - { u"SeparatorLineVerticalAlignment", WID_TXTCOL_LINE_ALIGN, + { u"SeparatorLineRelativeHeight"_ustr, WID_TXTCOL_LINE_REL_HGT, cppu::UnoType<sal_Int32>::get(), + 0, 0 }, + { u"SeparatorLineVerticalAlignment"_ustr, WID_TXTCOL_LINE_ALIGN, cppu::UnoType<css::style::VerticalAlignment>::get(), 0, 0 }, - { u"SeparatorLineIsOn", WID_TXTCOL_LINE_IS_ON, cppu::UnoType<bool>::get(), 0, 0 }, - { u"SeparatorLineStyle", WID_TXTCOL_LINE_STYLE, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { u"SeparatorLineIsOn"_ustr, WID_TXTCOL_LINE_IS_ON, cppu::UnoType<bool>::get(), 0, 0 }, + { u"SeparatorLineStyle"_ustr, WID_TXTCOL_LINE_STYLE, cppu::UnoType<sal_Int16>::get(), 0, 0 }, }; class SvxXTextColumns final diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 105ed7a2d60e..13c375f7f040 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -70,8 +70,8 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxShapePropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"UserDefinedAttributes"_ustr, SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes"_ustr, EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, }; return aShapePropertyMap_Impl; @@ -94,8 +94,8 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxTextShapePropertyMap( TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"UserDefinedAttributes"_ustr, SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes"_ustr, EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, }; return aTextShapePropertyMap_Impl; @@ -119,8 +119,8 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxConnectorPropertyMap( TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"UserDefinedAttributes"_ustr, SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes"_ustr, EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, }; return aConnectorPropertyMap_Impl; @@ -144,8 +144,8 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxDimensioningPropertyM TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"UserDefinedAttributes"_ustr, SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes"_ustr, EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, }; return aDimensioningPropertyMap_Impl; @@ -169,8 +169,8 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxCirclePropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"UserDefinedAttributes"_ustr, SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes"_ustr, EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, }; return aCirclePropertyMap_Impl; @@ -180,7 +180,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxPolyPolygonPropertyMa { static SfxItemPropertyMapEntry const aPolyPolygonPropertyMap_Impl[] = { - { u"Geometry", OWN_ATTR_BASE_GEOMETRY, cppu::UnoType<css::drawing::PointSequenceSequence>::get(), 0, 0 }, + { u"Geometry"_ustr, OWN_ATTR_BASE_GEOMETRY, cppu::UnoType<css::drawing::PointSequenceSequence>::get(), 0, 0 }, SPECIAL_POLYGON_PROPERTIES SPECIAL_POLYPOLYGON_PROPERTIES SPECIAL_POLYPOLYGONBEZIER_PROPERTIES @@ -196,8 +196,8 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxPolyPolygonPropertyMa TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"UserDefinedAttributes"_ustr, SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes"_ustr, EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, }; return aPolyPolygonPropertyMap_Impl; @@ -226,10 +226,10 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxGraphicObjectProperty TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - { u"IsMirrored", OWN_ATTR_MIRRORED, cppu::UnoType<bool>::get(), 0, 0}, - { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"GraphicStream", OWN_ATTR_GRAPHIC_STREAM, cppu::UnoType<css::io::XInputStream>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"IsMirrored"_ustr, OWN_ATTR_MIRRORED, cppu::UnoType<bool>::get(), 0, 0}, + { u"UserDefinedAttributes"_ustr, SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes"_ustr, EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"GraphicStream"_ustr, OWN_ATTR_GRAPHIC_STREAM, cppu::UnoType<css::io::XInputStream>::get(), css::beans::PropertyAttribute::READONLY, 0}, }; return aGraphicObjectPropertyMap_Impl; @@ -265,8 +265,8 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvx3DCubeObjectPropertyM MISC_OBJ_PROPERTIES LINKTARGET_PROPERTIES SHADOW_PROPERTIES - { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"UserDefinedAttributes"_ustr, SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes"_ustr, EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, }; return a3DCubeObjectPropertyMap_Impl; @@ -285,8 +285,8 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvx3DSphereObjectPropert MISC_OBJ_PROPERTIES LINKTARGET_PROPERTIES SHADOW_PROPERTIES - { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"UserDefinedAttributes"_ustr, SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes"_ustr, EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, }; return a3DSphereObjectPropertyMap_Impl; } @@ -309,8 +309,8 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvx3DLatheObjectProperty MISC_OBJ_PROPERTIES LINKTARGET_PROPERTIES SHADOW_PROPERTIES - { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"UserDefinedAttributes"_ustr, SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes"_ustr, EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, }; return a3DLatheObjectPropertyMap_Impl; @@ -334,8 +334,8 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvx3DExtrudeObjectProper MISC_OBJ_PROPERTIES LINKTARGET_PROPERTIES SHADOW_PROPERTIES - { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"UserDefinedAttributes"_ustr, SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes"_ustr, EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, }; return a3DExtrudeObjectPropertyMap_Impl; @@ -354,8 +354,8 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvx3DPolygonObjectProper MISC_OBJ_PROPERTIES LINKTARGET_PROPERTIES SHADOW_PROPERTIES - { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"UserDefinedAttributes"_ustr, SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes"_ustr, EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, }; return a3DPolygonObjectPropertyMap_Impl; @@ -397,8 +397,8 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxAllPropertyMap() SPECIAL_3DBACKSCALE_PROPERTIES SPECIAL_3DPOLYGONOBJECT_PROPERTIES - { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"UserDefinedAttributes"_ustr, SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes"_ustr, EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, }; return aAllPropertyMap_Impl; @@ -433,17 +433,17 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxOle2PropertyMap() TEXT_PROPERTIES FONTWORK_PROPERTIES - { u"ThumbnailGraphic", OWN_ATTR_THUMBNAIL , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 }, - { u"Model", OWN_ATTR_OLEMODEL , cppu::UnoType<css::frame::XModel>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { u"EmbeddedObject", OWN_ATTR_OLE_EMBEDDED_OBJECT, cppu::UnoType<css::embed::XEmbeddedObject>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { u"EmbeddedObjectNoNewClient",OWN_ATTR_OLE_EMBEDDED_OBJECT_NONEWCLIENT, cppu::UnoType<css::embed::XEmbeddedObject>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { u"OriginalSize", OWN_ATTR_OLESIZE , cppu::UnoType<css::awt::Size>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { u"CLSID", OWN_ATTR_CLSID , cppu::UnoType<OUString>::get(), 0, 0 }, - { u"IsInternal", OWN_ATTR_INTERNAL_OLE , cppu::UnoType<bool>::get() , css::beans::PropertyAttribute::READONLY, 0}, - { u"VisibleArea", OWN_ATTR_OLE_VISAREA , cppu::UnoType<css::awt::Rectangle>::get(), 0, 0}, - { u"Aspect", OWN_ATTR_OLE_ASPECT , cppu::UnoType<sal_Int64>::get(), 0, 0}, + { u"ThumbnailGraphic"_ustr, OWN_ATTR_THUMBNAIL , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 }, + { u"Model"_ustr, OWN_ATTR_OLEMODEL , cppu::UnoType<css::frame::XModel>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"EmbeddedObject"_ustr, OWN_ATTR_OLE_EMBEDDED_OBJECT, cppu::UnoType<css::embed::XEmbeddedObject>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"EmbeddedObjectNoNewClient"_ustr,OWN_ATTR_OLE_EMBEDDED_OBJECT_NONEWCLIENT, cppu::UnoType<css::embed::XEmbeddedObject>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"OriginalSize"_ustr, OWN_ATTR_OLESIZE , cppu::UnoType<css::awt::Size>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"CLSID"_ustr, OWN_ATTR_CLSID , cppu::UnoType<OUString>::get(), 0, 0 }, + { u"IsInternal"_ustr, OWN_ATTR_INTERNAL_OLE , cppu::UnoType<bool>::get() , css::beans::PropertyAttribute::READONLY, 0}, + { u"VisibleArea"_ustr, OWN_ATTR_OLE_VISAREA , cppu::UnoType<css::awt::Rectangle>::get(), 0, 0}, + { u"Aspect"_ustr, OWN_ATTR_OLE_ASPECT , cppu::UnoType<sal_Int64>::get(), 0, 0}, { UNO_NAME_OLE2_PERSISTNAME, OWN_ATTR_PERSISTNAME , cppu::UnoType<OUString>::get(), 0, 0 }, - { u"LinkURL", OWN_ATTR_OLE_LINKURL , cppu::UnoType<OUString>::get(), 0, 0 }, + { u"LinkURL"_ustr, OWN_ATTR_OLE_LINKURL , cppu::UnoType<OUString>::get(), 0, 0 }, { UNO_NAME_GRAPHOBJ_GRAPHIC, OWN_ATTR_VALUE_GRAPHIC , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0}, }; @@ -454,28 +454,28 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxPluginPropertyMap() { static SfxItemPropertyMapEntry const aPluginPropertyMap_Impl[] = { - { u"PluginMimeType", OWN_ATTR_PLUGIN_MIMETYPE , cppu::UnoType<OUString>::get(), 0, 0}, - { u"PluginURL", OWN_ATTR_PLUGIN_URL , cppu::UnoType<OUString>::get(), 0, 0}, - { u"PluginCommands", OWN_ATTR_PLUGIN_COMMANDS , cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(), 0, 0}, - { u"Transformation", OWN_ATTR_TRANSFORMATION , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, + { u"PluginMimeType"_ustr, OWN_ATTR_PLUGIN_MIMETYPE , cppu::UnoType<OUString>::get(), 0, 0}, + { u"PluginURL"_ustr, OWN_ATTR_PLUGIN_URL , cppu::UnoType<OUString>::get(), 0, 0}, + { u"PluginCommands"_ustr, OWN_ATTR_PLUGIN_COMMANDS , cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(), 0, 0}, + { u"Transformation"_ustr, OWN_ATTR_TRANSFORMATION , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, { UNO_NAME_MISC_OBJ_ZORDER, OWN_ATTR_ZORDER , cppu::UnoType<sal_Int32>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_LAYERID, SDRATTR_LAYERID , cppu::UnoType<sal_Int16>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME , cppu::UnoType<OUString>::get(), 0, 0}, { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0}, { UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, { UNO_NAME_OLE2_METAFILE, OWN_ATTR_METAFILE , cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { u"ThumbnailGraphic", OWN_ATTR_THUMBNAIL , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 }, + { u"ThumbnailGraphic"_ustr, OWN_ATTR_THUMBNAIL , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 }, { UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0}, { UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0}, { UNO_NAME_OLE2_PERSISTNAME, OWN_ATTR_PERSISTNAME , cppu::UnoType<OUString>::get(), 0, 0 }, - { u"LinkURL", OWN_ATTR_OLE_LINKURL , cppu::UnoType<OUString>::get(), 0, 0 }, + { u"LinkURL"_ustr, OWN_ATTR_OLE_LINKURL , cppu::UnoType<OUString>::get(), 0, 0 }, { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { u"VisibleArea", OWN_ATTR_OLE_VISAREA , cppu::UnoType<css::awt::Rectangle>::get(), 0, 0}, - { u"UINameSingular", OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"VisibleArea"_ustr, OWN_ATTR_OLE_VISAREA , cppu::UnoType<css::awt::Rectangle>::get(), 0, 0}, + { u"UINameSingular"_ustr, OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, // #i68101# { UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, - { u"Decorative", OWN_ATTR_MISC_OBJ_DECORATIVE, ::cppu::UnoType<bool>::get(), 0, 0 }, + { u"Decorative"_ustr, OWN_ATTR_MISC_OBJ_DECORATIVE, ::cppu::UnoType<bool>::get(), 0, 0 }, }; return aPluginPropertyMap_Impl; @@ -486,31 +486,31 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxFramePropertyMap() //TODO/LATER: new properties for ScrollingMode and DefaultBorder static SfxItemPropertyMapEntry const aFramePropertyMap_Impl[] = { - { u"FrameURL", OWN_ATTR_FRAME_URL , cppu::UnoType<OUString>::get(), 0, 0}, - { u"FrameName", OWN_ATTR_FRAME_NAME , cppu::UnoType<OUString>::get(), 0, 0}, - { u"FrameIsAutoScroll", OWN_ATTR_FRAME_ISAUTOSCROLL , cppu::UnoType<bool>::get() , css::beans::PropertyAttribute::MAYBEVOID, 0}, - { u"FrameIsBorder", OWN_ATTR_FRAME_ISBORDER , cppu::UnoType<bool>::get() , 0, 0}, - { u"FrameMarginWidth", OWN_ATTR_FRAME_MARGIN_WIDTH , cppu::UnoType<sal_Int32>::get(), 0, 0}, - { u"FrameMarginHeight", OWN_ATTR_FRAME_MARGIN_HEIGHT, cppu::UnoType<sal_Int32>::get(), 0, 0}, - { u"Transformation", OWN_ATTR_TRANSFORMATION , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, + { u"FrameURL"_ustr, OWN_ATTR_FRAME_URL , cppu::UnoType<OUString>::get(), 0, 0}, + { u"FrameName"_ustr, OWN_ATTR_FRAME_NAME , cppu::UnoType<OUString>::get(), 0, 0}, + { u"FrameIsAutoScroll"_ustr, OWN_ATTR_FRAME_ISAUTOSCROLL , cppu::UnoType<bool>::get() , css::beans::PropertyAttribute::MAYBEVOID, 0}, + { u"FrameIsBorder"_ustr, OWN_ATTR_FRAME_ISBORDER , cppu::UnoType<bool>::get() , 0, 0}, + { u"FrameMarginWidth"_ustr, OWN_ATTR_FRAME_MARGIN_WIDTH , cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"FrameMarginHeight"_ustr, OWN_ATTR_FRAME_MARGIN_HEIGHT, cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"Transformation"_ustr, OWN_ATTR_TRANSFORMATION , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, { UNO_NAME_MISC_OBJ_ZORDER, OWN_ATTR_ZORDER , cppu::UnoType<sal_Int32>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_LAYERID, SDRATTR_LAYERID , cppu::UnoType<sal_Int16>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME , cppu::UnoType<OUString>::get(), 0, 0}, { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0}, { UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, { UNO_NAME_OLE2_METAFILE, OWN_ATTR_METAFILE , cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { u"ThumbnailGraphic", OWN_ATTR_THUMBNAIL , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 }, + { u"ThumbnailGraphic"_ustr, OWN_ATTR_THUMBNAIL , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 }, { UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0}, { UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0}, { UNO_NAME_OLE2_PERSISTNAME, OWN_ATTR_PERSISTNAME , cppu::UnoType<OUString>::get(), 0, 0 }, - { u"LinkURL", OWN_ATTR_OLE_LINKURL , cppu::UnoType<OUString>::get(), 0, 0 }, + { u"LinkURL"_ustr, OWN_ATTR_OLE_LINKURL , cppu::UnoType<OUString>::get(), 0, 0 }, { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { u"VisibleArea", OWN_ATTR_OLE_VISAREA , cppu::UnoType<css::awt::Rectangle>::get(), 0, 0}, - { u"UINameSingular", OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"VisibleArea"_ustr, OWN_ATTR_OLE_VISAREA , cppu::UnoType<css::awt::Rectangle>::get(), 0, 0}, + { u"UINameSingular"_ustr, OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, // #i68101# { UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, - { u"Decorative", OWN_ATTR_MISC_OBJ_DECORATIVE, ::cppu::UnoType<bool>::get(), 0, 0 }, + { u"Decorative"_ustr, OWN_ATTR_MISC_OBJ_DECORATIVE, ::cppu::UnoType<bool>::get(), 0, 0 }, }; return aFramePropertyMap_Impl; @@ -520,31 +520,31 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxAppletPropertyMap() { static SfxItemPropertyMapEntry const aAppletPropertyMap_Impl[] = { - { u"AppletCodeBase", OWN_ATTR_APPLET_CODEBASE , cppu::UnoType<OUString>::get(), 0, 0}, - { u"AppletName", OWN_ATTR_APPLET_NAME , cppu::UnoType<OUString>::get(), 0, 0}, - { u"AppletCode", OWN_ATTR_APPLET_CODE , cppu::UnoType<OUString>::get(), 0, 0}, - { u"AppletCommands", OWN_ATTR_APPLET_COMMANDS , cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(), 0, 0}, - { u"AppletDocBase", OWN_ATTR_APPLET_DOCBASE , cppu::UnoType<OUString>::get(), 0, 0}, - { u"AppletIsScript", OWN_ATTR_APPLET_ISSCRIPT , cppu::UnoType<bool>::get(), 0, 0 }, - { u"Transformation", OWN_ATTR_TRANSFORMATION , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, + { u"AppletCodeBase"_ustr, OWN_ATTR_APPLET_CODEBASE , cppu::UnoType<OUString>::get(), 0, 0}, + { u"AppletName"_ustr, OWN_ATTR_APPLET_NAME , cppu::UnoType<OUString>::get(), 0, 0}, + { u"AppletCode"_ustr, OWN_ATTR_APPLET_CODE , cppu::UnoType<OUString>::get(), 0, 0}, + { u"AppletCommands"_ustr, OWN_ATTR_APPLET_COMMANDS , cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(), 0, 0}, + { u"AppletDocBase"_ustr, OWN_ATTR_APPLET_DOCBASE , cppu::UnoType<OUString>::get(), 0, 0}, + { u"AppletIsScript"_ustr, OWN_ATTR_APPLET_ISSCRIPT , cppu::UnoType<bool>::get(), 0, 0 }, + { u"Transformation"_ustr, OWN_ATTR_TRANSFORMATION , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, { UNO_NAME_MISC_OBJ_ZORDER, OWN_ATTR_ZORDER , cppu::UnoType<sal_Int32>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_LAYERID, SDRATTR_LAYERID , cppu::UnoType<sal_Int16>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME , cppu::UnoType<OUString>::get(), 0, 0}, { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0}, { UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, { UNO_NAME_OLE2_METAFILE, OWN_ATTR_METAFILE , cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { u"ThumbnailGraphic", OWN_ATTR_THUMBNAIL , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 }, + { u"ThumbnailGraphic"_ustr, OWN_ATTR_THUMBNAIL , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 }, { UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0}, { UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0}, { UNO_NAME_OLE2_PERSISTNAME, OWN_ATTR_PERSISTNAME , cppu::UnoType<OUString>::get(), 0, 0 }, - { u"LinkURL", OWN_ATTR_OLE_LINKURL , cppu::UnoType<OUString>::get(), 0, 0 }, + { u"LinkURL"_ustr, OWN_ATTR_OLE_LINKURL , cppu::UnoType<OUString>::get(), 0, 0 }, { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { u"VisibleArea", OWN_ATTR_OLE_VISAREA , cppu::UnoType<css::awt::Rectangle>::get(), 0, 0}, - { u"UINameSingular", OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"VisibleArea"_ustr, OWN_ATTR_OLE_VISAREA , cppu::UnoType<css::awt::Rectangle>::get(), 0, 0}, + { u"UINameSingular"_ustr, OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, // #i68101# { UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, - { u"Decorative", OWN_ATTR_MISC_OBJ_DECORATIVE, ::cppu::UnoType<bool>::get(), 0, 0 }, + { u"Decorative"_ustr, OWN_ATTR_MISC_OBJ_DECORATIVE, ::cppu::UnoType<bool>::get(), 0, 0 }, }; return aAppletPropertyMap_Impl; @@ -570,41 +570,41 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxControlShapePropertyM { UNO_NAME_EDIT_CHAR_COLOR_THEME, 0, cppu::UnoType<sal_Int16>::get(), 0, MID_COLOR_THEME_INDEX }, { UNO_NAME_EDIT_CHAR_COLOR_TINT_OR_SHADE, 0, cppu::UnoType<sal_Int16>::get(), 0, MID_COLOR_TINT_OR_SHADE }, { UNO_NAME_EDIT_CHAR_COMPLEX_COLOR, 0, cppu::UnoType<css::util::XComplexColor>::get(), 0, MID_COMPLEX_COLOR }, - { u"CharBackColor", 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { u"CharBackTransparent", 0, cppu::UnoType<bool>::get(), 0, 0 }, - { u"CharRelief", 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { u"CharUnderlineColor", 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { u"CharKerning", 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { u"CharWordMode", 0, cppu::UnoType<bool>::get(), 0, 0 }, + { u"CharBackColor"_ustr, 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { u"CharBackTransparent"_ustr, 0, cppu::UnoType<bool>::get(), 0, 0 }, + { u"CharRelief"_ustr, 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { u"CharUnderlineColor"_ustr, 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { u"CharKerning"_ustr, 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { u"CharWordMode"_ustr, 0, cppu::UnoType<bool>::get(), 0, 0 }, { UNO_NAME_EDIT_PARA_ADJUST, 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { u"TextVerticalAdjust", 0, cppu::UnoType<TextVerticalAdjust>::get(), MAYBEVOID, 0 }, - { u"ControlBackground", 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { u"ControlBorder", 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { u"ControlBorderColor", 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { u"ControlSymbolColor", 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { u"ImageScaleMode", 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { u"TextVerticalAdjust"_ustr, 0, cppu::UnoType<TextVerticalAdjust>::get(), MAYBEVOID, 0 }, + { u"ControlBackground"_ustr, 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { u"ControlBorder"_ustr, 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { u"ControlBorderColor"_ustr, 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { u"ControlSymbolColor"_ustr, 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { u"ImageScaleMode"_ustr, 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, { UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0}, { UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0}, - { u"ControlTextEmphasis", 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { u"ControlWritingMode", 0, cppu::UnoType< sal_Int16 >::get(), 0, 0}, + { u"ControlTextEmphasis"_ustr, 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { u"ControlWritingMode"_ustr, 0, cppu::UnoType< sal_Int16 >::get(), 0, 0}, // the following properties are handled by SvxShape - { u"Transformation", OWN_ATTR_TRANSFORMATION , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, + { u"Transformation"_ustr, OWN_ATTR_TRANSFORMATION , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, { UNO_NAME_MISC_OBJ_ZORDER, OWN_ATTR_ZORDER , cppu::UnoType<sal_Int32>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_LAYERID, SDRATTR_LAYERID , cppu::UnoType<sal_Int16>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME , cppu::UnoType<OUString>::get(), 0, 0}, { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0}, { UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - {u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"UserDefinedAttributes"_ustr, SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + {u"ParaUserDefinedAttributes"_ustr, EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { u"UINameSingular", OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"UINameSingular"_ustr, OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, // #i68101# { UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, - { u"Decorative", OWN_ATTR_MISC_OBJ_DECORATIVE, ::cppu::UnoType<bool>::get(), 0, 0 }, + { u"Decorative"_ustr, OWN_ATTR_MISC_OBJ_DECORATIVE, ::cppu::UnoType<bool>::get(), 0, 0 }, // #i112587# { UNO_NAME_MISC_OBJ_PRINTABLE, SDRATTR_OBJPRINTABLE , cppu::UnoType<bool>::get(), 0, 0}, - { u"Visible", SDRATTR_OBJVISIBLE , cppu::UnoType<bool>::get(), 0, 0}, + { u"Visible"_ustr, SDRATTR_OBJVISIBLE , cppu::UnoType<bool>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_INTEROPGRABBAG, OWN_ATTR_INTEROPGRABBAG, cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(), 0, 0}, }; @@ -615,8 +615,8 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxPageShapePropertyMap( { static SfxItemPropertyMapEntry const aPageShapePropertyMap_Impl[] = { - { u"PageNumber", OWN_ATTR_PAGE_NUMBER , cppu::UnoType<sal_Int32>::get(), 0, 0}, - { u"Transformation", OWN_ATTR_TRANSFORMATION , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, + { u"PageNumber"_ustr, OWN_ATTR_PAGE_NUMBER , cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"Transformation"_ustr, OWN_ATTR_TRANSFORMATION , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, { UNO_NAME_MISC_OBJ_ZORDER, OWN_ATTR_ZORDER , cppu::UnoType<sal_Int32>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_LAYERID, SDRATTR_LAYERID , cppu::UnoType<sal_Int16>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME , cppu::UnoType<OUString>::get(), 0, 0}, @@ -628,7 +628,7 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxPageShapePropertyMap( // #i68101# { UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, - { u"Decorative", OWN_ATTR_MISC_OBJ_DECORATIVE, ::cppu::UnoType<bool>::get(), 0, 0 }, + { u"Decorative"_ustr, OWN_ATTR_MISC_OBJ_DECORATIVE, ::cppu::UnoType<bool>::get(), 0, 0 }, }; return aPageShapePropertyMap_Impl; @@ -638,17 +638,17 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxCaptionPropertyMap() { static SfxItemPropertyMapEntry const aCaptionPropertyMap_Impl[] = { - { u"CaptionPoint", OWN_ATTR_CAPTION_POINT, cppu::UnoType<css::awt::Point>::get(), 0, 0 }, - { u"CaptionType", SDRATTR_CAPTIONTYPE, cppu::UnoType<sal_Int16>::get(), 0, 0}, - { u"CaptionIsFixedAngle", SDRATTR_CAPTIONFIXEDANGLE, cppu::UnoType<bool>::get(), 0, 0}, - { u"CaptionAngle", SDRATTR_CAPTIONANGLE, cppu::UnoType<sal_Int32>::get(), 0, 0}, - { u"CaptionGap", SDRATTR_CAPTIONGAP, cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, - { u"CaptionEscapeDirection", SDRATTR_CAPTIONESCDIR, cppu::UnoType<sal_Int32>::get(), 0, 0}, - { u"CaptionIsEscapeRelative", SDRATTR_CAPTIONESCISREL, cppu::UnoType<bool>::get(), 0, 0}, - { u"CaptionEscapeRelative", SDRATTR_CAPTIONESCREL, cppu::UnoType<sal_Int32>::get(), 0, 0}, - { u"CaptionEscapeAbsolute", SDRATTR_CAPTIONESCABS, cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, - { u"CaptionLineLength", SDRATTR_CAPTIONLINELEN, cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, - { u"CaptionIsFitLineLength", SDRATTR_CAPTIONFITLINELEN, cppu::UnoType<bool>::get(), 0, 0}, + { u"CaptionPoint"_ustr, OWN_ATTR_CAPTION_POINT, cppu::UnoType<css::awt::Point>::get(), 0, 0 }, + { u"CaptionType"_ustr, SDRATTR_CAPTIONTYPE, cppu::UnoType<sal_Int16>::get(), 0, 0}, + { u"CaptionIsFixedAngle"_ustr, SDRATTR_CAPTIONFIXEDANGLE, cppu::UnoType<bool>::get(), 0, 0}, + { u"CaptionAngle"_ustr, SDRATTR_CAPTIONANGLE, cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"CaptionGap"_ustr, SDRATTR_CAPTIONGAP, cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, + { u"CaptionEscapeDirection"_ustr, SDRATTR_CAPTIONESCDIR, cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"CaptionIsEscapeRelative"_ustr, SDRATTR_CAPTIONESCISREL, cppu::UnoType<bool>::get(), 0, 0}, + { u"CaptionEscapeRelative"_ustr, SDRATTR_CAPTIONESCREL, cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"CaptionEscapeAbsolute"_ustr, SDRATTR_CAPTIONESCABS, cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, + { u"CaptionLineLength"_ustr, SDRATTR_CAPTIONLINELEN, cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, + { u"CaptionIsFitLineLength"_ustr, SDRATTR_CAPTIONFITLINELEN, cppu::UnoType<bool>::get(), 0, 0}, EDGERADIUS_PROPERTIES FILL_PROPERTIES LINE_PROPERTIES @@ -660,8 +660,8 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxCaptionPropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - {u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"UserDefinedAttributes"_ustr, SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + {u"ParaUserDefinedAttributes"_ustr, EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, }; return aCaptionPropertyMap_Impl; @@ -671,9 +671,9 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxCustomShapePropertyMa { static SfxItemPropertyMapEntry const aCustomShapePropertyMap_Impl[] = { - { u"CustomShapeEngine", SDRATTR_CUSTOMSHAPE_ENGINE, cppu::UnoType<OUString>::get(), 0, 0 }, - { u"CustomShapeData", SDRATTR_CUSTOMSHAPE_DATA, cppu::UnoType<OUString>::get(), 0, 0 }, - { u"CustomShapeGeometry", SDRATTR_CUSTOMSHAPE_GEOMETRY, + { u"CustomShapeEngine"_ustr, SDRATTR_CUSTOMSHAPE_ENGINE, cppu::UnoType<OUString>::get(), 0, 0 }, + { u"CustomShapeData"_ustr, SDRATTR_CUSTOMSHAPE_DATA, cppu::UnoType<OUString>::get(), 0, 0 }, + { u"CustomShapeGeometry"_ustr, SDRATTR_CUSTOMSHAPE_GEOMETRY, cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(), 0, 0 }, FILL_PROPERTIES LINE_PROPERTIES @@ -685,8 +685,8 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxCustomShapePropertyMa SOFTEDGE_PROPERTIES SHADOW_PROPERTIES TEXT_PROPERTIES - {u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - {u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + {u"UserDefinedAttributes"_ustr, SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + {u"ParaUserDefinedAttributes"_ustr, EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, }; return aCustomShapePropertyMap_Impl; } @@ -700,25 +700,25 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxMediaShapePropertyMap { UNO_NAME_MISC_OBJ_LAYERNAME, SDRATTR_LAYERNAME, cppu::UnoType<OUString>::get(), 0, 0}, { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP, cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0}, { UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { u"Transformation", OWN_ATTR_TRANSFORMATION, cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, - { u"MediaURL", OWN_ATTR_MEDIA_URL, cppu::UnoType<OUString>::get(), 0, 0}, - { u"PreferredSize", OWN_ATTR_MEDIA_PREFERREDSIZE, cppu::UnoType<css::awt::Size>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { u"Loop", OWN_ATTR_MEDIA_LOOP, cppu::UnoType<sal_Bool>::get(), 0, 0}, - { u"Mute", OWN_ATTR_MEDIA_MUTE, cppu::UnoType<sal_Bool>::get(), 0, 0}, - { u"VolumeDB", OWN_ATTR_MEDIA_VOLUMEDB, cppu::UnoType<sal_Int16>::get(), 0, 0}, - { u"Zoom", OWN_ATTR_MEDIA_ZOOM, cppu::UnoType<css::media::ZoomLevel>::get(), 0, 0}, + { u"Transformation"_ustr, OWN_ATTR_TRANSFORMATION, cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, + { u"MediaURL"_ustr, OWN_ATTR_MEDIA_URL, cppu::UnoType<OUString>::get(), 0, 0}, + { u"PreferredSize"_ustr, OWN_ATTR_MEDIA_PREFERREDSIZE, cppu::UnoType<css::awt::Size>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"Loop"_ustr, OWN_ATTR_MEDIA_LOOP, cppu::UnoType<sal_Bool>::get(), 0, 0}, + { u"Mute"_ustr, OWN_ATTR_MEDIA_MUTE, cppu::UnoType<sal_Bool>::get(), 0, 0}, + { u"VolumeDB"_ustr, OWN_ATTR_MEDIA_VOLUMEDB, cppu::UnoType<sal_Int16>::get(), 0, 0}, + { u"Zoom"_ustr, OWN_ATTR_MEDIA_ZOOM, cppu::UnoType<css::media::ZoomLevel>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0}, { UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0}, { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { u"UINameSingular", OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"UINameSingular"_ustr, OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, // #i68101# { UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, - { u"Decorative", OWN_ATTR_MISC_OBJ_DECORATIVE, ::cppu::UnoType<bool>::get(), 0, 0 }, - {u"PrivateStream", OWN_ATTR_MEDIA_STREAM, cppu::UnoType<css::io::XInputStream>::get(), 0, 0}, - {u"PrivateTempFileURL", OWN_ATTR_MEDIA_TEMPFILEURL, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { u"MediaMimeType", OWN_ATTR_MEDIA_MIMETYPE, cppu::UnoType<OUString>::get(), 0, 0}, - { u"FallbackGraphic", OWN_ATTR_FALLBACK_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"Decorative"_ustr, OWN_ATTR_MISC_OBJ_DECORATIVE, ::cppu::UnoType<bool>::get(), 0, 0 }, + {u"PrivateStream"_ustr, OWN_ATTR_MEDIA_STREAM, cppu::UnoType<css::io::XInputStream>::get(), 0, 0}, + {u"PrivateTempFileURL"_ustr, OWN_ATTR_MEDIA_TEMPFILEURL, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"MediaMimeType"_ustr, OWN_ATTR_MEDIA_MIMETYPE, cppu::UnoType<OUString>::get(), 0, 0}, + { u"FallbackGraphic"_ustr, OWN_ATTR_FALLBACK_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), css::beans::PropertyAttribute::READONLY, 0}, { UNO_NAME_GRAPHOBJ_GRAPHIC, OWN_ATTR_VALUE_GRAPHIC , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0}, { UNO_NAME_GRAPHIC_GRAPHICCROP, SDRATTR_GRAFCROP , cppu::UnoType<css::text::GraphicCrop>::get(), 0, 0}, }; @@ -736,24 +736,24 @@ static o3tl::span<SfxItemPropertyMapEntry const> ImplGetSvxTableShapePropertyMap { UNO_NAME_MISC_OBJ_LAYERNAME, SDRATTR_LAYERNAME, cppu::UnoType<OUString>::get(), 0, 0}, { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP, cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0}, { UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { u"Transformation", OWN_ATTR_TRANSFORMATION, cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, + { u"Transformation"_ustr, OWN_ATTR_TRANSFORMATION, cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, { UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0}, { UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0}, { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0}, { UNO_NAME_MISC_OBJ_NAME, SDRATTR_OBJECTNAME, cppu::UnoType<OUString>::get(), 0, 0}, - { u"UINameSingular", OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"UINameSingular"_ustr, OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, { UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, { UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, - { u"Decorative", OWN_ATTR_MISC_OBJ_DECORATIVE, ::cppu::UnoType<bool>::get(), 0, 0 }, - { u"Model", OWN_ATTR_OLEMODEL , cppu::UnoType<css::table::XTable>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { u"TableTemplate", OWN_ATTR_TABLETEMPLATE , cppu::UnoType<css::container::XIndexAccess>::get(), 0, 0}, - { u"UseFirstRowStyle", OWN_ATTR_TABLETEMPLATE_FIRSTROW, cppu::UnoType<bool>::get(),0, 0}, - { u"UseLastRowStyle", OWN_ATTR_TABLETEMPLATE_LASTROW, cppu::UnoType<bool>::get(),0, 0}, - { u"UseFirstColumnStyle", OWN_ATTR_TABLETEMPLATE_FIRSTCOLUMN, cppu::UnoType<bool>::get(),0, 0}, - { u"UseLastColumnStyle", OWN_ATTR_TABLETEMPLATE_LASTCOLUMN, cppu::UnoType<bool>::get(),0, 0}, - { u"UseBandingRowStyle", OWN_ATTR_TABLETEMPLATE_BANDINGROWS, cppu::UnoType<bool>::get(),0, 0}, - { u"UseBandingColumnStyle", OWN_ATTR_TABLETEMPLATE_BANDINGCOLUMNS, cppu::UnoType<bool>::get(),0, 0}, - { u"ReplacementGraphic", OWN_ATTR_REPLACEMENT_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"Decorative"_ustr, OWN_ATTR_MISC_OBJ_DECORATIVE, ::cppu::UnoType<bool>::get(), 0, 0 }, + { u"Model"_ustr, OWN_ATTR_OLEMODEL , cppu::UnoType<css::table::XTable>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"TableTemplate"_ustr, OWN_ATTR_TABLETEMPLATE , cppu::UnoType<css::container::XIndexAccess>::get(), 0, 0}, + { u"UseFirstRowStyle"_ustr, OWN_ATTR_TABLETEMPLATE_FIRSTROW, cppu::UnoType<bool>::get(),0, 0}, + { u"UseLastRowStyle"_ustr, OWN_ATTR_TABLETEMPLATE_LASTROW, cppu::UnoType<bool>::get(),0, 0}, + { u"UseFirstColumnStyle"_ustr, OWN_ATTR_TABLETEMPLATE_FIRSTCOLUMN, cppu::UnoType<bool>::get(),0, 0}, + { u"UseLastColumnStyle"_ustr, OWN_ATTR_TABLETEMPLATE_LASTCOLUMN, cppu::UnoType<bool>::get(),0, 0}, + { u"UseBandingRowStyle"_ustr, OWN_ATTR_TABLETEMPLATE_BANDINGROWS, cppu::UnoType<bool>::get(),0, 0}, + { u"UseBandingColumnStyle"_ustr, OWN_ATTR_TABLETEMPLATE_BANDINGCOLUMNS, cppu::UnoType<bool>::get(),0, 0}, + { u"ReplacementGraphic"_ustr, OWN_ATTR_REPLACEMENT_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), css::beans::PropertyAttribute::READONLY, 0}, }; return aTableShapePropertyMap_Impl; diff --git a/sw/qa/core/crsr/crsr.cxx b/sw/qa/core/crsr/crsr.cxx index bf2a504b3304..72d271638d09 100644 --- a/sw/qa/core/crsr/crsr.cxx +++ b/sw/qa/core/crsr/crsr.cxx @@ -48,7 +48,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreCrsrTest, testFindReplace) xText->insertString(xText->getEnd(), "foo xxx", /*bAbsorb=*/false); xText->insertControlCharacter(xText->getEnd(), text::ControlCharacter::PARAGRAPH_BREAK, /*bAbsorb=*/false); - xText->insertString(xText->getEnd(), OUString(u"foo xxx \xad after"), /*bAbsorb=*/false); + xText->insertString(xText->getEnd(), u"foo xxx \xad after"_ustr, /*bAbsorb=*/false); uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY); uno::Reference<text::XTextViewCursorSupplier> xTextViewCursorSupplier( xModel->getCurrentController(), uno::UNO_QUERY); @@ -150,7 +150,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreCrsrTest, testContentControlReadOnly) uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY); uno::Reference<text::XText> xText = xTextDocument->getText(); uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor(); - xText->insertString(xCursor, u"☐", /*bAbsorb=*/false); + xText->insertString(xCursor, u"☐"_ustr, /*bAbsorb=*/false); xCursor->gotoStart(/*bExpand=*/false); xCursor->gotoEnd(/*bExpand=*/true); uno::Reference<text::XTextContent> xContentControl( diff --git a/sw/qa/core/text/text.cxx b/sw/qa/core/text/text.cxx index 45198e0aaa9a..16aa73cd9823 100644 --- a/sw/qa/core/text/text.cxx +++ b/sw/qa/core/text/text.cxx @@ -1475,18 +1475,20 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testScriptinfosurrogatePairs) // Without the fix it fails with: // - Expected: 11 // - Actual : 11◌ - assertXPath(pXmlDoc, "//txt[1]/SwParaPortion/SwLineLayout/SwLinePortion[1]", "portion", u"11"); + assertXPath(pXmlDoc, "//txt[1]/SwParaPortion/SwLineLayout/SwLinePortion[1]", "portion", + u"11"_ustr); assertXPath(pXmlDoc, "//txt[1]/SwParaPortion/SwLineLayout/SwLinePortion[2]", "portion", - u"\u25CC\U00010A01"); + u"\u25CC\U00010A01"_ustr); // Without the fix this would crash because we got a lone surrogate that // can’t be converted to UTF-8, but if it were not for that it might fail // with something like: // - Expected: 11 // - Actual : 11𝐀 - assertXPath(pXmlDoc, "//txt[2]/SwParaPortion/SwLineLayout/SwLinePortion[1]", "portion", u"11"); + assertXPath(pXmlDoc, "//txt[2]/SwParaPortion/SwLineLayout/SwLinePortion[1]", "portion", + u"11"_ustr); assertXPath(pXmlDoc, "//txt[2]/SwParaPortion/SwLineLayout/SwLinePortion[2]", "portion", - u"\U0001D400\u064E"); + u"\U0001D400\u064E"_ustr); } CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testTdf112594) @@ -1500,9 +1502,9 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testTdf112594) // - Expected: 11 // - Actual : 11\u202F // (U+020F is a space, so might not be visible) - assertXPath(pXmlDoc, "//SwParaPortion/SwLineLayout/SwLinePortion[1]", "portion", u"11"); + assertXPath(pXmlDoc, "//SwParaPortion/SwLineLayout/SwLinePortion[1]", "portion", u"11"_ustr); assertXPath(pXmlDoc, "//SwParaPortion/SwLineLayout/SwLinePortion[2]", "portion", - u"\u202F\u1824"); + u"\u202F\u1824"_ustr); } CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/qa/core/theme/ThemeTest.cxx b/sw/qa/core/theme/ThemeTest.cxx index fc9ed7be9abe..4be895dd3f06 100644 --- a/sw/qa/core/theme/ThemeTest.cxx +++ b/sw/qa/core/theme/ThemeTest.cxx @@ -339,11 +339,11 @@ CPPUNIT_TEST_FIXTURE(SwCoreThemeTest, testDrawPageThemeExistsDOCX) CPPUNIT_ASSERT(pModel); auto const& pTheme = pModel->getTheme(); CPPUNIT_ASSERT(pTheme); - CPPUNIT_ASSERT_EQUAL(OUString(u"Office Theme"), pTheme->GetName()); + CPPUNIT_ASSERT_EQUAL(u"Office Theme"_ustr, pTheme->GetName()); auto pColorSet = pTheme->getColorSet(); CPPUNIT_ASSERT(pColorSet); - CPPUNIT_ASSERT_EQUAL(OUString(u"Orange"), pColorSet->getName()); + CPPUNIT_ASSERT_EQUAL(u"Orange"_ustr, pColorSet->getName()); CPPUNIT_ASSERT_EQUAL(Color(0xE48312), pTheme->GetColor(model::ThemeColorType::Accent1)); CPPUNIT_ASSERT_EQUAL(Color(0xBD582C), pTheme->GetColor(model::ThemeColorType::Accent2)); @@ -357,18 +357,16 @@ CPPUNIT_TEST_FIXTURE(SwCoreThemeTest, testDrawPageThemeExistsDOCX) CPPUNIT_ASSERT_EQUAL(Color(0xCCDDEA), pTheme->GetColor(model::ThemeColorType::Light2)); model::FontScheme const& rFontScheme = pTheme->getFontScheme(); - CPPUNIT_ASSERT_EQUAL(OUString(u"Calibri Light"), rFontScheme.getMajorLatin().maTypeface); - CPPUNIT_ASSERT_EQUAL(OUString(u"Calibri"), rFontScheme.getMinorLatin().maTypeface); + CPPUNIT_ASSERT_EQUAL(u"Calibri Light"_ustr, rFontScheme.getMajorLatin().maTypeface); + CPPUNIT_ASSERT_EQUAL(u"Calibri"_ustr, rFontScheme.getMinorLatin().maTypeface); CPPUNIT_ASSERT_EQUAL(true, rFontScheme.getMajorAsian().maTypeface.isEmpty()); CPPUNIT_ASSERT_EQUAL(true, rFontScheme.getMinorAsian().maTypeface.isEmpty()); CPPUNIT_ASSERT_EQUAL(true, rFontScheme.getMajorComplex().maTypeface.isEmpty()); CPPUNIT_ASSERT_EQUAL(true, rFontScheme.getMinorComplex().maTypeface.isEmpty()); CPPUNIT_ASSERT_EQUAL(size_t(47), rFontScheme.getMajorSupplementalFontList().size()); CPPUNIT_ASSERT_EQUAL(size_t(47), rFontScheme.getMinorSupplementalFontList().size()); - CPPUNIT_ASSERT_EQUAL(OUString(u"Angsana New"), - rFontScheme.findMajorSupplementalTypeface(u"Thai")); - CPPUNIT_ASSERT_EQUAL(OUString(u"Cordia New"), - rFontScheme.findMinorSupplementalTypeface(u"Thai")); + CPPUNIT_ASSERT_EQUAL(u"Angsana New"_ustr, rFontScheme.findMajorSupplementalTypeface(u"Thai")); + CPPUNIT_ASSERT_EQUAL(u"Cordia New"_ustr, rFontScheme.findMinorSupplementalTypeface(u"Thai")); model::FormatScheme const& rFormatScheme = pTheme->getFormatScheme(); checkFillStyles(rFormatScheme.getFillStyleList()); @@ -387,11 +385,11 @@ CPPUNIT_TEST_FIXTURE(SwCoreThemeTest, testDrawPageThemeExistsODT) CPPUNIT_ASSERT(pModel); auto const& pTheme = pModel->getTheme(); CPPUNIT_ASSERT(pTheme); - CPPUNIT_ASSERT_EQUAL(OUString(u"Office Theme"), pTheme->GetName()); + CPPUNIT_ASSERT_EQUAL(u"Office Theme"_ustr, pTheme->GetName()); auto pColorSet = pTheme->getColorSet(); CPPUNIT_ASSERT(pColorSet); - CPPUNIT_ASSERT_EQUAL(OUString(u"Orange"), pColorSet->getName()); + CPPUNIT_ASSERT_EQUAL(u"Orange"_ustr, pColorSet->getName()); CPPUNIT_ASSERT_EQUAL(Color(0xE48312), pTheme->GetColor(model::ThemeColorType::Accent1)); CPPUNIT_ASSERT_EQUAL(Color(0xBD582C), pTheme->GetColor(model::ThemeColorType::Accent2)); @@ -419,11 +417,11 @@ CPPUNIT_TEST_FIXTURE(SwCoreThemeTest, testThemeChanging) { auto const& pTheme = pModel->getTheme(); CPPUNIT_ASSERT(pTheme); - CPPUNIT_ASSERT_EQUAL(OUString(u"Office Theme"), pTheme->GetName()); + CPPUNIT_ASSERT_EQUAL(u"Office Theme"_ustr, pTheme->GetName()); auto pColorSet = pTheme->getColorSet(); CPPUNIT_ASSERT(pColorSet); - CPPUNIT_ASSERT_EQUAL(OUString(u"Orange"), pColorSet->getName()); + CPPUNIT_ASSERT_EQUAL(u"Orange"_ustr, pColorSet->getName()); CPPUNIT_ASSERT_EQUAL(Color(0xE48312), pTheme->GetColor(model::ThemeColorType::Accent1)); } @@ -432,7 +430,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreThemeTest, testThemeChanging) auto const& rColorSets = svx::ColorSets::get(); auto pNewColorSet = std::make_shared<model::ColorSet>(rColorSets.getColorSet(0)); // check that the theme colors are as expected - CPPUNIT_ASSERT_EQUAL(OUString(u"LibreOffice"), pNewColorSet->getName()); + CPPUNIT_ASSERT_EQUAL(u"LibreOffice"_ustr, pNewColorSet->getName()); sw::ThemeColorChanger aChanger(pDoc->GetDocShell()); aChanger.apply(pNewColorSet); @@ -442,11 +440,11 @@ CPPUNIT_TEST_FIXTURE(SwCoreThemeTest, testThemeChanging) { auto const& pTheme = pModel->getTheme(); CPPUNIT_ASSERT(pTheme); - CPPUNIT_ASSERT_EQUAL(OUString(u"Office Theme"), pTheme->GetName()); + CPPUNIT_ASSERT_EQUAL(u"Office Theme"_ustr, pTheme->GetName()); auto pColorSet = pTheme->getColorSet(); CPPUNIT_ASSERT(pColorSet); - CPPUNIT_ASSERT_EQUAL(OUString(u"LibreOffice"), pColorSet->getName()); + CPPUNIT_ASSERT_EQUAL(u"LibreOffice"_ustr, pColorSet->getName()); CPPUNIT_ASSERT_EQUAL(Color(0x18A303), pTheme->GetColor(model::ThemeColorType::Accent1)); } @@ -457,11 +455,11 @@ CPPUNIT_TEST_FIXTURE(SwCoreThemeTest, testThemeChanging) { auto const& pTheme = pModel->getTheme(); CPPUNIT_ASSERT(pTheme); - CPPUNIT_ASSERT_EQUAL(OUString(u"Office Theme"), pTheme->GetName()); + CPPUNIT_ASSERT_EQUAL(u"Office Theme"_ustr, pTheme->GetName()); auto pColorSet = pTheme->getColorSet(); CPPUNIT_ASSERT(pColorSet); - CPPUNIT_ASSERT_EQUAL(OUString(u"Orange"), pColorSet->getName()); + CPPUNIT_ASSERT_EQUAL(u"Orange"_ustr, pColorSet->getName()); CPPUNIT_ASSERT_EQUAL(Color(0xE48312), pTheme->GetColor(model::ThemeColorType::Accent1)); } @@ -472,11 +470,11 @@ CPPUNIT_TEST_FIXTURE(SwCoreThemeTest, testThemeChanging) { auto const& pTheme = pModel->getTheme(); CPPUNIT_ASSERT(pTheme); - CPPUNIT_ASSERT_EQUAL(OUString(u"Office Theme"), pTheme->GetName()); + CPPUNIT_ASSERT_EQUAL(u"Office Theme"_ustr, pTheme->GetName()); auto pColorSet = pTheme->getColorSet(); CPPUNIT_ASSERT(pColorSet); - CPPUNIT_ASSERT_EQUAL(OUString(u"LibreOffice"), pColorSet->getName()); + CPPUNIT_ASSERT_EQUAL(u"LibreOffice"_ustr, pColorSet->getName()); CPPUNIT_ASSERT_EQUAL(Color(0x18A303), pTheme->GetColor(model::ThemeColorType::Accent1)); } } diff --git a/sw/qa/core/unocore/unocore.cxx b/sw/qa/core/unocore/unocore.cxx index 8715a4868f30..90970b6f680b 100644 --- a/sw/qa/core/unocore/unocore.cxx +++ b/sw/qa/core/unocore/unocore.cxx @@ -466,8 +466,8 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, testContentControlCheckbox) // An uncaught exception of type com.sun.star.beans.UnknownPropertyException xContentControlProps->setPropertyValue("Checkbox", uno::Any(true)); xContentControlProps->setPropertyValue("Checked", uno::Any(true)); - xContentControlProps->setPropertyValue("CheckedState", uno::Any(OUString(u"☒"))); - xContentControlProps->setPropertyValue("UncheckedState", uno::Any(OUString(u"☐"))); + xContentControlProps->setPropertyValue("CheckedState", uno::Any(u"☒"_ustr)); + xContentControlProps->setPropertyValue("UncheckedState", uno::Any(u"☐"_ustr)); xText->insertTextContent(xCursor, xContentControl, /*bAbsorb=*/true); // Then make sure that the specified properties are set: @@ -480,8 +480,8 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, testContentControlCheckbox) std::shared_ptr<SwContentControl> pContentControl = rFormatContentControl.GetContentControl(); CPPUNIT_ASSERT(pContentControl->GetCheckbox()); CPPUNIT_ASSERT(pContentControl->GetChecked()); - CPPUNIT_ASSERT_EQUAL(OUString(u"☒"), pContentControl->GetCheckedState()); - CPPUNIT_ASSERT_EQUAL(OUString(u"☐"), pContentControl->GetUncheckedState()); + CPPUNIT_ASSERT_EQUAL(u"☒"_ustr, pContentControl->GetCheckedState()); + CPPUNIT_ASSERT_EQUAL(u"☐"_ustr, pContentControl->GetUncheckedState()); } CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, testContentControlDropdown) diff --git a/sw/qa/extras/accessibility/basics.cxx b/sw/qa/extras/accessibility/basics.cxx index 8a42ae8ce6bc..6bdd992c22d0 100644 --- a/sw/qa/extras/accessibility/basics.cxx +++ b/sw/qa/extras/accessibility/basics.cxx @@ -18,7 +18,7 @@ using namespace css; CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, TestBasicStructure) { - loadFromSrc(u"/sw/qa/python/testdocuments/xtextcontent.odt"); + loadFromSrc(u"/sw/qa/python/testdocuments/xtextcontent.odt"_ustr); auto xContext = getDocumentAccessibleContext(); CPPUNIT_ASSERT(xContext.is()); @@ -38,7 +38,7 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, TestBasicStructure) CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, TestTypeSimple) { - load(u"private:factory/swriter"); + load(u"private:factory/swriter"_ustr); auto xContext = getDocumentAccessibleContext(); CPPUNIT_ASSERT(xContext.is()); @@ -54,7 +54,7 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, TestTypeSimple) CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, TestTypeMultiPara) { - load(u"private:factory/swriter"); + load(u"private:factory/swriter"_ustr); auto xContext = getDocumentAccessibleContext(); CPPUNIT_ASSERT(xContext.is()); @@ -72,14 +72,14 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, TestTypeMultiPara) CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, TestMenuInsertPageNumber) { - load(u"private:factory/swriter"); + load(u"private:factory/swriter"_ustr); CPPUNIT_ASSERT(activateMenuItem(u"Insert", u"Field", u"Page Number")); CPPUNIT_ASSERT_EQUAL(rtl::OUString("<PARAGRAPH>1</PARAGRAPH>"), collectText()); } CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, TestMenuInsertPageBreak) { - load(u"private:factory/swriter"); + load(u"private:factory/swriter"_ustr); CPPUNIT_ASSERT(activateMenuItem(u"Insert", u"Field", u"Page Number")); CPPUNIT_ASSERT(activateMenuItem(u"Insert", u"Page Break")); diff --git a/sw/qa/extras/accessibility/dialogs.cxx b/sw/qa/extras/accessibility/dialogs.cxx index 7fd23ae2247d..a14eed6bdba3 100644 --- a/sw/qa/extras/accessibility/dialogs.cxx +++ b/sw/qa/extras/accessibility/dialogs.cxx @@ -22,7 +22,7 @@ using namespace css; CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, BasicTestSpecialCharactersDialog) { - load(u"private:factory/swriter"); + load(u"private:factory/swriter"_ustr); auto dialogWaiter = awaitDialog(u"Special Characters", [this](Dialog& dialog) { dumpA11YTree(dialog.getAccessible()->getAccessibleContext()); @@ -33,7 +33,7 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, BasicTestSpecialCharactersDialo getFocusedObject(dialog.getAccessible())); // search for (c) symbol - dialog.postExtTextEventAsync(u"copyright"); + dialog.postExtTextEventAsync(u"copyright"_ustr); Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT(dialog.tabTo(accessibility::AccessibleRole::TABLE_CELL, u"©")); @@ -54,13 +54,13 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, BasicTestSpecialCharactersDialo CPPUNIT_ASSERT(activateMenuItem(u"Insert", u"Special Character...")); CPPUNIT_ASSERT(dialogWaiter->waitEndDialog()); - CPPUNIT_ASSERT_EQUAL(rtl::OUString(u"<PARAGRAPH>©</PARAGRAPH>"), collectText()); + CPPUNIT_ASSERT_EQUAL(u"<PARAGRAPH>©</PARAGRAPH>"_ustr, collectText()); } /* checks for the fix from https://gerrit.libreoffice.org/c/core/+/147660 */ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, TestSpecialCharactersDialogFocus) { - load(u"private:factory/swriter"); + load(u"private:factory/swriter"_ustr); auto dialogWaiter = awaitDialog(u"Special Characters", [](Dialog& dialog) { CPPUNIT_ASSERT(dialog.tabTo(accessibility::AccessibleRole::TABLE_CELL, u" ")); @@ -86,12 +86,12 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, TestSpecialCharactersDialogFocu CPPUNIT_ASSERT(activateMenuItem(u"Insert", u"Special Character...")); CPPUNIT_ASSERT(dialogWaiter->waitEndDialog()); - CPPUNIT_ASSERT_EQUAL(rtl::OUString(u"<PARAGRAPH>!</PARAGRAPH>"), collectText()); + CPPUNIT_ASSERT_EQUAL(u"<PARAGRAPH>!</PARAGRAPH>"_ustr, collectText()); } CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, BasicTestHyperlinkDialog) { - load(u"private:factory/swriter"); + load(u"private:factory/swriter"_ustr); auto dialogWaiter = awaitDialog(u"Hyperlink", [this](Dialog& dialog) { dumpA11YTree(dialog.getAccessible()->getAccessibleContext()); @@ -99,7 +99,7 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, BasicTestHyperlinkDialog) // Focus the URL box (should be default, but make sure we're on it) CPPUNIT_ASSERT(dialog.tabTo(accessibility::AccessibleRole::COMBO_BOX, u"URL:")); // Fill in an address - dialog.postExtTextEventAsync(u"https://libreoffice.org/"); + dialog.postExtTextEventAsync(u"https://libreoffice.org/"_ustr); // Validate the whole dialog dialog.postKeyEventAsync(0, awt::Key::RETURN); Scheduler::ProcessEventsToIdle(); @@ -115,7 +115,7 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, BasicTestHyperlinkDialog) CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, BasicTestBookmarkDialog) { - load(u"private:factory/swriter"); + load(u"private:factory/swriter"_ustr); auto dialogWaiter = awaitDialog(u"Bookmark", [this](Dialog& dialog) { dumpA11YTree(dialog.getAccessible()->getAccessibleContext()); @@ -123,7 +123,7 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, BasicTestBookmarkDialog) CPPUNIT_ASSERT(dialog.tabTo(accessibility::AccessibleRole::TEXT, u"Name:")); dialog.postKeyEventAsync(0, awt::Key::SELECT_ALL); dialog.postKeyEventAsync(0, awt::Key::DELETE); - dialog.postExtTextEventAsync(u"Test Bookmark 1"); + dialog.postExtTextEventAsync(u"Test Bookmark 1"_ustr); // Validate the whole dialog dialog.postKeyEventAsync(0, awt::Key::RETURN); Scheduler::ProcessEventsToIdle(); @@ -139,7 +139,7 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, BasicTestBookmarkDialog) CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, BasicTestSectionDialog) { - load(u"private:factory/swriter"); + load(u"private:factory/swriter"_ustr); auto dialogWaiter = awaitDialog(u"Insert Section", [this](Dialog& dialog) { dumpA11YTree(dialog.getAccessible()->getAccessibleContext()); @@ -157,7 +157,7 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, BasicTestSectionDialog) CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, BasicTestFontworkDialog) { - load(u"private:factory/swriter"); + load(u"private:factory/swriter"_ustr); auto dialogWaiter = awaitDialog(u"Fontwork Gallery", [this](Dialog& dialog) { dumpA11YTree(dialog.getAccessible()->getAccessibleContext()); @@ -178,7 +178,7 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, BasicTestFontworkDialog) CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, BasicTestFrameDialog) { - load(u"private:factory/swriter"); + load(u"private:factory/swriter"_ustr); auto dialogWaiter = awaitDialog(u"Frame", [](Dialog& dialog) { // Validate the whole dialog diff --git a/sw/qa/extras/accessibility/tdf155705.cxx b/sw/qa/extras/accessibility/tdf155705.cxx index ebaf4600142a..c145c7b2c858 100644 --- a/sw/qa/extras/accessibility/tdf155705.cxx +++ b/sw/qa/extras/accessibility/tdf155705.cxx @@ -24,7 +24,7 @@ using namespace css; /* This test only works if spell checking is available for en_US */ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, tdf155705) { - loadFromSrc(u"/sw/qa/extras/accessibility/testdocuments/tdf155705.fodt"); + loadFromSrc(u"/sw/qa/extras/accessibility/testdocuments/tdf155705.fodt"_ustr); /* we need to give it a second to fully set up the XAccessibleTextMarkup, otherwise we get a * dysfunctional one that asserts out on m_pTextFrame */ diff --git a/sw/qa/extras/accessibility/unicode.cxx b/sw/qa/extras/accessibility/unicode.cxx index b4b2b5f6fc84..0130ee1dc48f 100644 --- a/sw/qa/extras/accessibility/unicode.cxx +++ b/sw/qa/extras/accessibility/unicode.cxx @@ -19,23 +19,23 @@ using namespace accessibility; // Checks fetching multi-unit characters CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, TestUnicodeSP) { - loadFromSrc(u"/sw/qa/extras/accessibility/testdocuments/unicode.fodf"); + loadFromSrc(u"/sw/qa/extras/accessibility/testdocuments/unicode.fodf"_ustr); auto xContext = getDocumentAccessibleContext()->getAccessibleChild(0)->getAccessibleContext(); uno::Reference<XAccessibleText> para(xContext, uno::UNO_QUERY_THROW); auto segment = para->getTextAtIndex(0, AccessibleTextType::CHARACTER); - CPPUNIT_ASSERT_EQUAL(OUString(u"\U0001f0a1"), segment.SegmentText); + CPPUNIT_ASSERT_EQUAL(u"\U0001f0a1"_ustr, segment.SegmentText); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), segment.SegmentStart); CPPUNIT_ASSERT_EQUAL(sal_Int32(2), segment.SegmentEnd); segment = para->getTextBeforeIndex(2, AccessibleTextType::CHARACTER); - CPPUNIT_ASSERT_EQUAL(OUString(u"\U0001f0a1"), segment.SegmentText); + CPPUNIT_ASSERT_EQUAL(u"\U0001f0a1"_ustr, segment.SegmentText); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), segment.SegmentStart); CPPUNIT_ASSERT_EQUAL(sal_Int32(2), segment.SegmentEnd); segment = para->getTextBehindIndex(0, AccessibleTextType::CHARACTER); - CPPUNIT_ASSERT_EQUAL(OUString(u"\U0001f0ae"), segment.SegmentText); + CPPUNIT_ASSERT_EQUAL(u"\U0001f0ae"_ustr, segment.SegmentText); CPPUNIT_ASSERT_EQUAL(sal_Int32(2), segment.SegmentStart); CPPUNIT_ASSERT_EQUAL(sal_Int32(4), segment.SegmentEnd); } @@ -43,7 +43,7 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, TestUnicodeSP) // Checks getTextBehindIndex() with multi-unit characters CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, TestUnicodeSPBehindIndex) { - loadFromSrc(u"/sw/qa/extras/accessibility/testdocuments/unicode.fodf"); + loadFromSrc(u"/sw/qa/extras/accessibility/testdocuments/unicode.fodf"_ustr); auto xContext = getDocumentAccessibleContext()->getAccessibleChild(0)->getAccessibleContext(); @@ -57,17 +57,17 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, TestUnicodeSPBehindIndex) lang::IndexOutOfBoundsException); auto segment = para->getTextBehindIndex(nChCount, AccessibleTextType::CHARACTER); - CPPUNIT_ASSERT_EQUAL(OUString(u""), segment.SegmentText); + CPPUNIT_ASSERT_EQUAL(u""_ustr, segment.SegmentText); CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), segment.SegmentStart); CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), segment.SegmentEnd); segment = para->getTextBehindIndex(nChCount - 2, AccessibleTextType::CHARACTER); - CPPUNIT_ASSERT_EQUAL(OUString(u""), segment.SegmentText); + CPPUNIT_ASSERT_EQUAL(u""_ustr, segment.SegmentText); CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), segment.SegmentStart); CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), segment.SegmentEnd); segment = para->getTextBehindIndex(nChCount - 4, AccessibleTextType::CHARACTER); - CPPUNIT_ASSERT_EQUAL(OUString(u"\U0001f0ab"), segment.SegmentText); + CPPUNIT_ASSERT_EQUAL(u"\U0001f0ab"_ustr, segment.SegmentText); CPPUNIT_ASSERT_EQUAL(sal_Int32(6), segment.SegmentStart); CPPUNIT_ASSERT_EQUAL(sal_Int32(8), segment.SegmentEnd); @@ -84,17 +84,17 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, TestUnicodeSPBehindIndex) lang::IndexOutOfBoundsException); segment = para->getTextBehindIndex(nChCount, AccessibleTextType::CHARACTER); - CPPUNIT_ASSERT_EQUAL(OUString(u""), segment.SegmentText); + CPPUNIT_ASSERT_EQUAL(u""_ustr, segment.SegmentText); CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), segment.SegmentStart); CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), segment.SegmentEnd); segment = para->getTextBehindIndex(nChCount - 1, AccessibleTextType::CHARACTER); - CPPUNIT_ASSERT_EQUAL(OUString(u""), segment.SegmentText); + CPPUNIT_ASSERT_EQUAL(u""_ustr, segment.SegmentText); CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), segment.SegmentStart); CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), segment.SegmentEnd); segment = para->getTextBehindIndex(nChCount - 2, AccessibleTextType::CHARACTER); - CPPUNIT_ASSERT_EQUAL(OUString(u"j"), segment.SegmentText); + CPPUNIT_ASSERT_EQUAL(u"j"_ustr, segment.SegmentText); CPPUNIT_ASSERT_EQUAL(sal_Int32(3), segment.SegmentStart); CPPUNIT_ASSERT_EQUAL(sal_Int32(4), segment.SegmentEnd); } diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx index 3eb328f0b5cc..6928052169e6 100644 --- a/sw/qa/extras/globalfilter/globalfilter.cxx +++ b/sw/qa/extras/globalfilter/globalfilter.cxx @@ -1305,7 +1305,7 @@ CPPUNIT_TEST_FIXTURE(Test, testListLabelPDFExport) for (int i = 0; i < nChars; i++) aChars[i] = pPdfTextPage->getUnicode(i); OUString aText(aChars.data(), aChars.size()); - CPPUNIT_ASSERT_EQUAL(OUString(u"\u0623\r\n.\r\n\u0623.\u0623\r\n.\r\n\u0623.\u0623.\u0623\r\n."), aText); + CPPUNIT_ASSERT_EQUAL(u"\u0623\r\n.\r\n\u0623.\u0623\r\n.\r\n\u0623.\u0623.\u0623\r\n."_ustr, aText); } // Parse the document again to get its raw content diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx index bf6d29e91841..dbdf472ceff9 100644 --- a/sw/qa/extras/htmlexport/htmlexport.cxx +++ b/sw/qa/extras/htmlexport/htmlexport.cxx @@ -574,7 +574,7 @@ DECLARE_HTMLEXPORT_TEST(testTdf83890, "tdf83890.odt") DECLARE_HTMLEXPORT_TEST(testExtbChars, "extb.html") { - OUString aExpected(u"\U00024b62"); + OUString aExpected(u"\U00024b62"_ustr); // Assert that UTF8 encoded non-BMP Unicode character is correct uno::Reference<text::XTextRange> xTextRange1 = getRun(getParagraph(1), 1); CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange1->getString()); @@ -2208,11 +2208,11 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testLeadingTab) // - Expected: <nbsp><nbsp><space>first // - Actual : <tab><space>first // i.e. the leading tab was not replaced by 2 nbsps. - assertXPathContent(pXmlDoc, "//reqif-xhtml:p[1]", u"\xa0\xa0 first"); + assertXPathContent(pXmlDoc, "//reqif-xhtml:p[1]", u"\xa0\xa0 first"_ustr); // Test a leading tab that is not at the start of the paragraph: - assertXPathContent(pXmlDoc, "//reqif-xhtml:p[2]", u"\xa0\xa0\xa0\xa0 second"); + assertXPathContent(pXmlDoc, "//reqif-xhtml:p[2]", u"\xa0\xa0\xa0\xa0 second"_ustr); // Test a tab which is not leading: - assertXPathContent(pXmlDoc, "//reqif-xhtml:p[3]", u"thi \t rd"); + assertXPathContent(pXmlDoc, "//reqif-xhtml:p[3]", u"thi \t rd"_ustr); } CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testLeadingTabHTML) @@ -2238,7 +2238,7 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testLeadingTabHTML) // - Expected: <newline><nbsp><nbsp><space>test // - Actual : <newline><tab><space>test // i.e. the leading tab was not replaced by 2 nbsps. - assertXPathContent(pHtmlDoc, "/html/body/p", SAL_NEWLINE_STRING u"\xa0\xa0 test"); + assertXPathContent(pHtmlDoc, "/html/body/p", SAL_NEWLINE_STRING u"\xa0\xa0 test"_ustr); } CPPUNIT_TEST_FIXTURE(HtmlExportTest, testClearingBreak) diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx b/sw/qa/extras/htmlimport/htmlimport.cxx index 34900529ada9..125143d6f581 100644 --- a/sw/qa/extras/htmlimport/htmlimport.cxx +++ b/sw/qa/extras/htmlimport/htmlimport.cxx @@ -151,7 +151,7 @@ CPPUNIT_TEST_FIXTURE(HtmlImportTest, testListStyleType) if (rProp.Name == "BulletChar") { // should be 'o'. - CPPUNIT_ASSERT_EQUAL(OUString(u"\uE009"), rProp.Value.get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"\uE009"_ustr, rProp.Value.get<OUString>()); bBulletFound = true; break; } @@ -516,7 +516,7 @@ CPPUNIT_TEST_FIXTURE(HtmlImportTest, testUTF16_nonBMP) { createSwWebDoc("emojis16BE.html"); // tdf#146173: non-BMP characters' surrogates didn't combine correctly - CPPUNIT_ASSERT_EQUAL(OUString(u"a text with emojis: 🌾 ☀👨🏼🌾🏃🏼♂️🤙🏽🔍"), + CPPUNIT_ASSERT_EQUAL(u"a text with emojis: 🌾 ☀👨🏼🌾🏃🏼♂️🤙🏽🔍"_ustr, getParagraph(1)->getString()); } diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index 743b88d350ba..47f2eddbc42d 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -3566,7 +3566,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf152413) // - Actual : 2 // - In <>, XPath '/root/page/body/txt/SwParaPortion/SwLineLayout/SwLinePortion' number of nodes is incorrect assertXPath(pXmlDoc, "/root/page/body/txt/SwParaPortion/SwLineLayout/SwLinePortion", "portion", - u"صِرَ ٰطَ"); + u"صِرَ ٰطَ"_ustr); } CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf125893) diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx index 0089601974e6..2b0881850207 100644 --- a/sw/qa/extras/mailmerge/mailmerge.cxx +++ b/sw/qa/extras/mailmerge/mailmerge.cxx @@ -604,19 +604,19 @@ DECLARE_SHELL_MAILMERGE_TEST(testBookmarkCondition, "bookmarkcondition.fodt", "b // check that conditions on sections and bookmarks are evaluated the same assertXPath(pLayout, "/root/page", 7); assertXPath(pLayout, "/root/page[1]/body/section", 1); - assertXPath(pLayout, "/root/page[1]/body/section[1]/txt[1]/SwParaPortion/SwLineLayout", "portion", u"In den Bergen war es anstrengend."); - assertXPath(pLayout, "/root/page[1]/body/txt[5]/SwParaPortion/SwLineLayout", "portion", u"Mein Urlaub war anstrengend . "); + assertXPath(pLayout, "/root/page[1]/body/section[1]/txt[1]/SwParaPortion/SwLineLayout", "portion", u"In den Bergen war es anstrengend."_ustr); + assertXPath(pLayout, "/root/page[1]/body/txt[5]/SwParaPortion/SwLineLayout", "portion", u"Mein Urlaub war anstrengend . "_ustr); assertXPath(pLayout, "/root/page[3]/body/section", 1); - assertXPath(pLayout, "/root/page[3]/body/section[1]/txt[1]/SwParaPortion/SwLineLayout", "portion", u"In Barcelona war es schön."); - assertXPath(pLayout, "/root/page[3]/body/txt[5]/SwParaPortion/SwLineLayout", "portion", u"Mein Urlaub war schön . "); + assertXPath(pLayout, "/root/page[3]/body/section[1]/txt[1]/SwParaPortion/SwLineLayout", "portion", u"In Barcelona war es schön."_ustr); + assertXPath(pLayout, "/root/page[3]/body/txt[5]/SwParaPortion/SwLineLayout", "portion", u"Mein Urlaub war schön . "_ustr); assertXPath(pLayout, "/root/page[5]/body/section", 1); assertXPath(pLayout, "/root/page[5]/body/section[1]/txt[1]/SwParaPortion/SwLineLayout", "portion", "In Paris war es erlebnisreich."); - assertXPath(pLayout, "/root/page[5]/body/txt[5]/SwParaPortion/SwLineLayout", "portion", u"Mein Urlaub war erlebnisreich . "); + assertXPath(pLayout, "/root/page[5]/body/txt[5]/SwParaPortion/SwLineLayout", "portion", u"Mein Urlaub war erlebnisreich . "_ustr); assertXPath(pLayout, "/root/page[7]/body/section", 3); - assertXPath(pLayout, "/root/page[7]/body/section[1]/txt[1]/SwParaPortion/SwLineLayout", "portion", u"In den Bergen war es anstrengend."); - assertXPath(pLayout, "/root/page[7]/body/section[2]/txt[1]/SwParaPortion/SwLineLayout", "portion", u"In Barcelona war es schön."); - assertXPath(pLayout, "/root/page[7]/body/section[3]/txt[1]/SwParaPortion/SwLineLayout", "portion", u"In Paris war es erlebnisreich."); - assertXPath(pLayout, "/root/page[7]/body/txt[5]/SwParaPortion/SwLineLayout", "portion", u"Mein Urlaub war anstrengend schön erlebnisreich . "); + assertXPath(pLayout, "/root/page[7]/body/section[1]/txt[1]/SwParaPortion/SwLineLayout", "portion", u"In den Bergen war es anstrengend."_ustr); + assertXPath(pLayout, "/root/page[7]/body/section[2]/txt[1]/SwParaPortion/SwLineLayout", "portion", u"In Barcelona war es schön."_ustr); + assertXPath(pLayout, "/root/page[7]/body/section[3]/txt[1]/SwParaPortion/SwLineLayout", "portion", u"In Paris war es erlebnisreich."_ustr); + assertXPath(pLayout, "/root/page[7]/body/txt[5]/SwParaPortion/SwLineLayout", "portion", u"Mein Urlaub war anstrengend schön erlebnisreich . "_ustr); } DECLARE_SHELL_MAILMERGE_TEST_SELECTION(testTdf95292, "linked-labels.odt", "10-testing-addresses.ods", "testing-addresses", 5) diff --git a/sw/qa/extras/odfexport/odfexport2.cxx b/sw/qa/extras/odfexport/odfexport2.cxx index 1c9d442e073b..48faa5ac5769 100644 --- a/sw/qa/extras/odfexport/odfexport2.cxx +++ b/sw/qa/extras/odfexport/odfexport2.cxx @@ -109,7 +109,7 @@ DECLARE_ODFEXPORT_TEST(testReferenceLanguage, "referencelanguage.odt") // (used from LibreOffice 6.1, and proposed for next ODF) OUString const aFieldTexts[] = { "A 2", "Az Isten", "Az 50-esek", "A 2018-asok", "Az egyebek", "A fejezetek", - u"Az „Őseinket...”", "a 2", + u"Az „Őseinket...”"_ustr, "a 2", "Az v", "az 1", "Az e)", "az 1", "Az (5)", "az 1", "A 2", "az 1" }; uno::Reference<text::XTextFieldsSupplier> xTextFieldsSupplier(mxComponent, uno::UNO_QUERY); @@ -219,7 +219,7 @@ DECLARE_ODFEXPORT_TEST(testSpellOutNumberingTypes, "spellout-numberingtypes.odt" { CPPUNIT_ASSERT_EQUAL(1, getPages()); // ordinal indicator, ordinal and cardinal number numbering styles (from LibreOffice 6.1) - OUString const aFieldTexts[] = { "1st", "Erste", "Eins", "1.", "Premier", "Un", u"1ᵉʳ", "First", "One" }; + OUString const aFieldTexts[] = { "1st", "Erste", "Eins", "1.", "Premier", "Un", u"1ᵉʳ"_ustr, "First", "One" }; // fallback for old platforms without std::codecvt and std::regex supports OUString const aFieldTextFallbacks[] = { "Ordinal-number 1", "Ordinal 1", "1" }; uno::Reference<text::XTextFieldsSupplier> xTextFieldsSupplier(mxComponent, uno::UNO_QUERY); @@ -572,7 +572,7 @@ DECLARE_ODFEXPORT_TEST(testTdf52065_centerTabs, "testTdf52065_centerTabs.odt") // Without the fix, the text was unseen, with a tabstop width of 64057. It should be 3057 CPPUNIT_ASSERT(nTabStop < 4000); CPPUNIT_ASSERT(3000 < nTabStop); - CPPUNIT_ASSERT_EQUAL(OUString(u"Pečiatka zamestnávateľa"), parseDump("//body/txt[4]/SwParaPortion/SwLineLayout/child::*[4]", "portion")); + CPPUNIT_ASSERT_EQUAL(u"Pečiatka zamestnávateľa"_ustr, parseDump("//body/txt[4]/SwParaPortion/SwLineLayout/child::*[4]", "portion")); // tdf#149547: __XXX___invalid CharacterStyles should not be imported/exported CPPUNIT_ASSERT(!getStyles("CharacterStyles")->hasByName("__XXX___invalid")); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx index 4e8d2991d83b..4d5f56969272 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx @@ -303,7 +303,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf67207_MERGEFIELD, "mailmerge.docx") CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.text.TextField.Database")); OUString sValue; xTextField->getPropertyValue("Content") >>= sValue; - CPPUNIT_ASSERT_EQUAL(OUString(u"«Name»"), sValue); + CPPUNIT_ASSERT_EQUAL(u"«Name»"_ustr, sValue); uno::Reference<beans::XPropertySet> xFiledMaster = xDependent->getTextFieldMaster(); uno::Reference<lang::XServiceInfo> xFiledMasterServiceInfo(xFiledMaster, uno::UNO_QUERY_THROW); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx index 243bfffb23c2..21e3a97c362e 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx @@ -894,17 +894,17 @@ DECLARE_OOXMLEXPORT_TEST(testTdf119143, "tdf119143.docx") // The runs inside <w:dir> were ignored const OUString sParaText = getParagraph(1)->getString(); CPPUNIT_ASSERT_EQUAL( - OUString(u"عندما يريد العالم أن يتكلّم ، فهو يتحدّث " - u"بلغة " - u"يونيكود. تسجّل الآن لحضور المؤتمر الدولي العاشر " - u"ليونيكود (Unicode Conference)، الذي سيعقد في 10-12 " - u"آذار 1997 بمدينة مَايِنْتْس، ألمانيا. و سيجمع المؤتمر " - u"بين خبراء من كافة قطاعات الصناعة على الشبكة " - u"العالمية انترنيت ويونيكود، حيث ستتم، على الصعيدين " - u"الدولي والمحلي على حد سواء مناقشة سبل استخدام " - u"يونكود في النظم القائمة وفيما يخص التطبيقات " - u"الحاسوبية، الخطوط، تصميم النصوص والحوسبة متعددة " - u"اللغات."), + u"عندما يريد العالم أن يتكلّم ، فهو يتحدّث " + u"بلغة " + u"يونيكود. تسجّل الآن لحضور المؤتمر الدولي العاشر " + u"ليونيكود (Unicode Conference)، الذي سيعقد في 10-12 " + u"آذار 1997 بمدينة مَايِنْتْس، ألمانيا. و سيجمع المؤتمر " + u"بين خبراء من كافة قطاعات الصناعة على الشبكة " + u"العالمية انترنيت ويونيكود، حيث ستتم، على الصعيدين " + u"الدولي والمحلي على حد سواء مناقشة سبل استخدام " + u"يونكود في النظم القائمة وفيما يخص التطبيقات " + u"الحاسوبية، الخطوط، تصميم النصوص والحوسبة متعددة " + u"اللغات."_ustr, sParaText); } @@ -1017,7 +1017,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf94628) ->Value.get<OUString>(); // Actually for 'BLACK UPPER RIGHT TRIANGLE' is \u25E5 // But we use Wingdings 3 font here, so code is different - CPPUNIT_ASSERT_EQUAL(OUString(u"\uF07B"), sBulletChar); + CPPUNIT_ASSERT_EQUAL(u"\uF07B"_ustr, sBulletChar); } DECLARE_OOXMLEXPORT_TEST(testTdf122594, "tdf122594.docx") @@ -1227,9 +1227,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf145720, "tdf104797.docx") // mandatory authors and dates assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:moveFrom/w:moveFromRangeStart", "author", - u"Tekijä"); + u"Tekijä"_ustr); assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:moveTo/w:moveToRangeStart", "author", - u"Tekijä"); + u"Tekijä"_ustr); // no date (anonymized change) // This failed, date was exported as w:date="0-00-00T00:00:00Z", and later "1970-01-01T00:00:00Z" assertXPathNoAttribute(pXmlDoc, "/w:document/w:body/w:p[1]/w:moveFrom/w:moveFromRangeStart", diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx index 80243ba64a2d..eb78d7c470d0 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx @@ -1171,7 +1171,7 @@ DECLARE_OOXMLEXPORT_TEST(tdf118169, "tdf118169.docx") uno::Reference<beans::XPropertySet> xPropertySet(xControlShape->getControl(), uno::UNO_QUERY); uno::Reference<lang::XServiceInfo> xServiceInfo(xPropertySet, uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(true, bool(xServiceInfo->supportsService("com.sun.star.form.component.CheckBox"))); - CPPUNIT_ASSERT_EQUAL(OUString(u"őőőőőőőőőőőűűűű"), getProperty<OUString>(xPropertySet, "Label")); + CPPUNIT_ASSERT_EQUAL(u"őőőőőőőőőőőűűűű"_ustr, getProperty<OUString>(xPropertySet, "Label")); } CPPUNIT_TEST_FIXTURE(Test, testTdf127116) diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx index eb26ce7763b8..dd0c1a75e48f 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx @@ -972,7 +972,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf132766) // Ensure that for list=1 and level=0 we wrote correct bullet char and correct font assertXPath(pXmlDoc, "//w:numbering/w:abstractNum[@w:abstractNumId='1']/w:lvl[@w:ilvl='0']/w:lvlText", - "val", u"\uF0B7"); + "val", u"\uF0B7"_ustr); assertXPath(pXmlDoc, "//w:numbering/w:abstractNum[@w:abstractNumId='1']/w:lvl[@w:ilvl='0']/w:rPr/w:rFonts", "ascii", "Symbol"); assertXPath(pXmlDoc, "//w:numbering/w:abstractNum[@w:abstractNumId='1']/w:lvl[@w:ilvl='0']/w:rPr/w:rFonts", diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx index e4eb392faf16..730afb8e5d12 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx @@ -1011,9 +1011,9 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf150542) // Ensure that all docvars from input are written back and with correct values. // Order of document variables is not checked. So this can fail at some time if order is changed. assertXPath(pSettingsDoc, - "/w:settings/w:docVars/w:docVar[1]", "name", u"LocalChars\u00C1\u0072\u0076\u00ED\u007A\u0074\u0075\u0072\u006F\u0054\u00FC\u006B\u00F6\u0072\u0066\u00FA\u0072\u00F3\u0067\u00E9\u0070"); + "/w:settings/w:docVars/w:docVar[1]", "name", u"LocalChars\u00C1\u0072\u0076\u00ED\u007A\u0074\u0075\u0072\u006F\u0054\u00FC\u006B\u00F6\u0072\u0066\u00FA\u0072\u00F3\u0067\u00E9\u0070"_ustr); assertXPath(pSettingsDoc, - "/w:settings/w:docVars/w:docVar[1]", "val", u"Correct value (\u00E1\u0072\u0076\u00ED\u007A\u0074\u0075\u0072\u006F\u0020\u0074\u00FC\u006B\u00F6\u0072\u0066\u00FA\u0072\u00F3\u0067\u00E9\u0070)"); + "/w:settings/w:docVars/w:docVar[1]", "val", u"Correct value (\u00E1\u0072\u0076\u00ED\u007A\u0074\u0075\u0072\u006F\u0020\u0074\u00FC\u006B\u00F6\u0072\u0066\u00FA\u0072\u00F3\u0067\u00E9\u0070)"_ustr); assertXPath(pSettingsDoc, "/w:settings/w:docVars/w:docVar[2]", "name", "DocVar1"); assertXPath(pSettingsDoc, diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx index 8473d8c6eb6b..90c3c750c53c 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx @@ -47,7 +47,7 @@ public: DECLARE_OOXMLEXPORT_TEST(testTdf135164_cancelledNumbering, "tdf135164_cancelledNumbering.docx") { - uno::Reference<beans::XPropertySet> xPara(getParagraph(1, u"TBMM DÖNEMİ"), uno::UNO_QUERY); + uno::Reference<beans::XPropertySet> xPara(getParagraph(1, u"TBMM DÖNEMİ"_ustr), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(OUString(""), getProperty<OUString>(xPara, "ListLabelString")); xPara.set(getParagraph(2, "Numbering explicitly cancelled"), uno::UNO_QUERY); @@ -284,7 +284,7 @@ CPPUNIT_TEST_FIXTURE(Test, testCheckboxContentControlExport) uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY); uno::Reference<text::XText> xText = xTextDocument->getText(); uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor(); - xText->insertString(xCursor, OUString(u"☐"), /*bAbsorb=*/false); + xText->insertString(xCursor, u"☐"_ustr, /*bAbsorb=*/false); xCursor->gotoStart(/*bExpand=*/false); xCursor->gotoEnd(/*bExpand=*/true); uno::Reference<text::XTextContent> xContentControl( @@ -292,8 +292,8 @@ CPPUNIT_TEST_FIXTURE(Test, testCheckboxContentControlExport) uno::Reference<beans::XPropertySet> xContentControlProps(xContentControl, uno::UNO_QUERY); xContentControlProps->setPropertyValue("Checkbox", uno::Any(true)); xContentControlProps->setPropertyValue("Checked", uno::Any(true)); - xContentControlProps->setPropertyValue("CheckedState", uno::Any(OUString(u"☒"))); - xContentControlProps->setPropertyValue("UncheckedState", uno::Any(OUString(u"☐"))); + xContentControlProps->setPropertyValue("CheckedState", uno::Any(u"☒"_ustr)); + xContentControlProps->setPropertyValue("UncheckedState", uno::Any(u"☐"_ustr)); xText->insertTextContent(xCursor, xContentControl, /*bAbsorb=*/true); // When exporting to DOCX: @@ -1008,16 +1008,16 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf146955) CPPUNIT_TEST_FIXTURE(Test, testTdf144668) { loadAndReload("tdf144668.odt"); - uno::Reference<beans::XPropertySet> xPara1(getParagraph(1, u"level1"), uno::UNO_QUERY); + uno::Reference<beans::XPropertySet> xPara1(getParagraph(1, u"level1"_ustr), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(OUString("[0001]"), getProperty<OUString>(xPara1, "ListLabelString")); - uno::Reference<beans::XPropertySet> xPara2(getParagraph(2, u"level2"), uno::UNO_QUERY); + uno::Reference<beans::XPropertySet> xPara2(getParagraph(2, u"level2"_ustr), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(OUString("[001]"), getProperty<OUString>(xPara2, "ListLabelString")); } DECLARE_OOXMLEXPORT_TEST(testTdf148455_1, "tdf148455_1.docx") { - uno::Reference<beans::XPropertySet> xPara2(getParagraph(3, u"1.1.1"), uno::UNO_QUERY); + uno::Reference<beans::XPropertySet> xPara2(getParagraph(3, u"1.1.1"_ustr), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(OUString("1.1.1."), getProperty<OUString>(xPara2, "ListLabelString")); } diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx index bbcc40dde073..c25a9369bd94 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx @@ -386,42 +386,42 @@ DECLARE_OOXMLEXPORT_TEST(testTdf153964_topMarginAfterBreak14, "tdf153964_topMarg uno::Reference<beans::XPropertySet> xPara(getParagraph(2, "a w:br at the start of the document. Does it use 60 point top margin?"), uno::UNO_QUERY); //CPPUNIT_ASSERT_EQUAL(sal_Int32(2117), getProperty<sal_Int32>(xPara, "ParaTopMargin")); - xPara.set(getParagraph(3, u"60 pt spacing before"), uno::UNO_QUERY); + xPara.set(getParagraph(3, u"60 pt spacing before"_ustr), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(sal_Int32(2117), getProperty<sal_Int32>(xPara, "ParaTopMargin")); CPPUNIT_ASSERT_EQUAL(Color(0xfbe4d5), getProperty<Color>(xPara, "ParaBackColor")); // The top margin was applied to paragraph 3, so it shouldn't apply here - xPara.set(getParagraph(4, u"column break1"), uno::UNO_QUERY); + xPara.set(getParagraph(4, u"column break1"_ustr), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xPara, "ParaTopMargin")); CPPUNIT_ASSERT_EQUAL(Color(0xfbe4d5), getProperty<Color>(xPara, "ParaBackColor")); - xPara.set(getParagraph(5, u"60 pt followed by page break"), uno::UNO_QUERY); + xPara.set(getParagraph(5, u"60 pt followed by page break"_ustr), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(sal_Int32(2117), getProperty<sal_Int32>(xPara, "ParaTopMargin")); CPPUNIT_ASSERT_EQUAL(Color(0xdeeaf6), getProperty<Color>(xPara, "ParaBackColor")); // The top margin was applied to paragraph 5, so it shouldn't apply here - xPara.set(getParagraph(6, u"page break1"), uno::UNO_QUERY); + xPara.set(getParagraph(6, u"page break1"_ustr), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xPara, "ParaTopMargin")); CPPUNIT_ASSERT_EQUAL(Color(0xdeeaf6), getProperty<Color>(xPara, "ParaBackColor")); // The top margin was not applied yet, so with compat14 it should apply here. - xPara.set(getParagraph(7, u"column break2"), uno::UNO_QUERY); + xPara.set(getParagraph(7, u"column break2"_ustr), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(sal_Int32(2117), getProperty<sal_Int32>(xPara, "ParaTopMargin")); CPPUNIT_ASSERT_EQUAL(Color(0xe2efd9), getProperty<Color>(xPara, "ParaBackColor")); // In an odd twist, the w:br was actually at the end of the previous w:p, so in that case // we ignore the top margin definition this time. - xPara.set(getParagraph(9, u"page break2"), uno::UNO_QUERY); + xPara.set(getParagraph(9, u"page break2"_ustr), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xPara, "ParaTopMargin")); // The top margin was not applied before the column break, so with compat14 it should apply here - xPara.set(getParagraph(10, u""), uno::UNO_QUERY); // after column break + xPara.set(getParagraph(10, u""_ustr), uno::UNO_QUERY); // after column break CPPUNIT_ASSERT_EQUAL(sal_Int32(2117), getProperty<sal_Int32>(xPara, "ParaTopMargin")); CPPUNIT_ASSERT_EQUAL(Color(0xfff2cc), getProperty<Color>(xPara, "ParaBackColor")); // In an odd twist, the w:br was actually at the end of the previous w:p, so in that case // we ignore the top margin definition this time. - xPara.set(getParagraph(12, u""), uno::UNO_QUERY); // after page break + xPara.set(getParagraph(12, u""_ustr), uno::UNO_QUERY); // after page break CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xPara, "ParaTopMargin")); } @@ -432,40 +432,40 @@ DECLARE_OOXMLEXPORT_TEST(testTdf153964_topMarginAfterBreak15, "tdf153964_topMarg uno::Reference<beans::XPropertySet> xPara(getParagraph(2, "a w:br at the start of the document. Does it use 60 point top margin?"), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xPara, "ParaTopMargin")); - xPara.set(getParagraph(3, u"60 pt spacing before"), uno::UNO_QUERY); + xPara.set(getParagraph(3, u"60 pt spacing before"_ustr), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(sal_Int32(2117), getProperty<sal_Int32>(xPara, "ParaTopMargin")); CPPUNIT_ASSERT_EQUAL(Color(0xfbe4d5), getProperty<Color>(xPara, "ParaBackColor")); // The top margin was applied to paragraph 3, so it shouldn't apply here - xPara.set(getParagraph(4, u"column break1"), uno::UNO_QUERY); + xPara.set(getParagraph(4, u"column break1"_ustr), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xPara, "ParaTopMargin")); CPPUNIT_ASSERT_EQUAL(Color(0xfbe4d5), getProperty<Color>(xPara, "ParaBackColor")); - xPara.set(getParagraph(5, u"60 pt followed by page break"), uno::UNO_QUERY); + xPara.set(getParagraph(5, u"60 pt followed by page break"_ustr), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(sal_Int32(2117), getProperty<sal_Int32>(xPara, "ParaTopMargin")); CPPUNIT_ASSERT_EQUAL(Color(0xdeeaf6), getProperty<Color>(xPara, "ParaBackColor")); // The top margin was applied to paragraph 5, so it shouldn't apply here - xPara.set(getParagraph(6, u"page break1"), uno::UNO_QUERY); + xPara.set(getParagraph(6, u"page break1"_ustr), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xPara, "ParaTopMargin")); CPPUNIT_ASSERT_EQUAL(Color(0xdeeaf6), getProperty<Color>(xPara, "ParaBackColor")); // The top margin was not applied to paragraph 6, and with compat15 it shouldn't apply here. - xPara.set(getParagraph(7, u"column break2"), uno::UNO_QUERY); + xPara.set(getParagraph(7, u"column break2"_ustr), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xPara, "ParaTopMargin")); CPPUNIT_ASSERT_EQUAL(Color(0xe2efd9), getProperty<Color>(xPara, "ParaBackColor")); // The top margin not was applied to paragraph 8, and with compat15 it shouldn't apply here. - xPara.set(getParagraph(9, u"page break2"), uno::UNO_QUERY); + xPara.set(getParagraph(9, u"page break2"_ustr), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xPara, "ParaTopMargin")); // The top margin was not applied to paragraph 9, and with compat15 it shouldn't apply here. - xPara.set(getParagraph(10, u""), uno::UNO_QUERY); // after column break + xPara.set(getParagraph(10, u""_ustr), uno::UNO_QUERY); // after column break CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xPara, "ParaTopMargin")); CPPUNIT_ASSERT_EQUAL(Color(0xfff2cc), getProperty<Color>(xPara, "ParaBackColor")); // The top margin was not applied to paragraph 11, and with compat15 it shouldn't apply here. - xPara.set(getParagraph(12, u""), uno::UNO_QUERY); // after page break + xPara.set(getParagraph(12, u""_ustr), uno::UNO_QUERY); // after page break CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xPara, "ParaTopMargin")); } diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx index 960e29566d7e..eab98f97b2f7 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx @@ -132,7 +132,7 @@ DECLARE_OOXMLEXPORT_TEST(testUTF8CustomProperties, "tdf127864.docx") = xDocumentPropertiesSupplier->getDocumentProperties(); uno::Reference<beans::XPropertySet> xPropertySet( xDocumentProperties->getUserDefinedProperties(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString(u"первый"), getProperty<OUString>(xPropertySet, u"первый")); + CPPUNIT_ASSERT_EQUAL(u"первый"_ustr, getProperty<OUString>(xPropertySet, u"первый"_ustr)); } DECLARE_OOXMLEXPORT_TEST(testKeywords, "tdf143175.docx") @@ -303,12 +303,12 @@ DECLARE_OOXMLEXPORT_TEST(testMathD, "math-d.docx") DECLARE_OOXMLEXPORT_TEST(testMathEscaping, "math-escaping.docx") { - CHECK_FORMULA( u"\u2212 \u221E < x < \u221E", getFormula( getRun( getParagraph( 1 ), 1 ))); + CHECK_FORMULA( u"\u2212 \u221E < x < \u221E"_ustr, getFormula( getRun( getParagraph( 1 ), 1 ))); } DECLARE_OOXMLEXPORT_TEST(testMathLim, "math-lim.docx") { - CHECK_FORMULA( u"lim from {x \u2192 1} {x}", getFormula( getRun( getParagraph( 1 ), 1 ))); + CHECK_FORMULA( u"lim from {x \u2192 1} {x}"_ustr, getFormula( getRun( getParagraph( 1 ), 1 ))); } DECLARE_OOXMLEXPORT_TEST(testMathMatrix, "math-matrix.docx") @@ -319,32 +319,32 @@ DECLARE_OOXMLEXPORT_TEST(testMathMatrix, "math-matrix.docx") CPPUNIT_TEST_FIXTURE(Test, testMathMso2k7) { loadAndReload("math-mso2k7.docx"); - CHECK_FORMULA( u"A = \u03C0 {r} ^ {2}", getFormula( getRun( getParagraph( 1 ), 1 ))); + CHECK_FORMULA( u"A = \u03C0 {r} ^ {2}"_ustr, getFormula( getRun( getParagraph( 1 ), 1 ))); // TODO check the stack/binom difference // CHECK_FORMULA( "{left (x+a right )} ^ {n} = sum from {k=0} to {n} {left (binom {n} {k} right ) {x} ^ {k} {a} ^ {n-k}}", CHECK_FORMULA( "{left (x+a right )} ^ {n} = sum from {k=0} to {n} {left (stack {n # k} right ) {x} ^ {k} {a} ^ {n-k}}", getFormula( getRun( getParagraph( 2 ), 1 ))); - CHECK_FORMULA( u"{left (1+x right )} ^ {n} =1+ {nx} over {1!} + {n left (n-1 right ) {x} ^ {2}} over {2!} +\u2026", + CHECK_FORMULA( u"{left (1+x right )} ^ {n} =1+ {nx} over {1!} + {n left (n-1 right ) {x} ^ {2}} over {2!} +\u2026"_ustr, getFormula( getRun( getParagraph( 3 ), 1 ))); // TODO check (cos/sin miss {}) // CHECK_FORMULA( "f left (x right ) = {a} rsub {0} + sum from {n=1} to {\xe2\x88\x9e} {left ({a} rsub {n} cos {{n\xcf\x80x} over {L}} + {b} rsub {n} sin {{n\xcf\x80x} over {L}} right )}", - CHECK_FORMULA( u"f left (x right ) = {a} rsub {0} + sum from {n=1} to {\u221E} {left ({a} rsub {n} cos {n\u03C0x} over {L} + {b} rsub {n} sin {n\u03C0x} over {L} right )}", + CHECK_FORMULA( u"f left (x right ) = {a} rsub {0} + sum from {n=1} to {\u221E} {left ({a} rsub {n} cos {n\u03C0x} over {L} + {b} rsub {n} sin {n\u03C0x} over {L} right )}"_ustr, getFormula( getRun( getParagraph( 4 ), 1 ))); CHECK_FORMULA( "{a} ^ {2} + {b} ^ {2} = {c} ^ {2}", getFormula( getRun( getParagraph( 5 ), 1 ))); - CHECK_FORMULA( u"x = {- b \u00B1 sqrt {{b} ^ {2} -4 ac}} over {2 a}", + CHECK_FORMULA( u"x = {- b \u00B1 sqrt {{b} ^ {2} -4 ac}} over {2 a}"_ustr, getFormula( getRun( getParagraph( 6 ), 1 ))); CHECK_FORMULA( - u"{e} ^ {x} =1+ {x} over {1!} + {{x} ^ {2}} over {2!} + {{x} ^ {3}} over {3!} +\u2026, -\u221E<x<\u221E", + u"{e} ^ {x} =1+ {x} over {1!} + {{x} ^ {2}} over {2!} + {{x} ^ {3}} over {3!} +\u2026, -\u221E<x<\u221E"_ustr, getFormula( getRun( getParagraph( 7 ), 1 ))); CHECK_FORMULA( // "sin {\xce\xb1} \xc2\xb1 sin {\xce\xb2} =2 sin {{1} over {2} left (\xce\xb1\xc2\xb1\xce\xb2 right )} cos {{1} over {2} left (\xce\xb1\xe2\x88\x93\xce\xb2 right )}", // TODO check (cos/in miss {}) - u"sin \u03B1 \u00B1 sin \u03B2 =2 sin {1} over {2} left (\u03B1\u00B1\u03B2 right ) cos {1} over {2} left (\u03B1\u2213\u03B2 right )", + u"sin \u03B1 \u00B1 sin \u03B2 =2 sin {1} over {2} left (\u03B1\u00B1\u03B2 right ) cos {1} over {2} left (\u03B1\u2213\u03B2 right )"_ustr, getFormula( getRun( getParagraph( 8 ), 1 ))); CHECK_FORMULA( // "cos {\xce\xb1} + cos {\xce\xb2} =2 cos {{1} over {2} left (\xce\xb1+\xce\xb2 right )} cos {{1} over {2} left (\xce\xb1-\xce\xb2 right )}", // TODO check (cos/sin miss {}) - u"cos \u03B1 + cos \u03B2 =2 cos {1} over {2} left (\u03B1+\u03B2 right ) cos {1} over {2} left (\u03B1-\u03B2 right )", + u"cos \u03B1 + cos \u03B2 =2 cos {1} over {2} left (\u03B1+\u03B2 right ) cos {1} over {2} left (\u03B1-\u03B2 right )"_ustr, getFormula( getRun( getParagraph( 9 ), 1 ))); } @@ -641,7 +641,7 @@ DECLARE_OOXMLEXPORT_TEST(testTableStylerPrSz, "table-style-rPr-sz.docx") DECLARE_OOXMLEXPORT_TEST(testMathLiteral, "math-literal.docx") { - CHECK_FORMULA( u"iiint from {V} to <?> {\"div\" \"F\"} dV= llint from {S} to <?> {\"F\" \u2219 \"n \" dS}", + CHECK_FORMULA( u"iiint from {V} to <?> {\"div\" \"F\"} dV= llint from {S} to <?> {\"F\" \u2219 \"n \" dS}"_ustr, getFormula( getRun( getParagraph( 1 ), 1 ))); } diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx index db2abe3513a7..ae1aa909d5fe 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx @@ -1026,7 +1026,7 @@ CPPUNIT_TEST_FIXTURE(Test, testFileOpenInputOutputError) assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr/w:pStyle", "val", "Normal"); // let's also assert that the formula was exported properly - assertXPathContent(pXmlDoc, "//w:tbl/w:tr/w:tc[2]/w:p/m:oMathPara/m:oMath/m:sSubSup/m:e/m:r/m:t", u"\u03C3"); + assertXPathContent(pXmlDoc, "//w:tbl/w:tr/w:tc[2]/w:p/m:oMathPara/m:oMath/m:sSubSup/m:e/m:r/m:t", u"\u03C3"_ustr); } CPPUNIT_TEST_FIXTURE(Test, testSingleCellTableBorders) diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx index a9742f1a3736..ce1645007d85 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx @@ -636,7 +636,7 @@ CPPUNIT_TEST_FIXTURE(Test, testDateControl) assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:sdt/w:sdtPr/w:date", "fullDate", "2014-03-05T00:00:00Z"); assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:sdt/w:sdtPr/w:date/w:dateFormat", "val", "dddd, dd' de 'MMMM' de 'yyyy"); assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:sdt/w:sdtPr/w:date/w:lid", "val", "es-ES"); - assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:sdt/w:sdtContent/w:r/w:t", u"mi\u00E9rcoles, 05 de marzo de 2014"); + assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:sdt/w:sdtContent/w:r/w:t", u"mi\u00E9rcoles, 05 de marzo de 2014"_ustr); } CPPUNIT_TEST_FIXTURE(Test, test_Tdf115030) @@ -894,7 +894,7 @@ CPPUNIT_TEST_FIXTURE(Test, test_ClosingBrace) assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/m:oMath[1]/m:d[2]/m:dPr[1]/m:endChr[1]","val",""); // tdf#154371 paragraph style Подзаголовок ур3 inherits from Heading 3 (includes list level and list id) - uno::Reference<beans::XPropertySet> xParaStyle(getStyles("ParagraphStyles")->getByName(u"Подзаголовок ур3"), uno::UNO_QUERY); + uno::Reference<beans::XPropertySet> xParaStyle(getStyles("ParagraphStyles")->getByName(u"Подзаголовок ур3"_ustr), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(2), getProperty<sal_Int16>(xParaStyle, "NumberingLevel")); CPPUNIT_ASSERT(!getProperty<OUString>(xParaStyle, "NumberingStyleName").isEmpty()); } diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx index d97fd7c237d0..872c3055cb39 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx @@ -1380,7 +1380,7 @@ DECLARE_OOXMLEXPORT_TEST(testNonBMPChar, "nonbmpchar.docx") { // Assert that UTF8 encoded non-BMP Unicode character is correct uno::Reference<text::XTextRange> xTextRange1 = getRun(getParagraph(1), 1); - CPPUNIT_ASSERT_EQUAL(OUString(u"\U00024b62"), xTextRange1->getString()); + CPPUNIT_ASSERT_EQUAL(u"\U00024b62"_ustr, xTextRange1->getString()); } CPPUNIT_TEST_FIXTURE(Test, testSpacingGroupShapeText) diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx index 253c76c13818..39badeb658ca 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx @@ -525,7 +525,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo74357, "fdo74357.docx") DECLARE_OOXMLEXPORT_TEST(testFdo55187, "fdo55187.docx") { // 0x010d was imported as a newline. - getParagraph(1, OUString(u"lup\u010Dka")); + getParagraph(1, u"lup\u010Dka"_ustr); } DECLARE_OOXMLEXPORT_TEST(testN780563, "n780563.docx") @@ -814,7 +814,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo59638, "fdo59638.docx") if (rProp.Name == "BulletChar") { // Was '*', should be 'o'. - CPPUNIT_ASSERT_EQUAL(OUString(u"\uF0B7"), rProp.Value.get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"\uF0B7"_ustr, rProp.Value.get<OUString>()); return; } } diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index e31dc1222e52..21922f19e3f1 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -963,13 +963,13 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf133647_unicode) xFields->nextElement(); uno::Reference<text::XTextField> xEnumerationAccess1(xFields->nextElement(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString(u"defined(預期結果)"), xEnumerationAccess1->getPresentation(true).trim()); + CPPUNIT_ASSERT_EQUAL(u"defined(預期結果)"_ustr, xEnumerationAccess1->getPresentation(true).trim()); uno::Reference<text::XTextField> xEnumerationAccess2(xFields->nextElement(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString(u"defined(نتيجةمتوقعة)"), xEnumerationAccess2->getPresentation(true).trim()); + CPPUNIT_ASSERT_EQUAL(u"defined(نتيجةمتوقعة)"_ustr, xEnumerationAccess2->getPresentation(true).trim()); uno::Reference<text::XTextField> xEnumerationAccess3(xFields->nextElement(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString(u"defined(ExpectedResult)"), xEnumerationAccess3->getPresentation(true).trim()); + CPPUNIT_ASSERT_EQUAL(u"defined(ExpectedResult)"_ustr, xEnumerationAccess3->getPresentation(true).trim()); } CPPUNIT_TEST_FIXTURE(Test, testTdf123389) diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx index 6edd873dc7ed..76210cd2ef20 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx @@ -694,13 +694,13 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf119200) createSwDoc("tdf119200.docx"); auto xPara = getParagraph(1); // Check that we import MathType functional symbols as symbols, not functions with missing args - CPPUNIT_ASSERT_EQUAL(OUString(u" size 12{ func \u2208 } {}"), getFormula(getRun(xPara, 1))); - CPPUNIT_ASSERT_EQUAL(OUString(u" size 12{ func \u2209 } {}"), getFormula(getRun(xPara, 2))); - CPPUNIT_ASSERT_EQUAL(OUString(u" size 12{ func \u2282 } {}"), getFormula(getRun(xPara, 3))); - CPPUNIT_ASSERT_EQUAL(OUString(u" size 12{ func \u2283 } {}"), getFormula(getRun(xPara, 4))); - CPPUNIT_ASSERT_EQUAL(OUString(u" size 12{ func \u2284 } {}"), getFormula(getRun(xPara, 5))); - CPPUNIT_ASSERT_EQUAL(OUString(u" size 12{ func \u2286 } {}"), getFormula(getRun(xPara, 6))); - CPPUNIT_ASSERT_EQUAL(OUString(u" size 12{ func \u2287 } {}"), getFormula(getRun(xPara, 7))); + CPPUNIT_ASSERT_EQUAL(u" size 12{ func \u2208 } {}"_ustr, getFormula(getRun(xPara, 1))); + CPPUNIT_ASSERT_EQUAL(u" size 12{ func \u2209 } {}"_ustr, getFormula(getRun(xPara, 2))); + CPPUNIT_ASSERT_EQUAL(u" size 12{ func \u2282 } {}"_ustr, getFormula(getRun(xPara, 3))); + CPPUNIT_ASSERT_EQUAL(u" size 12{ func \u2283 } {}"_ustr, getFormula(getRun(xPara, 4))); + CPPUNIT_ASSERT_EQUAL(u" size 12{ func \u2284 } {}"_ustr, getFormula(getRun(xPara, 5))); + CPPUNIT_ASSERT_EQUAL(u" size 12{ func \u2286 } {}"_ustr, getFormula(getRun(xPara, 6))); + CPPUNIT_ASSERT_EQUAL(u" size 12{ func \u2287 } {}"_ustr, getFormula(getRun(xPara, 7))); } CPPUNIT_TEST_FIXTURE(Test, testTdf115094) diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx index 66f2ad157bed..3759697475b1 100644 --- a/sw/qa/extras/rtfexport/rtfexport.cxx +++ b/sw/qa/extras/rtfexport/rtfexport.cxx @@ -211,14 +211,14 @@ CPPUNIT_TEST_FIXTURE(Test, testMathEscaping) { loadAndReload("math-escaping.rtf"); OUString aActual = getFormula(getRun(getParagraph(1), 1)); - CPPUNIT_ASSERT_EQUAL(OUString(u"\u00E1 \\{"), aActual); + CPPUNIT_ASSERT_EQUAL(u"\u00E1 \\{"_ustr, aActual); } CPPUNIT_TEST_FIXTURE(Test, testMathLim) { loadAndReload("math-lim.rtf"); OUString aActual = getFormula(getRun(getParagraph(1), 1)); - CPPUNIT_ASSERT_EQUAL(OUString(u"lim from {x \u2192 1} {x}"), aActual); + CPPUNIT_ASSERT_EQUAL(u"lim from {x \u2192 1} {x}"_ustr, aActual); } DECLARE_RTFEXPORT_TEST(testMathMatrix, "math-matrix.rtf") @@ -237,23 +237,23 @@ CPPUNIT_TEST_FIXTURE(Test, testMathMso2007) { loadAndReload("math-mso2007.rtf"); OUString aActual = getFormula(getRun(getParagraph(1), 1)); - OUString aExpected(u"A = \u03C0 {r} ^ {2}"); + OUString aExpected(u"A = \u03C0 {r} ^ {2}"_ustr); CPPUNIT_ASSERT_EQUAL(aExpected, aActual); aActual = getFormula(getRun(getParagraph(2), 1)); - aExpected = OUString(u"{left (x + a right )} ^ {n} = sum from {k = 0} to {n} {left (stack { n " - u"# k } right ) {x} ^ {k} {a} ^ {n \u2212 k}}"); + aExpected = u"{left (x + a right )} ^ {n} = sum from {k = 0} to {n} {left (stack { n " + u"# k } right ) {x} ^ {k} {a} ^ {n \u2212 k}}"_ustr; CPPUNIT_ASSERT_EQUAL(aExpected, aActual); aActual = getFormula(getRun(getParagraph(3), 1)); - aExpected = OUString(u"{left (1 + x right )} ^ {n} = 1 + {nx} over {1 !} + {n left (n \u2212 1 " - u"right ) {x} ^ {2}} over {2 !} + \u2026"); + aExpected = u"{left (1 + x right )} ^ {n} = 1 + {nx} over {1 !} + {n left (n \u2212 1 " + u"right ) {x} ^ {2}} over {2 !} + \u2026"_ustr; CPPUNIT_ASSERT_EQUAL(aExpected, aActual); aActual = getFormula(getRun(getParagraph(4), 1)); - aExpected = OUString(u"f left (x right ) = {a} rsub {0} + sum from {n = 1} to {\u221E} {left " - u"({a} rsub {n} cos {n\u03C0x} over {L} + {b} rsub {n} sin {n\u03C0x} " - u"over {L} right )}"); + aExpected = u"f left (x right ) = {a} rsub {0} + sum from {n = 1} to {\u221E} {left " + u"({a} rsub {n} cos {n\u03C0x} over {L} + {b} rsub {n} sin {n\u03C0x} " + u"over {L} right )}"_ustr; CPPUNIT_ASSERT_EQUAL(aExpected, aActual); aActual = getFormula(getRun(getParagraph(5), 1)); @@ -261,22 +261,22 @@ CPPUNIT_TEST_FIXTURE(Test, testMathMso2007) CPPUNIT_ASSERT_EQUAL(aExpected, aActual); aActual = getFormula(getRun(getParagraph(6), 1)); - aExpected = OUString(u"x = {\u2212 b \u00B1 sqrt {{b} ^ {2} \u2212 4 ac}} over {2 a}"); + aExpected = u"x = {\u2212 b \u00B1 sqrt {{b} ^ {2} \u2212 4 ac}} over {2 a}"_ustr; CPPUNIT_ASSERT_EQUAL(aExpected, aActual); aActual = getFormula(getRun(getParagraph(7), 1)); - aExpected = OUString(u"{e} ^ {x} = 1 + {x} over {1 !} + {{x} ^ {2}} over {2 !} + {{x} ^ {3}} " - u"over {3 !} + \u2026 , \u2212 \u221E < x < \u221E"); + aExpected = u"{e} ^ {x} = 1 + {x} over {1 !} + {{x} ^ {2}} over {2 !} + {{x} ^ {3}} " + u"over {3 !} + \u2026 , \u2212 \u221E < x < \u221E"_ustr; CPPUNIT_ASSERT_EQUAL(aExpected, aActual); aActual = getFormula(getRun(getParagraph(8), 1)); - aExpected = OUString(u"sin \u03B1 \u00B1 sin \u03B2 = 2 sin {1} over {2} left (\u03B1 \u00B1 " - u"\u03B2 right ) cos {1} over {2} left (\u03B1 \u2213 \u03B2 right )"); + aExpected = u"sin \u03B1 \u00B1 sin \u03B2 = 2 sin {1} over {2} left (\u03B1 \u00B1 " + u"\u03B2 right ) cos {1} over {2} left (\u03B1 \u2213 \u03B2 right )"_ustr; CPPUNIT_ASSERT_EQUAL(aExpected, aActual); aActual = getFormula(getRun(getParagraph(9), 1)); - aExpected = OUString(u"cos \u03B1 + cos \u03B2 = 2 cos {1} over {2} left (\u03B1 + \u03B2 " - u"right ) cos {1} over {2} left (\u03B1 \u2212 \u03B2 right )"); + aExpected = u"cos \u03B1 + cos \u03B2 = 2 cos {1} over {2} left (\u03B1 + \u03B2 " + u"right ) cos {1} over {2} left (\u03B1 \u2212 \u03B2 right )"_ustr; CPPUNIT_ASSERT_EQUAL(aExpected, aActual); } @@ -379,7 +379,7 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo77979) loadAndReload("fdo77979.odt"); CPPUNIT_ASSERT_EQUAL(1, getPages()); // font name is encoded with \fcharset of font - CPPUNIT_ASSERT_EQUAL(OUString(u"\u5FAE\u8F6F\u96C5\u9ED1"), + CPPUNIT_ASSERT_EQUAL(u"\u5FAE\u8F6F\u96C5\u9ED1"_ustr, getProperty<OUString>(getRun(getParagraph(1), 1), "CharFontName")); } @@ -480,8 +480,7 @@ DECLARE_RTFEXPORT_TEST(testFdo61507, "fdo61507.rtf") mxComponent, uno::UNO_QUERY); uno::Reference<document::XDocumentProperties> xDocumentProperties( xDocumentPropertiesSupplier->getDocumentProperties()); - CPPUNIT_ASSERT_EQUAL(OUString(u"\u00C9\u00C1\u0150\u0170\u222D"), - xDocumentProperties->getTitle()); + CPPUNIT_ASSERT_EQUAL(u"\u00C9\u00C1\u0150\u0170\u222D"_ustr, xDocumentProperties->getTitle()); // Only "Hello.", no additional characters. CPPUNIT_ASSERT_EQUAL(6, getLength()); @@ -514,8 +513,7 @@ DECLARE_RTFEXPORT_TEST(testMnor, "mnor.rtf") // \mnor wasn't handled, leading to missing quotes around "divF" and so on. OUString aActual = getFormula(getRun(getParagraph(1), 1)); CPPUNIT_ASSERT_EQUAL( - OUString( - u"iiint from {V} to <?> {\"divF\"} dV = llint from {S} to <?> {\"F\" \u2219 \"n\" dS}"), + u"iiint from {V} to <?> {\"divF\"} dV = llint from {S} to <?> {\"F\" \u2219 \"n\" dS}"_ustr, aActual); } diff --git a/sw/qa/extras/rtfexport/rtfexport2.cxx b/sw/qa/extras/rtfexport/rtfexport2.cxx index 1998262deca4..6d5812abf47a 100644 --- a/sw/qa/extras/rtfexport/rtfexport2.cxx +++ b/sw/qa/extras/rtfexport/rtfexport2.cxx @@ -178,7 +178,7 @@ DECLARE_RTFEXPORT_TEST(testFdo79384, "fdo79384.rtf") { uno::Reference<text::XTextRange> xTextRange = getRun(getParagraph(1), 1); - CPPUNIT_ASSERT_EQUAL(OUString(u"Маркеры спискамЫ"), xTextRange->getString()); + CPPUNIT_ASSERT_EQUAL(u"Маркеры спискамЫ"_ustr, xTextRange->getString()); } DECLARE_RTFEXPORT_TEST(testFdo47326, "fdo47326.rtf") @@ -227,7 +227,7 @@ DECLARE_RTFEXPORT_TEST(testFdo45394, "fdo45394.rtf") getStyles("PageStyles")->getByName("Standard"), "HeaderText"); OUString aActual = xHeaderText->getString(); // Encoding in the header was wrong. - CPPUNIT_ASSERT_EQUAL(OUString(u"\u041F\u041A \u0420\u0418\u041A"), aActual); + CPPUNIT_ASSERT_EQUAL(u"\u041F\u041A \u0420\u0418\u041A"_ustr, aActual); uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xIndexAccess(xTextTablesSupplier->getTextTables(), @@ -295,7 +295,7 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo48023) // Implicit encoding detection based on locale was missing CPPUNIT_ASSERT_EQUAL( - OUString(u"\u041F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0438\u0441\u0442"), + u"\u041F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0438\u0441\u0442"_ustr, xTextRange->getString()); }; @@ -330,7 +330,7 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo44211) auto verify = [this]() { uno::Reference<text::XTextRange> xTextRange = getRun(getParagraph(1), 1); - CPPUNIT_ASSERT_EQUAL(OUString(u"\u0105\u010D\u0119"), xTextRange->getString()); + CPPUNIT_ASSERT_EQUAL(u"\u0105\u010D\u0119"_ustr, xTextRange->getString()); }; AllSettings aSavedSettings = Application::GetSettings(); @@ -513,7 +513,10 @@ DECLARE_RTFEXPORT_TEST(testFdo36089, "fdo36089.rtf") getProperty<sal_Int16>(getRun(getParagraph(1), 2), "CharEscapement")); } -DECLARE_RTFEXPORT_TEST(testFdo48446, "fdo48446.rtf") { getParagraph(1, u"\u0418\u043C\u044F"); } +DECLARE_RTFEXPORT_TEST(testFdo48446, "fdo48446.rtf") +{ + getParagraph(1, u"\u0418\u043C\u044F"_ustr); +} DECLARE_RTFEXPORT_TEST(testFdo47495, "fdo47495.rtf") { @@ -715,7 +718,7 @@ DECLARE_RTFEXPORT_TEST(testFdo56512, "fdo56512.rtf") uno::Reference<container::XIndexAccess> xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY); uno::Reference<text::XTextRange> xTextRange(xIndexAccess->getByIndex(0), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString(u"\u05E2\u05D5\u05E1\u05E7 \u05DE\u05D5\u05E8\u05E9\u05D4 "), + CPPUNIT_ASSERT_EQUAL(u"\u05E2\u05D5\u05E1\u05E7 \u05DE\u05D5\u05E8\u05E9\u05D4 "_ustr, xTextRange->getString()); } @@ -872,7 +875,7 @@ DECLARE_RTFEXPORT_TEST(testFdo59638, "fdo59638.rtf") if (rProp.Name == "BulletChar") { // Was '*', should be 'o'. - CPPUNIT_ASSERT_EQUAL(OUString(u"\uF0B7"), rProp.Value.get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"\uF0B7"_ustr, rProp.Value.get<OUString>()); return; } } diff --git a/sw/qa/extras/rtfexport/rtfexport4.cxx b/sw/qa/extras/rtfexport/rtfexport4.cxx index 56ff343487ef..9547734711ea 100644 --- a/sw/qa/extras/rtfexport/rtfexport4.cxx +++ b/sw/qa/extras/rtfexport/rtfexport4.cxx @@ -119,7 +119,7 @@ DECLARE_RTFEXPORT_TEST(test148518, "FORMDROPDOWN.rtf") DECLARE_RTFEXPORT_TEST(test150269, "hidden-linebreaks.rtf") { - uno::Reference<text::XTextRange> xRun = getRun(getParagraph(1), 1, u"\n\n\n"); + uno::Reference<text::XTextRange> xRun = getRun(getParagraph(1), 1, u"\n\n\n"_ustr); CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xRun, "CharHidden")); } @@ -633,37 +633,37 @@ CPPUNIT_TEST_FIXTURE(Test, testClearingBreak) DECLARE_RTFEXPORT_TEST(testTdf95706, "tdf95706.rtf") { uno::Reference<text::XTextRange> xRun2 - = getRun(getParagraph(2), 1, u"\u0104\u012e\u0100\u0106\u00c4"); + = getRun(getParagraph(2), 1, u"\u0104\u012e\u0100\u0106\u00c4"_ustr); CPPUNIT_ASSERT_EQUAL(OUString("Arial"), getProperty<OUString>(xRun2, "CharFontName")); uno::Reference<text::XTextRange> xRun3 - = getRun(getParagraph(3), 1, u"\u0154\u00c1\u00c2\u0102\u00c4"); + = getRun(getParagraph(3), 1, u"\u0154\u00c1\u00c2\u0102\u00c4"_ustr); CPPUNIT_ASSERT_EQUAL(OUString("Arial"), getProperty<OUString>(xRun3, "CharFontName")); uno::Reference<text::XTextRange> xRun4 - = getRun(getParagraph(4), 1, u"\u0410\u0411\u0412\u0413\u0414"); + = getRun(getParagraph(4), 1, u"\u0410\u0411\u0412\u0413\u0414"_ustr); CPPUNIT_ASSERT_EQUAL(OUString("Arial"), getProperty<OUString>(xRun4, "CharFontName")); uno::Reference<text::XTextRange> xRun5 - = getRun(getParagraph(5), 1, u"\u0390\u0391\u0392\u0393\u0394"); + = getRun(getParagraph(5), 1, u"\u0390\u0391\u0392\u0393\u0394"_ustr); CPPUNIT_ASSERT_EQUAL(OUString("Arial"), getProperty<OUString>(xRun5, "CharFontName")); uno::Reference<text::XTextRange> xRun6 - = getRun(getParagraph(6), 1, u"\u00c0\u00c1\u00c2\u00c3\u00c4"); + = getRun(getParagraph(6), 1, u"\u00c0\u00c1\u00c2\u00c3\u00c4"_ustr); CPPUNIT_ASSERT_EQUAL(OUString("Arial"), getProperty<OUString>(xRun6, "CharFontName")); uno::Reference<text::XTextRange> xRun7 - = getRun(getParagraph(7), 1, u"\u05b0\u05b1\u05b2\u05b3\u05b4"); + = getRun(getParagraph(7), 1, u"\u05b0\u05b1\u05b2\u05b3\u05b4"_ustr); // Do not check font for Hebrew: it can be substituted by smth able to handle these chars //CPPUNIT_ASSERT_EQUAL(OUString("Arial"), getProperty<OUString>(xRun7, "CharFontName")); uno::Reference<text::XTextRange> xRun8 - = getRun(getParagraph(8), 1, u"\u06c1\u0621\u0622\u0623\u0624"); + = getRun(getParagraph(8), 1, u"\u06c1\u0621\u0622\u0623\u0624"_ustr); // Do not check font for Arabic: it can be substituted by smth able to handle these chars //CPPUNIT_ASSERT_EQUAL(OUString("Arial"), getProperty<OUString>(xRun8, "CharFontName")); uno::Reference<text::XTextRange> xRun9 - = getRun(getParagraph(9), 1, u"\u00c0\u00c1\u00c2\u0102\u00c4"); + = getRun(getParagraph(9), 1, u"\u00c0\u00c1\u00c2\u0102\u00c4"_ustr); CPPUNIT_ASSERT_EQUAL(OUString("Arial"), getProperty<OUString>(xRun9, "CharFontName")); // Ensure strange font remains strange. No reason to check content: in this case it can vary on locale @@ -672,22 +672,22 @@ DECLARE_RTFEXPORT_TEST(testTdf95706, "tdf95706.rtf") getProperty<OUString>(xRun10, "CharFontName")); uno::Reference<text::XTextRange> xRun12 - = getRun(getParagraph(12), 1, u"\u0390\u0391\u0392\u0393\u0394"); + = getRun(getParagraph(12), 1, u"\u0390\u0391\u0392\u0393\u0394"_ustr); CPPUNIT_ASSERT_EQUAL(OUString("Arial"), getProperty<OUString>(xRun12, "CharFontName")); uno::Reference<text::XTextRange> xRun13 - = getRun(getParagraph(13), 1, u"\u0390\u0391\u0392\u0393\u0394"); + = getRun(getParagraph(13), 1, u"\u0390\u0391\u0392\u0393\u0394"_ustr); CPPUNIT_ASSERT_EQUAL(OUString("Arial"), getProperty<OUString>(xRun13, "CharFontName")); uno::Reference<text::XTextRange> xRun14 = getRun(getParagraph(14), 1); CPPUNIT_ASSERT_EQUAL(OUString("Arial"), getProperty<OUString>(xRun14, "CharFontName")); uno::Reference<text::XTextRange> xRun15 - = getRun(getParagraph(15), 1, u"\u0104\u012e\u0100\u0106\u00c4"); + = getRun(getParagraph(15), 1, u"\u0104\u012e\u0100\u0106\u00c4"_ustr); CPPUNIT_ASSERT_EQUAL(OUString("Arial"), getProperty<OUString>(xRun15, "CharFontName")); uno::Reference<text::XTextRange> xRun16 - = getRun(getParagraph(16), 1, u"\u0104\u012e\u0100\u0106\u00c4"); + = getRun(getParagraph(16), 1, u"\u0104\u012e\u0100\u0106\u00c4"_ustr); CPPUNIT_ASSERT_EQUAL(OUString("Arial"), getProperty<OUString>(xRun16, "CharFontName")); } diff --git a/sw/qa/extras/rtfexport/rtfexport5.cxx b/sw/qa/extras/rtfexport/rtfexport5.cxx index c8b9ac0dc206..72efeee7ca76 100644 --- a/sw/qa/extras/rtfexport/rtfexport5.cxx +++ b/sw/qa/extras/rtfexport/rtfexport5.cxx @@ -64,7 +64,7 @@ DECLARE_RTFEXPORT_TEST(testFdo42109, "fdo42109.rtf") DECLARE_RTFEXPORT_TEST(testFdo62977, "fdo62977.rtf") { // The middle character was imported as '?' instead of the proper unicode value. - getRun(getParagraph(1), 1, OUString(u"\u5E74\uFF14\u6708")); + getRun(getParagraph(1), 1, u"\u5E74\uFF14\u6708"_ustr); } DECLARE_RTFEXPORT_TEST(testN818997, "n818997.rtf") @@ -146,7 +146,7 @@ DECLARE_RTFEXPORT_TEST(testTdf153613_inlineAfterPgBreak2, "tdf153613_inlineAfter DECLARE_RTFEXPORT_TEST(testFdo64671, "fdo64671.rtf") { // Additional '}' was inserted before the special character. - getRun(getParagraph(1), 1, OUString(u"\u017D")); + getRun(getParagraph(1), 1, u"\u017D"_ustr); } CPPUNIT_TEST_FIXTURE(Test, testFdo62044) @@ -283,7 +283,7 @@ DECLARE_RTFEXPORT_TEST(testFdo77996, "fdo77996.rtf") uno::Reference<document::XDocumentProperties> xProps( xDocumentPropertiesSupplier->getDocumentProperties()); CPPUNIT_ASSERT_EQUAL(OUString("Aln Lin (Bei Jing)"), xProps->getAuthor()); - OUString aTitle(u"\u53A6\u95E8\u94A8\u4E1A\u80A1\u4EFD\u6709\u9650\u516C\u53F8"); + OUString aTitle(u"\u53A6\u95E8\u94A8\u4E1A\u80A1\u4EFD\u6709\u9650\u516C\u53F8"_ustr); CPPUNIT_ASSERT_EQUAL(aTitle, xProps->getTitle()); uno::Reference<beans::XPropertySet> xUDProps(xProps->getUserDefinedProperties(), uno::UNO_QUERY); @@ -356,7 +356,7 @@ DECLARE_RTFEXPORT_TEST(testFdo44715, "fdo44715.rtf") DECLARE_RTFEXPORT_TEST(testFdo68076, "fdo68076.rtf") { // Encoding of the last char was wrong (more 'o' than 'y'). - getParagraph(1, u"\u041E\u0431\u044A\u0435\u043A\u0442 \u2013 \u0443"); + getParagraph(1, u"\u041E\u0431\u044A\u0435\u043A\u0442 \u2013 \u0443"_ustr); } DECLARE_RTFEXPORT_TEST(testFdo70221, "fdo70221.rtf") @@ -615,13 +615,14 @@ DECLARE_RTFEXPORT_TEST(testDprectAnchor, "dprect-anchor.rtf") DECLARE_RTFEXPORT_TEST(testFdo76628, "fdo76628.rtf") { // Should be 'SAMPLE' in Russian, was garbage. - getParagraph(1, u"\u041E\u0411\u0420\u0410\u0417\u0415\u0426"); + getParagraph(1, u"\u041E\u0411\u0420\u0410\u0417\u0415\u0426"_ustr); uno::Reference<text::XText> xHeaderText = getProperty<uno::Reference<text::XText>>( getStyles("PageStyles")->getByName("Standard"), "HeaderText"); // Should be 'prepared' in Russian, was garbage. - getParagraphOfText(1, xHeaderText, - u"\u041F\u043E\u0434\u0433\u043E\u0442\u043E\u0432\u043B\u0435\u043D\u043E"); + getParagraphOfText( + 1, xHeaderText, + u"\u041F\u043E\u0434\u0433\u043E\u0442\u043E\u0432\u043B\u0435\u043D\u043E"_ustr); } DECLARE_RTFEXPORT_TEST(testFdo77267, "fdo77267.rtf") diff --git a/sw/qa/extras/rtfexport/rtfexport6.cxx b/sw/qa/extras/rtfexport/rtfexport6.cxx index 13afa440cd2d..985dfd5ce4a9 100644 --- a/sw/qa/extras/rtfexport/rtfexport6.cxx +++ b/sw/qa/extras/rtfexport/rtfexport6.cxx @@ -49,27 +49,27 @@ DECLARE_RTFEXPORT_TEST(testFdo85889pc, "fdo85889-pc.rtf") { uno::Reference<text::XTextRange> xTextRange = getRun(getParagraph(1), 1); - CPPUNIT_ASSERT_EQUAL(OUString(u"\u00B1\u2265\u2264"), xTextRange->getString()); + CPPUNIT_ASSERT_EQUAL(u"\u00B1\u2265\u2264"_ustr, xTextRange->getString()); } DECLARE_RTFEXPORT_TEST(testFdo85889pca, "fdo85889-pca.rtf") { uno::Reference<text::XTextRange> xTextRange = getRun(getParagraph(1), 1); - CPPUNIT_ASSERT_EQUAL(OUString(u"\u00B1\u2017\u00BE"), xTextRange->getString()); + CPPUNIT_ASSERT_EQUAL(u"\u00B1\u2017\u00BE"_ustr, xTextRange->getString()); } DECLARE_RTFEXPORT_TEST(testFdo85889mac, "fdo85889-mac.rtf") { uno::Reference<text::XTextRange> xTextRange = getRun(getParagraph(1), 1); - CPPUNIT_ASSERT_EQUAL(OUString(u"\u00D2\u00DA\u00DB"), xTextRange->getString()); + CPPUNIT_ASSERT_EQUAL(u"\u00D2\u00DA\u00DB"_ustr, xTextRange->getString()); } CPPUNIT_TEST_FIXTURE(Test, testFdo72031) { auto verify = [this]() { - CPPUNIT_ASSERT_EQUAL(OUString(u"\uF0C5"), getRun(getParagraph(1), 1)->getString()); + CPPUNIT_ASSERT_EQUAL(u"\uF0C5"_ustr, getRun(getParagraph(1), 1)->getString()); }; AllSettings aSavedSettings = Application::GetSettings(); @@ -179,14 +179,13 @@ DECLARE_RTFEXPORT_TEST(testTdf151370, "tdf151370.rtf") // Here we try to read/write docvar having non-ascii name and value. So it is encoded in Unicode OUString sFieldName(u"com.sun.star.text.fieldmaster.User." "LocalChars\u00c1\u0072\u0076\u00ed\u007a\u0074\u0075\u0072\u006f\u0054" - "\u00fc\u006b\u00f6\u0072\u0066\u00fa\u0072\u00f3\u0067\u00e9\u0070"); + "\u00fc\u006b\u00f6\u0072\u0066\u00fa\u0072\u00f3\u0067\u00e9\u0070"_ustr); CPPUNIT_ASSERT_EQUAL(sal_True, xTextFieldMasters->hasByName(sFieldName)); auto xFieldMaster = xTextFieldMasters->getByName(sFieldName); - CPPUNIT_ASSERT_EQUAL( - OUString(u"\u00e1\u0072\u0076\u00ed\u007a\u0074\u0075\u0072\u006f\u0074\u00fc" - "\u006b\u00f6\u0072\u0066\u00fa\u0072\u00f3\u0067\u00e9\u0070"), - getProperty<OUString>(xFieldMaster, "Content")); + CPPUNIT_ASSERT_EQUAL(u"\u00e1\u0072\u0076\u00ed\u007a\u0074\u0075\u0072\u006f\u0074\u00fc" + "\u006b\u00f6\u0072\u0066\u00fa\u0072\u00f3\u0067\u00e9\u0070"_ustr, + getProperty<OUString>(xFieldMaster, "Content")); } DECLARE_RTFEXPORT_TEST(testTdf108416, "tdf108416.rtf") @@ -657,7 +656,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf144437) DECLARE_RTFEXPORT_TEST(testTdf131234, "tdf131234.rtf") { - uno::Reference<text::XTextRange> xRun = getRun(getParagraph(1), 1, OUString(u"Hello")); + uno::Reference<text::XTextRange> xRun = getRun(getParagraph(1), 1, u"Hello"_ustr); // Ensure that text has default font attrs in spite of style referenced // E.g. 12pt, Times New Roman, black, no bold, no italic, no underline diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index d115dc4c75b1..78409762e827 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -269,8 +269,7 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo45182) uno::Reference<container::XIndexAccess> xFootnotes = xFootnotesSupplier->getFootnotes(); uno::Reference<text::XTextRange> xTextRange(xFootnotes->getByIndex(0), uno::UNO_QUERY); // Encoding in the footnote was wrong. - CPPUNIT_ASSERT_EQUAL(OUString(u"\u017Eivnost\u00ED" SAL_NEWLINE_STRING), - xTextRange->getString()); + CPPUNIT_ASSERT_EQUAL(u"\u017Eivnost\u00ED" SAL_NEWLINE_STRING ""_ustr, xTextRange->getString()); } CPPUNIT_TEST_FIXTURE(Test, testFdo85812) @@ -850,7 +849,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf105511) DefaultLocale::set("ru-RU", batch); batch->commit(); createSwDoc("tdf105511.rtf"); - getParagraph(1, u"\u0418\u043C\u044F"); + getParagraph(1, u"\u0418\u043C\u044F"_ustr); } CPPUNIT_TEST_FIXTURE(Test, testContSectionPageBreak) diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index 57d146edee3e..13a882b7f82f 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -1755,7 +1755,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, 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 { @@ -1764,7 +1764,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testThemeViewSeparation) aValue.bIsVisible = true; aValue.nColor = COL_WHITE; aColorConfig.SetColorValue(svtools::DOCCOLOR, aValue); - aColorConfig.AddScheme(u"Light"); + aColorConfig.AddScheme(u"Light"_ustr); } SwXTextDocument* pXTextDocument = createDoc(); int nFirstViewId = SfxLokHelper::getView(); diff --git a/sw/qa/extras/txtexport/txtexport.cxx b/sw/qa/extras/txtexport/txtexport.cxx index 338af339884e..673e29ef62df 100644 --- a/sw/qa/extras/txtexport/txtexport.cxx +++ b/sw/qa/extras/txtexport/txtexport.cxx @@ -89,7 +89,7 @@ DECLARE_TXTEXPORT_TEST(testTdf120574_utf16lebom, "UTF16LEBOMCRLF.txt") { std::vector<sal_Unicode> aMemStream = readMemoryStream<sal_Unicode>(); OUString aData(aMemStream.data(), aMemStream.size()); - CPPUNIT_ASSERT_EQUAL(OUString(u"\uFEFFフー\r\nバー\r\n"), aData); + CPPUNIT_ASSERT_EQUAL(u"\uFEFFフー\r\nバー\r\n"_ustr, aData); } DECLARE_TXTEXPORT_TEST(testTdf142669_utf8, "UTF8CRLF.txt") @@ -103,7 +103,7 @@ DECLARE_TXTEXPORT_TEST(testTdf142669_utf16le, "UTF16LECRLF.txt") { std::vector<sal_Unicode> aMemStream = readMemoryStream<sal_Unicode>(); OUString aData(aMemStream.data(), aMemStream.size()); - CPPUNIT_ASSERT_EQUAL(OUString(u"フー\r\nバー\r\n"), aData); + CPPUNIT_ASSERT_EQUAL(u"フー\r\nバー\r\n"_ustr, aData); } CPPUNIT_TEST_FIXTURE(TxtExportTest, testClearingBreakExport) diff --git a/sw/qa/extras/txtimport/txtimport.cxx b/sw/qa/extras/txtimport/txtimport.cxx index 410a9311621b..87bf86274b53 100644 --- a/sw/qa/extras/txtimport/txtimport.cxx +++ b/sw/qa/extras/txtimport/txtimport.cxx @@ -88,7 +88,7 @@ CPPUNIT_TEST_FIXTURE(TxtImportTest, testTdf60145_utf8withoutbom) uno::Reference<text::XTextRange> xPara(getParagraph(1)); - CPPUNIT_ASSERT_EQUAL(OUString(u"漢a'"), xPara->getString()); + CPPUNIT_ASSERT_EQUAL(u"漢a'"_ustr, xPara->getString()); } CPPUNIT_TEST_FIXTURE(TxtImportTest, testTdf60145_utf8withbom) @@ -101,7 +101,7 @@ CPPUNIT_TEST_FIXTURE(TxtImportTest, testTdf60145_utf8withbom) uno::Reference<text::XTextRange> xPara(getParagraph(1)); - CPPUNIT_ASSERT_EQUAL(OUString(u"漢a'"), xPara->getString()); + CPPUNIT_ASSERT_EQUAL(u"漢a'"_ustr, xPara->getString()); } CPPUNIT_TEST_FIXTURE(TxtImportTest, testTdf60145_utf16lewithoutbom) @@ -114,7 +114,7 @@ CPPUNIT_TEST_FIXTURE(TxtImportTest, testTdf60145_utf16lewithoutbom) uno::Reference<text::XTextRange> xPara(getParagraph(1)); - CPPUNIT_ASSERT_EQUAL(OUString(u"漢a'"), xPara->getString()); + CPPUNIT_ASSERT_EQUAL(u"漢a'"_ustr, xPara->getString()); } CPPUNIT_TEST_FIXTURE(TxtImportTest, testTdf60145_utf16lewithbom) @@ -127,7 +127,7 @@ CPPUNIT_TEST_FIXTURE(TxtImportTest, testTdf60145_utf16lewithbom) uno::Reference<text::XTextRange> xPara(getParagraph(1)); - CPPUNIT_ASSERT_EQUAL(OUString(u"漢a'"), xPara->getString()); + CPPUNIT_ASSERT_EQUAL(u"漢a'"_ustr, xPara->getString()); } CPPUNIT_TEST_FIXTURE(TxtImportTest, testTdf92161_gb18030) @@ -140,7 +140,7 @@ CPPUNIT_TEST_FIXTURE(TxtImportTest, testTdf92161_gb18030) uno::Reference<text::XTextRange> xPara(getParagraph(1)); - CPPUNIT_ASSERT_EQUAL(OUString(u"盖闻天地之数，有十二万九千六百岁为一元。"), xPara->getString()); + CPPUNIT_ASSERT_EQUAL(u"盖闻天地之数，有十二万九千六百岁为一元。"_ustr, xPara->getString()); } CPPUNIT_TEST_FIXTURE(TxtImportTest, testTdf60145_utf16bewithoutbom) @@ -153,7 +153,7 @@ CPPUNIT_TEST_FIXTURE(TxtImportTest, testTdf60145_utf16bewithoutbom) uno::Reference<text::XTextRange> xPara(getParagraph(1)); - CPPUNIT_ASSERT_EQUAL(OUString(u"漢a'"), xPara->getString()); + CPPUNIT_ASSERT_EQUAL(u"漢a'"_ustr, xPara->getString()); } CPPUNIT_TEST_FIXTURE(TxtImportTest, testTdf60145_utf16bewithbom) @@ -166,7 +166,7 @@ CPPUNIT_TEST_FIXTURE(TxtImportTest, testTdf60145_utf16bewithbom) uno::Reference<text::XTextRange> xPara(getParagraph(1)); - CPPUNIT_ASSERT_EQUAL(OUString(u"漢a'"), xPara->getString()); + CPPUNIT_ASSERT_EQUAL(u"漢a'"_ustr, xPara->getString()); } CPPUNIT_TEST_FIXTURE(TxtImportTest, testTdf115088) diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 6d4e90ddad22..c7ed440795ac 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -416,7 +416,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testFormulaNumberWithGroupSeparator) CPPUNIT_ASSERT_EQUAL(OUString("5000*10%"), pField->GetFormula()); CPPUNIT_ASSERT_EQUAL(OUString("500"), pField->ExpandField(true, nullptr)); pWrtShell->Down(false); - CPPUNIT_ASSERT_EQUAL(OUString(u"-100,00 €"), pWrtShell->GetCursor()->GetPoint()->nNode.GetNode().GetTextNode()->GetText()); + CPPUNIT_ASSERT_EQUAL(u"-100,00 €"_ustr, pWrtShell->GetCursor()->GetPoint()->nNode.GetNode().GetTextNode()->GetText()); pWrtShell->GoNextCell(); // tdf#42518 the problem was that this was 1.900,00 € CPPUNIT_ASSERT_EQUAL(OUString("** Expression is faulty **"), pWrtShell->GetCursor()->GetPoint()->nNode.GetNode().GetTextNode()->GetText()); @@ -557,7 +557,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf147220) SwDoc* pDoc = getSwDoc(); SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell(); - pWrtShell->Insert(u"él"); + pWrtShell->Insert(u"él"_ustr); // hide and enable dispatchCommand(mxComponent, ".uno:ShowTrackedChanges", {}); @@ -572,21 +572,21 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf147220) pWrtShell->GoEndSentence(); // this did not remove the original text from the layout - pWrtShell->Replace(u"Él", false); + pWrtShell->Replace(u"Él"_ustr, false); // currently the deleted text is before the replacement text, not sure if // that is really required - CPPUNIT_ASSERT_EQUAL(OUString(u"élÉl"), + CPPUNIT_ASSERT_EQUAL(u"élÉl"_ustr, pWrtShell->GetCursor()->GetPoint()->GetNode().GetTextNode()->GetText()); - CPPUNIT_ASSERT_EQUAL(OUString(u"Él"), + CPPUNIT_ASSERT_EQUAL(u"Él"_ustr, static_cast<SwTextFrame const*>(pWrtShell->GetCursor()->GetPoint()->GetNode().GetTextNode()->getLayoutFrame(nullptr))->GetText()); SwRedlineTable const& rRedlines(pDoc->getIDocumentRedlineAccess().GetRedlineTable()); CPPUNIT_ASSERT_EQUAL(SwRedlineTable::size_type(2), rRedlines.size()); CPPUNIT_ASSERT_EQUAL(RedlineType::Delete, rRedlines[0]->GetType()); - CPPUNIT_ASSERT_EQUAL(OUString(u"él"), rRedlines[0]->GetText()); + CPPUNIT_ASSERT_EQUAL(u"él"_ustr, rRedlines[0]->GetText()); CPPUNIT_ASSERT_EQUAL(RedlineType::Insert, rRedlines[1]->GetType()); - CPPUNIT_ASSERT_EQUAL(OUString(u"Él"), rRedlines[1]->GetText()); + CPPUNIT_ASSERT_EQUAL(u"Él"_ustr, rRedlines[1]->GetText()); } CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf135978) diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx b/sw/qa/extras/uiwriter/uiwriter2.cxx index fad17768fec2..a32890dffcf0 100644 --- a/sw/qa/extras/uiwriter/uiwriter2.cxx +++ b/sw/qa/extras/uiwriter/uiwriter2.cxx @@ -217,7 +217,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testRedlineMoveInsertInDelete) CPPUNIT_ASSERT_EQUAL(OUString(" "), pWrtShell->GetCursor()->GetPoint()->GetNode().GetTextNode()->GetText()); pWrtShell->SetRedlineFlags(mode); // show again - CPPUNIT_ASSERT_EQUAL(OUString(u"\u0001 foo"), + CPPUNIT_ASSERT_EQUAL(u"\u0001 foo"_ustr, pWrtShell->GetCursor()->GetPoint()->GetNode().GetTextNode()->GetText()); } diff --git a/sw/qa/extras/uiwriter/uiwriter6.cxx b/sw/qa/extras/uiwriter/uiwriter6.cxx index a02ebf08c6a0..74221022bd6d 100644 --- a/sw/qa/extras/uiwriter/uiwriter6.cxx +++ b/sw/qa/extras/uiwriter/uiwriter6.cxx @@ -1855,7 +1855,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testRedlineAutoCorrect2) // Continue it: emulateTyping(*pTextDoc, u"Lorem,... "); - sReplaced = u"Lorem,... Lorem,… "; + sReplaced = u"Lorem,... Lorem,… "_ustr; CPPUNIT_ASSERT_EQUAL(sReplaced, getParagraph(1)->getString()); } @@ -1872,7 +1872,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testEmojiAutoCorrect) // without change tracking CPPUNIT_ASSERT(!(pWrtShell->GetRedlineFlags() & RedlineFlags::On)); emulateTyping(*pTextDoc, u":snowman:"); - OUString sReplaced = u"☃Lorem,"; + OUString sReplaced = u"☃Lorem,"_ustr; CPPUNIT_ASSERT_EQUAL(sReplaced, getParagraph(1)->getString()); // with change tracking (showing redlines) @@ -1883,7 +1883,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testEmojiAutoCorrect) CPPUNIT_ASSERT(nMode & RedlineFlags::ShowDelete); emulateTyping(*pTextDoc, u":snowman:"); - sReplaced = u"☃☃Lorem,"; + sReplaced = u"☃☃Lorem,"_ustr; // tdf#140674 This was ":snowman:" instead of autocorrect CPPUNIT_ASSERT_EQUAL(sReplaced, getParagraph(1)->getString()); @@ -1899,7 +1899,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf108423) // testing autocorrect of i' -> I' on start of first paragraph emulateTyping(*pTextDoc, u"i'"); // The word "i" should be capitalized due to autocorrect, followed by a typographical apostrophe - OUString sIApostrophe(u"I\u2019"); + OUString sIApostrophe(u"I\u2019"_ustr); CPPUNIT_ASSERT_EQUAL(sIApostrophe, getParagraph(1)->getString()); emulateTyping(*pTextDoc, u" i'"); OUString sText(sIApostrophe + u" " + sIApostrophe); @@ -1938,7 +1938,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf106164) SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get()); // testing autocorrect of we're -> We're on start of first paragraph emulateTyping(*pTextDoc, u"we're "); - CPPUNIT_ASSERT_EQUAL(OUString(u"We\u2019re "), getParagraph(1)->getString()); + CPPUNIT_ASSERT_EQUAL(u"We\u2019re "_ustr, getParagraph(1)->getString()); } CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf54409) @@ -1950,7 +1950,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf54409) SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get()); // testing autocorrect of "tset -> "test with typographical double quotation mark U+201C emulateTyping(*pTextDoc, u"\"test "); - OUString sReplaced(u"\u201Ctest "); + OUString sReplaced(u"\u201Ctest "_ustr); CPPUNIT_ASSERT_EQUAL(sReplaced, getParagraph(1)->getString()); // testing autocorrect of test" -> test" with typographical double quotation mark U+201D emulateTyping(*pTextDoc, u"and tset\" "); @@ -1971,7 +1971,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf38394) SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get()); // testing autocorrect of French l'" -> l'« (instead of l'») emulateTyping(*pTextDoc, u"l'\""); - OUString sReplaced(u"l\u2019« "); + OUString sReplaced(u"l\u2019« "_ustr); CPPUNIT_ASSERT_EQUAL(sReplaced, getParagraph(1)->getString()); // tdf#132301 autocorrect of qu'« emulateTyping(*pTextDoc, u" qu'\""); @@ -1988,7 +1988,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf59666) SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get()); // testing missing autocorrect of single Greek letters emulateTyping(*pTextDoc, u"π "); - CPPUNIT_ASSERT_EQUAL(OUString(u"\u03C0 "), getParagraph(1)->getString()); + CPPUNIT_ASSERT_EQUAL(u"\u03C0 "_ustr, getParagraph(1)->getString()); } CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf133524) @@ -2001,7 +2001,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf133524) // 1. Testing autocorrect of >> and << // Example: »word« emulateTyping(*pTextDoc, u">>"); - OUString sReplaced(u"»"); + OUString sReplaced(u"»"_ustr); CPPUNIT_ASSERT_EQUAL(sReplaced, getParagraph(1)->getString()); // << emulateTyping(*pTextDoc, u"word<<"); @@ -2061,7 +2061,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf133524_Romanian) // Example: „Sentence and «word».” // opening primary level quote emulateTyping(*pTextDoc, u"\""); - OUString sReplaced(u"„"); + OUString sReplaced(u"„"_ustr); CPPUNIT_ASSERT_EQUAL(sReplaced, getParagraph(1)->getString()); // opening second level quote emulateTyping(*pTextDoc, u"Sentence and \""); @@ -2094,7 +2094,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf128860) SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get()); // Second level ending quote: ‚word' -> ,word‘ emulateTyping(*pTextDoc, u",word'"); - OUString sReplaced(u",word\u2019"); + OUString sReplaced(u",word\u2019"_ustr); CPPUNIT_ASSERT_EQUAL(sReplaced, getParagraph(1)->getString()); // Us apostrophe without preceding starting quote: word' -> word’ emulateTyping(*pTextDoc, u" word'"); @@ -2123,7 +2123,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf123786) SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get()); // Second level ending quote: „word' -> „word“ emulateTyping(*pTextDoc, u"„слово'"); - OUString sReplaced(u"„слово“"); + OUString sReplaced(u"„слово“"_ustr); CPPUNIT_ASSERT_EQUAL(sReplaced, getParagraph(1)->getString()); // Us apostrophe without preceding starting quote: word' -> word’ emulateTyping(*pTextDoc, u" слово'"); @@ -2145,7 +2145,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf133589) SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get()); // translitere words to Old Hungarian emulateTyping(*pTextDoc, u"székely "); - OUString sReplaced(u"𐳥𐳋𐳓𐳉𐳗 "); + OUString sReplaced(u"𐳥𐳋𐳓𐳉𐳗 "_ustr); CPPUNIT_ASSERT_EQUAL(sReplaced, getParagraph(1)->getString()); // disambiguate consonants: asszony -> asz|szony emulateTyping(*pTextDoc, u"asszony "); @@ -2383,11 +2383,11 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf143176) dispatchCommand(mxComponent, ".uno:AutoFormatApply", {}); // This was the original "Lorem ipsum..." - CPPUNIT_ASSERT_EQUAL(OUString(u"𐲖𐳛𐳢𐳉𐳘 𐳐𐳠𐳤𐳪𐳘 𐳇𐳛𐳖𐳛𐳢 " - u"𐳤𐳐𐳦 𐳀𐳘𐳉𐳦⹁"), + CPPUNIT_ASSERT_EQUAL(u"𐲖𐳛𐳢𐳉𐳘 𐳐𐳠𐳤𐳪𐳘 𐳇𐳛𐳖𐳛𐳢 " + u"𐳤𐳐𐳦 𐳀𐳘𐳉𐳦⹁"_ustr, getParagraph(1)->getString()); - CPPUNIT_ASSERT_EQUAL(OUString(u"𐳄𐳛𐳙𐳤𐳉𐳄𐳦𐳉𐳦𐳪𐳢 " - u"𐳀𐳇𐳐𐳠𐳐𐳤𐳄𐳐𐳙𐳍 𐳉𐳖𐳐𐳦."), + CPPUNIT_ASSERT_EQUAL(u"𐳄𐳛𐳙𐳤𐳉𐳄𐳦𐳉𐳦𐳪𐳢 " + u"𐳀𐳇𐳐𐳠𐳐𐳤𐳄𐳐𐳙𐳍 𐳉𐳖𐳐𐳦."_ustr, getParagraph(2)->getString()); } @@ -2713,7 +2713,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf155407) // Without the fix in place, this would fail with // - Expected: Foo – 11’—’22 // - Actual : Foo – 11’--’22 - CPPUNIT_ASSERT_EQUAL(OUString(u"Foo – 11’—’22 "), getParagraph(1)->getString()); + CPPUNIT_ASSERT_EQUAL(u"Foo – 11’—’22 "_ustr, getParagraph(1)->getString()); } dispatchCommand(mxComponent, ".uno:SelectAll", {}); // start again @@ -2723,7 +2723,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf155407) // Without the fix in place, this would fail with // - Expected: Bar – 111–222 // - Actual : Bar – 111-–22 - CPPUNIT_ASSERT_EQUAL(OUString(u"Bar – 111–222 "), getParagraph(1)->getString()); + CPPUNIT_ASSERT_EQUAL(u"Bar – 111–222 "_ustr, getParagraph(1)->getString()); } } diff --git a/sw/qa/extras/uiwriter/uiwriter7.cxx b/sw/qa/extras/uiwriter/uiwriter7.cxx index 9185f58bec56..f29e75e8c65e 100644 --- a/sw/qa/extras/uiwriter/uiwriter7.cxx +++ b/sw/qa/extras/uiwriter/uiwriter7.cxx @@ -154,7 +154,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf79236) SwDoc* pDoc = getSwDoc(); sw::UndoManager& rUndoManager = pDoc->GetUndoManager(); //Getting some paragraph style - SwTextFormatColl* pTextFormat = pDoc->FindTextFormatCollByName(u"Body Text"); + SwTextFormatColl* pTextFormat = pDoc->FindTextFormatCollByName(u"Body Text"_ustr); const SwAttrSet& rAttrSet = pTextFormat->GetAttrSet(); std::unique_ptr<SfxItemSet> pNewSet = rAttrSet.Clone(); sal_uInt16 initialCount = pNewSet->Count(); @@ -175,7 +175,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf79236) //Setting the updated item set on the style pDoc->ChgFormat(*pTextFormat, *pNewSet); //Checking the Changes - SwTextFormatColl* pTextFormat2 = pDoc->FindTextFormatCollByName(u"Body Text"); + SwTextFormatColl* pTextFormat2 = pDoc->FindTextFormatCollByName(u"Body Text"_ustr); const SwAttrSet& rAttrSet2 = pTextFormat2->GetAttrSet(); const SvxAdjustItem& rAdjustItem2 = rAttrSet2.GetAdjust(); SvxAdjust Adjust2 = rAdjustItem2.GetAdjust(); @@ -183,7 +183,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf79236) CPPUNIT_ASSERT_EQUAL(SvxAdjust::Right, Adjust2); //Undo the changes rUndoManager.Undo(); - SwTextFormatColl* pTextFormat3 = pDoc->FindTextFormatCollByName(u"Body Text"); + SwTextFormatColl* pTextFormat3 = pDoc->FindTextFormatCollByName(u"Body Text"_ustr); const SwAttrSet& rAttrSet3 = pTextFormat3->GetAttrSet(); const SvxAdjustItem& rAdjustItem3 = rAttrSet3.GetAdjust(); SvxAdjust Adjust3 = rAdjustItem3.GetAdjust(); @@ -191,7 +191,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf79236) CPPUNIT_ASSERT_EQUAL(SvxAdjust::Left, Adjust3); //Redo the changes rUndoManager.Redo(); - SwTextFormatColl* pTextFormat4 = pDoc->FindTextFormatCollByName(u"Body Text"); + SwTextFormatColl* pTextFormat4 = pDoc->FindTextFormatCollByName(u"Body Text"_ustr); const SwAttrSet& rAttrSet4 = pTextFormat4->GetAttrSet(); const SvxAdjustItem& rAdjustItem4 = rAttrSet4.GetAdjust(); SvxAdjust Adjust4 = rAdjustItem4.GetAdjust(); @@ -199,7 +199,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf79236) CPPUNIT_ASSERT_EQUAL(SvxAdjust::Right, Adjust4); //Undo the changes rUndoManager.Undo(); - SwTextFormatColl* pTextFormat5 = pDoc->FindTextFormatCollByName(u"Body Text"); + SwTextFormatColl* pTextFormat5 = pDoc->FindTextFormatCollByName(u"Body Text"_ustr); const SwAttrSet& rAttrSet5 = pTextFormat5->GetAttrSet(); const SvxAdjustItem& rAdjustItem5 = rAttrSet5.GetAdjust(); SvxAdjust Adjust5 = rAdjustItem5.GetAdjust(); @@ -2076,7 +2076,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf86639) createSwDoc("tdf86639.rtf"); SwDoc* pDoc = getSwDoc(); SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell(); - SwTextFormatColl* pColl = pDoc->FindTextFormatCollByName(u"Heading"); + SwTextFormatColl* pColl = pDoc->FindTextFormatCollByName(u"Heading"_ustr); pWrtShell->SetTextFormatColl(pColl); OUString aExpected = pColl->GetAttrSet().GetFont().GetFamilyName(); // This was Calibri, should be Liberation Sans. @@ -2414,8 +2414,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf89954) SwNodeIndex aNodeIndex(pDoc->GetNodes().GetEndOfContent(), -1); // Placeholder character for the comment anchor was ^A (CH_TXTATR_BREAKWORD), not <fff9> (CH_TXTATR_INWORD). // As a result, autocorrect did not turn the 't' input into 'T'. - CPPUNIT_ASSERT_EQUAL(OUString(u"Tes\uFFF9t. Test."), - aNodeIndex.GetNode().GetTextNode()->GetText()); + CPPUNIT_ASSERT_EQUAL(u"Tes\uFFF9t. Test."_ustr, aNodeIndex.GetNode().GetTextNode()->GetText()); } CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf89720) diff --git a/sw/qa/extras/uiwriter/uiwriter8.cxx b/sw/qa/extras/uiwriter/uiwriter8.cxx index b4dbaa771593..d61bbf289663 100644 --- a/sw/qa/extras/uiwriter/uiwriter8.cxx +++ b/sw/qa/extras/uiwriter/uiwriter8.cxx @@ -2625,7 +2625,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf151801) SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get()); // Single starting quote: 'word -> ›word emulateTyping(*pTextDoc, u"'word"); - OUString sReplaced(u"\u203Aword"); + OUString sReplaced(u"\u203Aword"_ustr); CPPUNIT_ASSERT_EQUAL(sReplaced, getParagraph(1)->getString()); // Single ending quote: ›word' -> ›word‹ emulateTyping(*pTextDoc, u"'"); diff --git a/sw/qa/extras/ww8export/ww8export2.cxx b/sw/qa/extras/ww8export/ww8export2.cxx index 51544b956abe..ef2142114872 100644 --- a/sw/qa/extras/ww8export/ww8export2.cxx +++ b/sw/qa/extras/ww8export/ww8export2.cxx @@ -617,7 +617,7 @@ DECLARE_WW8EXPORT_TEST(testTdf67207_MERGEFIELD, "mailmerge.doc") CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.text.TextField.Database")); OUString sValue; xTextField->getPropertyValue("Content") >>= sValue; - CPPUNIT_ASSERT_EQUAL(OUString(u"«Name»"), sValue); + CPPUNIT_ASSERT_EQUAL(u"«Name»"_ustr, sValue); uno::Reference<beans::XPropertySet> xFiledMaster = xDependent->getTextFieldMaster(); uno::Reference<lang::XServiceInfo> xFiledMasterServiceInfo(xFiledMaster, uno::UNO_QUERY_THROW); diff --git a/sw/qa/extras/ww8export/ww8export3.cxx b/sw/qa/extras/ww8export/ww8export3.cxx index 3f80ff8dcc9d..749297cf3049 100644 --- a/sw/qa/extras/ww8export/ww8export3.cxx +++ b/sw/qa/extras/ww8export/ww8export3.cxx @@ -879,7 +879,7 @@ CPPUNIT_TEST_FIXTURE(Test, testRtlGutter) DECLARE_WW8EXPORT_TEST(testTdf94326_notOutlineNumbering, "tdf94326_notOutlineNumbering.doc") { // The directly applied numbering list must not be lost. - uno::Reference<beans::XPropertySet> xPara(getParagraph(2, u"ОБЩИЕ ПОЛОЖЕНИЯ"), uno::UNO_QUERY); + uno::Reference<beans::XPropertySet> xPara(getParagraph(2, u"ОБЩИЕ ПОЛОЖЕНИЯ"_ustr), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(OUString("1."), getProperty<OUString>(xPara, "ListLabelString")); } diff --git a/sw/qa/extras/ww8export/ww8export4.cxx b/sw/qa/extras/ww8export/ww8export4.cxx index 0d101f818acf..837f65c2e5ae 100644 --- a/sw/qa/extras/ww8export/ww8export4.cxx +++ b/sw/qa/extras/ww8export/ww8export4.cxx @@ -105,7 +105,7 @@ DECLARE_WW8EXPORT_TEST(testTdf90408B, "tdf90408B.doc") uno::Reference<beans::XPropertySet> xRun(getRun(xPara, 1), uno::UNO_QUERY_THROW); CPPUNIT_ASSERT_EQUAL_MESSAGE("checkbox is 28pt", 28.f, getProperty<float>(xRun, "CharHeight")); - xRun.set(getRun(xPara, 2, u" Κατάψυξη, "), uno::UNO_QUERY_THROW); + xRun.set(getRun(xPara, 2, u" Κατάψυξη, "_ustr), uno::UNO_QUERY_THROW); CPPUNIT_ASSERT_EQUAL_MESSAGE("text is 10pt", 10.f, getProperty<float>(xRun, "CharHeight")); } diff --git a/sw/qa/filter/ww8/ww8.cxx b/sw/qa/filter/ww8/ww8.cxx index ebd4e3d38d36..03c922a4c3f4 100644 --- a/sw/qa/filter/ww8/ww8.cxx +++ b/sw/qa/filter/ww8/ww8.cxx @@ -183,7 +183,7 @@ CPPUNIT_TEST_FIXTURE(Test, testDocxSymbolFontExport) uno::Reference<text::XText> xText = xTextDocument->getText(); uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor(); - xText->insertString(xCursor, u"", true); + xText->insertString(xCursor, u""_ustr, true); uno::Reference<text::XTextRange> xRange = xCursor; uno::Reference<beans::XPropertySet> xTextProps(xRange, uno::UNO_QUERY); diff --git a/sw/qa/uibase/wrtsh/wrtsh.cxx b/sw/qa/uibase/wrtsh/wrtsh.cxx index a2d9fdc37514..125a80584026 100644 --- a/sw/qa/uibase/wrtsh/wrtsh.cxx +++ b/sw/qa/uibase/wrtsh/wrtsh.cxx @@ -104,7 +104,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTickCheckboxContentControl) uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY); uno::Reference<text::XText> xText = xTextDocument->getText(); uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor(); - xText->insertString(xCursor, OUString(u"☒"), /*bAbsorb=*/false); + xText->insertString(xCursor, u"☒"_ustr, /*bAbsorb=*/false); xCursor->gotoStart(/*bExpand=*/false); xCursor->gotoEnd(/*bExpand=*/true); uno::Reference<text::XTextContent> xContentControl( @@ -112,8 +112,8 @@ CPPUNIT_TEST_FIXTURE(Test, testTickCheckboxContentControl) uno::Reference<beans::XPropertySet> xContentControlProps(xContentControl, uno::UNO_QUERY); xContentControlProps->setPropertyValue("Checkbox", uno::Any(true)); xContentControlProps->setPropertyValue("Checked", uno::Any(true)); - xContentControlProps->setPropertyValue("CheckedState", uno::Any(OUString(u"☒"))); - xContentControlProps->setPropertyValue("UncheckedState", uno::Any(OUString(u"☐"))); + xContentControlProps->setPropertyValue("CheckedState", uno::Any(u"☒"_ustr)); + xContentControlProps->setPropertyValue("UncheckedState", uno::Any(u"☐"_ustr)); xText->insertTextContent(xCursor, xContentControl, /*bAbsorb=*/true); // When clicking on that content control: @@ -130,7 +130,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTickCheckboxContentControl) // - Expected: ☐ // - Actual : ☒ // i.e. the text node's text was "Ballot Box with X", not just "Ballot Box". - CPPUNIT_ASSERT_EQUAL(OUString(u"☐"), pTextNode->GetExpandText(pWrtShell->GetLayout())); + CPPUNIT_ASSERT_EQUAL(u"☐"_ustr, pTextNode->GetExpandText(pWrtShell->GetLayout())); } CPPUNIT_TEST_FIXTURE(Test, testInsertContentControl) diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx index 63c2720f7f64..56c1274a8726 100644 --- a/sw/source/core/doc/DocumentStylePoolManager.cxx +++ b/sw/source/core/doc/DocumentStylePoolManager.cxx @@ -2184,7 +2184,7 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId ) aFormat.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER); aFormat.SetIncludeUpperLevels( 1 ); - aFormat.SetListFormat("", u")", 2); + aFormat.SetListFormat("", u")"_ustr, 2); aFormat.SetNumAdjust( SvxAdjust::Left ); if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION ) diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx index 6dcdc99d3b47..ccbf299b1e7d 100644 --- a/sw/source/core/fields/textapi.cxx +++ b/sw/source/core/fields/textapi.cxx @@ -50,13 +50,13 @@ static const SvxItemPropertySet* ImplGetSvxTextPortionPropertySet() SVX_UNOEDIT_PARA_PROPERTIES, {UNO_NAME_PARA_STYLE_NAME, WID_PARASTYLENAME, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, - {u"TextField", EE_FEATURE_FIELD, + {u"TextField"_ustr, EE_FEATURE_FIELD, cppu::UnoType<text::XTextField>::get(), beans::PropertyAttribute::READONLY, 0 }, - {u"TextPortionType", WID_PORTIONTYPE, + {u"TextPortionType"_ustr, WID_PORTIONTYPE, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 }, - {u"TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, + {u"TextUserDefinedAttributes"_ustr, EE_CHAR_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - {u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, + {u"ParaUserDefinedAttributes"_ustr, EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, }; static SvxItemPropertySet aSvxTextPortionPropertySet( aSvxTextPortionPropertyMap, EditEngine::GetGlobalItemPool() ); diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index 10a7671279da..f8b2c3a41459 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -1125,8 +1125,8 @@ namespace sw::mark { dynamic_cast<ICheckboxFieldmark const*>(pBM)); assert(pCheckboxFm); return pCheckboxFm->IsChecked() - ? OUString(u"\u2612") - : OUString(u"\u2610"); + ? u"\u2612"_ustr + : u"\u2610"_ustr; } assert(pBM->GetFieldname() == ODF_FORMDROPDOWN); const IFieldmark::parameter_map_t* const pParameters = pBM->GetParameters(); diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx index 63db34aa3fbc..44929dcfff71 100644 --- a/sw/source/core/unocore/unomap.cxx +++ b/sw/source/core/unocore/unomap.cxx @@ -245,19 +245,19 @@ o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetPropertyM { static SfxItemPropertyMapEntry const aPageMap_Impl[] = { - { u"BorderBottom", WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), PropertyAttribute::MAYBEVOID, 0}, - { u"BorderLeft", WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), PropertyAttribute::MAYBEVOID, 0}, - { u"BorderRight", WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), PropertyAttribute::MAYBEVOID, 0}, - { u"BorderTop", WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), PropertyAttribute::MAYBEVOID, 0}, - { u"Height", WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), PropertyAttribute::MAYBEVOID, 0}, - { u"Width", WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), PropertyAttribute::MAYBEVOID, 0}, - { u"Number", WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID, 0}, - { u"Orientation", WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0}, - { u"UserDefinedAttributes", WID_PAGE_USERATTRIBS, ::cppu::UnoType<container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0}, - { u"IsBackgroundDark", WID_PAGE_ISDARK, ::cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0}, - { u"NavigationOrder", WID_NAVORDER, ::cppu::UnoType<container::XIndexAccess>::get(), PropertyAttribute::MAYBEVOID, 0}, - { u"BackgroundFullSize", WID_PAGE_BACKFULL, ::cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID, 0}, - { u"Theme", WID_PAGE_THEME, cppu::UnoType<util::XTheme>::get(), PropertyAttribute::MAYBEVOID, 0} + { u"BorderBottom"_ustr, WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), PropertyAttribute::MAYBEVOID, 0}, + { u"BorderLeft"_ustr, WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), PropertyAttribute::MAYBEVOID, 0}, + { u"BorderRight"_ustr, WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), PropertyAttribute::MAYBEVOID, 0}, + { u"BorderTop"_ustr, WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), PropertyAttribute::MAYBEVOID, 0}, + { u"Height"_ustr, WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), PropertyAttribute::MAYBEVOID, 0}, + { u"Width"_ustr, WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), PropertyAttribute::MAYBEVOID, 0}, + { u"Number"_ustr, WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID, 0}, + { u"Orientation"_ustr, WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0}, + { u"UserDefinedAttributes"_ustr, WID_PAGE_USERATTRIBS, ::cppu::UnoType<container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0}, + { u"IsBackgroundDark"_ustr, WID_PAGE_ISDARK, ::cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0}, + { u"NavigationOrder"_ustr, WID_NAVORDER, ::cppu::UnoType<container::XIndexAccess>::get(), PropertyAttribute::MAYBEVOID, 0}, + { u"BackgroundFullSize"_ustr, WID_PAGE_BACKFULL, ::cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID, 0}, + { u"Theme"_ustr, WID_PAGE_THEME, cppu::UnoType<util::XTheme>::get(), PropertyAttribute::MAYBEVOID, 0} }; m_aMapEntriesArr[nPropertyId] = aPageMap_Impl; } @@ -593,7 +593,7 @@ o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetPropertyM static SfxItemPropertyMapEntry const aFieldmarkMap_Impl[] = { // FIXME: is this supposed to actually exist as UNO property, or is it supposed to be in the "parameters" of the field? - { u"Checked", 0, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, + { u"Checked"_ustr, 0, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, }; m_aMapEntriesArr[nPropertyId] = aFieldmarkMap_Impl; } @@ -666,7 +666,7 @@ o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetPropertyM { UNO_NAME_APPLY_FORM_DESIGN_MODE, WID_DOC_APPLY_FORM_DESIGN_MODE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, { UNO_NAME_RUNTIME_UID, WID_DOC_RUNTIME_UID, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0}, { UNO_NAME_LOCK_UPDATES, WID_DOC_LOCK_UPDATES, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, - { u"UndocumentedWriterfilterHack", WID_DOC_WRITERFILTER, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, + { u"UndocumentedWriterfilterHack"_ustr, WID_DOC_WRITERFILTER, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, { UNO_NAME_HAS_VALID_SIGNATURES, WID_DOC_HAS_VALID_SIGNATURES, cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0}, { UNO_NAME_BUILDID, WID_DOC_BUILDID, cppu::UnoType<OUString>::get(), 0, 0}, { UNO_NAME_DOC_INTEROP_GRAB_BAG, WID_DOC_INTEROP_GRAB_BAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0 }, diff --git a/sw/source/core/unocore/unomap1.cxx b/sw/source/core/unocore/unomap1.cxx index 67112cd7a003..aae854fc24e0 100644 --- a/sw/source/core/unocore/unomap1.cxx +++ b/sw/source/core/unocore/unomap1.cxx @@ -433,7 +433,7 @@ o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetFrameStyl { UNO_NAME_ALLOW_OVERLAP, RES_WRAP_INFLUENCE_ON_OBJPOS, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_ALLOW_OVERLAP}, { UNO_NAME_WRITING_MODE, RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 }, { UNO_NAME_HIDDEN, FN_UNO_HIDDEN, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, - { u"Decorative", RES_DECORATIVE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 }, + { u"Decorative"_ustr, RES_DECORATIVE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 }, { UNO_NAME_TEXT_VERT_ADJUST, RES_TEXT_VERT_ADJUST, cppu::UnoType<css::drawing::TextVerticalAdjust>::get(), PROPERTY_NONE ,0}, // added FillProperties for SW, same as FILL_PROPERTIES in svx @@ -586,8 +586,8 @@ o3tl::span<const SfxItemPropertyMapEntry> SwUnoPropertyMapProvider::GetPageStyle // and uno types (see loop at end of this method and definition of SW_PROP_NMID) // This entry is for adding that properties to style import/export FILL_PROPERTIES_SW - { u"BackgroundFullSize", RES_BACKGROUND_FULL_SIZE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 }, - { u"RtlGutter", RES_RTL_GUTTER, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 }, + { u"BackgroundFullSize"_ustr, RES_BACKGROUND_FULL_SIZE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 }, + { u"RtlGutter"_ustr, RES_RTL_GUTTER, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 }, // Added DrawingLayer FillStyle Properties for Header. These need an own unique name, // but reuse the same WhichIDs as the regular fill. The implementation will decide to which diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 7879d44035b2..61319d5e2f3b 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -1481,7 +1481,7 @@ void DocxExport::WriteTheme() m_rFilter.addRelation(m_pDocumentFS->getOutputStream(), oox::getRelationship(Relationship::THEME), u"theme/theme1.xml" ); oox::ThemeExport aThemeExport(&m_rFilter, oox::drawingml::DOCUMENT_DOCX); - aThemeExport.write(u"word/theme/theme1.xml", *pTheme); + aThemeExport.write(u"word/theme/theme1.xml"_ustr, *pTheme); } // See OOXMLDocumentImpl::resolveGlossaryStream diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx index 5ffd32f4c25b..04a5d015050f 100644 --- a/sw/source/filter/ww8/docxexportfilter.cxx +++ b/sw/source/filter/ww8/docxexportfilter.cxx @@ -79,7 +79,7 @@ bool DocxExportFilter::exportDocument() { uno::Reference<embed::XStorage> xDocumentStorage = xStorageBasedDocument->getDocumentStorage(); - if (xDocumentStorage.is() && xDocumentStorage->hasByName(u"_MS_VBA_Macros")) + if (xDocumentStorage.is() && xDocumentStorage->hasByName(u"_MS_VBA_Macros"_ustr)) { // Let user know that macros won't be saved in this format std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog( diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index 689206c9e92d..d0148ac4ace3 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -407,10 +407,10 @@ void SwXMLExport::GetConfigurationSettings( Sequence < PropertyValue >& rProps) // the document this is a copy of Reference<XPropertySet> rInfoSet = getExportInfo(); - if (!rInfoSet.is() || !rInfoSet->getPropertySetInfo()->hasPropertyByName(u"NoEmbDataSet")) + if (!rInfoSet.is() || !rInfoSet->getPropertySetInfo()->hasPropertyByName(u"NoEmbDataSet"_ustr)) return; - Any aAny = rInfoSet->getPropertyValue(u"NoEmbDataSet"); + Any aAny = rInfoSet->getPropertyValue(u"NoEmbDataSet"_ustr); bool bNoEmbDataSet = *o3tl::doAccess<bool>(aAny); if (!bNoEmbDataSet) return; diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 5a66f839a027..a1ea231d305c 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -339,7 +339,7 @@ OUString SwCompatibilityOptPage::GetAllStrings() { OUString sAllStrings; - if (const auto& pString = m_xBuilder->weld_label(u"label11")) + if (const auto& pString = m_xBuilder->weld_label(u"label11"_ustr)) sAllStrings += pString->get_label() + " "; sAllStrings += m_xDefaultPB->get_label() + " "; diff --git a/sw/source/uibase/utlui/AccessibilityStatusBarControl.cxx b/sw/source/uibase/utlui/AccessibilityStatusBarControl.cxx index d0ce67fc2349..9a99d3c578fb 100644 --- a/sw/source/uibase/utlui/AccessibilityStatusBarControl.cxx +++ b/sw/source/uibase/utlui/AccessibilityStatusBarControl.cxx @@ -50,7 +50,7 @@ void AccessibilityStatusBarControl::StateChangedAtStatusBarControl(sal_uInt16 /* } else { - GetStatusBar().SetQuickHelpText(GetId(), u""); + GetStatusBar().SetQuickHelpText(GetId(), u""_ustr); } GetStatusBar().Invalidate(); diff --git a/sw/source/uibase/utlui/tmplctrl.cxx b/sw/source/uibase/utlui/tmplctrl.cxx index 647bdcd92b94..2b68905cf41d 100644 --- a/sw/source/uibase/utlui/tmplctrl.cxx +++ b/sw/source/uibase/utlui/tmplctrl.cxx @@ -61,7 +61,7 @@ void SwTemplateControl::StateChangedAtStatusBarControl( else { GetStatusBar().SetItemText(GetId(), OUString()); - GetStatusBar().SetQuickHelpText(GetId(), u""); + GetStatusBar().SetQuickHelpText(GetId(), u""_ustr); } } diff --git a/sw/source/uibase/utlui/wordcountctrl.cxx b/sw/source/uibase/utlui/wordcountctrl.cxx index 66d520d99a21..418596918936 100644 --- a/sw/source/uibase/utlui/wordcountctrl.cxx +++ b/sw/source/uibase/utlui/wordcountctrl.cxx @@ -37,8 +37,8 @@ void SwWordCountStatusBarControl::StateChangedAtStatusBarControl( } else { - GetStatusBar().SetItemText(GetId(), u""); - GetStatusBar().SetQuickHelpText(GetId(), u""); + GetStatusBar().SetItemText(GetId(), u""_ustr); + GetStatusBar().SetQuickHelpText(GetId(), u""_ustr); } } diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 923fabb06167..921d71415d95 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -1072,10 +1072,10 @@ void SwWrtShell::InsertContentControl(SwContentControlType eType) { pContentControl->SetCheckbox(true); // Ballot Box with X - pContentControl->SetCheckedState(u"\u2612"); + pContentControl->SetCheckedState(u"\u2612"_ustr); // Ballot Box - pContentControl->SetUncheckedState(OUString(u"\u2610")); - aPlaceholder = u"\u2610"; + pContentControl->SetUncheckedState(u"\u2610"_ustr); + aPlaceholder = u"\u2610"_ustr; break; } case SwContentControlType::COMBO_BOX: diff --git a/test/qa/cppunit/dialog.cxx b/test/qa/cppunit/dialog.cxx index c69f41b58d7c..eb6996fa68f4 100644 --- a/test/qa/cppunit/dialog.cxx +++ b/test/qa/cppunit/dialog.cxx @@ -16,7 +16,7 @@ * otherwise block the test potentially indefinitely */ CPPUNIT_TEST_FIXTURE(test::AccessibleTestBase, SelfTestIncorrectDialog) { - load(u"private:factory/swriter"); + load(u"private:factory/swriter"_ustr); auto dialogWaiter = awaitDialog(u"This Dialog Does Not Exist", [](Dialog&) { CPPUNIT_ASSERT_MESSAGE("This code should not be reached", false); @@ -33,7 +33,7 @@ CPPUNIT_TEST_FIXTURE(test::AccessibleTestBase, SelfTestIncorrectDialog) * subsequent tests if caught -- especially that DialogWaiter::waitEndDialog() won't timeout. */ CPPUNIT_TEST_FIXTURE(test::AccessibleTestBase, SelfTestThrowInDialogCallback) { - load(u"private:factory/swriter"); + load(u"private:factory/swriter"_ustr); class DummyException : public std::exception { @@ -48,7 +48,7 @@ CPPUNIT_TEST_FIXTURE(test::AccessibleTestBase, SelfTestThrowInDialogCallback) // Checks timeout if dialog does not show up as expected CPPUNIT_TEST_FIXTURE(test::AccessibleTestBase, SelfTestNoDialog) { - load(u"private:factory/swriter"); + load(u"private:factory/swriter"_ustr); auto dialogWaiter = awaitDialog(u"This Dialog Did Not Show Up", [](Dialog&) { CPPUNIT_ASSERT_MESSAGE("This code should not be reached", false); diff --git a/tools/qa/cppunit/test_inetmime.cxx b/tools/qa/cppunit/test_inetmime.cxx index 12b1641890b4..958cfad77f2d 100644 --- a/tools/qa/cppunit/test_inetmime.cxx +++ b/tools/qa/cppunit/test_inetmime.cxx @@ -152,7 +152,7 @@ namespace CPPUNIT_ASSERT_EQUAL(OString("windows-1250"), i->second.m_sCharset); CPPUNIT_ASSERT_EQUAL(OString("en-gb"), i->second.m_sLanguage); // Euro currency sign, windows-1250 x80 is converted to unicode u20AC: - CPPUNIT_ASSERT_EQUAL(OUString(u"value2 \u20AC"), i->second.m_sValue); + CPPUNIT_ASSERT_EQUAL(u"value2 \u20AC"_ustr, i->second.m_sValue); CPPUNIT_ASSERT(i->second.m_bConverted); i = parameters.find("parm3"); CPPUNIT_ASSERT(i != parameters.end()); diff --git a/unotools/qa/unit/testRecodeString.cxx b/unotools/qa/unit/testRecodeString.cxx index 31e26257b96f..b24a4a27e0a4 100644 --- a/unotools/qa/unit/testRecodeString.cxx +++ b/unotools/qa/unit/testRecodeString.cxx @@ -33,9 +33,9 @@ void Test::testRecodeString() // note, the below won't work with mergelibs as the class is not visible to the linker #if !ENABLE_MERGELIBS ConvertChar const* pConversion = ConvertChar::GetRecodeData(u"starbats", u"opensymbol"); - OUString aStr(u"u"); + OUString aStr(u"u"_ustr); pConversion->RecodeString(aStr, 0, 1); - CPPUNIT_ASSERT_EQUAL(OUString(u""), aStr); + CPPUNIT_ASSERT_EQUAL(u""_ustr, aStr); #endif } diff --git a/vcl/qa/cppunit/BmpFilterTest.cxx b/vcl/qa/cppunit/BmpFilterTest.cxx index 7a4987116a67..3669f99071e3 100644 --- a/vcl/qa/cppunit/BmpFilterTest.cxx +++ b/vcl/qa/cppunit/BmpFilterTest.cxx @@ -23,7 +23,7 @@ public: return m_directories.getURLFromSrc(maDataUrl) + sFileName; } BmpFilterTest() - : maDataUrl(u"/vcl/qa/cppunit/data/") + : maDataUrl(u"/vcl/qa/cppunit/data/"_ustr) { } }; diff --git a/vcl/qa/cppunit/XpmFilterTest.cxx b/vcl/qa/cppunit/XpmFilterTest.cxx index e9358d755f90..9dff029668b6 100644 --- a/vcl/qa/cppunit/XpmFilterTest.cxx +++ b/vcl/qa/cppunit/XpmFilterTest.cxx @@ -23,7 +23,7 @@ public: return m_directories.getURLFromSrc(maDataUrl) + sFileName; } XpmFilterTest() - : maDataUrl(u"/vcl/qa/cppunit/data/") + : maDataUrl(u"/vcl/qa/cppunit/data/"_ustr) { } }; diff --git a/vcl/qa/cppunit/cjktext.cxx b/vcl/qa/cppunit/cjktext.cxx index d35208fcd6a3..91d14805544d 100644 --- a/vcl/qa/cppunit/cjktext.cxx +++ b/vcl/qa/cppunit/cjktext.cxx @@ -104,7 +104,7 @@ static tools::Long getCharacterRightSideHeight(VirtualDevice* device, const Poin // IMPORTANT: If you modify this, modify also the void VclTextTest::testSimpleText(). void VclCjkTextTest::testVerticalText() { - OUString text(u"\x30e8"); + OUString text(u"\x30e8"_ustr); ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA); device->SetOutputSizePixel(Size(100, 100)); device->SetBackground(Wallpaper(COL_WHITE)); diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx index 44a40baf0a2f..99b728d338b8 100644 --- a/vcl/qa/cppunit/complextext.cxx +++ b/vcl/qa/cppunit/complextext.cxx @@ -44,7 +44,7 @@ static std::ostream& operator<<(std::ostream& rStream, const std::vector<sal_Int class VclComplexTextTest : public test::BootstrapFixture { - OUString maDataUrl = u"/vcl/qa/cppunit/data/"; + OUString maDataUrl = u"/vcl/qa/cppunit/data/"_ustr; public: OUString getFullUrl(std::u16string_view sFileName) @@ -70,7 +70,7 @@ public: CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testArabic) { #if HAVE_MORE_FONTS - OUString aOneTwoThree(u"واحِدْ إثٍنين ثلاثةٌ"); + OUString aOneTwoThree(u"واحِدْ إثٍنين ثلاثةٌ"_ustr); vcl::Font aFont("DejaVu Sans", "Book", Size(0, 2048)); @@ -231,7 +231,7 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testCachingSubstring) // Just something basic. testCachedGlyphsSubstring( "test", "Dejavu Sans", false ); // And complex arabic text, taken from tdf104649.docx . - OUString text(u"فصل (پاره 2): درخواست حاجت از ديگران و برآوردن حاجت ديگران 90"); + OUString text(u"فصل (پاره 2): درخواست حاجت از ديگران و برآوردن حاجت ديگران 90"_ustr); testCachedGlyphsSubstring( text, "Dejavu Sans", true ); // The text is RTL, but Writer will sometimes try to lay it out as LTR, for whatever reason // (tdf#149264)./ So make sure that gets handled properly too (SalLayoutGlyphsCache should @@ -256,7 +256,7 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testCaret) tools::Long nTextWidth, nTextWidth2, nRefTextWidth; // A. RTL text - aText = u"لا بلا"; + aText = u"لا بلا"_ustr; // 1) Regular DX array, the ligature width is given to the first components // and the next ones are all zero width. @@ -277,7 +277,7 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testCaret) // 3) caret placement with combining marks, they should not add to ligature // component count. - aText = u"لَاَ بلَاَ"; + aText = u"لَاَ بلَاَ"_ustr; aRefCharWidths = { 584, 584, 1168, 1168, 1819, 2389, 3000, 3000, 3611, 3611 }; nTextWidth2 = pOutDev->GetTextArray(aText, &aCharWidths, 0, -1, /*bCaret*/true); CPPUNIT_ASSERT_EQUAL(aCharWidths[0], aCharWidths[1]); @@ -290,7 +290,7 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testCaret) CPPUNIT_ASSERT_EQUAL(sal_Int32(nTextWidth), aCharWidths.back()); // B. LTR text - aText = u"fi fl ffi ffl"; + aText = u"fi fl ffi ffl"_ustr; // 1) Regular DX array, the ligature width is given to the first components // and the next ones are all zero width. @@ -329,7 +329,7 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testGdefCaret) aFont = vcl::Font("Noto Sans Arabic", "Regular", Size(0, 1000)); pOutDev->SetFont(aFont); - aText = u"لا بلا"; + aText = u"لا بلا"_ustr; // 1) Regular DX array, the ligature width is given to the first components // and the next ones are all zero width. @@ -350,7 +350,7 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testGdefCaret) // 3) caret placement with combining marks, they should not add to ligature // component count. - aText = u"لَاَ بلَاَ"; + aText = u"لَاَ بلَاَ"_ustr; aRefCharWidths = { 291, 291, 582, 582, 842, 1111, 1410, 1410, 1710, 1710 }; nTextWidth2 = pOutDev->GetTextArray(aText, &aCharWidths, 0, -1, /*bCaret*/true); CPPUNIT_ASSERT_EQUAL(aCharWidths[0], aCharWidths[1]); @@ -367,7 +367,7 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testGdefCaret) aFont = vcl::Font("Amiri", "Regular", Size(0, 1000)); pOutDev->SetFont(aFont); - aText = u"fi ffi fl ffl fb ffb"; + aText = u"fi ffi fl ffl fb ffb"_ustr; // 1) Regular DX array, the ligature width is given to the first components // and the next ones are all zero width. @@ -393,9 +393,9 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testGdefCaret) CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf152048) { #if HAVE_MORE_FONTS - OUString aText(u"میشود"); + OUString aText(u"میشود"_ustr); - vcl::Font aFont(u"Noto Naskh Arabic", u"Regular", Size(0, 2048)); + vcl::Font aFont(u"Noto Naskh Arabic"_ustr, u"Regular"_ustr, Size(0, 2048)); ScopedVclPtrInstance<VirtualDevice> pOutDev; pOutDev->SetFont(aFont); @@ -431,14 +431,14 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf152048) CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf152048_2) { #if HAVE_MORE_FONTS - 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)); ScopedVclPtrInstance<VirtualDevice> pOutDev; pOutDev->SetFont(aFont); // get an compare the default text array KernArray aCharWidths; - auto nTextWidth = pOutDev->GetTextArray(u"ع a ع", &aCharWidths); + auto nTextWidth = pOutDev->GetTextArray(u"ع a ع"_ustr, &aCharWidths); // Text width should always be equal to the width of the last glyph in the // kern array. @@ -452,7 +452,7 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf152048_2) CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf153440) { #if HAVE_MORE_FONTS - 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)); ScopedVclPtrInstance<VirtualDevice> pOutDev; pOutDev->SetFont(aFont); @@ -491,14 +491,14 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf153440) CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf107718) { #if !defined _WIN32 // TODO: Fails on jenkins but passes locally - vcl::Font aFont(u"Source Han Sans", u"Regular", Size(0, 72)); + vcl::Font aFont(u"Source Han Sans"_ustr, u"Regular"_ustr, Size(0, 72)); ScopedVclPtrInstance<VirtualDevice> pOutDev; bool bAdded = addFont(pOutDev, u"tdf107718.otf", u"Source Han Sans"); CPPUNIT_ASSERT_EQUAL(true, bAdded); - OUString aText(u"\u4E16\u1109\u1168\u11BC\u302E"); + OUString aText(u"\u4E16\u1109\u1168\u11BC\u302E"_ustr); for (bool bVertical : { false, true }) { aFont.SetVertical(bVertical); @@ -543,12 +543,12 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf107718) CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf107612) { #if HAVE_MORE_FONTS - vcl::Font aFont(u"DejaVu Sans", u"Book", Size(0, 72)); + vcl::Font aFont(u"DejaVu Sans"_ustr, u"Book"_ustr, Size(0, 72)); ScopedVclPtrInstance<VirtualDevice> pOutDev; pOutDev->SetFont(aFont); - auto pLayout = pOutDev->ImplLayout(u"a\u202F\u1823", 0, -1, Point(0, 0), 0, {}, {}); + auto pLayout = pOutDev->ImplLayout(u"a\u202F\u1823"_ustr, 0, -1, Point(0, 0), 0, {}, {}); // If font fallback happened, then the returned layout must be a // MultiSalLayout instance. diff --git a/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx index a28907045b4e..56b2f1c5b087 100644 --- a/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx +++ b/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx @@ -235,7 +235,7 @@ void TiffFilterTest::testRoundtrip() CPPUNIT_ASSERT_EQUAL(true, aDetector.detect()); CPPUNIT_ASSERT_EQUAL(true, aDetector.checkTIF()); - CPPUNIT_ASSERT_EQUAL(OUString(u"TIF"), + CPPUNIT_ASSERT_EQUAL(u"TIF"_ustr, vcl::getImportFormatShortName(aDetector.getMetadata().mnFormat)); } diff --git a/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx index 6bbe34c50d2b..0244c388ead8 100644 --- a/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx +++ b/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx @@ -152,7 +152,7 @@ void WebpFilterTest::testRoundtrip(bool lossy) CPPUNIT_ASSERT_EQUAL(true, aDetector.detect()); CPPUNIT_ASSERT_EQUAL(true, aDetector.checkWEBP()); - CPPUNIT_ASSERT_EQUAL(OUString(u"WEBP"), + CPPUNIT_ASSERT_EQUAL(u"WEBP"_ustr, vcl::getImportFormatShortName(aDetector.getMetadata().mnFormat)); } diff --git a/vcl/qa/cppunit/mnemonic.cxx b/vcl/qa/cppunit/mnemonic.cxx index fc95fc527068..05ef7366cd21 100644 --- a/vcl/qa/cppunit/mnemonic.cxx +++ b/vcl/qa/cppunit/mnemonic.cxx @@ -49,7 +49,7 @@ void VclMnemonicTest::testMnemonic() MnemonicGenerator aGenerator; { - OUString sResult = aGenerator.CreateMnemonic(u"ßa"); + OUString sResult = aGenerator.CreateMnemonic(u"ßa"_ustr); CPPUNIT_ASSERT_EQUAL(u'~', sResult[1]); } diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx index 9709d9c57313..3977c41090e9 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx @@ -837,7 +837,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testAlternativeText) if (pS && pS->GetValue() == "Figure") { CPPUNIT_ASSERT_EQUAL( - OUString(u"This is the text alternative - This is the description"), + u"This is the text alternative - This is the description"_ustr, ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE( *dynamic_cast<vcl::filter::PDFHexStringElement*>(pObject->Lookup("Alt")))); } @@ -1209,8 +1209,8 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf115117_2a) for (int i = 0; i < nChars; i++) aChars[i] = pPdfTextPage->getUnicode(i); OUString aActualText(aChars.data(), aChars.size()); - CPPUNIT_ASSERT_EQUAL( - OUString(u"\u0627\u0644 \u0628\u0627\u0644 \u0648\u0642\u0641 \u0627\u0644"), aActualText); + CPPUNIT_ASSERT_EQUAL(u"\u0627\u0644 \u0628\u0627\u0644 \u0648\u0642\u0641 \u0627\u0644"_ustr, + aActualText); #endif } @@ -1243,7 +1243,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf154549) // Without the fix in place, this test would have failed with // - Expected: ִبي // - Actual : بִي - CPPUNIT_ASSERT_EQUAL(OUString(u"\u05B4\u0628\u064A"), aActualText); + CPPUNIT_ASSERT_EQUAL(u"\u05B4\u0628\u064A"_ustr, aActualText); #endif } @@ -1272,7 +1272,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf150846) for (int i = 0; i < nChars; i++) aChars[i] = pPdfTextPage->getUnicode(i); OUString aActualText(aChars.data(), aChars.size()); - CPPUNIT_ASSERT_EQUAL(OUString(u"hello"), aActualText); + CPPUNIT_ASSERT_EQUAL(u"hello"_ustr, aActualText); } CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf103492) @@ -1303,7 +1303,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf103492) for (int i = 0; i < nChars1; i++) aChars1[i] = pPdfTextPage1->getUnicode(i); OUString aActualText1(aChars1.data(), aChars1.size()); - CPPUNIT_ASSERT_EQUAL(OUString(u"يوسف My name is"), aActualText1); + CPPUNIT_ASSERT_EQUAL(u"يوسف My name is"_ustr, aActualText1); std::unique_ptr<vcl::pdf::PDFiumPage> pPdfPage2 = pPdfDocument->openPage(/*nIndex=*/1); CPPUNIT_ASSERT(pPdfPage2); @@ -1319,7 +1319,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf103492) for (int i = 0; i < nChars2; i++) aChars2[i] = pPdfTextPage2->getUnicode(i); OUString aActualText2(aChars2.data(), aChars2.size()); - CPPUNIT_ASSERT_EQUAL(OUString(u"My name is يوسف"), aActualText2); + CPPUNIT_ASSERT_EQUAL(u"My name is يوسف"_ustr, aActualText2); } CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf145274) @@ -4190,21 +4190,21 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf57423) switch (nFigure) { case 2: - CPPUNIT_ASSERT_EQUAL(OUString(u"QR Code - Tells how to get to Mosegaard"), + CPPUNIT_ASSERT_EQUAL(u"QR Code - Tells how to get to Mosegaard"_ustr, ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE( *dynamic_cast<vcl::filter::PDFHexStringElement*>( pObject->Lookup("Alt")))); break; case 0: - CPPUNIT_ASSERT_EQUAL(OUString(u"Title: Arrows - Description: Explains the " - u"different arrow appearances"), + CPPUNIT_ASSERT_EQUAL(u"Title: Arrows - Description: Explains the " + u"different arrow appearances"_ustr, ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE( *dynamic_cast<vcl::filter::PDFHexStringElement*>( pObject->Lookup("Alt")))); break; case 1: CPPUNIT_ASSERT_EQUAL( - OUString(u"My blue triangle - Does not need further description"), + u"My blue triangle - Does not need further description"_ustr, ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE( *dynamic_cast<vcl::filter::PDFHexStringElement*>( pObject->Lookup("Alt")))); @@ -4215,7 +4215,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf57423) if (pS && pS->GetValue() == "Formula") { CPPUNIT_ASSERT_EQUAL( - OUString(u"Equation 1 - Now we give the full description of eq 1 here"), + u"Equation 1 - Now we give the full description of eq 1 here"_ustr, ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE( *dynamic_cast<vcl::filter::PDFHexStringElement*>(pObject->Lookup("Alt")))); ++nFormula; @@ -4225,7 +4225,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf57423) switch (nDiv) { case 0: - CPPUNIT_ASSERT_EQUAL(OUString(u"This frame has a description"), + CPPUNIT_ASSERT_EQUAL(u"This frame has a description"_ustr, ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE( *dynamic_cast<vcl::filter::PDFHexStringElement*>( pObject->Lookup("Alt")))); @@ -4235,14 +4235,14 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf57423) CPPUNIT_ASSERT(!pObject->Lookup("Alt")); break; case 2: - CPPUNIT_ASSERT_EQUAL(OUString(u"My textbox - Has a light background"), + CPPUNIT_ASSERT_EQUAL(u"My textbox - Has a light background"_ustr, ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE( *dynamic_cast<vcl::filter::PDFHexStringElement*>( pObject->Lookup("Alt")))); break; case 3: - CPPUNIT_ASSERT_EQUAL(OUString(u"Hey! There is no alternate text for Frame " - u"// but maybe not needed?"), + CPPUNIT_ASSERT_EQUAL(u"Hey! There is no alternate text for Frame " + u"// but maybe not needed?"_ustr, ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE( *dynamic_cast<vcl::filter::PDFHexStringElement*>( pObject->Lookup("Alt")))); @@ -4290,14 +4290,13 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf154982) switch (nFigure) { case 0: - CPPUNIT_ASSERT_EQUAL( - OUString(u"Here comes the signature - Please sign here"), - ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE( - *dynamic_cast<vcl::filter::PDFHexStringElement*>( - pObject->Lookup("Alt")))); + CPPUNIT_ASSERT_EQUAL(u"Here comes the signature - Please sign here"_ustr, + ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE( + *dynamic_cast<vcl::filter::PDFHexStringElement*>( + pObject->Lookup("Alt")))); break; case 1: - CPPUNIT_ASSERT_EQUAL(OUString(u"Home"), + CPPUNIT_ASSERT_EQUAL(u"Home"_ustr, ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE( *dynamic_cast<vcl::filter::PDFHexStringElement*>( pObject->Lookup("Alt")))); @@ -4568,13 +4567,13 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf154955) switch (nFigure) { case 0: - CPPUNIT_ASSERT_EQUAL(OUString(u"Two rectangles - Grouped"), + CPPUNIT_ASSERT_EQUAL(u"Two rectangles - Grouped"_ustr, ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE( *dynamic_cast<vcl::filter::PDFHexStringElement*>( pObject->Lookup("Alt")))); break; case 1: - CPPUNIT_ASSERT_EQUAL(OUString(u"these ones are green"), + CPPUNIT_ASSERT_EQUAL(u"these ones are green"_ustr, ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE( *dynamic_cast<vcl::filter::PDFHexStringElement*>( pObject->Lookup("Alt")))); @@ -5130,9 +5129,9 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf142129) auto* pFirstD = pFirst->LookupObject()->GetDictionary(); CPPUNIT_ASSERT(pFirstD); //CPPUNIT_ASSERT_EQUAL(OString("Outlines"), dynamic_cast<vcl::filter::PDFNameElement*>(pFirstD->LookupElement("Type"))->GetValue()); - CPPUNIT_ASSERT_EQUAL(OUString(u"Preface"), ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE( - *dynamic_cast<vcl::filter::PDFHexStringElement*>( - pFirstD->LookupElement("Title")))); + CPPUNIT_ASSERT_EQUAL(u"Preface"_ustr, ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE( + *dynamic_cast<vcl::filter::PDFHexStringElement*>( + pFirstD->LookupElement("Title")))); auto* pFirst1 = dynamic_cast<vcl::filter::PDFReferenceElement*>(pFirstD->LookupElement("First")); @@ -5143,7 +5142,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf142129) // there are no outline entries for it //CPPUNIT_ASSERT_EQUAL(OString("Outlines"), dynamic_cast<vcl::filter::PDFNameElement*>(pFirst1D->LookupElement("Type"))->GetValue()); CPPUNIT_ASSERT_EQUAL( - OUString(u"Who is this book for?"), + u"Who is this book for?"_ustr, ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE( *dynamic_cast<vcl::filter::PDFHexStringElement*>(pFirst1D->LookupElement("Title")))); @@ -5153,7 +5152,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf142129) CPPUNIT_ASSERT(pFirst2D); //CPPUNIT_ASSERT_EQUAL(OString("Outlines"), dynamic_cast<vcl::filter::PDFNameElement*>(pFirst2D->LookupElement("Type"))->GetValue()); CPPUNIT_ASSERT_EQUAL( - OUString(u"What\u2019s in this book?"), + u"What\u2019s in this book?"_ustr, ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE( *dynamic_cast<vcl::filter::PDFHexStringElement*>(pFirst2D->LookupElement("Title")))); @@ -5163,7 +5162,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf142129) CPPUNIT_ASSERT(pFirst3D); //CPPUNIT_ASSERT_EQUAL(OString("Outlines"), dynamic_cast<vcl::filter::PDFNameElement*>(pFirst3D->LookupElement("Type"))->GetValue()); CPPUNIT_ASSERT_EQUAL( - OUString(u"Minimum requirements for using LibreOffice"), + u"Minimum requirements for using LibreOffice"_ustr, ::vcl::filter::PDFDocument::DecodeHexStringUTF16BE( *dynamic_cast<vcl::filter::PDFHexStringElement*>(pFirst3D->LookupElement("Title")))); @@ -5635,9 +5634,9 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf139627) // Rendered as (left to right): "reh + mim" - "kasreh" - "jeh + tatweel" int rehmim = 0, kasreh = 1, jehtatweel = 2; - CPPUNIT_ASSERT_EQUAL(OUString(u"رم"), sText[rehmim].trim()); - CPPUNIT_ASSERT_EQUAL(OUString(u""), sText[kasreh].trim()); - CPPUNIT_ASSERT_EQUAL(OUString(u""), sText[jehtatweel].trim()); + CPPUNIT_ASSERT_EQUAL(u"رم"_ustr, sText[rehmim].trim()); + CPPUNIT_ASSERT_EQUAL(u""_ustr, sText[kasreh].trim()); + CPPUNIT_ASSERT_EQUAL(u""_ustr, sText[jehtatweel].trim()); // "Kasreh" should be within "jeh" character CPPUNIT_ASSERT_GREATER(aRect[jehtatweel].getMinX(), aRect[kasreh].getMinX()); diff --git a/vcl/qa/cppunit/physicalfontcollection.cxx b/vcl/qa/cppunit/physicalfontcollection.cxx index c3cde102ed26..bff91d021f62 100644 --- a/vcl/qa/cppunit/physicalfontcollection.cxx +++ b/vcl/qa/cppunit/physicalfontcollection.cxx @@ -179,7 +179,7 @@ void VclPhysicalFontCollectionTest::testShouldFindCJKFamily() // interestingly, you need to normalize the name still vcl::font::PhysicalFontFamily* pFontFamily = aFontCollection.FindOrCreateFontFamily( GetEnglishSearchFontName(u"시험")); // Korean for "test" - AddNormalFontFace(pFontFamily, u"시험"); + AddNormalFontFace(pFontFamily, u"시험"_ustr); vcl::font::PhysicalFontFamily* pCJKFamily = aFontCollection.FindFontFamilyByAttributes( ImplFontAttrs::CJK, WEIGHT_NORMAL, WIDTH_NORMAL, ITALIC_NORMAL, u""); @@ -307,7 +307,7 @@ void VclPhysicalFontCollectionTest::testShouldMatchFamilyName() // note that for this test, it is irrelevant what the search name is for PhysicalFontFamily, // the font searches the family name and uses the search parameter of FindFontFamilyByAttributes() vcl::font::PhysicalFontFamily* pFontFamily - = aFontCollection.FindOrCreateFontFamily(u"Matching family name"); + = aFontCollection.FindOrCreateFontFamily(u"Matching family name"_ustr); AddNormalFontFace(pFontFamily, GetEnglishSearchFontName(u"Matching family name")); CPPUNIT_ASSERT_MESSAGE("No family found", diff --git a/vcl/qa/cppunit/text.cxx b/vcl/qa/cppunit/text.cxx index a42b308f6c68..59e079c963ce 100644 --- a/vcl/qa/cppunit/text.cxx +++ b/vcl/qa/cppunit/text.cxx @@ -226,7 +226,7 @@ CPPUNIT_TEST_FIXTURE(VclTextTest, testSimpleText) CPPUNIT_TEST_FIXTURE(VclTextTest, testTextLayoutCache) { - OUString sTestString = u"The quick brown fox\n jumped over the lazy dogالعاشر"; + OUString sTestString = u"The quick brown fox\n jumped over the lazy dogالعاشر"_ustr; vcl::text::TextLayoutCache cache(sTestString.getStr(), sTestString.getLength()); vcl::text::Run run1 = cache.runs[0]; @@ -426,7 +426,7 @@ CPPUNIT_TEST_FIXTURE(VclTextTest, testImplLayoutRuns_PosIsInAnyRun) CPPUNIT_TEST_FIXTURE(VclTextTest, testImplLayoutArgsBiDiStrong) { OUString sTestString = u"The quick brown fox\n jumped over the lazy dog" - "العاشر"; + "العاشر"_ustr; vcl::text::ImplLayoutArgs aArgs(sTestString, 0, sTestString.getLength(), SalLayoutFlags::BiDiStrong, LanguageTag(LANGUAGE_NONE), nullptr); @@ -453,7 +453,7 @@ CPPUNIT_TEST_FIXTURE(VclTextTest, testImplLayoutArgsBiDiStrong) CPPUNIT_TEST_FIXTURE(VclTextTest, testImplLayoutArgsBiDiRtl) { OUString sTestString = u"The quick brown fox\n jumped over the lazy dog" - "العاشر"; + "العاشر"_ustr; vcl::text::ImplLayoutArgs aArgs(sTestString, 0, sTestString.getLength(), SalLayoutFlags::BiDiRtl, LanguageTag(LANGUAGE_NONE), nullptr); @@ -485,7 +485,7 @@ CPPUNIT_TEST_FIXTURE(VclTextTest, testImplLayoutArgsBiDiRtl) CPPUNIT_TEST_FIXTURE(VclTextTest, testImplLayoutArgsRightAlign) { OUString sTestString = u"The quick brown fox\n jumped over the lazy dog" - "العاشر"; + "العاشر"_ustr; vcl::text::ImplLayoutArgs aArgs(sTestString, 0, sTestString.getLength(), SalLayoutFlags::RightAlign, LanguageTag(LANGUAGE_NONE), nullptr); @@ -564,8 +564,8 @@ CPPUNIT_TEST_FIXTURE(VclTextTest, testGetStringWithCenterEllpsis) device->SetFont(vcl::Font("DejaVu Sans", "Book", Size(0, 11))); CPPUNIT_ASSERT_EQUAL( - OUString(u"a b c d ...v w x y z"), - device->GetEllipsisString(u"a b c d e f g h i j k l m n o p q r s t u v w x y z", 100, + u"a b c d ...v w x y z"_ustr, + device->GetEllipsisString(u"a b c d e f g h i j k l m n o p q r s t u v w x y z"_ustr, 100, DrawTextFlags::CenterEllipsis)); } @@ -575,17 +575,17 @@ CPPUNIT_TEST_FIXTURE(VclTextTest, testGetStringWithEndEllpsis) device->SetOutputSizePixel(Size(1000, 1000)); device->SetFont(vcl::Font("DejaVu Sans", "Book", Size(0, 11))); - CPPUNIT_ASSERT_EQUAL(OUString(u"a"), device->GetEllipsisString(u"abcde. f g h i j ...", 10, - DrawTextFlags::EndEllipsis)); + CPPUNIT_ASSERT_EQUAL(u"a"_ustr, device->GetEllipsisString(u"abcde. f g h i j ..."_ustr, 10, + DrawTextFlags::EndEllipsis)); CPPUNIT_ASSERT_EQUAL( - OUString(u"a b c d e f g h i j ..."), - device->GetEllipsisString(u"a b c d e f g h i j k l m n o p q r s t u v w x y z", 100, + u"a b c d e f g h i j ..."_ustr, + device->GetEllipsisString(u"a b c d e f g h i j k l m n o p q r s t u v w x y z"_ustr, 100, DrawTextFlags::EndEllipsis)); - CPPUNIT_ASSERT_EQUAL(OUString(u"a"), device->GetEllipsisString(u"abcde. f g h i j ...", 1, - DrawTextFlags::EndEllipsis - | DrawTextFlags::Clip)); + CPPUNIT_ASSERT_EQUAL( + u"a"_ustr, device->GetEllipsisString(u"abcde. f g h i j ..."_ustr, 1, + DrawTextFlags::EndEllipsis | DrawTextFlags::Clip)); } CPPUNIT_TEST_FIXTURE(VclTextTest, testGetStringWithNewsEllpsis) @@ -594,32 +594,32 @@ CPPUNIT_TEST_FIXTURE(VclTextTest, testGetStringWithNewsEllpsis) device->SetOutputSizePixel(Size(1000, 1000)); device->SetFont(vcl::Font("DejaVu Sans", "Book", Size(0, 11))); - CPPUNIT_ASSERT_EQUAL(OUString(u"a"), device->GetEllipsisString(u"abcde. f g h i j ...", 10, - DrawTextFlags::NewsEllipsis)); + CPPUNIT_ASSERT_EQUAL(u"a"_ustr, device->GetEllipsisString(u"abcde. f g h i j ..."_ustr, 10, + DrawTextFlags::NewsEllipsis)); CPPUNIT_ASSERT_EQUAL( - OUString(u"a b .... x y z"), - device->GetEllipsisString(u"a b c d. e f g. h i j k l m n o p q r s t u v w. x y z", 100, - DrawTextFlags::NewsEllipsis)); + u"a b .... x y z"_ustr, + device->GetEllipsisString(u"a b c d. e f g. h i j k l m n o p q r s t u v w. x y z"_ustr, + 100, DrawTextFlags::NewsEllipsis)); CPPUNIT_ASSERT_EQUAL( - OUString(u"a b .... x y z"), - device->GetEllipsisString(u"a b c d. e f g h i j k l m n o p q r s t u v w. x y z", 100, - DrawTextFlags::NewsEllipsis)); + u"a b .... x y z"_ustr, + device->GetEllipsisString(u"a b c d. e f g h i j k l m n o p q r s t u v w. x y z"_ustr, + 100, DrawTextFlags::NewsEllipsis)); CPPUNIT_ASSERT_EQUAL( - OUString(u"a b c d e f g h i j ..."), - device->GetEllipsisString(u"a b c d e f g h i j k l m n o p q r s t u v w. x y z", 100, + u"a b c d e f g h i j ..."_ustr, + device->GetEllipsisString(u"a b c d e f g h i j k l m n o p q r s t u v w. x y z"_ustr, 100, DrawTextFlags::NewsEllipsis)); CPPUNIT_ASSERT_EQUAL( - OUString(u"a..... x y z"), - device->GetEllipsisString(u"a. b c d e f g h i j k l m n o p q r s t u v w. x y z", 100, - DrawTextFlags::NewsEllipsis)); + u"a..... x y z"_ustr, + device->GetEllipsisString(u"a. b c d e f g h i j k l m n o p q r s t u v w. x y z"_ustr, + 100, DrawTextFlags::NewsEllipsis)); CPPUNIT_ASSERT_EQUAL( - OUString(u"ab. cde..."), - device->GetEllipsisString(u"ab. cde. x y z", 50, DrawTextFlags::NewsEllipsis)); + u"ab. cde..."_ustr, + device->GetEllipsisString(u"ab. cde. x y z"_ustr, 50, DrawTextFlags::NewsEllipsis)); } CPPUNIT_TEST_FIXTURE(VclTextTest, testGetTextBreak) @@ -628,7 +628,7 @@ CPPUNIT_TEST_FIXTURE(VclTextTest, testGetTextBreak) device->SetOutputSizePixel(Size(1000, 1000)); device->SetFont(vcl::Font("DejaVu Sans", "Book", Size(0, 11))); - const OUString sTestStr(u"textline_ text_"); + const OUString sTestStr(u"textline_ text_"_ustr); const auto nLen = sTestStr.getLength(); const auto nTextWidth = device->GetTextWidth("text"); diff --git a/vcl/qt5/QtAccessibleWidget.cxx b/vcl/qt5/QtAccessibleWidget.cxx index 8a2cf2ed8b91..15794039cf2c 100644 --- a/vcl/qt5/QtAccessibleWidget.cxx +++ b/vcl/qt5/QtAccessibleWidget.cxx @@ -907,77 +907,77 @@ OUString lcl_ConvertFontSlant(awt::FontSlant eFontSlant) void lcl_ConvertFontUnderline(sal_Int16 nFontUnderline, OUString& rUnderlineStyle, OUString& rUnderlineType, OUString& rUnderlineWidth) { - rUnderlineStyle = u""; - rUnderlineType = u"single"; - rUnderlineWidth = u"auto"; + rUnderlineStyle = u""_ustr; + rUnderlineType = u"single"_ustr; + rUnderlineWidth = u"auto"_ustr; switch (nFontUnderline) { case awt::FontUnderline::BOLD: - rUnderlineWidth = u"bold"; + rUnderlineWidth = u"bold"_ustr; return; case awt::FontUnderline::BOLDDASH: - rUnderlineWidth = u"bold"; - rUnderlineStyle = u"dash"; + rUnderlineWidth = u"bold"_ustr; + rUnderlineStyle = u"dash"_ustr; return; case awt::FontUnderline::BOLDDASHDOT: - rUnderlineWidth = u"bold"; - rUnderlineStyle = u"dot-dash"; + rUnderlineWidth = u"bold"_ustr; + rUnderlineStyle = u"dot-dash"_ustr; return; case awt::FontUnderline::BOLDDASHDOTDOT: - rUnderlineWidth = u"bold"; - rUnderlineStyle = u"dot-dot-dash"; + rUnderlineWidth = u"bold"_ustr; + rUnderlineStyle = u"dot-dot-dash"_ustr; return; case awt::FontUnderline::BOLDDOTTED: - rUnderlineWidth = u"bold"; - rUnderlineStyle = u"dotted"; + rUnderlineWidth = u"bold"_ustr; + rUnderlineStyle = u"dotted"_ustr; return; case awt::FontUnderline::BOLDLONGDASH: - rUnderlineWidth = u"bold"; - rUnderlineStyle = u"long-dash"; + rUnderlineWidth = u"bold"_ustr; + rUnderlineStyle = u"long-dash"_ustr; return; case awt::FontUnderline::BOLDWAVE: - rUnderlineWidth = u"bold"; - rUnderlineStyle = u"wave"; + rUnderlineWidth = u"bold"_ustr; + rUnderlineStyle = u"wave"_ustr; return; case awt::FontUnderline::DASH: - rUnderlineStyle = u"dash"; + rUnderlineStyle = u"dash"_ustr; return; case awt::FontUnderline::DASHDOT: - rUnderlineStyle = u"dot-dash"; + rUnderlineStyle = u"dot-dash"_ustr; return; case awt::FontUnderline::DASHDOTDOT: - rUnderlineStyle = u"dot-dot-dash"; + rUnderlineStyle = u"dot-dot-dash"_ustr; return; case awt::FontUnderline::DONTKNOW: - rUnderlineWidth = u""; - rUnderlineStyle = u""; - rUnderlineType = u""; + rUnderlineWidth = u""_ustr; + rUnderlineStyle = u""_ustr; + rUnderlineType = u""_ustr; return; case awt::FontUnderline::DOTTED: - rUnderlineStyle = u"dotted"; + rUnderlineStyle = u"dotted"_ustr; return; case awt::FontUnderline::DOUBLE: - rUnderlineType = u"double"; + rUnderlineType = u"double"_ustr; return; case awt::FontUnderline::DOUBLEWAVE: - rUnderlineStyle = u"wave"; - rUnderlineType = u"double"; + rUnderlineStyle = u"wave"_ustr; + rUnderlineType = u"double"_ustr; return; case awt::FontUnderline::LONGDASH: - rUnderlineStyle = u"long-dash"; + rUnderlineStyle = u"long-dash"_ustr; return; case awt::FontUnderline::NONE: - rUnderlineWidth = u"none"; - rUnderlineStyle = u"none"; - rUnderlineType = u"none"; + rUnderlineWidth = u"none"_ustr; + rUnderlineStyle = u"none"_ustr; + rUnderlineType = u"none"_ustr; return; case awt::FontUnderline::SINGLE: - rUnderlineType = u"single"; + rUnderlineType = u"single"_ustr; return; case awt::FontUnderline::SMALLWAVE: case awt::FontUnderline::WAVE: - rUnderlineStyle = u"wave"; + rUnderlineStyle = u"wave"_ustr; return; default: assert(false && "Unhandled font underline type"); diff --git a/vcl/qt5/QtMenu.cxx b/vcl/qt5/QtMenu.cxx index e2a0d7bd714c..93f3d6f5a378 100644 --- a/vcl/qt5/QtMenu.cxx +++ b/vcl/qt5/QtMenu.cxx @@ -53,7 +53,7 @@ static inline void lcl_force_menubar_layout_update(QMenuBar& rMenuBar) rMenuBar.adjustSize(); } -OUString QtMenu::m_sCurrentHelpId = u""; +OUString QtMenu::m_sCurrentHelpId = u""_ustr; QtMenu::QtMenu(bool bMenuBar) : mpVCLMenu(nullptr) diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 1b802660cf3a..d85b235b0ea3 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -1283,7 +1283,7 @@ OUString MetricFormatter::CreateFieldText( sal_Int64 nValue ) const aStr += " "; if (meUnit == FieldUnit::INCH) { - OUString sDoublePrime = u"\u2033"; + OUString sDoublePrime = u"\u2033"_ustr; if (aSuffix != "\"" && aSuffix != sDoublePrime) aStr += " "; else @@ -1291,7 +1291,7 @@ OUString MetricFormatter::CreateFieldText( sal_Int64 nValue ) const } else if (meUnit == FieldUnit::FOOT) { - OUString sPrime = u"\u2032"; + OUString sPrime = u"\u2032"_ustr; if (aSuffix != "'" && aSuffix != sPrime) aStr += " "; else diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx index da927c8b4bb2..115b3da6fb46 100644 --- a/vcl/source/font/fontmetric.cxx +++ b/vcl/source/font/fontmetric.cxx @@ -382,7 +382,7 @@ void FontMetricData::ImplInitFlags( const OutputDevice* pDev ) if (MsLangId::isCJK(rFont.GetLanguage())) { tools::Rectangle aRect; - pDev->GetTextBoundRect( aRect, u"\x3001" ); // Fullwidth fullstop + pDev->GetTextBoundRect( aRect, u"\x3001"_ustr ); // Fullwidth fullstop const auto nH = rFont.GetFontSize().Height(); const auto nB = aRect.Left(); // Use 18.75% as a threshold to define a centered fullwidth fullstop. diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 8d4082b1c227..6e552ce8c6c2 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -3772,7 +3772,7 @@ we check in the following sequence: (m_aContext.BaseURL.getLength() > 0 ? m_aContext.BaseURL : //use dummy location if empty - u"http://ahost.ax"), + u"http://ahost.ax"_ustr), url)); aTargetURL = aNewURL; //reassign the new target URL diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 3825c9674fb1..229296a275c9 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -311,7 +311,7 @@ namespace weld aStr += " "; if (m_eSrcUnit == FieldUnit::INCH) { - OUString sDoublePrime = u"\u2033"; + OUString sDoublePrime = u"\u2033"_ustr; if (aSuffix != "\"" && aSuffix != sDoublePrime) aStr += " "; else @@ -319,7 +319,7 @@ namespace weld } else if (m_eSrcUnit == FieldUnit::FOOT) { - OUString sPrime = u"\u2032"; + OUString sPrime = u"\u2032"_ustr; if (aSuffix != "'" && aSuffix != sPrime) aStr += " "; else diff --git a/vcl/workben/minvcl.cxx b/vcl/workben/minvcl.cxx index aafef4a9864e..cd144e7e401a 100644 --- a/vcl/workben/minvcl.cxx +++ b/vcl/workben/minvcl.cxx @@ -38,7 +38,7 @@ private: int TheApplication::Main() { mpWin = VclPtr<WorkWindow>::Create(nullptr, WB_APP | WB_STDWORK); - mpWin->SetText(u"Minimum VCL application with a window"); + mpWin->SetText(u"Minimum VCL application with a window"_ustr); mpWin->Show(); Execute(); mpWin.disposeAndClear(); diff --git a/writerfilter/qa/cppunittests/dmapper/SdtHelper.cxx b/writerfilter/qa/cppunittests/dmapper/SdtHelper.cxx index 6300a488b409..e0d48f2726e5 100644 --- a/writerfilter/qa/cppunittests/dmapper/SdtHelper.cxx +++ b/writerfilter/qa/cppunittests/dmapper/SdtHelper.cxx @@ -143,16 +143,16 @@ CPPUNIT_TEST_FIXTURE(Test, testSdtRunCheckbox) CPPUNIT_ASSERT(bChecked); OUString aCheckedState; xContentControlProps->getPropertyValue("CheckedState") >>= aCheckedState; - CPPUNIT_ASSERT_EQUAL(OUString(u"☒"), aCheckedState); + CPPUNIT_ASSERT_EQUAL(u"☒"_ustr, aCheckedState); OUString aUncheckedState; xContentControlProps->getPropertyValue("UncheckedState") >>= aUncheckedState; - CPPUNIT_ASSERT_EQUAL(OUString(u"☐"), aUncheckedState); + CPPUNIT_ASSERT_EQUAL(u"☐"_ustr, aUncheckedState); uno::Reference<text::XTextRange> xContentControlRange(xContentControl, uno::UNO_QUERY); uno::Reference<text::XText> xText = xContentControlRange->getText(); uno::Reference<container::XEnumerationAccess> xContentEnumAccess(xText, uno::UNO_QUERY); uno::Reference<container::XEnumeration> xContentEnum = xContentEnumAccess->createEnumeration(); uno::Reference<text::XTextRange> xContent(xContentEnum->nextElement(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString(u"☒"), xContent->getString()); + CPPUNIT_ASSERT_EQUAL(u"☒"_ustr, xContent->getString()); } CPPUNIT_TEST_FIXTURE(Test, testSdtRunDropdown) diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 4d91790ade4c..cddf8c6f6127 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -8765,11 +8765,11 @@ void DomainMapper_Impl::ImportGraphic(const writerfilter::Reference<Properties> uno::Reference< text::XTextCursor > xCrsr = xText->createTextCursor(); xCrsr->gotoEnd(false); PropertyMapPtr pEmpty(new PropertyMap()); - appendTextPortion(u"", pEmpty); + appendTextPortion(u""_ustr, pEmpty); appendTextContent( xTextContent, uno::Sequence< beans::PropertyValue >() ); bAppend = false; xCrsr->gotoEnd(false); - appendTextPortion(u"", pEmpty); + appendTextPortion(u""_ustr, pEmpty); m_bRedlineImageInPreviousRun = true; m_previousRedline = m_currentRedline; diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index fa03d3fdd286..194900b444de 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -1016,20 +1016,20 @@ void StyleSheetTable_Impl::ApplyClonedTOCStylesToXText(uno::Reference<text::XTex while (xParaEnum->hasMoreElements()) { uno::Reference<lang::XServiceInfo> const xElem(xParaEnum->nextElement(), uno::UNO_QUERY_THROW); - if (xElem->supportsService(u"com.sun.star.text.Paragraph")) + if (xElem->supportsService(u"com.sun.star.text.Paragraph"_ustr)) { uno::Reference<beans::XPropertySet> const xPara(xElem, uno::UNO_QUERY_THROW); OUString styleName; - if (xPara->getPropertyValue(u"ParaStyleName") >>= styleName) + if (xPara->getPropertyValue(u"ParaStyleName"_ustr) >>= styleName) { auto const it(m_ClonedTOCStylesMap.find(styleName)); if (it != m_ClonedTOCStylesMap.end()) { - xPara->setPropertyValue(u"ParaStyleName", uno::Any(it->second)); + xPara->setPropertyValue(u"ParaStyleName"_ustr, uno::Any(it->second)); } } } - else if (xElem->supportsService(u"com.sun.star.text.TextTable")) + else if (xElem->supportsService(u"com.sun.star.text.TextTable"_ustr)) { uno::Reference<text::XTextTable> const xTable(xElem, uno::UNO_QUERY_THROW); uno::Sequence<OUString> const cells(xTable->getCellNames()); diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index ccd90714526b..f2b695c3366e 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -1292,12 +1292,12 @@ void OOXMLFastContextHandlerValue::pushBiDiEmbedLevel() { const bool bRtl = mpValue && mpValue->getInt() == NS_ooxml::LN_Value_ST_Direction_rtl; - OOXMLFactory::characters(this, bRtl ? OUString(u"\u202B") : OUString(u"\u202A")); // RLE / LRE + OOXMLFactory::characters(this, bRtl ? u"\u202B"_ustr : u"\u202A"_ustr); // RLE / LRE } void OOXMLFastContextHandlerValue::popBiDiEmbedLevel() { - OOXMLFactory::characters(this, u"\u202C"); // PDF (POP DIRECTIONAL FORMATTING) + OOXMLFactory::characters(this, u"\u202C"_ustr); // PDF (POP DIRECTIONAL FORMATTING) } void OOXMLFastContextHandlerValue::handleGridAfter() diff --git a/xmloff/qa/unit/style.cxx b/xmloff/qa/unit/style.cxx index 132caa08c346..4d24f31a1fbb 100644 --- a/xmloff/qa/unit/style.cxx +++ b/xmloff/qa/unit/style.cxx @@ -367,7 +367,7 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testMCGR_OldToNew) // The old properties need to be still available, as they might be used in macros. OUString sGradientName; xShapeProperties->getPropertyValue("FillGradientName") >>= sGradientName; - CPPUNIT_ASSERT_EQUAL(OUString(u"red2yellow"), sGradientName); + CPPUNIT_ASSERT_EQUAL(u"red2yellow"_ustr, sGradientName); awt::Gradient2 aGradient; xShapeProperties->getPropertyValue("FillGradient") >>= aGradient; CPPUNIT_ASSERT_EQUAL(sal_Int32(0xFF0000), aGradient.StartColor); @@ -488,7 +488,7 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testMCGR_threeStops) // The old properties need to be still available, as they might be used in macros. OUString sGradientName; xShapeProperties->getPropertyValue("FillGradientName") >>= sGradientName; - CPPUNIT_ASSERT_EQUAL(OUString(u"threeStops"), sGradientName); + CPPUNIT_ASSERT_EQUAL(u"threeStops"_ustr, sGradientName); awt::Gradient2 aGradient; xShapeProperties->getPropertyValue("FillGradient") >>= aGradient; CPPUNIT_ASSERT_EQUAL(sal_Int32(0xFF0000), aGradient.StartColor); diff --git a/xmloff/qa/unit/text.cxx b/xmloff/qa/unit/text.cxx index 47bd6d969fb5..5188770a32ba 100644 --- a/xmloff/qa/unit/text.cxx +++ b/xmloff/qa/unit/text.cxx @@ -608,7 +608,7 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testCheckboxContentControlExport) uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY); uno::Reference<text::XText> xText = xTextDocument->getText(); uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor(); - xText->insertString(xCursor, OUString(u"☐"), /*bAbsorb=*/false); + xText->insertString(xCursor, u"☐"_ustr, /*bAbsorb=*/false); xCursor->gotoStart(/*bExpand=*/false); xCursor->gotoEnd(/*bExpand=*/true); uno::Reference<text::XTextContent> xContentControl( @@ -616,8 +616,8 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testCheckboxContentControlExport) uno::Reference<beans::XPropertySet> xContentControlProps(xContentControl, uno::UNO_QUERY); xContentControlProps->setPropertyValue("Checkbox", uno::Any(true)); xContentControlProps->setPropertyValue("Checked", uno::Any(true)); - xContentControlProps->setPropertyValue("CheckedState", uno::Any(OUString(u"☒"))); - xContentControlProps->setPropertyValue("UncheckedState", uno::Any(OUString(u"☐"))); + xContentControlProps->setPropertyValue("CheckedState", uno::Any(u"☒"_ustr)); + xContentControlProps->setPropertyValue("UncheckedState", uno::Any(u"☐"_ustr)); xText->insertTextContent(xCursor, xContentControl, /*bAbsorb=*/true); // When exporting to ODT: @@ -627,8 +627,8 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testCheckboxContentControlExport) xmlDocUniquePtr pXmlDoc = parseExport("content.xml"); assertXPath(pXmlDoc, "//loext:content-control", "checkbox", "true"); assertXPath(pXmlDoc, "//loext:content-control", "checked", "true"); - assertXPath(pXmlDoc, "//loext:content-control", "checked-state", u"☒"); - assertXPath(pXmlDoc, "//loext:content-control", "unchecked-state", u"☐"); + assertXPath(pXmlDoc, "//loext:content-control", "checked-state", u"☒"_ustr); + assertXPath(pXmlDoc, "//loext:content-control", "unchecked-state", u"☐"_ustr); } CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testCheckboxContentControlImport) @@ -661,16 +661,16 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testCheckboxContentControlImport) CPPUNIT_ASSERT(bChecked); OUString aCheckedState; xContentControlProps->getPropertyValue("CheckedState") >>= aCheckedState; - CPPUNIT_ASSERT_EQUAL(OUString(u"☒"), aCheckedState); + CPPUNIT_ASSERT_EQUAL(u"☒"_ustr, aCheckedState); OUString aUncheckedState; xContentControlProps->getPropertyValue("UncheckedState") >>= aUncheckedState; - CPPUNIT_ASSERT_EQUAL(OUString(u"☐"), aUncheckedState); + CPPUNIT_ASSERT_EQUAL(u"☐"_ustr, aUncheckedState); uno::Reference<text::XTextRange> xContentControlRange(xContentControl, uno::UNO_QUERY); uno::Reference<text::XText> xText = xContentControlRange->getText(); uno::Reference<container::XEnumerationAccess> xContentEnumAccess(xText, uno::UNO_QUERY); uno::Reference<container::XEnumeration> xContentEnum = xContentEnumAccess->createEnumeration(); uno::Reference<text::XTextRange> xContent(xContentEnum->nextElement(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString(u"☒"), xContent->getString()); + CPPUNIT_ASSERT_EQUAL(u"☒"_ustr, xContent->getString()); } CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testDropdownContentControlExport) diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 70c95e31c055..30b251cbda01 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -5004,10 +5004,10 @@ static void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Referenc // otherwise loext:writing-mode is used in style export. if (!(rExport.getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED)) { - if (xPropSetInfo->hasPropertyByName(u"WritingMode")) + if (xPropSetInfo->hasPropertyByName(u"WritingMode"_ustr)) { sal_Int16 nDirection = -1; - xPropSet->getPropertyValue(u"WritingMode") >>= nDirection; + xPropSet->getPropertyValue(u"WritingMode"_ustr) >>= nDirection; if (nDirection == text::WritingMode2::TB_RL90) fTextRotateAngle -= 90; else if (nDirection == text::WritingMode2::BT_LR) diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx index 29a277a79bef..67b749f79f0b 100644 --- a/xmloff/source/style/GradientStyle.cxx +++ b/xmloff/source/style/GradientStyle.cxx @@ -342,7 +342,7 @@ void XMLGradientStyleExport::exportXML( fPreviousOffset = fOffset; // As of LO 7.6.0 only color-type="rgb" is implemented. - m_rExport.AddAttribute(XML_NAMESPACE_LO_EXT, XML_COLOR_TYPE, u"rgb"); + m_rExport.AddAttribute(XML_NAMESPACE_LO_EXT, XML_COLOR_TYPE, u"rgb"_ustr); // Attribute loext:color-value, data type color, that is #rrggbb. const basegfx::BColor aDecimalColor(aCandidate.getStopColor()); diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 647d6943a856..811dbf97e47d 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -1490,7 +1490,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( { if ( !lcl_HasListStyle( sStyleName, m_xImpl->m_xParaStyles, GetXMLImport(), - u"NumberingStyleName", + u"NumberingStyleName"_ustr, u"" ) ) { // heading not in a list --> apply outline style |