Convert chart range chooser tab page to .ui

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

8 files changed, 284 insertions, 256 deletions

diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk
index ccd1fb3e05dc..56655c3743f1 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\
     chart2/source/controller/dialogs/Strings_Statistic.src \
     chart2/source/controller/dialogs/tp_ChartType.src \
     chart2/source/controller/dialogs/tp_DataSource.src \
-    chart2/source/controller/dialogs/tp_RangeChooser.src \
 ))
 
 $(eval $(call gb_SrsTarget_add_nonlocalizable_files,chart2/res,\
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index 3606207f51c0..ff06b99a520f 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
 	chart2/uiconfig/ui/tp_ErrorBars \
 	chart2/uiconfig/ui/tp_LegendPosition \
 	chart2/uiconfig/ui/tp_PolarOptions \
+	chart2/uiconfig/ui/tp_RangeChooser \
 	chart2/uiconfig/ui/tp_SeriesToAxis \
 	chart2/uiconfig/ui/tp_Scale \
 	chart2/uiconfig/ui/tp_Trendline \
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 03c369b26a6b..74f8973bff2f 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -160,8 +160,8 @@ DataSourceDialog::DataSourceDialog(
     m_pTabControl->InsertPage( TP_RANGECHOOSER, SCH_RESSTR(STR_PAGE_DATA_RANGE) );
     m_pTabControl->InsertPage( TP_DATA_SOURCE,  SCH_RESSTR(STR_OBJECT_DATASERIES_PLURAL) );
 
-    m_pTabControl->SetTabPage( TP_RANGECHOOSER, m_pRangeChooserTabePage );
     m_pTabControl->SetTabPage( TP_DATA_SOURCE,  m_pDataSourceTabPage );
+    m_pTabControl->SetTabPage( TP_RANGECHOOSER, m_pRangeChooserTabePage );
 
     m_pTabControl->SelectTabPage( m_nLastPageId );
 
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 3514e915a994..d8f8336e1ad3 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "tp_RangeChooser.hxx"
-#include "tp_RangeChooser.hrc"
 #include "Strings.hrc"
 #include "ResId.hxx"
 #include "macros.hxx"
@@ -33,36 +32,25 @@
 
 namespace
 {
-void lcl_ShowChooserButton(
-    ::chart::RangeSelectionButton & rChooserButton,
-    Edit & rEditField,
-    sal_Bool bShow )
-{
-    if( rChooserButton.IsVisible() != bShow )
+    void lcl_ShowChooserButton(
+        PushButton& rChooserButton,
+        bool bShow)
     {
-        rChooserButton.Show( bShow );
-        sal_Int32 nWidthDiff = 10 + 2;
-        if( bShow )
-            nWidthDiff = -nWidthDiff;
-        Size aSize = rChooserButton.PixelToLogic( rEditField.GetSizePixel(), MAP_APPFONT );
-        aSize.setWidth( aSize.getWidth() + nWidthDiff );
-        rEditField.SetSizePixel( rChooserButton.LogicToPixel( aSize, MAP_APPFONT ));
+        if( rChooserButton.IsVisible() != bShow )
+        {
+            rChooserButton.Show( bShow );
+        }
     }
-}
-void lcl_enableRangeChoosing( bool bEnable, Dialog * pDialog )
-{
-    if( pDialog )
+
+    void lcl_enableRangeChoosing( bool bEnable, Dialog * pDialog )
     {
-        pDialog->Show( bEnable ? sal_False : sal_True );
-        pDialog->SetModalInputMode( bEnable ? sal_False : sal_True );
+        if( pDialog )
+        {
+            pDialog->Show( bEnable ? sal_False : sal_True );
+            pDialog->SetModalInputMode( bEnable ? sal_False : sal_True );
+        }
     }
-}
-void lcl_shiftControlY( Control & rControl, long nYOffset )
-{
-    Point aPos( rControl.GetPosPixel());
-    aPos.setY( aPos.getY() + nYOffset );
-    rControl.SetPosPixel( aPos );
-}
+
 } // anonymous namespace
 
 namespace chart
@@ -78,17 +66,9 @@ RangeChooserTabPage::RangeChooserTabPage( Window* pParent
         , ChartTypeTemplateProvider* pTemplateProvider
         , Dialog * pParentDialog
         , bool bHideDescription /* = false */ )
-
-        : OWizardPage( pParent, SchResId(TP_RANGECHOOSER) )
-
-        , m_aFT_Caption( this, SchResId( FT_CAPTION_FOR_WIZARD ) )
-        , m_aFT_Range( this, SchResId( FT_RANGE ) )
-        , m_aED_Range( this, SchResId( ED_RANGE ) )
-        , m_aIB_Range( this, SchResId( IB_RANGE ) )
-        , m_aRB_Rows( this, SchResId( RB_DATAROWS ) )
-        , m_aRB_Columns( this, SchResId( RB_DATACOLS ) )
-        , m_aCB_FirstRowAsLabel( this, SchResId( CB_FIRST_ROW_ASLABELS ) )
-        , m_aCB_FirstColumnAsLabel( this, SchResId( CB_FIRST_COLUMN_ASLABELS ) )
+        : OWizardPage( pParent
+        ,"tp_RangeChooser"
+        ,"modules/schart/ui/tp_RangeChooser.ui")
         , m_nChangingControlCalls(0)
         , m_bIsDirty(false)
         , m_xDataProvider( 0 )
@@ -99,42 +79,24 @@ RangeChooserTabPage::RangeChooserTabPage( Window* pParent
         , m_pParentDialog( pParentDialog )
         , m_pTabPageNotifiable( dynamic_cast< TabPageNotifiable * >( pParentDialog ))
 {
-    FreeResource();
-
-    if( bHideDescription )
-    {
-        // note: the offset should be a negative value for shifting upwards, the
-        // 4 is for the offset difference between a wizard page and a tab-page
-        long nYOffset = - ( m_aFT_Range.GetPosPixel().getY() - m_aFT_Caption.GetPosPixel().getY() + 4 );
-        m_aFT_Caption.Hide();
-
-        // shift all controls by the offset space saved by hiding the caption
-        lcl_shiftControlY( m_aFT_Range, nYOffset );
-        lcl_shiftControlY( m_aED_Range, nYOffset );
-        lcl_shiftControlY( m_aIB_Range, nYOffset );
-        lcl_shiftControlY( m_aRB_Rows, nYOffset );
-        lcl_shiftControlY( m_aRB_Columns, nYOffset );
-        lcl_shiftControlY( m_aCB_FirstRowAsLabel, nYOffset );
-        lcl_shiftControlY( m_aCB_FirstColumnAsLabel, nYOffset );
-    }
-    else
-    {
-        // make font of caption bold
-        Font aFont( m_aFT_Caption.GetControlFont() );
-        aFont.SetWeight( WEIGHT_BOLD );
-        m_aFT_Caption.SetControlFont( aFont );
+    get(m_pFT_Caption, "FT_CAPTION_FOR_WIZARD");
+    get(m_pFT_Range, "FT_RANGE");
+    get(m_pED_Range, "ED_RANGE");
+    get(m_pIB_Range, "IB_RANGE");
+    get(m_pRB_Rows, "RB_DATAROWS");
+    get(m_pRB_Columns, "RB_DATACOLS");
+    get(m_pCB_FirstRowAsLabel, "CB_FIRST_ROW_ASLABELS");
+    get(m_pCB_FirstColumnAsLabel, "CB_FIRST_COLUMN_ASLABELS");
+    get(m_pFTTitle, "STR_PAGE_DATA_RANGE");// OH:remove later with dialog title
 
-        // no mnemonic
-        m_aFT_Caption.SetStyle( m_aFT_Caption.GetStyle() | WB_NOLABEL );
-    }
+    m_pFT_Caption->Show(!bHideDescription);
 
-    this->SetText( SCH_RESSTR(STR_PAGE_DATA_RANGE) );
-    m_aIB_Range.SetQuickHelpText( SCH_RESSTR(STR_TIP_SELECT_RANGE) );
+    this->SetText( m_pFTTitle->GetText());// OH:remove later with dialog
 
     // set defaults as long as DetectArguments does not work
-    m_aRB_Columns.Check();
-    m_aCB_FirstColumnAsLabel.Check();
-    m_aCB_FirstRowAsLabel.Check();
+    m_pRB_Columns->Check();
+    m_pCB_FirstColumnAsLabel->Check();
+    m_pCB_FirstRowAsLabel->Check();
 
     // BM: Note, that the range selection is not available, if there is no view.
     // This happens for charts having their own embedded spreadsheet.  If you
@@ -142,17 +104,16 @@ RangeChooserTabPage::RangeChooserTabPage( Window* pParent
     // page the calc view would be created in this case.  So, I enable the
     // button here, and in the worst case nothing happens when it is pressed.
     // Not nice, but I see no better solution for the moment.
-    m_aIB_Range.SetClickHdl( LINK( this, RangeChooserTabPage, ChooseRangeHdl ));
-    m_aED_Range.SetKeyInputHdl( LINK( this, RangeChooserTabPage, ChooseRangeHdl ));
+    m_pIB_Range->SetClickHdl( LINK( this, RangeChooserTabPage, ChooseRangeHdl ));
 
     // #i75179# enable setting the background to a different color
-    m_aED_Range.SetStyle( m_aED_Range.GetStyle() | WB_FORCECTRLBACKGROUND );
+    m_pED_Range->SetStyle( m_pED_Range->GetStyle() | WB_FORCECTRLBACKGROUND );
 
-    m_aED_Range.SetUpdateDataHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ));
-    m_aED_Range.SetModifyHdl( LINK( this, RangeChooserTabPage, ControlEditedHdl ));
-    m_aRB_Rows.SetToggleHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) );
-    m_aCB_FirstRowAsLabel.SetToggleHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) );
-    m_aCB_FirstColumnAsLabel.SetToggleHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) );
+    m_pED_Range->SetUpdateDataHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ));
+    m_pED_Range->SetModifyHdl( LINK( this, RangeChooserTabPage, ControlEditedHdl ));
+    m_pRB_Rows->SetToggleHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) );
+    m_pCB_FirstRowAsLabel->SetToggleHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) );
+    m_pCB_FirstColumnAsLabel->SetToggleHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) );
 }
 
 RangeChooserTabPage::~RangeChooserTabPage()
