sw/source/filter/ww8/docxattributeoutput.cxx | 22 +++++++++++-----------
sw/source/filter/ww8/docxhelper.hxx | 2 +-
xmloff/source/text/txtparae.cxx | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit a13622923af5024398eff324dadb048fd6fd7b04
Author: Jan Holesovsky <ke...@collabora.com>
Date: Mon Feb 24 10:56:11 2014 +0100
Here the line made sense, bring it back.
Change-Id: Iba1c798edfe1b0eb5edcba904ceacec9174cacc6
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 0135f28..95f6f0ce5 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -258,7 +258,7 @@ static int txtparae_bContainsIllegalCharacters = sal_False;
// The following map shows which property values are required:
//
// property auto style pass export
-
+// -------------------------------------------------------
// ParaStyleName if style exists always
// ParaConditionalStyleName if style exists always
// NumberingRules if style exists always
commit d39f1358372e6b0994fdd3f82542caeb547a64e7
Author: Jan Holesovsky <ke...@collabora.com>
Date: Mon Feb 24 10:10:33 2014 +0100
OUString -> const OUString&, Sequence<> -> const Sequence<>&
Change-Id: I5d17a04fe0a3051374d75d9c989d95377f18c79d
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 9dd8cd5..1322131 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1183,12 +1183,12 @@ const NameToId constNameToIdMapping[] =
{ OUString("lumMod"), FSNS( XML_w14, XML_lumMod ) },
};
-boost::optional<sal_Int32> lclGetElementIdForName(OUString aName)
+boost::optional<sal_Int32> lclGetElementIdForName(const OUString& rName)
{
sal_Int32 aLength = sizeof (constNameToIdMapping) / sizeof(NameToId);
for (sal_Int32 i=0; i < aLength; ++i)
{
- if(aName == constNameToIdMapping[i].maName)
+ if (rName == constNameToIdMapping[i].maName)
{
return constNameToIdMapping[i].maId;
}
@@ -1196,16 +1196,16 @@ boost::optional<sal_Int32>
lclGetElementIdForName(OUString aName)
return boost::optional<sal_Int32>();
}
-void lclProcessRecursiveGrabBag(sal_Int32 aElementId,
css::uno::Sequence<css::beans::PropertyValue> aElements,
sax_fastparser::FSHelperPtr pSerializer)
+void lclProcessRecursiveGrabBag(sal_Int32 aElementId, const
css::uno::Sequence<css::beans::PropertyValue>& rElements,
sax_fastparser::FSHelperPtr pSerializer)
{
css::uno::Sequence<css::beans::PropertyValue> aAttributes;
FastAttributeList* pAttributes = pSerializer->createAttrList();
- for (sal_Int32 j=0; j < aElements.getLength(); ++j)
+ for (sal_Int32 j=0; j < rElements.getLength(); ++j)
{
- if( aElements[j].Name == "attributes")
+ if (rElements[j].Name == "attributes")
{
- aElements[j].Value >>= aAttributes;
+ rElements[j].Value >>= aAttributes;
}
}
@@ -1232,14 +1232,14 @@ void lclProcessRecursiveGrabBag(sal_Int32 aElementId,
css::uno::Sequence<css::be
pSerializer->startElement(aElementId, xAttributesList);
- for (sal_Int32 j=0; j < aElements.getLength(); ++j)
+ for (sal_Int32 j=0; j < rElements.getLength(); ++j)
{
css::uno::Sequence<css::beans::PropertyValue> aSumElements;
- boost::optional<sal_Int32> aSubElementId =
lclGetElementIdForName(aElements[j].Name);
+ boost::optional<sal_Int32> aSubElementId =
lclGetElementIdForName(rElements[j].Name);
if(aSubElementId)
{
- aElements[j].Value >>= aSumElements;
+ rElements[j].Value >>= aSumElements;
lclProcessRecursiveGrabBag(*aSubElementId, aSumElements,
pSerializer);
}
}
@@ -2759,9 +2759,9 @@ void DocxAttributeOutput::StartStyles()
LatentStyles();
}
-sal_Int32 DocxStringGetToken(DocxStringTokenMap const * pMap, OUString aName)
+sal_Int32 DocxStringGetToken(DocxStringTokenMap const * pMap, const OUString&
rName)
{
- OString sName = OUStringToOString(aName, RTL_TEXTENCODING_UTF8);
+ OString sName = OUStringToOString(rName, RTL_TEXTENCODING_UTF8);
while (pMap->pToken)
{
if (sName == pMap->pToken)
diff --git a/sw/source/filter/ww8/docxhelper.hxx
b/sw/source/filter/ww8/docxhelper.hxx
index d6d158f..4791aaa 100644
--- a/sw/source/filter/ww8/docxhelper.hxx
+++ b/sw/source/filter/ww8/docxhelper.hxx
@@ -18,7 +18,7 @@ struct DocxStringTokenMap
sal_Int32 nToken;
};
-sal_Int32 DocxStringGetToken(DocxStringTokenMap const * pMap, OUString aName);
+sal_Int32 DocxStringGetToken(DocxStringTokenMap const * pMap, const OUString&
rName);
#endif // INCLUDED_SW_SOURCE_FILTER_WW8_DOCXHELPER_HXX
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
