openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arie...@apache.org
Subject svn commit: r1781472 - in /openoffice/branches/AOO414: ./ main/ main/svtools/inc/svtools/treelist.hxx main/svtools/source/contnr/svtreebx.cxx
Date Thu, 02 Feb 2017 21:49:28 GMT
Author: arielch
Date: Thu Feb  2 21:49:28 2017
New Revision: 1781472

URL: http://svn.apache.org/viewvc?rev=1781472&view=rev
Log:
i125147 - Prevent NULL pointer dereference


Modified:
    openoffice/branches/AOO414/   (props changed)
    openoffice/branches/AOO414/main/   (props changed)
    openoffice/branches/AOO414/main/svtools/inc/svtools/treelist.hxx
    openoffice/branches/AOO414/main/svtools/source/contnr/svtreebx.cxx

Propchange: openoffice/branches/AOO414/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  2 21:49:28 2017
@@ -2,5 +2,5 @@
 /openoffice/branches/ia2:1417739-1541842
 /openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
 /openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1647713,1652476,1654282,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1690740,1690755,1690854,1694131-1694132,1694701,1702894,1702898,1702986,1702988,1705542-1705543,1705551,1706649,1707397,1707659,1723875,1729921,1730154,1760461,176
 3017,1763019,1766467,1766530,1766915,1780015
+/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1647713,1652476,1654282,1668939,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1690740,1690755,1690854,1694131-1694132,1694701,1702894,1702898,1702986,1702988,1705542-1705543,1705551,1706649,1707397,1707659,1723875,1729921,1730154,176
 0461,1763017,1763019,1766467,1766530,1766915,1780015
 /openoffice/trunk/main:1705369

Propchange: openoffice/branches/AOO414/main/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  2 21:49:28 2017
@@ -2,4 +2,4 @@
 /openoffice/branches/ia2/main:1417739-1541842
 /openoffice/branches/ooxml-osba/main:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
 /openoffice/branches/rejuvenate01/main:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1620195,1621121,1623847,1623849-1623850,1630814,1633294,1633297,1635806,1642300-1642302,1643177,1650314,1652476,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1695962,1697807,170007
 8,1700126,1700135,1702107,1702894,1702898,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542,1706649,1707167,1707169-1707170,1707175,1707397,1707408,1707412,1707642,1707645,1707659,1707844,1708477,1708483,1709212,1709377,1709403,1723875,1729921,1730154,1760461,1763017,1763019,1766467,1766915,1780015
+/openoffice/trunk/main:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1620195,1621121,1623847,1623849-1623850,1630814,1633294,1633297,1635806,1642300-1642302,1643177,1650314,1652476,1654282,1668939,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1695962,169780
 7,1700078,1700126,1700135,1702107,1702894,1702898,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542,1706649,1707167,1707169-1707170,1707175,1707397,1707408,1707412,1707642,1707645,1707659,1707844,1708477,1708483,1709212,1709377,1709403,1723875,1729921,1730154,1760461,1763017,1763019,1766467,1766915,1780015