@@ -172,24 +133,23 @@ void RangeChooserTabPage::initControlsFromModel()
     if(m_pTemplateProvider)
         m_xCurrentChartTypeTemplate = m_pTemplateProvider->getCurrentTemplate();
 
-    bool bUseColumns = ! m_aRB_Rows.IsChecked();
-    bool bFirstCellAsLabel = bUseColumns ? m_aCB_FirstRowAsLabel.IsChecked() : m_aCB_FirstColumnAsLabel.IsChecked();
-    bool bHasCategories = bUseColumns ? m_aCB_FirstColumnAsLabel.IsChecked() : m_aCB_FirstRowAsLabel.IsChecked();
+    bool bUseColumns = ! m_pRB_Rows->IsChecked();
+    bool bFirstCellAsLabel = bUseColumns ? m_pCB_FirstRowAsLabel->IsChecked() : m_pCB_FirstColumnAsLabel->IsChecked();
+    bool bHasCategories = bUseColumns ? m_pCB_FirstColumnAsLabel->IsChecked() : m_pCB_FirstRowAsLabel->IsChecked();
 
     bool bIsValid = m_rDialogModel.allArgumentsForRectRangeDetected();
     if( bIsValid )
-        m_rDialogModel.detectArguments(
-            m_aLastValidRangeString, bUseColumns, bFirstCellAsLabel, bHasCategories );
+        m_rDialogModel.detectArguments(m_aLastValidRangeString, bUseColumns, bFirstCellAsLabel, bHasCategories );
     else
         m_aLastValidRangeString = "";
 
