Compiler macro in lieu of literal "Label" to make it easier to track it.

Change-Id: I6bc694fcc8f97b308747c097c4fa977d20524377

chart2/inc/unonames.hxx

@@ -21,6 +21,7 @@
 #define CHART_UNONAME_LINK_TO_SRC_NUMFMT    "LinkNumberFormatToSource"
 #define CHART_UNONAME_ERRORBAR_X            "ErrorBarX"
 #define CHART_UNONAME_ERRORBAR_Y            "ErrorBarY"
+#define CHART_UNONAME_LABEL                 "Label"
 
 #endif
 

chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx

@@ -21,6 +21,8 @@
 #include "WrappedSeriesOrDiagramProperty.hxx"
 #include "macros.hxx"
 #include "FastPropertyIdRanges.hxx"
+#include <unonames.hxx>
+
 #include <com/sun/star/chart2/DataPointLabel.hpp>
 #include <com/sun/star/chart/ChartDataCaption.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -137,7 +139,7 @@ sal_Int32 WrappedDataCaptionProperty::getValueFromSeries( const Reference< beans
     sal_Int32 aRet = 0;
     m_aDefaultValue >>= aRet;
     chart2::DataPointLabel aLabel;
-    if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue("Label") >>= aLabel ) )
+    if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue(CHART_UNONAME_LABEL) >>= aLabel ) )
         aRet = lcl_LabelToCaption( aLabel );
     return aRet;
 }
@@ -148,7 +150,7 @@ void WrappedDataCaptionProperty::setValueToSeries( const Reference< beans::XProp
         return;
 
     chart2::DataPointLabel aLabel = lcl_CaptionToLabel( nCaption );
-    xSeriesPropertySet->setPropertyValue( "Label", uno::makeAny( aLabel ) );
+    xSeriesPropertySet->setPropertyValue( CHART_UNONAME_LABEL, uno::makeAny( aLabel ) );
 }
 
 } //namespace wrapper

chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx

@@ -310,7 +310,7 @@ bool DataPointItemConverter::ApplySpecialItem(
         {
             const SfxBoolItem & rItem = static_cast< const SfxBoolItem & >( rItemSet.Get( nWhichId ));
 
-            uno::Any aOldValue( GetPropertySet()->getPropertyValue( "Label" ));
+            uno::Any aOldValue = GetPropertySet()->getPropertyValue(CHART_UNONAME_LABEL);
             chart2::DataPointLabel aLabel;
             if( aOldValue >>= aLabel )
             {
@@ -323,15 +323,15 @@ bool DataPointItemConverter::ApplySpecialItem(
                 {
                     Reference< chart2::XDataSeries > xSeries( GetPropertySet(), uno::UNO_QUERY);
                     if( (bOldValue ? 1 : 0) != rValue ||
-                        DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "Label" , aOldValue ) )
+                        DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, CHART_UNONAME_LABEL , aOldValue ) )
                     {
-                        DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "Label" , uno::makeAny( aLabel ) );
+                        DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, CHART_UNONAME_LABEL , uno::makeAny( aLabel ) );
                         bChanged = true;
                     }
                 }
                 else if( (bOldValue ? 1 : 0) != rValue )
                 {
-                    GetPropertySet()->setPropertyValue( "Label" , uno::makeAny( aLabel ));
+                    GetPropertySet()->setPropertyValue(CHART_UNONAME_LABEL , uno::makeAny(aLabel));
                     bChanged = true;
                 }
             }
