[Libreoffice-commits] .: 2 commits - chart2/source .gitignore

[Norbert Thiebaud]

 .gitignore                            |    3 ++-
 chart2/source/view/main/ChartView.cxx |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 49e15b4ed7a9b7e65a8d8521aa533152662e5147
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Nov 21 12:45:19 2010 -0600

    fix a potential null pointer dereference

diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index b358f44..7277cec 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -694,9 +694,10 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
             m_aSeriesPlotterList.push_back( pPlotter );
             pPlotter->setNumberFormatsSupplier( xNumberFormatsSupplier );
             pPlotter->setColorScheme( xColorScheme );
-            pPlotter->setExplicitCategoriesProvider( pVCooSys->getExplicitCategoriesProvider() );
+            if(pVCooSys)
+                pPlotter->setExplicitCategoriesProvider( pVCooSys->getExplicitCategoriesProvider() );
             sal_Int32 nMissingValueTreatment = DiagramHelper::getCorrectedMissingValueTreatment( xDiagram, xChartType );
-            
+
             if(pVCooSys)
                 pVCooSys->addMinimumAndMaximumSupplier(pPlotter);
 
commit 07a64bb58bc639569ed0a2e64f43cc4239331870
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Nov 21 12:44:55 2010 -0600

    adjust .gitignore for MacOS

diff --git a/.gitignore b/.gitignore
index b3350f9..388957f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,5 +22,6 @@ warn
 .svn
 CVS
 .hg
-.gitignore
 .hgignore
+/*/unxmac??
+/*/unxmac??.pro