summaryrefslogtreecommitdiff
path: root/chart2/source/controller/dialogs/tp_RangeChooser.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'chart2/source/controller/dialogs/tp_RangeChooser.cxx')
-rw-r--r--chart2/source/controller/dialogs/tp_RangeChooser.cxx65
1 files changed, 27 insertions, 38 deletions
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index c11c9eee8d8a..4977569e2c13 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -20,12 +20,13 @@
#include "tp_RangeChooser.hxx"
#include <DataSourceHelper.hxx>
#include <ChartTypeTemplateProvider.hxx>
+#include <ChartTypeTemplate.hxx>
#include "DialogModel.hxx"
#include <RangeSelectionHelper.hxx>
#include <TabPageNotifiable.hxx>
#include <com/sun/star/beans/PropertyState.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <svtools/miscopt.hxx>
+#include <officecfg/Office/Common.hxx>
#include <osl/diagnose.h>
namespace
@@ -40,15 +41,6 @@ namespace
}
}
- void lcl_enableRangeChoosing(bool bEnable, weld::DialogController* pDialog)
- {
- if (!pDialog)
- return;
- weld::Dialog* pDlg = pDialog->getDialog();
- pDlg->set_modal(!bEnable);
- pDlg->set_visible(!bEnable);
- }
-
} // anonymous namespace
namespace chart
@@ -61,28 +53,26 @@ using ::com::sun::star::uno::Sequence;
RangeChooserTabPage::RangeChooserTabPage(weld::Container* pPage, weld::DialogController* pController, DialogModel & rDialogModel,
ChartTypeTemplateProvider* pTemplateProvider,
bool bHideDescription /* = false */)
- : OWizardPage(pPage, pController, "modules/schart/ui/tp_RangeChooser.ui", "tp_RangeChooser")
+ : OWizardPage(pPage, pController, u"modules/schart/ui/tp_RangeChooser.ui"_ustr, u"tp_RangeChooser"_ustr)
, m_nChangingControlCalls(0)
, m_bIsDirty(false)
- , m_aLastValidRangeString()
, m_pTemplateProvider(pTemplateProvider)
, m_rDialogModel( rDialogModel )
, m_pTabPageNotifiable(dynamic_cast<TabPageNotifiable*>(pController))
- , m_xFT_Caption(m_xBuilder->weld_label("FT_CAPTION_FOR_WIZARD"))
- , m_xFT_Range(m_xBuilder->weld_label("FT_RANGE"))
- , m_xED_Range(m_xBuilder->weld_entry("ED_RANGE"))
- , m_xIB_Range(m_xBuilder->weld_button("IB_RANGE"))
- , m_xRB_Rows(m_xBuilder->weld_radio_button("RB_DATAROWS"))
- , m_xRB_Columns(m_xBuilder->weld_radio_button("RB_DATACOLS"))
- , m_xCB_FirstRowAsLabel(m_xBuilder->weld_check_button("CB_FIRST_ROW_ASLABELS"))
- , m_xCB_FirstColumnAsLabel(m_xBuilder->weld_check_button("CB_FIRST_COLUMN_ASLABELS"))
- , m_xFTTitle(m_xBuilder->weld_label("STR_PAGE_DATA_RANGE"))
- , m_xFL_TimeBased(m_xBuilder->weld_widget("separator1"))
- , m_xCB_TimeBased(m_xBuilder->weld_check_button("CB_TIME_BASED"))
- , m_xFT_TimeStart(m_xBuilder->weld_label("label1"))
- , m_xEd_TimeStart(m_xBuilder->weld_entry("ED_TIME_BASED_START"))
- , m_xFT_TimeEnd(m_xBuilder->weld_label("label2"))
- , m_xEd_TimeEnd(m_xBuilder->weld_entry("ED_TIME_BASED_END"))
+ , m_xFT_Caption(m_xBuilder->weld_label(u"FT_CAPTION_FOR_WIZARD"_ustr))
+ , m_xED_Range(m_xBuilder->weld_entry(u"ED_RANGE"_ustr))
+ , m_xIB_Range(m_xBuilder->weld_button(u"IB_RANGE"_ustr))
+ , m_xRB_Rows(m_xBuilder->weld_radio_button(u"RB_DATAROWS"_ustr))
+ , m_xRB_Columns(m_xBuilder->weld_radio_button(u"RB_DATACOLS"_ustr))
+ , m_xCB_FirstRowAsLabel(m_xBuilder->weld_check_button(u"CB_FIRST_ROW_ASLABELS"_ustr))
+ , m_xCB_FirstColumnAsLabel(m_xBuilder->weld_check_button(u"CB_FIRST_COLUMN_ASLABELS"_ustr))
+ , m_xFTTitle(m_xBuilder->weld_label(u"STR_PAGE_DATA_RANGE"_ustr))
+ , m_xFL_TimeBased(m_xBuilder->weld_widget(u"separator1"_ustr))
+ , m_xCB_TimeBased(m_xBuilder->weld_check_button(u"CB_TIME_BASED"_ustr))
+ , m_xFT_TimeStart(m_xBuilder->weld_label(u"label1"_ustr))
+ , m_xEd_TimeStart(m_xBuilder->weld_entry(u"ED_TIME_BASED_START"_ustr))
+ , m_xFT_TimeEnd(m_xBuilder->weld_label(u"label2"_ustr))
+ , m_xEd_TimeEnd(m_xBuilder->weld_entry(u"ED_TIME_BASED_END"_ustr))
{
m_xFT_Caption->set_visible(!bHideDescription);
@@ -109,8 +99,7 @@ RangeChooserTabPage::RangeChooserTabPage(weld::Container* pPage, weld::DialogCon
m_xEd_TimeStart->connect_changed( LINK( this, RangeChooserTabPage, ControlChangedHdl ) );
m_xEd_TimeEnd->connect_changed( LINK( this, RangeChooserTabPage, ControlChangedHdl ) );
- SvtMiscOptions aOpts;
- if ( !aOpts.IsExperimentalMode() )
+ if ( !officecfg::Office::Common::Misc::ExperimentalMode::get() )
{
m_xFL_TimeBased->hide();
m_xCB_TimeBased->hide();
@@ -193,7 +182,7 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls()
if( !m_xCurrentChartTypeTemplate.is() )
{
if(m_pTemplateProvider)
- m_xCurrentChartTypeTemplate.set( m_pTemplateProvider->getCurrentTemplate());
+ m_xCurrentChartTypeTemplate = m_pTemplateProvider->getCurrentTemplate();
if( !m_xCurrentChartTypeTemplate.is())
{
OSL_FAIL( "Need a template to change data source" );
@@ -217,8 +206,8 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls()
if(bTimeBased)
{
aArguments.realloc( aArguments.getLength() + 1 );
- aArguments[aArguments.getLength() - 1] =
- beans::PropertyValue( "TimeBased", -1, uno::Any(bTimeBased),
+ aArguments.getArray()[aArguments.getLength() - 1] =
+ beans::PropertyValue( u"TimeBased"_ustr, -1, uno::Any(bTimeBased),
beans::PropertyState_DIRECT_VALUE );
}
@@ -228,8 +217,8 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls()
m_rDialogModel.setTemplate( m_xCurrentChartTypeTemplate );
aArguments.realloc( aArguments.getLength() + 1 );
- aArguments[aArguments.getLength() - 1] =
- beans::PropertyValue( "CellRangeRepresentation" , -1,
+ aArguments.getArray()[aArguments.getLength() - 1] =
+ beans::PropertyValue( u"CellRangeRepresentation"_ustr , -1,
uno::Any( m_aLastValidRangeString ),
beans::PropertyState_DIRECT_VALUE );
m_rDialogModel.setData( aArguments );
@@ -317,12 +306,12 @@ IMPL_LINK_NOARG(RangeChooserTabPage, ControlEditedHdl, weld::Entry&, void)
isValid();
}
-IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedRadioHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedRadioHdl, weld::Toggleable&, void)
{
ControlChangedHdl(*m_xED_Range);
}
-IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedCheckBoxHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedCheckBoxHdl, weld::Toggleable&, void)
{
ControlChangedHdl(*m_xED_Range);
}
@@ -339,7 +328,7 @@ IMPL_LINK_NOARG(RangeChooserTabPage, ChooseRangeHdl, weld::Button&, void)
OUString aRange = m_xED_Range->get_text();
OUString aTitle = m_xFTTitle->get_label();
- lcl_enableRangeChoosing(true, m_pDialogController);
+ enableRangeChoosing(true, m_pDialogController);
m_rDialogModel.getRangeSelectionHelper()->chooseRange( aRange, aTitle, *this );
}
@@ -363,7 +352,7 @@ void RangeChooserTabPage::listeningFinished( const OUString & rNewRange )
if( isValid())
changeDialogModelAccordingToControls();
- lcl_enableRangeChoosing(false, m_pDialogController);
+ enableRangeChoosing(false, m_pDialogController);
}
void RangeChooserTabPage::disposingRangeSelection()
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-10 04:26:02 +0000