Modified: openoffice/branches/AOO414/main/svtools/inc/svtools/treelist.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO414/main/svtools/inc/svtools/treelist.hxx?rev=1781472&r1=1781471&r2=1781472&view=diff
==============================================================================
--- openoffice/branches/AOO414/main/svtools/inc/svtools/treelist.hxx (original)
+++ openoffice/branches/AOO414/main/svtools/inc/svtools/treelist.hxx Thu Feb  2 21:49:28 2017
@@ -411,14 +411,14 @@ inline sal_Bool SvListView::IsSelected(
 	DBG_ASSERT(pEntry,"IsExpanded:No Entry");
 	SvViewData* pData = (SvViewData*)aDataTable.Get( (sal_uLong)pEntry );
 	DBG_ASSERT(pData,"Entry not in Table");
-	return pData->IsSelected();
+	return pData && pData->IsSelected();
 }
 inline sal_Bool SvListView::HasEntryFocus( SvListEntry* pEntry ) const
 {
 	DBG_ASSERT(pEntry,"IsExpanded:No Entry");
 	SvViewData* pData = (SvViewData*)aDataTable.Get( (sal_uLong)pEntry );
 	DBG_ASSERT(pData,"Entry not in Table");
-	return pData->HasFocus();
+	return pData && pData->HasFocus();
 }
 inline void SvListView::SetEntryFocus( SvListEntry* pEntry, sal_Bool bFocus ) const
 {

Modified: openoffice/branches/AOO414/main/svtools/source/contnr/svtreebx.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO414/main/svtools/source/contnr/svtreebx.cxx?rev=1781472&r1=1781471&r2=1781472&view=diff
==============================================================================
--- openoffice/branches/AOO414/main/svtools/source/contnr/svtreebx.cxx (original)
+++ openoffice/branches/AOO414/main/svtools/source/contnr/svtreebx.cxx Thu Feb  2 21:49:28
2017
@@ -2757,32 +2757,32 @@ void SvTreeListBox::FillAccessibleEntryS
 {
 	DBG_ASSERT( pEntry, "SvTreeListBox::FillAccessibleEntryStateSet: invalid entry" );
 
-	if ( pEntry->HasChildsOnDemand() || pEntry->HasChilds() )
-	{
-		rStateSet.AddState( AccessibleStateType::EXPANDABLE );
-		if ( IsExpanded( pEntry ) )
-		    rStateSet.AddState( (sal_Int16)AccessibleStateType::EXPANDED );
-	}
+    if ( pEntry )
+    {
+        if ( pEntry->HasChildsOnDemand() || pEntry->HasChilds() )
+        {
+            rStateSet.AddState( AccessibleStateType::EXPANDABLE );
+            if ( IsExpanded( pEntry ) )
+                rStateSet.AddState( (sal_Int16)AccessibleStateType::EXPANDED );
+        }
 
-	if ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED )
-		rStateSet.AddState( AccessibleStateType::CHECKED );
-	if ( IsEntryVisible( pEntry ) )
-		rStateSet.AddState( AccessibleStateType::VISIBLE );
-	if ( IsSelected( pEntry ) )
-		rStateSet.AddState( AccessibleStateType::SELECTED );
-	if ( IsEnabled() )
-	{
-		rStateSet.AddState( AccessibleStateType::ENABLED );
-		rStateSet.AddState( AccessibleStateType::FOCUSABLE );
-		rStateSet.AddState( AccessibleStateType::SELECTABLE );
-		SvViewDataEntry* pViewDataNewCur = 0;
-		if( pEntry )
-		{
-			pViewDataNewCur= GetViewDataEntry(pEntry);
-			if(pViewDataNewCur->HasFocus())
-				rStateSet.AddState( AccessibleStateType::FOCUSED );
-		}
-	}
+        if ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED )
+            rStateSet.AddState( AccessibleStateType::CHECKED );
+        if ( IsEntryVisible( pEntry ) )
+            rStateSet.AddState( AccessibleStateType::VISIBLE );
+        if ( IsSelected( pEntry ) )
+            rStateSet.AddState( AccessibleStateType::SELECTED );
+        if ( IsEnabled() )
+        {
+            rStateSet.AddState( AccessibleStateType::ENABLED );
+            rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+            rStateSet.AddState( AccessibleStateType::SELECTABLE );
+            SvViewDataEntry* pViewDataNewCur = 0;
+            pViewDataNewCur = GetViewDataEntry(pEntry);
+            if( pViewDataNewCur && pViewDataNewCur->HasFocus() )
+                rStateSet.AddState( AccessibleStateType::FOCUSED );
+        }
+    }
 }
 
 Rectangle SvTreeListBox::GetBoundingRect( SvLBoxEntry* pEntry )



Mime
View raw message