Remove deprecated chart ObjectType OBJECTTYPE_DATA_ERRORS.

10 files changed, 7 insertions, 28 deletions

diff --git a/chart2/source/controller/accessibility/ChartElementFactory.cxx b/chart2/source/controller/accessibility/ChartElementFactory.cxx
index c278460256b1..d146f942d249 100644
--- a/chart2/source/controller/accessibility/ChartElementFactory.cxx
+++ b/chart2/source/controller/accessibility/ChartElementFactory.cxx
@@ -57,7 +57,6 @@ AccessibleBase* ChartElementFactory::CreateChartElement( const AccessibleElement
         case OBJECTTYPE_DATA_SERIES:
         case OBJECTTYPE_DATA_LABELS:
         case OBJECTTYPE_DATA_LABEL:
-        case OBJECTTYPE_DATA_ERRORS:
         case OBJECTTYPE_DATA_ERRORS_X:
         case OBJECTTYPE_DATA_ERRORS_Y:
         case OBJECTTYPE_DATA_ERRORS_Z:
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 8ede4c949aef..0f0ae829814f 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -283,9 +283,6 @@ rtl::OUString ObjectNameProvider::getName( ObjectType eObjectType, bool bPlural
         case OBJECTTYPE_DATA_LABEL:
                 aRet=String(SchResId(STR_OBJECT_LABEL));
                 break;
-        case OBJECTTYPE_DATA_ERRORS:
-                aRet=String(SchResId(STR_OBJECT_ERROR_BARS_Y));
-                break;
         case OBJECTTYPE_DATA_ERRORS_X:
                 aRet=String(SchResId(STR_OBJECT_ERROR_BARS_X));
                 break;
@@ -752,7 +749,6 @@ rtl::OUString ObjectNameProvider::getNameForCID(
         case OBJECTTYPE_DATA_POINT:
         case OBJECTTYPE_DATA_LABELS:
         case OBJECTTYPE_DATA_LABEL:
-        case OBJECTTYPE_DATA_ERRORS:
         case OBJECTTYPE_DATA_ERRORS_X:
         case OBJECTTYPE_DATA_ERRORS_Y:
         case OBJECTTYPE_DATA_ERRORS_Z:
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index cd6b1f05cfac..ecd24357824a 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -160,10 +160,9 @@ void ObjectPropertiesDialogParameter::init( const uno::Reference< frame::XModel
         }
     }
 
-    if( OBJECTTYPE_DATA_ERRORS == m_eObjectType ||
-            m_eObjectType == OBJECTTYPE_DATA_ERRORS_X ||
-            m_eObjectType == OBJECTTYPE_DATA_ERRORS_Y ||
-            m_eObjectType == OBJECTTYPE_DATA_ERRORS_Z)
+    if( m_eObjectType == OBJECTTYPE_DATA_ERRORS_X ||
+        m_eObjectType == OBJECTTYPE_DATA_ERRORS_Y ||
+        m_eObjectType == OBJECTTYPE_DATA_ERRORS_Z)
         m_bHasStatisticProperties = true;
 
     if( OBJECTTYPE_AXIS == m_eObjectType )
@@ -242,7 +241,6 @@ void ObjectPropertiesDialogParameter::init( const uno::Reference< frame::XModel
                 case OBJECTTYPE_DATA_POINT:
                 case OBJECTTYPE_DATA_LABEL:
                 case OBJECTTYPE_DATA_LABELS:
-                case OBJECTTYPE_DATA_ERRORS:
                 case OBJECTTYPE_DATA_ERRORS_X:
                 case OBJECTTYPE_DATA_ERRORS_Y:
                 case OBJECTTYPE_DATA_ERRORS_Z:
@@ -455,7 +453,6 @@ SchAttribTabDlg::SchAttribTabDlg(Window* pParent,
             AddTabPage(RID_SVXPAGE_LINE, String(SchResId(STR_PAGE_LINE)));
             break;
 
-        case OBJECTTYPE_DATA_ERRORS:
         case OBJECTTYPE_DATA_ERRORS_Y:
             AddTabPage(TP_YERRORBAR, String(SchResId(STR_PAGE_YERROR_BARS)), ErrorBarsTabPage::Create, NULL);
             AddTabPage(RID_SVXPAGE_LINE, String(SchResId(STR_PAGE_LINE)));
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index a2a0d92a3f7e..19f146a6186e 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -255,7 +255,6 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
                                         wrapper::GraphicPropertyItemConverter::LINE_PROPERTIES );
                     break;
 
-            case OBJECTTYPE_DATA_ERRORS:
             case OBJECTTYPE_DATA_ERRORS_X:
             case OBJECTTYPE_DATA_ERRORS_Y:
             case OBJECTTYPE_DATA_ERRORS_Z:
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index eb96489f311a..050d64574f03 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -563,7 +563,6 @@ bool ChartController::isObjectDeleteable( const uno::Any& rSelection )
         case OBJECTTYPE_DATA_CURVE_EQUATION:
         case OBJECTTYPE_DATA_CURVE:
         case OBJECTTYPE_DATA_AVERAGE_LINE:
-        case OBJECTTYPE_DATA_ERRORS:
         case OBJECTTYPE_DATA_ERRORS_X:
         case OBJECTTYPE_DATA_ERRORS_Y:
         case OBJECTTYPE_DATA_ERRORS_Z:
@@ -725,7 +724,6 @@ bool ChartController::executeDispatch_Delete()
                 break;
             }
 
-            case OBJECTTYPE_DATA_ERRORS:
             case OBJECTTYPE_DATA_ERRORS_X:
             case OBJECTTYPE_DATA_ERRORS_Y:
             case OBJECTTYPE_DATA_ERRORS_Z:
@@ -738,8 +736,7 @@ bool ChartController::executeDispatch_Delete()
 
                     if ( aObjectType == OBJECTTYPE_DATA_ERRORS_X )
                         nId = STR_OBJECT_ERROR_BARS_X;
-                    else if ( aObjectType == OBJECTTYPE_DATA_ERRORS_Y ||
-                              aObjectType == OBJECTTYPE_DATA_ERRORS )
+                    else if ( aObjectType == OBJECTTYPE_DATA_ERRORS_Y )
                         nId = STR_OBJECT_ERROR_BARS_Y;
                     else
                         nId = STR_OBJECT_ERROR_BARS_Z;
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 3cc3538299a9..6fcfacc1c7e0 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -206,7 +206,6 @@ OUString lcl_getFormatCommandForObjectCID( const OUString& rCID )
         case OBJECTTYPE_DATA_ERRORS_X:
             aDispatchCommand = C2U(".uno:FormatXErrorBars");
             break;
-        case OBJECTTYPE_DATA_ERRORS:
         case OBJECTTYPE_DATA_ERRORS_Y:
             aDispatchCommand = C2U(".uno:FormatYErrorBars");
             break;
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index 372fe31c9b5d..251098119214 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -280,7 +280,7 @@ void ControllerState::update(
             if( aObjectType == OBJECTTYPE_DATA_ERRORS_X)
                 bMayFormatXErrorBars = true;
 
-            if( aObjectType == OBJECTTYPE_DATA_ERRORS_Y || aObjectType == OBJECTTYPE_DATA_ERRORS )
+            if( aObjectType == OBJECTTYPE_DATA_ERRORS_Y )
                 bMayFormatYErrorBars = true;
 
             if( aObjectType == OBJECTTYPE_DATA_CURVE )
diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx
index 0c71e23e9d24..d1cbf81fc86f 100644
--- a/chart2/source/inc/ObjectIdentifier.hxx
+++ b/chart2/source/inc/ObjectIdentifier.hxx
@@ -68,7 +68,6 @@ enum ObjectType
     OBJECTTYPE_DATA_POINT,
     OBJECTTYPE_DATA_LABELS,
     OBJECTTYPE_DATA_LABEL,
-    OBJECTTYPE_DATA_ERRORS,
     OBJECTTYPE_DATA_ERRORS_X,
     OBJECTTYPE_DATA_ERRORS_Y,
     OBJECTTYPE_DATA_ERRORS_Z,
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index 5dcc2cf68d07..b386b79853d3 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -875,9 +875,6 @@ OUString ObjectIdentifier::getStringForType( ObjectType eObjectType )
         case OBJECTTYPE_DATA_LABEL:
                 aRet=C2U("DataLabel");
                 break;
-        case OBJECTTYPE_DATA_ERRORS:
-                aRet=C2U("Errors");
-                break;
         case OBJECTTYPE_DATA_ERRORS_X:
                 aRet=C2U("ErrorsX");
                 break;
@@ -963,8 +960,6 @@ ObjectType ObjectIdentifier::getObjectType( const OUString& rCID )
         eRet = OBJECTTYPE_DATA_ERRORS_Y;
     else if( rCID.match(C2U("ErrorsZ"),nLastSign) )
         eRet = OBJECTTYPE_DATA_ERRORS_Z;
-    else if( rCID.match(C2U("Errors"),nLastSign) )
-        eRet = OBJECTTYPE_DATA_ERRORS;
     else if( rCID.match(C2U("Curve"),nLastSign) )
         eRet = OBJECTTYPE_DATA_CURVE;
     else if( rCID.match(C2U("Equation"),nLastSign) )
@@ -1233,7 +1228,6 @@ Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet(
                     }
                     break;
                 }
-            case OBJECTTYPE_DATA_ERRORS:
             case OBJECTTYPE_DATA_ERRORS_X:
             case OBJECTTYPE_DATA_ERRORS_Y:
             case OBJECTTYPE_DATA_ERRORS_Z:
@@ -1250,7 +1244,7 @@ Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet(
 
                             if ( eObjectType == OBJECTTYPE_DATA_ERRORS_X)
                                 errorBar = C2U("ErrorBarX");
-                            else if (eObjectType == OBJECTTYPE_DATA_ERRORS_Y || eObjectType == OBJECTTYPE_DATA_ERRORS)
+                            else if (eObjectType == OBJECTTYPE_DATA_ERRORS_Y)
                                 errorBar = C2U("ErrorBarY");
                             else
                                 errorBar = C2U("ErrorBarZ");
diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx
index 4876c4e78dae..d4033352a3c2 100644
--- a/chart2/source/tools/RangeHighlighter.cxx
+++ b/chart2/source/tools/RangeHighlighter.cxx
@@ -134,8 +134,7 @@ void RangeHighlighter::determineRanges()
                         fillRangesForDataPoint( xDataSeries, nIndex );
                         return;
                     }
-                    else if( OBJECTTYPE_DATA_ERRORS == eObjectType ||
-                             OBJECTTYPE_DATA_ERRORS_X == eObjectType ||
+                    else if( OBJECTTYPE_DATA_ERRORS_X == eObjectType ||
                              OBJECTTYPE_DATA_ERRORS_Y == eObjectType ||
                              OBJECTTYPE_DATA_ERRORS_Z == eObjectType )
                     {