[Libreoffice-commits] .: 2 commits - cui/source package/source

[Caolán McNamara]

 cui/source/options/optjava.cxx             |    2 +-
 package/source/manifest/ManifestImport.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit db67aa335d566ff014ebd7d8ae444f01e0974bd0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Nov 28 12:29:53 2010 +0000

    cppcheck: use prefix variant

diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx
index 33b6387..063291f 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/package/source/manifest/ManifestImport.cxx
@@ -135,7 +135,7 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re
     else if ( aStack.size() > 1 )
     {
         ManifestStack::reverse_iterator aIter = aStack.rbegin();
-        aIter++;
+        ++aIter;
 
         if ( aIter->m_aConvertedName.equals( sFileEntryElement ) )
         {
@@ -317,7 +317,7 @@ void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax
 ::rtl::OUString ManifestImport::ConvertName( const ::rtl::OUString& aName )
 {
     ::rtl::OUString aConvertedName;
-    for ( ManifestStack::reverse_iterator aIter = aStack.rbegin(); !aConvertedName.getLength() && aIter != aStack.rend(); aIter++ )
+    for ( ManifestStack::reverse_iterator aIter = aStack.rbegin(); !aConvertedName.getLength() && aIter != aStack.rend(); ++aIter )
     {
         if ( !aIter->m_aNamespaces.empty() )
             aConvertedName = ConvertNameWithNamespace( aName, aIter->m_aNamespaces );
commit 49979ae7a13e3809fbae26f516e707294e4d3d5c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Nov 28 12:02:36 2010 +0000

    cppcheck: scope of variable can be reduced

diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 7835498..e7bc189 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -582,11 +582,11 @@ void SvxJavaOptionsPage::HandleCheckEntry( SvLBoxEntry* _pEntry )
 void SvxJavaOptionsPage::AddFolder( const ::rtl::OUString& _rFolder )
 {
     bool bStartAgain = true;
-    sal_Int32 nPos = 0;
     JavaInfo* pInfo = NULL;
     javaFrameworkError eErr = jfw_getJavaInfoByPath( _rFolder.pData, &pInfo );
     if ( JFW_E_NONE == eErr && pInfo )
     {
+        sal_Int32 nPos = 0;
         bool bFound = false;
         JavaInfo** parInfo = m_parJavaInfo;
         for ( sal_Int32 i = 0; i < m_nInfoSize; ++i )