@@ -537,7 +537,7 @@ void DataPointItemConverter::FillSpecialItem(
         case SCHATTR_DATADESCR_SHOW_SYMBOL:
         {
             chart2::DataPointLabel aLabel;
-            if( GetPropertySet()->getPropertyValue( "Label" ) >>= aLabel )
+            if (GetPropertySet()->getPropertyValue(CHART_UNONAME_LABEL) >>= aLabel)
             {
                 bool bValue = (SCHATTR_DATADESCR_SHOW_NUMBER==nWhichId) ? aLabel.ShowNumber : (
                     (SCHATTR_DATADESCR_SHOW_PERCENTAGE==nWhichId) ? aLabel.ShowNumberInPercent : (
@@ -548,7 +548,7 @@ void DataPointItemConverter::FillSpecialItem(
                 if( m_bOverwriteLabelsForAttributedDataPointsAlso )
                 {
                     if( DataSeriesHelper::hasAttributedDataPointDifferentValue(
-                        Reference< chart2::XDataSeries >( GetPropertySet(), uno::UNO_QUERY), "Label" , uno::makeAny(aLabel) ) )
+                        Reference< chart2::XDataSeries >( GetPropertySet(), uno::UNO_QUERY), CHART_UNONAME_LABEL , uno::makeAny(aLabel) ) )
                     {
                         rOutItemSet.InvalidateItem(nWhichId);
                     }

chart2/source/controller/main/ChartController_Tools.cxx

@@ -40,6 +40,7 @@
 #include "ShapeController.hxx"
 #include "DiagramHelper.hxx"
 #include "ObjectNameProvider.hxx"
+#include <unonames.hxx>
 
 #include <com/sun/star/chart2/DataPointLabel.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
@@ -774,7 +775,7 @@ bool ChartController::executeDispatch_Delete()
                             SCH_RESSTR( aObjectType == OBJECTTYPE_DATA_LABEL ? STR_OBJECT_LABEL : STR_OBJECT_DATALABELS )),
                                 m_xUndoManager );
                     chart2::DataPointLabel aLabel;
-                    xObjectProperties->getPropertyValue( "Label" ) >>= aLabel;
+                    xObjectProperties->getPropertyValue(CHART_UNONAME_LABEL) >>= aLabel;
                     aLabel.ShowNumber = false;
                     aLabel.ShowNumberInPercent = false;
                     aLabel.ShowCategoryName = false;
@@ -782,10 +783,10 @@ bool ChartController::executeDispatch_Delete()
                     if( aObjectType == OBJECTTYPE_DATA_LABELS )
                     {
                         uno::Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( aCID, getModel() ));
-                        ::chart::DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "Label", uno::makeAny(aLabel) );
+                        ::chart::DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, CHART_UNONAME_LABEL, uno::makeAny(aLabel) );
                     }
                     else
-                        xObjectProperties->setPropertyValue( "Label", uno::makeAny(aLabel) );
+                        xObjectProperties->setPropertyValue( CHART_UNONAME_LABEL, uno::makeAny(aLabel) );
                     bReturn = true;
                     aUndoGuard.commit();
                 }

chart2/source/model/main/DataPointProperties.cxx

