mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

now drop TabPageParent intermediate

Browse Source 
Change-Id: I47328f76342ac023628d9042bdfa8213a1c93d0c
Reviewed-on: https://gerrit.libreoffice.org/79469
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2019-09-24 14:10:48 +01:00
parent a37e559ed1
commit deb37c44ec
395 changed files with 1809 additions and 1875 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chart2/source/controller/dialogs/dlg_ChartType.cxx
View File

@ -33,9 +33,8 @@ ChartTypeDialog::ChartTypeDialog(weld::Window* pParent,
, m_xChartModel(xChartModel)
, m_xContentArea(m_xDialog->weld_content_area())
{
TabPageParent aParent(m_xContentArea.get(), this);
m_xChartTypeTabPage = std::make_unique<ChartTypeTabPage>(
aParent,
m_xContentArea.get(), this,
uno::Reference<XChartDocument>::query(m_xChartModel),
false/*don't show title description*/);

10
chart2/source/controller/dialogs/dlg_CreationWizard.cxx
View File

@ -90,15 +90,13 @@ std::unique_ptr<BuilderPage> CreationWizard::createPage(WizardState nState)
OString sIdent(OString::number(nState));
weld::Container* pPageContainer = m_xAssistant->append_page(sIdent);
// TODO eventually pass DialogController as distinct argument instead of bundling into TabPageParent
TabPageParent aParent(pPageContainer, this);
switch( nState )
{
case STATE_CHARTTYPE:
{
m_aTimerTriggeredControllerLock.startTimer();
xRet = std::make_unique<ChartTypeTabPage>(aParent, m_xChartModel);
xRet = std::make_unique<ChartTypeTabPage>(pPageContainer, this, m_xChartModel);
m_pTemplateProvider = static_cast<ChartTypeTabPage*>(xRet.get());
if (m_pDialogModel)
m_pDialogModel->setTemplate( m_pTemplateProvider->getCurrentTemplate());
@ -107,18 +105,18 @@ std::unique_ptr<BuilderPage> CreationWizard::createPage(WizardState nState)
case STATE_SIMPLE_RANGE:
{
m_aTimerTriggeredControllerLock.startTimer();
xRet = std::make_unique<RangeChooserTabPage>(aParent, *m_pDialogModel, m_pTemplateProvider, this);
xRet = std::make_unique<RangeChooserTabPage>(pPageContainer, this, *m_pDialogModel, m_pTemplateProvider);
break;
}
case STATE_DATA_SERIES:
{
m_aTimerTriggeredControllerLock.startTimer();
xRet = std::make_unique<DataSourceTabPage>(aParent, *m_pDialogModel, m_pTemplateProvider, this);
xRet = std::make_unique<DataSourceTabPage>(pPageContainer, this, *m_pDialogModel, m_pTemplateProvider);
break;
}
case STATE_OBJECTS:
{
xRet = std::make_unique<TitlesAndObjectsTabPage>(aParent, m_xChartModel, m_xComponentContext);
xRet = std::make_unique<TitlesAndObjectsTabPage>(pPageContainer, this, m_xChartModel, m_xComponentContext);
m_aTimerTriggeredControllerLock.startTimer();
break;
}

8
chart2/source/controller/dialogs/dlg_DataSource.cxx
View File

@ -88,11 +88,11 @@ DataSourceDialog::DataSourceDialog(weld::Window * pParent,
, m_xTabControl(m_xBuilder->weld_notebook("notebook"))
, m_xBtnOK(m_xBuilder->weld_button("ok"))
{
TabPageParent aRangeParent(m_xTabControl->get_page("range"), this);
m_xRangeChooserTabPage = std::make_unique<RangeChooserTabPage>(aRangeParent, *(m_apDialogModel.get()),
m_xRangeChooserTabPage = std::make_unique<RangeChooserTabPage>(m_xTabControl->get_page("range"), this,
*(m_apDialogModel.get()),
m_apDocTemplateProvider.get(), true /* bHideDescription */ );
TabPageParent aSeriesParent(m_xTabControl->get_page("series"), this);
m_xDataSourceTabPage = std::make_unique<DataSourceTabPage>(aSeriesParent, *(m_apDialogModel.get()),
m_xDataSourceTabPage = std::make_unique<DataSourceTabPage>(m_xTabControl->get_page("series"), this,
*(m_apDialogModel.get()),
m_apDocTemplateProvider.get(), true /* bHideDescription */ );
m_xTabControl->connect_enter_page(LINK(this, DataSourceDialog, ActivatePageHdl));
m_xTabControl->connect_leave_page(LINK(this, DataSourceDialog, DeactivatePageHdl));

2
chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
View File

@ -42,7 +42,7 @@ InsertErrorBarsDialog::InsertErrorBarsDialog(
ErrorBarResources::tErrorBarType eType /* = ErrorBarResources::ERROR_BAR_Y */ )
: GenericDialogController(pParent, "modules/schart/ui/dlg_InsertErrorBars.ui", "dlg_InsertErrorBars")
, m_apErrorBarResources( new ErrorBarResources(
m_xBuilder.get(), TabPageParent(m_xDialog.get(), nullptr), rMyAttrs,
m_xBuilder.get(), this, rMyAttrs,
/* bNoneAvailable = */ true, eType ))
{
ObjectType objType = eType == ErrorBarResources::ERROR_BAR_Y ? OBJECTTYPE_DATA_ERRORS_Y : OBJECTTYPE_DATA_ERRORS_X;

3
chart2/source/controller/dialogs/dlg_NumberFormat.cxx
View File

@ -36,8 +36,7 @@ NumberFormatDialog::NumberFormatDialog(weld::Window* pParent, SfxItemSet& rSet)
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT );
if (fnCreatePage)
{
TabPageParent pPageParent(get_content_area(), this);
std::unique_ptr<SfxTabPage> xTabPage = (*fnCreatePage)(pPageParent, &rSet);
std::unique_ptr<SfxTabPage> xTabPage = (*fnCreatePage)(get_content_area(), this, &rSet);
xTabPage->PageCreated(rSet);
SetTabPage(std::move(xTabPage));
}

26
chart2/source/controller/dialogs/res_ErrorBar.cxx
View File

@ -23,7 +23,7 @@
#include <helpids.h>
#include <chartview/ChartSfxItemIds.hxx>
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <vcl/dialog.hxx>
#include <vcl/weld.hxx>
#include <rtl/math.hxx>
#include <sal/log.hxx>
@ -40,19 +40,11 @@ using namespace ::com::sun::star;
namespace
{
void lcl_enableRangeChoosing(bool bEnable, TabPageParent pParent)
void lcl_enableRangeChoosing(bool bEnable, weld::DialogController* pController)
{
if (weld::DialogController* pController = pParent.pController)
{
weld::Window* pWeldDialog = pController->getDialog();
pWeldDialog->set_modal(!bEnable);
pWeldDialog->set_visible(!bEnable);
}
else if (::Dialog* pVCLDialog = pParent.pParent ? pParent.pParent->GetParentDialog() : nullptr)
{
pVCLDialog->Show(!bEnable);
pVCLDialog->SetModalInputMode(!bEnable);
}
weld::Window* pWeldDialog = pController->getDialog();
pWeldDialog->set_modal(!bEnable);
pWeldDialog->set_visible(!bEnable);
}
sal_uInt16 lcl_getLbEntryPosByErrorKind( SvxChartKindError eErrorKind )
@ -87,7 +79,7 @@ sal_uInt16 lcl_getLbEntryPosByErrorKind( SvxChartKindError eErrorKind )
namespace chart
{
ErrorBarResources::ErrorBarResources(weld::Builder* pParent, TabPageParent pParentDialog,
ErrorBarResources::ErrorBarResources(weld::Builder* pParent, weld::DialogController* pController,
const SfxItemSet& rInAttrs, bool bNoneAvailable,
tErrorBarType eType /* = ERROR_BAR_Y */ )
: m_eErrorKind( SvxChartKindError::NONE )
@ -101,7 +93,7 @@ ErrorBarResources::ErrorBarResources(weld::Builder* pParent, TabPageParent pPare
, m_nConstSpinSize( 1 )
, m_fPlusValue(0.0)
, m_fMinusValue(0.0)
, m_pParentDialog( pParentDialog )
, m_pController(pController)
, m_pCurrentRangeChoosingField( nullptr )
, m_bHasInternalDataProvider( true )
, m_bEnableDataTableDialog( true )
@ -456,7 +448,7 @@ IMPL_LINK(ErrorBarResources, ChooseRange, weld::Button&, rButton, void)
aUIString = m_xUIStringNeg->get_label();
}
lcl_enableRangeChoosing( true, m_pParentDialog );
lcl_enableRangeChoosing(true, m_pController);
m_apRangeSelectionHelper->chooseRange(
m_pCurrentRangeChoosingField->get_text(),
aUIString, *this );
@ -695,7 +687,7 @@ void ErrorBarResources::listeningFinished(
m_pCurrentRangeChoosingField = nullptr;
UpdateControlStates();
lcl_enableRangeChoosing( false, m_pParentDialog );
lcl_enableRangeChoosing(false, m_pController);
}
void ErrorBarResources::disposingRangeSelection()

8
chart2/source/controller/dialogs/tp_AxisLabel.cxx
View File

@ -30,8 +30,8 @@
namespace chart
{
SchAxisLabelTabPage::SchAxisLabelTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
: SfxTabPage(pParent, "modules/schart/ui/tp_axisLabel.ui", "AxisLabelTabPage", &rInAttrs)
SchAxisLabelTabPage::SchAxisLabelTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
: SfxTabPage(pPage, pController, "modules/schart/ui/tp_axisLabel.ui", "AxisLabelTabPage", &rInAttrs)
, m_bShowStaggeringControls( true )
, m_nInitialDegrees( 0 )
, m_bHasInitialDegrees( true )
@ -73,9 +73,9 @@ SchAxisLabelTabPage::~SchAxisLabelTabPage()
m_xLbTextDirection.reset();
}
std::unique_ptr<SfxTabPage> SchAxisLabelTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrs)
std::unique_ptr<SfxTabPage> SchAxisLabelTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrs)
{
return std::make_unique<SchAxisLabelTabPage>(pParent, *rAttrs);
return std::make_unique<SchAxisLabelTabPage>(pPage, pController, *rAttrs);
}
bool SchAxisLabelTabPage::FillItemSet( SfxItemSet* rOutAttrs )

4
chart2/source/controller/dialogs/tp_AxisLabel.hxx
View File

@ -69,10 +69,10 @@ private:
DECL_LINK(ToggleShowLabel, weld::ToggleButton&, void);
public:
SchAxisLabelTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
SchAxisLabelTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SchAxisLabelTabPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;

8
chart2/source/controller/dialogs/tp_AxisPositions.cxx
View File

@ -31,8 +31,8 @@ using namespace ::com::sun::star;
namespace chart
{
AxisPositionsTabPage::AxisPositionsTabPage(TabPageParent pWindow,const SfxItemSet& rInAttrs)
: SfxTabPage(pWindow ,"modules/schart/ui/tp_AxisPositions.ui" ,"tp_AxisPositions" , &rInAttrs)
AxisPositionsTabPage::AxisPositionsTabPage(weld::Container* pPage, weld::DialogController* pController,const SfxItemSet& rInAttrs)
: SfxTabPage(pPage, pController, "modules/schart/ui/tp_AxisPositions.ui", "tp_AxisPositions", &rInAttrs)
, m_pNumFormatter(nullptr)
, m_bCrossingAxisIsCategoryAxis(false)
, m_aCategories()
@ -65,9 +65,9 @@ AxisPositionsTabPage::~AxisPositionsTabPage()
{
}
std::unique_ptr<SfxTabPage> AxisPositionsTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
std::unique_ptr<SfxTabPage> AxisPositionsTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
return std::make_unique<AxisPositionsTabPage>(pParent, *rOutAttrs);
return std::make_unique<AxisPositionsTabPage>(pPage, pController, *rOutAttrs);
}
bool AxisPositionsTabPage::FillItemSet(SfxItemSet* rOutAttrs)

4
chart2/source/controller/dialogs/tp_AxisPositions.hxx
View File

@ -27,10 +27,10 @@ namespace chart
class AxisPositionsTabPage : public SfxTabPage
{
public:
AxisPositionsTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
AxisPositionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~AxisPositionsTabPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pItemSet ) override;

16
chart2/source/controller/dialogs/tp_ChartType.cxx
View File

@ -398,7 +398,7 @@ void SteppedPropertiesDialog::fillParameter( ChartTypeParameter& rParameter, boo
class SplineResourceGroup : public ChangingResource
{
public:
explicit SplineResourceGroup(weld::Builder* pBuilder, TabPageParent pParent);
explicit SplineResourceGroup(weld::Builder* pBuilder, weld::Window* pParent);
void showControls( bool bShow );
@ -413,7 +413,7 @@ private:
SteppedPropertiesDialog& getSteppedPropertiesDialog();
private:
TabPageParent m_pParent;
weld::Window* m_pParent;
std::unique_ptr<weld::Label> m_xFT_LineType;
std::unique_ptr<weld::ComboBox> m_xLB_LineType;
std::unique_ptr<weld::Button> m_xPB_DetailsDialog;
@ -421,7 +421,7 @@ private:
std::unique_ptr<SteppedPropertiesDialog> m_xSteppedPropertiesDialog;
};
SplineResourceGroup::SplineResourceGroup(weld::Builder* pBuilder, TabPageParent pParent)
SplineResourceGroup::SplineResourceGroup(weld::Builder* pBuilder, weld::Window* pParent)
: ChangingResource()
, m_pParent(pParent)
, m_xFT_LineType(pBuilder->weld_label("linetypeft"))
@ -435,7 +435,7 @@ SplinePropertiesDialog& SplineResourceGroup::getSplinePropertiesDialog()
{
if (!m_xSplinePropertiesDialog)
{
m_xSplinePropertiesDialog.reset(new SplinePropertiesDialog(m_pParent.GetFrameWeld()));
m_xSplinePropertiesDialog.reset(new SplinePropertiesDialog(m_pParent));
}
return *m_xSplinePropertiesDialog;
}
@ -444,7 +444,7 @@ SteppedPropertiesDialog& SplineResourceGroup::getSteppedPropertiesDialog()
{
if (!m_xSteppedPropertiesDialog)
{
m_xSteppedPropertiesDialog.reset(new SteppedPropertiesDialog(m_pParent.GetFrameWeld()));
m_xSteppedPropertiesDialog.reset(new SteppedPropertiesDialog(m_pParent));
}
return *m_xSteppedPropertiesDialog;
}
@ -601,12 +601,12 @@ IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl, weld::TreeView&, void)
m_pChangeListener->stateChanged(this);
}
ChartTypeTabPage::ChartTypeTabPage(TabPageParent pParent , const uno::Reference< XChartDocument >& xChartModel,
ChartTypeTabPage::ChartTypeTabPage(weld::Container* pPage, weld::DialogController* pController, const uno::Reference< XChartDocument >& xChartModel,
bool bShowDescription)
: OWizardPage(pParent, "modules/schart/ui/tp_ChartType.ui", "tp_ChartType")
: OWizardPage(pPage, pController, "modules/schart/ui/tp_ChartType.ui", "tp_ChartType")
, m_pDim3DLookResourceGroup( new Dim3DLookResourceGroup(m_xBuilder.get()) )
, m_pStackingResourceGroup( new StackingResourceGroup(m_xBuilder.get()) )
, m_pSplineResourceGroup( new SplineResourceGroup(m_xBuilder.get(), pParent) )
, m_pSplineResourceGroup( new SplineResourceGroup(m_xBuilder.get(), pController->getDialog()) )
, m_pGeometryResourceGroup( new GeometryResourceGroup(m_xBuilder.get()) )
, m_pSortByXValuesResourceGroup( new SortByXValuesResourceGroup(m_xBuilder.get()) )
, m_xChartModel( xChartModel )

2
chart2/source/controller/dialogs/tp_ChartType.hxx
View File

@ -45,7 +45,7 @@ class SortByXValuesResourceGroup;
class ChartTypeTabPage final : public ResourceChangeListener, public vcl::OWizardPage, public ChartTypeTemplateProvider
{
public:
ChartTypeTabPage( TabPageParent pParent
ChartTypeTabPage( weld::Container* pPage, weld::DialogController* pController
, const css::uno::Reference< css::chart2::XChartDocument >& xChartModel
, bool bShowDescription = true );
virtual ~ChartTypeTabPage() override;

10
chart2/source/controller/dialogs/tp_DataLabel.cxx
View File

@ -22,15 +22,15 @@
namespace chart
{
DataLabelsTabPage::DataLabelsTabPage(TabPageParent pWindow, const SfxItemSet& rInAttrs)
: SfxTabPage(pWindow , "modules/schart/ui/tp_DataLabel.ui", "tp_DataLabel", &rInAttrs)
, m_aDataLabelResources(m_xBuilder.get(), pWindow.GetFrameWeld(), rInAttrs)
DataLabelsTabPage::DataLabelsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
: SfxTabPage(pPage, pController, "modules/schart/ui/tp_DataLabel.ui", "tp_DataLabel", &rInAttrs)
, m_aDataLabelResources(m_xBuilder.get(), pController->getDialog(), rInAttrs)
{
}
std::unique_ptr<SfxTabPage> DataLabelsTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
std::unique_ptr<SfxTabPage> DataLabelsTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
return std::make_unique<DataLabelsTabPage>(pParent, *rOutAttrs);
return std::make_unique<DataLabelsTabPage>(pPage, pController, *rOutAttrs);
}
bool DataLabelsTabPage::FillItemSet(SfxItemSet* rOutAttrs)

4
chart2/source/controller/dialogs/tp_DataLabel.hxx
View File

@ -30,9 +30,9 @@ namespace chart
class DataLabelsTabPage : public SfxTabPage
{
public:
DataLabelsTabPage(TabPageParent pWindow, const SfxItemSet& rInAttrs);
DataLabelsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
static std::unique_ptr<SfxTabPage> Create(TabPageParent pWindow, const SfxItemSet* rInAttrs);
static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs);
void SetNumberFormatter( SvNumberFormatter* pFormatter );

14
chart2/source/controller/dialogs/tp_DataSource.cxx
View File

@ -158,16 +158,16 @@ Reference< chart2::data::XLabeledDataSequence > lcl_findLSequenceWithOnlyLabel(
namespace chart
{
DataSourceTabPage::DataSourceTabPage(TabPageParent pParent, DialogModel & rDialogModel,
DataSourceTabPage::DataSourceTabPage(weld::Container* pPage, weld::DialogController* pController,
DialogModel & rDialogModel,
ChartTypeTemplateProvider* pTemplateProvider,
bool bHideDescription /* = false */)
: ::vcl::OWizardPage(pParent, "modules/schart/ui/tp_DataSource.ui", "tp_DataSource")
: ::vcl::OWizardPage(pPage, pController, "modules/schart/ui/tp_DataSource.ui", "tp_DataSource")
, m_pTemplateProvider(pTemplateProvider)
, m_rDialogModel(rDialogModel)
, m_pCurrentRangeChoosingField( nullptr )
, m_bIsDirty( false )
, m_pParentController(pParent.pController)
, m_pTabPageNotifiable(dynamic_cast<TabPageNotifiable*>(m_pParentController))
, m_pTabPageNotifiable(dynamic_cast<TabPageNotifiable*>(pController))
, m_xFT_CAPTION(m_xBuilder->weld_label("FT_CAPTION_FOR_WIZARD"))
, m_xFT_SERIES(m_xBuilder->weld_label("FT_SERIES"))
, m_xLB_SERIES(m_xBuilder->weld_tree_view("LB_SERIES"))
@ -529,7 +529,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl, weld::Button&, voi
m_xLB_SERIES->get_text(nEntry));
}
lcl_enableRangeChoosing( true, m_pParentController );
lcl_enableRangeChoosing(true, m_pDialogController);
m_rDialogModel.getRangeSelectionHelper()->chooseRange( aSelectedRolesRange, aUIStr, *this );
}
else
@ -545,7 +545,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, CategoriesRangeButtonClickedHdl, weld::Button
return;
OUString aStr(SchResId(m_xFT_CATEGORIES->get_visible() ? STR_DATA_SELECT_RANGE_FOR_CATEGORIES : STR_DATA_SELECT_RANGE_FOR_DATALABELS));
lcl_enableRangeChoosing(true, m_pParentController);
lcl_enableRangeChoosing(true, m_pDialogController);
m_rDialogModel.getRangeSelectionHelper()->chooseRange(
m_rDialogModel.getCategoriesRange(), aStr, *this );
}
@ -723,7 +723,7 @@ void DataSourceTabPage::listeningFinished(
m_pCurrentRangeChoosingField = nullptr;
updateControlState();
lcl_enableRangeChoosing(false, m_pParentController);
lcl_enableRangeChoosing(false, m_pDialogController);
}
void DataSourceTabPage::disposingRangeSelection()

3
chart2/source/controller/dialogs/tp_DataSource.hxx
View File

@ -51,7 +51,7 @@ class DataSourceTabPage final :
public RangeSelectionListenerParent
{
public:
explicit DataSourceTabPage(TabPageParent pParent,
explicit DataSourceTabPage(weld::Container* pPage, weld::DialogController* pController,
DialogModel & rDialogModel,
ChartTypeTemplateProvider* pTemplateProvider,
bool bHideDescription = false);
@ -121,7 +121,6 @@ private:
weld::Entry* m_pCurrentRangeChoosingField;
bool m_bIsDirty;
weld::DialogController* m_pParentController;
TabPageNotifiable * m_pTabPageNotifiable;
std::unique_ptr<weld::Label> m_xFT_CAPTION;

10
chart2/source/controller/dialogs/tp_ErrorBars.cxx
View File

@ -26,15 +26,15 @@ using namespace ::com::sun::star;
namespace chart
{
ErrorBarsTabPage::ErrorBarsTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
: SfxTabPage(pParent, "modules/schart/ui/tp_ErrorBars.ui", "tp_ErrorBars", &rInAttrs)
, m_aErrorBarResources(m_xBuilder.get(), pParent, rInAttrs, /* bNoneAvailable = */ false)
ErrorBarsTabPage::ErrorBarsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
: SfxTabPage(pPage, pController, "modules/schart/ui/tp_ErrorBars.ui", "tp_ErrorBars", &rInAttrs)
, m_aErrorBarResources(m_xBuilder.get(), pController, rInAttrs, /* bNoneAvailable = */ false)
{
}
std::unique_ptr<SfxTabPage> ErrorBarsTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
std::unique_ptr<SfxTabPage> ErrorBarsTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
return std::make_unique<ErrorBarsTabPage>(pParent, *rOutAttrs);
return std::make_unique<ErrorBarsTabPage>(pPage, pController, *rOutAttrs);
}
bool ErrorBarsTabPage::FillItemSet( SfxItemSet* rOutAttrs )

4
chart2/source/controller/dialogs/tp_ErrorBars.hxx
View File

@ -29,14 +29,14 @@ namespace chart
class ErrorBarsTabPage : public SfxTabPage
{
public:
ErrorBarsTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
ErrorBarsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
void SetAxisMinorStepWidthForErrorBarDecimals( double fMinorStepWidth );
void SetErrorBarType( ErrorBarResources::tErrorBarType eNewType );
void SetChartDocumentForRangeChoosing(
const css::uno::Reference< css::chart2::XChartDocument > & xChartDocument );
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;

8
chart2/source/controller/dialogs/tp_LegendPosition.cxx
View File

@ -26,8 +26,8 @@
namespace chart
{
SchLegendPosTabPage::SchLegendPosTabPage(TabPageParent pWindow, const SfxItemSet& rInAttrs)
: SfxTabPage(pWindow, "modules/schart/ui/tp_LegendPosition.ui", "tp_LegendPosition", &rInAttrs)
SchLegendPosTabPage::SchLegendPosTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
: SfxTabPage(pPage, pController, "modules/schart/ui/tp_LegendPosition.ui", "tp_LegendPosition", &rInAttrs)
, m_aLegendPositionResources(*m_xBuilder)
, m_xLbTextDirection(new TextDirectionListBox(m_xBuilder->weld_combo_box("LB_LEGEND_TEXTDIR")))
{
@ -38,9 +38,9 @@ SchLegendPosTabPage::~SchLegendPosTabPage()
m_xLbTextDirection.reset();
}
std::unique_ptr<SfxTabPage> SchLegendPosTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
std::unique_ptr<SfxTabPage> SchLegendPosTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
return std::make_unique<SchLegendPosTabPage>(pParent, *rOutAttrs);
return std::make_unique<SchLegendPosTabPage>(pPage, pController, *rOutAttrs);
}
bool SchLegendPosTabPage::FillItemSet(SfxItemSet* rOutAttrs)

4
chart2/source/controller/dialogs/tp_LegendPosition.hxx
View File

@ -36,10 +36,10 @@ private:
std::unique_ptr<TextDirectionListBox> m_xLbTextDirection;
public:
SchLegendPosTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
SchLegendPosTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SchLegendPosTabPage() override;
static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
virtual void Reset(const SfxItemSet* rInAttrs) override;
};

8
chart2/source/controller/dialogs/tp_PointGeometry.cxx
View File

@ -28,8 +28,8 @@
namespace chart
{
SchLayoutTabPage::SchLayoutTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
: SfxTabPage(pParent, "modules/schart/ui/tp_ChartType.ui", "tp_ChartType", &rInAttrs)
SchLayoutTabPage::SchLayoutTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
: SfxTabPage(pPage, pController, "modules/schart/ui/tp_ChartType.ui", "tp_ChartType", &rInAttrs)
{
m_pGeometryResources.reset(new BarGeometryResources(m_xBuilder.get()));
}
@ -39,9 +39,9 @@ SchLayoutTabPage::~SchLayoutTabPage()
m_pGeometryResources.reset();
}
std::unique_ptr<SfxTabPage> SchLayoutTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
std::unique_ptr<SfxTabPage> SchLayoutTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
return std::make_unique<SchLayoutTabPage>(pParent, *rOutAttrs);
return std::make_unique<SchLayoutTabPage>(pPage, pController, *rOutAttrs);
}
bool SchLayoutTabPage::FillItemSet(SfxItemSet* rOutAttrs)

4
chart2/source/controller/dialogs/tp_PointGeometry.hxx
View File

@ -28,10 +28,10 @@ class BarGeometryResources;
class SchLayoutTabPage : public SfxTabPage
{
public:
SchLayoutTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
SchLayoutTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SchLayoutTabPage() override;
static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
virtual void Reset(const SfxItemSet* rInAttrs) override;

8
chart2/source/controller/dialogs/tp_PolarOptions.cxx
View File

@ -26,8 +26,8 @@
namespace chart
{
PolarOptionsTabPage::PolarOptionsTabPage(TabPageParent pWindow, const SfxItemSet& rInAttrs)
: SfxTabPage(pWindow, "modules/schart/ui/tp_PolarOptions.ui", "tp_PolarOptions", &rInAttrs)
PolarOptionsTabPage::PolarOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
: SfxTabPage(pPage, pController, "modules/schart/ui/tp_PolarOptions.ui", "tp_PolarOptions", &rInAttrs)
, m_xCB_Clockwise(m_xBuilder->weld_check_button("CB_CLOCKWISE"))
, m_xFL_StartingAngle(m_xBuilder->weld_frame("frameANGLE"))
, m_xNF_StartingAngle(m_xBuilder->weld_spin_button("NF_STARTING_ANGLE"))
@ -43,9 +43,9 @@ PolarOptionsTabPage::~PolarOptionsTabPage()
m_xAngleDial.reset();
}
std::unique_ptr<SfxTabPage> PolarOptionsTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
std::unique_ptr<SfxTabPage> PolarOptionsTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
return std::make_unique<PolarOptionsTabPage>(pParent, *rOutAttrs);
return std::make_unique<PolarOptionsTabPage>(pPage, pController, *rOutAttrs);
}
bool PolarOptionsTabPage::FillItemSet( SfxItemSet* rOutAttrs )

4
chart2/source/controller/dialogs/tp_PolarOptions.hxx
View File

@ -36,10 +36,10 @@ class PolarOptionsTabPage : public SfxTabPage
{
public:
PolarOptionsTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
PolarOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~PolarOptionsTabPage() override;
static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
virtual void Reset(const SfxItemSet* rInAttrs) override;

11
chart2/source/controller/dialogs/tp_RangeChooser.cxx
View File

@ -58,17 +58,16 @@ using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Sequence;
RangeChooserTabPage::RangeChooserTabPage(TabPageParent pParent, DialogModel & rDialogModel,
RangeChooserTabPage::RangeChooserTabPage(weld::Container* pPage, weld::DialogController* pController, DialogModel & rDialogModel,
ChartTypeTemplateProvider* pTemplateProvider,
bool bHideDescription /* = false */)
: OWizardPage(pParent, "modules/schart/ui/tp_RangeChooser.ui", "tp_RangeChooser")
: OWizardPage(pPage, pController, "modules/schart/ui/tp_RangeChooser.ui", "tp_RangeChooser")
, m_nChangingControlCalls(0)
, m_bIsDirty(false)
, m_aLastValidRangeString()
, m_pTemplateProvider(pTemplateProvider)
, m_rDialogModel( rDialogModel )
, m_pParentController(pParent.pController)
, m_pTabPageNotifiable(dynamic_cast<TabPageNotifiable*>(m_pParentController))
, 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"))
@ -340,7 +339,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_pParentController );
lcl_enableRangeChoosing(true, m_pDialogController);
m_rDialogModel.getRangeSelectionHelper()->chooseRange( aRange, aTitle, *this );
}
@ -364,7 +363,7 @@ void RangeChooserTabPage::listeningFinished( const OUString & rNewRange )
if( isValid())
changeDialogModelAccordingToControls();
lcl_enableRangeChoosing( false, m_pParentController );
lcl_enableRangeChoosing(false, m_pDialogController);
}
void RangeChooserTabPage::disposingRangeSelection()

3
chart2/source/controller/dialogs/tp_RangeChooser.hxx
View File

@ -37,7 +37,7 @@ class RangeChooserTabPage final : public vcl::OWizardPage, public RangeSelection
{
public:
RangeChooserTabPage(TabPageParent pParent, DialogModel & rDialogModel,
RangeChooserTabPage(weld::Container* pPage, weld::DialogController* pController, DialogModel & rDialogModel,
ChartTypeTemplateProvider* pTemplateProvider,
bool bHideDescription = false);
virtual ~RangeChooserTabPage() override;
@ -77,7 +77,6 @@ private:
ChartTypeTemplateProvider* m_pTemplateProvider;
DialogModel & m_rDialogModel;
weld::DialogController* m_pParentController;
TabPageNotifiable * m_pTabPageNotifiable;
std::unique_ptr<weld::Label> m_xFT_Caption;

8
chart2/source/controller/dialogs/tp_Scale.cxx
View File

@ -50,8 +50,8 @@ void lcl_setValue(weld::FormattedSpinButton& rFmtField, double fValue)
}
ScaleTabPage::ScaleTabPage(TabPageParent pWindow,const SfxItemSet& rInAttrs)
: SfxTabPage(pWindow, "modules/schart/ui/tp_Scale.ui", "tp_Scale", &rInAttrs)
ScaleTabPage::ScaleTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
: SfxTabPage(pPage, pController, "modules/schart/ui/tp_Scale.ui", "tp_Scale", &rInAttrs)
, fMin(0.0)
, fMax(0.0)
, fStepMain(0.0)
@ -213,9 +213,9 @@ IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl, weld::ComboBox&, void)
SetNumFormat();
}
std::unique_ptr<SfxTabPage> ScaleTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
std::unique_ptr<SfxTabPage> ScaleTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
return std::make_unique<ScaleTabPage>(pParent, *rOutAttrs);
return std::make_unique<ScaleTabPage>(pPage, pController, *rOutAttrs);
}
bool ScaleTabPage::FillItemSet(SfxItemSet* rOutAttrs)

4
chart2/source/controller/dialogs/tp_Scale.hxx
View File

@ -27,10 +27,10 @@ namespace chart
class ScaleTabPage : public SfxTabPage
{
public:
ScaleTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
ScaleTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~ScaleTabPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pItemSet ) override;

8
chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
View File

@ -30,8 +30,8 @@
namespace chart
{
SchOptionTabPage::SchOptionTabPage(TabPageParent pWindow,const SfxItemSet& rInAttrs)
: SfxTabPage(pWindow, "modules/schart/ui/tp_SeriesToAxis.ui", "TP_OPTIONS", &rInAttrs)
SchOptionTabPage::SchOptionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
: SfxTabPage(pPage, pController, "modules/schart/ui/tp_SeriesToAxis.ui", "TP_OPTIONS", &rInAttrs)
, m_nAllSeriesAxisIndex(0)
, m_bProvidesSecondaryYAxis(true)
, m_bProvidesOverlapAndGapWidth(false)
@ -68,10 +68,10 @@ IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl, weld::ToggleButton&, void)
m_xCBAxisSideBySide->set_sensitive( m_xRbtAxis1->get_active());
}
std::unique_ptr<SfxTabPage> SchOptionTabPage::Create(TabPageParent pParent,
std::unique_ptr<SfxTabPage> SchOptionTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rOutAttrs)
{
return std::make_unique<SchOptionTabPage>(pParent, *rOutAttrs);
return std::make_unique<SchOptionTabPage>(pPage, pController, *rOutAttrs);
}
bool SchOptionTabPage::FillItemSet(SfxItemSet* rOutAttrs)

4
chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
View File

@ -35,10 +35,10 @@ namespace chart
class SchOptionTabPage : public SfxTabPage
{
public:
SchOptionTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
SchOptionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SchOptionTabPage() override;
static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
virtual void Reset(const SfxItemSet* rInAttrs) override;

12
chart2/source/controller/dialogs/tp_TitleRotation.cxx
View File

@ -29,9 +29,9 @@
namespace chart
{
SchAlignmentTabPage::SchAlignmentTabPage(TabPageParent pParent,
SchAlignmentTabPage::SchAlignmentTabPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rInAttrs, bool bWithRotation)
: SfxTabPage(pParent, "modules/schart/ui/titlerotationtabpage.ui", "TitleRotationTabPage", &rInAttrs)
: SfxTabPage(pPage, pController, "modules/schart/ui/titlerotationtabpage.ui", "TitleRotationTabPage", &rInAttrs)
, m_xFtRotate(m_xBuilder->weld_label("degreeL"))
, m_xNfRotate(m_xBuilder->weld_spin_button("OrientDegree"))
, m_xCbStacked(m_xBuilder->weld_check_button("stackedCB"))
@ -73,16 +73,16 @@ SchAlignmentTabPage::~SchAlignmentTabPage()
m_xLbTextDirection.reset();
}
std::unique_ptr<SfxTabPage> SchAlignmentTabPage::Create(TabPageParent pParent,
std::unique_ptr<SfxTabPage> SchAlignmentTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rInAttrs)
{
return std::make_unique<SchAlignmentTabPage>(pParent, *rInAttrs);
return std::make_unique<SchAlignmentTabPage>(pPage, pController, *rInAttrs);
}
std::unique_ptr<SfxTabPage> SchAlignmentTabPage::CreateWithoutRotation(TabPageParent pParent,
std::unique_ptr<SfxTabPage> SchAlignmentTabPage::CreateWithoutRotation(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rInAttrs)
{
return std::make_unique<SchAlignmentTabPage>(pParent, *rInAttrs, false);
return std::make_unique<SchAlignmentTabPage>(pPage, pController, *rInAttrs, false);
}
bool SchAlignmentTabPage::FillItemSet(SfxItemSet* rOutAttrs)

6
chart2/source/controller/dialogs/tp_TitleRotation.hxx
View File

@ -49,11 +49,11 @@ private:
DECL_LINK(StackedToggleHdl, weld::ToggleButton&, void);
public:
SchAlignmentTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs, bool bWithRotation = true);
SchAlignmentTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs, bool bWithRotation = true);
virtual ~SchAlignmentTabPage() override;
static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
static std::unique_ptr<SfxTabPage> CreateWithoutRotation(TabPageParent pParent, const SfxItemSet* rInAttrs);
static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs);
static std::unique_ptr<SfxTabPage> CreateWithoutRotation(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
virtual void Reset(const SfxItemSet* rInAttrs) override;
};

8
chart2/source/controller/dialogs/tp_Trendline.cxx
View File

@ -24,15 +24,15 @@
namespace chart
{
TrendlineTabPage::TrendlineTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
: SfxTabPage(pParent, "modules/schart/ui/tp_Trendline.ui", "TP_TRENDLINE", &rInAttrs)
TrendlineTabPage::TrendlineTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
: SfxTabPage(pPage, pController, "modules/schart/ui/tp_Trendline.ui", "TP_TRENDLINE", &rInAttrs)
, m_aTrendlineResources(*m_xBuilder, rInAttrs)
{
}
std::unique_ptr<SfxTabPage> TrendlineTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
std::unique_ptr<SfxTabPage> TrendlineTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
return std::make_unique<TrendlineTabPage>(pParent, *rOutAttrs);
return std::make_unique<TrendlineTabPage>(pPage, pController, *rOutAttrs);
}
bool TrendlineTabPage::FillItemSet( SfxItemSet* rOutAttrs )

4
chart2/source/controller/dialogs/tp_Trendline.hxx
View File

@ -29,9 +29,9 @@ namespace chart
class TrendlineTabPage : public SfxTabPage
{
public:
TrendlineTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
TrendlineTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;

4
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
View File

@ -30,10 +30,10 @@ namespace chart
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
TitlesAndObjectsTabPage::TitlesAndObjectsTabPage(TabPageParent pParent,
TitlesAndObjectsTabPage::TitlesAndObjectsTabPage(weld::Container* pPage, weld::DialogController* pController,
const uno::Reference< XChartDocument >& xChartModel,
const uno::Reference< uno::XComponentContext >& xContext )
: OWizardPage(pParent, "modules/schart/ui/wizelementspage.ui", "WizElementsPage")
: OWizardPage(pPage, pController, "modules/schart/ui/wizelementspage.ui", "WizElementsPage")
, m_xTitleResources(new TitleResources(*m_xBuilder, false))
, m_xLegendPositionResources(new LegendPositionResources(*m_xBuilder, xContext))
, m_xChartModel(xChartModel)

2
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
View File

@ -37,7 +37,7 @@ namespace chart
class TitlesAndObjectsTabPage final : public vcl::OWizardPage
{
public:
TitlesAndObjectsTabPage(TabPageParent pParent,
TitlesAndObjectsTabPage(weld::Container* pPage, weld::DialogController* pController,
const css::uno::Reference< css::chart2::XChartDocument >& xChartModel,
const css::uno::Reference< css::uno::XComponentContext >& xContext);
virtual ~TitlesAndObjectsTabPage() override;

5
chart2/source/controller/inc/res_ErrorBar.hxx
View File

@ -31,6 +31,7 @@ namespace weld { class Builder; }
namespace weld { class Button; }
namespace weld { class CheckButton; }
namespace weld { class ComboBox; }
namespace weld { class DialogController; }
namespace weld { class Entry; }
namespace weld { class Frame; }
namespace weld { class Image; }
@ -55,7 +56,7 @@ public:
};
ErrorBarResources(
weld::Builder* pParent, TabPageParent pParentDialog, const SfxItemSet& rInAttrs, bool bNoneAvailable, chart::ErrorBarResources::tErrorBarType eType = ERROR_BAR_Y );
weld::Builder* pParent, weld::DialogController* pControllerDialog, const SfxItemSet& rInAttrs, bool bNoneAvailable, chart::ErrorBarResources::tErrorBarType eType = ERROR_BAR_Y);
virtual ~ErrorBarResources();
void SetAxisMinorStepWidthForErrorBarDecimals( double fMinorStepWidth );
@ -86,7 +87,7 @@ private:
double m_fPlusValue;
double m_fMinusValue;
TabPageParent m_pParentDialog;
weld::DialogController* m_pController;
std::unique_ptr< RangeSelectionHelper > m_apRangeSelectionHelper;
weld::Entry* m_pCurrentRangeChoosingField;
bool m_bHasInternalDataProvider;

4
cui/source/customize/SvxMenuConfigPage.cxx
View File

@ -38,8 +38,8 @@
#include <dlgname.hxx>
SvxMenuConfigPage::SvxMenuConfigPage(TabPageParent pParent, const SfxItemSet& rSet, bool bIsMenuBar)
: SvxConfigPage(pParent, rSet)
SvxMenuConfigPage::SvxMenuConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet, bool bIsMenuBar)
: SvxConfigPage(pPage, pController, rSet)
, m_bIsMenuBar(bIsMenuBar)
{
m_xGearBtn = m_xBuilder->weld_menu_button("menugearbtn");

6
cui/source/customize/SvxNotebookbarConfigPage.cxx
View File

@ -99,8 +99,10 @@ static OUString getModuleId(const OUString& sModuleName)
return "None";
}
SvxNotebookbarConfigPage::SvxNotebookbarConfigPage(TabPageParent pParent, const SfxItemSet& rSet)
: SvxConfigPage(pParent, rSet)
SvxNotebookbarConfigPage::SvxNotebookbarConfigPage(weld::Container* pPage,
weld::DialogController* pController,
const SfxItemSet& rSet)
: SvxConfigPage(pPage, pController, rSet)
{
m_xDescriptionFieldLb->set_visible(false);
m_xSearchEdit->set_visible(false);

4
cui/source/customize/SvxToolbarConfigPage.cxx
View File

@ -43,8 +43,8 @@
#include <dlgname.hxx>
SvxToolbarConfigPage::SvxToolbarConfigPage(TabPageParent pParent, const SfxItemSet& rSet)
: SvxConfigPage(pParent, rSet)
SvxToolbarConfigPage::SvxToolbarConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
: SvxConfigPage(pPage, pController, rSet)
{
m_xGearBtn = m_xBuilder->weld_menu_button("toolbargearbtn");
m_xGearBtn->show();

4
cui/source/customize/acccfg.cxx
View File

@ -814,8 +814,8 @@ IMPL_LINK(SfxAcceleratorConfigPage, KeyInputHdl, const KeyEvent&, rKey, bool)
return false;
}
SfxAcceleratorConfigPage::SfxAcceleratorConfigPage(TabPageParent pParent, const SfxItemSet& aSet )
: SfxTabPage(pParent, "cui/ui/accelconfigpage.ui", "AccelConfigPage", &aSet)
SfxAcceleratorConfigPage::SfxAcceleratorConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& aSet )
: SfxTabPage(pPage, pController, "cui/ui/accelconfigpage.ui", "AccelConfigPage", &aSet)
, m_pMacroInfoItem()
, aLoadAccelConfigStr(CuiResId(RID_SVXSTR_LOADACCELCONFIG))
, aSaveAccelConfigStr(CuiResId(RID_SVXSTR_SAVEACCELCONFIG))

28
cui/source/customize/cfg.cxx
View File

@ -161,35 +161,35 @@ SvxConfigPage::CanConfig( const OUString& aModuleId )
return !(aModuleId == "com.sun.star.script.BasicIDE" || aModuleId == "com.sun.star.frame.Bibliography");
}
static std::unique_ptr<SfxTabPage> CreateSvxMenuConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
static std::unique_ptr<SfxTabPage> CreateSvxMenuConfigPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
{
return std::make_unique<SvxMenuConfigPage>(pParent, *rSet);
return std::make_unique<SvxMenuConfigPage>(pPage, pController, *rSet);
}
static std::unique_ptr<SfxTabPage> CreateSvxContextMenuConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
static std::unique_ptr<SfxTabPage> CreateSvxContextMenuConfigPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
{
return std::make_unique<SvxMenuConfigPage>(pParent, *rSet, false);
return std::make_unique<SvxMenuConfigPage>(pPage, pController, *rSet, false);
}
static std::unique_ptr<SfxTabPage> CreateKeyboardConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
static std::unique_ptr<SfxTabPage> CreateKeyboardConfigPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
{
return std::make_unique<SfxAcceleratorConfigPage>(pParent, *rSet);
return std::make_unique<SfxAcceleratorConfigPage>(pPage, pController, *rSet);
}
static std::unique_ptr<SfxTabPage> CreateSvxNotebookbarConfigPage(TabPageParent pParent,
static std::unique_ptr<SfxTabPage> CreateSvxNotebookbarConfigPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rSet)
{
return std::make_unique<SvxNotebookbarConfigPage>(pParent, *rSet);
return std::make_unique<SvxNotebookbarConfigPage>(pPage, pController, *rSet);
}
static std::unique_ptr<SfxTabPage> CreateSvxToolbarConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
static std::unique_ptr<SfxTabPage> CreateSvxToolbarConfigPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
{
return std::make_unique<SvxToolbarConfigPage>(pParent, *rSet);
return std::make_unique<SvxToolbarConfigPage>(pPage, pController, *rSet);
}
static std::unique_ptr<SfxTabPage> CreateSvxEventConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
static std::unique_ptr<SfxTabPage> CreateSvxEventConfigPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
{
return std::make_unique<SvxEventConfigPage>(pParent, *rSet, SvxEventConfigPage::EarlyInit());
return std::make_unique<SvxEventConfigPage>(pPage, pController, *rSet, SvxEventConfigPage::EarlyInit());
}
/******************************************************************************
@ -969,8 +969,8 @@ IMPL_LINK(SvxMenuEntriesListBox, KeyInputHdl, const KeyEvent&, rKeyEvent, bool)
* both tabpages to add, delete, move and rename items etc.
*
*****************************************************************************/
SvxConfigPage::SvxConfigPage(TabPageParent pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "cui/ui/menuassignpage.ui", "MenuAssignPage", &rSet)
SvxConfigPage::SvxConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
: SfxTabPage(pPage, pController, "cui/ui/menuassignpage.ui", "MenuAssignPage", &rSet)
, m_aUpdateDataTimer("UpdateDataTimer")
, bInitialised(false)
, pCurrentSaveInData(nullptr)

4
cui/source/customize/eventdlg.cxx
View File

@ -36,9 +36,9 @@
using namespace ::com::sun::star;
SvxEventConfigPage::SvxEventConfigPage(TabPageParent pParent, const SfxItemSet& rSet,
SvxEventConfigPage::SvxEventConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet,
SvxEventConfigPage::EarlyInit)
: SvxMacroTabPage_(pParent, "cui/ui/eventsconfigpage.ui", "EventsConfigPage", rSet)
: SvxMacroTabPage_(pPage, pController, "cui/ui/eventsconfigpage.ui", "EventsConfigPage", rSet)
, m_xSaveInListBox(m_xBuilder->weld_combo_box("savein"))
{
mpImpl->xEventLB = m_xBuilder->weld_tree_view("events");

2
cui/source/customize/eventdlg.hxx
View File

@ -41,7 +41,7 @@ public:
/// this is only to let callers know that there is a LateInit which *must* be called
struct EarlyInit { };
SvxEventConfigPage(TabPageParent pParent, const SfxItemSet& rSet, EarlyInit);
SvxEventConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet, EarlyInit);
virtual ~SvxEventConfigPage() override;
void LateInit( const css::uno::Reference< css::frame::XFrame >& _rxFrame );

11
cui/source/customize/macropg.cxx
View File

@ -72,9 +72,9 @@ void SvxMacroTabPage_::EnableButtons()
}
}
SvxMacroTabPage_::SvxMacroTabPage_(TabPageParent pParent, const OUString& rUIXMLDescription,
SvxMacroTabPage_::SvxMacroTabPage_(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription,
const OString& rID, const SfxItemSet& rAttrSet)
: SfxTabPage(pParent, rUIXMLDescription, rID, &rAttrSet)
: SfxTabPage(pPage, pController, rUIXMLDescription, rID, &rAttrSet)
, bDocModified(false)
, bAppEvents(false)
, bInitialized(false)
@ -582,12 +582,12 @@ std::pair< OUString, OUString > SvxMacroTabPage_::GetPairFromAny( const Any& aA
return std::make_pair( type, url );
}
SvxMacroTabPage::SvxMacroTabPage(TabPageParent pParent,
SvxMacroTabPage::SvxMacroTabPage(weld::Container* pPage, weld::DialogController* pController,
const Reference< frame::XFrame >& _rxDocumentFrame,
const SfxItemSet& rSet,
Reference< container::XNameReplace > const & xNameReplace,
sal_uInt16 nSelectedIndex)
: SvxMacroTabPage_(pParent, "cui/ui/macroassignpage.ui", "MacroAssignPage", rSet)
: SvxMacroTabPage_(pPage, pController, "cui/ui/macroassignpage.ui", "MacroAssignPage", rSet)
{
mpImpl->xEventLB = m_xBuilder->weld_tree_view("assignments");
mpImpl->xEventLB->set_size_request(mpImpl->xEventLB->get_approximate_digit_width() * 70,
@ -615,8 +615,7 @@ SvxMacroAssignDlg::SvxMacroAssignDlg(weld::Window* pParent, const Reference< fra
const Reference< container::XNameReplace >& xNameReplace, sal_uInt16 nSelectedIndex)
: SvxMacroAssignSingleTabDialog(pParent, rSet)
{
TabPageParent pPageParent(get_content_area(), this);
SetTabPage(std::make_unique<SvxMacroTabPage>(pPageParent, _rxDocumentFrame, rSet, xNameReplace, nSelectedIndex));
SetTabPage(std::make_unique<SvxMacroTabPage>(get_content_area(), this, _rxDocumentFrame, rSet, xNameReplace, nSelectedIndex));
}
IMPL_LINK_NOARG(AssignComponentDialog, ButtonHandler, weld::Button&, void)

3
cui/source/dialogs/SpellDialog.cxx
View File

@ -454,8 +454,7 @@ void SpellDialog::StartSpellOptDlg_Impl()
SfxItemSet aSet( SfxGetpApp()->GetPool(), svl::Items<SID_AUTOSPELL_CHECK,SID_AUTOSPELL_CHECK>{});
SfxSingleTabDialogController aDlg(m_xDialog.get(), &aSet, "cui/ui/spelloptionsdialog.ui", "SpellOptionsDialog");
TabPageParent aParent(aDlg.get_content_area(), &aDlg);
std::unique_ptr<SfxTabPage> xPage = SvxLinguTabPage::Create(aParent, &aSet);
std::unique_ptr<SfxTabPage> xPage = SvxLinguTabPage::Create(aDlg.get_content_area(), &aDlg, &aSet);
static_cast<SvxLinguTabPage*>(xPage.get())->HideGroups( GROUP_MODULES );
aDlg.SetTabPage(std::move(xPage));
if (RET_OK == aDlg.run())

16
cui/source/dialogs/cuigaldlg.cxx
View File

@ -504,8 +504,8 @@ void GalleryThemeProperties::PageCreated(const OString& rId, SfxTabPage &rPage)
static_cast<TPGalleryThemeProperties&>( rPage ).SetXChgData( pData );
}
TPGalleryThemeGeneral::TPGalleryThemeGeneral(TabPageParent pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "cui/ui/gallerygeneralpage.ui", "GalleryGeneralPage", &rSet)
TPGalleryThemeGeneral::TPGalleryThemeGeneral(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
: SfxTabPage(pPage, pController, "cui/ui/gallerygeneralpage.ui", "GalleryGeneralPage", &rSet)
, pData(nullptr)
, m_xFiMSImage(m_xBuilder->weld_image("image"))
, m_xEdtMSName(m_xBuilder->weld_entry("name"))
@ -574,13 +574,13 @@ bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet* /*rSet*/ )
return true;
}
std::unique_ptr<SfxTabPage> TPGalleryThemeGeneral::Create(TabPageParent pParent, const SfxItemSet* rSet)
std::unique_ptr<SfxTabPage> TPGalleryThemeGeneral::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
return std::make_unique<TPGalleryThemeGeneral>(pParent, *rSet);
return std::make_unique<TPGalleryThemeGeneral>(pPage, pController, *rSet);
}
TPGalleryThemeProperties::TPGalleryThemeProperties(TabPageParent pWindow, const SfxItemSet& rSet)
: SfxTabPage(pWindow, "cui/ui/galleryfilespage.ui", "GalleryFilesPage", &rSet)
TPGalleryThemeProperties::TPGalleryThemeProperties(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
: SfxTabPage(pPage, pController, "cui/ui/galleryfilespage.ui", "GalleryFilesPage", &rSet)
, pData(nullptr)
, bEntriesFound(false)
, bInputAllowed(true)
@ -641,9 +641,9 @@ TPGalleryThemeProperties::~TPGalleryThemeProperties()
aFilterEntryList.clear();
}
std::unique_ptr<SfxTabPage> TPGalleryThemeProperties::Create(TabPageParent pParent, const SfxItemSet* rSet)
std::unique_ptr<SfxTabPage> TPGalleryThemeProperties::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
return std::make_unique<TPGalleryThemeProperties>(pParent, *rSet);
return std::make_unique<TPGalleryThemeProperties>(pPage, pController, *rSet);
}
OUString TPGalleryThemeProperties::addExtension( const OUString& _rDisplayText, const OUString& _rExtension )

2
cui/source/inc/SvxMenuConfigPage.hxx
View File

@ -56,7 +56,7 @@ private:
virtual void SelectElement() override;
public:
SvxMenuConfigPage(TabPageParent pParent, const SfxItemSet& rItemSet, bool bIsMenuBar = true);
SvxMenuConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rItemSet, bool bIsMenuBar = true);
virtual ~SvxMenuConfigPage() override;
SaveInData* CreateSaveInData(

3
cui/source/inc/SvxNotebookbarConfigPage.hxx
View File

@ -54,7 +54,8 @@ public:
OUString sUIItemId;
OUString sClassType;
};
SvxNotebookbarConfigPage(TabPageParent pParent, const SfxItemSet& rItemSet);
SvxNotebookbarConfigPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rItemSet);
virtual ~SvxNotebookbarConfigPage() override;
SaveInData* CreateSaveInData(const css::uno::Reference<css::ui::XUIConfigurationManager>&,
const css::uno::Reference<css::ui::XUIConfigurationManager>&,

2
cui/source/inc/SvxToolbarConfigPage.hxx
View File

@ -55,7 +55,7 @@ private:
virtual void SelectElement() override;
public:
SvxToolbarConfigPage(TabPageParent pParent, const SfxItemSet& rItemSet);
SvxToolbarConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rItemSet);
virtual ~SvxToolbarConfigPage() override;
void AddFunction(int nTarget = -1);

2
cui/source/inc/acccfg.hxx
View File

@ -139,7 +139,7 @@ private:
void ResetConfig();
public:
SfxAcceleratorConfigPage(TabPageParent pParent, const SfxItemSet& rItemSet);
SfxAcceleratorConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rItemSet);
virtual ~SfxAcceleratorConfigPage() override;
virtual bool FillItemSet( SfxItemSet* ) override;

4
cui/source/inc/align.hxx
View File

@ -50,8 +50,8 @@ class AlignmentTabPage : public SfxTabPage
public:
virtual ~AlignmentTabPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
explicit AlignmentTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet);
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
explicit AlignmentTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet);
static const sal_uInt16* GetRanges() { return s_pRanges; }

