[Libreoffice-commits] core.git: 3 commits - svl/source sw/source

[Caolán McNamara]

 svl/source/items/itemprop.cxx    |    7 ++-----
 sw/source/core/doc/docnum.cxx    |    2 +-
 sw/source/core/docnode/ndtbl.cxx |    4 +---
 3 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit c503ba54ed70c5c24cc7ed718c5299244845aa95
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 13 16:52:09 2014 +0000

    coverity#708846 Unused pointer value
    
    Change-Id: I3bef9d8fc00fdd0be6ed29a6fbc7af836e5088cb

diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 4cd0278..d754d4d 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2746,13 +2746,11 @@ void SwDoc::SetTabCols( const SwTabCols &rNew, sal_Bool bCurRowOnly,
 void SwDoc::SetTabRows( const SwTabCols &rNew, sal_Bool bCurColOnly, const SwCursor*,
                         const SwCellFrm* pBoxFrm )
 {
-    const SwTableBox* pBox;
     SwTabFrm *pTab;
 
     OSL_ENSURE( pBoxFrm, "SetTabRows called without pBoxFrm" );
 
     pTab = ((SwFrm*)pBoxFrm)->ImplFindTabFrm();
-    pBox = pBoxFrm->GetTabBox();
 
     // If the Table is still using relative values (USHRT_MAX)
     // we need to switch to absolute ones.
@@ -2828,7 +2826,7 @@ void SwDoc::SetTabRows( const SwTabCols &rNew, sal_Bool bCurColOnly, const SwCur
 
                             if ( pCntnt && pCntnt->IsTxtFrm() )
                             {
-                                pBox = ((SwCellFrm*)pFrm)->GetTabBox();
+                                const SwTableBox* pBox = ((SwCellFrm*)pFrm)->GetTabBox();
                                 const long nRowSpan = pBox->getRowSpan();
                                 if( nRowSpan > 0 ) // Not overlapped
                                     pTxtFrm = (SwTxtFrm*)pCntnt;
commit bc871d7bd6d4f01d8e5dc96ebe8dcbe9d1b5cad4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 13 16:49:08 2014 +0000

    coverity#708843 Unused pointer value
    
    Change-Id: I6b9d1ef8f6926668c5dbe824b0c900c40f18f8ec

diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 05ec96d..7e112f0 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -385,7 +385,7 @@ bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
                 pColl = aCollArr[ aMoveArr[nLevel] ];
 
                 if (pColl != NULL)
-                    pColl = (SwTxtFmtColl*)pTxtNd->ChgFmtColl( pColl );
+                    (SwTxtFmtColl*)pTxtNd->ChgFmtColl( pColl );
             }
 
         }
commit 6b522f0a6d5518807ea78a425ddcef6ebb3dec89
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 13 16:47:23 2014 +0000

    coverity#708824 Unused pointer value
    
    Change-Id: I2993b61d5556abd039f30c39938b6726fd2b1197

diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index 3c45186..e2492d3 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -317,11 +317,8 @@ PropertyState   SfxItemPropertySet::getPropertyState(const OUString& rName, cons
     }
     sal_uInt16 nWhich = pEntry->nWID;
 
-    // item holen
-    const SfxPoolItem* pItem = 0;
-    SfxItemState eState = rSet.GetItemState( nWhich, false, &pItem );
-    if(!pItem && nWhich != rSet.GetPool()->GetSlotId(nWhich))
-        pItem = &rSet.GetPool()->GetDefaultItem(nWhich);
+    // get item state
+    SfxItemState eState = rSet.GetItemState(nWhich, false);
     // item-Wert als UnoAny zurueckgeben
     if(eState == SFX_ITEM_DEFAULT)
         eRet = PropertyState_DEFAULT_VALUE;