[Libreoffice-commits] .: desktop/source framework/source jvmfwk/source package/source
Julien Nabet
serval2412 at kemper.freedesktop.org
Thu Apr 5 12:18:32 PDT 2012
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 2 +-
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 2 +-
desktop/source/deployment/manager/dp_extensionmanager.cxx | 2 +-
desktop/source/deployment/manager/dp_properties.cxx | 2 +-
desktop/source/deployment/registry/dp_backenddb.cxx | 2 +-
desktop/source/deployment/registry/package/dp_package.cxx | 4 ++--
framework/source/uielement/toolbarsmenucontroller.cxx | 2 +-
jvmfwk/source/elements.cxx | 2 +-
package/source/xstor/ohierarchyholder.cxx | 2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 7d2508572a0389bcb1c803911024296f411af653
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Thu Apr 5 21:15:13 2012 +0200
Fix Prefer prefix ++/-- operators
Includes too replacement < by != for comparison between current and end iterators
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 96c5b1c..03bf3cb 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -337,7 +337,7 @@ void ExtensionBox_Impl::select( const rtl::OUString & sName )
const ::osl::MutexGuard aGuard( m_entriesMutex );
typedef ::std::vector< TEntry_Impl >::const_iterator It;
- for ( It iIter = m_vEntries.begin(); iIter < m_vEntries.end(); iIter++ )
+ for ( It iIter = m_vEntries.begin(); iIter != m_vEntries.end(); ++iIter )
{
if ( sName.equals( (*iIter)->m_sTitle ) )
{
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 8852e93..8023678 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -424,7 +424,7 @@ void UpdateInstallDialog::Thread::downloadExtensions()
//Construct a string of all messages contained in the exceptions plus the respective download URLs
::rtl::OUStringBuffer buf(256);
typedef ::std::vector< ::std::pair<OUString, cssu::Exception > >::const_iterator CIT;
- for (CIT j = vecExceptions.begin(); j != vecExceptions.end(); j++)
+ for (CIT j = vecExceptions.begin(); j != vecExceptions.end(); ++j)
{
if (j != vecExceptions.begin())
buf.appendAscii("\n");
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index d7654b6..b5822ec 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -1181,7 +1181,7 @@ uno::Sequence< uno::Sequence<Reference<deploy::XPackage> > >
citVecVec = vecExtensions.begin();
sal_Int32 j = 0;
uno::Sequence< uno::Sequence<Reference<deploy::XPackage> > > seqSeq(vecExtensions.size());
- for (;citVecVec != vecExtensions.end(); citVecVec++, j++)
+ for (;citVecVec != vecExtensions.end(); ++citVecVec, j++)
{
seqSeq[j] = comphelper::containerToSequence(*citVecVec);
}
diff --git a/desktop/source/deployment/manager/dp_properties.cxx b/desktop/source/deployment/manager/dp_properties.cxx
index ec8120f..160e8a5 100644
--- a/desktop/source/deployment/manager/dp_properties.cxx
+++ b/desktop/source/deployment/manager/dp_properties.cxx
@@ -69,7 +69,7 @@ ExtensionProperties::ExtensionProperties(
dp_misc::readProperties(props, contentProps);
typedef ::std::list< ::std::pair< OUString, OUString> >::const_iterator CI;
- for (CI i = props.begin(); i != props.end(); i++)
+ for (CI i = props.begin(); i != props.end(); ++i)
{
if (i->first.equals(OUSTR(PROP_SUPPRESS_LICENSE)))
m_prop_suppress_license = i->second;
diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx
index a219f13..1d06860 100644
--- a/desktop/source/deployment/registry/dp_backenddb.cxx
+++ b/desktop/source/deployment/registry/dp_backenddb.cxx
@@ -311,7 +311,7 @@ void BackendDb::writeVectorOfPair(
Reference<css::xml::dom::XNode>(
vectorNode, css::uno::UNO_QUERY_THROW));
typedef ::std::vector< ::std::pair< OUString, OUString > >::const_iterator CIT;
- for (CIT i = vecPairs.begin(); i != vecPairs.end(); i++)
+ for (CIT i = vecPairs.begin(); i != vecPairs.end(); ++i)
{
const Reference<css::xml::dom::XElement> pairNode(
doc->createElementNS(sNameSpace, sPrefix + sPairTagName));
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 997fef4..23f583e 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -367,7 +367,7 @@ void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaT
//Notify the backend responsible for processing the different media
//types that this extension was removed.
ExtensionBackendDb::Data data = readDataFromDb(url);
- for (ExtensionBackendDb::Data::ITC_ITEMS i = data.items.begin(); i != data.items.end(); i++)
+ for (ExtensionBackendDb::Data::ITC_ITEMS i = data.items.begin(); i != data.items.end(); ++i)
{
m_xRootRegistry->packageRemoved(i->first, i->second);
}
@@ -1649,7 +1649,7 @@ BackendImpl::PackageImpl::getPackagesFromDb(
::std::vector<Reference<deployment::XPackage> > retVector;
typedef ::std::vector< ::std::pair<OUString, OUString> >::const_iterator ITC;
- for (ITC i = m_dbData.items.begin(); i != m_dbData.items.end(); i++)
+ for (ITC i = m_dbData.items.begin(); i != m_dbData.items.end(); ++i)
{
Reference<deployment::XPackage> xExtension =
bindBundleItem(i->first, i->second, true, m_identifier, xCmdEnv);
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 2301201..1bffc39 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -451,7 +451,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
aTbEntry.pCollatorWrapper = m_aIntlWrapper.getCaseCollator();
aSortedTbs.push_back( aTbEntry );
}
- pIter++;
+ ++pIter;
}
// sort toolbars
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index e6273e0..04d485d 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -1217,7 +1217,7 @@ const rtl::OUString& MergedSettings::getUserClassPath() const
{
::std::vector< ::rtl::OString> ret;
typedef ::std::vector< ::rtl::OUString>::const_iterator cit;
- for (cit i = m_vmParams.begin(); i < m_vmParams.end(); i++)
+ for (cit i = m_vmParams.begin(); i != m_vmParams.end(); ++i)
{
ret.push_back( ::rtl::OUStringToOString(*i, RTL_TEXTENCODING_UTF8));
}
diff --git a/package/source/xstor/ohierarchyholder.cxx b/package/source/xstor/ohierarchyholder.cxx
index c910e51..df8936c 100644
--- a/package/source/xstor/ohierarchyholder.cxx
+++ b/package/source/xstor/ohierarchyholder.cxx
@@ -310,7 +310,7 @@ void OHierarchyElement_Impl::RemoveElement( const ::rtl::Reference< OHierarchyEl
aIter != m_aChildren.end(); /* increment is done in body */)
{
OHierarchyElementList_Impl::iterator aTmpIter = aIter;
- aIter++;
+ ++aIter;
if ( aTmpIter->second == aRef )
m_aChildren.erase( aTmpIter );
More information about the Libreoffice-commits
mailing list