1 files changed, 14 insertions, 8 deletions
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx
index 5358c0345495..66a062d2ca24 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -20,11 +20,11 @@
 
 #include <svl/itemset.hxx>
 #include <svx/dialcontrol.hxx>
+#include <TextDirectionListBox.hxx>
 
 #include <map>
 
 class SvNumberFormatter;
-namespace chart { class TextDirectionListBox; }
 
 namespace chart
 {
@@ -47,8 +47,8 @@ private:
     SvNumberFormatter*  m_pNumberFormatter;
     bool                m_bNumberFormatMixedState;
     bool                m_bPercentFormatMixedState;
-    sal_uLong           m_nNumberFormatForValue;
-    sal_uLong           m_nNumberFormatForPercent;
+    sal_uInt32          m_nNumberFormatForValue;
+    sal_uInt32          m_nNumberFormatForPercent;
 
     bool                m_bSourceFormatMixedState;
     bool                m_bPercentSourceMixedState;
@@ -58,6 +58,14 @@ private:
     weld::Window*       m_pWindow;
     SfxItemPool*        m_pPool;
 
+    weld::TriStateEnabled m_aNumberState;
+    weld::TriStateEnabled m_aPercentState;
+    weld::TriStateEnabled m_aCategoryState;
+    weld::TriStateEnabled m_aSymbolState;
+    weld::TriStateEnabled m_aDataSeriesState;
+    weld::TriStateEnabled m_aWrapTextState;
+    weld::TriStateEnabled m_aCustomLeaderLinesState;
+
     std::unique_ptr<weld::CheckButton> m_xCBNumber;
     std::unique_ptr<weld::Button> m_xPB_NumberFormatForValue;
     std::unique_ptr<weld::CheckButton> m_xCBPercent;
@@ -65,12 +73,10 @@ private:
     std::unique_ptr<weld::Label> m_xFT_NumberFormatForPercent;
     std::unique_ptr<weld::CheckButton> m_xCBCategory;
     std::unique_ptr<weld::CheckButton> m_xCBSymbol;
+    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;
@@ -79,14 +85,14 @@ private:
 
     std::unique_ptr<weld::Widget> m_xBxTextDirection;
 
-    std::unique_ptr<TextDirectionListBox> m_xLB_TextDirection;
+    TextDirectionListBox m_aLB_TextDirection;
     std::unique_ptr<svx::DialControl> m_xDC_Dial;
     std::unique_ptr<weld::CustomWeld> m_xDC_DialWin;
 
     std::unique_ptr<weld::CheckButton> m_xCBCustomLeaderLines;
 
     DECL_LINK(NumberFormatDialogHdl, weld::Button&, void );
-    DECL_LINK(CheckHdl, weld::ToggleButton&, void );
+    DECL_LINK(CheckHdl, weld::Toggleable&, void );
     void EnableControls();
 };