chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 310
++++++++++
chart2/source/controller/sidebar/ChartTypePanel.cxx | 1
chart2/source/inc/ChartTypeDialogController.hxx | 12
3 files changed, 323 insertions(+)
New commits:
commit e3a1d65f9549c6c9e42cbebda511a9d9d6233b8a
Author: Muhammet Kara <muhammet.k...@collabora.com>
AuthorDate: Wed Nov 6 20:41:53 2019 +0300
Commit: Muhammet Kara <muhammet.k...@collabora.com>
CommitDate: Wed Nov 6 20:25:15 2019 +0100
Overload fillSubTypeList() for ValueSet param
Change-Id: Ia429db469d115e3f5190ba79ded3c191e6538fa2
Reviewed-on: https://gerrit.libreoffice.org/82166
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Muhammet Kara <muhammet.k...@collabora.com>
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 3c34c96982f3..3036dda89a30 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -339,6 +339,10 @@ void ChartTypeDialogController::fillSubTypeList(
SvtValueSet& rSubTypeList, cons
{
rSubTypeList.Clear();
}
+void ChartTypeDialogController::fillSubTypeList( ValueSet& rSubTypeList, const
ChartTypeParameter& /*rParameter*/ )
+{
+ rSubTypeList.Clear();
+}
bool ChartTypeDialogController::shouldShow_3DLookControl() const
{
return false;
@@ -476,6 +480,53 @@ void ColumnChartDialogController::fillSubTypeList(
SvtValueSet& rSubTypeList, co
rSubTypeList.SetItemText( 4, SchResId( STR_DEEP ) );
}
+void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList,
const ChartTypeParameter& rParameter )
+{
+ rSubTypeList.Clear();
+
+ if( rParameter.b3DLook )
+ {
+ switch(rParameter.nGeometry3D)
+ {
+ case DataPointGeometry3D::CYLINDER:
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_SAEULE_3D_1));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_SAEULE_3D_2));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_SAEULE_3D_3));
+ rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_SAEULE_3D_4));
+ break;
+ case DataPointGeometry3D::CONE:
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_KEGEL_3D_1));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_KEGEL_3D_2));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_KEGEL_3D_3));
+ rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_KEGEL_3D_4));
+ break;
+ case DataPointGeometry3D::PYRAMID:
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_PYRAMID_3D_1));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_PYRAMID_3D_2));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_PYRAMID_3D_3));
+ rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_PYRAMID_3D_4));
+ break;
+ default: //DataPointGeometry3D::CUBOID:
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_COLUMNS_3D_1));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_COLUMNS_3D_2));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_COLUMNS_3D_3));
+ rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_COLUMNS_3D));
+ break;
+ }
+ }
+ else
+ {
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_COLUMNS_2D_1));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_COLUMNS_2D_2));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_COLUMNS_2D_3));
+ }
+
+ rSubTypeList.SetItemText( 1, SchResId( STR_NORMAL ) );
+ rSubTypeList.SetItemText( 2, SchResId( STR_STACKED ) );
+ rSubTypeList.SetItemText( 3, SchResId( STR_PERCENT ) );
+ rSubTypeList.SetItemText( 4, SchResId( STR_DEEP ) );
+}
+
BarChartDialogController::BarChartDialogController()
{
}
@@ -552,6 +603,52 @@ void BarChartDialogController::fillSubTypeList(
SvtValueSet& rSubTypeList, const
rSubTypeList.SetItemText( 4, SchResId( STR_DEEP ) );
}
+void BarChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const
ChartTypeParameter& rParameter )
+{
+ rSubTypeList.Clear();
+
+ if( rParameter.b3DLook )
+ {
+ switch(rParameter.nGeometry3D)
+ {
+ case DataPointGeometry3D::CYLINDER:
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_ROEHRE_3D_1));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_ROEHRE_3D_2));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_ROEHRE_3D_3));
+ rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_ROEHRE_3D_4));
+ break;
+ case DataPointGeometry3D::CONE:
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_KEGELQ_3D_1));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_KEGELQ_3D_2));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_KEGELQ_3D_3));
+ rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_KEGELQ_3D_4));
+ break;
+ case DataPointGeometry3D::PYRAMID:
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_PYRAMIDQ_3D_1));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_PYRAMIDQ_3D_2));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_PYRAMIDQ_3D_3));
+ rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_PYRAMIDQ_3D_4));
+ break;
+ default: //DataPointGeometry3D::CUBOID:
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_BARS_3D_1));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_BARS_3D_2));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_BARS_3D_3));
+ rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_BARS_3D));
+ break;
+ }
+ }
+ else
+ {
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_BARS_2D_1));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_BARS_2D_2));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_BARS_2D_3));
+ }
+ rSubTypeList.SetItemText( 1, SchResId( STR_NORMAL ) );
+ rSubTypeList.SetItemText( 2, SchResId( STR_STACKED ) );
+ rSubTypeList.SetItemText( 3, SchResId( STR_PERCENT ) );
+ rSubTypeList.SetItemText( 4, SchResId( STR_DEEP ) );
+}
+
PieChartDialogController::PieChartDialogController()
{
}
@@ -607,6 +704,30 @@ void PieChartDialogController::fillSubTypeList(
SvtValueSet& rSubTypeList, const
rSubTypeList.SetItemText( 4, SchResId( STR_DONUT_EXPLODED ) );
}
+void PieChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const
ChartTypeParameter& rParameter )
+{
+ rSubTypeList.Clear();
+
+ if( rParameter.b3DLook )
+ {
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_CIRCLES_3D));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_CIRCLES_3D_EXPLODED));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_DONUT_3D));
+ rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_DONUT_3D_EXPLODED));
+ }
+ else
+ {
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_CIRCLES_2D));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_CIRCLES_2D_EXPLODED));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_DONUT_2D));
+ rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_DONUT_2D_EXPLODED));
+ }
+ rSubTypeList.SetItemText( 1, SchResId( STR_NORMAL ) );
+ rSubTypeList.SetItemText( 2, SchResId( STR_PIE_EXPLODED ) );
+ rSubTypeList.SetItemText( 3, SchResId( STR_DONUT ) );
+ rSubTypeList.SetItemText( 4, SchResId( STR_DONUT_EXPLODED ) );
+}
+
bool PieChartDialogController::shouldShow_3DLookControl() const
{
return true;
@@ -718,6 +839,73 @@ void LineChartDialogController::fillSubTypeList(
SvtValueSet& rSubTypeList, cons
rSubTypeList.SetItemText( 3, SchResId( STR_LINES_ONLY ) );
rSubTypeList.SetItemText( 4, SchResId( STR_LINES_3D ) );
}
+
+void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const
ChartTypeParameter& rParameter )
+{
+ rSubTypeList.Clear();
+
+ switch( rParameter.eCurveStyle )
+ {
+ case CurveStyle_CUBIC_SPLINES:
+ case CurveStyle_B_SPLINES:
+ if( rParameter.eStackMode == GlobalStackMode_NONE ||
rParameter.eStackMode == GlobalStackMode_STACK_Z )
+ {
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_POINTS_XCATEGORY));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_LINE_P_XCATEGORY_SMOOTH));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_LINE_O_XCATEGORY_SMOOTH));
+ rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_LINE3D_XCATEGORY_SMOOTH));
+ }
+ else
+ {
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_POINTS_STACKED));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_LINE_P_STACKED_SMOOTH));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_LINE_O_STACKED_SMOOTH));
+ rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_LINE3D_STACKED_SMOOTH));
+ }
+ break;
+ case CurveStyle_STEP_START:
+ case CurveStyle_STEP_END:
+ case CurveStyle_STEP_CENTER_X:
+ case CurveStyle_STEP_CENTER_Y:
+ if( rParameter.eStackMode == GlobalStackMode_NONE ||
rParameter.eStackMode == GlobalStackMode_STACK_Z )
+ {
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_POINTS_XCATEGORY));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_LINE_P_XCATEGORY_STEPPED));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_LINE_O_XCATEGORY_STEPPED));
+ rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_LINE3D_XCATEGORY_STEPPED));
+ }
+ else
+ {
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_POINTS_STACKED));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_LINE_P_STACKED_STEPPED));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_LINE_O_STACKED_STEPPED));
+ rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_LINE3D_STACKED_STEPPED));
+ }
+ break;
+ default: // includes CurveStyle_LINES
+ //direct lines
+ if( rParameter.eStackMode == GlobalStackMode_NONE ||
rParameter.eStackMode == GlobalStackMode_STACK_Z )
+ {
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_POINTS_XCATEGORY));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_LINE_P_XCATEGORY));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_LINE_O_XCATEGORY));
+ rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_LINE3D_XCATEGORY));
+ }
+ else
+ {
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_POINTS_STACKED));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_LINE_P_STACKED));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_LINE_O_STACKED));
+ rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_LINE3D_STACKED));
+ }
+ }
+
+ rSubTypeList.SetItemText( 1, SchResId( STR_POINTS_ONLY ) );
+ rSubTypeList.SetItemText( 2, SchResId( STR_POINTS_AND_LINES ) );
+ rSubTypeList.SetItemText( 3, SchResId( STR_LINES_ONLY ) );
+ rSubTypeList.SetItemText( 4, SchResId( STR_LINES_3D ) );
+}
+
bool LineChartDialogController::shouldShow_StackingControl() const
{
return true;
@@ -835,6 +1023,46 @@ void XYChartDialogController::fillSubTypeList(
SvtValueSet& rSubTypeList, const
rSubTypeList.SetItemText( 3, SchResId( STR_LINES_ONLY ) );
rSubTypeList.SetItemText( 4, SchResId( STR_LINES_3D ) );
}
+
+void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const
ChartTypeParameter& rParameter )
+{
+ rSubTypeList.Clear();
+
+ switch (rParameter.eCurveStyle)
+ {
+ case CurveStyle_CUBIC_SPLINES:
+ case CurveStyle_B_SPLINES:
+ {
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_POINTS_XVALUES));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_LINE_P_XVALUES_SMOOTH));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_LINE_O_XVALUES_SMOOTH));
+ rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_LINE3D_XVALUES_SMOOTH));
+ break;
+ }
+ case CurveStyle_STEP_START:
+ case CurveStyle_STEP_END:
+ case CurveStyle_STEP_CENTER_X:
+ case CurveStyle_STEP_CENTER_Y:
+ {
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_POINTS_XVALUES));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_LINE_P_XVALUES_STEPPED));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_LINE_O_XVALUES_STEPPED));
+ rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_LINE3D_XVALUES_STEPPED));
+ break;
+ }
+ default: // includes CurveStyle_LINES
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_POINTS_XVALUES));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_LINE_P_XVALUES));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_LINE_O_XVALUES));
+ rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_LINE3D_XVALUES));
+ }
+
+ rSubTypeList.SetItemText( 1, SchResId( STR_POINTS_ONLY ) );
+ rSubTypeList.SetItemText( 2, SchResId( STR_POINTS_AND_LINES ) );
+ rSubTypeList.SetItemText( 3, SchResId( STR_LINES_ONLY ) );
+ rSubTypeList.SetItemText( 4, SchResId( STR_LINES_3D ) );
+}
+
bool XYChartDialogController::shouldShow_SplineControl() const
{
return true;
@@ -928,6 +1156,29 @@ void AreaChartDialogController::fillSubTypeList(
SvtValueSet& rSubTypeList, cons
rSubTypeList.SetItemText( 2, SchResId( STR_STACKED ) );
rSubTypeList.SetItemText( 3, SchResId( STR_PERCENT ) );
}
+
+void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const
ChartTypeParameter& rParameter )
+{
+ rSubTypeList.Clear();
+
+ if( rParameter.b3DLook )
+ {
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_AREAS_3D));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_AREAS_3D_1));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_AREAS_3D_2));
+ }
+ else
+ {
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_AREAS_2D_1));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_AREAS_2D));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_AREAS_2D_3));
+ }
+
+ rSubTypeList.SetItemText( 1, SchResId( rParameter.b3DLook ? STR_DEEP :
STR_NORMAL ) );
+ rSubTypeList.SetItemText( 2, SchResId( STR_STACKED ) );
+ rSubTypeList.SetItemText( 3, SchResId( STR_PERCENT ) );
+}
+
void AreaChartDialogController::adjustParameterToSubType( ChartTypeParameter&
rParameter )
{
rParameter.eCurveStyle = CurveStyle_LINES;
@@ -1027,6 +1278,32 @@ void NetChartDialogController::fillSubTypeList(
SvtValueSet& rSubTypeList, const
rSubTypeList.SetItemText( 3, SchResId( STR_LINES_ONLY ) );
rSubTypeList.SetItemText( 4, SchResId( STR_FILLED ) );
}
+
+void NetChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const
ChartTypeParameter& rParameter )
+{
+ rSubTypeList.Clear();
+
+ if( rParameter.eStackMode == GlobalStackMode_NONE )
+ {
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_NET_SYMB));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_NET_LINESYMB));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_NET));
+ rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_NET_FILL));
+ }
+ else
+ {
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_NET_SYMB_STACK));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_NET_LINESYMB_STACK));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_NET_STACK));
+ rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_NET_FILL_STACK));
+ }
+
+ rSubTypeList.SetItemText( 1, SchResId( STR_POINTS_ONLY ) );
+ rSubTypeList.SetItemText( 2, SchResId( STR_POINTS_AND_LINES ) );
+ rSubTypeList.SetItemText( 3, SchResId( STR_LINES_ONLY ) );
+ rSubTypeList.SetItemText( 4, SchResId( STR_FILLED ) );
+}
+
void NetChartDialogController::adjustParameterToSubType( ChartTypeParameter&
rParameter )
{
rParameter.b3DLook = false;
@@ -1096,6 +1373,20 @@ void StockChartDialogController::fillSubTypeList(
SvtValueSet& rSubTypeList, con
rSubTypeList.SetItemText( 4, SchResId(STR_STOCK_4) );
}
+void StockChartDialogController::fillSubTypeList( ValueSet& rSubTypeList,
const ChartTypeParameter& /*rParameter*/ )
+{
+ rSubTypeList.Clear();
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_STOCK_1));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_STOCK_2));
+ rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_STOCK_3));
+ rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_STOCK_4));
+
+ rSubTypeList.SetItemText( 1, SchResId(STR_STOCK_1) );
+ rSubTypeList.SetItemText( 2, SchResId(STR_STOCK_2) );
+ rSubTypeList.SetItemText( 3, SchResId(STR_STOCK_3) );
+ rSubTypeList.SetItemText( 4, SchResId(STR_STOCK_4) );
+}
+
void StockChartDialogController::adjustParameterToSubType( ChartTypeParameter&
rParameter )
{
rParameter.b3DLook = false;
@@ -1135,6 +1426,16 @@ void
CombiColumnLineChartDialogController::fillSubTypeList( SvtValueSet& rSubTyp
rSubTypeList.SetItemText(2, SchResId(STR_LINE_STACKEDCOLUMN));
}
+void CombiColumnLineChartDialogController::fillSubTypeList( ValueSet&
rSubTypeList, const ChartTypeParameter& /*rParameter*/ )
+{
+ rSubTypeList.Clear();
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_COLUMN_LINE));
+ rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_COLUMN_LINE_STACKED));
+
+ rSubTypeList.SetItemText(1, SchResId(STR_LINE_COLUMN));
+ rSubTypeList.SetItemText(2, SchResId(STR_LINE_STACKEDCOLUMN));
+}
+
void CombiColumnLineChartDialogController::showExtraControls(weld::Builder*
pBuilder)
{
if (!m_xFT_NumberOfLines)
@@ -1260,6 +1561,15 @@ void BubbleChartDialogController::fillSubTypeList(
SvtValueSet& rSubTypeList, co
rSubTypeList.SetItemText( 1, SchResId(STR_BUBBLE_1) );
}
+
+void BubbleChartDialogController::fillSubTypeList( ValueSet& rSubTypeList,
const ChartTypeParameter& /*rParameter*/ )
+{
+ rSubTypeList.Clear();
+ rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_BUBBLE_1));
+
+ rSubTypeList.SetItemText( 1, SchResId(STR_BUBBLE_1) );
+}
+
void BubbleChartDialogController::adjustParameterToSubType(
ChartTypeParameter& rParameter )
{
rParameter.b3DLook = false;
diff --git a/chart2/source/controller/sidebar/ChartTypePanel.cxx
b/chart2/source/controller/sidebar/ChartTypePanel.cxx
index b2efe032f8a5..edc7beb71425 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.cxx
@@ -442,6 +442,7 @@ void ChartTypePanel::fillAllControls(const
ChartTypeParameter& rParameter,
// FIXME: This is just to test. This if-block should just call
m_pCurrentMainType->fillSubTypeList(*m_pSubTypeList, rParameter);
// after adding a new method to ColumnChartDialogController and its
children
//m_pCurrentMainType->fillSubTypeList(*m_pSubTypeList, rParameter);
+ //m_pCurrentMainType->fillSubTypeList(*m_pSubTypeList, rParameter);
m_pSubTypeList->Clear();
if (rParameter.b3DLook)
diff --git a/chart2/source/inc/ChartTypeDialogController.hxx
b/chart2/source/inc/ChartTypeDialogController.hxx
index 4a38768e9f77..c1b3411a3840 100644
--- a/chart2/source/inc/ChartTypeDialogController.hxx
+++ b/chart2/source/inc/ChartTypeDialogController.hxx
@@ -36,6 +36,7 @@ namespace com { namespace sun { namespace star { namespace
chart2 { class XChart
namespace com { namespace sun { namespace star { namespace lang { class
XMultiServiceFactory; } } } }
class SvtValueSet;
+class ValueSet;
namespace chart
{
@@ -93,6 +94,7 @@ public:
virtual OUString getImage()=0;
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap()
const = 0;
virtual void fillSubTypeList( SvtValueSet& rSubTypeList, const
ChartTypeParameter& rParameter );
+ virtual void fillSubTypeList( ValueSet& rSubTypeList, const
ChartTypeParameter& rParameter );
virtual bool shouldShow_3DLookControl() const;
virtual bool shouldShow_StackingControl() const;
@@ -149,6 +151,7 @@ public:
virtual OUString getImage() override;
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap()
const override;
virtual void fillSubTypeList( SvtValueSet& rSubTypeList, const
ChartTypeParameter& rParameter ) override;
+ virtual void fillSubTypeList( ValueSet& rSubTypeList, const
ChartTypeParameter& rParameter ) override;
};
class BarChartDialogController : public ColumnOrBarChartDialogController_Base
@@ -161,6 +164,7 @@ public:
virtual OUString getImage() override;
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap()
const override;
virtual void fillSubTypeList( SvtValueSet& rSubTypeList, const
ChartTypeParameter& rParameter ) override;
+ virtual void fillSubTypeList( ValueSet& rSubTypeList, const
ChartTypeParameter& rParameter ) override;
};
class PieChartDialogController : public ChartTypeDialogController
@@ -173,6 +177,7 @@ public:
virtual OUString getImage() override;
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap()
const override;
virtual void fillSubTypeList( SvtValueSet& rSubTypeList, const
ChartTypeParameter& rParameter ) override;
+ virtual void fillSubTypeList( ValueSet& rSubTypeList, const
ChartTypeParameter& rParameter ) override;
virtual void adjustParameterToSubType( ChartTypeParameter& rParameter )
override;
virtual bool shouldShow_3DLookControl() const override;
@@ -188,6 +193,7 @@ public:
virtual OUString getImage() override;
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap()
const override;
virtual void fillSubTypeList( SvtValueSet& rSubTypeList, const
ChartTypeParameter& rParameter ) override;
+ virtual void fillSubTypeList( ValueSet& rSubTypeList, const
ChartTypeParameter& rParameter ) override;
virtual void adjustParameterToSubType( ChartTypeParameter& rParameter )
override;
virtual void adjustParameterToMainType( ChartTypeParameter& rParameter )
override;
@@ -206,6 +212,7 @@ public:
virtual OUString getImage() override;
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap()
const override;
virtual void fillSubTypeList( SvtValueSet& rSubTypeList, const
ChartTypeParameter& rParameter ) override;
+ virtual void fillSubTypeList( ValueSet& rSubTypeList, const
ChartTypeParameter& rParameter ) override;
virtual void adjustParameterToSubType( ChartTypeParameter& rParameter )
override;
virtual bool shouldShow_SplineControl() const override;
@@ -222,6 +229,7 @@ public:
virtual OUString getImage() override;
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap()
const override;
virtual void fillSubTypeList( SvtValueSet& rSubTypeList, const
ChartTypeParameter& rParameter ) override;
+ virtual void fillSubTypeList( ValueSet& rSubTypeList, const
ChartTypeParameter& rParameter ) override;
virtual void adjustParameterToSubType( ChartTypeParameter& rParameter )
override;
virtual void adjustParameterToMainType( ChartTypeParameter& rParameter )
override;
@@ -238,6 +246,7 @@ public:
virtual OUString getImage() override;
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap()
const override;
virtual void fillSubTypeList( SvtValueSet& rSubTypeList, const
ChartTypeParameter& rParameter ) override;
+ virtual void fillSubTypeList( ValueSet& rSubTypeList, const
ChartTypeParameter& rParameter ) override;
virtual void adjustParameterToSubType( ChartTypeParameter& rParameter )
override;
virtual bool shouldShow_StackingControl() const override;
@@ -253,6 +262,7 @@ public:
virtual OUString getImage() override;
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap()
const override;
virtual void fillSubTypeList( SvtValueSet& rSubTypeList, const
ChartTypeParameter& rParameter ) override;
+ virtual void fillSubTypeList( ValueSet& rSubTypeList, const
ChartTypeParameter& rParameter ) override;
virtual void adjustParameterToSubType( ChartTypeParameter& rParameter )
override;
};
@@ -265,6 +275,7 @@ public:
virtual OUString getImage() override;
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap()
const override;
virtual void fillSubTypeList( SvtValueSet& rSubTypeList, const
ChartTypeParameter& rParameter ) override;
+ virtual void fillSubTypeList( ValueSet& rSubTypeList, const
ChartTypeParameter& rParameter ) override;
virtual void adjustParameterToSubType( ChartTypeParameter& rParameter )
override;
virtual void showExtraControls(weld::Builder* pBuilder) override;
@@ -293,6 +304,7 @@ public:
virtual OUString getImage() override;
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap()
const override;
virtual void fillSubTypeList( SvtValueSet& rSubTypeList, const
ChartTypeParameter& rParameter ) override;
+ virtual void fillSubTypeList( ValueSet& rSubTypeList, const
ChartTypeParameter& rParameter ) override;
virtual void adjustParameterToSubType( ChartTypeParameter& rParameter )
override;
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