-    m_aED_Range.SetText( m_aLastValidRangeString );
+    m_pED_Range->SetText( m_aLastValidRangeString );
 
-    m_aRB_Rows.Check( !bUseColumns );
-    m_aRB_Columns.Check(  bUseColumns );
+    m_pRB_Rows->Check( !bUseColumns );
+    m_pRB_Columns->Check(  bUseColumns );
 
-    m_aCB_FirstRowAsLabel.Check( m_aRB_Rows.IsChecked()?bHasCategories:bFirstCellAsLabel  );
-    m_aCB_FirstColumnAsLabel.Check( m_aRB_Columns.IsChecked()?bHasCategories:bFirstCellAsLabel  );
+    m_pCB_FirstRowAsLabel->Check( m_pRB_Rows->IsChecked()?bHasCategories:bFirstCellAsLabel  );
+    m_pCB_FirstColumnAsLabel->Check( m_pRB_Columns->IsChecked()?bHasCategories:bFirstCellAsLabel  );
 
     isValid();
 
@@ -237,17 +197,17 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls()
 
     if( m_bIsDirty )
     {
-        sal_Bool bFirstCellAsLabel = ( m_aCB_FirstColumnAsLabel.IsChecked() && !m_aRB_Columns.IsChecked() )
-            || ( m_aCB_FirstRowAsLabel.IsChecked()    && !m_aRB_Rows.IsChecked() );
-        sal_Bool bHasCategories = ( m_aCB_FirstColumnAsLabel.IsChecked() && m_aRB_Columns.IsChecked() )
-            || ( m_aCB_FirstRowAsLabel.IsChecked()    && m_aRB_Rows.IsChecked() );
+        sal_Bool bFirstCellAsLabel = ( m_pCB_FirstColumnAsLabel->IsChecked() && !m_pRB_Columns->IsChecked() )
+            || ( m_pCB_FirstRowAsLabel->IsChecked()    && !m_pRB_Rows->IsChecked() );
+        sal_Bool bHasCategories = ( m_pCB_FirstColumnAsLabel->IsChecked() && m_pRB_Columns->IsChecked() )
+            || ( m_pCB_FirstRowAsLabel->IsChecked()    && m_pRB_Rows->IsChecked() );
 
         Sequence< beans::PropertyValue > aArguments(
             DataSourceHelper::createArguments(
-                m_aRB_Columns.IsChecked(), bFirstCellAsLabel, bHasCategories ) );
+                m_pRB_Columns->IsChecked(), bFirstCellAsLabel, bHasCategories ) );
 
         // only if range is valid