28
cui/source/inc/autocdlg.hxx
View File

@ -66,10 +66,10 @@ private:
void InsertEntry(const OUString& rTxt);
public:
OfaAutocorrOptionsPage(TabPageParent pParent, const SfxItemSet& rSet);
OfaAutocorrOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~OfaAutocorrOptionsPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
@ -119,8 +119,8 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
void CreateEntry(const OUString& rTxt, sal_uInt16 nCol);
public:
OfaSwAutoFmtOptionsPage(TabPageParent pParent, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
OfaSwAutoFmtOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual ~OfaSwAutoFmtOptionsPage() override;
@ -190,10 +190,10 @@ private:
LanguageType eNewLanguage);
public:
OfaAutocorrReplacePage(TabPageParent pParent, const SfxItemSet& rSet);
OfaAutocorrReplacePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~OfaAutocorrReplacePage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
@ -245,10 +245,10 @@ private:
LanguageType eOldLanguage,
LanguageType eNewLanguage);
public:
OfaAutocorrExceptPage(TabPageParent pParent, const SfxItemSet& rSet);
OfaAutocorrExceptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~OfaAutocorrExceptPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
@ -301,8 +301,8 @@ private:
sal_uInt16 nCol, sal_uInt16 nTextCol);
public:
OfaQuoteTabPage(TabPageParent pParent, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent,
OfaQuoteTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual ~OfaQuoteTabPage() override;
@ -336,8 +336,8 @@ private:
DECL_LINK(KeyReleaseHdl, const KeyEvent&, bool);
public:
OfaAutoCompleteTabPage(TabPageParent pParent, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent,
OfaAutoCompleteTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual ~OfaAutoCompleteTabPage() override;
@ -398,10 +398,10 @@ private:
public:
/// construction via Create()
OfaSmartTagOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet);
OfaSmartTagOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~OfaSmartTagOptionsTabPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;

8
cui/source/inc/backgrnd.hxx
View File

@ -44,8 +44,8 @@ class SvxBackgroundTabPage : public SvxTabPage
{
static const sal_uInt16 pPageRanges[];
public:
SvxBackgroundTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet);
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
SvxBackgroundTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet);
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
virtual ~SvxBackgroundTabPage() override;
// returns the area of the which-values
@ -163,10 +163,10 @@ class SvxBkgTabPage : public SvxAreaTabPage
DECL_LINK(TblDestinationHdl_Impl, weld::ComboBox&, void);
public:
SvxBkgTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
SvxBkgTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxBkgTabPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void ActivatePage( const SfxItemSet& ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;

4
cui/source/inc/border.hxx
View File

@ -79,9 +79,9 @@ class SvxBorderTabPage : public SfxTabPage
static const sal_uInt16 pRanges[];
public:
SvxBorderTabPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
SvxBorderTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs);
virtual ~SvxBorderTabPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
static const sal_uInt16* GetRanges() { return pRanges; }

