Update Data Label dlg according to UX mockup

Change-Id: Ia9855a4bc9c5211b4510aa1053faac9e65346818
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111118
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>

2 files changed, 2 insertions, 7 deletions

diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 57a0d3c9565a..857d2b5295db 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -106,9 +106,7 @@ DataLabelResources::DataLabelResources(weld::Builder* pBuilder, weld::Window* pP
     , m_xCBSymbol(pBuilder->weld_check_button("CB_SYMBOL"))
     , m_xCBDataSeries(pBuilder->weld_check_button("CB_DATA_SERIES_NAME"))
     , m_xCBWrapText(pBuilder->weld_check_button("CB_WRAP_TEXT"))
-    , m_xSeparatorResources(pBuilder->weld_widget("boxSEPARATOR"))
     , m_xLB_Separator(pBuilder->weld_combo_box("LB_TEXT_SEPARATOR"))
-    , m_xBxLabelPlacement(pBuilder->weld_widget("boxPLACEMENT"))
     , m_xLB_LabelPlacement(pBuilder->weld_combo_box("LB_LABEL_PLACEMENT"))
     , m_xBxOrientation(pBuilder->weld_widget("boxORIENTATION"))
     , m_xFT_Dial(pBuilder->weld_label("CT_LABEL_DIAL"))
@@ -249,12 +247,12 @@ void DataLabelResources::EnableControls()
         if (m_xCBDataSeries->get_state() != TRISTATE_FALSE)
             ++nNumberOfCheckedLabelParts;
 
-        m_xSeparatorResources->set_sensitive( nNumberOfCheckedLabelParts > 1 );
+        m_xLB_Separator->set_sensitive( nNumberOfCheckedLabelParts > 1 );
 
         bool bEnableTextDir = nNumberOfCheckedLabelParts > 0;
         m_xBxTextDirection->set_sensitive( bEnableTextDir );
         bool bEnablePlacement = nNumberOfCheckedLabelParts > 0 && m_xLB_LabelPlacement->get_count()>1;
-        m_xBxLabelPlacement->set_sensitive( bEnablePlacement );
+        m_xLB_LabelPlacement->set_sensitive( bEnablePlacement );
     }
 
     m_xPB_NumberFormatForValue->set_sensitive( m_pNumberFormatter && m_xCBNumber->get_active() );
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx
index 1f832a4881a3..dde594b620d6 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -68,10 +68,7 @@ private:
     std::unique_ptr<weld::CheckButton> m_xCBDataSeries;
     std::unique_ptr<weld::CheckButton> m_xCBWrapText;
 
-    std::unique_ptr<weld::Widget> m_xSeparatorResources;
     std::unique_ptr<weld::ComboBox> m_xLB_Separator;
-
-    std::unique_ptr<weld::Widget> m_xBxLabelPlacement;
     std::unique_ptr<weld::ComboBox> m_xLB_LabelPlacement;
 
     std::unique_ptr<weld::Widget> m_xBxOrientation;