svn commit: r1583549 - in /openoffice/branches/AOO410: ./ main/ main/svtools/source/control/roadmap.cxx

[hdu]

Author: hdu
Date: Tue Apr  1 07:29:46 2014
New Revision: 1583549

URL: http://svn.apache.org/r1583549
Log:
#i124570# Prevent a null pointer dereference in ORoadmap::DataChanged()

Fixed-by: Ariel Constenla-Haile <arie...@apache.org>

Merged for AOO410 from trunk revision 1583418.

Modified:
    openoffice/branches/AOO410/   (props changed)
    openoffice/branches/AOO410/main/   (props changed)
    openoffice/branches/AOO410/main/svtools/source/control/roadmap.cxx

Propchange: openoffice/branches/AOO410/
------------------------------------------------------------------------------
  Merged /openoffice/trunk:r1583418

Propchange: openoffice/branches/AOO410/main/
------------------------------------------------------------------------------
  Merged /openoffice/trunk/main:r1583418

Modified: openoffice/branches/AOO410/main/svtools/source/control/roadmap.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/svtools/source/control/roadmap.cxx?rev=1583549&r1=1583548&r2=1583549&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/svtools/source/control/roadmap.cxx 
(original)
+++ openoffice/branches/AOO410/main/svtools/source/control/roadmap.cxx Tue Apr  
1 07:29:46 2014
@@ -766,7 +766,8 @@ namespace svt
                        SetFont( aFont );
                        RoadmapTypes::ItemId curItemID = 
GetCurrentRoadmapItemID();
                        RoadmapItem* pLabelItem = GetByID( curItemID );
-                       
pLabelItem->ToggleBackgroundColor(rStyleSettings.GetHighlightColor());
+            if ( pLabelItem != NULL )
+                
pLabelItem->ToggleBackgroundColor(rStyleSettings.GetHighlightColor());
                        Invalidate();
                }
        }