-        if( m_aLastValidRangeString.equals(m_aED_Range.GetText()))
+        if( m_aLastValidRangeString.equals(m_pED_Range->GetText()))
         {
             m_rDialogModel.setTemplate( m_xCurrentChartTypeTemplate );
             aArguments.realloc( aArguments.getLength() + 1 );
@@ -266,28 +226,28 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls()
 
 bool RangeChooserTabPage::isValid()
 {
-    OUString aRange( m_aED_Range.GetText());
-    sal_Bool bFirstCellAsLabel = ( m_aCB_FirstColumnAsLabel.IsChecked() && !m_aRB_Columns.IsChecked() )
-        || ( m_aCB_FirstRowAsLabel.IsChecked()    && !m_aRB_Rows.IsChecked() );
-    sal_Bool bHasCategories = ( m_aCB_FirstColumnAsLabel.IsChecked() && m_aRB_Columns.IsChecked() )
-        || ( m_aCB_FirstRowAsLabel.IsChecked()    && m_aRB_Rows.IsChecked() );
+    OUString aRange( m_pED_Range->GetText());
+    sal_Bool bFirstCellAsLabel = ( m_pCB_FirstColumnAsLabel->IsChecked() && !m_pRB_Columns->IsChecked() )
+        || ( m_pCB_FirstRowAsLabel->IsChecked()    && !m_pRB_Rows->IsChecked() );
+    sal_Bool bHasCategories = ( m_pCB_FirstColumnAsLabel->IsChecked() && m_pRB_Columns->IsChecked() )
+        || ( m_pCB_FirstRowAsLabel->IsChecked()    && m_pRB_Rows->IsChecked() );
     bool bIsValid = ( aRange.isEmpty() ) ||
         m_rDialogModel.getRangeSelectionHelper()->verifyArguments(
             DataSourceHelper::createArguments(
-                aRange, Sequence< sal_Int32 >(), m_aRB_Columns.IsChecked(), bFirstCellAsLabel, bHasCategories ));
+                aRange, Sequence< sal_Int32 >(), m_pRB_Columns->IsChecked(), bFirstCellAsLabel, bHasCategories ));
 
     if( bIsValid )
     {
-        m_aED_Range.SetControlForeground();
-        m_aED_Range.SetControlBackground();
+        m_pED_Range->SetControlForeground();
+        m_pED_Range->SetControlBackground();
         if( m_pTabPageNotifiable )
             m_pTabPageNotifiable->setValidPage( this );
         m_aLastValidRangeString = aRange;
     }
     else
     {
-        m_aED_Range.SetControlBackground( RANGE_SELECTION_INVALID_RANGE_BACKGROUND_COLOR );
-        m_aED_Range.SetControlForeground( RANGE_SELECTION_INVALID_RANGE_FOREGROUND_COLOR );
+        m_pED_Range->SetControlBackground( RANGE_SELECTION_INVALID_RANGE_BACKGROUND_COLOR );
+        m_pED_Range->SetControlForeground( RANGE_SELECTION_INVALID_RANGE_FOREGROUND_COLOR );
         if( m_pTabPageNotifiable )
             m_pTabPageNotifiable->setInvalidPage( this );
     }
