[Libreoffice-commits] .: 5 commits - l10ntools/source sc/source toolkit/inc toolkit/source tools/source

[David Tardon]

 l10ntools/source/directory.cxx                            |    5 -----
 sc/source/ui/unoobj/chart2uno.cxx                         |    2 +-
 toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx |    2 +-
 toolkit/source/layout/vcl/wbutton.cxx                     |    2 +-
 tools/source/rc/resmgr.cxx                                |    2 +-
 5 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 0c11d49e9c9031930ba023e6f546ebb73aac54e7
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Aug 8 12:23:07 2011 +0200

    remove unused code

diff --git a/l10ntools/source/directory.cxx b/l10ntools/source/directory.cxx
index a7cba91..85663a3 100644
--- a/l10ntools/source/directory.cxx
+++ b/l10ntools/source/directory.cxx
@@ -241,8 +241,6 @@ void Directory::readDirectory( const rtl::OUString& sFullpath )
         {
             case S_IFREG:
                         {
-                            rtl::OString sFile = sFullpathext;
-                            sFile += sEntryName ;
                             transex::File aFile( rtl::OStringToOUString( sEntity , RTL_TEXTENCODING_UTF8 , sEntity.getLength() ) ,
                                                  rtl::OStringToOUString( sEntryName , RTL_TEXTENCODING_UTF8 , sEntryName.getLength() )
                                                );
@@ -256,9 +254,6 @@ void Directory::readDirectory( const rtl::OUString& sFullpath )
                         }
             case S_IFDIR:
                         {
-                            rtl::OString sDir = sFullpathext;
-                            sDir += sEntryName ;
-
                             transex::Directory aDir(
                                                      rtl::OStringToOUString( sEntity , RTL_TEXTENCODING_UTF8 , sEntity.getLength() ) ,
                                                      rtl::OStringToOUString( sEntryName , RTL_TEXTENCODING_UTF8 , sEntryName.getLength() )
commit 778c80a9a78fccb3e5a8993f7691eac98fdda540
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 19 15:06:17 2011 +0200

    reassign iterator on erase

diff --git a/toolkit/source/layout/vcl/wbutton.cxx b/toolkit/source/layout/vcl/wbutton.cxx
index 96e6aeb..7df8e36 100644
--- a/toolkit/source/layout/vcl/wbutton.cxx
+++ b/toolkit/source/layout/vcl/wbutton.cxx
@@ -490,7 +490,7 @@ protected:
               it != maAdvanced.end(); ++it )
             if ( *it == w )
             {
-                lst.erase( it );
+                it = lst.erase( it );
                 return *it;
             }
         return 0;
commit 1913c4b0ad6963042b8919dc2e93987fc5a0b3c7
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 19 14:50:51 2011 +0200

    remove stray semicolon

diff --git a/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx b/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx
index 8d4d978..4f61adb 100644
--- a/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx
@@ -47,7 +47,7 @@ protected:
 
 public:
                         UnoControlContainerModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
-                        UnoControlContainerModel( const UnoControlContainerModel& rModel ) : UnoControlModel( rModel ) {;}
+                        UnoControlContainerModel( const UnoControlContainerModel& rModel ) : UnoControlModel( rModel ) {}
 
     UnoControlModel*    Clone() const { return new UnoControlContainerModel( *this ); }
 
commit 20ddaed243e6b66462fb9132d5cc84d78f578b8e
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Aug 7 12:52:10 2011 +0200

    fix typo

diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 75a1e22..5d51102 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -629,7 +629,7 @@ void Chart2Positioner::glueState()
             i = nCol*nR + nRow;
             if (aCellStates[i] == nOccu)
             {
-                if (nRow > 0 && nRow > 0)
+                if (nCol > 0 && nRow > 0)
                     bGlue = false;
                 else
                     nRow = nR;
commit 834bdb3d3ecb801ad23b1f9a7b3473e2483aa902
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 19 11:52:37 2011 +0200

    avoid possible NULL ptr deref.

diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index f45d91b..5a44dfa 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -465,7 +465,7 @@ InternalResMgr* ResMgrContainer::getNextFallback( InternalResMgr* pMgr )
     }
     InternalResMgr* pNext = getResMgr( pMgr->aPrefix, aLocale, pMgr->bSingular );
     // prevent recursion
-    if( pNext == pMgr || pNext->aResName.equals( pMgr->aResName ) )
+    if( pNext == pMgr || ( pNext && pNext->aResName.equals( pMgr->aResName ) ) )
     {
         if( pNext->bSingular )
             delete pNext;