[Libreoffice-commits] core.git: 3 commits - dbaccess/source oox/source svtools/source

[Caolán McNamara]

 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |    3 +--
 oox/source/shape/ShapeContextHandler.cxx              |    8 ++++----
 svtools/source/filter/exportdialog.cxx                |    2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 77ba51a2dd1c37cce2ffb596f4544d9c8cfefeda
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 11 08:53:27 2013 +0100

    CID#1103695 avoid use of -1 here
    
    Change-Id: I7097d26f301fffa79d04fe4f26aeddb32223d62c

diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index 706715b..b935acf 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -951,7 +951,7 @@ void ExportDialog::updateControls()
         if (nInd != -1)
             aEst = aEst.replaceAt( nInd, 2, ImpValueOfInKB( nRawFileSize ) );
 
-        if ( nRealFileSize )
+        if ( nRealFileSize && nInd != -1 )
         {
             nInd = aEst.indexOf( "%", nInd );
             if (nInd != -1)
commit 44fa08ed89f61add6ba6fb0eb1b5c243b53c350f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 11 08:51:26 2013 +0100

    CID#1103679 calm coverity re invalid iterators
    
    Change-Id: Iad07aa59c6016752ec9467945d737380d214c3c0

diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index ca189a1..0ae0859 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -1826,8 +1826,7 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const O
         }
         m_bVisibleRow[BROW_CRIT1_ROW + nLevel] = sal_True;
     }
-
-    else if (aIter == getFields().end())
+    else if (aIter == rFields.end())
     {
         OTableFieldDescRef pTmp = InsertField(rInfo, BROWSER_INVALIDID, sal_False, sal_False );
         if ( pTmp->isNumericOrAggreateFunction() && rInfo->IsGroupBy() ) // the GroupBy was inherited from rInfo
commit 88af59fa755505422958746fb321e15f50c99378
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 11 08:47:04 2013 +0100

    CID#1103719 leak on default: path
    
    Change-Id: I74a17da384499fb18f13d5caa04c356dfee71eff

diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index 3e7efb0..96d4849 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -97,16 +97,16 @@ uno::Reference<xml::sax::XFastContextHandler> ShapeContextHandler::getChartShape
 {
     if (!mxChartShapeContext.is())
     {
-        ContextHandler2Helper *rFragmentHandler
-                    (new ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath));
-        ShapePtr pMasterShape;
-
         switch (nElement & 0xffff)
         {
             case XML_chart:
+            {
+                ContextHandler2Helper *rFragmentHandler
+                            (new ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath));
                 mpShape.reset(new Shape("com.sun.star.drawing.OLE2Shape" ));
                 mxChartShapeContext.set(new ChartGraphicDataContext(*rFragmentHandler, mpShape, true));
                 break;
+            }
             default:
                 break;
         }