@@ -297,35 +257,36 @@ bool RangeChooserTabPage::isValid()
     // would render it invalid, the button should be disabled
     if( bIsValid )
     {
-        bool bDataInColumns = m_aRB_Columns.IsChecked();
+        bool bDataInColumns = m_pRB_Columns->IsChecked();
         bool bIsSwappedRangeValid = m_rDialogModel.getRangeSelectionHelper()->verifyArguments(
             DataSourceHelper::createArguments(
                 aRange, Sequence< sal_Int32 >(), ! bDataInColumns, bHasCategories, bFirstCellAsLabel ));
-        m_aRB_Rows.Enable( bIsSwappedRangeValid );
-        m_aRB_Columns.Enable( bIsSwappedRangeValid );
+        m_pRB_Rows->Enable( bIsSwappedRangeValid );
+        m_pRB_Columns->Enable( bIsSwappedRangeValid );
 
-        m_aCB_FirstRowAsLabel.Enable(
+        m_pCB_FirstRowAsLabel->Enable(
             m_rDialogModel.getRangeSelectionHelper()->verifyArguments(
                 DataSourceHelper::createArguments(
-                    aRange, Sequence< sal_Int32 >(), m_aRB_Columns.IsChecked(),
+                    aRange, Sequence< sal_Int32 >(), m_pRB_Columns->IsChecked(),
                     bDataInColumns ? ! bFirstCellAsLabel : bFirstCellAsLabel,
                     bDataInColumns ? bHasCategories : ! bHasCategories )));
-        m_aCB_FirstColumnAsLabel.Enable(
+        m_pCB_FirstColumnAsLabel->Enable(
             m_rDialogModel.getRangeSelectionHelper()->verifyArguments(
                 DataSourceHelper::createArguments(
-                    aRange, Sequence< sal_Int32 >(), m_aRB_Columns.IsChecked(),
+                    aRange, Sequence< sal_Int32 >(), m_pRB_Columns->IsChecked(),
                     bDataInColumns ? bFirstCellAsLabel : ! bFirstCellAsLabel,
                     bDataInColumns ? ! bHasCategories : bHasCategories )));
     }
     else
     {
-        m_aRB_Rows.Enable( bIsValid );
-        m_aRB_Columns.Enable( bIsValid );
-        m_aCB_FirstRowAsLabel.Enable( bIsValid );
-        m_aCB_FirstColumnAsLabel.Enable( bIsValid );
+        m_pRB_Rows->Enable( bIsValid );
+        m_pRB_Columns->Enable( bIsValid );
+        m_pCB_FirstRowAsLabel->Enable( bIsValid );
+        m_pCB_FirstColumnAsLabel->Enable( bIsValid );
     }
-    sal_Bool bShowIB = m_rDialogModel.getRangeSelectionHelper()->hasRangeSelection();
-    lcl_ShowChooserButton( m_aIB_Range, m_aED_Range, bShowIB );
+
+    bool bShowIB = m_rDialogModel.getRangeSelectionHelper()->hasRangeSelection();
+    lcl_ShowChooserButton( *m_pIB_Range, bShowIB );
 
     return bIsValid;
 }
@@ -347,9 +308,9 @@ IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedHdl)
 
 IMPL_LINK_NOARG(RangeChooserTabPage, ChooseRangeHdl)
 {
-    OUString aRange = m_aED_Range.GetText();
+    OUString aRange = m_pED_Range->GetText();
     // using assignment for broken gcc 3.3
-    OUString aTitle = SCH_RESSTR( STR_PAGE_DATA_RANGE );
+    OUString aTitle = m_pFTTitle->GetText();
 
     lcl_enableRangeChoosing( true, m_pParentDialog );
     m_rDialogModel.getRangeSelectionHelper()->chooseRange( aRange, aTitle, *this );
@@ -371,8 +332,8 @@ void RangeChooserTabPage::listeningFinished( const OUString & rNewRange )
     //update dialog state
     ToTop();
     GrabFocus();
-    m_aED_Range.SetText( aRange );
-    m_aED_Range.GrabFocus();
+    m_pED_Range->SetText( aRange );
+    m_pED_Range->GrabFocus();
 
     setDirty();
     if( isValid())
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hrc b/chart2/source/controller/dialogs/tp_RangeChooser.hrc
deleted file mode 100644
index b9953bafc62d..000000000000
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hrc
+++ /dev/null
@@ -1,34 +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 "ResourceIds.hrc"
-
-#define FT_CAPTION_FOR_WIZARD 1
-#define FT_RANGE              2
-
-#define RB_DATAROWS           1
-#define RB_DATACOLS           2
-
-#define ED_RANGE              1
-#define IB_RANGE              1
-
-#define CB_FIRST_ROW_ASLABELS       1
-#define CB_FIRST_COLUMN_ASLABELS    2
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index 5d074fc78c38..fd45ed3f635f 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -78,16 +78,17 @@ protected: //methods
 
 protected: //member
 
-    FixedText       m_aFT_Caption;
-    FixedText       m_aFT_Range;
-    RangeEdit       m_aED_Range;
-    RangeSelectionButton     m_aIB_Range;
+    FixedText*       m_pFT_Caption;
+    FixedText*       m_pFT_Range;
+    Edit*            m_pED_Range;
+    PushButton*      m_pIB_Range;
 
-    RadioButton     m_aRB_Rows;
-    RadioButton     m_aRB_Columns;
+    RadioButton*     m_pRB_Rows;
+    RadioButton*     m_pRB_Columns;
 
-    CheckBox        m_aCB_FirstRowAsLabel;
-    CheckBox        m_aCB_FirstColumnAsLabel;
+    CheckBox*        m_pCB_FirstRowAsLabel;
+    CheckBox*        m_pCB_FirstColumnAsLabel;
+    FixedText*       m_pFTTitle;
 
     sal_Int32       m_nChangingControlCalls;
     bool            m_bIsDirty;
@@ -105,6 +106,7 @@ protected: //member
     DialogModel &                                           m_rDialogModel;
     Dialog *                                                m_pParentDialog;
     TabPageNotifiable *                                     m_pTabPageNotifiable;
+
 };
 
 } //namespace chart
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.src b/chart2/source/controller/dialogs/tp_RangeChooser.src
deleted file mode 100644
index 0865c9b42deb..000000000000
--- a/chart2/source/controller/dialogs/tp_RangeChooser.src
+++ /dev/null
@@ -1,91 +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 "tp_RangeChooser.hrc"
-#include "dlg_CreationWizard.hrc"
-#include <svtools/controldims.hrc>
-
-#define MASKCOLOR MaskColor = Color { Red = 0xC000 ; Green = 0xC000 ; Blue = 0xC000 ; }
-
-TabPage TP_RANGECHOOSER
-{
-    HelpID = "chart2:TabPage:TP_RANGECHOOSER";
-    Hide = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 248, 140 ) ;
-
-    FixedText FT_CAPTION_FOR_WIZARD
-    {
-        Pos = MAP_APPFONT ( 5 , 8  ) ;
-        Size = MAP_APPFONT ( 238 , 10 ) ;
-        Text [ en-US ] = "Choose a data range" ;
-    };
-    FixedText FT_RANGE
-    {
-        Pos = MAP_APPFONT ( 6 , 22  ) ;
-        Size = MAP_APPFONT ( 236 , 8 ) ;
-        Text [ en-US ] = "~Data range" ;
-    };
-    Edit ED_RANGE
-    {
-        HelpID = "chart2:Edit:TP_RANGECHOOSER:ED_RANGE";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 32  ) ;
-        Size = MAP_APPFONT ( 220 , 12 ) ;
-    };
-    ImageButton IB_RANGE
-    {
-        HelpID = "chart2:ImageButton:TP_RANGECHOOSER:IB_RANGE";
-        Pos = MAP_APPFONT ( 228 , 31  ) ;
-        Size = MAP_APPFONT ( 14 , 14 ) ;
-        TabStop = FALSE ;
-    };
-    RadioButton RB_DATAROWS
-    {
-        HelpID = "chart2:RadioButton:TP_RANGECHOOSER:RB_DATAROWS";
-        Pos = MAP_APPFONT ( 6 , 52  ) ;
-        Size = MAP_APPFONT ( 236 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Data series in ~rows" ;
-    };
-    RadioButton RB_DATACOLS
-    {
-        HelpID = "chart2:RadioButton:TP_RANGECHOOSER:RB_DATACOLS";
-        Pos = MAP_APPFONT ( 6 , 66  ) ;
-        Size = MAP_APPFONT ( 236 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Data series in ~columns" ;
-    };
-    CheckBox CB_FIRST_ROW_ASLABELS
-    {
-        HelpID = "chart2:CheckBox:TP_RANGECHOOSER:CB_FIRST_ROW_ASLABELS";
-        Pos = MAP_APPFONT ( 6 , 84  ) ;
-        Size = MAP_APPFONT ( 236 , 10 ) ;
-        Text [ en-US ] = "~First row as label" ;
-    };
-    CheckBox CB_FIRST_COLUMN_ASLABELS
-    {
-        HelpID = "chart2:CheckBox:TP_RANGECHOOSER:CB_FIRST_COLUMN_ASLABELS";
-        Pos = MAP_APPFONT ( 6 , 98  ) ;
-        Size = MAP_APPFONT ( 236 , 10 ) ;
-        Text [ en-US ] = "F~irst column as label" ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/uiconfig/ui/tp_RangeChooser.ui b/chart2/uiconfig/ui/tp_RangeChooser.ui
new file mode 100644
index 000000000000..5ef8000c5d5e
--- /dev/null
+++ b/chart2/uiconfig/ui/tp_RangeChooser.ui
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkImage" id="imageIB_RANGE">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="tooltip_markup" translatable="yes">Select data range</property>
+    <property name="pixbuf">chart2/res/selectrange.png</property>
+  </object>
+  <object class="GtkBox" id="tp_RangeChooser">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="spacing">12</property>
+    <child>
+      <object class="GtkAlignment" id="alignment1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="top_padding">6</property>
+        <property name="left_padding">12</property>
+        <child>
+          <object class="GtkBox" id="box1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="border_width">6</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkLabel" id="FT_CAPTION_FOR_WIZARD">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Choose a data range</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </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>
+                <property name="hexpand">True</property>
+                <property name="spacing">12</property>
+                <child>
+                  <object class="GtkLabel" id="FT_RANGE">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">_Data range:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">ED_RANGE</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="ED_RANGE">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="invisible_char">•</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="IB_RANGE">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="receives_default">True</property>
+                    <property name="tooltip_markup" translatable="yes">Select data range</property>
+                    <property name="image">imageIB_RANGE</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioButton" id="RB_DATAROWS">
+                <property name="label" translatable="yes">Data series in _rows</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="receives_default">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">RB_DATACOLS</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioButton" id="RB_DATACOLS">
+                <property name="label" translatable="yes">Data series in _columns</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="receives_default">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">RB_DATAROWS</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="CB_FIRST_ROW_ASLABELS">
+                <property name="label" translatable="yes">_First row as label</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="receives_default">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">5</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="CB_FIRST_COLUMN_ASLABELS">
+                <property name="label" translatable="yes">F_irst column as label</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="receives_default">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">6</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="STR_PAGE_DATA_RANGE">
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Data Range</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">7</property>
+              </packing>
+            </child>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+  </object>
+</interface>