2
cui/source/inc/cfg.hxx
View File

@ -404,7 +404,7 @@ protected:
std::unique_ptr<weld::Button> m_xRemoveCommandButton;
SvxConfigPage(TabPageParent, const SfxItemSet&);
SvxConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet&);
DECL_LINK(MoveHdl, weld::Button&, void);
DECL_LINK(SelectFunctionHdl, weld::TreeView&, void);

18
cui/source/inc/chardlg.hxx
View File

@ -40,7 +40,7 @@ protected:
bool m_bPreviewBackgroundToCharacter;
SvxCharBasePage(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet& rAttrSet);
SvxCharBasePage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet& rAttrSet);
void SetPrevFontWidthScale( const SfxItemSet& rSet );
void SetPrevFontEscapement( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc );
@ -138,8 +138,8 @@ public:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
public:
SvxCharNamePage(TabPageParent pParent, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
SvxCharNamePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual ~SvxCharNamePage() override;
static const sal_uInt16* GetRanges() { return pNameRanges; }
@ -209,8 +209,8 @@ private:
DECL_LINK(ColorBoxSelectHdl_Impl, ColorListBox&, void);
public:
SvxCharEffectsPage(TabPageParent pParent, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
SvxCharEffectsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual ~SvxCharEffectsPage() override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
@ -279,8 +279,8 @@ private:
void FontModifyHdl_Impl();
public:
SvxCharPositionPage(TabPageParent pParent, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
SvxCharPositionPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual ~SvxCharPositionPage() override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
@ -318,8 +318,8 @@ private:
DECL_LINK(CharacterMapHdl_Impl, weld::TreeView&, void);
public:
SvxCharTwoLinesPage(TabPageParent pParent, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
SvxCharTwoLinesPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual ~SvxCharTwoLinesPage() override;
virtual void ActivatePage( const SfxItemSet& rSet ) override;

4
cui/source/inc/connect.hxx
View File

@ -58,10 +58,10 @@ private:
public:
SvxConnectionPage(TabPageParent pWindow, const SfxItemSet& rInAttrs);
SvxConnectionPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxConnectionPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;

8
cui/source/inc/cuigaldlg.hxx
View File

@ -203,9 +203,9 @@ private:
virtual bool FillItemSet( SfxItemSet* rSet ) override;
public:
TPGalleryThemeGeneral(TabPageParent pParent, const SfxItemSet& rSet);
TPGalleryThemeGeneral(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
void SetXChgData( ExchangeData* pData );
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
};
class TPGalleryThemeProperties : public SfxTabPage
@ -261,7 +261,7 @@ class TPGalleryThemeProperties : public SfxTabPage
DECL_LINK(DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void);
public:
TPGalleryThemeProperties(TabPageParent pWindow, const SfxItemSet& rSet);
TPGalleryThemeProperties(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~TPGalleryThemeProperties() override;
void SetXChgData( ExchangeData* pData );
@ -269,7 +269,7 @@ public:
void StartSearchFiles( const OUString& _rFolderURL, short _nDlgResult );
static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet);
};
#endif // INCLUDED_CUI_SOURCE_INC_CUIGALDLG_HXX

4
cui/source/inc/cuioptgenrl.hxx
View File

@ -60,10 +60,10 @@ protected:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
public:
SvxGeneralTabPage(TabPageParent pParent, const SfxItemSet& rSet);
SvxGeneralTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxGeneralTabPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;

32
cui/source/inc/cuitabarea.hxx
View File

@ -186,10 +186,10 @@ class SvxTransparenceTabPage : public SfxTabPage
void InvalidatePreview (bool bEnable = true );
public:
SvxTransparenceTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
SvxTransparenceTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxTransparenceTabPage() override;
static std::unique_ptr<SfxTabPage> Create(TabPageParent, const SfxItemSet*);
static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet*);
static const sal_uInt16* GetRanges() { return pTransparenceRanges; }
virtual bool FillItemSet(SfxItemSet*) override;
@ -262,10 +262,10 @@ private:
DeactivateRC DeactivatePage_Impl( SfxItemSet* pSet );
public:
SvxAreaTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
SvxAreaTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxAreaTabPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pAreaRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
@ -321,10 +321,10 @@ private:
DECL_LINK(SelectShadowHdl_Impl, ColorListBox&, void);
public:
SvxShadowTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
SvxShadowTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxShadowTabPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pShadowRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
@ -396,12 +396,12 @@ private:
sal_Int32 SearchGradientList(const OUString& rGradientName);
public:
SvxGradientTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
SvxGradientTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxGradientTabPage() override;
void Construct();
static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
@ -464,12 +464,12 @@ private:
sal_Int32 SearchHatchList(const OUString& rHatchName);
public:
SvxHatchTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
SvxHatchTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxHatchTabPage() override;
void Construct();
static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
@ -544,12 +544,12 @@ private:
sal_Int32 SearchBitmapList(const GraphicObject& rGraphicObject);
public:
SvxBitmapTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
SvxBitmapTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxBitmapTabPage() override;
void Construct();
static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
@ -598,12 +598,12 @@ private:
sal_Int32 SearchPatternList(const OUString& rPatternName);
public:
SvxPatternTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
SvxPatternTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxPatternTabPage() override;
void Construct();
static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
@ -712,12 +712,12 @@ private:
sal_Int32 FindInPalette( const Color& rColor );
public:
SvxColorTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
SvxColorTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxColorTabPage() override;
void Construct();
static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;

12
cui/source/inc/cuitabline.hxx
View File

@ -200,12 +200,12 @@ public:
void ShowSymbolControls(bool bOn);
SvxLineTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
SvxLineTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxLineTabPage() override;
void Construct();
static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pLineRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
@ -291,12 +291,12 @@ private:
void CheckChanges_Impl();
public:
SvxLineDefTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
SvxLineDefTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxLineDefTabPage() override;
void Construct();
static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
@ -351,12 +351,12 @@ private:
void CheckChanges_Impl();
public:
SvxLineEndDefTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
SvxLineEndDefTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxLineEndDefTabPage() override;
void Construct();
static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;

4
cui/source/inc/dbregister.hxx
View File

@ -68,10 +68,10 @@ namespace svx
void openLinkDialog(const OUString& sOldName, const OUString& sOldLocation, int nEntry = -1);
public:
DbRegistrationOptionsPage(TabPageParent pParent, const SfxItemSet& rSet);
DbRegistrationOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~DbRegistrationOptionsPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;

2
cui/source/inc/dstribut.hxx
View File

@ -40,7 +40,7 @@ class SvxDistributePage : public SfxTabPage
std::unique_ptr<weld::RadioButton> m_xBtnVerBottom;
public:
SvxDistributePage(TabPageParent pWindow, const SfxItemSet& rInAttrs,
SvxDistributePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs,
SvxDistributeHorizontal eHor,
SvxDistributeVertical eVer);
virtual ~SvxDistributePage() override;

4
cui/source/inc/grfpage.hxx
View File

@ -95,8 +95,8 @@ class SvxGrfCropPage : public SfxTabPage
static Size GetGrfOrigSize(const Graphic&);
public:
SvxGrfCropPage(TabPageParent pParent, const SfxItemSet &rSet);
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet *rSet );
SvxGrfCropPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet);
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet );
virtual ~SvxGrfCropPage() override;
virtual bool FillItemSet( SfxItemSet *rSet ) override;

