[Libreoffice-commits] .: writerperfect/source
Fridrich Strba
fridrich at kemper.freedesktop.org
Tue Oct 25 02:52:47 PDT 2011
writerperfect/source/filter/FontStyle.cxx | 4 -
writerperfect/source/filter/ListStyle.cxx | 6 +-
writerperfect/source/filter/OdgGenerator.cxx | 8 +--
writerperfect/source/filter/OdtGenerator.cxx | 42 ++++++++--------
writerperfect/source/filter/PageSpan.cxx | 18 +++---
writerperfect/source/filter/TextRunStyle.cxx | 8 +--
writerperfect/source/filter/libwriterperfect_filter.hxx | 2
7 files changed, 43 insertions(+), 45 deletions(-)
New commits:
commit 192f7dfb17ed329045dd4f836e86a65e92dbb463
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Oct 25 11:51:55 2011 +0200
Prefer pre-increment in for loops
diff --git a/writerperfect/source/filter/FontStyle.cxx b/writerperfect/source/filter/FontStyle.cxx
index ac501c6..9accf52 100644
--- a/writerperfect/source/filter/FontStyle.cxx
+++ b/writerperfect/source/filter/FontStyle.cxx
@@ -52,7 +52,7 @@ void FontStyle::write(OdfDocumentHandler *pHandler) const
void FontStyleManager::clean()
{
for (std::map<WPXString, FontStyle *, ltstr>::iterator iter = mHash.begin();
- iter != mHash.end(); iter++)
+ iter != mHash.end(); ++iter)
{
delete(iter->second);
}
@@ -63,7 +63,7 @@ void FontStyleManager::writeFontsDeclaration(OdfDocumentHandler *pHandler) const
{
TagOpenElement("office:font-face-decls").write(pHandler);
for (std::map<WPXString, FontStyle *, ltstr>::const_iterator iter = mHash.begin();
- iter != mHash.end(); iter++)
+ iter != mHash.end(); ++iter)
{
(iter->second)->write(pHandler);
}
diff --git a/writerperfect/source/filter/ListStyle.cxx b/writerperfect/source/filter/ListStyle.cxx
index cee4ac1..9b705f5 100644
--- a/writerperfect/source/filter/ListStyle.cxx
+++ b/writerperfect/source/filter/ListStyle.cxx
@@ -139,14 +139,14 @@ ListStyle::ListStyle(const char *psName, const int iListID) :
miNumListLevels(0),
miListID(iListID)
{
- for (int i=0; i<WP6_NUM_LIST_LEVELS; i++)
+ for (int i=0; i<WP6_NUM_LIST_LEVELS; ++i)
mppListLevels[i] = NULL;
}
ListStyle::~ListStyle()
{
- for (int i=0; i<WP6_NUM_LIST_LEVELS; i++)
+ for (int i=0; i<WP6_NUM_LIST_LEVELS; ++i)
{
if (mppListLevels[i])
delete(mppListLevels[i]);
@@ -177,7 +177,7 @@ void ListStyle::write(OdfDocumentHandler *pHandler) const
listStyleOpenElement.addAttribute("style:name", getName());
listStyleOpenElement.write(pHandler);
- for (int i=0; i<WP6_NUM_LIST_LEVELS; i++)
+ for (int i=0; i<WP6_NUM_LIST_LEVELS; ++i)
{
if (mppListLevels[i] != NULL)
mppListLevels[i]->write(pHandler, i);
diff --git a/writerperfect/source/filter/OdgGenerator.cxx b/writerperfect/source/filter/OdgGenerator.cxx
index 637ba76..68f77c1 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -509,7 +509,7 @@ OdgGenerator::~OdgGenerator()
{
// writing out the page automatic styles
for (std::vector<DocumentElement *>::iterator iterPageAutomaticStyles = mpImpl->mPageAutomaticStyles.begin();
- iterPageAutomaticStyles != mpImpl->mPageAutomaticStyles.end(); iterPageAutomaticStyles++)
+ iterPageAutomaticStyles != mpImpl->mPageAutomaticStyles.end(); ++iterPageAutomaticStyles)
{
(*iterPageAutomaticStyles)->write(mpImpl->mpHandler);
}
@@ -776,7 +776,7 @@ void OdgGeneratorPrivate::_drawPolySomething(const ::WPXPropertyListVector &vert
::WPXPropertyListVector path;
::WPXPropertyList element;
- for (unsigned long ii = 0; ii < vertices.count(); ii++)
+ for (unsigned long ii = 0; ii < vertices.count(); ++ii)
{
element = vertices[ii];
if (ii == 0)
@@ -812,7 +812,7 @@ void OdgGeneratorPrivate::_drawPath(const WPXPropertyListVector &path)
double lastX = 0.0;
double lastY = 0.0;
- for(unsigned k = 0; k < path.count(); k++)
+ for(unsigned k = 0; k < path.count(); ++k)
{
if (!path[k]["svg:x"] || !path[k]["svg:y"])
continue;
@@ -884,7 +884,7 @@ void OdgGeneratorPrivate::_drawPath(const WPXPropertyListVector &path)
pDrawPathElement->addAttribute("svg:viewBox", sValue);
sValue.clear();
- for(unsigned i = 0; i < path.count(); i++)
+ for(unsigned i = 0; i < path.count(); ++i)
{
WPXString sElement;
if (path[i]["libwpg:path-action"]->getStr() == "M")
diff --git a/writerperfect/source/filter/OdtGenerator.cxx b/writerperfect/source/filter/OdtGenerator.cxx
index cb64d63..72f816c 100644
--- a/writerperfect/source/filter/OdtGenerator.cxx
+++ b/writerperfect/source/filter/OdtGenerator.cxx
@@ -215,7 +215,7 @@ OdtGeneratorPrivate::~OdtGeneratorPrivate()
WRITER_DEBUG_MSG(("WriterWordPerfect: Cleaning up our mess..\n"));
WRITER_DEBUG_MSG(("Destroying the body elements\n"));
- for (std::vector<DocumentElement *>::iterator iterBody = mBodyElements.begin(); iterBody != mBodyElements.end(); iterBody++)
+ for (std::vector<DocumentElement *>::iterator iterBody = mBodyElements.begin(); iterBody != mBodyElements.end(); ++iterBody)
{
delete (*iterBody);
(*iterBody) = 0;
@@ -226,38 +226,38 @@ OdtGeneratorPrivate::~OdtGeneratorPrivate()
mFontManager.clean();
for (std::vector<ListStyle *>::iterator iterListStyles = mListStyles.begin();
- iterListStyles != mListStyles.end(); iterListStyles++)
+ iterListStyles != mListStyles.end(); ++iterListStyles)
{
delete(*iterListStyles);
}
for (std::vector<SectionStyle *>::iterator iterSectionStyles = mSectionStyles.begin();
- iterSectionStyles != mSectionStyles.end(); iterSectionStyles++)
+ iterSectionStyles != mSectionStyles.end(); ++iterSectionStyles)
{
delete(*iterSectionStyles);
}
for (std::vector<TableStyle *>::iterator iterTableStyles = mTableStyles.begin();
- iterTableStyles != mTableStyles.end(); iterTableStyles++)
+ iterTableStyles != mTableStyles.end(); ++iterTableStyles)
{
delete((*iterTableStyles));
}
for (std::vector<PageSpan *>::iterator iterPageSpans = mPageSpans.begin();
- iterPageSpans != mPageSpans.end(); iterPageSpans++)
+ iterPageSpans != mPageSpans.end(); ++iterPageSpans)
{
delete(*iterPageSpans);
}
for (std::vector<DocumentElement *>::iterator iterFrameStyles = mFrameStyles.begin();
- iterFrameStyles != mFrameStyles.end(); iterFrameStyles++)
+ iterFrameStyles != mFrameStyles.end(); ++iterFrameStyles)
{
delete(*iterFrameStyles);
}
for (std::vector<DocumentElement *>::iterator iterFrameAutomaticStyles = mFrameAutomaticStyles.begin();
- iterFrameAutomaticStyles != mFrameAutomaticStyles.end(); iterFrameAutomaticStyles++)
+ iterFrameAutomaticStyles != mFrameAutomaticStyles.end(); ++iterFrameAutomaticStyles)
{
delete(*iterFrameAutomaticStyles);
}
for (std::vector<DocumentElement *>::iterator iterMetaData = mMetaData.begin();
- iterMetaData != mMetaData.end(); iterMetaData++)
+ iterMetaData != mMetaData.end(); ++iterMetaData)
{
delete(*iterMetaData);
}
@@ -349,7 +349,7 @@ void OdtGeneratorPrivate::_writeDefaultStyles(OdfDocumentHandler *pHandler)
pHandler->endElement("style:style");
for (std::vector<DocumentElement *>::const_iterator iter = mFrameStyles.begin();
- iter != mFrameStyles.end(); iter++)
+ iter != mFrameStyles.end(); ++iter)
(*iter)->write(pHandler);
pHandler->endElement("office:styles");
@@ -364,7 +364,7 @@ void OdtGeneratorPrivate::_writeMasterPages(OdfDocumentHandler *pHandler)
{
TagOpenElement("office:master-styles").write(mpHandler);
int pageNumber = 1;
- for (unsigned int i=0; i<mPageSpans.size(); i++)
+ for (unsigned int i=0; i<mPageSpans.size(); ++i)
{
bool bLastPage;
(i == (mPageSpans.size() - 1)) ? bLastPage = true : bLastPage = false;
@@ -376,7 +376,7 @@ void OdtGeneratorPrivate::_writeMasterPages(OdfDocumentHandler *pHandler)
void OdtGeneratorPrivate::_writePageLayouts(OdfDocumentHandler *pHandler)
{
- for (unsigned int i=0; i<mPageSpans.size(); i++)
+ for (unsigned int i=0; i<mPageSpans.size(); ++i)
{
mPageSpans[i]->writePageLayout(i, pHandler);
}
@@ -419,7 +419,7 @@ bool OdtGeneratorPrivate::_writeTargetDocument(OdfDocumentHandler *pHandler)
// write out the metadata
TagOpenElement("office:meta").write(mpHandler);
- for (std::vector<DocumentElement *>::const_iterator iterMetaData = mMetaData.begin(); iterMetaData != mMetaData.end(); iterMetaData++)
+ for (std::vector<DocumentElement *>::const_iterator iterMetaData = mMetaData.begin(); iterMetaData != mMetaData.end(); ++iterMetaData)
{
(*iterMetaData)->write(mpHandler);
}
@@ -436,7 +436,7 @@ bool OdtGeneratorPrivate::_writeTargetDocument(OdfDocumentHandler *pHandler)
TagOpenElement("office:automatic-styles").write(mpHandler);
for (std::vector<DocumentElement *>::const_iterator iterFrameAutomaticStyles = mFrameAutomaticStyles.begin();
- iterFrameAutomaticStyles != mFrameAutomaticStyles.end(); iterFrameAutomaticStyles++)
+ iterFrameAutomaticStyles != mFrameAutomaticStyles.end(); ++iterFrameAutomaticStyles)
{
(*iterFrameAutomaticStyles)->write(pHandler);
}
@@ -446,19 +446,19 @@ bool OdtGeneratorPrivate::_writeTargetDocument(OdfDocumentHandler *pHandler)
mSpanManager.write(pHandler);
// writing out the sections styles
- for (std::vector<SectionStyle *>::const_iterator iterSectionStyles = mSectionStyles.begin(); iterSectionStyles != mSectionStyles.end(); iterSectionStyles++)
+ for (std::vector<SectionStyle *>::const_iterator iterSectionStyles = mSectionStyles.begin(); iterSectionStyles != mSectionStyles.end(); ++iterSectionStyles)
{
(*iterSectionStyles)->write(pHandler);
}
// writing out the lists styles
- for (std::vector<ListStyle *>::const_iterator iterListStyles = mListStyles.begin(); iterListStyles != mListStyles.end(); iterListStyles++)
+ for (std::vector<ListStyle *>::const_iterator iterListStyles = mListStyles.begin(); iterListStyles != mListStyles.end(); ++iterListStyles)
{
(*iterListStyles)->write(pHandler);
}
// writing out the table styles
- for (std::vector<TableStyle *>::const_iterator iterTableStyles = mTableStyles.begin(); iterTableStyles != mTableStyles.end(); iterTableStyles++)
+ for (std::vector<TableStyle *>::const_iterator iterTableStyles = mTableStyles.begin(); iterTableStyles != mTableStyles.end(); ++iterTableStyles)
{
(*iterTableStyles)->write(pHandler);
}
@@ -476,7 +476,7 @@ bool OdtGeneratorPrivate::_writeTargetDocument(OdfDocumentHandler *pHandler)
TagOpenElement("office:body").write(mpHandler);
TagOpenElement("office:text").write(mpHandler);
- for (std::vector<DocumentElement *>::const_iterator iterBodyElements = mBodyElements.begin(); iterBodyElements != mBodyElements.end(); iterBodyElements++)
+ for (std::vector<DocumentElement *>::const_iterator iterBodyElements = mBodyElements.begin(); iterBodyElements != mBodyElements.end(); ++iterBodyElements)
{
(*iterBodyElements)->write(pHandler);
}
@@ -682,7 +682,7 @@ void OdtGenerator::defineOrderedListLevel(const WPXPropertyList &propList)
// Iterate through ALL list styles with the same WordPerfect list id and define a level if it is not already defined
// This solves certain problems with lists that start and finish without reaching certain levels and then begin again
// and reach those levels. See gradguide0405_PC.wpd in the regression suite
- for (std::vector<ListStyle *>::iterator iterOrderedListStyles = mpImpl->mListStyles.begin(); iterOrderedListStyles != mpImpl->mListStyles.end(); iterOrderedListStyles++)
+ for (std::vector<ListStyle *>::iterator iterOrderedListStyles = mpImpl->mListStyles.begin(); iterOrderedListStyles != mpImpl->mListStyles.end(); ++iterOrderedListStyles)
{
if ((* iterOrderedListStyles) && (* iterOrderedListStyles)->getListID() == id && propList["libwpd:level"])
(* iterOrderedListStyles)->updateListLevel((propList["libwpd:level"]->getInt() - 1), propList);
@@ -711,7 +711,7 @@ void OdtGenerator::defineUnorderedListLevel(const WPXPropertyList &propList)
}
// See comment in OdtGenerator::defineOrderedListLevel
- for (std::vector<ListStyle *>::iterator iterUnorderedListStyles = mpImpl->mListStyles.begin(); iterUnorderedListStyles != mpImpl->mListStyles.end(); iterUnorderedListStyles++)
+ for (std::vector<ListStyle *>::iterator iterUnorderedListStyles = mpImpl->mListStyles.begin(); iterUnorderedListStyles != mpImpl->mListStyles.end(); ++iterUnorderedListStyles)
{
if ((* iterUnorderedListStyles) && (* iterUnorderedListStyles)->getListID() == id && propList["libwpd:level"])
(* iterUnorderedListStyles)->updateListLevel((propList["libwpd:level"]->getInt() - 1), propList);
@@ -950,7 +950,7 @@ void OdtGenerator::openTable(const WPXPropertyList &propList, const WPXPropertyL
pTableOpenElement->addAttribute("table:style-name", sTableName.cstr());
mpImpl->mpCurrentContentElements->push_back(pTableOpenElement);
- for (int i=0; i<pTableStyle->getNumColumns(); i++)
+ for (int i=0; i<pTableStyle->getNumColumns(); ++i)
{
TagOpenElement *pTableColumnOpenElement = new TagOpenElement("table:table-column");
WPXString sColumnStyleName;
@@ -1257,7 +1257,7 @@ void OdtGenerator::insertBinaryObject(const WPXPropertyList &propList, const WPX
if (tmpObjectHandler(data, &tmpHandler, ODF_FLAT_XML) && !tmpContentElements.empty())
{
mpImpl->mpCurrentContentElements->push_back(new TagOpenElement("draw:object"));
- for (std::vector<DocumentElement *>::const_iterator iter = tmpContentElements.begin(); iter != tmpContentElements.end(); iter++)
+ for (std::vector<DocumentElement *>::const_iterator iter = tmpContentElements.begin(); iter != tmpContentElements.end(); ++iter)
mpImpl->mpCurrentContentElements->push_back(*iter);
mpImpl->mpCurrentContentElements->push_back(new TagCloseElement("draw:object"));
}
diff --git a/writerperfect/source/filter/PageSpan.cxx b/writerperfect/source/filter/PageSpan.cxx
index 20ce463..54161a5 100644
--- a/writerperfect/source/filter/PageSpan.cxx
+++ b/writerperfect/source/filter/PageSpan.cxx
@@ -53,7 +53,7 @@ PageSpan::~PageSpan()
{
for (DEVIter iterHeaderContent = mpHeaderContent->begin();
iterHeaderContent != mpHeaderContent->end();
- iterHeaderContent++)
+ ++iterHeaderContent)
delete(*iterHeaderContent);
delete mpHeaderContent;
}
@@ -62,7 +62,7 @@ PageSpan::~PageSpan()
{
for (DEVIter iterHeaderLeftContent = mpHeaderLeftContent->begin();
iterHeaderLeftContent != mpHeaderLeftContent->end();
- iterHeaderLeftContent++)
+ ++iterHeaderLeftContent)
delete(*iterHeaderLeftContent);
delete mpHeaderLeftContent;
}
@@ -71,7 +71,7 @@ PageSpan::~PageSpan()
{
for (DEVIter iterFooterContent = mpFooterContent->begin();
iterFooterContent != mpFooterContent->end();
- iterFooterContent++)
+ ++iterFooterContent)
delete(*iterFooterContent);
delete mpFooterContent;
}
@@ -80,7 +80,7 @@ PageSpan::~PageSpan()
{
for (DEVIter iterFooterLeftContent = mpFooterLeftContent->begin();
iterFooterLeftContent != mpFooterLeftContent->end();
- iterFooterLeftContent++)
+ ++iterFooterLeftContent)
delete(*iterFooterLeftContent);
delete mpFooterLeftContent;
}
@@ -116,7 +116,7 @@ void PageSpan::setHeaderContent(std::vector<DocumentElement *> * pHeaderContent)
{
for (DEVIter iterHeaderContent = mpHeaderContent->begin();
iterHeaderContent != mpHeaderContent->end();
- iterHeaderContent++)
+ ++iterHeaderContent)
delete(*iterHeaderContent);
delete mpHeaderContent;
}
@@ -130,7 +130,7 @@ void PageSpan::setFooterContent(std::vector<DocumentElement *> * pFooterContent)
{
for (DEVIter iterFooterContent = mpFooterContent->begin();
iterFooterContent != mpFooterContent->end();
- iterFooterContent++)
+ ++iterFooterContent)
delete(*iterFooterContent);
delete mpFooterContent;
}
@@ -144,7 +144,7 @@ void PageSpan::setHeaderLeftContent(std::vector<DocumentElement *> * pHeaderCont
{
for (DEVIter iterHeaderLeftContent = mpHeaderLeftContent->begin();
iterHeaderLeftContent != mpHeaderLeftContent->end();
- iterHeaderLeftContent++)
+ ++iterHeaderLeftContent)
delete(*iterHeaderLeftContent);
delete mpHeaderLeftContent;
}
@@ -158,7 +158,7 @@ void PageSpan::setFooterLeftContent(std::vector<DocumentElement *> * pFooterCont
{
for (DEVIter iterFooterLeftContent = mpFooterLeftContent->begin();
iterFooterLeftContent != mpFooterLeftContent->end();
- iterFooterLeftContent++)
+ ++iterFooterLeftContent)
delete(*iterFooterLeftContent);
delete mpFooterLeftContent;
}
@@ -202,7 +202,7 @@ void PageSpan::writeMasterPages(const int iStartingNum, const int iPageLayoutNum
int iSpan = 0;
(bLastPageSpan) ? iSpan = 1 : iSpan = getSpan();
- for (int i=iStartingNum; i<(iStartingNum+iSpan); i++)
+ for (int i=iStartingNum; i<(iStartingNum+iSpan); ++i)
{
TagOpenElement masterPageOpen("style:master-page");
WPXString sMasterPageName, sMasterPageDisplayName;
diff --git a/writerperfect/source/filter/TextRunStyle.cxx b/writerperfect/source/filter/TextRunStyle.cxx
index 18a0ada..36e16ac 100644
--- a/writerperfect/source/filter/TextRunStyle.cxx
+++ b/writerperfect/source/filter/TextRunStyle.cxx
@@ -182,7 +182,7 @@ void SpanStyle::write(OdfDocumentHandler *pHandler) const
void ParagraphStyleManager::clean()
{
for (std::map<WPXString, ParagraphStyle *, ltstr>::iterator iter = mHash.begin();
- iter != mHash.end(); iter++)
+ iter != mHash.end(); ++iter)
{
delete(iter->second);
}
@@ -192,7 +192,7 @@ void ParagraphStyleManager::clean()
void ParagraphStyleManager::write(OdfDocumentHandler *pHandler) const
{
for (std::map<WPXString, ParagraphStyle *, ltstr>::const_iterator iter = mHash.begin();
- iter != mHash.end(); iter++)
+ iter != mHash.end(); ++iter)
{
if (strcmp(iter->second->getName().cstr(), "Standard") == 0)
continue;
@@ -234,7 +234,7 @@ WPXString ParagraphStyleManager::findOrAdd (const WPXPropertyList &propList, con
void SpanStyleManager::clean()
{
for (std::map<WPXString, SpanStyle *, ltstr>::iterator iter = mHash.begin();
- iter != mHash.end(); iter++)
+ iter != mHash.end(); ++iter)
delete(iter->second);
mHash.clear();
}
@@ -242,7 +242,7 @@ void SpanStyleManager::clean()
void SpanStyleManager::write(OdfDocumentHandler *pHandler) const
{
for (std::map<WPXString, SpanStyle *, ltstr>::const_iterator iter = mHash.begin();
- iter != mHash.end(); iter++)
+ iter != mHash.end(); ++iter)
iter->second->write(pHandler);
}
diff --git a/writerperfect/source/filter/libwriterperfect_filter.hxx b/writerperfect/source/filter/libwriterperfect_filter.hxx
index 9b5b78f..4f9c722 100644
--- a/writerperfect/source/filter/libwriterperfect_filter.hxx
+++ b/writerperfect/source/filter/libwriterperfect_filter.hxx
@@ -32,8 +32,6 @@
#include <libwpd/libwpd.h>
#include <libwpd/WPXString.h>
-class WPXPropertyList;
-
WPXString propListToStyleKey(const WPXPropertyList &xPropList);
struct ltstr
More information about the Libreoffice-commits
mailing list