summaryrefslogtreecommitdiff
path: root/qadevOOo/tests/java/ifc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-01-15 10:14:59 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-01-15 20:24:48 +0000
commit506d18aa3bfc966b79f447dfc850c547568be7cd (patch)
treeea513421eec25361ba5a1b0169e781321e348a62 /qadevOOo/tests/java/ifc
parent65abc5e30181d68baf47e18d2b7b0292be7f92f1 (diff)
coverity#1326416 Dereference null return value
Change-Id: I8c215da294d6c48d37849c25c40d8632f1949fba
Diffstat (limited to 'qadevOOo/tests/java/ifc')
-rw-r--r--qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java
index 72f3ceaf6c0b..92f9d2c1fc6f 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java
@@ -471,7 +471,7 @@ public class _XDataPilotTable2 extends MultiMethodTest
private boolean checkDrillDownSheetContent(XSpreadsheet xSheet, Object[][] data)
{
CellAddress lastCell = getLastUsedCellAddress(xSheet, 0, 0);
- if (data.length <= 0 || lastCell.Row == 0 || lastCell.Column == 0)
+ if (data.length <= 0 || lastCell == null || lastCell.Row == 0 || lastCell.Column == 0)
{
log.println("empty data condition");
return false;
_nItemId;
+ ToolBoxItemId m_nItemId;
bool m_bHasFocus;
bool m_bIsChecked;
bool m_bIndeterminate;
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index a04685730c85..cf3bf77169e7 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -200,11 +200,11 @@ void VCLXAccessibleToolBox::UpdateFocus_Impl()
if ( !bHasFocus )
return;
- sal_uInt16 nHighlightItemId = pToolBox->GetHighlightItemId();
+ ToolBoxItemId nHighlightItemId = pToolBox->GetHighlightItemId();
sal_uInt16 nFocusCount = 0;
for ( const auto& [rPos, rxChild] : m_aAccessibleChildren )
{
- sal_uInt16 nItemId = pToolBox->GetItemId( rPos );
+ ToolBoxItemId nItemId = pToolBox->GetItemId( rPos );
if ( rxChild.is() )
{
@@ -252,12 +252,12 @@ void VCLXAccessibleToolBox::UpdateChecked_Impl( ToolBox::ImplToolItems::size_typ
if ( !pToolBox )
return;
- sal_uInt16 nFocusId = pToolBox->GetItemId( _nPos );
+ ToolBoxItemId nFocusId = pToolBox->GetItemId( _nPos );
VCLXAccessibleToolBoxItem* pFocusItem = nullptr;
for ( const auto& [rPos, rxChild] : m_aAccessibleChildren )
{
- sal_uInt16 nItemId = pToolBox->GetItemId( rPos );
+ ToolBoxItemId nItemId = pToolBox->GetItemId( rPos );
VCLXAccessibleToolBoxItem* pItem =
static_cast< VCLXAccessibleToolBoxItem* >( rxChild.get() );
@@ -276,7 +276,7 @@ void VCLXAccessibleToolBox::UpdateIndeterminate_Impl( ToolBox::ImplToolItems::si
if ( !pToolBox )
return;
- sal_uInt16 nItemId = pToolBox->GetItemId( _nPos );
+ ToolBoxItemId nItemId = pToolBox->GetItemId( _nPos );
ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.find( _nPos );
//TODO: ToolBox::ImplToolItems::size_type -> sal_Int32!
@@ -392,7 +392,7 @@ void VCLXAccessibleToolBox::UpdateCustomPopupItemp_Impl( vcl::Window* pWindow, b
if( !(pWindow && pToolBox) )
return;
- const sal_uInt16 nDownItem = pToolBox->GetDownItemId();
+ const ToolBoxItemId nDownItem = pToolBox->GetDownItemId();
if ( !nDownItem )
// No item is currently in down state.
// Moreover, calling GetItemPos with 0 will find a separator if there is any.
@@ -434,7 +434,7 @@ void VCLXAccessibleToolBox::HandleSubToolBarEvent( const VclWindowEvent& rVclWin
&& pChildWindow->GetType() == WindowType::TOOLBOX) )
return;
- const sal_uInt16 nCurItemId( pToolBox->GetCurItemId() );
+ const ToolBoxItemId nCurItemId( pToolBox->GetCurItemId() );
if ( !nCurItemId )
// No item is currently active (might happen when opening the overflow popup).
// Moreover, calling GetItemPos with 0 will find a separator if there is any.
@@ -698,8 +698,8 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal
ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.find(i);
if ( m_aAccessibleChildren.end() == aIter )
{
- sal_uInt16 nItemId = pToolBox->GetItemId( i );
- sal_uInt16 nHighlightItemId = pToolBox->GetHighlightItemId();
+ ToolBoxItemId nItemId = pToolBox->GetItemId( i );
+ ToolBoxItemId nHighlightItemId = pToolBox->GetHighlightItemId();
vcl::Window* pItemWindow = pToolBox->GetItemWindow( nItemId );
// not found -> create a new child
rtl::Reference<VCLXAccessibleToolBoxItem> pChild = new VCLXAccessibleToolBoxItem( pToolBox, i );
@@ -711,7 +711,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal
pChild->SetChild( xChild );
}
xChild = pChild;
- if ( nHighlightItemId > 0 && nItemId == nHighlightItemId )
+ if ( nHighlightItemId > ToolBoxItemId(0) && nItemId == nHighlightItemId )
pChild->SetFocus( true );
if ( pToolBox->IsItemChecked( nItemId ) )
pChild->SetChecked( true );
@@ -754,7 +754,7 @@ Reference< XAccessible > VCLXAccessibleToolBox::GetItemWindowAccessible( const V
ToolBox::ImplToolItems::size_type nCount = pToolBox->GetItemCount();
for (ToolBox::ImplToolItems::size_type i = 0 ; i < nCount && !xReturn.is() ; ++i)
{
- sal_uInt16 nItemId = pToolBox->GetItemId( i );
+ ToolBoxItemId nItemId = pToolBox->GetItemId( i );
vcl::Window* pItemWindow = pToolBox->GetItemWindow( nItemId );
if ( pItemWindow == pChildWindow )
xReturn = getAccessibleChild(i);
@@ -819,7 +819,7 @@ sal_Int32 VCLXAccessibleToolBox::getSelectedAccessibleChildCount( )
VclPtr< ToolBox > pToolBox = GetAs< ToolBox >();
if (pToolBox)
{
- sal_uInt16 nHighlightItemId = pToolBox->GetHighlightItemId();
+ ToolBoxItemId nHighlightItemId = pToolBox->GetHighlightItemId();
for ( size_t i = 0, nCount = pToolBox->GetItemCount(); i < nCount; i++ )
{
if ( nHighlightItemId == pToolBox->GetItemId( i ) )
@@ -843,7 +843,7 @@ Reference< XAccessible > VCLXAccessibleToolBox::getSelectedAccessibleChild( sal_
VclPtr< ToolBox > pToolBox = GetAs< ToolBox >();
if (pToolBox)
{
- sal_uInt16 nHighlightItemId = pToolBox->GetHighlightItemId();
+ ToolBoxItemId nHighlightItemId = pToolBox->GetHighlightItemId();
for ( sal_Int32 i = 0, nCount = pToolBox->GetItemCount(); i < nCount; i++ )
{
if ( nHighlightItemId == pToolBox->GetItemId( i ) )
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index cc613bbe4ec3..211547a7e206 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -118,7 +118,7 @@ OUString VCLXAccessibleToolBoxItem::GetText()
{
OUString sRet;
// no text for separators and spaces
- if ( m_pToolBox && m_nItemId > 0 )
+ if ( m_pToolBox && m_nItemId > ToolBoxItemId(0) )
{
sRet = m_pToolBox->GetItemText( m_nItemId );
if (sRet.isEmpty())
@@ -498,7 +498,7 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getIndexAtPoint( const awt::Point&
sal_Int32 nIndex = -1;
if ( m_pToolBox && m_pToolBox->GetButtonType() != ButtonType::SYMBOLONLY ) // symbol buttons have no character bounds
{
- sal_uInt16 nItemId = 0;
+ ToolBoxItemId nItemId;
tools::Rectangle aItemRect = m_pToolBox->GetItemRect( m_nItemId );
Point aPnt( VCLPoint( aPoint ) );
aPnt += aItemRect.TopLeft();