4
cui/source/inc/labdlg.hxx
View File

@ -78,10 +78,10 @@ private:
DECL_LINK(SelectCaptTypeHdl_Impl, SvtValueSet*, void);
public:
SvxCaptionTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
SvxCaptionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxCaptionTabPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pCaptionRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;

4
cui/source/inc/macroass.hxx
View File

@ -51,7 +51,7 @@ class SfxMacroTabPage final : public SfxTabPage
public:
SfxMacroTabPage(
TabPageParent pParent,
weld::Container* pPage, weld::DialogController* pController,
const css::uno::Reference< css::frame::XFrame >& rxDocumentFrame,
const SfxItemSet& rSet
);
@ -72,7 +72,7 @@ public:
bool IsReadOnly() const override;
// --------- inherit from the base -------------
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
};
class SfxMacroAssignDlg : public SfxSingleTabDialogController

4
cui/source/inc/macropg.hxx
View File

@ -70,7 +70,7 @@ protected:
bool bDocModified, bAppEvents, bInitialized;
EventDisplayNames aDisplayNames;
SvxMacroTabPage_(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet& rItemSet);
SvxMacroTabPage_(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet& rItemSet);
void EnableButtons();
static css::uno::Any GetPropsByName( const OUString& eventName, EventsHash& eventsHash );
@ -95,7 +95,7 @@ class SvxMacroTabPage : public SvxMacroTabPage_
{
public:
SvxMacroTabPage(
TabPageParent pParent,
weld::Container* pPage, weld::DialogController* pController,
const css::uno::Reference< css::frame::XFrame >& _rxDocumentFrame,
const SfxItemSet& rSet,
css::uno::Reference< css::container::XNameReplace > const & xNameReplace,

4
cui/source/inc/measure.hxx
View File

@ -67,10 +67,10 @@ private:
public:
SvxMeasurePage(TabPageParent pWindow, const SfxItemSet& rInAttrs);
SvxMeasurePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxMeasurePage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;

4
cui/source/inc/numfmt.hxx
View File

@ -60,8 +60,8 @@ class SvxNumberFormatTabPage : public SfxTabPage
static const sal_uInt16 pRanges[];
public:
SvxNumberFormatTabPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
SvxNumberFormatTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs);
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet );
virtual ~SvxNumberFormatTabPage() override;
// Returns area information.

