Skip to content

C
core
Kaydet (Commit) 30cb5591 authored tarafından Rafael Dominguez's avatar Rafael Dominguez Kaydeden (comit) Markus Mohrhard
Dosyalara gözat
Seçenekler

Remove deprecated chart ObjectType OBJECTTYPE_DATA_ERRORS.

üst f412f4bc
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 28 deletions
chart2/source/controller/accessibility/ChartElementFactory.cxx
Dosyayı görüntüle @ 30cb5591
......@@ -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:
......
chart2/source/controller/dialogs/ObjectNameProvider.cxx
Dosyayı görüntüle @ 30cb5591
......@@ -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:
......
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
Dosyayı görüntüle @ 30cb5591
......@@ -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)));
......
chart2/source/controller/main/ChartController_Properties.cxx
Dosyayı görüntüle @ 30cb5591
......@@ -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:
......
chart2/source/controller/main/ChartController_Tools.cxx
Dosyayı görüntüle @ 30cb5591
......@@ -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;
......
chart2/source/controller/main/ChartController_Window.cxx
Dosyayı görüntüle @ 30cb5591
......@@ -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;
......
chart2/source/controller/main/ControllerCommandDispatch.cxx
Dosyayı görüntüle @ 30cb5591
......@@ -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 )
......
chart2/source/inc/ObjectIdentifier.hxx
Dosyayı görüntüle @ 30cb5591
......@@ -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,
......
chart2/source/tools/ObjectIdentifier.cxx
Dosyayı görüntüle @ 30cb5591
......@@ -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");
......
chart2/source/tools/RangeHighlighter.cxx
Dosyayı görüntüle @ 30cb5591
......@@ -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 )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment