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

Remove RTL_CONST_STRINGPARAM

Browse Source 
Change-Id: Iac8a36a1f4a9c56d7b8689acd1b2273550a8c968
Reviewed-on: https://gerrit.libreoffice.org/2257
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Chr. Rossmanith
2013-02-17 20:38:27 +01:00
committed by Caolán McNamara
parent 3998d1abb2
commit a09f11715b
2 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
vcl/source/window/builder.cxx
View File

@@ -446,11 +446,11 @@ void VclBuilder::handleTranslations(xmlreader::XmlReader &reader)
if (res == xmlreader::XmlReader::RESULT_BEGIN) if (res == xmlreader::XmlReader::RESULT_BEGIN)
{ {
if (name.equals(RTL_CONSTASCII_STRINGPARAM("e"))) if (name.equals("e"))
{ {
while (reader.nextAttribute(&nsId, &name)) while (reader.nextAttribute(&nsId, &name))
{ {
if (name.equals(RTL_CONSTASCII_STRINGPARAM("g"))) if (name.equals("g"))
{ {
name = reader.getAttributeValue(false); name = reader.getAttributeValue(false);
sID = OString(name.begin, name.length); sID = OString(name.begin, name.length);
@@ -458,7 +458,7 @@ void VclBuilder::handleTranslations(xmlreader::XmlReader &reader)
if (nDelim != -1) if (nDelim != -1)
sID = sID.copy(nDelim); sID = sID.copy(nDelim);
} }
else if (name.equals(RTL_CONSTASCII_STRINGPARAM("i"))) else if (name.equals("i"))
{ {
name = reader.getAttributeValue(false); name = reader.getAttributeValue(false);
sProperty = OString(name.begin, name.length); sProperty = OString(name.begin, name.length);
@@ -1306,11 +1306,11 @@ void VclBuilder::handleTabChild(Window *pParent, xmlreader::XmlReader &reader)
if (res == xmlreader::XmlReader::RESULT_BEGIN) if (res == xmlreader::XmlReader::RESULT_BEGIN)
{ {
++nLevel; ++nLevel;
if (name.equals(RTL_CONSTASCII_STRINGPARAM("object"))) if (name.equals("object"))
{ {
while (reader.nextAttribute(&nsId, &name)) while (reader.nextAttribute(&nsId, &name))
{ {
if (name.equals(RTL_CONSTASCII_STRINGPARAM("id"))) if (name.equals("id"))
{ {
name = reader.getAttributeValue(false); name = reader.getAttributeValue(false);
sID = OString(name.begin, name.length); sID = OString(name.begin, name.length);
@@ -1324,7 +1324,7 @@ void VclBuilder::handleTabChild(Window *pParent, xmlreader::XmlReader &reader)
} }
} }
} }
else if (name.equals(RTL_CONSTASCII_STRINGPARAM("property"))) else if (name.equals("property"))
collectProperty(reader, sID, aProperties); collectProperty(reader, sID, aProperties);
} }
@@ -1409,18 +1409,18 @@ void VclBuilder::handleChild(Window *pParent, xmlreader::XmlReader &reader)
while (reader.nextAttribute(&nsId, &name)) while (reader.nextAttribute(&nsId, &name))
{ {
if (name.equals(RTL_CONSTASCII_STRINGPARAM("type"))) if (name.equals("type"))
{ {
name = reader.getAttributeValue(false); name = reader.getAttributeValue(false);
sType = OString(name.begin, name.length); sType = OString(name.begin, name.length);
} }
else if (name.equals(RTL_CONSTASCII_STRINGPARAM("internal-child"))) else if (name.equals("internal-child"))
{ {
bIsInternalChild = true; bIsInternalChild = true;
} }
} }
if (sType == "tab") if (sType.equals("tab"))
{ {
handleTabChild(pParent, reader); handleTabChild(pParent, reader);
return; return;
@@ -1434,7 +1434,7 @@ void VclBuilder::handleChild(Window *pParent, xmlreader::XmlReader &reader)
if (res == xmlreader::XmlReader::RESULT_BEGIN) if (res == xmlreader::XmlReader::RESULT_BEGIN)
{ {
if (name.equals(RTL_CONSTASCII_STRINGPARAM("object")) || name.equals(RTL_CONSTASCII_STRINGPARAM("placeholder"))) if (name.equals("object") || name.equals("placeholder"))
{ {
pCurrentChild = handleObject(pParent, reader); pCurrentChild = handleObject(pParent, reader);
@@ -1474,7 +1474,7 @@ void VclBuilder::handleChild(Window *pParent, xmlreader::XmlReader &reader)
} }
} }
} }
else if (name.equals(RTL_CONSTASCII_STRINGPARAM("packing"))) else if (name.equals("packing"))
{ {
handlePacking(pCurrentChild, reader); handlePacking(pCurrentChild, reader);
} }
@@ -1503,12 +1503,12 @@ void VclBuilder::collectPangoAttribute(xmlreader::XmlReader &reader, stringmap &
while (reader.nextAttribute(&nsId, &span)) while (reader.nextAttribute(&nsId, &span))
{ {
if (span.equals(RTL_CONSTASCII_STRINGPARAM("name"))) if (span.equals("name"))
{ {
span = reader.getAttributeValue(false); span = reader.getAttributeValue(false);
sProperty = OString(span.begin, span.length); sProperty = OString(span.begin, span.length);
} }
else if (span.equals(RTL_CONSTASCII_STRINGPARAM("value"))) else if (span.equals("value"))
{ {
span = reader.getAttributeValue(false); span = reader.getAttributeValue(false);
sValue = OString(span.begin, span.length); sValue = OString(span.begin, span.length);
@@ -1529,12 +1529,12 @@ void VclBuilder::collectAtkAttribute(xmlreader::XmlReader &reader, stringmap &rM
while (reader.nextAttribute(&nsId, &span)) while (reader.nextAttribute(&nsId, &span))
{ {
if (span.equals(RTL_CONSTASCII_STRINGPARAM("type"))) if (span.equals("type"))
{ {
span = reader.getAttributeValue(false); span = reader.getAttributeValue(false);
sProperty = OString(span.begin, span.length); sProperty = OString(span.begin, span.length);
} }
else if (span.equals(RTL_CONSTASCII_STRINGPARAM("target"))) else if (span.equals("target"))
{ {
span = reader.getAttributeValue(false); span = reader.getAttributeValue(false);
sValue = OString(span.begin, span.length); sValue = OString(span.begin, span.length);
@@ -1578,7 +1578,7 @@ void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OString &rID, sal
if (res == xmlreader::XmlReader::RESULT_BEGIN) if (res == xmlreader::XmlReader::RESULT_BEGIN)
{ {
++nLevel; ++nLevel;
if (name.equals(RTL_CONSTASCII_STRINGPARAM("col"))) if (name.equals("col"))
{ {
bool bTranslated = false; bool bTranslated = false;
OString sProperty, sValue; OString sProperty, sValue;
@@ -1586,12 +1586,12 @@ void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OString &rID, sal
while (reader.nextAttribute(&nsId, &name)) while (reader.nextAttribute(&nsId, &name))
{ {
if (name.equals(RTL_CONSTASCII_STRINGPARAM("id"))) if (name.equals("id"))
{ {
name = reader.getAttributeValue(false); name = reader.getAttributeValue(false);
nId = OString(name.begin, name.length).toInt32(); nId = OString(name.begin, name.length).toInt32();
} }
else if (nId == 0 && name.equals(RTL_CONSTASCII_STRINGPARAM("translatable")) && reader.getAttributeValue(false).equals(RTL_CONSTASCII_STRINGPARAM("yes"))) else if (nId == 0 && name.equals("translatable") && reader.getAttributeValue(false).equals("yes"))
{ {
sValue = getTranslation(rID, OString::valueOf(nRowIndex)); sValue = getTranslation(rID, OString::valueOf(nRowIndex));
bTranslated = !sValue.isEmpty(); bTranslated = !sValue.isEmpty();
@@ -1640,7 +1640,7 @@ void VclBuilder::handleListStore(xmlreader::XmlReader &reader, const OString &rI
if (res == xmlreader::XmlReader::RESULT_BEGIN) if (res == xmlreader::XmlReader::RESULT_BEGIN)
{ {
if (name.equals(RTL_CONSTASCII_STRINGPARAM("row"))) if (name.equals("row"))
handleRow(reader, rID, nRowIndex++); handleRow(reader, rID, nRowIndex++);
else else
++nLevel; ++nLevel;
@@ -1678,7 +1678,7 @@ void VclBuilder::handleAtkObject(xmlreader::XmlReader &reader, const OString &rI
if (res == xmlreader::XmlReader::RESULT_BEGIN) if (res == xmlreader::XmlReader::RESULT_BEGIN)
{ {
++nLevel; ++nLevel;
if (name.equals(RTL_CONSTASCII_STRINGPARAM("property"))) if (name.equals("property"))
collectProperty(reader, rID, aProperties); collectProperty(reader, rID, aProperties);
} }
@@ -1724,14 +1724,14 @@ std::vector<OString> VclBuilder::handleItems(xmlreader::XmlReader &reader, const
if (res == xmlreader::XmlReader::RESULT_BEGIN) if (res == xmlreader::XmlReader::RESULT_BEGIN)
{ {
++nLevel; ++nLevel;
if (name.equals(RTL_CONSTASCII_STRINGPARAM("item"))) if (name.equals("item"))
{ {
bool bTranslated = false; bool bTranslated = false;
OString sValue; OString sValue;
while (reader.nextAttribute(&nsId, &name)) while (reader.nextAttribute(&nsId, &name))
{ {
if (name.equals(RTL_CONSTASCII_STRINGPARAM("translatable")) && reader.getAttributeValue(false).equals(RTL_CONSTASCII_STRINGPARAM("yes"))) if (name.equals("translatable") && reader.getAttributeValue(false).equals("yes"))
{ {
sValue = getTranslation(rID, OString::valueOf(nItemIndex)); sValue = getTranslation(rID, OString::valueOf(nItemIndex));
bTranslated = !sValue.isEmpty(); bTranslated = !sValue.isEmpty();
@@ -1782,14 +1782,14 @@ void VclBuilder::handleMenu(xmlreader::XmlReader &reader, const OString &rID)
if (res == xmlreader::XmlReader::RESULT_BEGIN) if (res == xmlreader::XmlReader::RESULT_BEGIN)
{ {
if (name.equals(RTL_CONSTASCII_STRINGPARAM("child"))) if (name.equals("child"))
{ {
handleMenuChild(pCurrentMenu, reader); handleMenuChild(pCurrentMenu, reader);
} }
else else
{ {
++nLevel; ++nLevel;
if (name.equals(RTL_CONSTASCII_STRINGPARAM("property"))) if (name.equals("property"))
collectProperty(reader, rID, aProperties); collectProperty(reader, rID, aProperties);
} }
} }
@@ -1820,7 +1820,7 @@ void VclBuilder::handleMenuChild(PopupMenu *pParent, xmlreader::XmlReader &reade
if (res == xmlreader::XmlReader::RESULT_BEGIN) if (res == xmlreader::XmlReader::RESULT_BEGIN)
{ {
if (name.equals(RTL_CONSTASCII_STRINGPARAM("object")) || name.equals(RTL_CONSTASCII_STRINGPARAM("placeholder"))) if (name.equals("object") || name.equals("placeholder"))
{ {
handleMenuObject(pParent, reader); handleMenuObject(pParent, reader);
} }
@@ -1850,12 +1850,12 @@ void VclBuilder::handleMenuObject(PopupMenu *pParent, xmlreader::XmlReader &read
while (reader.nextAttribute(&nsId, &name)) while (reader.nextAttribute(&nsId, &name))
{ {
if (name.equals(RTL_CONSTASCII_STRINGPARAM("class"))) if (name.equals("class"))
{ {
name = reader.getAttributeValue(false); name = reader.getAttributeValue(false);
sClass = OString(name.begin, name.length); sClass = OString(name.begin, name.length);
} }
else if (name.equals(RTL_CONSTASCII_STRINGPARAM("id"))) else if (name.equals("id"))
{ {
name = reader.getAttributeValue(false); name = reader.getAttributeValue(false);
sID = OString(name.begin, name.length); sID = OString(name.begin, name.length);
@@ -1886,9 +1886,9 @@ void VclBuilder::handleMenuObject(PopupMenu *pParent, xmlreader::XmlReader &read
if (res == xmlreader::XmlReader::RESULT_BEGIN) if (res == xmlreader::XmlReader::RESULT_BEGIN)
{ {
++nLevel; ++nLevel;
if (name.equals(RTL_CONSTASCII_STRINGPARAM("property"))) if (name.equals("property"))
collectProperty(reader, sID, aProperties); collectProperty(reader, sID, aProperties);
else if (name.equals(RTL_CONSTASCII_STRINGPARAM("accelerator"))) else if (name.equals("accelerator"))
collectAccelerator(reader, aAccelerators); collectAccelerator(reader, aAccelerators);
} }
@@ -1925,11 +1925,11 @@ void VclBuilder::handleSizeGroup(xmlreader::XmlReader &reader, const OString &rI
if (res == xmlreader::XmlReader::RESULT_BEGIN) if (res == xmlreader::XmlReader::RESULT_BEGIN)
{ {
++nLevel; ++nLevel;
if (name.equals(RTL_CONSTASCII_STRINGPARAM("widget"))) if (name.equals("widget"))
{ {
while (reader.nextAttribute(&nsId, &name)) while (reader.nextAttribute(&nsId, &name))
{ {
if (name.equals(RTL_CONSTASCII_STRINGPARAM("name"))) if (name.equals("name"))
{ {
name = reader.getAttributeValue(false); name = reader.getAttributeValue(false);
OString sWidget = OString(name.begin, name.length); OString sWidget = OString(name.begin, name.length);
@@ -1942,7 +1942,7 @@ void VclBuilder::handleSizeGroup(xmlreader::XmlReader &reader, const OString &rI
} }
else else
{ {
if (name.equals(RTL_CONSTASCII_STRINGPARAM("property"))) if (name.equals("property"))
collectProperty(reader, rID, rSizeGroup.m_aProperties); collectProperty(reader, rID, rSizeGroup.m_aProperties);
} }
} }
@@ -2062,12 +2062,12 @@ Window* VclBuilder::handleObject(Window *pParent, xmlreader::XmlReader &reader)
while (reader.nextAttribute(&nsId, &name)) while (reader.nextAttribute(&nsId, &name))
{ {
if (name.equals(RTL_CONSTASCII_STRINGPARAM("class"))) if (name.equals("class"))
{ {
name = reader.getAttributeValue(false); name = reader.getAttributeValue(false);
sClass = OString(name.begin, name.length); sClass = OString(name.begin, name.length);
} }
else if (name.equals(RTL_CONSTASCII_STRINGPARAM("id"))) else if (name.equals("id"))
{ {
name = reader.getAttributeValue(false); name = reader.getAttributeValue(false);
sID = OString(name.begin, name.length); sID = OString(name.begin, name.length);
@@ -2120,7 +2120,7 @@ Window* VclBuilder::handleObject(Window *pParent, xmlreader::XmlReader &reader)
if (res == xmlreader::XmlReader::RESULT_BEGIN) if (res == xmlreader::XmlReader::RESULT_BEGIN)
{ {
if (name.equals(RTL_CONSTASCII_STRINGPARAM("child"))) if (name.equals("child"))
{ {
if (!pCurrentChild) if (!pCurrentChild)
{ {
@@ -2129,16 +2129,16 @@ Window* VclBuilder::handleObject(Window *pParent, xmlreader::XmlReader &reader)
} }
handleChild(pCurrentChild, reader); handleChild(pCurrentChild, reader);
} }
else if (name.equals(RTL_CONSTASCII_STRINGPARAM("items"))) else if (name.equals("items"))
aItems = handleItems(reader, sID); aItems = handleItems(reader, sID);
else else
{ {
++nLevel; ++nLevel;
if (name.equals(RTL_CONSTASCII_STRINGPARAM("property"))) if (name.equals("property"))
collectProperty(reader, sID, aProperties); collectProperty(reader, sID, aProperties);
else if (name.equals(RTL_CONSTASCII_STRINGPARAM("attribute"))) else if (name.equals("attribute"))
collectPangoAttribute(reader, aPangoAttributes); collectPangoAttribute(reader, aPangoAttributes);
else if (name.equals(RTL_CONSTASCII_STRINGPARAM("relation"))) else if (name.equals("relation"))
collectAtkAttribute(reader, aAtkAttributes); collectAtkAttribute(reader, aAtkAttributes);
} }
} }
@@ -2190,7 +2190,7 @@ void VclBuilder::handlePacking(Window *pCurrent, xmlreader::XmlReader &reader)
if (res == xmlreader::XmlReader::RESULT_BEGIN) if (res == xmlreader::XmlReader::RESULT_BEGIN)
{ {
++nLevel; ++nLevel;
if (name.equals(RTL_CONSTASCII_STRINGPARAM("property"))) if (name.equals("property"))
applyPackingProperty(pCurrent, reader); applyPackingProperty(pCurrent, reader);
} }
@@ -2225,7 +2225,7 @@ void VclBuilder::applyPackingProperty(Window *pCurrent,
while (reader.nextAttribute(&nsId, &name)) while (reader.nextAttribute(&nsId, &name))
{ {
if (name.equals(RTL_CONSTASCII_STRINGPARAM("name"))) if (name.equals("name"))
{ {
name = reader.getAttributeValue(false); name = reader.getAttributeValue(false);
OString sKey(name.begin, name.length); OString sKey(name.begin, name.length);
@@ -2310,12 +2310,12 @@ void VclBuilder::collectProperty(xmlreader::XmlReader &reader, const OString &rI
while (reader.nextAttribute(&nsId, &name)) while (reader.nextAttribute(&nsId, &name))
{ {
if (name.equals(RTL_CONSTASCII_STRINGPARAM("name"))) if (name.equals("name"))
{ {
name = reader.getAttributeValue(false); name = reader.getAttributeValue(false);
sProperty = OString(name.begin, name.length); sProperty = OString(name.begin, name.length);
} }
else if (name.equals(RTL_CONSTASCII_STRINGPARAM("translatable")) && reader.getAttributeValue(false).equals(RTL_CONSTASCII_STRINGPARAM("yes"))) else if (name.equals("translatable") && reader.getAttributeValue(false).equals("yes"))
{ {
sValue = getTranslation(rID, sProperty); sValue = getTranslation(rID, sProperty);
bTranslated = !sValue.isEmpty(); bTranslated = !sValue.isEmpty();
@@ -2344,12 +2344,12 @@ void VclBuilder::collectAccelerator(xmlreader::XmlReader &reader, stringmap &rMa
while (reader.nextAttribute(&nsId, &name)) while (reader.nextAttribute(&nsId, &name))
{ {
if (name.equals(RTL_CONSTASCII_STRINGPARAM("key"))) if (name.equals("key"))
{ {
name = reader.getAttributeValue(false); name = reader.getAttributeValue(false);
sValue = OString(name.begin, name.length); sValue = OString(name.begin, name.length);
} }
else if (name.equals(RTL_CONSTASCII_STRINGPARAM("signal"))) else if (name.equals("signal"))
{ {
name = reader.getAttributeValue(false); name = reader.getAttributeValue(false);
sProperty = OString(name.begin, name.length); sProperty = OString(name.begin, name.length);

8
vcl/source/window/layout.cxx
View File

@@ -1521,13 +1521,13 @@ bool VclSizeGroup::set_property(const OString &rKey, const OString &rValue)
else if (rKey == "mode") else if (rKey == "mode")
{ {
VclSizeGroupMode eMode = VCL_SIZE_GROUP_HORIZONTAL; VclSizeGroupMode eMode = VCL_SIZE_GROUP_HORIZONTAL;
if (rValue.equalsL(RTL_CONSTASCII_STRINGPARAM("none"))) if (rValue.equals("none"))
eMode = VCL_SIZE_GROUP_NONE; eMode = VCL_SIZE_GROUP_NONE;
else if (rValue.equalsL(RTL_CONSTASCII_STRINGPARAM("horizontal"))) else if (rValue.equals("horizontal"))
eMode = VCL_SIZE_GROUP_HORIZONTAL; eMode = VCL_SIZE_GROUP_HORIZONTAL;
else if (rValue.equalsL(RTL_CONSTASCII_STRINGPARAM("vertical"))) else if (rValue.equals("vertical"))
eMode = VCL_SIZE_GROUP_VERTICAL; eMode = VCL_SIZE_GROUP_VERTICAL;
else if (rValue.equalsL(RTL_CONSTASCII_STRINGPARAM("both"))) else if (rValue.equals("both"))
eMode = VCL_SIZE_GROUP_BOTH; eMode = VCL_SIZE_GROUP_BOTH;
else else
{ {