added method getDataPointLabelIfLabel

2 files changed, 15 insertions, 5 deletions

diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx
index b1920e028b29..20d895eab9c9 100644
--- a/chart2/source/view/inc/VDataSeries.hxx
+++ b/chart2/source/view/inc/VDataSeries.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: VDataSeries.hxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: iha $ $Date: 2003-12-15 19:19:15 $
+ *  last change: $Author: iha $ $Date: 2004-01-06 19:39:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -161,12 +161,14 @@ public:
     rtl::OUString       getDataCurveCID( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xDataCurveModelProp ) const;
 
     ::drafts::com::sun::star::chart2::DataPointLabel*
-                        getDataPointLabel( sal_Int32 index ) const;
+                        getDataPointLabelIfLabel( sal_Int32 index ) const;
     bool    getTextLabelMultiPropertyLists( sal_Int32 index, tNameSequence*& pPropNames, tAnySequence*& pPropValues ) const;
 
 private: //methods
     VDataSeries();
     bool    isAttributedDataPoint( sal_Int32 index ) const;
+    ::drafts::com::sun::star::chart2::DataPointLabel*
+                        getDataPointLabel( sal_Int32 index ) const;
 
 private: //member
 
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index 03d03240b8ce..253003b095d0 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: VDataSeries.cxx,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: iha $ $Date: 2004-01-05 17:06:55 $
+ *  last change: $Author: iha $ $Date: 2004-01-06 19:39:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -412,6 +412,14 @@ DataPointLabel* VDataSeries::getDataPointLabel( sal_Int32 index ) const
     return pRet;
 }
 
+DataPointLabel* VDataSeries::getDataPointLabelIfLabel( sal_Int32 index ) const
+{
+    DataPointLabel* pLabel = this->getDataPointLabel( index );
+    if( !pLabel || (!pLabel->ShowNumber && !pLabel->ShowNumberInPercent
+        && !pLabel->ShowCategoryName && !pLabel->ShowLegendSymbol ) )
+        return 0;
+    return pLabel;
+}
 
 void createTextLabelMultiPropertyListsFromPropertySet(
             const uno::Reference< beans::XPropertySet >& xSourceProp