tp_axisLabel.ui widgets

Change-Id: I279d2989e6a3a8f0aa279c5aa8eb13251a6052da
Reviewed-on: https://gerrit.libreoffice.org/5801
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

5 files changed, 536 insertions, 304 deletions

diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index ea08c586c23a..999547cf9b40 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
 	chart2/uiconfig/ui/smoothlinesdlg \
 	chart2/uiconfig/ui/steppedlinesdlg \
 	chart2/uiconfig/ui/titlerotationtabpage \
+	chart2/uiconfig/ui/tp_axisLabel \
 	chart2/uiconfig/ui/tp_SeriesToAxis \
 ))
 
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 606052f466b6..59ad0b521849 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -36,30 +36,7 @@ namespace chart
 {
 
 SchAxisLabelTabPage::SchAxisLabelTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
-        SfxTabPage( pParent, SchResId( TP_AXIS_LABEL ), rInAttrs ),
-
-        aCbShowDescription( this, SchResId( CB_AXIS_LABEL_SCHOW_DESCR ) ),
-
-        aFlOrder( this, SchResId( FL_AXIS_LABEL_ORDER ) ),
-        aRbSideBySide( this, SchResId( RB_AXIS_LABEL_SIDEBYSIDE ) ),
-        aRbUpDown( this, SchResId( RB_AXIS_LABEL_UPDOWN ) ),
-        aRbDownUp( this, SchResId( RB_AXIS_LABEL_DOWNUP ) ),
-        aRbAuto( this, SchResId( RB_AXIS_LABEL_AUTOORDER ) ),
-
-        aFlSeparator( this, SchResId( FL_SEPARATOR ) ),
-        aFlTextFlow( this, SchResId( FL_AXIS_LABEL_TEXTFLOW ) ),
-        aCbTextOverlap( this, SchResId( CB_AXIS_LABEL_TEXTOVERLAP ) ),
-        aCbTextBreak( this, SchResId( CB_AXIS_LABEL_TEXTBREAK ) ),
-
-        aFlOrient( this, SchResId( FL_AXIS_LABEL_ORIENTATION ) ),
-        aCtrlDial( this, SchResId( CT_AXIS_LABEL_DIAL ) ),
-        aFtRotate( this, SchResId( FT_AXIS_LABEL_DEGREES ) ),
-        aNfRotate( this, SchResId( NF_AXIS_LABEL_ORIENT ) ),
-        aCbStacked( this, SchResId( PB_AXIS_LABEL_TEXTSTACKED ) ),
-        aOrientHlp( aCtrlDial, aNfRotate, aCbStacked ),
-
-        m_aFtTextDirection( this, SchResId( FT_AXIS_TEXTDIR ) ),
-        m_aLbTextDirection( this, SchResId( LB_AXIS_TEXTDIR ), &m_aFtTextDirection ),
+        SfxTabPage( pParent, "AxisLabelTabPage","modules/schart/ui/tp_axisLabel.ui", rInAttrs ),
 
         m_bShowStaggeringControls( true ),
 
@@ -69,22 +46,39 @@ SchAxisLabelTabPage::SchAxisLabelTabPage( Window* pParent, const SfxItemSet& rIn
         m_bHasInitialStacking( true ),
         m_bComplexCategories( false )
 {
-    FreeResource();
-
-    aCbStacked.EnableTriState( sal_False );
-    aOrientHlp.AddDependentWindow( aFlOrient );
-    aOrientHlp.AddDependentWindow( aFtRotate, STATE_CHECK );
-
-    aCbShowDescription.SetClickHdl( LINK( this, SchAxisLabelTabPage, ToggleShowLabel ) );
-
-    //  Make the fixed line separator vertical.
-    aFlSeparator.SetStyle (aFlSeparator.GetStyle() | WB_VERT);
+    get(m_pCbShowDescription, "showlabelsCB");
+    get(m_pFlOrder, "orderL");
+    get(m_pRbSideBySide, "tile");
+    get(m_pRbUpDown, "odd");
+    get(m_pRbDownUp, "even");
+    get(m_pRbAuto, "auto");
+    get(m_pFlTextFlow, "textflowL");
+    get(m_pCbTextOverlap, "overlapCB");
+    get(m_pCbTextBreak, "breakCB");
+    get(m_pFlOrient, "labelTextOrient");
+    get(m_pCtrlDial,"dialCtrl");
+    get(m_pFtRotate,"degreeL");
+    get(m_pNfRotate,"OrientDegree");
+    get(m_pCbStacked,"stackedCB");
+    get(m_pFtTextDirection,"textdirL");
+    get(m_pLbTextDirection,"textdirLB");
+    get(m_pFtABCD,"labelABCD");
+    m_pCtrlDial->SetText(m_pFtABCD->GetText());
+    m_pOrientHlp = new svx::OrientationHelper(*m_pCtrlDial, *m_pNfRotate, *m_pCbStacked);
+    m_pOrientHlp->Enable( sal_True );
+
+
+    m_pCbStacked->EnableTriState( sal_False );
+    m_pOrientHlp->AddDependentWindow( *m_pFlOrient );
+    m_pOrientHlp->AddDependentWindow( *m_pFtRotate, STATE_CHECK );
+
+    m_pCbShowDescription->SetClickHdl( LINK( this, SchAxisLabelTabPage, ToggleShowLabel ) );
 
     Construct();
 }
 
 SchAxisLabelTabPage::~SchAxisLabelTabPage()
-{}
+{delete m_pOrientHlp;}
 
 void SchAxisLabelTabPage::Construct()
 {
@@ -98,16 +92,16 @@ SfxTabPage* SchAxisLabelTabPage::Create( Window* pParent, const SfxItemSet& rAtt
 sal_Bool SchAxisLabelTabPage::FillItemSet( SfxItemSet& rOutAttrs )
 {
     bool bStacked = false;
-    if( aOrientHlp.GetStackedState() != STATE_DONTKNOW )
+    if( m_pOrientHlp->GetStackedState() != STATE_DONTKNOW )
     {
-        bStacked = aOrientHlp.GetStackedState() == STATE_CHECK;
+        bStacked = m_pOrientHlp->GetStackedState() == STATE_CHECK;
         if( !m_bHasInitialStacking || (bStacked != m_bInitialStacking) )
             rOutAttrs.Put( SfxBoolItem( SCHATTR_TEXT_STACKED, bStacked ) );
     }
 
-    if( aCtrlDial.HasRotation() )
+    if( m_pCtrlDial->HasRotation() )
     {
-        sal_Int32 nDegrees = bStacked ? 0 : aCtrlDial.GetRotation();
+        sal_Int32 nDegrees = bStacked ? 0 : m_pCtrlDial->GetRotation();
         if( !m_bHasInitialDegrees || (nDegrees != m_nInitialDegrees) )
             rOutAttrs.Put( SfxInt32Item( SCHATTR_TEXT_DEGREES, nDegrees ) );
     }
@@ -117,13 +111,13 @@ sal_Bool SchAxisLabelTabPage::FillItemSet( SfxItemSet& rOutAttrs )
         SvxChartTextOrder eOrder = CHTXTORDER_SIDEBYSIDE;
         bool bRadioButtonChecked = true;
 
-        if( aRbUpDown.IsChecked())
+        if( m_pRbUpDown->IsChecked())
             eOrder = CHTXTORDER_UPDOWN;
-        else if( aRbDownUp.IsChecked())
+        else if( m_pRbDownUp->IsChecked())
             eOrder = CHTXTORDER_DOWNUP;
-        else if( aRbAuto.IsChecked())
+        else if( m_pRbAuto->IsChecked())
             eOrder = CHTXTORDER_AUTO;
-        else if( aRbSideBySide.IsChecked())
+        else if( m_pRbSideBySide->IsChecked())
             eOrder = CHTXTORDER_SIDEBYSIDE;
         else
             bRadioButtonChecked = false;
@@ -132,40 +126,40 @@ sal_Bool SchAxisLabelTabPage::FillItemSet( SfxItemSet& rOutAttrs )
             rOutAttrs.Put( SvxChartTextOrderItem( eOrder, SCHATTR_AXIS_LABEL_ORDER ));
     }
 
-    if( aCbTextOverlap.GetState() != STATE_DONTKNOW )
-        rOutAttrs.Put( SfxBoolItem( SCHATTR_AXIS_LABEL_OVERLAP, aCbTextOverlap.IsChecked() ) );
-    if( aCbTextBreak.GetState() != STATE_DONTKNOW )
-        rOutAttrs.Put( SfxBoolItem( SCHATTR_AXIS_LABEL_BREAK, aCbTextBreak.IsChecked() ) );
-    if( aCbShowDescription.GetState() != STATE_DONTKNOW )
-        rOutAttrs.Put( SfxBoolItem( SCHATTR_AXIS_SHOWDESCR, aCbShowDescription.IsChecked() ) );
+    if( m_pCbTextOverlap->GetState() != STATE_DONTKNOW )
+        rOutAttrs.Put( SfxBoolItem( SCHATTR_AXIS_LABEL_OVERLAP, m_pCbTextOverlap->IsChecked() ) );
+    if( m_pCbTextBreak->GetState() != STATE_DONTKNOW )
+        rOutAttrs.Put( SfxBoolItem( SCHATTR_AXIS_LABEL_BREAK, m_pCbTextBreak->IsChecked() ) );
+    if( m_pCbShowDescription->GetState() != STATE_DONTKNOW )
+        rOutAttrs.Put( SfxBoolItem( SCHATTR_AXIS_SHOWDESCR, m_pCbShowDescription->IsChecked() ) );
 
-    if( m_aLbTextDirection.GetSelectEntryCount() > 0 )
-        rOutAttrs.Put( SfxInt32Item( EE_PARA_WRITINGDIR, m_aLbTextDirection.GetSelectEntryValue() ) );
+    if( m_pLbTextDirection->GetSelectEntryCount() > 0 )
+        rOutAttrs.Put( SfxInt32Item( EE_PARA_WRITINGDIR, m_pLbTextDirection->GetSelectEntryValue() ) );
 
     return sal_True;
 }
 
 void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
 {
-    const SfxPoolItem* pPoolItem = NULL;
+   const SfxPoolItem* pPoolItem = NULL;
 
     // show description
     SfxItemState aState = rInAttrs.GetItemState( SCHATTR_AXIS_SHOWDESCR, sal_False, &pPoolItem );
     if( aState == SFX_ITEM_DONTCARE )
     {
-        aCbShowDescription.EnableTriState( sal_True );
-        aCbShowDescription.SetState( STATE_DONTKNOW );
+        m_pCbShowDescription->EnableTriState( sal_True );
+        m_pCbShowDescription->SetState( STATE_DONTKNOW );
     }
     else
     {
-        aCbShowDescription.EnableTriState( sal_False );
+        m_pCbShowDescription->EnableTriState( sal_False );
         sal_Bool bCheck = sal_False;
         if( aState == SFX_ITEM_SET )
             bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
-        aCbShowDescription.Check( bCheck );
+        m_pCbShowDescription->Check( bCheck );
 
         if( ( aState & SFX_ITEM_DEFAULT ) == 0 )
-            aCbShowDescription.Hide();
+            m_pCbShowDescription->Hide();
     }
 
     // Rotation as orient item or in degrees ----------
@@ -178,9 +172,9 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
 
     m_bHasInitialDegrees = aState != SFX_ITEM_DONTCARE;
     if( m_bHasInitialDegrees )
-        aCtrlDial.SetRotation( m_nInitialDegrees );
+        m_pCtrlDial->SetRotation( m_nInitialDegrees );
     else
-        aCtrlDial.SetNoRotation();
+        m_pCtrlDial->SetNoRotation();
 
     // check stacked item
     m_bInitialStacking = false;
@@ -190,52 +184,52 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
 
     m_bHasInitialStacking = aState != SFX_ITEM_DONTCARE;
     if( m_bHasInitialDegrees )
-        aOrientHlp.SetStackedState( m_bInitialStacking ? STATE_CHECK : STATE_NOCHECK );
+        m_pOrientHlp->SetStackedState( m_bInitialStacking ? STATE_CHECK : STATE_NOCHECK );
     else
-        aOrientHlp.SetStackedState( STATE_DONTKNOW );
+        m_pOrientHlp->SetStackedState( STATE_DONTKNOW );
 
     if( rInAttrs.GetItemState( EE_PARA_WRITINGDIR, sal_True, &pPoolItem ) == SFX_ITEM_SET )
-        m_aLbTextDirection.SelectEntryValue( SvxFrameDirection(((const SvxFrameDirectionItem*)pPoolItem)->GetValue()) );
+        m_pLbTextDirection->SelectEntryValue( SvxFrameDirection(((const SvxFrameDirectionItem*)pPoolItem)->GetValue()) );
 
     // Text overlap ----------
     aState = rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_OVERLAP, sal_False, &pPoolItem );
     if( aState == SFX_ITEM_DONTCARE )
     {
-        aCbTextOverlap.EnableTriState( sal_True );
-        aCbTextOverlap.SetState( STATE_DONTKNOW );
+        m_pCbTextOverlap->EnableTriState( sal_True );
+        m_pCbTextOverlap->SetState( STATE_DONTKNOW );
     }
     else
     {
-        aCbTextOverlap.EnableTriState( sal_False );
+        m_pCbTextOverlap->EnableTriState( sal_False );
         sal_Bool bCheck = sal_False;
         if( aState == SFX_ITEM_SET )
             bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
-        aCbTextOverlap.Check( bCheck );
+        m_pCbTextOverlap->Check( bCheck );
 
         if( ( aState & SFX_ITEM_DEFAULT ) == 0 )
-            aCbTextOverlap.Hide();
+            m_pCbTextOverlap->Hide();
     }
 
     // text break ----------
     aState = rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_BREAK, sal_False, &pPoolItem );
     if( aState == SFX_ITEM_DONTCARE )
     {
-        aCbTextBreak.EnableTriState( sal_True );
-        aCbTextBreak.SetState( STATE_DONTKNOW );
+        m_pCbTextBreak->EnableTriState( sal_True );
+        m_pCbTextBreak->SetState( STATE_DONTKNOW );
     }
     else
     {
-        aCbTextBreak.EnableTriState( sal_False );
+        m_pCbTextBreak->EnableTriState( sal_False );
         sal_Bool bCheck = sal_False;
         if( aState == SFX_ITEM_SET )
             bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
-        aCbTextBreak.Check( bCheck );
+        m_pCbTextBreak->Check( bCheck );
 
         if( ( aState & SFX_ITEM_DEFAULT ) == 0 )
         {
-            aCbTextBreak.Hide();
-            if( ! aCbTextOverlap.IsVisible() )
-                aFlTextFlow.Hide();
+            m_pCbTextBreak->Hide();
+            if( ! m_pCbTextOverlap->IsVisible() )
+                m_pFlTextFlow->Hide();
         }
     }
 
@@ -250,16 +244,16 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
             switch( eOrder )
             {
                 case CHTXTORDER_SIDEBYSIDE:
-                    aRbSideBySide.Check();
+                    m_pRbSideBySide->Check();
                     break;
                 case CHTXTORDER_UPDOWN:
-                    aRbUpDown.Check();
+                    m_pRbUpDown->Check();
                     break;
                 case CHTXTORDER_DOWNUP:
-                    aRbDownUp.Check();
+                    m_pRbDownUp->Check();
                     break;
                 case CHTXTORDER_AUTO:
-                    aRbAuto.Check();
+                    m_pRbAuto->Check();
                     break;
             }
         }
@@ -274,11 +268,11 @@ void SchAxisLabelTabPage::ShowStaggeringControls( sal_Bool bShowStaggeringContro
 
     if( !m_bShowStaggeringControls )
     {
-        aRbSideBySide.Hide();
-        aRbUpDown.Hide();
-        aRbDownUp.Hide();
-        aRbAuto.Hide();
-        aFlOrder.Hide();
+        m_pRbSideBySide->Hide();
+        m_pRbUpDown->Hide();
+        m_pRbDownUp->Hide();
+        m_pRbAuto->Hide();
+        m_pFlOrder->Hide();
     }
 }
 
@@ -291,21 +285,21 @@ void SchAxisLabelTabPage::SetComplexCategories( bool bComplexCategories )
 
 IMPL_LINK_NOARG(SchAxisLabelTabPage, ToggleShowLabel)
 {
-    sal_Bool bEnable = ( aCbShowDescription.GetState() != STATE_NOCHECK );
+    sal_Bool bEnable = ( m_pCbShowDescription->GetState() != STATE_NOCHECK );
 
-    aOrientHlp.Enable( bEnable );
-    aFlOrder.Enable( bEnable );
-    aRbSideBySide.Enable( bEnable );
-    aRbUpDown.Enable( bEnable );
-    aRbDownUp.Enable( bEnable );
-    aRbAuto.Enable( bEnable );
+    m_pOrientHlp->Enable( bEnable );
+    m_pFlOrder->Enable( bEnable );
+    m_pRbSideBySide->Enable( bEnable );
+    m_pRbUpDown->Enable( bEnable );
+    m_pRbDownUp->Enable( bEnable );
+    m_pRbAuto->Enable( bEnable );
 
-    aFlTextFlow.Enable( bEnable );
-    aCbTextOverlap.Enable( bEnable && !m_bComplexCategories );
-    aCbTextBreak.Enable( bEnable );
+    m_pFlTextFlow->Enable( bEnable );
+    m_pCbTextOverlap->Enable( bEnable && !m_bComplexCategories );
+    m_pCbTextBreak->Enable( bEnable );
 
-    m_aFtTextDirection.Enable( bEnable );
-    m_aLbTextDirection.Enable( bEnable );
+    m_pFtTextDirection->Enable( bEnable );
+    m_pLbTextDirection->Enable( bEnable );
 
     return 0L;
 }
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index 6d505bfc0645..b30fb7cf9d14 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -36,28 +36,27 @@ namespace chart
 class SchAxisLabelTabPage : public SfxTabPage
 {
 private:
-    CheckBox            aCbShowDescription;
-
-    FixedLine           aFlOrder;
-    RadioButton         aRbSideBySide;
-    RadioButton         aRbUpDown;
-    RadioButton         aRbDownUp;
-    RadioButton         aRbAuto;
-
-    FixedLine           aFlSeparator;
-    FixedLine           aFlTextFlow;
-    CheckBox            aCbTextOverlap;
-    CheckBox            aCbTextBreak;
-
-    FixedLine           aFlOrient;
-    svx::DialControl    aCtrlDial;
-    FixedText           aFtRotate;
-    svx::WrapField      aNfRotate;
-    TriStateBox         aCbStacked;
-    svx::OrientationHelper aOrientHlp;
-
-    FixedText               m_aFtTextDirection;
-    TextDirectionListBox    m_aLbTextDirection;
+    CheckBox*            m_pCbShowDescription;
+
+    FixedText*           m_pFlOrder;
+    RadioButton*         m_pRbSideBySide;
+    RadioButton*         m_pRbUpDown;
+    RadioButton*         m_pRbDownUp;
+    RadioButton*         m_pRbAuto;
+
+    FixedText*          m_pFlTextFlow;
+    CheckBox*            m_pCbTextOverlap;
+    CheckBox*            m_pCbTextBreak;
+    FixedText*               m_pFtABCD;
+    FixedText*           m_pFlOrient;
+    svx::DialControl*    m_pCtrlDial;
+    FixedText*           m_pFtRotate;
+    svx::WrapField*      m_pNfRotate;
+    TriStateBox*         m_pCbStacked;
+    svx::OrientationHelper* m_pOrientHlp;
+
+    FixedText*               m_pFtTextDirection;
+    TextDirectionListBox*    m_pLbTextDirection;
 
     sal_Bool                m_bShowStaggeringControls;
 
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.src b/chart2/source/controller/dialogs/tp_AxisLabel.src
index 55065955b469..e69de29bb2d1 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.src
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.src
@@ -1,187 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include "HelpIds.hrc"
-#include "TabPages.hrc"
-
-TabPage TP_AXIS_LABEL
-{
-    HelpID  = HID_SCH_TP_AXIS_LABEL;
-    Size    = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    Hide    = TRUE;
-
-    CheckBox CB_AXIS_LABEL_SCHOW_DESCR
-    {
-        HelpID = "chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_SCHOW_DESCR";
-        Pos = MAP_APPFONT ( 6 , 6  ) ;
-        Size    = MAP_APPFONT ( 248 , 12 ) ;
-
-        Text [ en-US ] = "Sho~w labels";
-    };
-
-    FixedLine FL_AXIS_LABEL_ORIENTATION
-    {
-        Pos = MAP_APPFONT ( 6 , 91  ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-
-        Text [ en-US ] = "Text orientation" ;
-    };
-        Control CT_AXIS_LABEL_DIAL
-        {
-            HelpId  = HID_SCH_ALIGNMENT_CTR_DIAL ;
-            Pos     = MAP_APPFONT ( 12 , 105  ) ;
-            Size    = MAP_APPFONT ( 43 , 43 ) ;
-            Text    = "ABCD" ;
-        };
-        TriStateBox PB_AXIS_LABEL_TEXTSTACKED
-        {
-            HelpId  = HID_SCH_ALIGNMENT_STACKED ;
-            Pos     = MAP_APPFONT ( 139 , 105  ) ;
-            Size    = MAP_APPFONT ( 115 , 10 ) ;
-            TabStop = TRUE ;
-            Text [ en-US ] = "Ve~rtically stacked";
-        };
-        FixedText FT_AXIS_LABEL_DEGREES
-        {
-            Pos = MAP_APPFONT ( 93 , 122  ) ;
-            Size = MAP_APPFONT ( 60 , 8 ) ;
-            Text [ en-US ] = "~Degrees" ;
-    };
-    NumericField NF_AXIS_LABEL_ORIENT
-    {
-        HelpId = HID_SCH_ALIGNMENT_DEGREES ;
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 61 , 120  ) ;
-        Size = MAP_APPFONT ( 28 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        StrictFormat = TRUE ;
-        SpinSize = 5 ;
-        Minimum = 0 ;
-        Maximum = 359 ;
-    };
-    FixedText FT_UNUSED
-    {
-        //only necessary for constructor of SvxWinOrientation
-        Hide = TRUE ;
-        Pos = MAP_APPFONT ( 204 , 117  ) ;
-        Size = MAP_APPFONT ( 50 , 10 ) ;
-    };
-    Control CT_UNUSED
-    {
-        //only necessary for constructor of SvxWinOrientation
-        Hide    = TRUE ;
-        Pos = MAP_APPFONT ( 204 , 133  ) ;
-        Size    = MAP_APPFONT ( 50 , 15 ) ;
-    };
-    FixedLine FL_SEPARATOR
-    {
-        Pos = MAP_APPFONT ( 128 , 33  ) ;
-        Size = MAP_APPFONT ( 4 , 52 ) ;
-    };
-
-    FixedLine FL_AXIS_LABEL_TEXTFLOW
-    {
-        Pos = MAP_APPFONT ( 133 , 22  ) ;
-        Size    = MAP_APPFONT ( 121 , 8 ) ;
-
-        Text [ en-US ] = "Text flow" ;
-    };
-        CheckBox CB_AXIS_LABEL_TEXTOVERLAP
-        {
-            HelpID = "chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_TEXTOVERLAP";
-            Pos = MAP_APPFONT ( 139 , 33  ) ;
-            Size = MAP_APPFONT ( 115 , 10 ) ;
-            TabStop = TRUE ;
-
-            Text [ en-US ] = "O~verlap" ;
-    };
-        CheckBox CB_AXIS_LABEL_TEXTBREAK
-        {
-            HelpID = "chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_TEXTBREAK";
-            Pos = MAP_APPFONT ( 139 , 47  ) ;
-            Size = MAP_APPFONT ( 115 , 10 ) ;
-            TabStop = TRUE ;
-
-            Text [ en-US ] = "~Break" ;
-    };
-
-
-    FixedLine FL_AXIS_LABEL_ORDER
-    {
-        Pos = MAP_APPFONT ( 6 , 22  ) ;
-        Size = MAP_APPFONT ( 121 , 8 ) ;
-
-        Text [ en-US ] = "Order" ;
-    };
-        RadioButton RB_AXIS_LABEL_SIDEBYSIDE
-        {
-            HelpID = "chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_SIDEBYSIDE";
-            Pos = MAP_APPFONT ( 12 , 33  ) ;
-            Size = MAP_APPFONT ( 112 , 10 ) ;
-            TabStop = TRUE ;
-
-            Text [ en-US ] = "~Tile" ;
-    };
-        RadioButton RB_AXIS_LABEL_UPDOWN
-        {
-            HelpID = "chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_UPDOWN";
-            Pos = MAP_APPFONT ( 12 , 47  ) ;
-            Size = MAP_APPFONT ( 112 , 10 ) ;
-            TabStop = TRUE ;
-
-            Text [ en-US ] = "St~agger odd" ;
-    };
-        RadioButton RB_AXIS_LABEL_DOWNUP
-        {
-            HelpID = "chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_DOWNUP";
-            Pos = MAP_APPFONT ( 12 , 61  ) ;
-            Size = MAP_APPFONT ( 112 , 10 ) ;
-            TabStop = TRUE ;
-
-            Text [ en-US ] = "Stagger ~even" ;
-    };
-        RadioButton RB_AXIS_LABEL_AUTOORDER
-        {
-            HelpID = "chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_AUTOORDER";
-            Pos = MAP_APPFONT ( 12 , 75  ) ;
-            Size = MAP_APPFONT ( 112 , 10 ) ;
-            TabStop = TRUE ;
-
-            Text [ en-US ] = "A~utomatic" ;
-    };
-
-    FixedText FT_AXIS_TEXTDIR
-    {
-        Pos = MAP_APPFONT ( 12 , 156 ) ;
-        Size = MAP_APPFONT ( 64 , 8 ) ;
-        Text [ en-US ] = "Te~xt direction" ;
-    };
-    ListBox LB_AXIS_TEXTDIR
-    {
-        HelpID = "chart2:ListBox:TP_AXIS_LABEL:LB_AXIS_TEXTDIR";
-        Pos = MAP_APPFONT ( 78 , 154 ) ;
-        Size = MAP_APPFONT ( 170 , 100 ) ;
-        Border = TRUE;
-        TabStop = TRUE;
-        DropDown = TRUE;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/uiconfig/ui/tp_axisLabel.ui b/chart2/uiconfig/ui/tp_axisLabel.ui
new file mode 100644
index 000000000000..2f63f76f7ee0
--- /dev/null
+++ b/chart2/uiconfig/ui/tp_axisLabel.ui
@@ -0,0 +1,425 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkBox" id="AxisLabelTabPage">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="orientation">vertical</property>
+    <property name="hexpand">True</property>
+    <property name="vexpand">True</property>
+    <property name="border_width">6</property>
+    <property name="spacing">12</property>
+    <child>
+      <object class="GtkCheckButton" id="showlabelsCB">
+        <property name="label" translatable="yes">Sho_w labels</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">False</property>
+        <property name="use_action_appearance">False</property>
+        <property name="use_underline">True</property>
+        <property name="xalign">0</property>
+        <property name="active">True</property>
+        <property name="draw_indicator">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkBox" id="box2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkFrame" id="frame1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <object class="GtkAlignment" id="alignment1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="left_padding">12</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="top_padding">6</property>
+                <child>
+                  <object class="GtkBox" id="box3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkRadioButton" id="tile">
+                        <property name="label" translatable="yes">_Tile</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">odd</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="odd">
+                        <property name="label" translatable="yes">St_agger odd</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">even</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="even">
+                        <property name="label" translatable="yes">Stagger _even</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">auto</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="auto">
+                        <property name="label" translatable="yes">A_utomatic</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">tile</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="orderL">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Order</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkFrame" id="frame2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <object class="GtkAlignment" id="alignment2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="left_padding">12</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="top_padding">6</property>
+                <child>
+                  <object class="GtkBox" id="box4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkCheckButton" id="overlapCB">
+                        <property name="label" translatable="yes">O_verlap</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="breakCB">
+                        <property name="label" translatable="yes">_Break</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="textflowL">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Text flow</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+     <object class="GtkFrame" id="TitleRotationTabPage">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="hexpand">True</property>
+    <property name="border_width">6</property>
+    <property name="label_xalign">0</property>
+    <property name="shadow_type">none</property>
+    <child>
+      <object class="GtkAlignment" id="alignment5">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="top_padding">6</property>
+        <property name="left_padding">12</property>
+        <child>
+          <object class="GtkGrid" id="grid10">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="row_spacing">6</property>
+            <property name="column_spacing">12</property>
+            <child>
+              <object class="GtkGrid" id="grid3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">12</property>
+                <child>
+                  <object class="svxlo-WrapField" id="OrientDegree">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="margin_top">40</property>
+                    <property name="invisible_char">•</property>
+                    <property name="invisible_char_set">True</property>
+                    <property name="progress_pulse_step">1</property>
+                    <property name="adjustment">adjustmentSpinDegrees</property>
+                    <property name="wrap">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="degreeL">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_top">40</property>
+                    <property name="label" translatable="yes">_Degrees</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">2</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="svxlo-DialControl" id="dialCtrl">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="active">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkGrid" id="grid4">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">12</property>
+                <child>
+                  <object class="GtkCheckButton" id="stackedCB">
+                    <property name="label" translatable="yes">Ve_rtically stacked</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0.019999999552965164</property>
+                    <property name="inconsistent">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="labelABCD">
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">ABCD</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="textdirL">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Te_xt direction:</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="chartcontrollerlo-TextDirectionListBox" id="textdirLB">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+                <property name="width">2</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child type="label">
+      <object class="GtkLabel" id="labelTextOrient">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Text orientation</property>
+        <attributes>
+          <attribute name="weight" value="bold"/>
+        </attributes>
+      </object>
+    </child>
+  </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+  </object>
+<object class="GtkAdjustment" id="adjustmentSpinDegrees">
+    <property name="upper">359</property>
+    <property name="step_increment">5</property>
+  </object>
+</interface>