24
cui/source/inc/numpages.hxx
View File

@ -73,10 +73,10 @@ class SvxSingleNumPickTabPage final : public SfxTabPage
DECL_LINK(DoubleClickHdl_Impl, SvtValueSet*, void);
public:
SvxSingleNumPickTabPage(TabPageParent pParent, const SfxItemSet& rSet);
SvxSingleNumPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxSingleNumPickTabPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
@ -102,10 +102,10 @@ class SvxBulletPickTabPage final : public SfxTabPage
DECL_LINK(NumSelectHdl_Impl, SvtValueSet*, void);
DECL_LINK(DoubleClickHdl_Impl, SvtValueSet*, void);
public:
SvxBulletPickTabPage(TabPageParent pParent, const SfxItemSet& rSet);
SvxBulletPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxBulletPickTabPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
@ -140,10 +140,10 @@ class SvxNumPickTabPage final : public SfxTabPage
DECL_LINK(DoubleClickHdl_Impl, SvtValueSet*, void);
public:
SvxNumPickTabPage(TabPageParent pParent, const SfxItemSet& rSet);
SvxNumPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxNumPickTabPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
@ -179,10 +179,10 @@ class SvxBitmapPickTabPage final : public SfxTabPage
DECL_LINK(ClickAddBrowseHdl_Impl, weld::Button&, void);
public:
SvxBitmapPickTabPage(TabPageParent pParent, const SfxItemSet& rSet);
SvxBitmapPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxBitmapPickTabPage() override;
static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent,
static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
@ -279,10 +279,10 @@ class SvxNumOptionsTabPage : public SfxTabPage
void EditModifyHdl_Impl(const weld::Entry*);
public:
SvxNumOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet);
SvxNumOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxNumOptionsTabPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
@ -364,7 +364,7 @@ class SvxNumPositionTabPage : public SfxTabPage
DECL_LINK(IndentAtHdl_Impl, weld::MetricSpinButton&, void);
public:
SvxNumPositionTabPage(TabPageParent pParent, const SfxItemSet& rSet);
SvxNumPositionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxNumPositionTabPage() override;
virtual void ActivatePage(const SfxItemSet& rSet) override;
@ -372,7 +372,7 @@ public:
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
void SetMetric(FieldUnit eSet);