@@ -264,7 +264,7 @@ void DataPointProperties::AddPropertiesToVector(
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
-        Property( "Label",
+        Property( CHART_UNONAME_LABEL,
                   PROP_DATAPOINT_LABEL,
                   cppu::UnoType<chart2::DataPointLabel>::get(),
                   beans::PropertyAttribute::BOUND

chart2/source/tools/DataSeriesHelper.cxx

@@ -148,14 +148,14 @@ void lcl_insertOrDeleteDataLabelsToSeriesAndAllPoints( const Reference< chart2::
         if( xSeriesProperties.is() )
         {
             DataPointLabel aLabelAtSeries;
-            xSeriesProperties->getPropertyValue( "Label" ) >>= aLabelAtSeries;
+            xSeriesProperties->getPropertyValue(CHART_UNONAME_LABEL) >>= aLabelAtSeries;
             aLabelAtSeries.ShowNumber = bInsert;
             if( !bInsert )
             {
                 aLabelAtSeries.ShowNumberInPercent = false;
                 aLabelAtSeries.ShowCategoryName = false;
             }
-            xSeriesProperties->setPropertyValue( "Label", uno::makeAny( aLabelAtSeries ) );
+            xSeriesProperties->setPropertyValue(CHART_UNONAME_LABEL, uno::makeAny(aLabelAtSeries));
             uno::Sequence< sal_Int32 > aAttributedDataPointIndexList;
             if( xSeriesProperties->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList )
             {
@@ -165,14 +165,14 @@ void lcl_insertOrDeleteDataLabelsToSeriesAndAllPoints( const Reference< chart2::
                     if( xPointProp.is() )
                     {
                         DataPointLabel aLabel;
-                        xPointProp->getPropertyValue( "Label" ) >>= aLabel;
+                        xPointProp->getPropertyValue(CHART_UNONAME_LABEL) >>= aLabel;
                         aLabel.ShowNumber = bInsert;
                         if( !bInsert )
                         {
                             aLabel.ShowNumberInPercent = false;
                             aLabel.ShowCategoryName = false;
                         }
-                        xPointProp->setPropertyValue( "Label", uno::makeAny( aLabel ) );
+                        xPointProp->setPropertyValue(CHART_UNONAME_LABEL, uno::makeAny(aLabel));
                     }
                 }
             }
@@ -777,7 +777,7 @@ bool hasDataLabelsAtSeries( const Reference< chart2::XDataSeries >& xSeries )
         if( xProp.is() )
         {
             DataPointLabel aLabel;
-            if( (xProp->getPropertyValue( "Label" ) >>= aLabel) )
+            if( (xProp->getPropertyValue(CHART_UNONAME_LABEL) >>= aLabel) )
                 bRet = aLabel.ShowNumber || aLabel.ShowNumberInPercent || aLabel.ShowCategoryName;
         }
     }
@@ -805,7 +805,7 @@ bool hasDataLabelsAtPoints( const Reference< chart2::XDataSeries >& xSeries )
                     if( xPointProp.is() )
                     {
                         DataPointLabel aLabel;
-                        if( (xPointProp->getPropertyValue( "Label" ) >>= aLabel) )
+                        if( (xPointProp->getPropertyValue(CHART_UNONAME_LABEL) >>= aLabel) )
                             bRet = aLabel.ShowNumber || aLabel.ShowNumberInPercent || aLabel.ShowCategoryName;
                         if( bRet )
                             break;
@@ -843,7 +843,7 @@ bool hasDataLabelAtPoint( const Reference< chart2::XDataSeries >& xSeries, sal_I
             if( xProp.is() )
             {
                 DataPointLabel aLabel;
-                if( (xProp->getPropertyValue( "Label" ) >>= aLabel) )
+                if( (xProp->getPropertyValue(CHART_UNONAME_LABEL) >>= aLabel) )
                     bRet = aLabel.ShowNumber || aLabel.ShowNumberInPercent || aLabel.ShowCategoryName;
             }
         }
@@ -872,9 +872,9 @@ void insertDataLabelToPoint( const Reference< beans::XPropertySet >& xPointProp
         if( xPointProp.is() )
         {
             DataPointLabel aLabel;
-            xPointProp->getPropertyValue( "Label" ) >>= aLabel;
+            xPointProp->getPropertyValue(CHART_UNONAME_LABEL) >>= aLabel;
             aLabel.ShowNumber = true;
-            xPointProp->setPropertyValue( "Label", uno::makeAny( aLabel ) );
+            xPointProp->setPropertyValue(CHART_UNONAME_LABEL, uno::makeAny(aLabel));
         }
     }
     catch(const uno::Exception &e)
@@ -890,11 +890,11 @@ void deleteDataLabelsFromPoint( const Reference< beans::XPropertySet >& xPointPr
         if( xPointProp.is() )
         {
             DataPointLabel aLabel;
-            xPointProp->getPropertyValue( "Label" ) >>= aLabel;
+            xPointProp->getPropertyValue(CHART_UNONAME_LABEL) >>= aLabel;
             aLabel.ShowNumber = false;
             aLabel.ShowNumberInPercent = false;
             aLabel.ShowCategoryName = false;
-            xPointProp->setPropertyValue( "Label", uno::makeAny( aLabel ) );
+            xPointProp->setPropertyValue(CHART_UNONAME_LABEL, uno::makeAny(aLabel));
         }
     }
     catch(const uno::Exception &e)

chart2/source/view/main/VDataSeries.cxx

@@ -896,7 +896,7 @@ DataPointLabel* getDataPointLabelFromPropertySet( const uno::Reference< beans::X
     SAL_WNODEPRECATED_DECLARATIONS_POP
     try
     {
-        if( !(xProp->getPropertyValue("Label") >>= *apLabel) )
+        if( !(xProp->getPropertyValue(CHART_UNONAME_LABEL) >>= *apLabel) )
             apLabel.reset();
     }
     catch(const uno::Exception &e)