[Libreoffice-commits] core.git: 2 commits - chart2/source connectivity/source

[Julien Nabet]

 chart2/source/controller/main/DrawCommandDispatch.cxx |    6 +++---
 connectivity/source/drivers/dbase/DResultSet.cxx      |    1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit f9122b32975bbd2aeba6e1bb9722f6140eafe8f1
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Mar 23 14:52:25 2013 +0100

    coverity#704216 Logically dead code
    
    Change-Id: I83af7c87576c185b4884a2a6ceaea5274efa7c37

diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx
index 3bb10a5..df8bc00 100644
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -188,7 +188,6 @@ sal_Bool ODbaseResultSet::fillIndexValues(const Reference< XColumnsSupplier> &_x
                 delete pIter;
                 return sal_True;
             }
-            delete pIter;
         }
     }
     return sal_False;
commit bbc96d45d4435a0a938ad0b8aba89fca9ad8df06
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Mar 23 14:28:52 2013 +0100

    Related coverity#704213/704214/704215 Logically dead code
    
    Change-Id: I80c119b2287ff0c4f2e467943be6a7682914934a

diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 8dbd956..57b629e 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -403,7 +403,7 @@ void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequen
                                 m_pChartController->m_aSelection.setSelection( xShape );
                                 m_pChartController->m_aSelection.applySelection( pDrawViewWrapper );
                             }
-                            if ( nFeatureId == SID_DRAW_TEXT )
+                            if ( nFeatureId == COMMAND_ID_DRAW_TEXT )
                             {
                                 m_pChartController->StartTextEdit();
                             }
@@ -517,7 +517,7 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID )
                                 if ( pTextObj )
                                 {
                                     pTextObj->SetLogicRect( aRect );
-                                    sal_Bool bVertical = ( nID == SID_DRAW_TEXT_VERTICAL );
+                                    sal_Bool bVertical = ( nID == COMMAND_ID_DRAW_TEXT_VERTICAL );
                                     pTextObj->SetVerticalWriting( bVertical );
                                     if ( bVertical )
                                     {
@@ -537,7 +537,7 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID )
                         {
                             if ( pObj->ISA( SdrCaptionObj ) )
                             {
-                                sal_Bool bIsVertical( SID_DRAW_CAPTION_VERTICAL == nID );
+                                sal_Bool bIsVertical( COMMAND_ID_DRAW_CAPTION_VERTICAL == nID );
                                 SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( pObj );
                                 if ( pTextObj )
                                 {