4
cui/source/inc/optasian.hxx
View File

@ -47,10 +47,10 @@ class SvxAsianLayoutPage : public SfxTabPage
DECL_LINK(ModifyHdl, weld::Entry&, void);
public:
SvxAsianLayoutPage(TabPageParent pParent, const SfxItemSet& rSet );
SvxAsianLayoutPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet );
virtual ~SvxAsianLayoutPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;

4
cui/source/inc/optlingu.hxx
View File

@ -133,8 +133,8 @@ private:
void UpdateDicBox_Impl();
public:
SvxLinguTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet);
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
SvxLinguTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet);
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual ~SvxLinguTabPage() override;
virtual bool FillItemSet( SfxItemSet* rSet ) override;

4
cui/source/inc/optpath.hxx
View File

@ -58,8 +58,8 @@ private:
const OUString& _rUserPath, const OUString& _rWritablePath );
public:
SvxPathTabPage( TabPageParent pParent, const SfxItemSet& rSet );
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
SvxPathTabPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual ~SvxPathTabPage() override;
virtual bool FillItemSet( SfxItemSet* rSet ) override;

4
cui/source/inc/page.hxx
View File

@ -161,8 +161,8 @@ protected:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
public:
SvxPageDescPage(TabPageParent pParent, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
SvxPageDescPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual ~SvxPageDescPage() override;
// returns the range of the Which values

16
cui/source/inc/paragrph.hxx
View File

@ -98,8 +98,8 @@ protected:
public:
SvxStdParagraphTabPage(TabPageParent pParent, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
SvxStdParagraphTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual ~SvxStdParagraphTabPage() override;
DECL_LINK(ELRLoseFocusHdl, weld::MetricSpinButton&, void);
@ -161,8 +161,8 @@ protected:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
public:
SvxParaAlignTabPage(TabPageParent pParent, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
SvxParaAlignTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual ~SvxParaAlignTabPage() override;
static const sal_uInt16* GetRanges() { return pAlignRanges; }
@ -194,8 +194,8 @@ class SvxExtParagraphTabPage: public SfxTabPage
static const sal_uInt16 pExtRanges[];
public:
SvxExtParagraphTabPage(TabPageParent pParent, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
SvxExtParagraphTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rSet );
virtual ~SvxExtParagraphTabPage() override;
@ -286,8 +286,8 @@ class SvxAsianTabPage : public SfxTabPage
std::unique_ptr<weld::CheckButton> m_xScriptSpaceCB;
public:
SvxAsianTabPage(TabPageParent pParent, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
SvxAsianTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet);
virtual ~SvxAsianTabPage() override;
static const sal_uInt16* GetRanges();

4
cui/source/inc/swpossizetabpage.hxx
View File

@ -109,8 +109,8 @@ class SvxSwPosSizeTabPage : public SfxTabPage
void setOptimalRelWidth();
public:
SvxSwPosSizeTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
SvxSwPosSizeTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual ~SvxSwPosSizeTabPage() override;
static const sal_uInt16* GetRanges();

4
cui/source/inc/tabstpge.hxx
View File

@ -62,8 +62,8 @@ class SvxTabulatorTabPage : public SfxTabPage
static const sal_uInt16 pRanges[];
public:
SvxTabulatorTabPage(TabPageParent pParent, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
SvxTabulatorTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual ~SvxTabulatorTabPage() override;
static const sal_uInt16* GetRanges() { return pRanges; }

4
cui/source/inc/textanim.hxx
View File

@ -78,10 +78,10 @@ private:
sal_uInt16 GetSelectedDirection() const;
public:
SvxTextAnimationPage(TabPageParent pPage, const SfxItemSet& rInAttrs);
SvxTextAnimationPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxTextAnimationPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;

4
cui/source/inc/textattr.hxx
View File

@ -74,10 +74,10 @@ private:
public:
SvxTextAttrPage(TabPageParent pWindow, const SfxItemSet& rInAttrs);
SvxTextAttrPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxTextAttrPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;

12
cui/source/inc/transfrm.hxx
View File

@ -129,10 +129,10 @@ private:
DECL_LINK( ClickAutoHdl, weld::ToggleButton&, void );
public:
SvxPositionSizeTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
SvxPositionSizeTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxPositionSizeTabPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pPosSizeRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
@ -186,10 +186,10 @@ private:
std::unique_ptr<weld::CustomWeld> m_xCtlAngle;
public:
SvxAngleTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
SvxAngleTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxAngleTabPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pAngleRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
@ -232,10 +232,10 @@ private:
std::unique_ptr<weld::MetricSpinButton> m_aControlY[2];
public:
SvxSlantTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
SvxSlantTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxSlantTabPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pSlantRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;

8
cui/source/options/connpooloptions.cxx
View File

@ -46,8 +46,8 @@ namespace offapp
return false;
}
ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(TabPageParent pParent, const SfxItemSet& _rAttrSet)
: SfxTabPage(pParent, "cui/ui/connpooloptions.ui", "ConnPoolPage", &_rAttrSet)
ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet)
: SfxTabPage(pPage, pController, "cui/ui/connpooloptions.ui", "ConnPoolPage", &_rAttrSet)
, m_sYes(CuiResId(RID_SVXSTR_YES))
, m_sNo(CuiResId(RID_SVXSTR_NO))
, m_xEnablePooling(m_xBuilder->weld_check_button("connectionpooling"))
@ -125,9 +125,9 @@ namespace offapp
{
}
std::unique_ptr<SfxTabPage> ConnectionPoolOptionsPage::Create(TabPageParent pParent, const SfxItemSet* _rAttrSet)
std::unique_ptr<SfxTabPage> ConnectionPoolOptionsPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet)
{
return std::make_unique<ConnectionPoolOptionsPage>(pParent, *_rAttrSet);
return std::make_unique<ConnectionPoolOptionsPage>(pPage, pController, *_rAttrSet);
}
void ConnectionPoolOptionsPage::implInitControls(const SfxItemSet& _rSet)

4
cui/source/options/connpooloptions.hxx
View File

@ -43,9 +43,9 @@ namespace offapp
std::unique_ptr<weld::SpinButton> m_xTimeout;
public:
ConnectionPoolOptionsPage(TabPageParent _pParent, const SfxItemSet& _rAttrSet);
ConnectionPoolOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet);
virtual ~ConnectionPoolOptionsPage() override;
static std::unique_ptr<SfxTabPage> Create(TabPageParent _pParent, const SfxItemSet* _rAttrSet);
static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet);
private:
virtual bool FillItemSet(SfxItemSet* _rSet) override;

