[Libreoffice-commits] .: 6 commits - binfilter/bf_sc binfilter/bf_svtools binfilter/bf_sw unoxml/source writerfilter/source writerperfect/source
Caolán McNamara
caolan at kemper.freedesktop.org
Sat Nov 27 04:49:06 PST 2010
binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx | 22 +++++-----
binfilter/bf_sc/source/filter/xml/sc_xmlstyli.cxx | 2
binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx | 2
binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx | 2
unoxml/source/dom/document.cxx | 4 -
writerfilter/source/resourcemodel/WW8Analyzer.cxx | 4 -
writerperfect/source/filter/PageSpan.cxx | 2
7 files changed, 21 insertions(+), 17 deletions(-)
New commits:
commit a35a22a1ca017d4b417ddfa54a47f04664e4f518
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 27 12:43:16 2010 +0000
cppcheck: unused variable under some ifdefs
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx b/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx
index d98eff9..7a7b778 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx
@@ -413,7 +413,9 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1)
/*?*/
/*?*/ UnlockModify(); // Benachrichtigungen wieder freischalten
/*?*/
+/*?*/ #ifdef ACCESSIBLE_LAYOUT
/*?*/ const SwRootFrm *pRootFrm;
+/*?*/ #endif
/*?*/ // If there is an accessible layout we must call modify even
/*?*/ // with length zero, because we have to notify about the changed
/*?*/ // text node.
commit 6272a178f6c788cff6e32c45f05c2e5e8d75008f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 27 12:41:14 2010 +0000
cppcheck: use prefix form
diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx
index 18a108c..2c92450 100644
--- a/unoxml/source/dom/document.cxx
+++ b/unoxml/source/dom/document.cxx
@@ -142,7 +142,7 @@ namespace DOM
while (iter1 != m_streamListeners.end()) {
Reference< XStreamListener > aListener = *iter1;
aListener->started();
- iter1++;
+ ++iter1;
}
// setup libxml IO and write data to output stream
@@ -156,7 +156,7 @@ namespace DOM
while (iter2 != m_streamListeners.end()) {
Reference< XStreamListener > aListener = *iter2;
aListener->closed();
- iter2++;
+ ++iter2;
}
}
commit 0071243566a77149ecebcfe6cdcb2fa3b7900b7d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 27 12:21:04 2010 +0000
cppcheck: use prefix form
diff --git a/writerfilter/source/resourcemodel/WW8Analyzer.cxx b/writerfilter/source/resourcemodel/WW8Analyzer.cxx
index 6f6315d..71f5296 100644
--- a/writerfilter/source/resourcemodel/WW8Analyzer.cxx
+++ b/writerfilter/source/resourcemodel/WW8Analyzer.cxx
@@ -178,7 +178,7 @@ void WW8Analyzer::dumpStats(ostream & o) const
{
{
for (IdSet::const_iterator aIt = mSprmIdSet.begin();
- aIt != mSprmIdSet.end(); aIt++)
+ aIt != mSprmIdSet.end(); ++aIt)
{
sal_uInt32 aId = *aIt;
@@ -194,7 +194,7 @@ void WW8Analyzer::dumpStats(ostream & o) const
{
for (IdSet::const_iterator aIt = mAttributeIdSet.begin();
- aIt != mAttributeIdSet.end(); aIt++)
+ aIt != mAttributeIdSet.end(); ++aIt)
{
sal_uInt32 aId = *aIt;
commit a39bfde4f9bb21213de1f51d0b1adefe43220e6a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 27 11:34:04 2010 +0000
cppcheck: use prefix form
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx
index 2bce8af..9ad9001 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx
@@ -409,7 +409,7 @@ void ScMyValidationsContainer::WriteValidations(ScXMLExport& rExport)
break;
}
}
- aItr++;
+ ++aItr;
}
}
}
@@ -700,7 +700,7 @@ sal_Int32 ScRowFormatRanges::GetMaxRows()
{
if ((*aItr).nRepeatRows < nMaxRows)
nMaxRows = (*aItr).nRepeatRows;
- aItr++;
+ ++aItr;
}
else
DBG_ERROR("no ranges found");
@@ -749,19 +749,19 @@ ScFormatRangeStyles::~ScFormatRangeStyles()
while (i != aStyleNames.end())
{
delete *i;
- i++;
+ ++i;
}
i = aAutoStyleNames.begin();
while (i != aAutoStyleNames.end())
{
delete *i;
- i++;
+ ++i;
}
ScMyFormatRangeListVec::iterator j = aTables.begin();
while (j != aTables.end())
{
delete *j;
- j++;
+ ++j;
}
}
@@ -874,7 +874,7 @@ sal_Int32 ScFormatRangeStyles::GetStyleNameIndex(const sal_uInt16 nTable,
return (*aItr).nStyleNameIndex;
}
else
- aItr++;
+ ++aItr;
}
return -1;
}
@@ -915,7 +915,7 @@ sal_Int32 ScFormatRangeStyles::GetStyleNameIndex(const sal_uInt16 nTable, const
if (bRemoveRange && (*aItr).aRangeAddress.EndRow < nRow)
aItr = pFormatRanges->erase(aItr);
else
- aItr++;
+ ++aItr;
}
}
return -1;
@@ -974,13 +974,15 @@ void ScFormatRangeStyles::GetFormatRanges(const sal_Int32 nStartColumn, const sa
pRowFormatRanges->AddRange(aRange, nRow);
nColumns += aRange.nRepeatColumns;
}
- aItr++;
+ ++aItr;
}
else
+ {
if(aItr->aRangeAddress.EndRow < nRow)
aItr = pFormatRanges->erase(aItr);
else
- aItr++;
+ ++aItr;
+ }
}
pRowFormatRanges->Sort();
}
@@ -1029,7 +1031,7 @@ ScColumnRowStylesBase::~ScColumnRowStylesBase()
while (i != aStyleNames.end())
{
delete *i;
- i++;
+ ++i;
}
}
commit ecbbd0c98fdb3c9b56795c7bce1da5d4f6cbad05
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 27 11:07:48 2010 +0000
cppcheck: use prefix form
diff --git a/writerperfect/source/filter/PageSpan.cxx b/writerperfect/source/filter/PageSpan.cxx
index a3bfb13..7ff4d1c 100644
--- a/writerperfect/source/filter/PageSpan.cxx
+++ b/writerperfect/source/filter/PageSpan.cxx
@@ -268,7 +268,7 @@ void PageSpan::_writeHeaderFooter(const char *headerFooterTagName,
headerFooterOpen.write(pHandler);
for (std::vector<DocumentElement *>::const_iterator iter = headerFooterContent.begin();
iter != headerFooterContent.end();
- iter++) {
+ ++iter) {
(*iter)->write(pHandler);
}
}
commit 52dcbba27e561a8c0d4225ec37b625f64f3ba70e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 27 10:56:14 2010 +0000
cppcheck: use prefix form
diff --git a/binfilter/bf_sc/source/filter/xml/sc_xmlstyli.cxx b/binfilter/bf_sc/source/filter/xml/sc_xmlstyli.cxx
index 9e1f3ca..e41f29f 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_xmlstyli.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_xmlstyli.cxx
@@ -566,7 +566,7 @@ void XMLTableStyleContext::FillPropertySet(
//rPropSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_CONDITIONALFORMAT)),
GetConditionalFormat(aConditionalFormat, aItr->sCondition, aItr->sApplyStyle, aItr->sBaseCell);
- aItr++;
+ ++aItr;
}
AddProperty(CTF_SC_IMPORT_MAP, aConditionalFormat);
bConditionalFormatCreated = sal_True;
diff --git a/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx b/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx
index e77904a..3e8aac6 100644
--- a/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx
@@ -1397,7 +1397,7 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvS
break;
}
}
- aIter++;
+ ++aIter;
}
}
More information about the Libreoffice-commits
mailing list