[Libreoffice-commits] core.git: 2 commits - chart2/source comphelper/source connectivity/source cppcanvas/source dbaccess/source extensions/source idl/source l10ntools/source linguistic/source odk/examples oox/source sc/source sdext/source sfx2/source svgio/source svx/source sw/source ucb/source vcl/unx winaccessibility/source
Noel Grandin
noel at peralex.com
Thu Nov 21 03:30:17 PST 2013
chart2/source/tools/ChartModelHelper.cxx | 2
comphelper/source/misc/syntaxhighlight.cxx | 2
connectivity/source/drivers/hsqldb/HDriver.cxx | 6
cppcanvas/source/mtfrenderer/implrenderer.cxx | 6
dbaccess/source/ui/dlg/dbfindex.cxx | 4
extensions/source/plugin/unx/unxmgr.cxx | 2
idl/source/objects/slot.cxx | 8
l10ntools/source/export.cxx | 30 -
linguistic/source/dicimp.cxx | 4
odk/examples/cpp/counter/countermain.cxx | 2
oox/source/drawingml/diagram/diagram.cxx | 6
oox/source/shape/ShapeContextHandler.cxx | 2
sc/source/filter/lotus/lotform.cxx | 66 ++--
sdext/source/pdfimport/pdfparse/pdfentries.cxx | 8
sfx2/source/appl/appmisc.cxx | 6
sfx2/source/bastyp/mieclip.cxx | 10
svgio/source/svgreader/svgcharacternode.cxx | 7
svgio/source/svgreader/svgcirclenode.cxx | 3
svgio/source/svgreader/svgdocumenthandler.cxx | 4
svgio/source/svgreader/svgellipsenode.cxx | 3
svgio/source/svgreader/svggnode.cxx | 3
svgio/source/svgreader/svggradientnode.cxx | 10
svgio/source/svgreader/svgimagenode.cxx | 3
svgio/source/svgreader/svglinenode.cxx | 3
svgio/source/svgreader/svgmarkernode.cxx | 11
svgio/source/svgreader/svgnode.cxx | 66 +---
svgio/source/svgreader/svgpathnode.cxx | 3
svgio/source/svgreader/svgpatternnode.cxx | 3
svgio/source/svgreader/svgpolynode.cxx | 4
svgio/source/svgreader/svgrectnode.cxx | 3
svgio/source/svgreader/svgstyleattributes.cxx | 155 +++-------
svgio/source/svgreader/svgstylenode.cxx | 4
svgio/source/svgreader/svgtextnode.cxx | 3
svgio/source/svgreader/svgtextpathnode.cxx | 14
svgio/source/svgreader/svgtoken.cxx | 258 ++++++++--------
svgio/source/svgreader/svgtools.cxx | 339 ++++++++++------------
svgio/source/svgreader/svgusenode.cxx | 3
svx/source/xml/xmlgrhlp.cxx | 2
sw/source/filter/html/htmlatr.cxx | 18 -
sw/source/filter/ww8/ww8par5.cxx | 4
sw/source/ui/misc/numberingtypelistbox.cxx | 2
sw/source/ui/uno/unotxdoc.cxx | 3
sw/source/ui/vba/vbasystem.cxx | 10
ucb/source/ucp/webdav/ContentProperties.cxx | 45 +-
ucb/source/ucp/webdav/DAVProperties.cxx | 29 -
ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx | 10
ucb/source/ucp/webdav/SerfSession.cxx | 4
ucb/source/ucp/webdav/SerfUri.cxx | 8
ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx | 26 -
ucb/source/ucp/webdav/webdavcontent.cxx | 158 ++++------
ucb/source/ucp/webdav/webdavdatasupplier.cxx | 4
ucb/source/ucp/webdav/webdavprovider.cxx | 17 -
ucb/source/ucp/webdav/webdavresponseparser.cxx | 73 +---
vcl/unx/generic/printer/jobdata.cxx | 2
vcl/unx/generic/printer/ppdparser.cxx | 18 -
vcl/unx/gtk/gdi/salprn-gtk.cxx | 2
winaccessibility/source/UAccCOM/AccTextBase.cxx | 22 -
winaccessibility/source/UAccCOM/MAccessible.cxx | 10
winaccessibility/source/service/AccObject.cxx | 2
59 files changed, 677 insertions(+), 858 deletions(-)
New commits:
commit 6eac9deadd9fb6d0c547791e3a8ae4f9a4d33de4
Author: Noel Grandin <noel at peralex.com>
Date: Thu Nov 21 11:34:01 2013 +0200
remove unnecessary RTL_CONSTASCII_STRINGPARAM in OUString::equalsL
Convert code like this:
if (aStr.equalsL(RTL_CONSTASCII_STRINGPARAM("rem")))
to:
if (aStr == "rem")
which compiles down to the same code.
Change-Id: I2dfa0f0a457c465948ecf720daaa45ff29d69de9
diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx
index c9bac08..580f284 100644
--- a/comphelper/source/misc/syntaxhighlight.cxx
+++ b/comphelper/source/misc/syntaxhighlight.cxx
@@ -368,7 +368,7 @@ sal_Bool SyntaxHighlighter::Tokenizer::getNextToken( const sal_Unicode*& pos, /*
{
reType = TT_KEYWORDS;
- if (aByteStr.equalsL(RTL_CONSTASCII_STRINGPARAM("rem")))
+ if( aByteStr == "rem" )
{
// Remove all characters until end of line or EOF
sal_Unicode cPeek = *pos;
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 21ed0d2..1e7b6b4 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -279,15 +279,13 @@ namespace connectivity
continue;
const OString sIniKey = comphelper::string::getToken(sLine, 0, '=');
const OString sValue = comphelper::string::getToken(sLine, 1, '=');
- if (sIniKey.equalsL(RTL_CONSTASCII_STRINGPARAM("hsqldb.compatible_version")))
+ if( sIniKey == "hsqldb.compatible_version" )
{
sVersionString = sValue;
}
else
{
- if (sIniKey.equalsL(RTL_CONSTASCII_STRINGPARAM("version"))
- && ( sVersionString.isEmpty() )
- )
+ if (sIniKey == "version" && sVersionString.isEmpty())
{
sVersionString = sValue;
}
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index a8145bb..9b60ea5 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -1653,7 +1653,7 @@ namespace cppcanvas
// XPATHSTROKE_SEQ_BEGIN comment
// Handle drawing layer fills
- else if( pAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) )
+ else if( pAct->GetComment() == "XPATHFILL_SEQ_BEGIN" )
{
const sal_uInt8* pData = pAct->GetData();
if ( pData )
@@ -1769,7 +1769,7 @@ namespace cppcanvas
}
}
// Handle drawing layer fills
- else if( pAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("EMF_PLUS")) ) {
+ else if( pAct->GetComment() == "EMF_PLUS" ) {
static int count = -1, limit = 0x7fffffff;
if (count == -1) {
count = 0;
@@ -1782,7 +1782,7 @@ namespace cppcanvas
if (count < limit)
processEMFPlus( pAct, rFactoryParms, rStates.getState(), rCanvas );
count ++;
- } else if( pAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("EMF_PLUS_HEADER_INFO")) ) {
+ } else if( pAct->GetComment() == "EMF_PLUS_HEADER_INFO" ) {
SAL_INFO ("cppcanvas.emf", "EMF+ passed to canvas mtf renderer - header info, size: " << pAct->GetDataSize ());
SvMemoryStream rMF ((void*) pAct->GetData (), pAct->GetDataSize (), STREAM_READ);
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 644df94..b71b56e 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -352,7 +352,7 @@ void ODbaseIndexDialog::Init()
aNDX = aKeyName.copy(0,3);
// yes -> add to the tables index list
- if (aNDX.equalsL(RTL_CONSTASCII_STRINGPARAM("NDX")))
+ if (aNDX == "NDX")
{
aEntry = OStringToOUString(aInfFile.ReadKey(aKeyName), osl_getThreadTextEncoding());
rTabInfo.aIndexList.push_back( OTableIndex( aEntry ) );
@@ -455,7 +455,7 @@ void OTableInfo::WriteInfFile( const OUString& rDSN ) const
aNDX = aKeyName.copy(0,3);
//...if yes, delete index file, nKey is at subsequent key
- if (aNDX.equalsL(RTL_CONSTASCII_STRINGPARAM("NDX")))
+ if (aNDX == "NDX")
{
aInfFile.DeleteKey(aKeyName);
nKeyCnt--;
diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx
index 2ee2b49..101e235 100644
--- a/extensions/source/plugin/unx/unxmgr.cxx
+++ b/extensions/source/plugin/unx/unxmgr.cxx
@@ -66,7 +66,7 @@ static bool CheckPlugin( const OString& rPath, list< PluginDescription* >& rDesc
}
OString aBaseName = rPath.copy(nPos+1);
- if (aBaseName.equalsL(RTL_CONSTASCII_STRINGPARAM("libnullplugin.so")))
+ if (aBaseName == "libnullplugin.so")
{
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "don't like %s\n", aBaseName.getStr() );
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 4d78be8..c540104 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -1090,7 +1090,7 @@ void SvMetaSlot::WriteSlotStubs( const OString& rShellName,
OString aMethodName( GetExecMethod() );
if ( !aMethodName.isEmpty() &&
- !aMethodName.equalsL(RTL_CONSTASCII_STRINGPARAM("NoExec")) )
+ aMethodName != "NoExec" )
{
sal_Bool bIn = sal_False;
for( size_t n = 0; n < rList.size(); n++ )
@@ -1115,7 +1115,7 @@ void SvMetaSlot::WriteSlotStubs( const OString& rShellName,
aMethodName = GetStateMethod();
if (!aMethodName.isEmpty() &&
- !aMethodName.equalsL(RTL_CONSTASCII_STRINGPARAM("NoState")))
+ aMethodName != "NoState")
{
sal_Bool bIn = sal_False;
for ( size_t n=0; n < rList.size(); n++ )
@@ -1252,7 +1252,7 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
// write ExecMethod, with standard name if not specified
if( !GetExecMethod().isEmpty() &&
- !GetExecMethod().equalsL(RTL_CONSTASCII_STRINGPARAM("NoExec")))
+ GetExecMethod() != "NoExec")
{
rOutStm << "SFX_STUB_PTR(" << rShellName.getStr() << ','
<< GetExecMethod().getStr() << ')';
@@ -1263,7 +1263,7 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
// write StateMethod, with standard name if not specified
if( !GetStateMethod().isEmpty() &&
- !GetStateMethod().equalsL(RTL_CONSTASCII_STRINGPARAM("NoState")))
+ GetStateMethod() != "NoState")
{
rOutStm << "SFX_STUB_PTR(" << rShellName.getStr() << ','
<< GetStateMethod().getStr() << ')';
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 4057167..5f40c10 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -507,18 +507,18 @@ int Export::Execute( int nToken, const char * pToken )
OString sValue = sToken.getToken(0, '=', n);
CleanValue( sValue );
sKey = sKey.toAsciiUpperCase();
- if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("IDENTIFIER")))
+ if (sKey == "IDENTIFIER")
{
OString sId(
sValue.replaceAll("\t", OString()).
replaceAll(" ", OString()));
pResData->SetId(sId, ID_LEVEL_IDENTIFIER);
}
- else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HELPID")))
+ else if (sKey == "HELPID")
{
pResData->sHelpId = sValue;
}
- else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("STRINGLIST")))
+ else if (sKey =="STRINGLIST")
{
pResData->bList = sal_True;
nList = LIST_STRING;
@@ -526,7 +526,7 @@ int Export::Execute( int nToken, const char * pToken )
nListIndex = 0;
nListLevel = 0;
}
- else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("FILTERLIST")))
+ else if (sKey == "FILTERLIST")
{
pResData->bList = sal_True;
nList = LIST_FILTER;
@@ -534,7 +534,7 @@ int Export::Execute( int nToken, const char * pToken )
nListIndex = 0;
nListLevel = 0;
}
- else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("UIENTRIES")))
+ else if (sKey == "UIENTRIES")
{
pResData->bList = sal_True;
nList = LIST_UIENTRIES;
@@ -564,7 +564,7 @@ int Export::Execute( int nToken, const char * pToken )
OString sValue = sToken.getToken(1, '=');
CleanValue( sValue );
sKey = sKey.toAsciiUpperCase();
- if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("STRINGLIST")))
+ if (sKey == "STRINGLIST")
{
pResData->bList = sal_True;
nList = LIST_STRING;
@@ -572,7 +572,7 @@ int Export::Execute( int nToken, const char * pToken )
nListIndex = 0;
nListLevel = 0;
}
- else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("FILTERLIST")))
+ else if (sKey == "FILTERLIST")
{
pResData->bList = sal_True;
nList = LIST_FILTER;
@@ -580,7 +580,7 @@ int Export::Execute( int nToken, const char * pToken )
nListIndex = 0;
nListLevel = 0;
}
- else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("PAIREDLIST")))
+ else if (sKey == "PAIREDLIST")
{
pResData->bList = sal_True;
nList = LIST_PAIRED;
@@ -588,7 +588,7 @@ int Export::Execute( int nToken, const char * pToken )
nListIndex = 0;
nListLevel = 0;
}
- else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("ITEMLIST")))
+ else if (sKey == "ITEMLIST")
{
pResData->bList = sal_True;
nList = LIST_ITEM;
@@ -596,7 +596,7 @@ int Export::Execute( int nToken, const char * pToken )
nListIndex = 0;
nListLevel = 0;
}
- else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("UIENTRIES")))
+ else if (sKey == "UIENTRIES")
{
pResData->bList = sal_True;
nList = LIST_UIENTRIES;
@@ -648,11 +648,11 @@ int Export::Execute( int nToken, const char * pToken )
if ( !sText.isEmpty() && !sLang.isEmpty() )
{
sKey = sKey.toAsciiUpperCase();
- if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("TEXT")) ||
- sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("MESSAGE")) ||
- sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("CUSTOMUNITTEXT")) ||
- sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("SLOTNAME")) ||
- sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("UINAME")))
+ if (sKey == "TEXT" ||
+ sKey == "MESSAGE" ||
+ sKey == "CUSTOMUNITTEXT" ||
+ sKey == "SLOTNAME" ||
+ sKey == "UINAME")
{
SetChildWithText();
if ( sLangIndex.equalsIgnoreAsciiCase("en-US") )
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 7000cd0..42e18a7 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -117,7 +117,7 @@ sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, sal_Bool &bNe
// lang: field
if (getTag(aLine, "lang: ", aTagValue))
{
- if (aTagValue.equalsL(RTL_CONSTASCII_STRINGPARAM("<none>")))
+ if (aTagValue == "<none>")
nLng = LANGUAGE_NONE;
else
nLng = LanguageTag::convertToLanguageTypeWithFallback(
@@ -127,7 +127,7 @@ sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, sal_Bool &bNe
// type: negative / positive
if (getTag(aLine, "type: ", aTagValue))
{
- if (aTagValue.equalsL(RTL_CONSTASCII_STRINGPARAM("negative")))
+ if (aTagValue == "negative")
bNeg = sal_True;
else
bNeg = sal_False;
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index c230710..12bd4b4 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -1976,71 +1976,71 @@ static DefTokenId lcl_KnownAddIn( const OString& rTest )
{
DefTokenId eId = ocNoName;
- if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("FACT")))
+ if (rTest == "FACT")
eId = ocFact;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ISEMPTY")))
+ else if (rTest == "ISEMPTY")
eId=ocIsEmpty;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("DEGTORAD")))
+ else if (rTest == "DEGTORAD")
eId=ocRad;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("RADTODEG")))
+ else if (rTest == "RADTODEG")
eId=ocDeg;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("SIGN")))
+ else if (rTest == "SIGN")
eId=ocPlusMinus;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ACOSH")))
+ else if (rTest == "ACOSH")
eId=ocArcCosHyp;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ACOTH")))
+ else if (rTest == "ACOTH")
eId=ocArcCotHyp;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ASINH")))
+ else if (rTest == "ASINH")
eId=ocArcSinHyp;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ATANH")))
+ else if (rTest == "ATANH")
eId=ocArcTanHyp;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("COSH")))
+ else if (rTest == "COSH")
eId=ocCosHyp;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("COTH")))
+ else if (rTest == "COTH")
eId=ocCotHyp;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("SINH")))
+ else if (rTest == "SINH")
eId=ocSinHyp;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("TANH")))
+ else if (rTest == "TANH")
eId=ocTanHyp;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("EVEN")))
+ else if (rTest == "EVEN")
eId=ocIsEven;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ODD")))
+ else if (rTest == "ODD")
eId=ocIsOdd;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("ACOT")))
+ else if (rTest == "ACOT")
eId=ocArcCot;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("COT")))
+ else if (rTest == "COT")
eId=ocCot;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("TRUNC")))
+ else if (rTest == "TRUNC")
eId=ocTrunc;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("GEOMEAN")))
+ else if (rTest == "GEOMEAN")
eId=ocGeoMean;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("HARMEAN")))
+ else if (rTest == "HARMEAN")
eId=ocHarMean;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("CORREL")))
+ else if (rTest == "CORREL")
eId=ocCorrel;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("MEDIAN")))
+ else if (rTest == "MEDIAN")
eId=ocMedian;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("COV")))
+ else if (rTest == "COV")
eId=ocCovar;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("SKEWNESS")))
+ else if (rTest == "SKEWNESS")
eId=ocSchiefe;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("CHITEST")))
+ else if (rTest == "CHITEST")
eId=ocChiTest;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("FTEST")))
+ else if (rTest == "FTEST")
eId=ocFTest;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("AVEDEV")))
+ else if (rTest == "AVEDEV")
eId=ocAveDev;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("PRODUCT")))
+ else if (rTest == "PRODUCT")
eId=ocProduct;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("PERMUT")))
+ else if (rTest == "PERMUT")
eId=ocVariationen;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("GAMMALN")))
+ else if (rTest == "GAMMALN")
eId=ocGammaLn;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("POISSON")))
+ else if (rTest =="POISSON")
eId=ocPoissonDist;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("NORMAL")))
+ else if (rTest == "NORMAL")
eId=ocNormDist;
- else if (rTest.equalsL(RTL_CONSTASCII_STRINGPARAM("CRITBINOMIAL")))
+ else if (rTest == "CRITBINOMIAL")
eId=ocKritBinom;
return eId;
}
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index c1343d9..4cef688 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -458,7 +458,7 @@ bool PDFContainer::emitSubElements( EmitContext& rWriteContext ) const
if( rWriteContext.m_bDecrypt )
{
const PDFName* pName = dynamic_cast<PDFName*>(m_aSubElements[i]);
- if (pName && pName->m_aName.equalsL(RTL_CONSTASCII_STRINGPARAM("Encrypt")))
+ if (pName && pName->m_aName == "Encrypt")
{
i++;
continue;
@@ -695,7 +695,7 @@ bool PDFObject::getDeflatedStream( char** ppStream, unsigned int* pBytes, const
}
// is the (first) filter FlateDecode ?
- if (pFilter && pFilter->m_aName.equalsL(RTL_CONSTASCII_STRINGPARAM("FlateDecode")))
+ if (pFilter && pFilter->m_aName == "FlateDecode")
{
bIsDeflated = true;
}
@@ -850,7 +850,7 @@ bool PDFObject::emit( EmitContext& rWriteContext ) const
if( it != pClone->m_pStream->m_pDict->m_aMap.end() )
{
PDFName* pFilter = dynamic_cast<PDFName*>(it->second);
- if (pFilter && pFilter->m_aName.equalsL(RTL_CONSTASCII_STRINGPARAM("FlateDecode")))
+ if (pFilter && pFilter->m_aName == "FlateDecode")
pClone->m_pStream->m_pDict->eraseValue( "Filter" );
else
{
@@ -858,7 +858,7 @@ bool PDFObject::emit( EmitContext& rWriteContext ) const
if( pArray && ! pArray->m_aSubElements.empty() )
{
pFilter = dynamic_cast<PDFName*>(pArray->m_aSubElements.front());
- if (pFilter && pFilter->m_aName.equalsL(RTL_CONSTASCII_STRINGPARAM("FlateDecode")))
+ if (pFilter && pFilter->m_aName == "FlateDecode")
{
delete pFilter;
pArray->m_aSubElements.erase( pArray->m_aSubElements.begin() );
diff --git a/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx
index 869b29f..8205f17 100644
--- a/sfx2/source/bastyp/mieclip.cxx
+++ b/sfx2/source/bastyp/mieclip.cxx
@@ -51,15 +51,15 @@ SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream )
{
nIndex = 0;
OString sTmp(sLine.getToken(0, ':', nIndex));
- if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("StartHTML")))
+ if (sTmp == "StartHTML")
nStt = sLine.copy(nIndex).toInt32();
- else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("EndHTML")))
+ else if (sTmp == "EndHTML")
nEnd = sLine.copy(nIndex).toInt32();
- else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("StartFragment")))
+ else if (sTmp == "StartFragment")
nFragStart = sLine.copy(nIndex).toInt32();
- else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("EndFragment")))
+ else if (sTmp == "EndFragment")
nFragEnd = sLine.copy(nIndex).toInt32();
- else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("SourceURL")))
+ else if (sTmp == "SourceURL")
sBaseURL = OStringToOUString( sLine.copy(nIndex), RTL_TEXTENCODING_UTF8 );
if (nEnd >= 0 && nStt >= 0 &&
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 95f5639..0509b7c 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -61,7 +61,7 @@ const MetaCommentAction* ImplCheckForEPS( GDIMetaFile& rMtf )
if ( ( rMtf.GetActionSize() >= 2 )
&& ( rMtf.FirstAction()->GetType() == META_EPS_ACTION )
&& ( ((const MetaAction*)rMtf.GetAction( 1 ))->GetType() == META_COMMENT_ACTION )
- && ( ((const MetaCommentAction*)rMtf.GetAction( 1 ))->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("EPSReplacementGraphic")) ) )
+ && ( ((const MetaCommentAction*)rMtf.GetAction( 1 ))->GetComment() == "EPSReplacementGraphic" ) )
pComment = (const MetaCommentAction*)rMtf.GetAction( 1 );
return pComment;
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 8e0333d..2bda348 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -543,13 +543,13 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
// der erste Buchstabe reicht meistens
switch( rInfo.aToken[0] )
{
- case 'A': OSL_ENSURE( rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_address)),
+ case 'A': OSL_ENSURE( rInfo.aToken == OOO_STRING_SVTOOLS_HTML_address,
"Doch kein ADDRESS?" );
rInfo.bParaPossible = sal_True;
rHWrt.bNoAlign = sal_True;
break;
- case 'B': OSL_ENSURE( rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_blockquote)),
+ case 'B': OSL_ENSURE( rInfo.aToken == OOO_STRING_SVTOOLS_HTML_blockquote,
"Doch kein BLOCKQUOTE?" );
rInfo.bParaPossible = sal_True;
rHWrt.bNoAlign = sal_True;
@@ -561,7 +561,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
}
else
{
- OSL_ENSURE( rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_preformtxt)),
+ OSL_ENSURE( rInfo.aToken == OOO_STRING_SVTOOLS_HTML_preformtxt,
"Doch kein PRE?" );
if( HTML_PREFORMTXT_ON == rHWrt.nLastParaToken )
{
@@ -576,10 +576,10 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
}
break;
- case 'D': OSL_ENSURE( rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dt)) ||
- rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dd)),
+ case 'D': OSL_ENSURE( rInfo.aToken == OOO_STRING_SVTOOLS_HTML_dt ||
+ rInfo.aToken == OOO_STRING_SVTOOLS_HTML_dd,
"Doch kein DD/DT?" );
- bDT = rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dt));
+ bDT = rInfo.aToken == OOO_STRING_SVTOOLS_HTML_dt;
rInfo.bParaPossible = !bDT;
rHWrt.bNoAlign = sal_True;
bForceDL = sal_True;
@@ -1031,9 +1031,9 @@ void OutHTML_SwFmtOff( Writer& rWrt, const SwHTMLTxtCollOutputInfo& rInfo )
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), rInfo.aToken.getStr(),
sal_False );
rHWrt.bLFPossible =
- !rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dt)) &&
- !rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dd)) &&
- !rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_li));
+ rInfo.aToken != OOO_STRING_SVTOOLS_HTML_dt &&
+ rInfo.aToken != OOO_STRING_SVTOOLS_HTML_dd &&
+ rInfo.aToken != OOO_STRING_SVTOOLS_HTML_li;
}
if( rInfo.bOutDiv )
{
diff --git a/sw/source/ui/misc/numberingtypelistbox.cxx b/sw/source/ui/misc/numberingtypelistbox.cxx
index 224dab5..79162c1 100644
--- a/sw/source/ui/misc/numberingtypelistbox.cxx
+++ b/sw/source/ui/misc/numberingtypelistbox.cxx
@@ -48,7 +48,7 @@ SwNumberingTypeListBox::SwNumberingTypeListBox( Window* pWin, WinBits nStyle ) :
bool SwNumberingTypeListBox::set_property(const OString &rKey, const OString &rValue)
{
- if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("type")))
+ if (rKey == "type")
Reload(rValue.toInt32());
else
return ListBox::set_property(rKey, rValue);
diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx
index 6ca213b..9af1dbb 100644
--- a/sw/source/ui/vba/vbasystem.cxx
+++ b/sw/source/ui/vba/vbasystem.cxx
@@ -57,23 +57,23 @@ void lcl_getRegKeyInfo( const OString& sKeyInfo, HKEY& hBaseKey, OString& sSubKe
{
OString sBaseKey = sKeyInfo.copy( 0, nBaseKeyIndex );
sSubKey = sKeyInfo.copy( nBaseKeyIndex + 1 );
- if( sBaseKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HKEY_CURRENT_USER")) )
+ if( sBaseKey == "HKEY_CURRENT_USER" )
{
hBaseKey = HKEY_CURRENT_USER;
}
- else if( sBaseKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HKEY_LOCAL_MACHINE")) )
+ else if( sBaseKey == "HKEY_LOCAL_MACHINE" )
{
hBaseKey = HKEY_LOCAL_MACHINE;
}
- else if( sBaseKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HKEY_CLASSES_ROOT")) )
+ else if( sBaseKey == "HKEY_CLASSES_ROOT" )
{
hBaseKey = HKEY_CLASSES_ROOT;
}
- else if( sBaseKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HKEY_USERS")) )
+ else if( sBaseKey == "HKEY_USERS" )
{
hBaseKey = HKEY_USERS;
}
- else if( sBaseKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HKEY_CURRENT_CONFIG")) )
+ else if( sBaseKey == "HKEY_CURRENT_CONFIG" )
{
hBaseKey = HKEY_CURRENT_CONFIG;
}
diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx
index adf9d41..9b9e9ec 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -246,7 +246,7 @@ bool JobData::constructFromStreamBuffer( void* pData, int bytes, JobData& rJobDa
bPDFDevice = true;
rJobData.m_nPDFDevice = aLine.copy(RTL_CONSTASCII_LENGTH(pdfdeviceEquals)).toInt32();
}
- else if (aLine.equalsL(RTL_CONSTASCII_STRINGPARAM("PPDContexData")))
+ else if (aLine == "PPDContexData")
{
if( bPrinter )
{
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index ed2cdea..8c59507 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -980,17 +980,17 @@ void PPDParser::parse( ::std::list< OString >& rLines )
parseOpenUI( aCurrentLine );
continue;
}
- else if (aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("OrderDependency")))
+ else if (aKey == "OrderDependency")
{
parseOrderDependency( aCurrentLine );
continue;
}
- else if (aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("UIConstraints")) ||
- aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("NonUIConstraints")))
+ else if (aKey == "UIConstraints" ||
+ aKey == "NonUIConstraints")
{
continue; // parsed in pass 2
}
- else if( aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("CustomPageSize")) ) // currently not handled
+ else if( aKey == "CustomPageSize" ) // currently not handled
continue;
// default values are parsed in pass 2
@@ -1278,15 +1278,15 @@ void PPDParser::parseOrderDependency(const OString& rLine)
pKey = keyit->second;
pKey->m_nOrderDependency = nOrder;
- if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("ExitServer")) )
+ if( aSetup == "ExitServer" )
pKey->m_eSetupType = PPDKey::ExitServer;
- else if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("Prolog")) )
+ else if( aSetup == "Prolog" )
pKey->m_eSetupType = PPDKey::Prolog;
- else if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("DocumentSetup")) )
+ else if( aSetup == "DocumentSetup" )
pKey->m_eSetupType = PPDKey::DocumentSetup;
- else if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("PageSetup")) )
+ else if( aSetup == "PageSetup" )
pKey->m_eSetupType = PPDKey::PageSetup;
- else if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("JCLSetup")) )
+ else if( aSetup == "JCLSetup" )
pKey->m_eSetupType = PPDKey::JCLSetup;
else
pKey->m_eSetupType = PPDKey::AnySetup;
commit 89633c6da1cde46983926dcc2e0f8e08de0e9378
Author: Noel Grandin <noel at peralex.com>
Date: Wed Nov 20 16:21:34 2013 +0200
remove unnecessary use of OUString::createFromAscii
Convert code like this:
OUString aStrSpacing(OUString::createFromAscii("spacing"));
to:
OUString aStrSpacing("spacing");
Change-Id: Ia2b7d6b42f35d33cfe587a0d6668030f3537fa6d
diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx
index f50c47c..05bda30 100644
--- a/chart2/source/tools/ChartModelHelper.cxx
+++ b/chart2/source/tools/ChartModelHelper.cxx
@@ -71,7 +71,7 @@ uno::Reference< chart2::data::XDataProvider > ChartModelHelper::createInternalDa
{
::com::sun::star::chart::ChartDataRowSource aDataRowSource(::com::sun::star::chart::ChartDataRowSource_COLUMNS);
- xProp->getPropertyValue( ::rtl::OUString::createFromAscii("DataRowSource")) >>= aDataRowSource;
+ xProp->getPropertyValue( OUString("DataRowSource") ) >>= aDataRowSource;
bDefaultDataInColumns = (::com::sun::star::chart::ChartDataRowSource_COLUMNS == aDataRowSource);
}
diff --git a/odk/examples/cpp/counter/countermain.cxx b/odk/examples/cpp/counter/countermain.cxx
index 2e8d607..6cbde3a 100644
--- a/odk/examples/cpp/counter/countermain.cxx
+++ b/odk/examples/cpp/counter/countermain.cxx
@@ -79,7 +79,7 @@ SAL_IMPLEMENT_MAIN()
OSL_ENSURE( xMgr.is(), "### cannot get initial service manager!" );
Reference< XInterface > xx = xMgr->createInstanceWithContext(
- OUString::createFromAscii("foo.Counter"), xContext);
+ OUString("foo.Counter"), xContext);
OSL_ENSURE( xx.is(), "### cannot get service instance of \"foo.Counter\"!" );
diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx
index 93f5850..3ec6156 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -460,9 +460,9 @@ void loadDiagram( ShapePtr& pShape,
} else {
// We still want to add the XDocuments to the DiagramDomMap
DiagramDomMap& rMainDomMap = pDiagram->getDomMap();
- rMainDomMap[OUString::createFromAscii("OOXLayout")] = loadFragment(rFilter,rLayoutPath);
- rMainDomMap[OUString::createFromAscii("OOXStyle")] = loadFragment(rFilter,rQStylePath);
- rMainDomMap[OUString::createFromAscii("OOXColor")] = loadFragment(rFilter,rColorStylePath);
+ rMainDomMap[OUString("OOXLayout")] = loadFragment(rFilter,rLayoutPath);
+ rMainDomMap[OUString("OOXStyle")] = loadFragment(rFilter,rQStylePath);
+ rMainDomMap[OUString("OOXColor")] = loadFragment(rFilter,rColorStylePath);
}
// diagram loaded. now lump together & attach to shape
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index 8286def..4af1ab0 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -387,7 +387,7 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException)
sal_Int32 length = aValue.getLength();
aValue.realloc(length+1);
beans::PropertyValue* pValue = aValue.getArray();
- pValue[length].Name = OUString::createFromAscii("OOXDrawing");
+ pValue[length].Name = "OOXDrawing";
pValue[length].Value = uno::makeAny( mxFilterBase->importFragment( aFragmentPath ) );
pShapePtr->setDiagramDoms( aValue );
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index 8b8c88c..82d5ae1 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -160,15 +160,13 @@ bool SfxApplication::loadBrandSvg(const char *pName, BitmapEx &rBitmap, int nWid
{
// Load from disk
// ---------------------------------------------------------------------
- OUString aBaseName = ( OUString("/") +
- OUString::createFromAscii( pName ) );
- OUString aSvg( ".svg" );
+ OUString aBaseName = OUString("/") + OUString::createFromAscii( pName );
rtl_Locale *pLoc = NULL;
osl_getProcessLocale (&pLoc);
LanguageTag aLanguageTag( *pLoc);
- OUString uri = OUString::createFromAscii( "$BRAND_BASE_DIR/" LIBO_ETC_FOLDER ) + aBaseName+aSvg;
+ OUString uri = OUString( "$BRAND_BASE_DIR/" LIBO_ETC_FOLDER ) + aBaseName + ".svg";
rtl::Bootstrap::expandMacros( uri );
INetURLObject aObj( uri );
SvgData aSvgData(aObj.PathToFileName());
diff --git a/svgio/source/svgreader/svgcharacternode.cxx b/svgio/source/svgreader/svgcharacternode.cxx
index 392f886..1e9fc1e 100644
--- a/svgio/source/svgreader/svgcharacternode.cxx
+++ b/svgio/source/svgreader/svgcharacternode.cxx
@@ -130,14 +130,11 @@ namespace svgio
{
if(!aContent.isEmpty())
{
- static OUString aStrSpacing(OUString::createFromAscii("spacing"));
- static OUString aStrSpacingAndGlyphs(OUString::createFromAscii("spacingAndGlyphs"));
-
- if(aContent.match(aStrSpacing))
+ if(aContent.startsWith("spacing"))
{
setLengthAdjust(true);
}
- else if(aContent.match(aStrSpacingAndGlyphs))
+ else if(aContent.startsWith("spacingAndGlyphs"))
{
setLengthAdjust(false);
}
diff --git a/svgio/source/svgreader/svgcirclenode.cxx b/svgio/source/svgreader/svgcirclenode.cxx
index f462a07..0d4910d 100644
--- a/svgio/source/svgreader/svgcirclenode.cxx
+++ b/svgio/source/svgreader/svgcirclenode.cxx
@@ -46,8 +46,7 @@ namespace svgio
const SvgStyleAttributes* SvgCircleNode::getSvgStyleAttributes() const
{
- static OUString aClassStr(OUString::createFromAscii("circle"));
- return checkForCssStyle(aClassStr, maSvgStyleAttributes);
+ return checkForCssStyle(OUString("circle"), maSvgStyleAttributes);
}
void SvgCircleNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent)
diff --git a/svgio/source/svgreader/svgdocumenthandler.cxx b/svgio/source/svgreader/svgdocumenthandler.cxx
index f8637ea..7e03217 100644
--- a/svgio/source/svgreader/svgdocumenthandler.cxx
+++ b/svgio/source/svgreader/svgdocumenthandler.cxx
@@ -373,9 +373,9 @@ namespace svgio
/// invalid token, ignore
#ifdef DBG_UTIL
myAssert(
- OUString::createFromAscii("Unknown Base SvgToken <") +
+ OUString("Unknown Base SvgToken <") +
aName +
- OUString::createFromAscii("> (!)"));
+ OUString("> (!)") );
#endif
break;
}
diff --git a/svgio/source/svgreader/svgellipsenode.cxx b/svgio/source/svgreader/svgellipsenode.cxx
index 283e9da..75e3e28 100644
--- a/svgio/source/svgreader/svgellipsenode.cxx
+++ b/svgio/source/svgreader/svgellipsenode.cxx
@@ -47,8 +47,7 @@ namespace svgio
const SvgStyleAttributes* SvgEllipseNode::getSvgStyleAttributes() const
{
- static rtl::OUString aClassStr(rtl::OUString::createFromAscii("ellipse"));
- return checkForCssStyle(aClassStr, maSvgStyleAttributes);
+ return checkForCssStyle(OUString("ellipse"), maSvgStyleAttributes);
}
void SvgEllipseNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent)
diff --git a/svgio/source/svgreader/svggnode.cxx b/svgio/source/svgreader/svggnode.cxx
index bd41365..b2c87b3 100644
--- a/svgio/source/svgreader/svggnode.cxx
+++ b/svgio/source/svgreader/svggnode.cxx
@@ -45,8 +45,7 @@ namespace svgio
const SvgStyleAttributes* SvgGNode::getSvgStyleAttributes() const
{
- static rtl::OUString aClassStr(rtl::OUString::createFromAscii("g"));
- return checkForCssStyle(aClassStr, maSvgStyleAttributes);
+ return checkForCssStyle(OUString("g"), maSvgStyleAttributes);
}
void SvgGNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent)
diff --git a/svgio/source/svgreader/svggradientnode.cxx b/svgio/source/svgreader/svggradientnode.cxx
index eab2d12..d8c5b27 100644
--- a/svgio/source/svgreader/svggradientnode.cxx
+++ b/svgio/source/svgreader/svggradientnode.cxx
@@ -197,19 +197,15 @@ namespace svgio
{
if(!aContent.isEmpty())
{
- static OUString aStrPad(OUString::createFromAscii("pad"));
- static OUString aStrReflect(OUString::createFromAscii("reflect"));
- static OUString aStrRepeat(OUString::createFromAscii("repeat"));
-
- if(aContent.match(aStrPad, 0))
+ if(aContent.startsWith("pad"))
{
setSpreadMethod(drawinglayer::primitive2d::Spread_pad);
}
- else if(aContent.match(aStrReflect, 0))
+ else if(aContent.startsWith("reflect"))
{
setSpreadMethod(drawinglayer::primitive2d::Spread_reflect);
}
- else if(aContent.match(aStrRepeat, 0))
+ else if(aContent.startsWith("repeat"))
{
setSpreadMethod(drawinglayer::primitive2d::Spread_repeat);
}
diff --git a/svgio/source/svgreader/svgimagenode.cxx b/svgio/source/svgreader/svgimagenode.cxx
index 30300e0..533d1be 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -64,8 +64,7 @@ namespace svgio
const SvgStyleAttributes* SvgImageNode::getSvgStyleAttributes() const
{
- static rtl::OUString aClassStr(rtl::OUString::createFromAscii("image"));
- return checkForCssStyle(aClassStr, maSvgStyleAttributes);
+ return checkForCssStyle(OUString("image"), maSvgStyleAttributes);
}
void SvgImageNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent)
diff --git a/svgio/source/svgreader/svglinenode.cxx b/svgio/source/svgreader/svglinenode.cxx
index aebefe7..84aaa4b 100644
--- a/svgio/source/svgreader/svglinenode.cxx
+++ b/svgio/source/svgreader/svglinenode.cxx
@@ -47,8 +47,7 @@ namespace svgio
const SvgStyleAttributes* SvgLineNode::getSvgStyleAttributes() const
{
- static rtl::OUString aClassStr(rtl::OUString::createFromAscii("line"));
- return checkForCssStyle(aClassStr, maSvgStyleAttributes);
+ return checkForCssStyle(OUString("line"), maSvgStyleAttributes);
}
void SvgLineNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent)
diff --git a/svgio/source/svgreader/svgmarkernode.cxx b/svgio/source/svgreader/svgmarkernode.cxx
index dd900e4..1f75ef6 100644
--- a/svgio/source/svgreader/svgmarkernode.cxx
+++ b/svgio/source/svgreader/svgmarkernode.cxx
@@ -50,8 +50,7 @@ namespace svgio
const SvgStyleAttributes* SvgMarkerNode::getSvgStyleAttributes() const
{
- static rtl::OUString aClassStr(rtl::OUString::createFromAscii("marker"));
- return checkForCssStyle(aClassStr, maSvgStyleAttributes);
+ return checkForCssStyle(OUString("marker"), maSvgStyleAttributes);
}
void SvgMarkerNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent)
@@ -109,9 +108,7 @@ namespace svgio
{
if(!aContent.isEmpty())
{
- static OUString aStrStrokeWidth(OUString::createFromAscii("strokeWidth"));
-
- if(aContent.match(aStrStrokeWidth, 0))
+ if(aContent.startsWith("strokeWidth"))
{
setMarkerUnits(strokeWidth);
}
@@ -154,9 +151,7 @@ namespace svgio
if(nLen)
{
- static OUString aStrAuto(OUString::createFromAscii("auto"));
-
- if(aContent.match(aStrAuto, 0))
+ if(aContent.startsWith("auto"))
{
setOrientAuto(true);
}
diff --git a/svgio/source/svgreader/svgnode.cxx b/svgio/source/svgreader/svgnode.cxx
index 728905b..293834c 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -59,11 +59,11 @@ namespace svgio
copyToLimiter(*pClassList, ' ', nPos, aTokenValue, nLen);
skip_char(*pClassList, ' ', nPos, nLen);
- rtl::OUString aId(rtl::OUString::createFromAscii("."));
+ rtl::OUString aId(".");
const rtl::OUString aOUTokenValue(aTokenValue.makeStringAndClear());
// look for CSS style common to token
- aId = aId + aOUTokenValue;
+ aId += aOUTokenValue;
pNew = rDocument.findSvgStyleAttributesById(aId);
if(!pNew && !rClassStr.isEmpty())
@@ -221,94 +221,75 @@ namespace svgio
{
if(aContent.getLength())
{
- static rtl::OUString aStrInline(rtl::OUString::createFromAscii("inline"));
- static rtl::OUString aStrBlock(rtl::OUString::createFromAscii("block"));
- static rtl::OUString aStrList_item(rtl::OUString::createFromAscii("list-item"));
- static rtl::OUString aStrRun_in(rtl::OUString::createFromAscii("run-in"));
- static rtl::OUString aStrCompact(rtl::OUString::createFromAscii("compact"));
- static rtl::OUString aStrMarker(rtl::OUString::createFromAscii("marker"));
- static rtl::OUString aStrTable(rtl::OUString::createFromAscii("table"));
- static rtl::OUString aStrInline_table(rtl::OUString::createFromAscii("inline-table"));
- static rtl::OUString aStrTable_row_group(rtl::OUString::createFromAscii("table-row-group"));
- static rtl::OUString aStrTable_header_group(rtl::OUString::createFromAscii("table-header-group"));
- static rtl::OUString aStrTable_footer_group(rtl::OUString::createFromAscii("table-footer-group"));
- static rtl::OUString aStrTable_row(rtl::OUString::createFromAscii("table-row"));
- static rtl::OUString aStrTable_column_group(rtl::OUString::createFromAscii("table-column-group"));
- static rtl::OUString aStrTable_column(rtl::OUString::createFromAscii("table-column"));
- static rtl::OUString aStrTable_cell(rtl::OUString::createFromAscii("table-cell"));
- static rtl::OUString aStrTable_caption(rtl::OUString::createFromAscii("table-caption"));
- static rtl::OUString aStrNone(rtl::OUString::createFromAscii("none"));
- static rtl::OUString aStrInherit(rtl::OUString::createFromAscii("inherit"));
-
- if(aContent.match(aStrInline))
+ if(aContent.startsWith("inline"))
{
return Display_inline;
}
- else if(aContent.match(aStrNone))
+ else if(aContent.startsWith("none"))
{
return Display_none;
}
- else if(aContent.match(aStrInherit))
+ else if(aContent.startsWith("inherit"))
{
return Display_inherit;
}
- else if(aContent.match(aStrBlock))
+ else if(aContent.startsWith("block"))
{
return Display_block;
}
- else if(aContent.match(aStrList_item))
+ else if(aContent.startsWith("list-item"))
{
return Display_list_item;
}
- else if(aContent.match(aStrRun_in))
+ else if(aContent.startsWith("run-in"))
{
return Display_run_in;
}
- else if(aContent.match(aStrCompact))
+ else if(aContent.startsWith("compact"))
{
return Display_compact;
}
- else if(aContent.match(aStrMarker))
+ else if(aContent.startsWith("marker"))
{
return Display_marker;
}
- else if(aContent.match(aStrTable))
+ else if(aContent.startsWith("table"))
{
return Display_table;
}
- else if(aContent.match(aStrInline_table))
+ else if(aContent.startsWith("inline-table"))
{
return Display_inline_table;
}
- else if(aContent.match(aStrTable_row_group))
+ else if(aContent.startsWith("table-row-group"))
{
return Display_table_row_group;
}
- else if(aContent.match(aStrTable_header_group))
+ else if(aContent.startsWith("table-header-group"))
{
return Display_table_header_group;
}
- else if(aContent.match(aStrTable_footer_group))
+ else if(aContent.startsWith("table-footer-group"))
{
return Display_table_footer_group;
}
- else if(aContent.match(aStrTable_row))
+ else if(aContent.startsWith("table-row"))
{
return Display_table_row;
}
- else if(aContent.match(aStrTable_column_group))
+ else if(aContent.startsWith("table-column-group"))
{
return Display_table_column_group;
}
- else if(aContent.match(aStrTable_column))
+ else if(aContent.startsWith("table-column"))
{
return Display_table_column;
}
- else if(aContent.match(aStrTable_cell))
+ else if(aContent.startsWith("table-cell"))
{
return Display_table_cell;
}
- else if(aContent.match(aStrTable_caption))
+ else if(aContent.startsWith("table-caption"))
{
return Display_table_caption;
}
@@ -342,14 +323,11 @@ namespace svgio
{
if(!aContent.isEmpty())
{
- static OUString aStrDefault(OUString::createFromAscii("default"));
- static OUString aStrPreserve(OUString::createFromAscii("preserve"));
-
- if(aContent.match(aStrDefault))
+ if(aContent.startsWith("default"))
{
setXmlSpace(XmlSpace_default);
}
- else if(aContent.match(aStrPreserve))
+ else if(aContent.startsWith("preserve"))
{
setXmlSpace(XmlSpace_preserve);
}
diff --git a/svgio/source/svgreader/svgpathnode.cxx b/svgio/source/svgreader/svgpathnode.cxx
index e745711..7a96b5a 100644
--- a/svgio/source/svgreader/svgpathnode.cxx
+++ b/svgio/source/svgreader/svgpathnode.cxx
@@ -45,8 +45,7 @@ namespace svgio
const SvgStyleAttributes* SvgPathNode::getSvgStyleAttributes() const
{
- static rtl::OUString aClassStr(rtl::OUString::createFromAscii("path"));
- return checkForCssStyle(aClassStr, maSvgStyleAttributes);
+ return checkForCssStyle(OUString("path"), maSvgStyleAttributes);
}
void SvgPathNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent)
diff --git a/svgio/source/svgreader/svgpatternnode.cxx b/svgio/source/svgreader/svgpatternnode.cxx
index f4c7342..24793d7 100644
--- a/svgio/source/svgreader/svgpatternnode.cxx
+++ b/svgio/source/svgreader/svgpatternnode.cxx
@@ -64,8 +64,7 @@ namespace svgio
const SvgStyleAttributes* SvgPatternNode::getSvgStyleAttributes() const
{
- static rtl::OUString aClassStr(rtl::OUString::createFromAscii("pattern"));
- return checkForCssStyle(aClassStr, maSvgStyleAttributes);
+ return checkForCssStyle(OUString("pattern"), maSvgStyleAttributes);
}
void SvgPatternNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent)
diff --git a/svgio/source/svgreader/svgpolynode.cxx b/svgio/source/svgreader/svgpolynode.cxx
index c475c79..737ee38 100644
--- a/svgio/source/svgreader/svgpolynode.cxx
+++ b/svgio/source/svgreader/svgpolynode.cxx
@@ -48,9 +48,7 @@ namespace svgio
const SvgStyleAttributes* SvgPolyNode::getSvgStyleAttributes() const
{
- static rtl::OUString aClassStrA(rtl::OUString::createFromAscii("polygon"));
- static rtl::OUString aClassStrB(rtl::OUString::createFromAscii("polyline"));
- return checkForCssStyle(mbIsPolyline? aClassStrB : aClassStrA, maSvgStyleAttributes);
+ return checkForCssStyle(mbIsPolyline? OUString("polyline") : OUString("polygon"), maSvgStyleAttributes);
}
void SvgPolyNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent)
diff --git a/svgio/source/svgreader/svgrectnode.cxx b/svgio/source/svgreader/svgrectnode.cxx
index 8348ed7..47c3eda 100644
--- a/svgio/source/svgreader/svgrectnode.cxx
+++ b/svgio/source/svgreader/svgrectnode.cxx
@@ -49,8 +49,7 @@ namespace svgio
const SvgStyleAttributes* SvgRectNode::getSvgStyleAttributes() const
{
- static rtl::OUString aClassStr(rtl::OUString::createFromAscii("rect"));
- return checkForCssStyle(aClassStr, maSvgStyleAttributes);
+ return checkForCssStyle(OUString("rect"), maSvgStyleAttributes);
}
void SvgRectNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent)
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index ecddfbf..eec0798 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -1299,10 +1299,9 @@ namespace svgio
{
if(!aContent.isEmpty())
{
- static rtl::OUString aStrNone(rtl::OUString::createFromAscii("none"));
SvgNumberVector aVector;
- if(aContent.match(aStrNone))
+ if(aContent.startsWith("none"))
{
// #121221# The special value 'none' needs to be handled
// in the sense that *when* it is set, the parent shall not
@@ -1334,19 +1333,15 @@ namespace svgio
{
if(!aContent.isEmpty())
{
- static OUString aStrButt(OUString::createFromAscii("butt"));
- static OUString aStrRound(OUString::createFromAscii("round"));
- static OUString aStrSquare(OUString::createFromAscii("square"));
-
- if(aContent.match(aStrButt))
+ if(aContent.startsWith("butt"))
{
setStrokeLinecap(StrokeLinecap_butt);
}
- else if(aContent.match(aStrRound))
+ else if(aContent.startsWith("round"))
{
setStrokeLinecap(StrokeLinecap_round);
}
- else if(aContent.match(aStrSquare))
+ else if(aContent.startsWith("square"))
{
setStrokeLinecap(StrokeLinecap_square);
}
@@ -1357,19 +1352,15 @@ namespace svgio
{
if(!aContent.isEmpty())
{
- static OUString aStrMiter(OUString::createFromAscii("miter"));
- static OUString aStrRound(OUString::createFromAscii("round"));
- static OUString aStrBevel(OUString::createFromAscii("bevel"));
-
- if(aContent.match(aStrMiter))
+ if(aContent.startsWith("miter"))
{
setStrokeLinejoin(StrokeLinejoin_miter);
}
- else if(aContent.match(aStrRound))
+ else if(aContent.startsWith("round"))
{
setStrokeLinejoin(StrokeLinejoin_round);
}
- else if(aContent.match(aStrBevel))
+ else if(aContent.startsWith("bevel"))
{
setStrokeLinejoin(StrokeLinejoin_bevel);
}
@@ -1471,59 +1462,47 @@ namespace svgio
{
if(!aContent.isEmpty())
{
- static OUString aStrNormal(OUString::createFromAscii("normal"));
- static OUString aStrWider(OUString::createFromAscii("wider"));
- static OUString aStrNarrower(OUString::createFromAscii("narrower"));
- static OUString aStrUltra_condensed(OUString::createFromAscii("ultra-condensed"));
- static OUString aStrExtra_condensed(OUString::createFromAscii("extra-condensed"));
- static OUString aStrCondensed(OUString::createFromAscii("condensed"));
- static OUString aStrSemi_condensed(OUString::createFromAscii("semi-condensed"));
- static OUString aStrSemi_expanded(OUString::createFromAscii("semi-expanded"));
- static OUString aStrExpanded(OUString::createFromAscii("expanded"));
- static OUString aStrExtra_expanded(OUString::createFromAscii("extra-expanded"));
- static OUString aStrUltra_expanded(OUString::createFromAscii("ultra-expanded"));
-
- if(aContent.match(aStrNormal))
+ if(aContent.startsWith("normal"))
{
setFontStretch(FontStretch_normal);
}
- else if(aContent.match(aStrWider))
+ else if(aContent.startsWith("wider"))
{
setFontStretch(FontStretch_wider);
}
- else if(aContent.match(aStrNarrower))
+ else if(aContent.startsWith("narrower"))
{
setFontStretch(FontStretch_narrower);
}
- else if(aContent.match(aStrUltra_condensed))
+ else if(aContent.startsWith("ultra-condensed"))
{
setFontStretch(FontStretch_ultra_condensed);
}
- else if(aContent.match(aStrExtra_condensed))
+ else if(aContent.startsWith("extra-condensed"))
{
setFontStretch(FontStretch_extra_condensed);
}
- else if(aContent.match(aStrCondensed))
+ else if(aContent.startsWith("condensed"))
{
setFontStretch(FontStretch_condensed);
}
- else if(aContent.match(aStrSemi_condensed))
+ else if(aContent.startsWith("semi-condensed"))
{
setFontStretch(FontStretch_semi_condensed);
}
- else if(aContent.match(aStrSemi_expanded))
+ else if(aContent.startsWith("semi-expanded"))
{
setFontStretch(FontStretch_semi_expanded);
}
- else if(aContent.match(aStrExpanded))
+ else if(aContent.startsWith("expanded"))
{
setFontStretch(FontStretch_expanded);
}
- else if(aContent.match(aStrExtra_expanded))
+ else if(aContent.startsWith("extra-expanded"))
{
setFontStretch(FontStretch_extra_expanded);
}
- else if(aContent.match(aStrUltra_expanded))
+ else if(aContent.startsWith("ultra-expanded"))
{
setFontStretch(FontStretch_ultra_expanded);
}
@@ -1534,19 +1513,15 @@ namespace svgio
{
if(!aContent.isEmpty())
{
- static OUString aStrNormal(OUString::createFromAscii("normal"));
- static OUString aStrItalic(OUString::createFromAscii("italic"));
- static OUString aStrOblique(OUString::createFromAscii("oblique"));
-
- if(aContent.match(aStrNormal))
+ if(aContent.startsWith("normal"))
{
setFontStyle(FontStyle_normal);
}
- else if(aContent.match(aStrItalic))
+ else if(aContent.startsWith("italic"))
{
setFontStyle(FontStyle_italic);
}
- else if(aContent.match(aStrOblique))
+ else if(aContent.startsWith("oblique"))
{
setFontStyle(FontStyle_oblique);
}
@@ -1557,14 +1532,11 @@ namespace svgio
{
if(!aContent.isEmpty())
{
- static OUString aStrNormal(OUString::createFromAscii("normal"));
- static OUString aStrSmallCaps(OUString::createFromAscii("small-caps"));
-
- if(aContent.match(aStrNormal))
+ if(aContent.startsWith("normal"))
{
setFontVariant(FontVariant_normal);
}
- else if(aContent.match(aStrSmallCaps))
+ else if(aContent.startsWith("small-caps"))
{
setFontVariant(FontVariant_small_caps);
}
@@ -1575,61 +1547,47 @@ namespace svgio
{
if(!aContent.isEmpty())
{
- static OUString aStrNormal(OUString::createFromAscii("normal"));
- static OUString aStrBold(OUString::createFromAscii("bold"));
- static OUString aStrBolder(OUString::createFromAscii("bolder"));
- static OUString aStrLighter(OUString::createFromAscii("lighter"));
- static OUString aStr100(OUString::createFromAscii("100"));
- static OUString aStr200(OUString::createFromAscii("200"));
- static OUString aStr300(OUString::createFromAscii("300"));
- static OUString aStr400(OUString::createFromAscii("400"));
- static OUString aStr500(OUString::createFromAscii("500"));
- static OUString aStr600(OUString::createFromAscii("600"));
- static OUString aStr700(OUString::createFromAscii("700"));
- static OUString aStr800(OUString::createFromAscii("800"));
- static OUString aStr900(OUString::createFromAscii("900"));
-
- if(aContent.match(aStr100))
+ if(aContent.startsWith("100"))
{
setFontWeight(FontWeight_100);
}
- else if(aContent.match(aStr200))
+ else if(aContent.startsWith("200"))
{
setFontWeight(FontWeight_200);
}
- else if(aContent.match(aStr300))
+ else if(aContent.startsWith("300"))
{
setFontWeight(FontWeight_300);
}
- else if(aContent.match(aStr400) || aContent.match(aStrNormal))
+ else if(aContent.startsWith("400") || aContent.startsWith("normal"))
{
setFontWeight(FontWeight_400);
}
- else if(aContent.match(aStr500))
+ else if(aContent.startsWith("500"))
{
setFontWeight(FontWeight_500);
}
- else if(aContent.match(aStr600))
+ else if(aContent.startsWith("600"))
{
setFontWeight(FontWeight_600);
}
- else if(aContent.match(aStr700) || aContent.match(aStrBold))
+ else if(aContent.startsWith("700") || aContent.startsWith("bold"))
{
setFontWeight(FontWeight_700);
}
- else if(aContent.match(aStr800))
+ else if(aContent.startsWith("800"))
{
setFontWeight(FontWeight_800);
}
- else if(aContent.match(aStr900))
+ else if(aContent.startsWith("900"))
{
setFontWeight(FontWeight_900);
}
- else if(aContent.match(aStrBolder))
+ else if(aContent.startsWith("bolder"))
{
setFontWeight(FontWeight_bolder);
}
- else if(aContent.match(aStrLighter))
+ else if(aContent.startsWith("lighter"))
{
setFontWeight(FontWeight_lighter);
}
@@ -1648,29 +1606,23 @@ namespace svgio
{
if(!aContent.isEmpty())
{
- static OUString aStrNone(OUString::createFromAscii("none"));
- static OUString aStrUnderline(OUString::createFromAscii("underline"));
- static OUString aStrOverline(OUString::createFromAscii("overline"));
- static OUString aStrLineThrough(OUString::createFromAscii("line-through"));
- static OUString aStrBlink(OUString::createFromAscii("blink"));
-
- if(aContent.match(aStrNone))
+ if(aContent.startsWith("none"))
{
setTextDecoration(TextDecoration_none);
}
- else if(aContent.match(aStrUnderline))
+ else if(aContent.startsWith("underline"))
{
setTextDecoration(TextDecoration_underline);
}
- else if(aContent.match(aStrOverline))
+ else if(aContent.startsWith("overline"))
{
setTextDecoration(TextDecoration_overline);
}
- else if(aContent.match(aStrLineThrough))
+ else if(aContent.startsWith("line-through"))
{
setTextDecoration(TextDecoration_line_through);
}
- else if(aContent.match(aStrBlink))
+ else if(aContent.startsWith("blink"))
{
setTextDecoration(TextDecoration_blink);
}
@@ -1689,19 +1641,15 @@ namespace svgio
{
if(!aContent.isEmpty())
{
- static OUString aStrStart(OUString::createFromAscii("start"));
- static OUString aStrMiddle(OUString::createFromAscii("middle"));
- static OUString aStrEnd(OUString::createFromAscii("end"));
-
- if(aContent.match(aStrStart))
+ if(aContent.startsWith("start"))
{
setTextAnchor(TextAnchor_start);
}
- else if(aContent.match(aStrMiddle))
+ else if(aContent.startsWith("middle"))
{
setTextAnchor(TextAnchor_middle);
}
- else if(aContent.match(aStrEnd))
+ else if(aContent.startsWith("end"))
{
setTextAnchor(TextAnchor_end);
}
@@ -1712,24 +1660,19 @@ namespace svgio
{
if(!aContent.isEmpty())
{
- static OUString aStrLeft(OUString::createFromAscii("left"));
- static OUString aStrRight(OUString::createFromAscii("right"));
- static OUString aStrCenter(OUString::createFromAscii("center"));
- static OUString aStrJustify(OUString::createFromAscii("justify"));
-
- if(aContent.match(aStrLeft))
+ if(aContent.startsWith("left"))
{
setTextAlign(TextAlign_left);
}
- else if(aContent.match(aStrRight))
+ else if(aContent.startsWith("right"))
{
setTextAlign(TextAlign_right);
}
- else if(aContent.match(aStrCenter))
+ else if(aContent.startsWith("center"))
{
setTextAlign(TextAlign_center);
}
- else if(aContent.match(aStrJustify))
+ else if(aContent.startsWith("justify"))
{
setTextAlign(TextAlign_justify);
}
@@ -1829,15 +1772,13 @@ namespace svgio
{
if(!aContent.isEmpty())
{
- static rtl::OUString aStrSub(rtl::OUString::createFromAscii("sub"));
- static rtl::OUString aStrSuper(rtl::OUString::createFromAscii("super"));
SvgNumber aNum;
- if(aContent.match(aStrSub))
+ if(aContent.startsWith("sub"))
{
setBaselineShift(BaselineShift_Sub);
}
- else if(aContent.match(aStrSuper))
+ else if(aContent.startsWith("super"))
{
setBaselineShift(BaselineShift_Super);
}
diff --git a/svgio/source/svgreader/svgstylenode.cxx b/svgio/source/svgreader/svgstylenode.cxx
index 6c20df9..352e02d 100644
--- a/svgio/source/svgreader/svgstylenode.cxx
+++ b/svgio/source/svgreader/svgstylenode.cxx
@@ -56,9 +56,7 @@ namespace svgio
{
if(!aContent.isEmpty())
{
- static OUString aStrTextCss(OUString::createFromAscii("text/css"));
-
- if(aContent.match(aStrTextCss))
+ if(aContent.startsWith("text/css"))
{
setTextCss(true);
}
diff --git a/svgio/source/svgreader/svgtextnode.cxx b/svgio/source/svgreader/svgtextnode.cxx
index 77adede..ab1eb69 100644
--- a/svgio/source/svgreader/svgtextnode.cxx
+++ b/svgio/source/svgreader/svgtextnode.cxx
@@ -49,8 +49,7 @@ namespace svgio
const SvgStyleAttributes* SvgTextNode::getSvgStyleAttributes() const
{
- static rtl::OUString aClassStr(rtl::OUString::createFromAscii("text"));
- return checkForCssStyle(aClassStr, maSvgStyleAttributes);
+ return checkForCssStyle(OUString("text"), maSvgStyleAttributes);
}
void SvgTextNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent)
diff --git a/svgio/source/svgreader/svgtextpathnode.cxx b/svgio/source/svgreader/svgtextpathnode.cxx
index 8e09a84..0bdea38 100644
--- a/svgio/source/svgreader/svgtextpathnode.cxx
+++ b/svgio/source/svgreader/svgtextpathnode.cxx
@@ -302,14 +302,11 @@ namespace svgio
{
if(!aContent.isEmpty())
{
- static OUString aStrAlign(OUString::createFromAscii("align"));
- static OUString aStrStretch(OUString::createFromAscii("stretch"));
-
- if(aContent.match(aStrAlign))
+ if(aContent.startsWith("align"))
{
setMethod(true);
}
- else if(aContent.match(aStrStretch))
+ else if(aContent.startsWith("stretch"))
{
setMethod(false);
}
@@ -320,14 +317,11 @@ namespace svgio
{
if(!aContent.isEmpty())
{
- static OUString aStrAuto(OUString::createFromAscii("auto"));
- static OUString aStrExact(OUString::createFromAscii("exact"));
-
- if(aContent.match(aStrAuto))
+ if(aContent.startsWith("auto"))
{
setSpacing(true);
}
- else if(aContent.match(aStrExact))
+ else if(aContent.startsWith("exact"))
{
setSpacing(false);
}
diff --git a/svgio/source/svgreader/svgtoken.cxx b/svgio/source/svgreader/svgtoken.cxx
index ab64e7d..c893704 100644
--- a/svgio/source/svgreader/svgtoken.cxx
+++ b/svgio/source/svgreader/svgtoken.cxx
@@ -25,142 +25,142 @@ namespace svgio
{
namespace svgreader
{
- static OUString aSVGStrWidth(OUString::createFromAscii("width"));
- static OUString aSVGStrHeight(OUString::createFromAscii("height"));
- static OUString aSVGStrViewBox(OUString::createFromAscii("viewBox"));
- static OUString aSVGStrTransform(OUString::createFromAscii("transform"));
- static OUString aSVGStrStyle(OUString::createFromAscii("style"));
- static OUString aSVGStrDisplay(OUString::createFromAscii("display")); // #i121656#
- static OUString aSVGStrD(OUString::createFromAscii("d"));
- static OUString aSVGStrX(OUString::createFromAscii("x"));
- static OUString aSVGStrY(OUString::createFromAscii("y"));
- static OUString aSVGStrXmlns(OUString::createFromAscii("xmlns"));
- static OUString aSVGStrVersion(OUString::createFromAscii("version"));
- static OUString aSVGStrId(OUString::createFromAscii("id"));
- static OUString aSVGStrRx(OUString::createFromAscii("rx"));
- static OUString aSVGStrRy(OUString::createFromAscii("ry"));
- static OUString aSVGStrPoints(OUString::createFromAscii("points"));
- static OUString aSVGStrDx(OUString::createFromAscii("dx"));
- static OUString aSVGStrDy(OUString::createFromAscii("dy"));
- static OUString aSVGStrRotate(OUString::createFromAscii("rotate"));
- static OUString aSVGStrTextLength(OUString::createFromAscii("textLength"));
- static OUString aSVGStrLengthAdjust(OUString::createFromAscii("lengthAdjust"));
- static OUString aSVGStrFont(OUString::createFromAscii("font"));
- static OUString aSVGStrFontFamily(OUString::createFromAscii("font-family"));
- static OUString aSVGStrFontSize(OUString::createFromAscii("font-size"));
- static OUString aSVGStrFontSizeAdjust(OUString::createFromAscii("font-size-adjust"));
- static OUString aSVGStrFontStretch(OUString::createFromAscii("font-stretch"));
- static OUString aSVGStrFontStyle(OUString::createFromAscii("font-style"));
- static OUString aSVGStrFontVariant(OUString::createFromAscii("font-variant"));
- static OUString aSVGStrFontWeight(OUString::createFromAscii("font-weight"));
- static OUString aSVGStrDirection(OUString::createFromAscii("direction"));
- static OUString aSVGStrLetterSpacing(OUString::createFromAscii("letter-spacing"));
- static OUString aSVGStrTextDecoration(OUString::createFromAscii("text-decoration"));
- static OUString aSVGStrUnicodeBidi(OUString::createFromAscii("unicode-bidi"));
- static OUString aSVGStrWordSpacing(OUString::createFromAscii("word-spacing"));
- static OUString aSVGStrTspan(OUString::createFromAscii("tspan"));
- static OUString aSVGStrTref(OUString::createFromAscii("tref"));
- static OUString aSVGStrTextPath(OUString::createFromAscii("textPath"));
- static OUString aSVGStrStartOffset(OUString::createFromAscii("startOffset"));
- static OUString aSVGStrMethod(OUString::createFromAscii("method"));
- static OUString aSVGStrSpacing(OUString::createFromAscii("spacing"));
- static OUString aSVGStrTextAlign(OUString::createFromAscii("text-align"));
- static OUString aSVGStrPathLength(OUString::createFromAscii("pathLength"));
- static OUString aSVGStrType(OUString::createFromAscii("type"));
- static OUString aSVGStrClass(OUString::createFromAscii("class"));
- static OUString aSVGStrTextAnchor(OUString::createFromAscii("text-anchor"));
- static OUString aSVGStrXmlSpace(OUString::createFromAscii("xml:space"));
- static OUString aSVGStrColor(OUString::createFromAscii("color"));
- static OUString aSVGStrClipPathNode(OUString::createFromAscii("clipPath"));
- static OUString aSVGStrClipPathProperty(OUString::createFromAscii("clip-path"));
- static OUString aSVGStrMask(OUString::createFromAscii("mask"));
- static OUString aSVGStrClipPathUnits(OUString::createFromAscii("clipPathUnits"));
- static OUString aSVGStrMaskUnits(OUString::createFromAscii("maskUnits"));
- static OUString aSVGStrMaskContentUnits(OUString::createFromAscii("maskContentUnits"));
- static OUString aSVGStrClipRule(OUString::createFromAscii("clip-rule"));
- static OUString aSVGStrMarker(OUString::createFromAscii("marker"));
- static OUString aSVGStrMarkerStart(OUString::createFromAscii("marker-start"));
- static OUString aSVGStrMarkerMid(OUString::createFromAscii("marker-mid"));
- static OUString aSVGStrMarkerEnd(OUString::createFromAscii("marker-end"));
- static OUString aSVGStrRefX(OUString::createFromAscii("refX"));
- static OUString aSVGStrRefY(OUString::createFromAscii("refY"));
- static OUString aSVGStrMarkerUnits(OUString::createFromAscii("markerUnits"));
- static OUString aSVGStrMarkerWidth(OUString::createFromAscii("markerWidth"));
- static OUString aSVGStrMarkerHeight(OUString::createFromAscii("markerHeight"));
- static OUString aSVGStrOrient(OUString::createFromAscii("orient"));
- static OUString aSVGStrPattern(OUString::createFromAscii("pattern"));
- static OUString aSVGStrPatternUnits(OUString::createFromAscii("patternUnits"));
- static OUString aSVGStrPatternContentUnits(OUString::createFromAscii("patternContentUnits"));
- static OUString aSVGStrPatternTransform(OUString::createFromAscii("patternTransform"));
- static OUString aSVGStrOpacity(OUString::createFromAscii("opacity"));
- static OUString aSVGStrTitle(OUString::createFromAscii("title"));
- static OUString aSVGStrDesc(OUString::createFromAscii("desc"));
+ static OUString aSVGStrWidth("width");
+ static OUString aSVGStrHeight("height");
+ static OUString aSVGStrViewBox("viewBox");
+ static OUString aSVGStrTransform("transform");
+ static OUString aSVGStrStyle("style");
+ static OUString aSVGStrDisplay("display"); // #i121656#
+ static OUString aSVGStrD("d");
+ static OUString aSVGStrX("x");
+ static OUString aSVGStrY("y");
+ static OUString aSVGStrXmlns("xmlns");
+ static OUString aSVGStrVersion("version");
+ static OUString aSVGStrId("id");
+ static OUString aSVGStrRx("rx");
+ static OUString aSVGStrRy("ry");
+ static OUString aSVGStrPoints("points");
+ static OUString aSVGStrDx("dx");
+ static OUString aSVGStrDy("dy");
+ static OUString aSVGStrRotate("rotate");
+ static OUString aSVGStrTextLength("textLength");
+ static OUString aSVGStrLengthAdjust("lengthAdjust");
+ static OUString aSVGStrFont("font");
+ static OUString aSVGStrFontFamily("font-family");
+ static OUString aSVGStrFontSize("font-size");
+ static OUString aSVGStrFontSizeAdjust("font-size-adjust");
+ static OUString aSVGStrFontStretch("font-stretch");
+ static OUString aSVGStrFontStyle("font-style");
+ static OUString aSVGStrFontVariant("font-variant");
+ static OUString aSVGStrFontWeight("font-weight");
+ static OUString aSVGStrDirection("direction");
+ static OUString aSVGStrLetterSpacing("letter-spacing");
+ static OUString aSVGStrTextDecoration("text-decoration");
+ static OUString aSVGStrUnicodeBidi("unicode-bidi");
+ static OUString aSVGStrWordSpacing("word-spacing");
+ static OUString aSVGStrTspan("tspan");
+ static OUString aSVGStrTref("tref");
+ static OUString aSVGStrTextPath("textPath");
+ static OUString aSVGStrStartOffset("startOffset");
+ static OUString aSVGStrMethod("method");
+ static OUString aSVGStrSpacing("spacing");
+ static OUString aSVGStrTextAlign("text-align");
+ static OUString aSVGStrPathLength("pathLength");
+ static OUString aSVGStrType("type");
+ static OUString aSVGStrClass("class");
+ static OUString aSVGStrTextAnchor("text-anchor");
+ static OUString aSVGStrXmlSpace("xml:space");
+ static OUString aSVGStrColor("color");
+ static OUString aSVGStrClipPathNode("clipPath");
+ static OUString aSVGStrClipPathProperty("clip-path");
+ static OUString aSVGStrMask("mask");
+ static OUString aSVGStrClipPathUnits("clipPathUnits");
+ static OUString aSVGStrMaskUnits("maskUnits");
+ static OUString aSVGStrMaskContentUnits("maskContentUnits");
+ static OUString aSVGStrClipRule("clip-rule");
+ static OUString aSVGStrMarker("marker");
+ static OUString aSVGStrMarkerStart("marker-start");
+ static OUString aSVGStrMarkerMid("marker-mid");
+ static OUString aSVGStrMarkerEnd("marker-end");
+ static OUString aSVGStrRefX("refX");
+ static OUString aSVGStrRefY("refY");
+ static OUString aSVGStrMarkerUnits("markerUnits");
+ static OUString aSVGStrMarkerWidth("markerWidth");
+ static OUString aSVGStrMarkerHeight("markerHeight");
+ static OUString aSVGStrOrient("orient");
+ static OUString aSVGStrPattern("pattern");
+ static OUString aSVGStrPatternUnits("patternUnits");
+ static OUString aSVGStrPatternContentUnits("patternContentUnits");
+ static OUString aSVGStrPatternTransform("patternTransform");
+ static OUString aSVGStrOpacity("opacity");
+ static OUString aSVGStrTitle("title");
+ static OUString aSVGStrDesc("desc");
- static OUString aSVGStrPreserveAspectRatio(OUString::createFromAscii("preserveAspectRatio"));
- static OUString aSVGStrDefer(OUString::createFromAscii("defer"));
- static OUString aSVGStrNone(OUString::createFromAscii("none"));
- static OUString aSVGStrXMinYMin(OUString::createFromAscii("xMinYMin"));
- static OUString aSVGStrXMidYMin(OUString::createFromAscii("xMidYMin"));
- static OUString aSVGStrXMaxYMin(OUString::createFromAscii("xMaxYMin"));
- static OUString aSVGStrXMinYMid(OUString::createFromAscii("xMinYMid"));
- static OUString aSVGStrXMidYMid(OUString::createFromAscii("xMidYMid"));
- static OUString aSVGStrXMaxYMid(OUString::createFromAscii("xMaxYMid"));
- static OUString aSVGStrXMinYMax(OUString::createFromAscii("xMinYMax"));
- static OUString aSVGStrXMidYMax(OUString::createFromAscii("xMidYMax"));
- static OUString aSVGStrXMaxYMax(OUString::createFromAscii("xMaxYMax"));
- static OUString aSVGStrMeet(OUString::createFromAscii("meet"));
- static OUString aSVGStrSlice(OUString::createFromAscii("slice"));
+ static OUString aSVGStrPreserveAspectRatio("preserveAspectRatio");
+ static OUString aSVGStrDefer("defer");
+ static OUString aSVGStrNone("none");
+ static OUString aSVGStrXMinYMin("xMinYMin");
+ static OUString aSVGStrXMidYMin("xMidYMin");
+ static OUString aSVGStrXMaxYMin("xMaxYMin");
+ static OUString aSVGStrXMinYMid("xMinYMid");
+ static OUString aSVGStrXMidYMid("xMidYMid");
+ static OUString aSVGStrXMaxYMid("xMaxYMid");
+ static OUString aSVGStrXMinYMax("xMinYMax");
+ static OUString aSVGStrXMidYMax("xMidYMax");
+ static OUString aSVGStrXMaxYMax("xMaxYMax");
+ static OUString aSVGStrMeet("meet");
+ static OUString aSVGStrSlice("slice");
- static OUString aSVGStrDefs(OUString::createFromAscii("defs"));
- static OUString aSVGStrG(OUString::createFromAscii("g"));
- static OUString aSVGStrSvg(OUString::createFromAscii("svg"));
- static OUString aSVGStrSymbol(OUString::createFromAscii("symbol"));
- static OUString aSVGStrUse(OUString::createFromAscii("use"));
+ static OUString aSVGStrDefs("defs");
+ static OUString aSVGStrG("g");
+ static OUString aSVGStrSvg("svg");
+ static OUString aSVGStrSymbol("symbol");
+ static OUString aSVGStrUse("use");
- static OUString aSVGStrCircle(OUString::createFromAscii("circle"));
- static OUString aSVGStrEllipse(OUString::createFromAscii("ellipse"));
- static OUString aSVGStrLine(OUString::createFromAscii("line"));
- static OUString aSVGStrPath(OUString::createFromAscii("path"));
- static OUString aSVGStrPolygon(OUString::createFromAscii("polygon"));
- static OUString aSVGStrPolyline(OUString::createFromAscii("polyline"));
- static OUString aSVGStrRect(OUString::createFromAscii("rect"));
- static OUString aSVGStrImage(OUString::createFromAscii("image"));
+ static OUString aSVGStrCircle("circle");
+ static OUString aSVGStrEllipse("ellipse");
+ static OUString aSVGStrLine("line");
+ static OUString aSVGStrPath("path");
+ static OUString aSVGStrPolygon("polygon");
+ static OUString aSVGStrPolyline("polyline");
+ static OUString aSVGStrRect("rect");
+ static OUString aSVGStrImage("image");
- static OUString aSVGStrLinearGradient(OUString::createFromAscii("linearGradient"));
- static OUString aSVGStrRadialGradient(OUString::createFromAscii("radialGradient"));
- static OUString aSVGStrStop(OUString::createFromAscii("stop"));
- static OUString aSVGStrOffset(OUString::createFromAscii("offset"));
- static OUString aSVGStrX1(OUString::createFromAscii("x1"));
- static OUString aSVGStrY1(OUString::createFromAscii("y1"));
- static OUString aSVGStrX2(OUString::createFromAscii("x2"));
- static OUString aSVGStrY2(OUString::createFromAscii("y2"));
- static OUString aSVGStrCx(OUString::createFromAscii("cx"));
- static OUString aSVGStrCy(OUString::createFromAscii("cy"));
- static OUString aSVGStrFx(OUString::createFromAscii("fx"));
- static OUString aSVGStrFy(OUString::createFromAscii("fy"));
- static OUString aSVGStrR(OUString::createFromAscii("r"));
- static OUString aSVGStrGradientUnits(OUString::createFromAscii("gradientUnits"));
- static OUString aSVGStrGradientTransform(OUString::createFromAscii("gradientTransform"));
- static OUString aSVGStrSpreadMethod(OUString::createFromAscii("spreadMethod"));
- static OUString aSVGStrXlinkHref(OUString::createFromAscii("xlink:href"));
- static OUString aSVGStrStopColor(OUString::createFromAscii("stop-color"));
- static OUString aSVGStrStopOpacity(OUString::createFromAscii("stop-opacity"));
+ static OUString aSVGStrLinearGradient("linearGradient");
+ static OUString aSVGStrRadialGradient("radialGradient");
+ static OUString aSVGStrStop("stop");
+ static OUString aSVGStrOffset("offset");
+ static OUString aSVGStrX1("x1");
+ static OUString aSVGStrY1("y1");
+ static OUString aSVGStrX2("x2");
+ static OUString aSVGStrY2("y2");
+ static OUString aSVGStrCx("cx");
+ static OUString aSVGStrCy("cy");
+ static OUString aSVGStrFx("fx");
+ static OUString aSVGStrFy("fy");
+ static OUString aSVGStrR("r");
+ static OUString aSVGStrGradientUnits("gradientUnits");
+ static OUString aSVGStrGradientTransform("gradientTransform");
+ static OUString aSVGStrSpreadMethod("spreadMethod");
+ static OUString aSVGStrXlinkHref("xlink:href");
+ static OUString aSVGStrStopColor("stop-color");
+ static OUString aSVGStrStopOpacity("stop-opacity");
- static OUString aSVGStrFill(OUString::createFromAscii("fill"));
- static OUString aSVGStrFillOpacity(OUString::createFromAscii("fill-opacity"));
- static OUString aSVGStrFillRule(OUString::createFromAscii("fill-rule"));
+ static OUString aSVGStrFill("fill");
+ static OUString aSVGStrFillOpacity("fill-opacity");
+ static OUString aSVGStrFillRule("fill-rule");
- static OUString aSVGStrStroke(OUString::createFromAscii("stroke"));
- static OUString aSVGStrStrokeDasharray(OUString::createFromAscii("stroke-dasharray"));
- static OUString aSVGStrStrokeDashoffset(OUString::createFromAscii("stroke-dashoffset"));
- static OUString aSVGStrStrokeLinecap(OUString::createFromAscii("stroke-linecap"));
- static OUString aSVGStrStrokeLinejoin(OUString::createFromAscii("stroke-linejoin"));
- static OUString aSVGStrStrokeMiterlimit(OUString::createFromAscii("stroke-miterlimit"));
- static OUString aSVGStrStrokeOpacity(OUString::createFromAscii("stroke-opacity"));
- static OUString aSVGStrStrokeWidth(OUString::createFromAscii("stroke-width"));
+ static OUString aSVGStrStroke("stroke");
+ static OUString aSVGStrStrokeDasharray("stroke-dasharray");
+ static OUString aSVGStrStrokeDashoffset("stroke-dashoffset");
+ static OUString aSVGStrStrokeLinecap("stroke-linecap");
+ static OUString aSVGStrStrokeLinejoin("stroke-linejoin");
+ static OUString aSVGStrStrokeMiterlimit("stroke-miterlimit");
+ static OUString aSVGStrStrokeOpacity("stroke-opacity");
+ static OUString aSVGStrStrokeWidth("stroke-width");
- static OUString aSVGStrText(OUString::createFromAscii("text"));
- static OUString aSVGStrBaselineShift(OUString::createFromAscii("baseline-shift"));
+ static OUString aSVGStrText("text");
+ static OUString aSVGStrBaselineShift("baseline-shift");
SVGToken StrToSVGToken(const OUString& rStr)
{
diff --git a/svgio/source/svgreader/svgtools.cxx b/svgio/source/svgreader/svgtools.cxx
index a24599a..77de836 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -42,10 +42,10 @@ namespace svgio
#endif
// common non-token strings
- const OUString commonStrings::aStrUserSpaceOnUse(OUString::createFromAscii("userSpaceOnUse"));
- const OUString commonStrings::aStrObjectBoundingBox(OUString::createFromAscii("objectBoundingBox"));
- const OUString commonStrings::aStrNonzero(OUString::createFromAscii("nonzero"));
- const OUString commonStrings::aStrEvenOdd(OUString::createFromAscii("evenodd"));
+ const OUString commonStrings::aStrUserSpaceOnUse("userSpaceOnUse");
+ const OUString commonStrings::aStrObjectBoundingBox("objectBoundingBox");
+ const OUString commonStrings::aStrNonzero("nonzero");
+ const OUString commonStrings::aStrEvenOdd("evenodd");
basegfx::B2DHomMatrix SvgAspectRatio::createLinearMapping(const basegfx::B2DRange& rTarget, const basegfx::B2DRange& rSource)
{
@@ -231,7 +231,7 @@ namespace svgio
if ( aViewPort.isEmpty() )
{
#ifdef DBG_UTIL
- myAssert(rtl::OUString::createFromAscii("Design error, this case should have been handled in the caller"));
+ myAssert(OUString("Design error, this case should have been handled in the caller"));
#endif
// no viewPort, assume a normal page size (A4)
aViewPort = basegfx::B2DRange(
@@ -568,8 +568,8 @@ namespace svgio
if(nPos < nLen)
{
const sal_Unicode aChar(rCandidate[nPos]);
- static OUString aStrGrad(OUString::createFromAscii("grad"));
- static OUString aStrRad(OUString::createFromAscii("rad"));
+ static OUString aStrGrad("grad");
+ static OUString aStrRad("rad");
switch(aChar)
{
@@ -647,153 +647,153 @@ namespace svgio
if(aColorTokenMapperList.empty())
{
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("aliceblue"), Color(240, 248, 255)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("antiquewhite"), Color(250, 235, 215)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("aqua"), Color( 0, 255, 255)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("aquamarine"), Color(127, 255, 212)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("azure"), Color(240, 255, 255)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("beige"), Color(245, 245, 220)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("bisque"), Color(255, 228, 196)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("black"), Color( 0, 0, 0)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("blanchedalmond"), Color(255, 235, 205)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("blue"), Color( 0, 0, 255)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("blueviolet"), Color(138, 43, 226)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("brown"), Color(165, 42, 42)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("burlywood"), Color(222, 184, 135)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("cadetblue"), Color( 95, 158, 160)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("chartreuse"), Color(127, 255, 0)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("chocolate"), Color(210, 105, 30)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("coral"), Color(255, 127, 80)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("cornflowerblue"), Color(100, 149, 237)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("cornsilk"), Color(255, 248, 220)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("crimson"), Color(220, 20, 60)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("cyan"), Color( 0, 255, 255)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkblue"), Color( 0, 0, 139)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkcyan"), Color( 0, 139, 139)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkgoldenrod"), Color(184, 134, 11)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkgray"), Color(169, 169, 169)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkgreen"), Color( 0, 100, 0)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkgrey"), Color(169, 169, 169)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkkhaki"), Color(189, 183, 107)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkmagenta"), Color(139, 0, 139)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkolivegreen"), Color( 85, 107, 47)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkorange"), Color(255, 140, 0)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkorchid"), Color(153, 50, 204)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkred"), Color(139, 0, 0)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darksalmon"), Color(233, 150, 122)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkseagreen"), Color(143, 188, 143)));
- aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkslateblue"), Color( 72, 61, 139)));
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list