3
cui/source/options/cuisrchdlg.cxx
View File

@ -32,8 +32,7 @@ SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(weld::Window *pParent,
{
// m_xPage will be implicitly destroyed by the
// SfxSingleTabDialog destructor
TabPageParent pPageParent(get_content_area(), this);
SetTabPage(SvxJSearchOptionsPage::Create(pPageParent, &rOptionsSet)); //! implicitly calls m_xPage->Reset(...)!
SetTabPage(SvxJSearchOptionsPage::Create(get_content_area(), this, &rOptionsSet)); //! implicitly calls m_xPage->Reset(...)!
m_pPage = static_cast<SvxJSearchOptionsPage*>(GetTabPage());
m_pPage->EnableSaveOptions(false);
m_pPage->SetTransliterationFlags(nInitialFlags);

11
cui/source/options/dbregister.cxx
View File

@ -61,8 +61,7 @@ DatabaseRegistrationDialog::DatabaseRegistrationDialog(weld::Window* pParent, co
: RegistrationItemSetHolder(rInAttrs)
, SfxSingleTabDialogController(pParent, &getRegistrationItems())
{
TabPageParent aParent(get_content_area(), this);
SetTabPage(DbRegistrationOptionsPage::Create(aParent, &getRegistrationItems()));
SetTabPage(DbRegistrationOptionsPage::Create(get_content_area(), this, &getRegistrationItems()));
m_xDialog->set_title(CuiResId(RID_SVXSTR_REGISTERED_DATABASES));
}
@ -80,8 +79,8 @@ short DatabaseRegistrationDialog::run()
// class DbRegistrationOptionsPage --------------------------------------------------
DbRegistrationOptionsPage::DbRegistrationOptionsPage(TabPageParent pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "cui/ui/dbregisterpage.ui", "DbRegisterPage", &rSet)
DbRegistrationOptionsPage::DbRegistrationOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
: SfxTabPage(pPage, pController, "cui/ui/dbregisterpage.ui", "DbRegisterPage", &rSet)
, m_nOldCount(0)
, m_bModified(false)
, m_xNew(m_xBuilder->weld_button("new"))
@ -117,10 +116,10 @@ DbRegistrationOptionsPage::~DbRegistrationOptionsPage()
delete reinterpret_cast<DatabaseRegistration*>(m_xPathBox->get_id(i).toInt64());
}
std::unique_ptr<SfxTabPage> DbRegistrationOptionsPage::Create( TabPageParent pParent,
std::unique_ptr<SfxTabPage> DbRegistrationOptionsPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet )
{
return std::make_unique<DbRegistrationOptionsPage>(pParent, *rAttrSet);
return std::make_unique<DbRegistrationOptionsPage>(pPage, pController, *rAttrSet);
}
bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet* rCoreSet )

8
cui/source/options/fontsubs.cxx
View File

@ -32,8 +32,8 @@
/* */
/*********************************************************************/
SvxFontSubstTabPage::SvxFontSubstTabPage(TabPageParent pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "cui/ui/optfontspage.ui", "OptFontsPage", &rSet)
SvxFontSubstTabPage::SvxFontSubstTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
: SfxTabPage(pPage, pController, "cui/ui/optfontspage.ui", "OptFontsPage", &rSet)
, m_xConfig(new SvtFontSubstConfig)
, m_bSorted(false)
, m_xUseTableCB(m_xBuilder->weld_check_button("usetable"))
@ -140,10 +140,10 @@ SvxFontSubstTabPage::~SvxFontSubstTabPage()
{
}
std::unique_ptr<SfxTabPage> SvxFontSubstTabPage::Create( TabPageParent pParent,
std::unique_ptr<SfxTabPage> SvxFontSubstTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet)
{
return std::make_unique<SvxFontSubstTabPage>(pParent, *rAttrSet);
return std::make_unique<SvxFontSubstTabPage>(pPage, pController, *rAttrSet);
}
bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* )

4
cui/source/options/fontsubs.hxx
View File

@ -50,8 +50,8 @@ class SvxFontSubstTabPage : public SfxTabPage
void setColSizes();
public:
SvxFontSubstTabPage(TabPageParent pParent, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
SvxFontSubstTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
virtual ~SvxFontSubstTabPage() override;
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;

8
cui/source/options/optaccessibility.cxx
View File

@ -22,9 +22,9 @@
#include <vcl/svapp.hxx>
#include <officecfg/Office/Common.hxx>
SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(TabPageParent pParent,
SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "cui/ui/optaccessibilitypage.ui", "OptAccessibilityPage", &rSet)
: SfxTabPage(pPage, pController, "cui/ui/optaccessibilitypage.ui", "OptAccessibilityPage", &rSet)
, m_xAccessibilityTool(m_xBuilder->weld_check_button("acctool"))
, m_xTextSelectionInReadonly(m_xBuilder->weld_check_button("textselinreadonly"))
, m_xAnimatedGraphics(m_xBuilder->weld_check_button("animatedgraphics"))
@ -43,9 +43,9 @@ SvxAccessibilityOptionsTabPage::~SvxAccessibilityOptionsTabPage()
{
}
std::unique_ptr<SfxTabPage> SvxAccessibilityOptionsTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
std::unique_ptr<SfxTabPage> SvxAccessibilityOptionsTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
return std::make_unique<SvxAccessibilityOptionsTabPage>(pParent, *rAttrSet);
return std::make_unique<SvxAccessibilityOptionsTabPage>(pPage, pController, *rAttrSet);
}
bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* )

4
cui/source/options/optaccessibility.hxx
View File

@ -32,10 +32,10 @@ class SvxAccessibilityOptionsTabPage : public SfxTabPage
std::unique_ptr<weld::CheckButton> m_xPagePreviews;
public:
SvxAccessibilityOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet);
SvxAccessibilityOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxAccessibilityOptionsTabPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
};

8
cui/source/options/optasian.cxx
View File

@ -100,8 +100,8 @@ void SvxAsianLayoutPage_Impl::addForbiddenCharacters(
static LanguageType eLastUsedLanguageTypeForForbiddenCharacters(USHRT_MAX);
SvxAsianLayoutPage::SvxAsianLayoutPage(TabPageParent pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "cui/ui/optasianpage.ui", "OptAsianPage", &rSet)
SvxAsianLayoutPage::SvxAsianLayoutPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
: SfxTabPage(pPage, pController, "cui/ui/optasianpage.ui", "OptAsianPage", &rSet)
, pImpl(new SvxAsianLayoutPage_Impl)
, m_xCharKerningRB(m_xBuilder->weld_radio_button("charkerning"))
, m_xCharPunctKerningRB(m_xBuilder->weld_radio_button("charpunctkerning"))
@ -131,9 +131,9 @@ SvxAsianLayoutPage::~SvxAsianLayoutPage()
{
}
std::unique_ptr<SfxTabPage> SvxAsianLayoutPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
std::unique_ptr<SfxTabPage> SvxAsianLayoutPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
return std::make_unique<SvxAsianLayoutPage>(pParent, *rAttrSet);
return std::make_unique<SvxAsianLayoutPage>(pPage, pController, *rAttrSet);
}
bool SvxAsianLayoutPage::FillItemSet( SfxItemSet* )

8
cui/source/options/optbasic.cxx
View File

@ -21,8 +21,8 @@
#include <basic/codecompletecache.hxx>
#include <officecfg/Office/BasicIDE.hxx>
SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage(TabPageParent pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "cui/ui/optbasicidepage.ui", "OptBasicIDEPage", &rSet)
SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
: SfxTabPage(pPage, pController, "cui/ui/optbasicidepage.ui", "OptBasicIDEPage", &rSet)
, m_xCodeCompleteChk(m_xBuilder->weld_check_button("codecomplete_enable"))
, m_xAutocloseProcChk(m_xBuilder->weld_check_button("autoclose_proc"))
, m_xAutocloseParenChk(m_xBuilder->weld_check_button("autoclose_paren"))
@ -118,9 +118,9 @@ void SvxBasicIDEOptionsPage::Reset( const SfxItemSet* /*rSet*/ )
m_xUseExtendedTypesChk->save_state();
}
std::unique_ptr<SfxTabPage> SvxBasicIDEOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
std::unique_ptr<SfxTabPage> SvxBasicIDEOptionsPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
{
return std::make_unique<SvxBasicIDEOptionsPage>( pParent, *rAttrSet );
return std::make_unique<SvxBasicIDEOptionsPage>(pPage, pController, *rAttrSet);
}
void SvxBasicIDEOptionsPage::FillUserData()

4
cui/source/options/optbasic.hxx
View File

@ -35,10 +35,10 @@ private:
void LoadConfig();
public:
SvxBasicIDEOptionsPage(TabPageParent pParent, const SfxItemSet& rSet);
SvxBasicIDEOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxBasicIDEOptionsPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
virtual void FillUserData() override;

8
cui/source/options/optchart.cxx
View File

@ -88,8 +88,8 @@ void SvxDefaultColorOptPage::FillBoxChartColorLB()
m_xLbChartColors->thaw();
}
SvxDefaultColorOptPage::SvxDefaultColorOptPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
: SfxTabPage(pParent, "cui/ui/optchartcolorspage.ui", "OptChartColorsPage", &rInAttrs)
SvxDefaultColorOptPage::SvxDefaultColorOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
: SfxTabPage(pPage, pController, "cui/ui/optchartcolorspage.ui", "OptChartColorsPage", &rInAttrs)
, m_xLbChartColors(m_xBuilder->weld_tree_view("colors"))
, m_xLbPaletteSelector(m_xBuilder->weld_combo_box("paletteselector"))
, m_xPBDefault(m_xBuilder->weld_button("default"))
@ -141,9 +141,9 @@ void SvxDefaultColorOptPage::Construct()
m_xLbChartColors->select( 0 );
}
std::unique_ptr<SfxTabPage> SvxDefaultColorOptPage::Create( TabPageParent pParent, const SfxItemSet* rAttrs )
std::unique_ptr<SfxTabPage> SvxDefaultColorOptPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrs )
{
return std::make_unique<SvxDefaultColorOptPage>( pParent, *rAttrs );
return std::make_unique<SvxDefaultColorOptPage>( pPage, pController, *rAttrs );
}
bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet* rOutAttrs )

4
cui/source/options/optchart.hxx
View File

@ -65,12 +65,12 @@ private:
void FillBoxChartColorLB();
public:
SvxDefaultColorOptPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
SvxDefaultColorOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxDefaultColorOptPage() override;
void Construct();
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;

10
cui/source/options/optcolor.cxx
View File

@ -693,13 +693,13 @@ IMPL_LINK(ColorConfigCtrl_Impl, ControlFocusHdl, weld::Widget&, rCtrl, void)
}
// SvxColorOptionsTabPage
SvxColorOptionsTabPage::SvxColorOptionsTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet)
: SfxTabPage(pParent, "cui/ui/optappearancepage.ui", "OptAppearancePage", &rCoreSet)
SvxColorOptionsTabPage::SvxColorOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet)
: SfxTabPage(pPage, pController, "cui/ui/optappearancepage.ui", "OptAppearancePage", &rCoreSet)
, bFillItemSetCalled(false)
, m_xColorSchemeLB(m_xBuilder->weld_combo_box("colorschemelb"))
, m_xSaveSchemePB(m_xBuilder->weld_button("save"))
, m_xDeleteSchemePB(m_xBuilder->weld_button("delete"))
, m_xColorConfigCT(new ColorConfigCtrl_Impl(pParent.GetFrameWeld(), *m_xBuilder))
, m_xColorConfigCT(new ColorConfigCtrl_Impl(pController->getDialog(), *m_xBuilder))
, m_xTable(m_xBuilder->weld_widget("table"))
, m_xOnFT(m_xBuilder->weld_label("on"))
, m_xElementFT(m_xBuilder->weld_label("uielements"))
@ -743,9 +743,9 @@ SvxColorOptionsTabPage::~SvxColorOptionsTabPage()
m_xColorConfigCT.reset();
}
std::unique_ptr<SfxTabPage> SvxColorOptionsTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
std::unique_ptr<SfxTabPage> SvxColorOptionsTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
return std::make_unique<SvxColorOptionsTabPage>(pParent, *rAttrSet);
return std::make_unique<SvxColorOptionsTabPage>(pPage, pController, *rAttrSet);
}
bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet* )

4
cui/source/options/optcolor.hxx
View File

@ -49,10 +49,10 @@ class SvxColorOptionsTabPage : public SfxTabPage
void UpdateColorConfig();
public:
SvxColorOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet);
SvxColorOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxColorOptionsTabPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;

8
cui/source/options/optctl.cxx
View File

@ -37,8 +37,8 @@ IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl, weld::Button&, void)
}
}
SvxCTLOptionsPage::SvxCTLOptionsPage(TabPageParent pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "cui/ui/optctlpage.ui", "OptCTLPage", &rSet)
SvxCTLOptionsPage::SvxCTLOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
: SfxTabPage(pPage, pController, "cui/ui/optctlpage.ui", "OptCTLPage", &rSet)
, m_xSequenceCheckingCB(m_xBuilder->weld_check_button("sequencechecking"))
, m_xRestrictedCB(m_xBuilder->weld_check_button("restricted"))
, m_xTypeReplaceCB(m_xBuilder->weld_check_button("typeandreplace"))
@ -53,9 +53,9 @@ SvxCTLOptionsPage::~SvxCTLOptionsPage()
{
}
std::unique_ptr<SfxTabPage> SvxCTLOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
std::unique_ptr<SfxTabPage> SvxCTLOptionsPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
{
return std::make_unique<SvxCTLOptionsPage>( pParent, *rAttrSet );
return std::make_unique<SvxCTLOptionsPage>( pPage, pController, *rAttrSet );
}
bool SvxCTLOptionsPage::FillItemSet( SfxItemSet* )

4
cui/source/options/optctl.hxx
View File

@ -36,9 +36,9 @@ private:
DECL_LINK( SequenceCheckingCB_Hdl, weld::Button&, void );
public:
SvxCTLOptionsPage(TabPageParent pParent, const SfxItemSet& rSet);
SvxCTLOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxCTLOptionsPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
};

16
cui/source/options/optfltr.cxx
View File

@ -36,8 +36,8 @@ enum class MSFltrPg2_CheckBoxEntries {
};
OfaMSFilterTabPage::OfaMSFilterTabPage(TabPageParent pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "cui/ui/optfltrpage.ui", "OptFltrPage", &rSet)
OfaMSFilterTabPage::OfaMSFilterTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
: SfxTabPage(pPage, pController, "cui/ui/optfltrpage.ui", "OptFltrPage", &rSet)
, m_xWBasicCodeCB(m_xBuilder->weld_check_button("wo_basic"))
, m_xWBasicWbctblCB(m_xBuilder->weld_check_button("wo_exec"))
, m_xWBasicStgCB(m_xBuilder->weld_check_button("wo_saveorig"))
@ -65,10 +65,10 @@ IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, weld::Button&,
m_xEBasicExectblCB->set_sensitive(m_xEBasicCodeCB->get_active());
}
std::unique_ptr<SfxTabPage> OfaMSFilterTabPage::Create( TabPageParent pParent,
std::unique_ptr<SfxTabPage> OfaMSFilterTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet )
{
return std::make_unique<OfaMSFilterTabPage>(pParent, *rAttrSet);
return std::make_unique<OfaMSFilterTabPage>(pPage, pController, *rAttrSet);
}
bool OfaMSFilterTabPage::FillItemSet( SfxItemSet* )
@ -123,8 +123,8 @@ void OfaMSFilterTabPage::Reset( const SfxItemSet* )
m_xPBasicStgCB->save_state();
}
OfaMSFilterTabPage2::OfaMSFilterTabPage2(TabPageParent pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "cui/ui/optfltrembedpage.ui", "OptFilterPage", &rSet)
OfaMSFilterTabPage2::OfaMSFilterTabPage2(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
: SfxTabPage(pPage, pController, "cui/ui/optfltrembedpage.ui", "OptFilterPage", &rSet)
, sChgToFromMath(CuiResId(RID_SVXSTR_CHG_MATH))
, sChgToFromWriter(CuiResId(RID_SVXSTR_CHG_WRITER))
, sChgToFromCalc(CuiResId(RID_SVXSTR_CHG_CALC))
@ -147,10 +147,10 @@ OfaMSFilterTabPage2::~OfaMSFilterTabPage2()
{
}
std::unique_ptr<SfxTabPage> OfaMSFilterTabPage2::Create( TabPageParent pParent,
std::unique_ptr<SfxTabPage> OfaMSFilterTabPage2::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet )
{
return std::make_unique<OfaMSFilterTabPage2>( pParent, *rAttrSet );
return std::make_unique<OfaMSFilterTabPage2>( pPage, pController, *rAttrSet );
}
bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* )

8
cui/source/options/optfltr.hxx
View File

@ -35,10 +35,10 @@ class OfaMSFilterTabPage : public SfxTabPage
DECL_LINK(LoadWordBasicCheckHdl_Impl, weld::Button&, void);
DECL_LINK(LoadExcelBasicCheckHdl_Impl, weld::Button&, void);
public:
OfaMSFilterTabPage(TabPageParent pParent, const SfxItemSet& rSet );
OfaMSFilterTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet );
virtual ~OfaMSFilterTabPage() override;
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
@ -68,8 +68,8 @@ class OfaMSFilterTabPage2 : public SfxTabPage
int GetEntry4Type( MSFltrPg2_CheckBoxEntries _nType ) const;
public:
OfaMSFilterTabPage2(TabPageParent pParent, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
OfaMSFilterTabPage2(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
virtual ~OfaMSFilterTabPage2() override;
virtual bool FillItemSet( SfxItemSet* rSet ) override;

Some files were not shown because too many files have changed in this diff Show More