place an intermediate class as parent for SfxTabPages
so a SfxTabPage can be parented by a vcl::Window or a welded native notebook tabpage.
That ways the same SfxTabPage can be used at the same time in both a native dialog
or a vcl dialog. The impl can be changed to the weld api, and when hosted in a native
dialog the vcl impl of that will be instantiated, while native otherwise. e.g.
print options appearing in print options dialog and general options.
This allows incremental changeover.
Change-Id: I6f1fed1e8d0898b01853bb878757bad41cbf9bba
Reviewed-on: https://gerrit.libreoffice.org/53193
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index bd37fc0..ae0006c 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -98,9 +98,9 @@ void SchAxisLabelTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SchAxisLabelTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrs )
VclPtr<SfxTabPage> SchAxisLabelTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrs )
{
return VclPtr<SchAxisLabelTabPage>::Create( pParent, *rAttrs );
return VclPtr<SchAxisLabelTabPage>::Create( pParent.pParent, *rAttrs );
}
bool SchAxisLabelTabPage::FillItemSet( SfxItemSet* rOutAttrs )
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index 7eda50a..b260f6d 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -69,7 +69,7 @@ public:
virtual ~SchAxisLabelTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rInAttrs );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 2739f24..fc4fbe1 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -105,9 +105,9 @@ void AxisPositionsTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> AxisPositionsTabPage::Create(vcl::Window* pWindow,const SfxItemSet* rOutAttrs)
VclPtr<SfxTabPage> AxisPositionsTabPage::Create(TabPageParent pWindow,const SfxItemSet* rOutAttrs)
{
return VclPtr<AxisPositionsTabPage>::Create(pWindow, *rOutAttrs);
return VclPtr<AxisPositionsTabPage>::Create(pWindow.pParent, *rOutAttrs);
}
bool AxisPositionsTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
index e5bacaf..5359e34 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
@@ -36,7 +36,7 @@ public:
virtual ~AxisPositionsTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rInAttrs );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;
using TabPage::DeactivatePage;
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx
index 8d97984..9d92ffa 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx
@@ -33,9 +33,9 @@ DataLabelsTabPage::DataLabelsTabPage(vcl::Window* pWindow, const SfxItemSet& rIn
{
}
VclPtr<SfxTabPage> DataLabelsTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rOutAttrs)
VclPtr<SfxTabPage> DataLabelsTabPage::Create(TabPageParent pWindow, const SfxItemSet* rOutAttrs)
{
return VclPtr<DataLabelsTabPage>::Create(pWindow, *rOutAttrs);
return VclPtr<DataLabelsTabPage>::Create(pWindow.pParent, *rOutAttrs);
}
bool DataLabelsTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx
index 3b8836e..3abb439 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx
@@ -32,7 +32,7 @@ class DataLabelsTabPage : public SfxTabPage
public:
DataLabelsTabPage(vcl::Window* pWindow, const SfxItemSet& rInAttrs);
static VclPtr<SfxTabPage> Create(vcl::Window* pWindow, const SfxItemSet* rInAttrs);
static VclPtr<SfxTabPage> Create(TabPageParent pWindow, const SfxItemSet* rInAttrs);
void SetNumberFormatter( SvNumberFormatter* pFormatter );
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
index e2f6a0b..f2a8084 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
@@ -41,9 +41,9 @@ ErrorBarsTabPage::ErrorBarsTabPage( vcl::Window* pParent, const SfxItemSet& rInA
}
VclPtr<SfxTabPage> ErrorBarsTabPage::Create(
vcl::Window* pParent, const SfxItemSet* rOutAttrs )
TabPageParent pParent, const SfxItemSet* rOutAttrs )
{
return VclPtr<ErrorBarsTabPage>::Create( pParent, *rOutAttrs );
return VclPtr<ErrorBarsTabPage>::Create( pParent.pParent, *rOutAttrs );
}
bool ErrorBarsTabPage::FillItemSet( SfxItemSet* rOutAttrs )
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.hxx b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
index eb53cdc..9c065f7 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
@@ -36,7 +36,7 @@ public:
void SetChartDocumentForRangeChoosing(
const css::uno::Reference< css::chart2::XChartDocument > & xChartDocument );
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rInAttrs );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index 836aa0a..e572d80 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -52,9 +52,9 @@ void SchLegendPosTabPage::dispose()
}
VclPtr<SfxTabPage> SchLegendPosTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rOutAttrs)
VclPtr<SfxTabPage> SchLegendPosTabPage::Create(TabPageParent pWindow, const SfxItemSet* rOutAttrs)
{
return VclPtr<SchLegendPosTabPage>::Create(pWindow, *rOutAttrs);
return VclPtr<SchLegendPosTabPage>::Create(pWindow.pParent, *rOutAttrs);
}
bool SchLegendPosTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
index 3150f72..7fd77f9 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
@@ -40,7 +40,7 @@ public:
virtual ~SchLegendPosTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rInAttrs);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
virtual void Reset(const SfxItemSet* rInAttrs) override;
};
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index 9269413..2350c3e 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -48,10 +48,10 @@ void SchLayoutTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SchLayoutTabPage::Create(vcl::Window* pWindow,
VclPtr<SfxTabPage> SchLayoutTabPage::Create(TabPageParent pWindow,
const SfxItemSet* rOutAttrs)
{
return VclPtr<SchLayoutTabPage>::Create(pWindow, *rOutAttrs);
return VclPtr<SchLayoutTabPage>::Create(pWindow.pParent, *rOutAttrs);
}
bool SchLayoutTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
index d2cb915..f095435 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
@@ -32,7 +32,7 @@ public:
virtual ~SchLayoutTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rInAttrs);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
virtual void Reset(const SfxItemSet* rInAttrs) override;
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index b5b0b0b..e756d7a 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -61,9 +61,9 @@ void PolarOptionsTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> PolarOptionsTabPage::Create( vcl::Window* pWindow,const SfxItemSet* rOutAttrs )
VclPtr<SfxTabPage> PolarOptionsTabPage::Create( TabPageParent pWindow,const SfxItemSet* rOutAttrs )
{
return VclPtr<PolarOptionsTabPage>::Create( pWindow, *rOutAttrs );
return VclPtr<PolarOptionsTabPage>::Create( pWindow.pParent, *rOutAttrs );
}
bool PolarOptionsTabPage::FillItemSet( SfxItemSet* rOutAttrs )
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
index 363cf15..7e7907c 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
@@ -36,7 +36,7 @@ public:
virtual ~PolarOptionsTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rInAttrs);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
virtual void Reset(const SfxItemSet* rInAttrs) override;
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 868dc28..b785414 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -265,9 +265,9 @@ IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl, ListBox&, void)
SetNumFormat();
}
VclPtr<SfxTabPage> ScaleTabPage::Create(vcl::Window* pWindow,const SfxItemSet* rOutAttrs)
VclPtr<SfxTabPage> ScaleTabPage::Create(TabPageParent pWindow,const SfxItemSet* rOutAttrs)
{
return VclPtr<ScaleTabPage>::Create(pWindow, *rOutAttrs);
return VclPtr<ScaleTabPage>::Create(pWindow.pParent, *rOutAttrs);
}
bool ScaleTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index 75c869d..ec89fb4 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -36,7 +36,7 @@ public:
virtual ~ScaleTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rInAttrs );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;
using TabPage::DeactivatePage;
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index 9e110cd..9690c47 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -96,10 +96,10 @@ IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl, Button*, void)
m_pCBAxisSideBySide->Enable( m_pRbtAxis1->IsChecked());
}
VclPtr<SfxTabPage> SchOptionTabPage::Create(vcl::Window* pWindow,
VclPtr<SfxTabPage> SchOptionTabPage::Create(TabPageParent pWindow,
const SfxItemSet* rOutAttrs)
{
return VclPtr<SchOptionTabPage>::Create(pWindow, *rOutAttrs);
return VclPtr<SchOptionTabPage>::Create(pWindow.pParent, *rOutAttrs);
}
bool SchOptionTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index 5051d7c..d2d6711 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -34,7 +34,7 @@ public:
virtual ~SchOptionTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rInAttrs);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
virtual void Reset(const SfxItemSet* rInAttrs) override;
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index 369f8a7..d452167 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -72,16 +72,16 @@ void SchAlignmentTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SchAlignmentTabPage::Create(vcl::Window* pParent,
VclPtr<SfxTabPage> SchAlignmentTabPage::Create(TabPageParent pParent,
const SfxItemSet* rInAttrs)
{
return VclPtr<SchAlignmentTabPage>::Create(pParent, *rInAttrs);
return VclPtr<SchAlignmentTabPage>::Create(pParent.pParent, *rInAttrs);
}
VclPtr<SfxTabPage> SchAlignmentTabPage::CreateWithoutRotation(vcl::Window* pParent,
VclPtr<SfxTabPage> SchAlignmentTabPage::CreateWithoutRotation(TabPageParent pParent,
const SfxItemSet* rInAttrs)
{
return VclPtr<SchAlignmentTabPage>::Create(pParent, *rInAttrs, false);
return VclPtr<SchAlignmentTabPage>::Create(pParent.pParent, *rInAttrs, false);
}
bool SchAlignmentTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
index f747179..aa49e4f 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -45,8 +45,8 @@ public:
virtual ~SchAlignmentTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rInAttrs);
static VclPtr<SfxTabPage> CreateWithoutRotation(vcl::Window* pParent, const SfxItemSet* rInAttrs);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
static VclPtr<SfxTabPage> CreateWithoutRotation(TabPageParent pParent, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
virtual void Reset(const SfxItemSet* rInAttrs) override;
};
diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx
index 176ba72..8909c11 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.cxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.cxx
@@ -31,9 +31,9 @@ TrendlineTabPage::TrendlineTabPage( vcl::Window* pParent, const SfxItemSet& rInA
}
VclPtr<SfxTabPage> TrendlineTabPage::Create(
vcl::Window* pParent, const SfxItemSet* rOutAttrs )
TabPageParent pParent, const SfxItemSet* rOutAttrs )
{
return VclPtr<TrendlineTabPage>::Create( pParent, *rOutAttrs );
return VclPtr<TrendlineTabPage>::Create( pParent.pParent, *rOutAttrs );
}
bool TrendlineTabPage::FillItemSet( SfxItemSet* rOutAttrs )
diff --git a/chart2/source/controller/dialogs/tp_Trendline.hxx b/chart2/source/controller/dialogs/tp_Trendline.hxx
index 5f991cf..8981939 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.hxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.hxx
@@ -31,7 +31,7 @@ class TrendlineTabPage : public SfxTabPage
public:
TrendlineTabPage ( vcl::Window* pParent, const SfxItemSet& rInAttrs );
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rInAttrs );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 762570f..fb1195c 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -175,29 +175,29 @@ SvxConfigPage::CanConfig( const OUString& aModuleId )
return !(aModuleId == "com.sun.star.script.BasicIDE" || aModuleId == "com.sun.star.frame.Bibliography");
}
VclPtr<SfxTabPage> CreateSvxMenuConfigPage( vcl::Window *pParent, const SfxItemSet* rSet )
VclPtr<SfxTabPage> CreateSvxMenuConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
{
return VclPtr<SvxMenuConfigPage>::Create( pParent, *rSet );
return VclPtr<SvxMenuConfigPage>::Create( pParent.pParent, *rSet );
}
VclPtr<SfxTabPage> CreateSvxContextMenuConfigPage( vcl::Window *pParent, const SfxItemSet* rSet )
VclPtr<SfxTabPage> CreateSvxContextMenuConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
{
return VclPtr<SvxMenuConfigPage>::Create( pParent, *rSet, false );
return VclPtr<SvxMenuConfigPage>::Create( pParent.pParent, *rSet, false );
}
VclPtr<SfxTabPage> CreateKeyboardConfigPage( vcl::Window *pParent, const SfxItemSet* rSet )
VclPtr<SfxTabPage> CreateKeyboardConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
{
return VclPtr<SfxAcceleratorConfigPage>::Create( pParent, *rSet );
return VclPtr<SfxAcceleratorConfigPage>::Create( pParent.pParent, *rSet );
}
VclPtr<SfxTabPage> CreateSvxToolbarConfigPage( vcl::Window *pParent, const SfxItemSet* rSet )
VclPtr<SfxTabPage> CreateSvxToolbarConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
{
return VclPtr<SvxToolbarConfigPage>::Create( pParent, *rSet );
return VclPtr<SvxToolbarConfigPage>::Create( pParent.pParent, *rSet );
}
VclPtr<SfxTabPage> CreateSvxEventConfigPage( vcl::Window *pParent, const SfxItemSet* rSet )
VclPtr<SfxTabPage> CreateSvxEventConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
{
return VclPtr<SvxEventConfigPage>::Create( pParent, *rSet, SvxEventConfigPage::EarlyInit() );
return VclPtr<SvxEventConfigPage>::Create( pParent.pParent, *rSet, SvxEventConfigPage::EarlyInit() );
}
/******************************************************************************
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 9ed4eca..972dbc0 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -701,9 +701,9 @@ bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet* /*rSet*/ )
return true;
}
VclPtr<SfxTabPage> TPGalleryThemeGeneral::Create( vcl::Window* pParent, const SfxItemSet* rSet )
VclPtr<SfxTabPage> TPGalleryThemeGeneral::Create( TabPageParent pParent, const SfxItemSet* rSet )
{
return VclPtr<TPGalleryThemeGeneral>::Create( pParent, *rSet );
return VclPtr<TPGalleryThemeGeneral>::Create( pParent.pParent, *rSet );
}
@@ -796,9 +796,9 @@ void TPGalleryThemeProperties::dispose()
}
VclPtr<SfxTabPage> TPGalleryThemeProperties::Create( vcl::Window* pParent, const SfxItemSet* rSet )
VclPtr<SfxTabPage> TPGalleryThemeProperties::Create( TabPageParent pParent, const SfxItemSet* rSet )
{
return VclPtr<TPGalleryThemeProperties>::Create( pParent, *rSet );
return VclPtr<TPGalleryThemeProperties>::Create( pParent.pParent, *rSet );
}
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index 1a90d4a..6edfd8b 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -60,7 +60,7 @@ public:
virtual ~AlignmentTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
static const sal_uInt16* GetRanges() { return s_pRanges; }
virtual bool FillItemSet( SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 14915f6..ecef0e8 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -112,7 +112,7 @@ public:
virtual ~OfaAutocorrOptionsPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
@@ -172,7 +172,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
virtual void dispose() override;
public:
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
@@ -278,7 +278,7 @@ public:
virtual ~OfaAutocorrReplacePage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet);
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
@@ -337,7 +337,7 @@ public:
virtual ~OfaAutocorrExceptPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
@@ -402,7 +402,7 @@ public:
virtual ~OfaQuoteTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
@@ -455,7 +455,7 @@ private:
public:
virtual ~OfaAutoCompleteTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
@@ -521,7 +521,7 @@ public:
virtual ~OfaSmartTagOptionsTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet);
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index e25b204..8f5a9c9 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -49,7 +49,7 @@ class SvxBackgroundTabPage : public SvxTabPage
friend class VclPtr<SvxBackgroundTabPage>;
static const sal_uInt16 pPageRanges[];
public:
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
// returns the area of the which-values
static const sal_uInt16* GetRanges() { return pPageRanges; }
@@ -152,7 +152,7 @@ public:
virtual ~SvxBkgTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
virtual void PageCreated( const SfxAllItemSet& aSet ) override;
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index b8fb44b..e596380 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -49,7 +49,7 @@ class SvxBorderTabPage : public SfxTabPage
public:
virtual ~SvxBorderTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
static const sal_uInt16* GetRanges() { return pRanges; }
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 38343104..144b13e 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -150,7 +150,7 @@ public:
virtual ~SvxCharNamePage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges() { return pNameRanges; }
virtual void Reset( const SfxItemSet* rSet ) override;
@@ -238,7 +238,7 @@ public:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
public:
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges() { return pEffectsRanges; }
virtual void Reset( const SfxItemSet* rSet ) override;
@@ -315,7 +315,7 @@ public:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
public:
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges() { return pPositionRanges; }
virtual void Reset( const SfxItemSet* rSet ) override;
@@ -360,7 +360,7 @@ public:
virtual void ActivatePage( const SfxItemSet& rSet ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges() { return pTwoLinesRanges; }
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index 7bacaac..5c034d2 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -67,7 +67,7 @@ public:
virtual ~SvxConnectionPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 1aeaa2e..e9c96b5 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -231,7 +231,7 @@ public:
void SetXChgData( ExchangeData* pData );
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
};
class TPGalleryThemeProperties : public SfxTabPage
@@ -296,7 +296,7 @@ public:
void StartSearchFiles( const OUString& _rFolderURL, short _nDlgResult );
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
};
#endif // INCLUDED_CUI_SOURCE_INC_CUIGALDLG_HXX
diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index b612ccf..7e2c753 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -72,7 +72,7 @@ public:
virtual ~SvxGeneralTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 6d6997e..ce7fea8 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -195,7 +195,7 @@ public:
virtual ~SvxTransparenceTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window*, const SfxItemSet*);
static VclPtr<SfxTabPage> Create(TabPageParent, const SfxItemSet*);
static const sal_uInt16* GetRanges() { return pTransparenceRanges; }
virtual bool FillItemSet(SfxItemSet*) override;
@@ -263,7 +263,7 @@ public:
virtual ~SvxAreaTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pAreaRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
@@ -324,7 +324,7 @@ public:
virtual ~SvxShadowTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pShadowRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
@@ -402,7 +402,7 @@ public:
void Construct();
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
@@ -473,7 +473,7 @@ public:
void Construct();
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
@@ -557,7 +557,7 @@ public:
void Construct();
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
@@ -615,7 +615,7 @@ public:
void Construct();
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
@@ -734,7 +734,7 @@ public:
void Construct();
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index aaefe35..eadb4e0 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -202,7 +202,7 @@ public:
void Construct();
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pLineRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
@@ -300,7 +300,7 @@ public:
void Construct();
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
@@ -365,7 +365,7 @@ public:
void Construct();
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 3d3b259..8204dec 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -86,7 +86,7 @@ namespace svx
virtual ~DbRegistrationOptionsPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index 8709661..887a937 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -109,7 +109,7 @@ class SvxGrfCropPage : public SfxTabPage
Size GetGrfOrigSize( const Graphic& ) const;
public:
static VclPtr<SfxTabPage> Create( vcl::Window *pParent, const SfxItemSet *rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet *rSet );
virtual bool FillItemSet( SfxItemSet *rSet ) override;
virtual void Reset( const SfxItemSet *rSet ) override;
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 3fa0179..631b662 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -83,7 +83,7 @@ public:
virtual ~SvxCaptionTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pCaptionRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index dd34296..1ed414b 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -76,7 +76,7 @@ public:
bool IsReadOnly() const override;
// --------- inherit from the base -------------
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
};
class SfxMacroAssignDlg : public SfxSingleTabDialog
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index bebb57e..721f7d4 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -72,7 +72,7 @@ public:
virtual ~SvxMeasurePage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 8e8d857..56e0fb8 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -69,7 +69,7 @@ public:
virtual ~SvxNumberFormatTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet );
// Returns area information.
static const sal_uInt16* GetRanges() { return pRanges; }
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 8732edb..d5e92dc 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -106,7 +106,7 @@ public:
virtual ~SvxSingleNumPickTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
@@ -139,7 +139,7 @@ public:
virtual ~SvxBulletPickTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
@@ -181,7 +181,7 @@ public:
virtual ~SvxNumPickTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
@@ -226,7 +226,7 @@ public:
virtual ~SvxBitmapPickTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
@@ -335,7 +335,7 @@ public:
virtual ~SvxNumOptionsTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
@@ -434,7 +434,7 @@ public:
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
void SetMetric(FieldUnit eSet);
diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx
index bdf0575..d46fdd1 100644
--- a/cui/source/inc/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
@@ -58,7 +58,7 @@ public:
virtual ~SvxAsianLayoutPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index d538446..04ca334 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -149,7 +149,7 @@ private:
public:
virtual ~SvxLinguTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index d37571e..a9d72a5 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -74,7 +74,7 @@ public:
virtual ~SvxPathTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 72838e5..7f24edc 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -181,7 +181,7 @@ protected:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
public:
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
// returns the range of the Which values
static const sal_uInt16* GetRanges() { return pRanges; }
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index bc79add..e46168d 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -105,7 +105,7 @@ public:
DECL_LINK(ELRLoseFocusHdl, Control&, void);
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges() { return pStdRanges; }
virtual bool FillItemSet( SfxItemSet* rSet ) override;
@@ -169,7 +169,7 @@ public:
virtual ~SvxParaAlignTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges() { return pAlignRanges; }
virtual bool FillItemSet( SfxItemSet* rSet ) override;
@@ -204,7 +204,7 @@ public:
virtual ~SvxExtParagraphTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rSet );
static const sal_uInt16* GetRanges() { return pExtRanges; }
@@ -287,7 +287,7 @@ public:
virtual ~SvxAsianTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index 0f8924a..b10e2ca 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -124,7 +124,7 @@ public:
virtual ~SvxSwPosSizeTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index e5e1f7d..289de2b 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -52,7 +52,7 @@ class SvxTabulatorTabPage : public SfxTabPage
public:
virtual ~SvxTabulatorTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges() { return pRanges; }
virtual bool FillItemSet( SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index 37ff656..0d568d7 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -84,7 +84,7 @@ public:
virtual ~SvxTextAnimationPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index 88b7784..5c96c71 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -84,7 +84,7 @@ public:
virtual ~SvxTextAttrPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 7222f09..8a24987 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -140,7 +140,7 @@ public:
virtual ~SvxPositionSizeTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pPosSizeRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
@@ -198,7 +198,7 @@ public:
virtual ~SvxAngleTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pAngleRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
@@ -251,7 +251,7 @@ public:
virtual ~SvxSlantTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pSlantRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 3a542707..89a052e 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -331,9 +331,9 @@ namespace offapp
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> ConnectionPoolOptionsPage::Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet)
VclPtr<SfxTabPage> ConnectionPoolOptionsPage::Create(TabPageParent _pParent, const SfxItemSet* _rAttrSet)
{
return VclPtr<ConnectionPoolOptionsPage>::Create(_pParent, *_rAttrSet);
return VclPtr<ConnectionPoolOptionsPage>::Create(_pParent.pParent, *_rAttrSet);
}
void ConnectionPoolOptionsPage::implInitControls(const SfxItemSet& _rSet)
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index 36f06b7..cfbd148 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -50,7 +50,7 @@ namespace offapp
ConnectionPoolOptionsPage(vcl::Window* _pParent, const SfxItemSet& _rAttrSet);
virtual ~ConnectionPoolOptionsPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet);
static VclPtr<SfxTabPage> Create(TabPageParent _pParent, const SfxItemSet* _rAttrSet);
private:
virtual bool EventNotify( NotifyEvent& _rNEvt ) override;
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 672617a..200436c 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -177,10 +177,10 @@ void DbRegistrationOptionsPage::dispose()
}
VclPtr<SfxTabPage> DbRegistrationOptionsPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> DbRegistrationOptionsPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet )
{
return VclPtr<DbRegistrationOptionsPage>::Create( pParent, *rAttrSet );
return VclPtr<DbRegistrationOptionsPage>::Create( pParent.pParent, *rAttrSet );
}
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index d627126..b500f01 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -154,10 +154,10 @@ void SvxFontSubstTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SvxFontSubstTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SvxFontSubstTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
return VclPtr<SvxFontSubstTabPage>::Create(pParent, *rAttrSet);
return VclPtr<SvxFontSubstTabPage>::Create(pParent.pParent, *rAttrSet);
}
bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index e016bf8..3c7e30c 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -97,7 +97,7 @@ class SvxFontSubstTabPage : public SfxTabPage
public:
SvxFontSubstTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet);
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
};
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index 65d1423..5d4bd2e 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -59,9 +59,9 @@ void SvxAccessibilityOptionsTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SvxAccessibilityOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
VclPtr<SfxTabPage> SvxAccessibilityOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<SvxAccessibilityOptionsTabPage>::Create(pParent, *rAttrSet);
return VclPtr<SvxAccessibilityOptionsTabPage>::Create(pParent.pParent, *rAttrSet);
}
bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx
index f5e161b..d451d19 100644
--- a/cui/source/options/optaccessibility.hxx
+++ b/cui/source/options/optaccessibility.hxx
@@ -37,7 +37,7 @@ public:
virtual ~SvxAccessibilityOptionsTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
};
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index caccaaf..c2a5030 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -163,9 +163,9 @@ void SvxAsianLayoutPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SvxAsianLayoutPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
VclPtr<SfxTabPage> SvxAsianLayoutPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<SvxAsianLayoutPage>::Create(pParent, *rAttrSet);
return VclPtr<SvxAsianLayoutPage>::Create(pParent.pParent, *rAttrSet);
}
bool SvxAsianLayoutPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index 9795c1d..688b4e7 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -137,9 +137,9 @@ void SvxBasicIDEOptionsPage::Reset( const SfxItemSet* /*rSet*/ )
pUseExtendedTypesChk->SaveValue();
}
VclPtr<SfxTabPage> SvxBasicIDEOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
VclPtr<SfxTabPage> SvxBasicIDEOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<SvxBasicIDEOptionsPage>::Create( pParent, *rAttrSet );
return VclPtr<SvxBasicIDEOptionsPage>::Create( pParent.pParent, *rAttrSet );
}
void SvxBasicIDEOptionsPage::FillUserData()
diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx
index fe63db8..9e27746 100644
--- a/cui/source/options/optbasic.hxx
+++ b/cui/source/options/optbasic.hxx
@@ -41,7 +41,7 @@ public:
virtual ~SvxBasicIDEOptionsPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
virtual void FillUserData() override;
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 2a212bdc..feba29e 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -190,9 +190,9 @@ void SvxDefaultColorOptPage::Construct()
}
VclPtr<SfxTabPage> SvxDefaultColorOptPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrs )
VclPtr<SfxTabPage> SvxDefaultColorOptPage::Create( TabPageParent pParent, const SfxItemSet* rAttrs )
{
return VclPtr<SvxDefaultColorOptPage>::Create( pParent, *rAttrs );
return VclPtr<SvxDefaultColorOptPage>::Create( pParent.pParent, *rAttrs );
}
bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet* rOutAttrs )
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 79af3c1..97ae4b2 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -70,7 +70,7 @@ public:
void Construct();
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rInAttrs );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;
};
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index a273888..a6538fd 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -1031,9 +1031,9 @@ void SvxColorOptionsTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SvxColorOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
VclPtr<SfxTabPage> SvxColorOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<SvxColorOptionsTabPage>::Create( pParent, *rAttrSet );
return VclPtr<SvxColorOptionsTabPage>::Create( pParent.pParent, *rAttrSet );
}
bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index f91a231..36e1063 100644
--- a/cui/source/options/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
@@ -51,7 +51,7 @@ public:
virtual ~SvxColorOptionsTabPage( ) override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index ffdffcd..a6bf4d8 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -70,9 +70,9 @@ void SvxCTLOptionsPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SvxCTLOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
VclPtr<SfxTabPage> SvxCTLOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<SvxCTLOptionsPage>::Create( pParent, *rAttrSet );
return VclPtr<SvxCTLOptionsPage>::Create( pParent.pParent, *rAttrSet );
}
bool SvxCTLOptionsPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx
index b377fda..05106a3c 100644
--- a/cui/source/options/optctl.hxx
+++ b/cui/source/options/optctl.hxx
@@ -45,7 +45,7 @@ public:
SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~SvxCTLOptionsPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
};
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 39073bc..86d4cc4 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -82,10 +82,10 @@ IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, Button*, void)
aEBasicExectblCB->Enable( aEBasicCodeCB->IsChecked() );
}
VclPtr<SfxTabPage> OfaMSFilterTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> OfaMSFilterTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet )
{
return VclPtr<OfaMSFilterTabPage>::Create( pParent, *rAttrSet );
return VclPtr<OfaMSFilterTabPage>::Create( pParent.pParent, *rAttrSet );
}
bool OfaMSFilterTabPage::FillItemSet( SfxItemSet* )
@@ -188,10 +188,10 @@ void OfaMSFilterTabPage2::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> OfaMSFilterTabPage2::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> OfaMSFilterTabPage2::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet )
{
return VclPtr<OfaMSFilterTabPage2>::Create( pParent, *rAttrSet );
return VclPtr<OfaMSFilterTabPage2>::Create( pParent.pParent, *rAttrSet );
}
bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index 4ef6cf3..0547ca3 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -44,7 +44,7 @@ public:
virtual ~OfaMSFilterTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
@@ -97,7 +97,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage
public:
OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet& rSet );
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 4dcb914..eca23fb 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -327,9 +327,9 @@ void OfaMiscTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> OfaMiscTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
VclPtr<SfxTabPage> OfaMiscTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<OfaMiscTabPage>::Create( pParent, *rAttrSet );
return VclPtr<OfaMiscTabPage>::Create( pParent.pParent, *rAttrSet );
}
bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
@@ -736,9 +736,9 @@ IMPL_LINK_NOARG( OfaViewTabPage, OnAntialiasingToggled, CheckBox&, void )
}
#endif
VclPtr<SfxTabPage> OfaViewTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
VclPtr<SfxTabPage> OfaViewTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<OfaViewTabPage>::Create(pParent, *rAttrSet);
return VclPtr<OfaViewTabPage>::Create(pParent.pParent, *rAttrSet);
}
bool OfaViewTabPage::FillItemSet( SfxItemSet* )
@@ -1298,9 +1298,9 @@ void OfaLanguagesTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> OfaLanguagesTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
VclPtr<SfxTabPage> OfaLanguagesTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<OfaLanguagesTabPage>::Create(pParent, *rAttrSet);
return VclPtr<OfaLanguagesTabPage>::Create(pParent.pParent, *rAttrSet);
}
static void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBoolItems[], sal_uInt16 nCount)
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index ceba711..852b847 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -70,7 +70,7 @@ public:
virtual ~OfaMiscTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
@@ -128,7 +128,7 @@ public:
virtual ~OfaViewTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
@@ -174,7 +174,7 @@ public:
virtual ~OfaLanguagesTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index f5c2167..988bdc2 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -349,9 +349,9 @@ void SvxGeneralTabPage::SetLinks ()
}
VclPtr<SfxTabPage> SvxGeneralTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
VclPtr<SfxTabPage> SvxGeneralTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<SvxGeneralTabPage>::Create( pParent, *rAttrSet );
return VclPtr<SvxGeneralTabPage>::Create( pParent.pParent, *rAttrSet );
}
bool SvxGeneralTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 824c4a1..23a628c 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -88,10 +88,10 @@ void OfaHtmlTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> OfaHtmlTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> OfaHtmlTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet )
{
return VclPtr<OfaHtmlTabPage>::Create(pParent, *rAttrSet);
return VclPtr<OfaHtmlTabPage>::Create(pParent.pParent, *rAttrSet);
}
bool OfaHtmlTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx
index 55b7281..a54590b1 100644
--- a/cui/source/options/opthtml.hxx
+++ b/cui/source/options/opthtml.hxx
@@ -54,7 +54,7 @@ public:
virtual void dispose() override;
OfaHtmlTabPage(vcl::Window* pParent, const SfxItemSet& rSet);
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index e2e3ef8..779f0a1 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -253,9 +253,9 @@ void SvxProxyTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SvxProxyTabPage::Create(vcl::Window* pParent, const SfxItemSet* rAttrSet )
VclPtr<SfxTabPage> SvxProxyTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<SvxProxyTabPage>::Create(pParent, *rAttrSet);
return VclPtr<SvxProxyTabPage>::Create(pParent.pParent, *rAttrSet);
}
void SvxProxyTabPage::ReadConfigData_Impl()
@@ -870,9 +870,9 @@ void SvxSecurityTabPage::InitControls()
}
}
VclPtr<SfxTabPage> SvxSecurityTabPage::Create(vcl::Window* pParent, const SfxItemSet* rAttrSet )
VclPtr<SfxTabPage> SvxSecurityTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<SvxSecurityTabPage>::Create(pParent, *rAttrSet);
return VclPtr<SvxSecurityTabPage>::Create(pParent.pParent, *rAttrSet);
}
void SvxSecurityTabPage::ActivatePage( const SfxItemSet& )
@@ -985,9 +985,9 @@ void SvxEMailTabPage::dispose()
/* -------------------------------------------------------------------------*/
VclPtr<SfxTabPage> SvxEMailTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
VclPtr<SfxTabPage> SvxEMailTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<SvxEMailTabPage>::Create(pParent, *rAttrSet);
return VclPtr<SvxEMailTabPage>::Create(pParent.pParent, *rAttrSet);
}
/* -------------------------------------------------------------------------*/
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index b0d8f78..d504f51 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -93,7 +93,7 @@ public:
SvxProxyTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~SvxProxyTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
};
@@ -153,7 +153,7 @@ protected:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
public:
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
};
@@ -180,7 +180,7 @@ public:
virtual ~SvxEMailTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 2534247..0ffe566 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -570,9 +570,9 @@ void SvxJavaOptionsPage::RequestRestart( svtools::RestartReason eReason )
}
VclPtr<SfxTabPage> SvxJavaOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
VclPtr<SfxTabPage> SvxJavaOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<SvxJavaOptionsPage>::Create( pParent, *rAttrSet );
return VclPtr<SvxJavaOptionsPage>::Create( pParent.pParent, *rAttrSet );
}
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index c533369..6caaeeb 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -112,7 +112,7 @@ public:
virtual ~SvxJavaOptionsPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index 95d8183..b4f2241 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -81,12 +81,11 @@ void SvxJSearchOptionsPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SvxJSearchOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
VclPtr<SfxTabPage> SvxJSearchOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
{
return VclPtr<SvxJSearchOptionsPage>::Create( pParent, *rSet );
return VclPtr<SvxJSearchOptionsPage>::Create( pParent.pParent, *rSet );
}
void SvxJSearchOptionsPage::SetTransliterationFlags( TransliterationFlags nSettings )
{
bool bVal(nSettings & TransliterationFlags::IGNORE_CASE);
diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx
index b6d7680..686f391 100644
--- a/cui/source/options/optjsearch.hxx
+++ b/cui/source/options/optjsearch.hxx
@@ -63,7 +63,7 @@ public:
SvxJSearchOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~SvxJSearchOptionsPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
virtual void Reset( const SfxItemSet* rSet ) override;
virtual bool FillItemSet( SfxItemSet* rSet ) override;
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 2395467..1155d27 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1045,10 +1045,10 @@ void SvxLinguTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SvxLinguTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SvxLinguTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet )
{
return VclPtr<SvxLinguTabPage>::Create( pParent, *rAttrSet );
return VclPtr<SvxLinguTabPage>::Create( pParent.pParent, *rAttrSet );
}
bool SvxLinguTabPage::FillItemSet( SfxItemSet* rCoreSet )
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index e757231..cefd3b2 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -75,9 +75,9 @@ void SvxOpenCLTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SvxOpenCLTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
VclPtr<SfxTabPage> SvxOpenCLTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<SvxOpenCLTabPage>::Create(pParent, *rAttrSet);
return VclPtr<SvxOpenCLTabPage>::Create(pParent.pParent, *rAttrSet);
}
bool SvxOpenCLTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optopencl.hxx b/cui/source/options/optopencl.hxx
index 4609b1b..cb7878f 100644
--- a/cui/source/options/optopencl.hxx
+++ b/cui/source/options/optopencl.hxx
@@ -42,7 +42,7 @@ public:
virtual ~SvxOpenCLTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index cfd41c1..90388aa 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -257,10 +257,10 @@ void SvxPathTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SvxPathTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SvxPathTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet )
{
return VclPtr<SvxPathTabPage>::Create( pParent, *rAttrSet );
return VclPtr<SvxPathTabPage>::Create( pParent.pParent, *rAttrSet );
}
bool SvxPathTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 528262c..ae321e6 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -211,10 +211,10 @@ void SvxSaveTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SvxSaveTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SvxSaveTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet )
{
return VclPtr<SvxSaveTabPage>::Create( pParent, *rAttrSet );
return VclPtr<SvxSaveTabPage>::Create( pParent.pParent, *rAttrSet );
}
void SvxSaveTabPage::DetectHiddenControls()
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index f6957ee..4928171 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -80,7 +80,7 @@ public:
virtual ~SvxSaveTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 577b0e7..889c743 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -198,9 +198,9 @@ void SvxOnlineUpdateTabPage::UpdateUserAgent()
}
VclPtr<SfxTabPage>
SvxOnlineUpdateTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
SvxOnlineUpdateTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<SvxOnlineUpdateTabPage>::Create( pParent, *rAttrSet );
return VclPtr<SvxOnlineUpdateTabPage>::Create( pParent.pParent, *rAttrSet );
}
bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index 788ae98..5e09143 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -61,7 +61,7 @@ public:
virtual ~SvxOnlineUpdateTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 6e14757..3ff42228 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -317,9 +317,9 @@ void SvxPersonalizationTabPage::dispose()
}
VclPtr<SfxTabPage> SvxPersonalizationTabPage::Create( vcl::Window *pParent, const SfxItemSet *rSet )
VclPtr<SfxTabPage> SvxPersonalizationTabPage::Create( TabPageParent pParent, const SfxItemSet *rSet )
{
return VclPtr<SvxPersonalizationTabPage>::Create( pParent, *rSet );
return VclPtr<SvxPersonalizationTabPage>::Create( pParent.pParent, *rSet );
}
bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet * )
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index 9d5e057..1f1e1f1 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -46,7 +46,7 @@ public:
virtual ~SvxPersonalizationTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window *pParent, const SfxItemSet *rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet *rSet );
/// Apply the settings ([OK] button).
virtual bool FillItemSet( SfxItemSet *rSet ) override;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 3c44cd6..7a177f2 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1033,7 +1033,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
pPageInfo->m_pPage.disposeAndReset( ::CreateGeneralTabPage(pPageInfo->m_nPageId, pTabBox, *pGroupInfo->m_pInItemSet ) );
if(!pPageInfo->m_pPage && pGroupInfo->m_pModule)
pPageInfo->m_pPage.disposeAndReset( pGroupInfo->m_pModule->CreateTabPage(pPageInfo->m_nPageId, pTabBox, *pGroupInfo->m_pInItemSet) );
pPageInfo->m_pPage.disposeAndReset( pGroupInfo->m_pModule->CreateTabPage(pPageInfo->m_nPageId, TabPageParent(pTabBox), *pGroupInfo->m_pInItemSet) );
DBG_ASSERT( pPageInfo->m_pPage, "tabpage could not created");
if ( pPageInfo->m_pPage )
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 7d82dd9..85671f3 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -275,9 +275,9 @@ void AlignmentTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> AlignmentTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
VclPtr<SfxTabPage> AlignmentTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<AlignmentTabPage>::Create( pParent, *rAttrSet );
return VclPtr<AlignmentTabPage>::Create( pParent.pParent, *rAttrSet );
}
bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet )
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 299a2c3..4c50310 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -214,10 +214,10 @@ void OfaAutocorrOptionsPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> OfaAutocorrOptionsPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> OfaAutocorrOptionsPage::Create( TabPageParent pParent,
const SfxItemSet* rSet)
{
return VclPtr<OfaAutocorrOptionsPage>::Create(pParent, *rSet);
return VclPtr<OfaAutocorrOptionsPage>::Create(pParent.pParent, *rSet);
}
bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet* )
@@ -502,10 +502,10 @@ void OfaSwAutoFmtOptionsPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> OfaSwAutoFmtOptionsPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> OfaSwAutoFmtOptionsPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
return VclPtr<OfaSwAutoFmtOptionsPage>::Create(pParent, *rAttrSet);
return VclPtr<OfaSwAutoFmtOptionsPage>::Create(pParent.pParent, *rAttrSet);
}
bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet* )
@@ -927,9 +927,9 @@ void OfaAutocorrReplacePage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> OfaAutocorrReplacePage::Create( vcl::Window* pParent, const SfxItemSet* rSet)
VclPtr<SfxTabPage> OfaAutocorrReplacePage::Create( TabPageParent pParent, const SfxItemSet* rSet)
{
return VclPtr<OfaAutocorrReplacePage>::Create(pParent, *rSet);
return VclPtr<OfaAutocorrReplacePage>::Create(pParent.pParent, *rSet);
}
void OfaAutocorrReplacePage::ActivatePage( const SfxItemSet& )
@@ -1438,10 +1438,10 @@ void OfaAutocorrExceptPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> OfaAutocorrExceptPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> OfaAutocorrExceptPage::Create( TabPageParent pParent,
const SfxItemSet* rSet)
{
return VclPtr<OfaAutocorrExceptPage>::Create(pParent, *rSet);
return VclPtr<OfaAutocorrExceptPage>::Create(pParent.pParent, *rSet);
}
void OfaAutocorrExceptPage::ActivatePage( const SfxItemSet& )
@@ -1893,10 +1893,10 @@ void OfaQuoteTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> OfaQuoteTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> OfaQuoteTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
return VclPtr<OfaQuoteTabPage>::Create(pParent, *rAttrSet);
return VclPtr<OfaQuoteTabPage>::Create(pParent.pParent, *rAttrSet);
}
bool OfaQuoteTabPage::FillItemSet( SfxItemSet* )
@@ -2229,10 +2229,10 @@ void OfaAutoCompleteTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> OfaAutoCompleteTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> OfaAutoCompleteTabPage::Create( TabPageParent pParent,
const SfxItemSet* rSet)
{
return VclPtr<OfaAutoCompleteTabPage>::Create( pParent, *rSet );
return VclPtr<OfaAutoCompleteTabPage>::Create( pParent.pParent, *rSet );
}
bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* )
@@ -2481,9 +2481,9 @@ void OfaSmartTagOptionsTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> OfaSmartTagOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet)
VclPtr<SfxTabPage> OfaSmartTagOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet)
{
return VclPtr<OfaSmartTagOptionsTabPage>::Create( pParent, *rSet );
return VclPtr<OfaSmartTagOptionsTabPage>::Create( pParent.pParent, *rSet );
}
/** This struct is used to associate list box entries with smart tag data
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 78cbbf6..722b4a8 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -427,9 +427,9 @@ void SvxBackgroundTabPage::dispose()
SvxTabPage::dispose();
}
VclPtr<SfxTabPage> SvxBackgroundTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
VclPtr<SfxTabPage> SvxBackgroundTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<SvxBackgroundTabPage>::Create( pParent, *rAttrSet );
return VclPtr<SvxBackgroundTabPage>::Create( pParent.pParent, *rAttrSet );
}
void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
@@ -1549,10 +1549,10 @@ bool SvxBkgTabPage::FillItemSet( SfxItemSet* rCoreSet )
return true;
}
VclPtr<SfxTabPage> SvxBkgTabPage::Create( vcl::Window* pWindow,
VclPtr<SfxTabPage> SvxBkgTabPage::Create( TabPageParent pWindow,
const SfxItemSet* rAttrs )
{
return VclPtr<SvxBkgTabPage>::Create( pWindow, *rAttrs );
return VclPtr<SvxBkgTabPage>::Create( pWindow.pParent, *rAttrs );
}
void SvxBkgTabPage::PageCreated(const SfxAllItemSet& aSet)
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 96ffc5c..6107c30 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -411,10 +411,10 @@ void SvxBorderTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SvxBorderTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SvxBorderTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet )
{
return VclPtr<SvxBorderTabPage>::Create( pParent, *rAttrSet );
return VclPtr<SvxBorderTabPage>::Create( pParent.pParent, *rAttrSet );
}
void SvxBorderTabPage::ResetFrameLine_Impl( svx::FrameBorderType eBorder, const SvxBorderLine* pCoreLine, bool bValid )
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 1d06dae..edb3d84 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1173,9 +1173,9 @@ DeactivateRC SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet )
}
VclPtr<SfxTabPage> SvxCharNamePage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
VclPtr<SfxTabPage> SvxCharNamePage::Create( TabPageParent pParent, const SfxItemSet* rSet )
{
return VclPtr<SvxCharNamePage>::Create( pParent, *rSet );
return VclPtr<SvxCharNamePage>::Create( pParent.pParent, *rSet );
}
@@ -1686,9 +1686,9 @@ DeactivateRC SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet )
}
VclPtr<SfxTabPage> SvxCharEffectsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
VclPtr<SfxTabPage> SvxCharEffectsPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
{
return VclPtr<SvxCharEffectsPage>::Create( pParent, *rSet );
return VclPtr<SvxCharEffectsPage>::Create( pParent.pParent, *rSet );
}
@@ -2742,9 +2742,9 @@ DeactivateRC SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet )
}
VclPtr<SfxTabPage> SvxCharPositionPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
VclPtr<SfxTabPage> SvxCharPositionPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
{
return VclPtr<SvxCharPositionPage>::Create( pParent, *rSet );
return VclPtr<SvxCharPositionPage>::Create( pParent.pParent, *rSet );
}
@@ -3272,9 +3272,9 @@ DeactivateRC SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet )
}
VclPtr<SfxTabPage> SvxCharTwoLinesPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
VclPtr<SfxTabPage> SvxCharTwoLinesPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
{
return VclPtr<SvxCharTwoLinesPage>::Create( pParent, *rSet );
return VclPtr<SvxCharTwoLinesPage>::Create( pParent.pParent, *rSet );
}
void SvxCharTwoLinesPage::Reset( const SfxItemSet* rSet )
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index ebfe9a0..2820e38 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -389,10 +389,10 @@ void SvxConnectionPage::Construct()
|*
\************************************************************************/
VclPtr<SfxTabPage> SvxConnectionPage::Create( vcl::Window* pWindow,
VclPtr<SfxTabPage> SvxConnectionPage::Create( TabPageParent pWindow,
const SfxItemSet* rAttrs )
{
return VclPtr<SvxConnectionPage>::Create( pWindow, *rAttrs );
return VclPtr<SvxConnectionPage>::Create( pWindow.pParent, *rAttrs );
}
IMPL_LINK( SvxConnectionPage, ChangeAttrListBoxHdl_Impl, ListBox&, r, void )
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 1546ed7..51a393d 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -152,9 +152,9 @@ void SvxGrfCropPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SvxGrfCropPage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
VclPtr<SfxTabPage> SvxGrfCropPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
{
return VclPtr<SvxGrfCropPage>::Create( pParent, *rSet );
return VclPtr<SvxGrfCropPage>::Create( pParent.pParent, *rSet );
}
void SvxGrfCropPage::Reset( const SfxItemSet *rSet )
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 0671a16..796b297 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -353,10 +353,10 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* )
}
VclPtr<SfxTabPage> SvxCaptionTabPage::Create( vcl::Window* pWindow,
VclPtr<SfxTabPage> SvxCaptionTabPage::Create( TabPageParent pWindow,
const SfxItemSet* rOutAttrs )
{
return VclPtr<SvxCaptionTabPage>::Create( pWindow, *rOutAttrs );
return VclPtr<SvxCaptionTabPage>::Create( pWindow.pParent, *rOutAttrs );
}
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index e86d51d..a3e3747 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -448,9 +448,9 @@ namespace
}
}
VclPtr<SfxTabPage> SfxMacroTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
VclPtr<SfxTabPage> SfxMacroTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return CreateSfxMacroTabPage(pParent, *rAttrSet);
return CreateSfxMacroTabPage(pParent.pParent, *rAttrSet);
}
SfxMacroAssignDlg::SfxMacroAssignDlg(vcl::Window* pParent,
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 58ae066..c9e5c2a 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -609,10 +609,10 @@ void SvxMeasurePage::Construct()
m_pCtlPreview->Invalidate();
}
VclPtr<SfxTabPage> SvxMeasurePage::Create( vcl::Window* pWindow,
VclPtr<SfxTabPage> SvxMeasurePage::Create( TabPageParent pWindow,
const SfxItemSet* rAttrs )
{
return VclPtr<SvxMeasurePage>::Create( pWindow, *rAttrs );
return VclPtr<SvxMeasurePage>::Create( pWindow.pParent, *rAttrs );
}
void SvxMeasurePage::PointChanged( vcl::Window* pWindow, RectPoint /*eRP*/ )
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 7735ee8..ecfa8ff 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -372,10 +372,10 @@ void SvxNumberFormatTabPage::Init_Impl()
m_pLbLanguage->InsertLanguage( LANGUAGE_SYSTEM );
}
VclPtr<SfxTabPage> SvxNumberFormatTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SvxNumberFormatTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet )
{
return VclPtr<SvxNumberFormatTabPage>::Create( pParent, *rAttrSet );
return VclPtr<SvxNumberFormatTabPage>::Create( pParent.pParent, *rAttrSet );
}
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index eb9fea5..652dbdb 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -230,10 +230,10 @@ void SvxSingleNumPickTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SvxSingleNumPickTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SvxSingleNumPickTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
return VclPtr<SvxSingleNumPickTabPage>::Create(pParent, *rAttrSet);
return VclPtr<SvxSingleNumPickTabPage>::Create(pParent.pParent, *rAttrSet);
}
bool SvxSingleNumPickTabPage::FillItemSet( SfxItemSet* rSet )
@@ -396,10 +396,10 @@ void SvxBulletPickTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SvxBulletPickTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SvxBulletPickTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
return VclPtr<SvxBulletPickTabPage>::Create(pParent, *rAttrSet);
return VclPtr<SvxBulletPickTabPage>::Create(pParent.pParent, *rAttrSet);
}
bool SvxBulletPickTabPage::FillItemSet( SfxItemSet* rSet )
@@ -595,10 +595,10 @@ void SvxNumPickTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SvxNumPickTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SvxNumPickTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
return VclPtr<SvxNumPickTabPage>::Create(pParent, *rAttrSet);
return VclPtr<SvxNumPickTabPage>::Create(pParent.pParent, *rAttrSet);
}
bool SvxNumPickTabPage::FillItemSet( SfxItemSet* rSet )
@@ -847,10 +847,10 @@ void SvxBitmapPickTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SvxBitmapPickTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SvxBitmapPickTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
return VclPtr<SvxBitmapPickTabPage>::Create(pParent, *rAttrSet);
return VclPtr<SvxBitmapPickTabPage>::Create(pParent.pParent, *rAttrSet);
}
void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet)
@@ -1242,10 +1242,10 @@ void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric)
m_pHeightMF->SetUnit( eMetric );
}
VclPtr<SfxTabPage> SvxNumOptionsTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SvxNumOptionsTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
return VclPtr<SvxNumOptionsTabPage>::Create(pParent, *rAttrSet);
return VclPtr<SvxNumOptionsTabPage>::Create(pParent.pParent, *rAttrSet);
};
void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet)
@@ -3114,10 +3114,10 @@ void SvxNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode()
m_pIndentAtMF->Show( bLabelAlignmentPosAndSpaceModeActive );
}
VclPtr<SfxTabPage> SvxNumPositionTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SvxNumPositionTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
return VclPtr<SvxNumPositionTabPage>::Create(pParent, *rAttrSet);
return VclPtr<SvxNumPositionTabPage>::Create(pParent.pParent, *rAttrSet);
}
void SvxNumPositionTabPage::SetMetric(FieldUnit eMetric)
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 7dbbf17..fea2604 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -138,9 +138,9 @@ bool IsEqualSize_Impl( const SvxSizeItem* pSize, const Size& rSize )
// class SvxPageDescPage --------------------------------------------------
VclPtr<SfxTabPage> SvxPageDescPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
VclPtr<SfxTabPage> SvxPageDescPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
{
return VclPtr<SvxPageDescPage>::Create( pParent, *rSet );
return VclPtr<SvxPageDescPage>::Create( pParent.pParent, *rSet );
}
SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr ) :
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index ad36ba0..f17c35b 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -196,9 +196,9 @@ IMPL_LINK_NOARG(SvxStdParagraphTabPage, ELRLoseFocusHdl, Control&, void)
m_pRightIndent->SetEmptyFieldValue();
}
VclPtr<SfxTabPage> SvxStdParagraphTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet)
VclPtr<SfxTabPage> SvxStdParagraphTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet)
{
return VclPtr<SvxStdParagraphTabPage>::Create( pParent, *rSet );
return VclPtr<SvxStdParagraphTabPage>::Create( pParent.pParent, *rSet );
}
bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
@@ -1112,9 +1112,9 @@ DeactivateRC SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet )
return DeactivateRC::LeavePage;
}
VclPtr<SfxTabPage> SvxParaAlignTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
VclPtr<SfxTabPage> SvxParaAlignTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
{
return VclPtr<SvxParaAlignTabPage>::Create(pParent, *rSet);
return VclPtr<SvxParaAlignTabPage>::Create(pParent.pParent, *rSet);
}
bool SvxParaAlignTabPage::FillItemSet( SfxItemSet* rOutSet )
@@ -1390,10 +1390,10 @@ void SvxParaAlignTabPage::PageCreated (const SfxAllItemSet& aSet)
EnableJustifyExt();
}
VclPtr<SfxTabPage> SvxExtParagraphTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SvxExtParagraphTabPage::Create( TabPageParent pParent,
const SfxItemSet* rSet )
{
return VclPtr<SvxExtParagraphTabPage>::Create( pParent, *rSet );
return VclPtr<SvxExtParagraphTabPage>::Create( pParent.pParent, *rSet );
}
bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
@@ -2267,9 +2267,9 @@ void SvxAsianTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SvxAsianTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
VclPtr<SfxTabPage> SvxAsianTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
{
return VclPtr<SvxAsianTabPage>::Create(pParent, *rSet);
return VclPtr<SvxAsianTabPage>::Create(pParent.pParent, *rSet);
}
const sal_uInt16* SvxAsianTabPage::GetRanges()
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 72d9260..d870f8e 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -730,9 +730,9 @@ void SvxSwPosSizeTabPage::setOptimalRelWidth()
m_pHoriLB->Clear();
}
VclPtr<SfxTabPage> SvxSwPosSizeTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet)
VclPtr<SfxTabPage> SvxSwPosSizeTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet)
{
return VclPtr<SvxSwPosSizeTabPage>::Create(pParent, *rSet);
return VclPtr<SvxSwPosSizeTabPage>::Create(pParent.pParent, *rSet);
}
const sal_uInt16* SvxSwPosSizeTabPage::GetRanges()
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 18bb286..cc34aaa 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -259,9 +259,9 @@ bool SvxTabulatorTabPage::FillItemSet(SfxItemSet* rSet)
return bModified;
}
VclPtr<SfxTabPage> SvxTabulatorTabPage::Create(vcl::Window* pParent, const SfxItemSet* rSet)
VclPtr<SfxTabPage> SvxTabulatorTabPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
{
return VclPtr<SvxTabulatorTabPage>::Create(pParent, *rSet);
return VclPtr<SvxTabulatorTabPage>::Create(pParent.pParent, *rSet);
}
void SvxTabulatorTabPage::Reset(const SfxItemSet* rSet)
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index c74c71a..cb8f10c 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -470,10 +470,10 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet* rAttrs)
|*
\************************************************************************/
VclPtr<SfxTabPage> SvxTextAnimationPage::Create( vcl::Window* pWindow,
VclPtr<SfxTabPage> SvxTextAnimationPage::Create( TabPageParent pWindow,
const SfxItemSet* rAttrs )
{
return VclPtr<SvxTextAnimationPage>::Create( pWindow, *rAttrs );
return VclPtr<SvxTextAnimationPage>::Create( pWindow.pParent, *rAttrs );
}
IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl, ListBox&, void)
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 3c3121b..1fe363be 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -528,10 +528,10 @@ void SvxTextAttrPage::Construct()
m_pTsbWordWrapText->Show( bWordWrapTextEnabled );
}
VclPtr<SfxTabPage> SvxTextAttrPage::Create( vcl::Window* pWindow,
VclPtr<SfxTabPage> SvxTextAttrPage::Create( TabPageParent pWindow,
const SfxItemSet* rAttrs )
{
return VclPtr<SvxTextAttrPage>::Create( pWindow, *rAttrs );
return VclPtr<SvxTextAttrPage>::Create( pWindow.pParent, *rAttrs );
}
/** Check whether we have to uncheck the "Full width" check box.
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 62e5ccd..5749203 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -131,16 +131,18 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs
SetExchangeSupport();
TabPageParent aFillTab(m_pFillTab);
// Calculate optimal size of all pages..
m_pFillTabPage.disposeAndReset(SvxColorTabPage::Create(m_pFillTab, &m_rXFSet));
m_pFillTabPage.disposeAndReset(SvxColorTabPage::Create(aFillTab, &m_rXFSet));
Size aSize = m_pFillTabPage->GetOptimalSize();
m_pFillTabPage.disposeAndReset(SvxGradientTabPage::Create(m_pFillTab, &m_rXFSet));
m_pFillTabPage.disposeAndReset(SvxGradientTabPage::Create(aFillTab, &m_rXFSet));
lclExtendSize(aSize, m_pFillTabPage->GetOptimalSize());
m_pFillTabPage.disposeAndReset(SvxBitmapTabPage::Create(m_pFillTab, &m_rXFSet));
m_pFillTabPage.disposeAndReset(SvxBitmapTabPage::Create(aFillTab, &m_rXFSet));
lclExtendSize(aSize, m_pFillTabPage->GetOptimalSize());
m_pFillTabPage.disposeAndReset(SvxHatchTabPage::Create(m_pFillTab, &m_rXFSet));
m_pFillTabPage.disposeAndReset(SvxHatchTabPage::Create(aFillTab, &m_rXFSet));
lclExtendSize(aSize, m_pFillTabPage->GetOptimalSize());
m_pFillTabPage.disposeAndReset(SvxPatternTabPage::Create(m_pFillTab, &m_rXFSet));
m_pFillTabPage.disposeAndReset(SvxPatternTabPage::Create(aFillTab, &m_rXFSet));
lclExtendSize(aSize, m_pFillTabPage->GetOptimalSize());
m_pFillTabPage.disposeAndClear();
@@ -333,10 +335,10 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs )
}
}
VclPtr<SfxTabPage> SvxAreaTabPage::Create( vcl::Window* pWindow,
VclPtr<SfxTabPage> SvxAreaTabPage::Create( TabPageParent pWindow,
const SfxItemSet* rAttrs )
{
return VclPtr<SvxAreaTabPage>::Create( pWindow, *rAttrs );
return VclPtr<SvxAreaTabPage>::Create( pWindow.pParent, *rAttrs );
}
namespace {
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 69df65a..b6b2d00 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -439,10 +439,10 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs )
}
VclPtr<SfxTabPage> SvxBitmapTabPage::Create( vcl::Window* pWindow,
VclPtr<SfxTabPage> SvxBitmapTabPage::Create( TabPageParent pWindow,
const SfxItemSet* rAttrs )
{
return VclPtr<SvxBitmapTabPage>::Create( pWindow, *rAttrs );
return VclPtr<SvxBitmapTabPage>::Create( pWindow.pParent, *rAttrs );
}
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 0c015d4..0e709f0 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -308,10 +308,10 @@ void SvxColorTabPage::Reset( const SfxItemSet* rSet )
}
VclPtr<SfxTabPage> SvxColorTabPage::Create( vcl::Window* pWindow,
VclPtr<SfxTabPage> SvxColorTabPage::Create( TabPageParent pWindow,
const SfxItemSet* rOutAttrs )
{
return VclPtr<SvxColorTabPage>::Create( pWindow, *rOutAttrs );
return VclPtr<SvxColorTabPage>::Create( pWindow.pParent, *rOutAttrs );
}
// is called when the content of the MtrFields is changed for color values
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 3b36e96..6b5bd18 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -272,10 +272,10 @@ void SvxGradientTabPage::Reset( const SfxItemSet* )
}
VclPtr<SfxTabPage> SvxGradientTabPage::Create( vcl::Window* pWindow,
VclPtr<SfxTabPage> SvxGradientTabPage::Create( TabPageParent pWindow,
const SfxItemSet* rOutAttrs )
{
return VclPtr<SvxGradientTabPage>::Create( pWindow, *rOutAttrs );
return VclPtr<SvxGradientTabPage>::Create( pWindow.pParent, *rOutAttrs );
}
IMPL_LINK( SvxGradientTabPage, ModifiedListBoxHdl_Impl, ListBox&, rListBox, void )
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 7621583..304a786 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -297,10 +297,10 @@ void SvxHatchTabPage::Reset( const SfxItemSet* rSet )
}
VclPtr<SfxTabPage> SvxHatchTabPage::Create( vcl::Window* pWindow,
VclPtr<SfxTabPage> SvxHatchTabPage::Create( TabPageParent pWindow,
const SfxItemSet* rSet )
{
return VclPtr<SvxHatchTabPage>::Create( pWindow, *rSet );
return VclPtr<SvxHatchTabPage>::Create( pWindow.pParent, *rSet );
}
IMPL_LINK( SvxHatchTabPage, ModifiedListBoxHdl_Impl, ListBox&, rListBox, void )
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 145a304..b19981a 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -1476,10 +1476,10 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
}
VclPtr<SfxTabPage> SvxLineTabPage::Create( vcl::Window* pWindow,
VclPtr<SfxTabPage> SvxLineTabPage::Create( TabPageParent pWindow,
const SfxItemSet* rAttrs )
{
return VclPtr<SvxLineTabPage>::Create( pWindow, *rAttrs );
return VclPtr<SvxLineTabPage>::Create( pWindow.pParent, *rAttrs );
}
IMPL_LINK( SvxLineTabPage, ChangePreviewListBoxHdl_Impl, SvxColorListBox&, rListBox, void )
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index ab7b9ac..4a84e8d 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -337,9 +337,9 @@ void SvxLineDefTabPage::Reset( const SfxItemSet* rAttrs )
}
VclPtr<SfxTabPage> SvxLineDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs )
VclPtr<SfxTabPage> SvxLineDefTabPage::Create( TabPageParent pWindow, const SfxItemSet* rOutAttrs )
{
return VclPtr<SvxLineDefTabPage>::Create( pWindow, *rOutAttrs );
return VclPtr<SvxLineDefTabPage>::Create( pWindow.pParent, *rOutAttrs );
}
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 1f1629f..63bca6e 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -270,9 +270,9 @@ void SvxLineEndDefTabPage::Reset( const SfxItemSet* )
}
VclPtr<SfxTabPage> SvxLineEndDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet )
VclPtr<SfxTabPage> SvxLineEndDefTabPage::Create( TabPageParent pWindow, const SfxItemSet* rSet )
{
return VclPtr<SvxLineEndDefTabPage>::Create( pWindow, *rSet );
return VclPtr<SvxLineEndDefTabPage>::Create( pWindow.pParent, *rSet );
}
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index 1e338d0..b312b33 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -252,10 +252,10 @@ void SvxPatternTabPage::Reset( const SfxItemSet* )
}
VclPtr<SfxTabPage> SvxPatternTabPage::Create( vcl::Window* pWindow,
VclPtr<SfxTabPage> SvxPatternTabPage::Create( TabPageParent pWindow,
const SfxItemSet* rSet )
{
return VclPtr<SvxPatternTabPage>::Create( pWindow, *rSet );
return VclPtr<SvxPatternTabPage>::Create( pWindow.pParent, *rSet );
}
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index ba15f1c..e603ce9 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -428,10 +428,10 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs )
}
VclPtr<SfxTabPage> SvxShadowTabPage::Create( vcl::Window* pWindow,
VclPtr<SfxTabPage> SvxShadowTabPage::Create( TabPageParent pWindow,
const SfxItemSet* rAttrs )
{
return VclPtr<SvxShadowTabPage>::Create( pWindow, *rAttrs );
return VclPtr<SvxShadowTabPage>::Create( pWindow.pParent, *rAttrs );
}
diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx
index a9fc292..c8d99d3 100644
--- a/cui/source/tabpages/tptrans.cxx
+++ b/cui/source/tabpages/tptrans.cxx
@@ -289,9 +289,9 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(vcl::Window* pParent, const SfxIt
SetExchangeSupport();
}
VclPtr<SfxTabPage> SvxTransparenceTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rAttrs)
VclPtr<SfxTabPage> SvxTransparenceTabPage::Create(TabPageParent pWindow, const SfxItemSet* rAttrs)
{
return VclPtr<SvxTransparenceTabPage>::Create(pWindow, *rAttrs);
return VclPtr<SvxTransparenceTabPage>::Create(pWindow.pParent, *rAttrs);
}
bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs)
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index b930cba..b455872 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -321,9 +321,9 @@ void SvxAngleTabPage::Reset(const SfxItemSet* rAttrs)
}
VclPtr<SfxTabPage> SvxAngleTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet)
VclPtr<SfxTabPage> SvxAngleTabPage::Create( TabPageParent pWindow, const SfxItemSet* rSet)
{
return VclPtr<SvxAngleTabPage>::Create(pWindow, *rSet);
return VclPtr<SvxAngleTabPage>::Create(pWindow.pParent, *rSet);
}
@@ -747,9 +747,9 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs)
}
}
VclPtr<SfxTabPage> SvxSlantTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs )
VclPtr<SfxTabPage> SvxSlantTabPage::Create( TabPageParent pWindow, const SfxItemSet* rOutAttrs )
{
return VclPtr<SvxSlantTabPage>::Create( pWindow, *rOutAttrs );
return VclPtr<SvxSlantTabPage>::Create( pWindow.pParent, *rOutAttrs );
}
void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet )
@@ -1209,9 +1209,9 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* )
}
VclPtr<SfxTabPage> SvxPositionSizeTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs )
VclPtr<SfxTabPage> SvxPositionSizeTabPage::Create( TabPageParent pWindow, const SfxItemSet* rOutAttrs )
{
return VclPtr<SvxPositionSizeTabPage>::Create( pWindow, *rOutAttrs );
return VclPtr<SvxPositionSizeTabPage>::Create( pWindow.pParent, *rOutAttrs );
}
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 670c399..75577db 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -77,9 +77,9 @@ namespace dbaui
using namespace ::dbtools;
using namespace ::svt;
VclPtr<SfxTabPage> OConnectionTabPage::Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
VclPtr<SfxTabPage> OConnectionTabPage::Create( TabPageParent pParent, const SfxItemSet* _rAttrSet )
{
return VclPtr<OConnectionTabPage>::Create( pParent, *_rAttrSet );
return VclPtr<OConnectionTabPage>::Create( pParent.pParent, *_rAttrSet );
}
// OConnectionTabPage
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx
index 7b21837..089baf3 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx
@@ -58,7 +58,7 @@ namespace dbaui
public:
virtual ~OConnectionTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* _rAttrSet );
virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) override;
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx
index 8194bfe..4fa30d4 100644
--- a/dbaccess/source/ui/dlg/DriverSettings.hxx
+++ b/dbaccess/source/ui/dlg/DriverSettings.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_DBACCESS_SOURCE_UI_DLG_DRIVERSETTINGS_HXX
#include <dsntypes.hxx>
#include <sfx2/tabdlg.hxx>
#include <svl/poolitem.hxx>
#include <vcl/vclptr.hxx>
#include <vector>
@@ -35,49 +36,48 @@ namespace dbaui
/** Creates the detail page for ado
*/
static VclPtr<SfxTabPage> CreateDbase( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
static VclPtr<SfxTabPage> CreateDbase( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for ado
*/
static VclPtr<SfxTabPage> CreateAdo( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
static VclPtr<SfxTabPage> CreateAdo( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for ODBC
*/
static VclPtr<SfxTabPage> CreateODBC( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
static VclPtr<SfxTabPage> CreateODBC( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for user
*/
static VclPtr<SfxTabPage> CreateUser( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
static VclPtr<SfxTabPage> CreateUser( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for MySQLODBC
*/
static VclPtr<SfxTabPage> CreateMySQLODBC( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
static VclPtr<SfxTabPage> CreateMySQLODBC( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for MySQLJDBC
*/
static VclPtr<SfxTabPage> CreateMySQLJDBC( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
static VclPtr<SfxTabPage> CreateMySQLJDBC( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for MySQLNATIVE
*/
static VclPtr<SfxTabPage> CreateMySQLNATIVE( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
static VclPtr<SfxTabPage> CreateMySQLNATIVE( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for Oracle JDBC
*/
static VclPtr<SfxTabPage> CreateOracleJDBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet );
static VclPtr<SfxTabPage> CreateOracleJDBC( TabPageParent pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for LDAP
*/
static VclPtr<SfxTabPage> CreateLDAP( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
static VclPtr<SfxTabPage> CreateLDAP( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
/// Creates the detail page for Text
static VclPtr<SfxTabPage> CreateText( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
static VclPtr<SfxTabPage> CreateText( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
/// creates the GeneratedValues page
static VclPtr<SfxTabPage> CreateGeneratedValuesPage( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
static VclPtr<SfxTabPage> CreateGeneratedValuesPage( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
/// creates the "Special Settings" page of the "Advanced Settings" dialog
static VclPtr<SfxTabPage> CreateSpecialSettingsPage( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
static VclPtr<SfxTabPage> CreateSpecialSettingsPage( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
};
}
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index 84869c3..0daf9f8 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -202,9 +202,9 @@ void OUserAdmin::FillUserNames()
}
VclPtr<SfxTabPage> OUserAdmin::Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
VclPtr<SfxTabPage> OUserAdmin::Create( TabPageParent pParent, const SfxItemSet* _rAttrSet )
{
return VclPtr<OUserAdmin>::Create( pParent, *_rAttrSet );
return VclPtr<OUserAdmin>::Create( pParent.pParent, *_rAttrSet );
}
IMPL_LINK( OUserAdmin, UserHdl, Button *, pButton, void )
diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx
index 17fa0bd..c7a1cbb 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.hxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.hxx
@@ -60,7 +60,7 @@ class OUserAdmin final : public OGenericAdministrationPage
OUserAdmin( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs);
public:
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* _rAttrSet );
virtual ~OUserAdmin() override;
virtual void dispose() override;
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index cc3fba2..67da68c 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -209,9 +209,9 @@ namespace dbaui
OCommonBehaviourTabPage::dispose();
}
VclPtr<SfxTabPage> ODriversSettings::CreateDbase( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
VclPtr<SfxTabPage> ODriversSettings::CreateDbase( TabPageParent pParent, const SfxItemSet* _rAttrSet )
{
return VclPtr<ODbaseDetailsPage>::Create( pParent, *_rAttrSet );
return VclPtr<ODbaseDetailsPage>::Create( pParent.pParent, *_rAttrSet );
}
void ODbaseDetailsPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue)
@@ -269,9 +269,9 @@ namespace dbaui
}
VclPtr<SfxTabPage> ODriversSettings::CreateAdo( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
VclPtr<SfxTabPage> ODriversSettings::CreateAdo( TabPageParent pParent, const SfxItemSet* _rAttrSet )
{
return VclPtr<OAdoDetailsPage>::Create( pParent, *_rAttrSet );
return VclPtr<OAdoDetailsPage>::Create( pParent.pParent, *_rAttrSet );
}
// OOdbcDetailsPage
@@ -293,9 +293,9 @@ namespace dbaui
OCommonBehaviourTabPage::dispose();
}
VclPtr<SfxTabPage> ODriversSettings::CreateODBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
VclPtr<SfxTabPage> ODriversSettings::CreateODBC( TabPageParent pParent, const SfxItemSet* _rAttrSet )
{
return VclPtr<OOdbcDetailsPage>::Create( pParent, *_rAttrSet );
return VclPtr<OOdbcDetailsPage>::Create( pParent.pParent, *_rAttrSet );
}
bool OOdbcDetailsPage::FillItemSet( SfxItemSet* _rSet )
@@ -346,9 +346,9 @@ namespace dbaui
OCommonBehaviourTabPage::dispose();
}
VclPtr<SfxTabPage> ODriversSettings::CreateUser( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
VclPtr<SfxTabPage> ODriversSettings::CreateUser( TabPageParent pParent, const SfxItemSet* _rAttrSet )
{
return VclPtr<OUserDriverDetailsPage>::Create( pParent, *_rAttrSet );
return VclPtr<OUserDriverDetailsPage>::Create( pParent.pParent, *_rAttrSet );
}
bool OUserDriverDetailsPage::FillItemSet( SfxItemSet* _rSet )
@@ -403,9 +403,9 @@ namespace dbaui
{
}
VclPtr<SfxTabPage> ODriversSettings::CreateMySQLODBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
VclPtr<SfxTabPage> ODriversSettings::CreateMySQLODBC( TabPageParent pParent, const SfxItemSet* _rAttrSet )
{
return VclPtr<OMySQLODBCDetailsPage>::Create( pParent, *_rAttrSet );
return VclPtr<OMySQLODBCDetailsPage>::Create( pParent.pParent, *_rAttrSet );
}
// OMySQLJDBCDetailsPage
@@ -641,18 +641,19 @@ namespace dbaui
OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue);
}
VclPtr<SfxTabPage> ODriversSettings::CreateMySQLJDBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
VclPtr<SfxTabPage> ODriversSettings::CreateMySQLJDBC( TabPageParent pParent, const SfxItemSet* _rAttrSet )
{
return VclPtr<OGeneralSpecialJDBCDetailsPage>::Create( pParent, *_rAttrSet,DSID_MYSQL_PORTNUMBER );
}
VclPtr<SfxTabPage> ODriversSettings::CreateMySQLNATIVE( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
{
return VclPtr<MySQLNativePage>::Create( pParent, *_rAttrSet );
return VclPtr<OGeneralSpecialJDBCDetailsPage>::Create( pParent.pParent, *_rAttrSet,DSID_MYSQL_PORTNUMBER );
}
VclPtr<SfxTabPage> ODriversSettings::CreateOracleJDBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
VclPtr<SfxTabPage> ODriversSettings::CreateMySQLNATIVE( TabPageParent pParent, const SfxItemSet* _rAttrSet )
{
return VclPtr<OGeneralSpecialJDBCDetailsPage>::Create( pParent, *_rAttrSet,DSID_ORACLE_PORTNUMBER, false);
return VclPtr<MySQLNativePage>::Create( pParent.pParent, *_rAttrSet );
}
VclPtr<SfxTabPage> ODriversSettings::CreateOracleJDBC( TabPageParent pParent, const SfxItemSet* _rAttrSet )
{
return VclPtr<OGeneralSpecialJDBCDetailsPage>::Create( pParent.pParent, *_rAttrSet,DSID_ORACLE_PORTNUMBER, false);
}
// OLDAPDetailsPage
@@ -690,9 +691,9 @@ namespace dbaui
OCommonBehaviourTabPage::dispose();
}
VclPtr<SfxTabPage> ODriversSettings::CreateLDAP( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
VclPtr<SfxTabPage> ODriversSettings::CreateLDAP( TabPageParent pParent, const SfxItemSet* _rAttrSet )
{
return VclPtr<OLDAPDetailsPage>::Create( pParent, *_rAttrSet );
return VclPtr<OLDAPDetailsPage>::Create( pParent.pParent, *_rAttrSet );
}
bool OLDAPDetailsPage::FillItemSet( SfxItemSet* _rSet )
@@ -764,10 +765,11 @@ namespace dbaui
OCommonBehaviourTabPage::dispose();
}
VclPtr<SfxTabPage> ODriversSettings::CreateText( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
VclPtr<SfxTabPage> ODriversSettings::CreateText( TabPageParent pParent, const SfxItemSet* _rAttrSet )
{
return VclPtr<OTextDetailsPage>::Create( pParent, *_rAttrSet );
return VclPtr<OTextDetailsPage>::Create( pParent.pParent, *_rAttrSet );
}
void OTextDetailsPage::fillControls(std::vector< ISaveValueWrapper* >& _rControlList)
{
OCommonBehaviourTabPage::fillControls(_rControlList);
@@ -802,16 +804,16 @@ namespace dbaui
return m_pTextConnectionHelper->prepareLeave();
}
VclPtr<SfxTabPage> ODriversSettings::CreateGeneratedValuesPage( vcl::Window* _pParent, const SfxItemSet* _rAttrSet )
VclPtr<SfxTabPage> ODriversSettings::CreateGeneratedValuesPage( TabPageParent _pParent, const SfxItemSet* _rAttrSet )
{
return VclPtr<GeneratedValuesPage>::Create( _pParent, *_rAttrSet );
return VclPtr<GeneratedValuesPage>::Create( _pParent.pParent, *_rAttrSet );
}
VclPtr<SfxTabPage> ODriversSettings::CreateSpecialSettingsPage( vcl::Window* _pParent, const SfxItemSet* _rAttrSet )
VclPtr<SfxTabPage> ODriversSettings::CreateSpecialSettingsPage( TabPageParent _pParent, const SfxItemSet* _rAttrSet )
{
OUString eType = ODbDataSourceAdministrationHelper::getDatasourceType( *_rAttrSet );
DataSourceMetaData aMetaData( eType );
return VclPtr<SpecialSettingsPage>::Create( _pParent, *_rAttrSet, aMetaData );
return VclPtr<SpecialSettingsPage>::Create( _pParent.pParent, *_rAttrSet, aMetaData );
}
} // namespace dbaui
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 90a7996..e3db5f1 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -739,10 +739,10 @@ void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* paParent )
}
VclPtr<SfxTabPage> ImpPDFTabGeneralPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> ImpPDFTabGeneralPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
return VclPtr<ImpPDFTabGeneralPage>::Create( pParent, *rAttrSet );
return VclPtr<ImpPDFTabGeneralPage>::Create( pParent.pParent, *rAttrSet );
}
@@ -935,10 +935,10 @@ void ImpPDFTabOpnFtrPage::dispose()
}
VclPtr<SfxTabPage> ImpPDFTabOpnFtrPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> ImpPDFTabOpnFtrPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
return VclPtr<ImpPDFTabOpnFtrPage>::Create( pParent, *rAttrSet );
return VclPtr<ImpPDFTabOpnFtrPage>::Create( pParent.pParent, *rAttrSet );
}
@@ -1120,10 +1120,10 @@ IMPL_LINK_NOARG( ImpPDFTabViewerPage, ToggleRbBookmarksHdl, RadioButton&, void )
}
VclPtr<SfxTabPage> ImpPDFTabViewerPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> ImpPDFTabViewerPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
return VclPtr<ImpPDFTabViewerPage>::Create( pParent, *rAttrSet );
return VclPtr<ImpPDFTabViewerPage>::Create( pParent.pParent, *rAttrSet );
}
@@ -1240,10 +1240,10 @@ void ImpPDFTabSecurityPage::dispose()
}
VclPtr<SfxTabPage> ImpPDFTabSecurityPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> ImpPDFTabSecurityPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
return VclPtr<ImpPDFTabSecurityPage>::Create( pParent, *rAttrSet );
return VclPtr<ImpPDFTabSecurityPage>::Create( pParent.pParent, *rAttrSet );
}
@@ -1471,10 +1471,10 @@ void ImpPDFTabLinksPage::dispose()
}
VclPtr<SfxTabPage> ImpPDFTabLinksPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> ImpPDFTabLinksPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
return VclPtr<ImpPDFTabLinksPage>::Create( pParent, *rAttrSet );
return VclPtr<ImpPDFTabLinksPage>::Create( pParent.pParent, *rAttrSet );
}
@@ -1735,10 +1735,10 @@ IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertClear, Button*, void )
}
VclPtr<SfxTabPage> ImpPDFTabSigningPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> ImpPDFTabSigningPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
return VclPtr<ImpPDFTabSigningPage>::Create( pParent, *rAttrSet );
return VclPtr<ImpPDFTabSigningPage>::Create( pParent.pParent, *rAttrSet );
}
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index f65ffaf..bb9e158 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -247,7 +247,7 @@ public:
virtual ~ImpPDFTabGeneralPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet);
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
void GetFilterConfigItem(ImpPDFTabDialog* paParent);
void SetFilterConfigItem(ImpPDFTabDialog* paParent);
@@ -287,7 +287,7 @@ public:
virtual ~ImpPDFTabOpnFtrPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
void GetFilterConfigItem( ImpPDFTabDialog* paParent);
void SetFilterConfigItem( const ImpPDFTabDialog* paParent );
@@ -320,7 +320,7 @@ public:
virtual ~ImpPDFTabViewerPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
void GetFilterConfigItem( ImpPDFTabDialog* paParent);
void SetFilterConfigItem( const ImpPDFTabDialog* paParent );
@@ -374,7 +374,7 @@ public:
virtual ~ImpPDFTabSecurityPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
void GetFilterConfigItem( ImpPDFTabDialog* paParent);
void SetFilterConfigItem( const ImpPDFTabDialog* paParent );
@@ -405,7 +405,7 @@ public:
virtual ~ImpPDFTabLinksPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
void GetFilterConfigItem( ImpPDFTabDialog* paParent);
void SetFilterConfigItem( const ImpPDFTabDialog* paParent );
@@ -434,7 +434,7 @@ public:
virtual ~ImpPDFTabSigningPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
void GetFilterConfigItem( ImpPDFTabDialog* paParent);
void SetFilterConfigItem( const ImpPDFTabDialog* paParent );
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index c1f0038..9516b74 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -214,7 +214,7 @@ protected:
public:
SfxDocumentPage( vcl::Window* pParent, const SfxItemSet& );
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* );
void EnableUseUserData();
};
@@ -239,7 +239,7 @@ protected:
public:
SfxDocumentDescPage( vcl::Window* pParent, const SfxItemSet& );
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* );
};
// class SfxDocumentInfoDialog -------------------------------------------
@@ -515,7 +515,7 @@ protected:
public:
SfxCustomPropertiesPage( vcl::Window* pParent, const SfxItemSet& );
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* );
};
struct CmisValue : public VclBuilderContainer
@@ -637,7 +637,7 @@ public:
virtual ~SfxCmisPropertiesPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* );
virtual void SetPosSizePixel(const Point& rAllocPos, const Size& rAllocation) override;
virtual void SetSizePixel(const Size& rAllocation) override;
virtual void SetPosPixel(const Point& rAllocPos) override;
diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx
index 641af7a..2a86859 100644
--- a/include/sfx2/mgetempl.hxx
+++ b/include/sfx2/mgetempl.hxx
@@ -81,7 +81,7 @@ friend class SfxStyleDialog;
virtual ~SfxManageStyleSheetPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* );
virtual bool FillItemSet(SfxItemSet *) override;
virtual void Reset(const SfxItemSet *) override;
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index 352d1e4..ef60ed2 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -25,6 +25,7 @@
#include <sfx2/dllapi.h>
#include <sfx2/shell.hxx>
#include <sfx2/styfitem.hxx>
#include <sfx2/tabdlg.hxx>
#include <svtools/imgdef.hxx>
#include <sal/types.h>
#include <tools/fldunit.hxx>
@@ -78,7 +79,7 @@ public:
void RegisterStatusBarControl(const SfxStbCtrlFactory&);
virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId,
vcl::Window* pParent,
TabPageParent pParent,
const SfxItemSet& rSet );
virtual void Invalidate(sal_uInt16 nId = 0) override;
diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx
index 82a94ed..cd8a43c 100644
--- a/include/sfx2/printopt.hxx
+++ b/include/sfx2/printopt.hxx
@@ -98,7 +98,7 @@ public:
virtual vcl::Window* GetParentLabeledBy( const vcl::Window* pLabel ) const override;
virtual vcl::Window* GetParentLabelFor( const vcl::Window* pLabel ) const override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* );
};
#endif // INCLUDED_SFX2_PRINTOPT_HXX
diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx
index cfb28f1..67d27d0 100644
--- a/include/sfx2/securitypage.hxx
+++ b/include/sfx2/securitypage.hxx
@@ -36,8 +36,8 @@ protected:
virtual void Reset( const SfxItemSet* ) override;
public:
SfxSecurityPage( vcl::Window* pParent, const SfxItemSet& );
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* );
SfxSecurityPage(vcl::Window* pParent, const SfxItemSet&);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet*);
};
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 65eb615..72ba237 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -28,6 +28,7 @@
#include <vcl/tabctrl.hxx>
#include <vcl/tabdlg.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/weld.hxx>
#include <svl/itempool.hxx>
#include <svl/itemset.hxx>
#include <com/sun/star/frame/XFrame.hpp>
@@ -39,7 +40,23 @@ class SfxViewFrame;
class SfxTabPage;
class SfxBindings;
typedef VclPtr<SfxTabPage> (*CreateTabPage)(vcl::Window *pParent, const SfxItemSet *rAttrSet);
struct TabPageParent
{
TabPageParent(vcl::Window* _pParent)
: pParent(_pParent)
, pPage(nullptr)
{
}
TabPageParent(weld::Window* _pPage)
: pParent(nullptr)
, pPage(_pPage)
{
}
VclPtr<vcl::Window> pParent;
weld::Widget* pPage;
};
typedef VclPtr<SfxTabPage> (*CreateTabPage)(TabPageParent pParent, const SfxItemSet *rAttrSet);
typedef const sal_uInt16* (*GetTabPageRanges)(); // provides international Which-value
struct TabPageImpl;
@@ -234,7 +251,12 @@ private:
std::unique_ptr< TabPageImpl > pImpl;
protected:
SfxTabPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet);
std::unique_ptr<weld::Builder> m_xBuilder;
std::unique_ptr<weld::Container> m_xContainer;
protected:
SfxTabPage(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet);
SfxTabPage(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet *rAttrSet);
sal_uInt16 GetWhich( sal_uInt16 nSlot, bool bDeep = true ) const
{ return pSet->GetPool()->GetWhich( nSlot, bDeep ); }
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 1935671..f29f94c 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -244,7 +244,7 @@ public:
virtual SfxPrinter* GetPrinter( bool bCreate = false );
virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL );
virtual bool HasPrintOptionsPage() const;
virtual VclPtr<SfxTabPage> CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions );
virtual VclPtr<SfxTabPage> CreatePrintOptionsPage( TabPageParent pParent, const SfxItemSet &rOptions );
Printer* GetActivePrinter() const;
// Working set
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index 6ce1508..dbca1f9 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -105,7 +105,7 @@ private:
class SVX_DLLPUBLIC SvxHeaderPage : public SvxHFPage
{
public:
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
// returns the Which values to the range
static const sal_uInt16* GetRanges() { return pRanges; }
SVX_DLLPRIVATE SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rSet );
@@ -116,7 +116,7 @@ public:
class SVX_DLLPUBLIC SvxFooterPage : public SvxHFPage
{
public:
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges() { return pRanges; }
SVX_DLLPRIVATE SvxFooterPage( vcl::Window* pParent, const SfxItemSet& rSet );
};
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 6d39a6b..e28b774 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1396,6 +1396,7 @@ public:
static void setDeInitHook(Link<LinkParamNone*,void> const & hook);
static weld::Builder* CreateBuilder(weld::Widget* pParent, const OUString &rUIFile);
static weld::Builder* CreateInterimBuilder(vcl::Window* pParent, const OUString &rUIFile); //for the duration of same SfxTabPages in mixed parent types
static weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent, VclMessageType eMessageType,
VclButtonsType eButtonType, const OUString& rPrimaryMessage);
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index 34cd82b..b3399439 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -232,7 +232,7 @@ public:
// virtual methods for the options dialog
virtual std::unique_ptr<SfxItemSet> CreateItemSet( sal_uInt16 nId ) override;
virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) override;
virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) override;
virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) override;
virtual SfxStyleFamilies* CreateStyleFamilies() override;
void SetInSharedDocLoading( bool bNew ) { mbIsInSharedDocLoading = bNew; }
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index f13ea70..6e05952 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -2036,7 +2036,7 @@ void ScModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet )
}
}
VclPtr<SfxTabPage> ScModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet )
VclPtr<SfxTabPage> ScModule::CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet )
{
VclPtr<SfxTabPage> pRet;
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
@@ -2058,7 +2058,7 @@ VclPtr<SfxTabPage> ScModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent
break;
}
case SID_SC_TP_GRID:
pRet = SvxGridTabPage::Create(pParent, rSet);
pRet = SvxGridTabPage::Create(pParent.pParent, rSet);
break;
case SID_SC_TP_USERLISTS:
{
diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx
index 16ac977..b260542 100644
--- a/sc/source/ui/attrdlg/tabpages.cxx
+++ b/sc/source/ui/attrdlg/tabpages.cxx
@@ -70,9 +70,9 @@ void ScTabPageProtection::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> ScTabPageProtection::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
VclPtr<SfxTabPage> ScTabPageProtection::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<ScTabPageProtection>::Create( pParent, *rAttrSet );
return VclPtr<ScTabPageProtection>::Create( pParent.pParent, *rAttrSet );
}
void ScTabPageProtection::Reset( const SfxItemSet* rCoreAttrs )
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 296816f..82621de 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -143,10 +143,10 @@ void ScTabPageSortFields::Init()
}
}
VclPtr<SfxTabPage> ScTabPageSortFields::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> ScTabPageSortFields::Create( TabPageParent pParent,
const SfxItemSet* rArgSet )
{
return VclPtr<ScTabPageSortFields>::Create( pParent, *rArgSet );
return VclPtr<ScTabPageSortFields>::Create( pParent.pParent, *rArgSet );
}
void ScTabPageSortFields::Reset( const SfxItemSet* /* rArgSet */ )
@@ -626,10 +626,10 @@ void ScTabPageSortOptions::Init()
m_pLbLanguage->InsertLanguage( LANGUAGE_SYSTEM );
}
VclPtr<SfxTabPage> ScTabPageSortOptions::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> ScTabPageSortOptions::Create( TabPageParent pParent,
const SfxItemSet* rArgSet )
{
return VclPtr<ScTabPageSortOptions>::Create( pParent, *rArgSet );
return VclPtr<ScTabPageSortOptions>::Create( pParent.pParent, *rArgSet );
}
void ScTabPageSortOptions::Reset( const SfxItemSet* /* rArgSet */ )
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index c333c31..b087c5d 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -392,22 +392,22 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, SvTreeListBox*, pLb, void )
// Derived Group TabPages:
VclPtr<SfxTabPage> ScTpSubTotalGroup1::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> ScTpSubTotalGroup1::Create( TabPageParent pParent,
const SfxItemSet* rArgSet )
{
return VclPtr<ScTpSubTotalGroup1>::Create( pParent, *rArgSet );
return VclPtr<ScTpSubTotalGroup1>::Create( pParent.pParent, *rArgSet );
}
VclPtr<SfxTabPage> ScTpSubTotalGroup2::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> ScTpSubTotalGroup2::Create( TabPageParent pParent,
const SfxItemSet* rArgSet )
{
return VclPtr<ScTpSubTotalGroup2>::Create( pParent, *rArgSet );
return VclPtr<ScTpSubTotalGroup2>::Create( pParent.pParent, *rArgSet );
}
VclPtr<SfxTabPage> ScTpSubTotalGroup3::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> ScTpSubTotalGroup3::Create( TabPageParent pParent,
const SfxItemSet* rArgSet )
{
return VclPtr<ScTpSubTotalGroup3>::Create( pParent, *rArgSet );
return VclPtr<ScTpSubTotalGroup3>::Create( pParent.pParent, *rArgSet );
}
ScTpSubTotalGroup1::ScTpSubTotalGroup1( vcl::Window* pParent, const SfxItemSet& rArgSet ) :
@@ -497,10 +497,10 @@ void ScTpSubTotalOptions::Init()
FillUserSortListBox();
}
VclPtr<SfxTabPage> ScTpSubTotalOptions::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> ScTpSubTotalOptions::Create( TabPageParent pParent,
const SfxItemSet* rArgSet )
{
return VclPtr<ScTpSubTotalOptions>::Create( pParent, *rArgSet );
return VclPtr<ScTpSubTotalOptions>::Create( pParent.pParent, *rArgSet );
}
void ScTpSubTotalOptions::Reset( const SfxItemSet* /* rArgSet */ )
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 15fee73..1161b2a 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -410,9 +410,9 @@ void ScTPValidationValue::Init()
CheckHdl( nullptr );
}
VclPtr<SfxTabPage> ScTPValidationValue::Create( vcl::Window* pParent, const SfxItemSet* rArgSet )
VclPtr<SfxTabPage> ScTPValidationValue::Create( TabPageParent pParent, const SfxItemSet* rArgSet )
{
return VclPtr<ScTPValidationValue>::Create( pParent, *rArgSet );
return VclPtr<ScTPValidationValue>::Create( pParent.pParent, *rArgSet );
}
void ScTPValidationValue::Reset( const SfxItemSet* rArgSet )
@@ -705,10 +705,10 @@ void ScTPValidationHelp::Init()
pTsbHelp->EnableTriState( false );
}
VclPtr<SfxTabPage> ScTPValidationHelp::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> ScTPValidationHelp::Create( TabPageParent pParent,
const SfxItemSet* rArgSet )
{
return VclPtr<ScTPValidationHelp>::Create( pParent, *rArgSet );
return VclPtr<ScTPValidationHelp>::Create( pParent.pParent, *rArgSet );
}
void ScTPValidationHelp::Reset( const SfxItemSet* rArgSet )
@@ -787,10 +787,10 @@ void ScTPValidationError::Init()
SelectActionHdl( *m_pLbAction.get() );
}
VclPtr<SfxTabPage> ScTPValidationError::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> ScTPValidationError::Create( TabPageParent pParent,
const SfxItemSet* rArgSet )
{
return VclPtr<ScTPValidationError>::Create( pParent, *rArgSet );
return VclPtr<ScTPValidationError>::Create( pParent.pParent, *rArgSet );
}
void ScTPValidationError::Reset( const SfxItemSet* rArgSet )
diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx
index e81bad2..d4fcbfd 100644
--- a/sc/source/ui/docshell/tpstat.cxx
+++ b/sc/source/ui/docshell/tpstat.cxx
@@ -26,9 +26,9 @@
// Dokumentinfo-Tabpage:
VclPtr<SfxTabPage> ScDocStatPage::Create( vcl::Window *pParent, const SfxItemSet* rSet )
VclPtr<SfxTabPage> ScDocStatPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
{
return VclPtr<ScDocStatPage>::Create( pParent, *rSet );
return VclPtr<ScDocStatPage>::Create( pParent.pParent, *rSet );
}
ScDocStatPage::ScDocStatPage( vcl::Window *pParent, const SfxItemSet& rSet )
diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx
index 69d1bfb..766200c 100644
--- a/sc/source/ui/inc/opredlin.hxx
+++ b/sc/source/ui/inc/opredlin.hxx
@@ -46,7 +46,7 @@ public:
ScRedlineOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~ScRedlineOptionsTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index 82a4b34..179e6b1 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -105,7 +105,7 @@ public:
virtual SfxPrinter* GetPrinter( bool bCreate = false ) override;
virtual sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL ) override;
virtual bool HasPrintOptionsPage() const override;
virtual VclPtr<SfxTabPage> CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) override;
virtual VclPtr<SfxTabPage> CreatePrintOptionsPage( TabPageParent pParent, const SfxItemSet &rOptions ) override;
void AddAccessibilityObject( SfxListener& rObject );
void RemoveAccessibilityObject( SfxListener& rObject );
diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx
index 0ac59c3..825bd22 100644
--- a/sc/source/ui/inc/scuitphfedit.hxx
+++ b/sc/source/ui/inc/scuitphfedit.hxx
@@ -106,7 +106,7 @@ class ScRightHeaderEditPage : public ScHFEditPage
{
friend class VclPtr<ScRightHeaderEditPage>;
public:
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rCoreSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet );
private:
ScRightHeaderEditPage( vcl::Window* pParent, const SfxItemSet& rSet );
@@ -116,7 +116,7 @@ class ScLeftHeaderEditPage : public ScHFEditPage
{
friend class VclPtr<ScLeftHeaderEditPage>;
public:
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rCoreSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet );
private:
ScLeftHeaderEditPage( vcl::Window* pParent, const SfxItemSet& rSet );
@@ -126,7 +126,7 @@ class ScRightFooterEditPage : public ScHFEditPage
{
friend class VclPtr<ScRightFooterEditPage>;
public:
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rCoreSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet );
private:
ScRightFooterEditPage( vcl::Window* pParent, const SfxItemSet& rSet );
@@ -136,7 +136,7 @@ class ScLeftFooterEditPage : public ScHFEditPage
{
friend class VclPtr<ScLeftFooterEditPage>;
public:
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rCoreSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet );
private:
ScLeftFooterEditPage( vcl::Window* pParent, const SfxItemSet& rSet );
diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx
index 5671f0d..cb53735 100644
--- a/sc/source/ui/inc/tabpages.hxx
+++ b/sc/source/ui/inc/tabpages.hxx
@@ -28,7 +28,7 @@ class ScTabPageProtection : public SfxTabPage
friend class VclPtr<ScTabPageProtection>;
static const sal_uInt16 pProtectionRanges[];
public:
static VclPtr<SfxTabPage> Create ( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create ( TabPageParent pParent,
const SfxItemSet* rAttrSet );
static const sal_uInt16* GetRanges () { return pProtectionRanges; }
virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) override;
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 00f883a..17bc4ec 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -318,7 +318,7 @@ public:
SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL ) override;
virtual bool HasPrintOptionsPage() const override;
virtual VclPtr<SfxTabPage> CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) override;
virtual VclPtr<SfxTabPage> CreatePrintOptionsPage( TabPageParent pParent, const SfxItemSet &rOptions ) override;
void ConnectObject( const SdrOle2Obj* pObj );
void ActivateObject( SdrOle2Obj* pObj, long nVerb );
diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx
index 3108604..4e43b77 100644
--- a/sc/source/ui/inc/tpcalc.hxx
+++ b/sc/source/ui/inc/tpcalc.hxx
@@ -32,7 +32,7 @@ class ScTpCalcOptions : public SfxTabPage
{
friend class VclPtr<ScTpCalcOptions>;
public:
static VclPtr<SfxTabPage> Create ( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create ( TabPageParent pParent,
const SfxItemSet* rCoreSet );
virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override;
virtual void Reset ( const SfxItemSet* rCoreSet ) override;
diff --git a/sc/source/ui/inc/tpcompatibility.hxx b/sc/source/ui/inc/tpcompatibility.hxx
index 1b84b0c..8430b63 100644
--- a/sc/source/ui/inc/tpcompatibility.hxx
+++ b/sc/source/ui/inc/tpcompatibility.hxx
@@ -20,7 +20,7 @@ class ScTpCompatOptions : public SfxTabPage
public:
using SfxTabPage::DeactivatePage;
static VclPtr<SfxTabPage> Create (vcl::Window* pParent, const SfxItemSet* rCoreAttrs);
static VclPtr<SfxTabPage> Create (TabPageParent pParent, const SfxItemSet* rCoreAttrs);
virtual bool FillItemSet(SfxItemSet* rCoreAttrs) override;
virtual void Reset(const SfxItemSet* rCoreAttrs) override;
diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx
index b93fe33..7808f31 100644
--- a/sc/source/ui/inc/tpdefaults.hxx
+++ b/sc/source/ui/inc/tpdefaults.hxx
@@ -20,7 +20,7 @@ class ScTpDefaultsOptions : public SfxTabPage
public:
using SfxTabPage::DeactivatePage;
static VclPtr<SfxTabPage> Create (vcl::Window* pParent, const SfxItemSet* rCoreSet);
static VclPtr<SfxTabPage> Create (TabPageParent pParent, const SfxItemSet* rCoreSet);
virtual bool FillItemSet(SfxItemSet* rCoreSet) override;
virtual void Reset(const SfxItemSet* rCoreSet) override;
diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx
index 0848f79..22445b7 100644
--- a/sc/source/ui/inc/tpformula.hxx
+++ b/sc/source/ui/inc/tpformula.hxx
@@ -35,7 +35,7 @@ class ScTpFormulaOptions : public SfxTabPage
public:
using SfxTabPage::DeactivatePage;
static VclPtr<SfxTabPage> Create (vcl::Window* pParent, const SfxItemSet* rCoreSet);
static VclPtr<SfxTabPage> Create (TabPageParent pParent, const SfxItemSet* rCoreSet);
virtual bool FillItemSet(SfxItemSet* rCoreSet) override;
virtual void Reset( const SfxItemSet* rCoreSet ) override;
diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx
index eadfedd..9fd7324 100644
--- a/sc/source/ui/inc/tphf.hxx
+++ b/sc/source/ui/inc/tphf.hxx
@@ -62,7 +62,7 @@ class ScHeaderPage : public ScHFPage
{
friend class VclPtr<ScHeaderPage>;
public:
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
private:
@@ -73,7 +73,7 @@ class ScFooterPage : public ScHFPage
{
friend class VclPtr<ScFooterPage>;
public:
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
private:
diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx
index 9de8060..fb201a5 100644
--- a/sc/source/ui/inc/tpprint.hxx
+++ b/sc/source/ui/inc/tpprint.hxx
@@ -34,7 +34,7 @@ class ScTpPrintOptions : public SfxTabPage
public:
virtual ~ScTpPrintOptions() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rCoreSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet );
virtual bool FillItemSet( SfxItemSet* rCoreSet ) override;
virtual void Reset( const SfxItemSet* rCoreSet ) override;
using SfxTabPage::DeactivatePage;
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index 1438693..660d9eb 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -50,7 +50,7 @@ public:
const SfxItemSet& rArgSet );
virtual ~ScTabPageSortFields() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create ( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create ( TabPageParent pParent,
const SfxItemSet* rArgSet );
virtual bool FillItemSet ( SfxItemSet* rArgSet ) override;
virtual void Reset ( const SfxItemSet* rArgSet ) override;
@@ -110,7 +110,7 @@ public:
#undef SfxTabPage
#define SfxTabPage ::SfxTabPage
static VclPtr<SfxTabPage> Create ( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create ( TabPageParent pParent,
const SfxItemSet* rArgSet );
virtual bool FillItemSet ( SfxItemSet* rArgSet ) override;
virtual void Reset ( const SfxItemSet* rArgSet ) override;
diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx
index 9afc120..299b703 100644
--- a/sc/source/ui/inc/tpstat.hxx
+++ b/sc/source/ui/inc/tpstat.hxx
@@ -27,7 +27,7 @@ class ScDocStatPage: public SfxTabPage
{
friend class VclPtr<ScDocStatPage>;
public:
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
virtual ~ScDocStatPage() override;
virtual void dispose() override;
diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx
index 0b01d8e..8b2bfee 100644
--- a/sc/source/ui/inc/tpsubt.hxx
+++ b/sc/source/ui/inc/tpsubt.hxx
@@ -85,7 +85,7 @@ class ScTpSubTotalGroup1 final : public ScTpSubTotalGroup
public:
virtual ~ScTpSubTotalGroup1() override;
static VclPtr<SfxTabPage> Create ( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create ( TabPageParent pParent,
const SfxItemSet* rArgSet );
virtual bool FillItemSet ( SfxItemSet* rArgSet ) override;
virtual void Reset ( const SfxItemSet* rArgSet ) override;
@@ -100,7 +100,7 @@ class ScTpSubTotalGroup2 final : public ScTpSubTotalGroup
public:
virtual ~ScTpSubTotalGroup2() override;
static VclPtr<SfxTabPage> Create ( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create ( TabPageParent pParent,
const SfxItemSet* rArgSet );
virtual bool FillItemSet ( SfxItemSet* rArgSet ) override;
virtual void Reset ( const SfxItemSet* rArgSet ) override;
@@ -115,7 +115,7 @@ class ScTpSubTotalGroup3 final : public ScTpSubTotalGroup
public:
virtual ~ScTpSubTotalGroup3() override;
static VclPtr<SfxTabPage> Create ( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create ( TabPageParent pParent,
const SfxItemSet* rArgSet );
virtual bool FillItemSet ( SfxItemSet* rArgSet ) override;
virtual void Reset ( const SfxItemSet* rArgSet ) override;
@@ -126,7 +126,7 @@ class ScTpSubTotalOptions final : public SfxTabPage
public:
virtual ~ScTpSubTotalOptions() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create ( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create ( TabPageParent pParent,
const SfxItemSet* rArgSet );
virtual bool FillItemSet ( SfxItemSet* rArgSet ) override;
virtual void Reset ( const SfxItemSet* rArgSet ) override;
diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx
index 3b01422..bd95248 100644
--- a/sc/source/ui/inc/tptable.hxx
+++ b/sc/source/ui/inc/tptable.hxx
@@ -30,7 +30,7 @@ class ScTablePage : public SfxTabPage
friend class VclPtr<ScTablePage>;
static const sal_uInt16 pPageTableRanges[];
public:
static VclPtr<SfxTabPage> Create ( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create ( TabPageParent pParent,
const SfxItemSet* rCoreSet );
static const sal_uInt16* GetRanges () { return pPageTableRanges; }
virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override;
diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx
index 8e5af6e..6e84d2e 100644
--- a/sc/source/ui/inc/tpusrlst.hxx
+++ b/sc/source/ui/inc/tpusrlst.hxx
@@ -34,7 +34,7 @@ class ScTpUserLists : public SfxTabPage
{
friend class VclPtr<ScTpUserLists>;
public:
static VclPtr<SfxTabPage> Create ( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create ( TabPageParent pParent,
const SfxItemSet* rAttrSet );
virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) override;
virtual void Reset ( const SfxItemSet* rCoreAttrs ) override;
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 6ac52a2..5453fd6 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -72,7 +72,7 @@ class ScTpContentOptions : public SfxTabPage
virtual void dispose() override;
public:
static VclPtr<SfxTabPage> Create ( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create ( TabPageParent pParent,
const SfxItemSet* rCoreSet );
virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override;
virtual void Reset ( const SfxItemSet* rCoreSet ) override;
@@ -115,7 +115,7 @@ class ScTpLayoutOptions : public SfxTabPage
public:
virtual ~ScTpLayoutOptions() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create ( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create ( TabPageParent pParent,
const SfxItemSet* rCoreSet );
virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override;
virtual void Reset ( const SfxItemSet* rCoreSet ) override;
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index 4d67bd6..e05e3ec 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -84,7 +84,7 @@ public:
explicit ScTPValidationValue( vcl::Window* pParent, const SfxItemSet& rArgSet );
virtual ~ScTPValidationValue() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rArgSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rArgSet );
static const sal_uInt16* GetRanges() { return pValueRanges; }
virtual bool FillItemSet( SfxItemSet* rArgSet ) override;
@@ -271,7 +271,7 @@ public:
virtual ~ScTPValidationHelp() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, const SfxItemSet* rArgSet );
static VclPtr<SfxTabPage> Create ( TabPageParent pParent, const SfxItemSet* rArgSet );
virtual bool FillItemSet ( SfxItemSet* rArgSet ) override;
virtual void Reset ( const SfxItemSet* rArgSet ) override;
};
@@ -297,7 +297,7 @@ public:
virtual ~ScTPValidationError() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, const SfxItemSet* rArgSet );
static VclPtr<SfxTabPage> Create ( TabPageParent pParent, const SfxItemSet* rArgSet );
virtual bool FillItemSet ( SfxItemSet* rArgSet ) override;
virtual void Reset ( const SfxItemSet* rArgSet ) override;
};
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index 4cee5bf..b64670d 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -65,9 +65,9 @@ void ScRedlineOptionsTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> ScRedlineOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
VclPtr<SfxTabPage> ScRedlineOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
{
return VclPtr<ScRedlineOptionsTabPage>::Create( pParent, *rSet );
return VclPtr<ScRedlineOptionsTabPage>::Create( pParent.pParent, *rSet );
}
bool ScRedlineOptionsTabPage::FillItemSet( SfxItemSet* /* rSet */ )
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index af66b3e..1c3900b 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -108,9 +108,9 @@ void ScTpCalcOptions::Init()
m_pBtnThread->SetClickHdl( LINK( this, ScTpCalcOptions, CheckClickHdl ) );
}
VclPtr<SfxTabPage> ScTpCalcOptions::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
VclPtr<SfxTabPage> ScTpCalcOptions::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<ScTpCalcOptions>::Create( pParent, *rAttrSet );
return VclPtr<ScTpCalcOptions>::Create( pParent.pParent, *rAttrSet );
}
void ScTpCalcOptions::Reset( const SfxItemSet* /* rCoreAttrs */ )
diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx
index 55e171a..593ac69 100644
--- a/sc/source/ui/optdlg/tpcompatibility.cxx
+++ b/sc/source/ui/optdlg/tpcompatibility.cxx
@@ -31,9 +31,9 @@ void ScTpCompatOptions::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> ScTpCompatOptions::Create(vcl::Window *pParent, const SfxItemSet *rCoreAttrs)
VclPtr<SfxTabPage> ScTpCompatOptions::Create(TabPageParent pParent, const SfxItemSet *rCoreAttrs)
{
return VclPtr<ScTpCompatOptions>::Create(pParent, *rCoreAttrs);
return VclPtr<ScTpCompatOptions>::Create(pParent.pParent, *rCoreAttrs);
}
bool ScTpCompatOptions::FillItemSet(SfxItemSet *rCoreAttrs)
diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx
index 5e6ef53..c252b96 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -39,9 +39,9 @@ void ScTpDefaultsOptions::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> ScTpDefaultsOptions::Create(vcl::Window *pParent, const SfxItemSet *rCoreAttrs)
VclPtr<SfxTabPage> ScTpDefaultsOptions::Create(TabPageParent pParent, const SfxItemSet *rCoreAttrs)
{
return VclPtr<ScTpDefaultsOptions>::Create(pParent, *rCoreAttrs);
return VclPtr<ScTpDefaultsOptions>::Create(pParent.pParent, *rCoreAttrs);
}
bool ScTpDefaultsOptions::FillItemSet(SfxItemSet *rCoreSet)
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index 3d95015..75b3482 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -228,9 +228,9 @@ IMPL_LINK( ScTpFormulaOptions, SepEditOnFocusHdl, Control&, rControl, void )
OnFocusSeparatorInput(static_cast<Edit*>(&rControl));
}
VclPtr<SfxTabPage> ScTpFormulaOptions::Create(vcl::Window* pParent, const SfxItemSet* rCoreSet)
VclPtr<SfxTabPage> ScTpFormulaOptions::Create(TabPageParent pParent, const SfxItemSet* rCoreSet)
{
return VclPtr<ScTpFormulaOptions>::Create(pParent, *rCoreSet);
return VclPtr<ScTpFormulaOptions>::Create(pParent.pParent, *rCoreSet);
}
bool ScTpFormulaOptions::FillItemSet(SfxItemSet* rCoreSet)
diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx
index 1b6a7c30..9c8dcbc 100644
--- a/sc/source/ui/optdlg/tpprint.cxx
+++ b/sc/source/ui/optdlg/tpprint.cxx
@@ -51,9 +51,9 @@ void ScTpPrintOptions::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> ScTpPrintOptions::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
VclPtr<SfxTabPage> ScTpPrintOptions::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<ScTpPrintOptions>::Create( pParent, *rAttrSet );
return VclPtr<ScTpPrintOptions>::Create( pParent.pParent, *rAttrSet );
}
DeactivateRC ScTpPrintOptions::DeactivatePage( SfxItemSet* pSetP )
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 7671b1e..85f7c0d 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -148,9 +148,9 @@ void ScTpUserLists::Init()
}
VclPtr<SfxTabPage> ScTpUserLists::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
VclPtr<SfxTabPage> ScTpUserLists::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<ScTpUserLists>::Create( pParent, *rAttrSet );
return VclPtr<ScTpUserLists>::Create( pParent.pParent, *rAttrSet );
}
void ScTpUserLists::Reset( const SfxItemSet* rCoreAttrs )
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index a7151bd..cf7a953 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -126,10 +126,10 @@ void ScTpContentOptions::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> ScTpContentOptions::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> ScTpContentOptions::Create( TabPageParent pParent,
const SfxItemSet* rCoreSet )
{
return VclPtr<ScTpContentOptions>::Create(pParent, *rCoreSet);
return VclPtr<ScTpContentOptions>::Create(pParent.pParent, *rCoreSet);
}
bool ScTpContentOptions::FillItemSet( SfxItemSet* rCoreSet )
@@ -409,10 +409,10 @@ void ScTpLayoutOptions::dispose()
}
VclPtr<SfxTabPage> ScTpLayoutOptions::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> ScTpLayoutOptions::Create( TabPageParent pParent,
const SfxItemSet* rCoreSet )
{
VclPtrInstance<ScTpLayoutOptions> pNew( pParent, *rCoreSet );
VclPtrInstance<ScTpLayoutOptions> pNew( pParent.pParent, *rCoreSet );
ScDocShell* pDocSh = dynamic_cast< ScDocShell *>( SfxObjectShell::Current() );
if(pDocSh!=nullptr)
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 33ec160..3d1192b 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -831,9 +831,9 @@ ScRightHeaderEditPage::ScRightHeaderEditPage( vcl::Window* pParent, const SfxIte
true )
{}
VclPtr<SfxTabPage> ScRightHeaderEditPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet )
VclPtr<SfxTabPage> ScRightHeaderEditPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet )
{
return VclPtr<ScRightHeaderEditPage>::Create( pParent, *rCoreSet );
return VclPtr<ScRightHeaderEditPage>::Create( pParent.pParent, *rCoreSet );
}
// class ScLeftHeaderEditPage
@@ -845,9 +845,9 @@ ScLeftHeaderEditPage::ScLeftHeaderEditPage( vcl::Window* pParent, const SfxItemS
true )
{}
VclPtr<SfxTabPage> ScLeftHeaderEditPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet )
VclPtr<SfxTabPage> ScLeftHeaderEditPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet )
{
return VclPtr<ScLeftHeaderEditPage>::Create( pParent, *rCoreSet );
return VclPtr<ScLeftHeaderEditPage>::Create( pParent.pParent, *rCoreSet );
}
// class ScRightFooterEditPage
@@ -859,9 +859,9 @@ ScRightFooterEditPage::ScRightFooterEditPage( vcl::Window* pParent, const SfxIte
false )
{}
VclPtr<SfxTabPage> ScRightFooterEditPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet )
VclPtr<SfxTabPage> ScRightFooterEditPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet )
{
return VclPtr<ScRightFooterEditPage>::Create( pParent, *rCoreSet );
return VclPtr<ScRightFooterEditPage>::Create( pParent.pParent, *rCoreSet );
}
// class ScLeftFooterEditPage
@@ -873,9 +873,9 @@ ScLeftFooterEditPage::ScLeftFooterEditPage( vcl::Window* pParent, const SfxItemS
false )
{}
VclPtr<SfxTabPage> ScLeftFooterEditPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet )
VclPtr<SfxTabPage> ScLeftFooterEditPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet )
{
return VclPtr<ScLeftFooterEditPage>::Create( pParent, *rCoreSet );
return VclPtr<ScLeftFooterEditPage>::Create( pParent.pParent, *rCoreSet );
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index ba90213..3d5bcf6 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -243,9 +243,9 @@ ScHeaderPage::ScHeaderPage( vcl::Window* pParent, const SfxItemSet& rSet )
{
}
VclPtr<SfxTabPage> ScHeaderPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet )
VclPtr<SfxTabPage> ScHeaderPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet )
{
return VclPtr<ScHeaderPage>::Create( pParent, *rCoreSet );
return VclPtr<ScHeaderPage>::Create( pParent.pParent, *rCoreSet );
}
const sal_uInt16* ScHeaderPage::GetRanges()
@@ -260,9 +260,9 @@ ScFooterPage::ScFooterPage( vcl::Window* pParent, const SfxItemSet& rSet )
{
}
VclPtr<SfxTabPage> ScFooterPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet )
VclPtr<SfxTabPage> ScFooterPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet )
{
return VclPtr<ScFooterPage>::Create( pParent, *rCoreSet );
return VclPtr<ScFooterPage>::Create( pParent.pParent, *rCoreSet );
}
const sal_uInt16* ScFooterPage::GetRanges()
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index 59f388d..2a47713 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -166,9 +166,9 @@ void ScTablePage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> ScTablePage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet )
VclPtr<SfxTabPage> ScTablePage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet )
{
return VclPtr<ScTablePage>::Create( pParent, *rCoreSet );
return VclPtr<ScTablePage>::Create( pParent.pParent, *rCoreSet );
}
void ScTablePage::Reset( const SfxItemSet* rCoreSet )
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index f5ddf74..ac3f877 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -516,7 +516,7 @@ bool ScPreviewShell::HasPrintOptionsPage() const
return true;
}
VclPtr<SfxTabPage> ScPreviewShell::CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions )
VclPtr<SfxTabPage> ScPreviewShell::CreatePrintOptionsPage( TabPageParent pParent, const SfxItemSet &rOptions )
{
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 3eae848..f5d0815 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1049,7 +1049,7 @@ bool ScTabViewShell::HasPrintOptionsPage() const
return true;
}
VclPtr<SfxTabPage> ScTabViewShell::CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions )
VclPtr<SfxTabPage> ScTabViewShell::CreatePrintOptionsPage( TabPageParent pParent, const SfxItemSet &rOptions )
{
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 1c5e384..51085fc 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -112,7 +112,7 @@ public:
// virtual methods for the option dialog
virtual std::unique_ptr<SfxItemSet> CreateItemSet( sal_uInt16 nId ) override;
virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) override;
virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) override;
virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) override;
virtual SfxStyleFamilies* CreateStyleFamilies() override;
SdExtPropertySetInfoCache gImplImpressPropertySetInfoCache;
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 37a8622..5429a9b 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -740,7 +740,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet )
pViewShell->GetViewFrame()->GetBindings().InvalidateAll( true );
}
VclPtr<SfxTabPage> SdModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet )
VclPtr<SfxTabPage> SdModule::CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet )
{
VclPtr<SfxTabPage> pRet;
SfxAllItemSet aSet(*(rSet.GetPool()));
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index 82c6a5f..3b7aa76 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -39,7 +39,7 @@ public:
virtual ~SdParagraphNumTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) override;
@@ -82,9 +82,9 @@ void SdParagraphNumTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SdParagraphNumTabPage::Create(vcl::Window *pParent, const SfxItemSet * rAttrSet)
VclPtr<SfxTabPage> SdParagraphNumTabPage::Create(TabPageParent pParent, const SfxItemSet * rAttrSet)
{
return VclPtr<SdParagraphNumTabPage>::Create( pParent, *rAttrSet );
return VclPtr<SdParagraphNumTabPage>::Create( pParent.pParent, *rAttrSet );
}
const sal_uInt16* SdParagraphNumTabPage::GetRanges()
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index 4673c0c..ea553b1 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -202,10 +202,10 @@ void SdPrintOptions::Reset( const SfxItemSet* rAttrs )
ClickBookletHdl( nullptr );
}
VclPtr<SfxTabPage> SdPrintOptions::Create( vcl::Window* pWindow,
VclPtr<SfxTabPage> SdPrintOptions::Create( TabPageParent pWindow,
const SfxItemSet* rOutAttrs )
{
return VclPtr<SdPrintOptions>::Create( pWindow, *rOutAttrs );
return VclPtr<SdPrintOptions>::Create( pWindow.pParent, *rOutAttrs );
}
IMPL_LINK( SdPrintOptions, ClickCheckboxHdl, Button*, pCbx, void )
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 4060620..188068e 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -372,10 +372,10 @@ DeactivateRC SdTPAction::DeactivatePage( SfxItemSet* pPageSet )
return DeactivateRC::LeavePage;
}
VclPtr<SfxTabPage> SdTPAction::Create( vcl::Window* pWindow,
VclPtr<SfxTabPage> SdTPAction::Create( TabPageParent pWindow,
const SfxItemSet& rAttrs )
{
return VclPtr<SdTPAction>::Create( pWindow, rAttrs );
return VclPtr<SdTPAction>::Create( pWindow.pParent, rAttrs );
}
void SdTPAction::UpdateTree()
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index a7381b2..53c4487 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -100,10 +100,10 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
pCbxRotate->GetClickHdl().Call(nullptr);
}
VclPtr<SfxTabPage> SdTpOptionsSnap::Create( vcl::Window* pWindow,
VclPtr<SfxTabPage> SdTpOptionsSnap::Create( TabPageParent pWindow,
const SfxItemSet* rAttrs )
{
return VclPtr<SdTpOptionsSnap>::Create( pWindow, *rAttrs );
return VclPtr<SdTpOptionsSnap>::Create( pWindow.pParent, *rAttrs );
}
/*************************************************************************
@@ -173,10 +173,10 @@ void SdTpOptionsContents::Reset( const SfxItemSet* rAttrs )
m_pCbxHandlesBezier->SaveValue();
}
VclPtr<SfxTabPage> SdTpOptionsContents::Create( vcl::Window* pWindow,
VclPtr<SfxTabPage> SdTpOptionsContents::Create( TabPageParent pWindow,
const SfxItemSet* rAttrs )
{
return VclPtr<SdTpOptionsContents>::Create( pWindow, *rAttrs );
return VclPtr<SdTpOptionsContents>::Create( pWindow.pParent, *rAttrs );
}
/*************************************************************************
@@ -526,10 +526,10 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs )
UpdateCompatibilityControls ();
}
VclPtr<SfxTabPage> SdTpOptionsMisc::Create( vcl::Window* pWindow,
VclPtr<SfxTabPage> SdTpOptionsMisc::Create( TabPageParent pWindow,
const SfxItemSet* rAttrs )
{
return VclPtr<SdTpOptionsMisc>::Create( pWindow, *rAttrs );
return VclPtr<SdTpOptionsMisc>::Create( pWindow.pParent, *rAttrs );
}
IMPL_LINK_NOARG(SdTpOptionsMisc, SelectMetricHdl_Impl, ListBox&, void)
diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx
index 3b64109..bf30742 100644
--- a/sd/source/ui/inc/prntopts.hxx
+++ b/sd/source/ui/inc/prntopts.hxx
@@ -63,7 +63,7 @@ public:
virtual ~SdPrintOptions() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx
index 8ca9566..fce151b 100644
--- a/sd/source/ui/inc/tpaction.hxx
+++ b/sd/source/ui/inc/tpaction.hxx
@@ -95,7 +95,7 @@ public:
virtual ~SdTPAction() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet& );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet& );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx
index 11ecd30..7970c6c 100644
--- a/sd/source/ui/inc/tpoption.hxx
+++ b/sd/source/ui/inc/tpoption.hxx
@@ -37,7 +37,7 @@ public:
SdTpOptionsSnap( vcl::Window* pParent, const SfxItemSet& rInAttrs );
virtual ~SdTpOptionsSnap() override;
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
@@ -59,7 +59,7 @@ public:
virtual ~SdTpOptionsContents() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
};
@@ -133,7 +133,7 @@ public:
virtual ~SdTpOptionsMisc() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 060cc8b..39274e3 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -188,7 +188,7 @@ SfxChildWinFactArr_Impl* SfxModule::GetChildWinFactories_Impl() const
return pImpl->pFactArr.get();
}
VclPtr<SfxTabPage> SfxModule::CreateTabPage( sal_uInt16, vcl::Window*, const SfxItemSet& )
VclPtr<SfxTabPage> SfxModule::CreateTabPage(sal_uInt16, TabPageParent, const SfxItemSet&)
{
return VclPtr<SfxTabPage>();
}
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 8697747..017ca40 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -634,9 +634,9 @@ void SfxDocumentDescPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SfxDocumentDescPage::Create(vcl::Window *pParent, const SfxItemSet *rItemSet)
VclPtr<SfxTabPage> SfxDocumentDescPage::Create(TabPageParent pParent, const SfxItemSet *rItemSet)
{
return VclPtr<SfxDocumentDescPage>::Create(pParent, *rItemSet);
return VclPtr<SfxDocumentDescPage>::Create(pParent.pParent, *rItemSet);
}
bool SfxDocumentDescPage::FillItemSet(SfxItemSet *rSet)
@@ -930,9 +930,9 @@ void SfxDocumentPage::ImplCheckPasswordState()
m_pChangePassBtn->Disable();
}
VclPtr<SfxTabPage> SfxDocumentPage::Create( vcl::Window* pParent, const SfxItemSet* rItemSet )
VclPtr<SfxTabPage> SfxDocumentPage::Create( TabPageParent pParent, const SfxItemSet* rItemSet )
{
return VclPtr<SfxDocumentPage>::Create( pParent, *rItemSet );
return VclPtr<SfxDocumentPage>::Create( pParent.pParent, *rItemSet );
}
void SfxDocumentPage::EnableUseUserData()
@@ -2221,9 +2221,9 @@ DeactivateRC SfxCustomPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ )
return nRet;
}
VclPtr<SfxTabPage> SfxCustomPropertiesPage::Create( vcl::Window* pParent, const SfxItemSet* rItemSet )
VclPtr<SfxTabPage> SfxCustomPropertiesPage::Create( TabPageParent pParent, const SfxItemSet* rItemSet )
{
return VclPtr<SfxCustomPropertiesPage>::Create( pParent, *rItemSet );
return VclPtr<SfxCustomPropertiesPage>::Create( pParent.pParent, *rItemSet );
}
CmisValue::CmisValue( vcl::Window* pParent, const OUString& aStr )
@@ -2717,9 +2717,9 @@ DeactivateRC SfxCmisPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ )
return DeactivateRC::LeavePage;
}
VclPtr<SfxTabPage> SfxCmisPropertiesPage::Create( vcl::Window* pParent, const SfxItemSet* rItemSet )
VclPtr<SfxTabPage> SfxCmisPropertiesPage::Create( TabPageParent pParent, const SfxItemSet* rItemSet )
{
return VclPtr<SfxCmisPropertiesPage>::Create( pParent, *rItemSet );
return VclPtr<SfxCmisPropertiesPage>::Create( pParent.pParent, *rItemSet );
}
void SfxCmisPropertiesPage::SetPosSizePixel(const Point& rAllocPos, const Size& rAllocation)
diff --git a/sfx2/source/dialog/documentfontsdialog.cxx b/sfx2/source/dialog/documentfontsdialog.cxx
index abf8af7..77177c7 100644
--- a/sfx2/source/dialog/documentfontsdialog.cxx
+++ b/sfx2/source/dialog/documentfontsdialog.cxx
@@ -23,9 +23,9 @@
using namespace ::com::sun::star;
VclPtr<SfxTabPage> SfxDocumentFontsPage::Create( vcl::Window* parent, const SfxItemSet* set )
VclPtr<SfxTabPage> SfxDocumentFontsPage::Create(TabPageParent parent, const SfxItemSet* set)
{
return VclPtr<SfxDocumentFontsPage>::Create( parent, *set );
return VclPtr<SfxDocumentFontsPage>::Create( parent.pParent, *set );
}
SfxDocumentFontsPage::SfxDocumentFontsPage( vcl::Window* parent, const SfxItemSet& set )
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 77eed3e..611a735 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -534,10 +534,10 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet* /*rAttrSet*/ )
}
VclPtr<SfxTabPage> SfxManageStyleSheetPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SfxManageStyleSheetPage::Create( TabPageParent pParent,
const SfxItemSet *rAttrSet )
{
return VclPtr<SfxManageStyleSheetPage>::Create( pParent, *rAttrSet );
return VclPtr<SfxManageStyleSheetPage>::Create( pParent.pParent, *rAttrSet );
}
diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx
index 65f9ea8..c50da65 100644
--- a/sfx2/source/dialog/printopt.cxx
+++ b/sfx2/source/dialog/printopt.cxx
@@ -113,9 +113,9 @@ void SfxCommonPrintOptionsTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SfxCommonPrintOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
VclPtr<SfxTabPage> SfxCommonPrintOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<SfxCommonPrintOptionsTabPage>::Create( pParent, *rAttrSet );
return VclPtr<SfxCommonPrintOptionsTabPage>::Create( pParent.pParent, *rAttrSet );
}
vcl::Window* SfxCommonPrintOptionsTabPage::GetParentLabeledBy( const vcl::Window* pWindow ) const
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index 8633a5e..cea3583 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -415,9 +415,9 @@ IMPL_LINK_NOARG(SfxSecurityPage_Impl, ChangeProtectionPBHdl, Button*, void)
}
VclPtr<SfxTabPage> SfxSecurityPage::Create( vcl::Window * pParent, const SfxItemSet * rItemSet )
VclPtr<SfxTabPage> SfxSecurityPage::Create( TabPageParent pParent, const SfxItemSet * rItemSet )
{
return VclPtr<SfxSecurityPage>::Create( pParent, *rItemSet );
return VclPtr<SfxSecurityPage>::Create( pParent.pParent, *rItemSet );
}
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index d4db8a0..c63a62e 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -164,6 +164,17 @@ SfxTabPage::SfxTabPage(vcl::Window *pParent, const OString& rID, const OUString&
{
}
SfxTabPage::SfxTabPage(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet *rAttrSet)
: TabPage(Application::GetDefDialogParent()) //just drag this along hidden in this scenario
, pSet ( rAttrSet )
, bHasExchangeSupport ( false )
, pImpl ( new TabPageImpl )
, m_xBuilder(pParent.pPage ? Application::CreateBuilder(pParent.pPage, rUIXMLDescription)
: Application::CreateInterimBuilder(pParent.pParent, rUIXMLDescription))
, m_xContainer(m_xBuilder->weld_container(rID))
{
}
SfxTabPage::~SfxTabPage()
{
disposeOnce();
@@ -172,6 +183,8 @@ SfxTabPage::~SfxTabPage()
void SfxTabPage::dispose()
{
pImpl.reset();
m_xContainer.reset();
m_xBuilder.reset();
TabPage::dispose();
}
@@ -1107,7 +1120,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void )
if ( !pTabPage )
{
if ( m_pSet )
pTabPage = (pDataObject->fnCreatePage)( pTabCtrl, m_pSet );
pTabPage = (pDataObject->fnCreatePage)( static_cast<vcl::Window*>(pTabCtrl), m_pSet );
else
pTabPage = (pDataObject->fnCreatePage)
( pTabCtrl, CreateInputItemSet( nId ) );
diff --git a/sfx2/source/inc/documentfontsdialog.hxx b/sfx2/source/inc/documentfontsdialog.hxx
index 4e1b12d..4860559 100644
--- a/sfx2/source/inc/documentfontsdialog.hxx
+++ b/sfx2/source/inc/documentfontsdialog.hxx
@@ -31,7 +31,7 @@ public:
SfxDocumentFontsPage( vcl::Window* parent, const SfxItemSet& set );
virtual ~SfxDocumentFontsPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* parent, const SfxItemSet* set );
static VclPtr<SfxTabPage> Create(TabPageParent parent, const SfxItemSet* set);
protected:
virtual bool FillItemSet( SfxItemSet* set ) override;
virtual void Reset( const SfxItemSet* set ) override;
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 580a4b4..44cc9d5 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -897,7 +897,7 @@ sal_uInt16 SfxViewShell::SetPrinter( SfxPrinter* /*pNewPrinter*/, SfxPrinterChan
VclPtr<SfxTabPage> SfxViewShell::CreatePrintOptionsPage
(
vcl::Window* /*pParent*/,
TabPageParent /*pParent*/,
const SfxItemSet& /*rOptions*/
)
{
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index cd860e5..86d1753 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -52,28 +52,27 @@ void SetFontStyle(const OUString &rStyleName, vcl::Font &rFont);
class SmPrintOptionsTabPage : public SfxTabPage
{
VclPtr<CheckBox> m_pTitle;
VclPtr<CheckBox> m_pText;
VclPtr<CheckBox> m_pFrame;
VclPtr<RadioButton> m_pSizeNormal;
VclPtr<RadioButton> m_pSizeScaled;
VclPtr<RadioButton> m_pSizeZoomed;
VclPtr<MetricField> m_pZoom;
VclPtr<CheckBox> m_pNoRightSpaces;
VclPtr<CheckBox> m_pSaveOnlyUsedSymbols;
VclPtr<CheckBox> m_pAutoCloseBrackets;
std::unique_ptr<weld::CheckButton> m_xTitle;
std::unique_ptr<weld::CheckButton> m_xText;
std::unique_ptr<weld::CheckButton> m_xFrame;
std::unique_ptr<weld::RadioButton> m_xSizeNormal;
std::unique_ptr<weld::RadioButton> m_xSizeScaled;
std::unique_ptr<weld::RadioButton> m_xSizeZoomed;
std::unique_ptr<weld::MetricSpinButton> m_xZoom;
std::unique_ptr<weld::CheckButton> m_xNoRightSpaces;
std::unique_ptr<weld::CheckButton> m_xSaveOnlyUsedSymbols;
std::unique_ptr<weld::CheckButton> m_xAutoCloseBrackets;
DECL_LINK(SizeButtonClickHdl, Button *, void);
DECL_LINK(SizeButtonClickHdl, weld::ToggleButton&, void);
virtual bool FillItemSet(SfxItemSet* rSet) override;
virtual void Reset(const SfxItemSet* rSet) override;
public:
static VclPtr<SfxTabPage> Create(vcl::Window *pWindow, const SfxItemSet &rSet);
static VclPtr<SfxTabPage> Create(TabPageParent pWindow, const SfxItemSet &rSet);
SmPrintOptionsTabPage(vcl::Window *pParent, const SfxItemSet &rOptions);
SmPrintOptionsTabPage(TabPageParent pPage, const SfxItemSet &rOptions);
virtual ~SmPrintOptionsTabPage() override;
virtual void dispose() override;
};
/**************************************************************************/
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index 81e2124..8080028 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -99,7 +99,7 @@ public:
//virtual methods for options dialog
virtual std::unique_ptr<SfxItemSet> CreateItemSet( sal_uInt16 nId ) override;
virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) override;
virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) override;
virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) override;
};
#define SM_MOD() ( static_cast<SmModule*>(SfxApplication::GetModule(SfxToolsModule::Math)) )
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index 5950e9e..7b6e741 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -251,7 +251,7 @@ protected:
void InsertFrom(SfxMedium &rMedium);
virtual bool HasPrintOptionsPage() const override;
virtual VclPtr<SfxTabPage> CreatePrintOptionsPage(vcl::Window *pParent,
virtual VclPtr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent,
const SfxItemSet &rOptions) override;
virtual void Deactivate(bool IsMDIActivate) override;
virtual void Activate(bool IsMDIActivate) override;
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index e1f744c..267cdca 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -151,99 +151,78 @@ void SetFontStyle(const OUString &rStyleName, vcl::Font &rFont)
rFont.SetWeight((nIndex & 0x2) ? WEIGHT_BOLD : WEIGHT_NORMAL);
}
IMPL_LINK_NOARG( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, void )
IMPL_LINK_NOARG(SmPrintOptionsTabPage, SizeButtonClickHdl, weld::ToggleButton&, void)
{
m_pZoom->Enable(m_pSizeZoomed->IsChecked());
m_xZoom->set_sensitive(m_xSizeZoomed->get_active());
}
SmPrintOptionsTabPage::SmPrintOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rOptions)
: SfxTabPage(pParent, "SmathSettings", "modules/smath/ui/smathsettings.ui", &rOptions)
SmPrintOptionsTabPage::SmPrintOptionsTabPage(TabPageParent pPage, const SfxItemSet& rOptions)
: SfxTabPage(pPage, "modules/smath/ui/smathsettings.ui", "SmathSettings", &rOptions)
, m_xTitle(m_xBuilder->weld_check_button("title"))
, m_xText(m_xBuilder->weld_check_button("text"))
, m_xFrame(m_xBuilder->weld_check_button("frame"))
, m_xSizeNormal(m_xBuilder->weld_radio_button("sizenormal"))
, m_xSizeScaled(m_xBuilder->weld_radio_button("sizescaled"))
, m_xSizeZoomed(m_xBuilder->weld_radio_button("sizezoomed"))
, m_xZoom(m_xBuilder->weld_metric_spin_button("zoom", FUNIT_PERCENT))
, m_xNoRightSpaces(m_xBuilder->weld_check_button("norightspaces"))
, m_xSaveOnlyUsedSymbols(m_xBuilder->weld_check_button("saveonlyusedsymbols"))
, m_xAutoCloseBrackets(m_xBuilder->weld_check_button("autoclosebrackets"))
{
get( m_pTitle, "title");
get( m_pText, "text");
get( m_pFrame, "frame");
get( m_pSizeNormal, "sizenormal");
get( m_pSizeScaled, "sizescaled");
get( m_pSizeZoomed, "sizezoomed");
get( m_pZoom, "zoom");
get( m_pNoRightSpaces, "norightspaces");
get( m_pSaveOnlyUsedSymbols, "saveonlyusedsymbols");
get( m_pAutoCloseBrackets, "autoclosebrackets");
m_pSizeNormal->SetClickHdl(LINK(this, SmPrintOptionsTabPage, SizeButtonClickHdl));
m_pSizeScaled->SetClickHdl(LINK(this, SmPrintOptionsTabPage, SizeButtonClickHdl));
m_pSizeZoomed->SetClickHdl(LINK(this, SmPrintOptionsTabPage, SizeButtonClickHdl));
m_xSizeNormal->connect_toggled(LINK(this, SmPrintOptionsTabPage, SizeButtonClickHdl));
m_xSizeScaled->connect_toggled(LINK(this, SmPrintOptionsTabPage, SizeButtonClickHdl));
m_xSizeZoomed->connect_toggled(LINK(this, SmPrintOptionsTabPage, SizeButtonClickHdl));
Reset(&rOptions);
}
SmPrintOptionsTabPage::~SmPrintOptionsTabPage()
{
disposeOnce();
}
void SmPrintOptionsTabPage::dispose()
{
m_pTitle.clear();
m_pText.clear();
m_pFrame.clear();
m_pSizeNormal.clear();
m_pSizeScaled.clear();
m_pSizeZoomed.clear();
m_pZoom.clear();
m_pNoRightSpaces.clear();
m_pSaveOnlyUsedSymbols.clear();
m_pAutoCloseBrackets.clear();
SfxTabPage::dispose();
}
bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet* rSet)
{
sal_uInt16 nPrintSize;
if (m_pSizeNormal->IsChecked())
if (m_xSizeNormal->get_active())
nPrintSize = PRINT_SIZE_NORMAL;
else if (m_pSizeScaled->IsChecked())
else if (m_xSizeScaled->get_active())
nPrintSize = PRINT_SIZE_SCALED;
else
nPrintSize = PRINT_SIZE_ZOOMED;
rSet->Put(SfxUInt16Item(GetWhich(SID_PRINTSIZE), nPrintSize));
rSet->Put(SfxUInt16Item(GetWhich(SID_PRINTZOOM), sal::static_int_cast<sal_uInt16>(m_pZoom->GetValue())));
rSet->Put(SfxBoolItem(GetWhich(SID_PRINTTITLE), m_pTitle->IsChecked()));
rSet->Put(SfxBoolItem(GetWhich(SID_PRINTTEXT), m_pText->IsChecked()));
rSet->Put(SfxBoolItem(GetWhich(SID_PRINTFRAME), m_pFrame->IsChecked()));
rSet->Put(SfxBoolItem(GetWhich(SID_NO_RIGHT_SPACES), m_pNoRightSpaces->IsChecked()));
rSet->Put(SfxBoolItem(GetWhich(SID_SAVE_ONLY_USED_SYMBOLS), m_pSaveOnlyUsedSymbols->IsChecked()));
rSet->Put(SfxBoolItem(GetWhich(SID_AUTO_CLOSE_BRACKETS), m_pAutoCloseBrackets->IsChecked()));
rSet->Put(SfxUInt16Item(GetWhich(SID_PRINTZOOM), sal::static_int_cast<sal_uInt16>(m_xZoom->get_value(FUNIT_PERCENT))));
rSet->Put(SfxBoolItem(GetWhich(SID_PRINTTITLE), m_xTitle->get_active()));
rSet->Put(SfxBoolItem(GetWhich(SID_PRINTTEXT), m_xText->get_active()));
rSet->Put(SfxBoolItem(GetWhich(SID_PRINTFRAME), m_xFrame->get_active()));
rSet->Put(SfxBoolItem(GetWhich(SID_NO_RIGHT_SPACES), m_xNoRightSpaces->get_active()));
rSet->Put(SfxBoolItem(GetWhich(SID_SAVE_ONLY_USED_SYMBOLS), m_xSaveOnlyUsedSymbols->get_active()));
rSet->Put(SfxBoolItem(GetWhich(SID_AUTO_CLOSE_BRACKETS), m_xAutoCloseBrackets->get_active()));
return true;
}
void SmPrintOptionsTabPage::Reset(const SfxItemSet* rSet)
{
SmPrintSize ePrintSize = static_cast<SmPrintSize>(static_cast<const SfxUInt16Item &>(rSet->Get(GetWhich(SID_PRINTSIZE))).GetValue());
m_pSizeNormal->Check(ePrintSize == PRINT_SIZE_NORMAL);
m_pSizeScaled->Check(ePrintSize == PRINT_SIZE_SCALED);
m_pSizeZoomed->Check(ePrintSize == PRINT_SIZE_ZOOMED);
m_xSizeNormal->set_active(ePrintSize == PRINT_SIZE_NORMAL);
m_xSizeScaled->set_active(ePrintSize == PRINT_SIZE_SCALED);
m_xSizeZoomed->set_active(ePrintSize == PRINT_SIZE_ZOOMED);
m_pZoom->Enable(m_pSizeZoomed->IsChecked());
m_xZoom->set_sensitive(m_xSizeZoomed->get_active());
m_pZoom->SetValue(static_cast<const SfxUInt16Item &>(rSet->Get(GetWhich(SID_PRINTZOOM))).GetValue());
m_xZoom->set_value(static_cast<const SfxUInt16Item &>(rSet->Get(GetWhich(SID_PRINTZOOM))).GetValue(), FUNIT_PERCENT);
m_pTitle->Check(static_cast<const SfxBoolItem &>(rSet->Get(GetWhich(SID_PRINTTITLE))).GetValue());
m_pText->Check(static_cast<const SfxBoolItem &>(rSet->Get(GetWhich(SID_PRINTTEXT))).GetValue());
m_pFrame->Check(static_cast<const SfxBoolItem &>(rSet->Get(GetWhich(SID_PRINTFRAME))).GetValue());
m_pNoRightSpaces->Check(static_cast<const SfxBoolItem &>(rSet->Get(GetWhich(SID_NO_RIGHT_SPACES))).GetValue());
m_pSaveOnlyUsedSymbols->Check(static_cast<const SfxBoolItem &>(rSet->Get(GetWhich(SID_SAVE_ONLY_USED_SYMBOLS))).GetValue());
m_pAutoCloseBrackets->Check(static_cast<const SfxBoolItem &>(rSet->Get(GetWhich(SID_AUTO_CLOSE_BRACKETS))).GetValue());
m_xTitle->set_active(static_cast<const SfxBoolItem &>(rSet->Get(GetWhich(SID_PRINTTITLE))).GetValue());
m_xNoRightSpaces->set_active(static_cast<const SfxBoolItem &>(rSet->Get(GetWhich(SID_NO_RIGHT_SPACES))).GetValue());
m_xSaveOnlyUsedSymbols->set_active(static_cast<const SfxBoolItem &>(rSet->Get(GetWhich(SID_SAVE_ONLY_USED_SYMBOLS))).GetValue());
m_xAutoCloseBrackets->set_active(static_cast<const SfxBoolItem &>(rSet->Get(GetWhich(SID_AUTO_CLOSE_BRACKETS))).GetValue());
}
VclPtr<SfxTabPage> SmPrintOptionsTabPage::Create(vcl::Window* pWindow, const SfxItemSet& rSet)
VclPtr<SfxTabPage> SmPrintOptionsTabPage::Create(TabPageParent pParent, const SfxItemSet& rSet)
{
return VclPtr<SmPrintOptionsTabPage>::Create(pWindow, rSet).get();
return VclPtr<SmPrintOptionsTabPage>::Create(pParent, rSet).get();
}
void SmShowFont::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect)
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index ba52877..3a4722d 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -234,11 +234,11 @@ void SmModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet )
}
}
VclPtr<SfxTabPage> SmModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet )
VclPtr<SfxTabPage> SmModule::CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet )
{
VclPtr<SfxTabPage> pRet;
if(nId == SID_SM_TP_PRINTOPTIONS)
pRet = SmPrintOptionsTabPage::Create( pParent, rSet );
pRet = SmPrintOptionsTabPage::Create( TabPageParent(pParent.pParent), rSet );
return pRet;
}
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index d7a52d8..819aaec2 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1260,7 +1260,7 @@ bool SmViewShell::HasPrintOptionsPage() const
return true;
}
VclPtr<SfxTabPage> SmViewShell::CreatePrintOptionsPage(vcl::Window *pParent,
VclPtr<SfxTabPage> SmViewShell::CreatePrintOptionsPage(TabPageParent pParent,
const SfxItemSet &rOptions)
{
return SmPrintOptionsTabPage::Create(pParent, rOptions);
diff --git a/starmath/uiconfig/smath/ui/smathsettings.ui b/starmath/uiconfig/smath/ui/smathsettings.ui
index b306831..f2b989a 100644
--- a/starmath/uiconfig/smath/ui/smathsettings.ui
+++ b/starmath/uiconfig/smath/ui/smathsettings.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<!-- Generated with glade 3.20.4 -->
<interface domain="sm">
<requires lib="gtk+" version="3.18"/>
<object class="GtkAdjustment" id="adjustment1">
@@ -132,7 +132,6 @@
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">sizescaled</property>
</object>
<packing>
<property name="expand">False</property>
@@ -149,7 +148,7 @@
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">sizezoomed</property>
<property name="group">sizenormal</property>
</object>
<packing>
<property name="expand">False</property>
@@ -180,9 +179,10 @@
</packing>
</child>
<child>
<object class="GtkSpinButton" id="zoom:0%">
<object class="GtkSpinButton" id="zoom">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activates_default">True</property>
<property name="adjustment">adjustment1</property>
</object>
<packing>
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 50bc3ee..5b6e63c6 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -112,18 +112,16 @@ namespace svx {
}
}
VclPtr<SfxTabPage> SvxHeaderPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
VclPtr<SfxTabPage> SvxHeaderPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
{
return VclPtr<SvxHeaderPage>::Create( pParent, *rSet );
return VclPtr<SvxHeaderPage>::Create( pParent.pParent, *rSet );
}
VclPtr<SfxTabPage> SvxFooterPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
VclPtr<SfxTabPage> SvxFooterPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
{
return VclPtr<SvxFooterPage>::Create( pParent, *rSet );
return VclPtr<SvxFooterPage>::Create( pParent.pParent, *rSet );
}
SvxHeaderPage::SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rAttr ) :
SvxHFPage( pParent, rAttr, SID_ATTR_PAGE_HEADERSET )
@@ -131,7 +129,6 @@ SvxHeaderPage::SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rAttr ) :
{
}
SvxFooterPage::SvxFooterPage( vcl::Window* pParent, const SfxItemSet& rAttr ) :
SvxHFPage( pParent, rAttr, SID_ATTR_PAGE_FOOTERSET )
@@ -139,7 +136,6 @@ SvxFooterPage::SvxFooterPage( vcl::Window* pParent, const SfxItemSet& rAttr ) :
{
}
SvxHFPage::SvxHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ) :
SfxTabPage(pParent, "HFFormatPage", "svx/ui/headfootformatpage.ui", &rSet),
nId(nSetId),
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index e70599f..4a454fa 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -222,7 +222,7 @@ public:
// Virtual methods for options dialog.
virtual std::unique_ptr<SfxItemSet> CreateItemSet( sal_uInt16 nId ) override;
virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) override;
virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) override;
virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) override;
virtual SfxStyleFamilies* CreateStyleFamilies() override;
// Pool is created here and set at SfxShell.
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 700ae75..73a9138 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -618,7 +618,7 @@ public:
// methods for printing
SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) override;
SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const override;
SAL_DLLPRIVATE virtual VclPtr<SfxTabPage> CreatePrintOptionsPage( vcl::Window* pParent,
SAL_DLLPRIVATE virtual VclPtr<SfxTabPage> CreatePrintOptionsPage( TabPageParent pParent,
const SfxItemSet& rSet) override;
static SvxSearchItem* GetSearchItem() { return m_pSrchItem; }
/// See SfxViewShell::getPart().
@@ -646,7 +646,7 @@ inline const SwDocShell *SwView::GetDocShell() const
return const_cast<SwView*>(this)->GetDocShell();
}
VclPtr<SfxTabPage> CreatePrintOptionsPage( vcl::Window *pParent,
VclPtr<SfxTabPage> CreatePrintOptionsPage( TabPageParent pParent,
const SfxItemSet &rOptions,
bool bPreview);
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 7f7007d..cb522a9 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -295,10 +295,10 @@ bool SwCharURLPage::FillItemSet(SfxItemSet* rSet)
return bModified;
}
VclPtr<SfxTabPage> SwCharURLPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SwCharURLPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet )
{
return VclPtr<SwCharURLPage>::Create( pParent, *rAttrSet );
return VclPtr<SwCharURLPage>::Create( pParent.pParent, *rAttrSet );
}
IMPL_LINK_NOARG(SwCharURLPage, InsertFileHdl, Button*, void)
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 23bc335..589b16e 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -617,10 +617,10 @@ DeactivateRC SwDropCapsPage::DeactivatePage(SfxItemSet * _pSet)
return DeactivateRC::LeavePage;
}
VclPtr<SfxTabPage> SwDropCapsPage::Create(vcl::Window *pParent,
VclPtr<SfxTabPage> SwDropCapsPage::Create(TabPageParent pParent,
const SfxItemSet *rSet)
{
return VclPtr<SwDropCapsPage>::Create(pParent, *rSet);
return VclPtr<SwDropCapsPage>::Create(pParent.pParent, *rSet);
}
bool SwDropCapsPage::FillItemSet(SfxItemSet *rSet)
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 01abf0f..7472c8d 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -122,10 +122,10 @@ void SwParagraphNumTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SwParagraphNumTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SwParagraphNumTabPage::Create( TabPageParent pParent,
const SfxItemSet* rSet )
{
return VclPtr<SwParagraphNumTabPage>::Create(pParent, *rSet);
return VclPtr<SwParagraphNumTabPage>::Create(pParent.pParent, *rSet);
}
bool SwParagraphNumTabPage::FillItemSet( SfxItemSet* rSet )
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index c3d9eb1..de20be2 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -147,9 +147,9 @@ DeactivateRC SwCondCollPage::DeactivatePage(SfxItemSet * _pSet)
return DeactivateRC::LeavePage;
}
VclPtr<SfxTabPage> SwCondCollPage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
VclPtr<SfxTabPage> SwCondCollPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
{
return VclPtr<SwCondCollPage>::Create(pParent, *rSet);
return VclPtr<SwCondCollPage>::Create(pParent.pParent, *rSet);
}
bool SwCondCollPage::FillItemSet(SfxItemSet *rSet)
diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx
index 4c254aa..0946178 100644
--- a/sw/source/ui/chrdlg/tblnumfm.cxx
+++ b/sw/source/ui/chrdlg/tblnumfm.cxx
@@ -38,7 +38,7 @@ SwNumFormatDlg::SwNumFormatDlg(vcl::Window* pParent, const SfxItemSet& rSet)
if ( fnCreatePage )
{
VclPtr<SfxTabPage> pNewPage = (*fnCreatePage)( get_content_area(), &rSet );
VclPtr<SfxTabPage> pNewPage = (*fnCreatePage)( TabPageParent(get_content_area()), &rSet );
SfxAllItemSet aSet(*(rSet.GetPool()));
aSet.Put ( SvxNumberInfoItem( pNewPage->GetItemSet().Get( SID_ATTR_NUMBERFORMAT_INFO ) ));
pNewPage->PageCreated(aSet);
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 41acaec..1038a54 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -151,9 +151,9 @@ void SwMailConfigPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SwMailConfigPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet)
VclPtr<SfxTabPage> SwMailConfigPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet)
{
return VclPtr<SwMailConfigPage>::Create(pParent, *rAttrSet);
return VclPtr<SwMailConfigPage>::Create(pParent.pParent, *rAttrSet);
}
bool SwMailConfigPage::FillItemSet( SfxItemSet* /*rSet*/ )
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index c02c74c..0a7a423 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -330,9 +330,9 @@ void SwCompatibilityOptPage::WriteOptions()
m_aConfigItem.AppendItem(*pItem);
}
VclPtr<SfxTabPage> SwCompatibilityOptPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
VclPtr<SfxTabPage> SwCompatibilityOptPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<SwCompatibilityOptPage>::Create( pParent, *rAttrSet );
return VclPtr<SwCompatibilityOptPage>::Create( pParent.pParent, *rAttrSet );
}
bool SwCompatibilityOptPage::FillItemSet( SfxItemSet* )
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 15b79ed..fc16a924 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -168,10 +168,10 @@ void SwLoadOptPage::dispose()
}
VclPtr<SfxTabPage> SwLoadOptPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SwLoadOptPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet )
{
return VclPtr<SwLoadOptPage>::Create(pParent, *rAttrSet );
return VclPtr<SwLoadOptPage>::Create(pParent.pParent, *rAttrSet );
}
IMPL_LINK_NOARG(SwLoadOptPage, StandardizedPageCountCheckHdl, Button*, void)
@@ -584,10 +584,10 @@ void SwCaptionOptPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SwCaptionOptPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SwCaptionOptPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet )
{
return VclPtr<SwCaptionOptPage>::Create( pParent, *rAttrSet );
return VclPtr<SwCaptionOptPage>::Create( pParent.pParent, *rAttrSet );
}
bool SwCaptionOptPage::FillItemSet( SfxItemSet* )
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index e2a9039..03006da 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -199,10 +199,10 @@ void SwContentOptPage::dispose()
}
VclPtr<SfxTabPage> SwContentOptPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SwContentOptPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
return VclPtr<SwContentOptPage>::Create(pParent, *rAttrSet);
return VclPtr<SwContentOptPage>::Create(pParent.pParent, *rAttrSet);
}
static void lcl_SelectMetricLB(ListBox* rMetric, sal_uInt16 nSID, const SfxItemSet& rSet)
@@ -305,115 +305,83 @@ IMPL_LINK(SwContentOptPage, VertRulerHdl, Button*, pBox, void)
}
// TabPage Printer additional settings
SwAddPrinterTabPage::SwAddPrinterTabPage(vcl::Window* pParent,
SwAddPrinterTabPage::SwAddPrinterTabPage(TabPageParent pParent,
const SfxItemSet& rCoreSet)
: SfxTabPage(pParent, "PrintOptionsPage",
"modules/swriter/ui/printoptionspage.ui", &rCoreSet)
: SfxTabPage(pParent, "modules/swriter/ui/printoptionspage.ui", "PrintOptionsPage", &rCoreSet)
, sNone(SwResId(SW_STR_NONE))
, bAttrModified(false)
, bPreview(false)
, m_xGrfCB(m_xBuilder->weld_check_button("graphics"))
, m_xCtrlFieldCB(m_xBuilder->weld_check_button("formcontrols"))
, m_xBackgroundCB(m_xBuilder->weld_check_button("background"))
, m_xBlackFontCB(m_xBuilder->weld_check_button("inblack"))
, m_xPrintHiddenTextCB(m_xBuilder->weld_check_button("hiddentext"))
, m_xPrintTextPlaceholderCB(m_xBuilder->weld_check_button("textplaceholder"))
, m_xPagesFrame(m_xBuilder->weld_widget("pagesframe"))
, m_xLeftPageCB(m_xBuilder->weld_check_button("leftpages"))
, m_xRightPageCB(m_xBuilder->weld_check_button("rightpages"))
, m_xProspectCB(m_xBuilder->weld_check_button("brochure"))
, m_xProspectCB_RTL(m_xBuilder->weld_check_button("rtl"))
, m_xCommentsFrame(m_xBuilder->weld_widget("commentsframe"))
, m_xNoRB(m_xBuilder->weld_radio_button("none"))
, m_xOnlyRB(m_xBuilder->weld_radio_button("only"))
, m_xEndRB(m_xBuilder->weld_radio_button("end"))
, m_xEndPageRB(m_xBuilder->weld_radio_button("endpage"))
, m_xInMarginsRB(m_xBuilder->weld_radio_button("inmargins"))
, m_xPrintEmptyPagesCB(m_xBuilder->weld_check_button("blankpages"))
, m_xPaperFromSetupCB(m_xBuilder->weld_check_button("papertray"))
, m_xFaxLB(m_xBuilder->weld_combo_box_text("fax"))
{
get(m_pGrfCB, "graphics");
get(m_pCtrlFieldCB, "formcontrols");
get(m_pBackgroundCB, "background");
get(m_pBlackFontCB, "inblack");
get(m_pPrintHiddenTextCB, "hiddentext");
get(m_pPrintTextPlaceholderCB, "textplaceholder");
get(m_pPagesFrame, "pagesframe");
get(m_pLeftPageCB, "leftpages");
get(m_pRightPageCB, "rightpages");
get(m_pProspectCB, "brochure");
get(m_pProspectCB_RTL, "rtl");
get(m_pCommentsFrame, "commentsframe");
get(m_pNoRB, "none");
get(m_pOnlyRB, "only");
get(m_pEndRB, "end");
get(m_pEndPageRB, "endpage");
get(m_pInMarginsRB, "inmargins");
get(m_pPrintEmptyPagesCB, "blankpages");
get(m_pPaperFromSetupCB, "papertray");
get(m_pFaxLB, "fax");
Link<Button*,void> aLk = LINK( this, SwAddPrinterTabPage, AutoClickHdl);
m_pGrfCB->SetClickHdl( aLk );
m_pRightPageCB->SetClickHdl( aLk );
m_pLeftPageCB->SetClickHdl( aLk );
m_pCtrlFieldCB->SetClickHdl( aLk );
m_pBackgroundCB->SetClickHdl( aLk );
m_pBlackFontCB->SetClickHdl( aLk );
m_pPrintHiddenTextCB->SetClickHdl( aLk );
m_pPrintTextPlaceholderCB->SetClickHdl( aLk );
m_pProspectCB->SetClickHdl( aLk );
m_pProspectCB_RTL->SetClickHdl( aLk );
m_pPaperFromSetupCB->SetClickHdl( aLk );
m_pPrintEmptyPagesCB->SetClickHdl( aLk );
m_pEndPageRB->SetClickHdl( aLk );
m_pInMarginsRB->SetClickHdl( aLk );
m_pEndRB->SetClickHdl( aLk );
m_pOnlyRB->SetClickHdl( aLk );
m_pNoRB->SetClickHdl( aLk );
m_pFaxLB->SetSelectHdl( LINK( this, SwAddPrinterTabPage, SelectHdl ) );
Link<weld::ToggleButton&,void> aLk = LINK( this, SwAddPrinterTabPage, AutoClickHdl);
m_xGrfCB->connect_toggled( aLk );
m_xRightPageCB->connect_toggled( aLk );
m_xLeftPageCB->connect_toggled( aLk );
m_xCtrlFieldCB->connect_toggled( aLk );
m_xBackgroundCB->connect_toggled( aLk );
m_xBlackFontCB->connect_toggled( aLk );
m_xPrintHiddenTextCB->connect_toggled( aLk );
m_xPrintTextPlaceholderCB->connect_toggled( aLk );
m_xProspectCB->connect_toggled( aLk );
m_xProspectCB_RTL->connect_toggled( aLk );
m_xPaperFromSetupCB->connect_toggled( aLk );
m_xPrintEmptyPagesCB->connect_toggled( aLk );
m_xEndPageRB->connect_toggled( aLk );
m_xInMarginsRB->connect_toggled( aLk );
m_xEndRB->connect_toggled( aLk );
m_xOnlyRB->connect_toggled( aLk );
m_xNoRB->connect_toggled( aLk );
m_xFaxLB->connect_changed( LINK( this, SwAddPrinterTabPage, SelectHdl ) );
const SfxPoolItem* pItem;
if(SfxItemState::SET == rCoreSet.GetItemState(SID_HTML_MODE, false, &pItem )
&& static_cast<const SfxUInt16Item*>(pItem)->GetValue() & HTMLMODE_ON)
{
m_pLeftPageCB->Hide();
m_pRightPageCB->Hide();
m_pPrintHiddenTextCB->Hide();
m_pPrintTextPlaceholderCB->Hide();
// hide m_pPrintEmptyPagesCB
m_pPrintEmptyPagesCB->Hide();
m_xLeftPageCB->hide();
m_xRightPageCB->hide();
m_xPrintHiddenTextCB->hide();
m_xPrintTextPlaceholderCB->hide();
m_xPrintEmptyPagesCB->hide();
}
m_pProspectCB_RTL->Disable();
m_xProspectCB_RTL->set_sensitive(false);
SvtCTLOptions aCTLOptions;
m_pProspectCB_RTL->Show(aCTLOptions.IsCTLFontEnabled());
m_xProspectCB_RTL->show(aCTLOptions.IsCTLFontEnabled());
}
SwAddPrinterTabPage::~SwAddPrinterTabPage()
{
disposeOnce();
}
void SwAddPrinterTabPage::dispose()
{
m_pGrfCB.clear();
m_pCtrlFieldCB.clear();
m_pBackgroundCB.clear();
m_pBlackFontCB.clear();
m_pPrintHiddenTextCB.clear();
m_pPrintTextPlaceholderCB.clear();
m_pPagesFrame.clear();
m_pLeftPageCB.clear();
m_pRightPageCB.clear();
m_pProspectCB.clear();
m_pProspectCB_RTL.clear();
m_pCommentsFrame.clear();
m_pNoRB.clear();
m_pOnlyRB.clear();
m_pEndRB.clear();
m_pEndPageRB.clear();
m_pInMarginsRB.clear();
m_pPrintEmptyPagesCB.clear();
m_pPaperFromSetupCB.clear();
m_pFaxLB.clear();
SfxTabPage::dispose();
}
void SwAddPrinterTabPage::SetPreview(bool bPrev)
{
bPreview = bPrev;
m_pCommentsFrame->Enable(!bPreview);
m_pPagesFrame->Enable(!bPreview);
m_xCommentsFrame->set_sensitive(!bPreview);
m_xPagesFrame->set_sensitive(!bPreview);
}
VclPtr<SfxTabPage> SwAddPrinterTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SwAddPrinterTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet )
{
return VclPtr<SwAddPrinterTabPage>::Create( pParent, *rAttrSet );
return VclPtr<SwAddPrinterTabPage>::Create(pParent, *rAttrSet);
}
bool SwAddPrinterTabPage::FillItemSet( SfxItemSet* rCoreSet )
@@ -421,36 +389,36 @@ bool SwAddPrinterTabPage::FillItemSet( SfxItemSet* rCoreSet )
if ( bAttrModified )
{
SwAddPrinterItem aAddPrinterAttr;
aAddPrinterAttr.m_bPrintGraphic = m_pGrfCB->IsChecked();
aAddPrinterAttr.m_bPrintTable = true; // always enabled since CWS printerpullgpages /*aTabCB.IsChecked();*/
aAddPrinterAttr.m_bPrintDraw = m_pGrfCB->IsChecked(); // UI merged with m_pGrfCB in CWS printerpullgpages
aAddPrinterAttr.m_bPrintControl = m_pCtrlFieldCB->IsChecked();
aAddPrinterAttr.m_bPrintPageBackground = m_pBackgroundCB->IsChecked();
aAddPrinterAttr.m_bPrintBlackFont = m_pBlackFontCB->IsChecked();
aAddPrinterAttr.m_bPrintHiddenText = m_pPrintHiddenTextCB->IsChecked();
aAddPrinterAttr.m_bPrintTextPlaceholder = m_pPrintTextPlaceholderCB->IsChecked();
aAddPrinterAttr.m_bPrintGraphic = m_xGrfCB->get_active();
aAddPrinterAttr.m_bPrintTable = true; // always enabled since CWS printerpullgpages /*m_xTabCB->get_active();*/
aAddPrinterAttr.m_bPrintDraw = m_xGrfCB->get_active(); // UI merged with m_xGrfCB in CWS printerpullgpages
aAddPrinterAttr.m_bPrintControl = m_xCtrlFieldCB->get_active();
aAddPrinterAttr.m_bPrintPageBackground = m_xBackgroundCB->get_active();
aAddPrinterAttr.m_bPrintBlackFont = m_xBlackFontCB->get_active();
aAddPrinterAttr.m_bPrintHiddenText = m_xPrintHiddenTextCB->get_active();
aAddPrinterAttr.m_bPrintTextPlaceholder = m_xPrintTextPlaceholderCB->get_active();
aAddPrinterAttr.m_bPrintLeftPages = m_pLeftPageCB->IsChecked();
aAddPrinterAttr.m_bPrintRightPages = m_pRightPageCB->IsChecked();
aAddPrinterAttr.m_bPrintReverse = false; // handled by vcl itself since CWS printerpullpages /*aReverseCB.IsChecked()*/;
aAddPrinterAttr.m_bPrintProspect = m_pProspectCB->IsChecked();
aAddPrinterAttr.m_bPrintProspectRTL = m_pProspectCB_RTL->IsChecked();
aAddPrinterAttr.m_bPaperFromSetup = m_pPaperFromSetupCB->IsChecked();
aAddPrinterAttr.m_bPrintEmptyPages = m_pPrintEmptyPagesCB->IsChecked();
aAddPrinterAttr.m_bPrintSingleJobs = true; // handled by vcl in new print dialog since CWS printerpullpages /*aSingleJobsCB.IsChecked()*/;
aAddPrinterAttr.m_bPrintLeftPages = m_xLeftPageCB->get_active();
aAddPrinterAttr.m_bPrintRightPages = m_xRightPageCB->get_active();
aAddPrinterAttr.m_bPrintReverse = false; // handled by vcl itself since CWS printerpullpages /*m_xReverseCB->get_active()*/;
aAddPrinterAttr.m_bPrintProspect = m_xProspectCB->get_active();
aAddPrinterAttr.m_bPrintProspectRTL = m_xProspectCB_RTL->get_active();
aAddPrinterAttr.m_bPaperFromSetup = m_xPaperFromSetupCB->get_active();
aAddPrinterAttr.m_bPrintEmptyPages = m_xPrintEmptyPagesCB->get_active();
aAddPrinterAttr.m_bPrintSingleJobs = true; // handled by vcl in new print dialog since CWS printerpullpages /*m_xSingleJobsCB->get_active()*/;
if (m_pNoRB->IsChecked()) aAddPrinterAttr.m_nPrintPostIts =
if (m_xNoRB->get_active()) aAddPrinterAttr.m_nPrintPostIts =
SwPostItMode::NONE;
if (m_pOnlyRB->IsChecked()) aAddPrinterAttr.m_nPrintPostIts =
if (m_xOnlyRB->get_active()) aAddPrinterAttr.m_nPrintPostIts =
SwPostItMode::Only;
if (m_pEndRB->IsChecked()) aAddPrinterAttr.m_nPrintPostIts =
if (m_xEndRB->get_active()) aAddPrinterAttr.m_nPrintPostIts =
SwPostItMode::EndDoc;
if (m_pEndPageRB->IsChecked()) aAddPrinterAttr.m_nPrintPostIts =
if (m_xEndPageRB->get_active()) aAddPrinterAttr.m_nPrintPostIts =
SwPostItMode::EndPage;
if (m_pInMarginsRB->IsChecked()) aAddPrinterAttr.m_nPrintPostIts =
if (m_xInMarginsRB->get_active()) aAddPrinterAttr.m_nPrintPostIts =
SwPostItMode::InMargins;
const OUString sFax = m_pFaxLB->GetSelectedEntry();
const OUString sFax = m_xFaxLB->get_active_text();
aAddPrinterAttr.m_sFaxName = sNone == sFax ? aEmptyOUStr : sFax;
rCoreSet->Put(aAddPrinterAttr);
}
@@ -465,63 +433,63 @@ void SwAddPrinterTabPage::Reset( const SfxItemSet* )
if( SfxItemState::SET == rSet.GetItemState( FN_PARAM_ADDPRINTER , false,
reinterpret_cast<const SfxPoolItem**>(&pAddPrinterAttr) ))
{
m_pGrfCB->Check(pAddPrinterAttr->m_bPrintGraphic || pAddPrinterAttr->m_bPrintDraw);
m_pCtrlFieldCB->Check( pAddPrinterAttr->m_bPrintControl);
m_pBackgroundCB->Check( pAddPrinterAttr->m_bPrintPageBackground);
m_pBlackFontCB->Check( pAddPrinterAttr->m_bPrintBlackFont);
m_pPrintHiddenTextCB->Check( pAddPrinterAttr->m_bPrintHiddenText);
m_pPrintTextPlaceholderCB->Check(pAddPrinterAttr->m_bPrintTextPlaceholder);
m_pLeftPageCB->Check( pAddPrinterAttr->m_bPrintLeftPages);
m_pRightPageCB->Check( pAddPrinterAttr->m_bPrintRightPages);
m_pPaperFromSetupCB->Check(pAddPrinterAttr->m_bPaperFromSetup);
m_pPrintEmptyPagesCB->Check(pAddPrinterAttr->m_bPrintEmptyPages);
m_pProspectCB->Check( pAddPrinterAttr->m_bPrintProspect);
m_pProspectCB_RTL->Check( pAddPrinterAttr->m_bPrintProspectRTL);
m_xGrfCB->set_active(pAddPrinterAttr->m_bPrintGraphic || pAddPrinterAttr->m_bPrintDraw);
m_xCtrlFieldCB->set_active( pAddPrinterAttr->m_bPrintControl);
m_xBackgroundCB->set_active( pAddPrinterAttr->m_bPrintPageBackground);
m_xBlackFontCB->set_active( pAddPrinterAttr->m_bPrintBlackFont);
m_xPrintHiddenTextCB->set_active( pAddPrinterAttr->m_bPrintHiddenText);
m_xPrintTextPlaceholderCB->set_active(pAddPrinterAttr->m_bPrintTextPlaceholder);
m_xLeftPageCB->set_active( pAddPrinterAttr->m_bPrintLeftPages);
m_xRightPageCB->set_active( pAddPrinterAttr->m_bPrintRightPages);
m_xPaperFromSetupCB->set_active(pAddPrinterAttr->m_bPaperFromSetup);
m_xPrintEmptyPagesCB->set_active(pAddPrinterAttr->m_bPrintEmptyPages);
m_xProspectCB->set_active( pAddPrinterAttr->m_bPrintProspect);
m_xProspectCB_RTL->set_active( pAddPrinterAttr->m_bPrintProspectRTL);
m_pNoRB->Check (pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::NONE ) ;
m_pOnlyRB->Check (pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::Only ) ;
m_pEndRB->Check (pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::EndDoc ) ;
m_pEndPageRB->Check (pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::EndPage ) ;
m_pInMarginsRB->Check (pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::InMargins ) ;
m_pFaxLB->SelectEntry( pAddPrinterAttr->m_sFaxName );
m_xNoRB->set_active(pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::NONE ) ;
m_xOnlyRB->set_active(pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::Only ) ;
m_xEndRB->set_active(pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::EndDoc ) ;
m_xEndPageRB->set_active(pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::EndPage ) ;
m_xInMarginsRB->set_active(pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::InMargins ) ;
m_xFaxLB->set_active( pAddPrinterAttr->m_sFaxName );
}
if (m_pProspectCB->IsChecked())
if (m_xProspectCB->get_active())
{
m_pProspectCB_RTL->Enable();
m_pNoRB->Enable( false );
m_pOnlyRB->Enable( false );
m_pEndRB->Enable( false );
m_pEndPageRB->Enable( false );
m_xProspectCB_RTL->set_sensitive(true);
m_xNoRB->set_sensitive( false );
m_xOnlyRB->set_sensitive( false );
m_xEndRB->set_sensitive( false );
m_xEndPageRB->set_sensitive( false );
}
else
m_pProspectCB_RTL->Enable( false );
m_xProspectCB_RTL->set_sensitive( false );
}
IMPL_LINK_NOARG(SwAddPrinterTabPage, AutoClickHdl, Button*, void)
IMPL_LINK_NOARG(SwAddPrinterTabPage, AutoClickHdl, weld::ToggleButton&, void)
{
bAttrModified = true;
bool bIsProspect = m_pProspectCB->IsChecked();
bool bIsProspect = m_xProspectCB->get_active();
if (!bIsProspect)
m_pProspectCB_RTL->Check( false );
m_pProspectCB_RTL->Enable( bIsProspect );
m_pNoRB->Enable( !bIsProspect );
m_pOnlyRB->Enable( !bIsProspect );
m_pEndRB->Enable( !bIsProspect );
m_pEndPageRB->Enable( !bIsProspect );
m_pInMarginsRB->Enable( !bIsProspect );
m_xProspectCB_RTL->set_active( false );
m_xProspectCB_RTL->set_sensitive( bIsProspect );
m_xNoRB->set_sensitive( !bIsProspect );
m_xOnlyRB->set_sensitive( !bIsProspect );
m_xEndRB->set_sensitive( !bIsProspect );
m_xEndPageRB->set_sensitive( !bIsProspect );
m_xInMarginsRB->set_sensitive( !bIsProspect );
}
void SwAddPrinterTabPage::SetFax( const std::vector<OUString>& rFaxLst )
{
m_pFaxLB->InsertEntry(sNone);
m_xFaxLB->append_text(sNone);
for(const auto & i : rFaxLst)
{
m_pFaxLB->InsertEntry(i);
m_xFaxLB->append_text(i);
}
m_pFaxLB->SelectEntryPos(0);
m_xFaxLB->set_active(0);
}
IMPL_LINK_NOARG(SwAddPrinterTabPage, SelectHdl, ListBox&, void)
IMPL_LINK_NOARG(SwAddPrinterTabPage, SelectHdl, weld::ComboBoxText&, void)
{
bAttrModified=true;
}
@@ -638,10 +606,10 @@ void SwStdFontTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SwStdFontTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SwStdFontTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet )
{
return VclPtr<SwStdFontTabPage>::Create(pParent, *rAttrSet);
return VclPtr<SwStdFontTabPage>::Create(pParent.pParent, *rAttrSet);
}
static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType,
@@ -1149,10 +1117,10 @@ void SwTableOptionsTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SwTableOptionsTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SwTableOptionsTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet )
{
return VclPtr<SwTableOptionsTabPage>::Create(pParent, *rAttrSet);
return VclPtr<SwTableOptionsTabPage>::Create(pParent.pParent, *rAttrSet);
}
bool SwTableOptionsTabPage::FillItemSet( SfxItemSet* )
@@ -1415,9 +1383,9 @@ void SwShdwCursorOptionsTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SwShdwCursorOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
VclPtr<SfxTabPage> SwShdwCursorOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
{
return VclPtr<SwShdwCursorOptionsTabPage>::Create( pParent, *rSet );
return VclPtr<SwShdwCursorOptionsTabPage>::Create( pParent.pParent, *rSet );
}
void SwShdwCursorOptionsTabPage::PageCreated( const SfxAllItemSet& aSet )
@@ -1821,9 +1789,9 @@ void SwRedlineOptionsTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SwRedlineOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet)
VclPtr<SfxTabPage> SwRedlineOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet)
{
return VclPtr<SwRedlineOptionsTabPage>::Create( pParent, *rSet );
return VclPtr<SwRedlineOptionsTabPage>::Create( pParent.pParent, *rSet );
}
bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet* )
@@ -2225,9 +2193,9 @@ void SwCompareOptionsTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SwCompareOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
VclPtr<SfxTabPage> SwCompareOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<SwCompareOptionsTabPage>::Create( pParent, *rAttrSet );
return VclPtr<SwCompareOptionsTabPage>::Create( pParent.pParent, *rAttrSet );
}
bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet* )
@@ -2375,10 +2343,10 @@ void SwTestTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SwTestTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SwTestTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet )
{
return VclPtr<SwTestTabPage>::Create(pParent, *rAttrSet);
return VclPtr<SwTestTabPage>::Create(pParent.pParent, *rAttrSet);
}
bool SwTestTabPage::FillItemSet( SfxItemSet* rCoreSet )
diff --git a/sw/source/ui/dialog/addrdlg.cxx b/sw/source/ui/dialog/addrdlg.cxx
index d2d43389..fc4e2e3 100644
--- a/sw/source/ui/dialog/addrdlg.cxx
+++ b/sw/source/ui/dialog/addrdlg.cxx
@@ -20,6 +20,7 @@
#include <addrdlg.hxx>
#include <svx/svxdlg.hxx>
#include <sfx2/pageids.hxx>
#include <vcl/layout.hxx>
SwAddrDlg::SwAddrDlg(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxSingleTabDialog(pParent, rSet)
@@ -29,7 +30,7 @@ SwAddrDlg::SwAddrDlg(vcl::Window* pParent, const SfxItemSet& rSet)
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SFXPAGE_GENERAL );
if ( fnCreatePage )
{
VclPtr<SfxTabPage> pPage2 = (*fnCreatePage)(get_content_area(), &rSet);
VclPtr<SfxTabPage> pPage2 = (*fnCreatePage)(TabPageParent(get_content_area()), &rSet);
SetTabPage(pPage2);
}
}
diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx
index 841a08d..5ac7637 100644
--- a/sw/source/ui/dialog/docstdlg.cxx
+++ b/sw/source/ui/dialog/docstdlg.cxx
@@ -34,9 +34,9 @@
#include <unotools/localedatawrapper.hxx>
#include <vcl/settings.hxx>
VclPtr<SfxTabPage> SwDocStatPage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
VclPtr<SfxTabPage> SwDocStatPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
{
return VclPtr<SwDocStatPage>::Create(pParent, *rSet);
return VclPtr<SwDocStatPage>::Create(pParent.pParent, *rSet);
}
SwDocStatPage::SwDocStatPage(vcl::Window *pParent, const SfxItemSet &rSet)
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 81765b9..025f9b9 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1672,10 +1672,10 @@ void SwInsertSectionTabPage::Reset( const SfxItemSet* )
{
}
VclPtr<SfxTabPage> SwInsertSectionTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SwInsertSectionTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
return VclPtr<SwInsertSectionTabPage>::Create(pParent, *rAttrSet);
return VclPtr<SwInsertSectionTabPage>::Create(pParent.pParent, *rAttrSet);
}
IMPL_LINK( SwInsertSectionTabPage, ChangeHideHdl, Button *, pBox, void )
@@ -2030,10 +2030,10 @@ void SwSectionFootnoteEndTabPage::Reset( const SfxItemSet* rSet )
ResetState( false, rSet->Get( RES_END_AT_TXTEND, false ));
}
VclPtr<SfxTabPage> SwSectionFootnoteEndTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SwSectionFootnoteEndTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
return VclPtr<SwSectionFootnoteEndTabPage>::Create(pParent, *rAttrSet);
return VclPtr<SwSectionFootnoteEndTabPage>::Create(pParent.pParent, *rAttrSet);
}
IMPL_LINK( SwSectionFootnoteEndTabPage, FootEndHdl, Button *, pBox, void )
@@ -2199,9 +2199,9 @@ void SwSectionIndentTabPage::Reset( const SfxItemSet* rSet)
IndentModifyHdl(*m_pBeforeMF);
}
VclPtr<SfxTabPage> SwSectionIndentTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet)
VclPtr<SfxTabPage> SwSectionIndentTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet)
{
return VclPtr<SwSectionIndentTabPage>::Create(pParent, *rAttrSet);
return VclPtr<SwSectionIndentTabPage>::Create(pParent.pParent, *rAttrSet);
}
void SwSectionIndentTabPage::SetWrtShell(SwWrtShell const & rSh)
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 56c2ddb..c8b5cfc 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -458,9 +458,9 @@ void SwEnvFormatPage::SetMinMax()
m_pSizeHeightField->Reformat();
}
VclPtr<SfxTabPage> SwEnvFormatPage::Create(vcl::Window* pParent, const SfxItemSet* rSet)
VclPtr<SfxTabPage> SwEnvFormatPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
{
return VclPtr<SwEnvFormatPage>::Create(pParent, *rSet);
return VclPtr<SwEnvFormatPage>::Create(pParent.pParent, *rSet);
}
void SwEnvFormatPage::ActivatePage(const SfxItemSet& rSet)
diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx
index 294b2ac..1d3593e 100644
--- a/sw/source/ui/envelp/envfmt.hxx
+++ b/sw/source/ui/envelp/envfmt.hxx
@@ -61,7 +61,7 @@ public:
virtual ~SwEnvFormatPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override;
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index f6edd2d..002518c 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -314,9 +314,9 @@ void SwEnvPage::InitDatabaseBox()
}
}
VclPtr<SfxTabPage> SwEnvPage::Create(vcl::Window* pParent, const SfxItemSet* rSet)
VclPtr<SfxTabPage> SwEnvPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
{
return VclPtr<SwEnvPage>::Create(pParent, *rSet);
return VclPtr<SwEnvPage>::Create(pParent.pParent, *rSet);
}
void SwEnvPage::ActivatePage(const SfxItemSet& rSet)
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index 5568e91..0e52ab4 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -141,9 +141,9 @@ IMPL_LINK_NOARG(SwEnvPrtPage, AlignHdl, ToolBox *, void)
}
}
VclPtr<SfxTabPage> SwEnvPrtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet)
VclPtr<SfxTabPage> SwEnvPrtPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
{
return VclPtr<SwEnvPrtPage>::Create(pParent, *rSet);
return VclPtr<SwEnvPrtPage>::Create(pParent.pParent, *rSet);
}
void SwEnvPrtPage::ActivatePage(const SfxItemSet&)
diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index 91ce62b..8d70bb9 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -61,7 +61,7 @@ public:
virtual ~SwEnvPrtPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override;
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 3f8daf7..a6a6f93 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -486,9 +486,9 @@ void SwLabPage::InitDatabaseBox()
}
}
VclPtr<SfxTabPage> SwLabPage::Create(vcl::Window* pParent, const SfxItemSet* rSet)
VclPtr<SfxTabPage> SwLabPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
{
return VclPtr<SwLabPage>::Create(pParent, *rSet);
return VclPtr<SwLabPage>::Create(pParent.pParent, *rSet);
}
void SwLabPage::ActivatePage(const SfxItemSet& rSet)
@@ -631,9 +631,9 @@ void SwVisitingCardPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SwVisitingCardPage::Create(vcl::Window* pParent, const SfxItemSet* rSet)
VclPtr<SfxTabPage> SwVisitingCardPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
{
return VclPtr<SwVisitingCardPage>::Create(pParent, *rSet);
return VclPtr<SwVisitingCardPage>::Create(pParent.pParent, *rSet);
}
void SwVisitingCardPage::ActivatePage(const SfxItemSet& rSet)
@@ -793,9 +793,9 @@ void SwPrivateDataPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SwPrivateDataPage::Create(vcl::Window* pParent, const SfxItemSet* rSet)
VclPtr<SfxTabPage> SwPrivateDataPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
{
return VclPtr<SwPrivateDataPage>::Create(pParent, *rSet);
return VclPtr<SwPrivateDataPage>::Create(pParent.pParent, *rSet);
}
void SwPrivateDataPage::ActivatePage(const SfxItemSet& rSet)
@@ -906,9 +906,9 @@ void SwBusinessDataPage::dispose()
}
VclPtr<SfxTabPage> SwBusinessDataPage::Create(vcl::Window* pParent, const SfxItemSet* rSet)
VclPtr<SfxTabPage> SwBusinessDataPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
{
return VclPtr<SwBusinessDataPage>::Create(pParent, *rSet);
return VclPtr<SwBusinessDataPage>::Create(pParent.pParent, *rSet);
}
void SwBusinessDataPage::ActivatePage(const SfxItemSet& rSet)
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 90672ac..97f43d9 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -479,9 +479,9 @@ void SwLabFormatPage::ChangeMinMax()
m_pPHeightField->Reformat();
}
VclPtr<SfxTabPage> SwLabFormatPage::Create(vcl::Window* pParent, const SfxItemSet* rSet)
VclPtr<SfxTabPage> SwLabFormatPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
{
return VclPtr<SwLabFormatPage>::Create(pParent, *rSet);
return VclPtr<SwLabFormatPage>::Create(pParent.pParent, *rSet);
}
void SwLabFormatPage::ActivatePage(const SfxItemSet& rSet)
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index 08007cf..ddbb559 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -99,7 +99,7 @@ public:
virtual ~SwLabFormatPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override;
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index 4bc9f9d..c876f2e 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -106,9 +106,9 @@ IMPL_LINK( SwLabPrtPage, CountHdl, Button *, pButton, void )
}
}
VclPtr<SfxTabPage> SwLabPrtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet)
VclPtr<SfxTabPage> SwLabPrtPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
{
return VclPtr<SwLabPrtPage>::Create( pParent, *rSet );
return VclPtr<SwLabPrtPage>::Create( pParent.pParent, *rSet );
}
void SwLabPrtPage::ActivatePage( const SfxItemSet& rSet )
diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx
index 08d6583..e36ab98 100644
--- a/sw/source/ui/envelp/labprt.hxx
+++ b/sw/source/ui/envelp/labprt.hxx
@@ -55,7 +55,7 @@ public:
virtual ~SwLabPrtPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override;
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index 23819ef..09e4dcc 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -64,7 +64,7 @@ public:
virtual ~SwLabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override;
@@ -116,7 +116,7 @@ class SwVisitingCardPage : public SfxTabPage
public:
SwVisitingCardPage(vcl::Window* pParent, const SfxItemSet& rSet);
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override;
@@ -155,7 +155,7 @@ public:
virtual ~SwPrivateDataPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override;
@@ -192,7 +192,7 @@ public:
virtual ~SwBusinessDataPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override;
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 681e6b80..6da535c 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -263,10 +263,10 @@ bool SwFieldDBPage::FillItemSet(SfxItemSet* )
return false;
}
VclPtr<SfxTabPage> SwFieldDBPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SwFieldDBPage::Create( TabPageParent pParent,
const SfxItemSet *const pAttrSet )
{
return VclPtr<SwFieldDBPage>::Create( pParent, pAttrSet );
return VclPtr<SwFieldDBPage>::Create( pParent.pParent, pAttrSet );
}
sal_uInt16 SwFieldDBPage::GetGroup()
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index 6dd7fdd..d5bf9cf 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -74,7 +74,7 @@ public:
virtual ~SwFieldDBPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 439ed8b..d88cd47 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -458,10 +458,10 @@ bool SwFieldDokInfPage::FillItemSet(SfxItemSet* )
return false;
}
VclPtr<SfxTabPage> SwFieldDokInfPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SwFieldDokInfPage::Create( TabPageParent pParent,
const SfxItemSet *const pAttrSet)
{
return VclPtr<SwFieldDokInfPage>::Create( pParent, pAttrSet );
return VclPtr<SwFieldDokInfPage>::Create( pParent.pParent, pAttrSet );
}
sal_uInt16 SwFieldDokInfPage::GetGroup()
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index 64ea970..56ba53b 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -64,7 +64,7 @@ public:
virtual ~SwFieldDokInfPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index fe827cf..66a6684 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -646,10 +646,10 @@ bool SwFieldDokPage::FillItemSet(SfxItemSet* )
return false;
}
VclPtr<SfxTabPage> SwFieldDokPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SwFieldDokPage::Create( TabPageParent pParent,
const SfxItemSet *const pAttrSet)
{
return VclPtr<SwFieldDokPage>::Create( pParent, pAttrSet );
return VclPtr<SwFieldDokPage>::Create( pParent.pParent, pAttrSet );
}
sal_uInt16 SwFieldDokPage::GetGroup()
diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx
index ea5b31b..7b07ee0 100644
--- a/sw/source/ui/fldui/flddok.hxx
+++ b/sw/source/ui/fldui/flddok.hxx
@@ -66,7 +66,7 @@ public:
virtual ~SwFieldDokPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 5a7b794..05c17ab 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -610,10 +610,10 @@ bool SwFieldFuncPage::FillItemSet(SfxItemSet* )
return false;
}
VclPtr<SfxTabPage> SwFieldFuncPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SwFieldFuncPage::Create( TabPageParent pParent,
const SfxItemSet *const pAttrSet)
{
return VclPtr<SwFieldFuncPage>::Create( pParent, pAttrSet );
return VclPtr<SwFieldFuncPage>::Create( pParent.pParent, pAttrSet );
}
sal_uInt16 SwFieldFuncPage::GetGroup()
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index 4315467..bd4252a 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -90,7 +90,7 @@ public:
virtual ~SwFieldFuncPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 6bafa43..10ace84 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -1109,10 +1109,10 @@ bool SwFieldRefPage::FillItemSet(SfxItemSet* )
return false;
}
VclPtr<SfxTabPage> SwFieldRefPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SwFieldRefPage::Create( TabPageParent pParent,
const SfxItemSet *const pAttrSet)
{
return VclPtr<SwFieldRefPage>::Create( pParent, pAttrSet );
return VclPtr<SwFieldRefPage>::Create( pParent.pParent, pAttrSet );
}
sal_uInt16 SwFieldRefPage::GetGroup()
diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx
index 486ab9f..851452e 100644
--- a/sw/source/ui/fldui/fldref.hxx
+++ b/sw/source/ui/fldui/fldref.hxx
@@ -87,7 +87,7 @@ public:
virtual ~SwFieldRefPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index cce918d..14c47ba 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -1240,10 +1240,10 @@ bool SwFieldVarPage::FillItemSet(SfxItemSet* )
return false;
}
VclPtr<SfxTabPage> SwFieldVarPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SwFieldVarPage::Create( TabPageParent pParent,
const SfxItemSet *const pAttrSet)
{
return VclPtr<SwFieldVarPage>::Create( pParent, pAttrSet );
return VclPtr<SwFieldVarPage>::Create( pParent.pParent, pAttrSet );
}
sal_uInt16 SwFieldVarPage::GetGroup()
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index 4acef8d..5e2ee0b 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -96,7 +96,7 @@ public:
virtual ~SwFieldVarPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 4d8913e..37736e6 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -630,9 +630,9 @@ void SwColumnPage::Reset(const SfxItemSet *rSet)
}
// create TabPage
VclPtr<SfxTabPage> SwColumnPage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
VclPtr<SfxTabPage> SwColumnPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
{
return VclPtr<SwColumnPage>::Create(pParent, *rSet);
return VclPtr<SwColumnPage>::Create(pParent.pParent, *rSet);
}
// stuff attributes into the Set when OK
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index a619dbe..255bf7e 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -867,9 +867,9 @@ void SwFramePage::setOptimalRelWidth()
m_pHoriRelationLB->Clear();
}
VclPtr<SfxTabPage> SwFramePage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
VclPtr<SfxTabPage> SwFramePage::Create(TabPageParent pParent, const SfxItemSet *rSet)
{
return VclPtr<SwFramePage>::Create( pParent, *rSet );
return VclPtr<SwFramePage>::Create( pParent.pParent, *rSet );
}
void SwFramePage::EnableGraficMode()
@@ -2425,9 +2425,9 @@ void SwGrfExtPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SwGrfExtPage::Create( vcl::Window *pParent, const SfxItemSet *rSet )
VclPtr<SfxTabPage> SwGrfExtPage::Create( TabPageParent pParent, const SfxItemSet *rSet )
{
return VclPtr<SwGrfExtPage>::Create( pParent, *rSet );
return VclPtr<SwGrfExtPage>::Create( pParent.pParent, *rSet );
}
void SwGrfExtPage::Reset(const SfxItemSet *rSet)
@@ -2866,9 +2866,9 @@ bool SwFrameURLPage::FillItemSet(SfxItemSet *rSet)
return bModified;
}
VclPtr<SfxTabPage> SwFrameURLPage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
VclPtr<SfxTabPage> SwFrameURLPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
{
return VclPtr<SwFrameURLPage>::Create( pParent, *rSet );
return VclPtr<SwFrameURLPage>::Create( pParent.pParent, *rSet );
}
IMPL_LINK_NOARG(SwFrameURLPage, InsertFileHdl, Button*, void)
@@ -2965,9 +2965,9 @@ void SwFrameAddPage::dispose()
}
VclPtr<SfxTabPage> SwFrameAddPage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
VclPtr<SfxTabPage> SwFrameAddPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
{
return VclPtr<SwFrameAddPage>::Create(pParent, *rSet);
return VclPtr<SwFrameAddPage>::Create(pParent.pParent, *rSet);
}
void SwFrameAddPage::Reset(const SfxItemSet *rSet )
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 75039bc..363dab1 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -143,9 +143,9 @@ void SwWrapTabPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SwWrapTabPage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
VclPtr<SfxTabPage> SwWrapTabPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
{
return VclPtr<SwWrapTabPage>::Create(pParent, *rSet);
return VclPtr<SwWrapTabPage>::Create(pParent.pParent, *rSet);
}
void SwWrapTabPage::Reset(const SfxItemSet *rSet)
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 5705042..ed3cb92 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -1302,9 +1302,9 @@ DeactivateRC SwTOXSelectTabPage::DeactivatePage( SfxItemSet* _pSet )
return DeactivateRC::LeavePage;
}
VclPtr<SfxTabPage> SwTOXSelectTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet)
VclPtr<SfxTabPage> SwTOXSelectTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet)
{
return VclPtr<SwTOXSelectTabPage>::Create(pParent, *rAttrSet);
return VclPtr<SwTOXSelectTabPage>::Create(pParent.pParent, *rAttrSet);
}
IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox&, rBox, void)
@@ -2247,9 +2247,9 @@ DeactivateRC SwTOXEntryTabPage::DeactivatePage( SfxItemSet* /*pSet*/)
return DeactivateRC::LeavePage;
}
VclPtr<SfxTabPage> SwTOXEntryTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet)
VclPtr<SfxTabPage> SwTOXEntryTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet)
{
return VclPtr<SwTOXEntryTabPage>::Create(pParent, *rAttrSet);
return VclPtr<SwTOXEntryTabPage>::Create(pParent.pParent, *rAttrSet);
}
IMPL_LINK_NOARG(SwTOXEntryTabPage, EditStyleHdl, Button*, void)
@@ -3760,10 +3760,10 @@ DeactivateRC SwTOXStylesTabPage::DeactivatePage( SfxItemSet* /*pSet*/ )
return DeactivateRC::LeavePage;
}
VclPtr<SfxTabPage> SwTOXStylesTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SwTOXStylesTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
return VclPtr<SwTOXStylesTabPage>::Create(pParent, *rAttrSet);
return VclPtr<SwTOXStylesTabPage>::Create(pParent.pParent, *rAttrSet);
}
IMPL_LINK_NOARG(SwTOXStylesTabPage, EditStyleHdl, Button *, void)
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 302de1f..79e9e68 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -239,9 +239,9 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* )
m_pPageTemplBox->SelectEntry( pInf->GetPageDesc( *pSh->GetDoc() )->GetName());
}
VclPtr<SfxTabPage> SwEndNoteOptionPage::Create( vcl::Window *pParent, const SfxItemSet *rSet )
VclPtr<SfxTabPage> SwEndNoteOptionPage::Create( TabPageParent pParent, const SfxItemSet *rSet )
{
return VclPtr<SwEndNoteOptionPage>::Create( pParent, true, *rSet );
return VclPtr<SwEndNoteOptionPage>::Create( pParent.pParent, true, *rSet );
}
// Different kinds of numbering; because the Listbox has varying numbers of
@@ -408,9 +408,9 @@ SwFootNoteOptionPage::~SwFootNoteOptionPage()
{
}
VclPtr<SfxTabPage> SwFootNoteOptionPage::Create(vcl::Window *pParent, const SfxItemSet *rSet )
VclPtr<SfxTabPage> SwFootNoteOptionPage::Create(TabPageParent pParent, const SfxItemSet *rSet )
{
return VclPtr<SwFootNoteOptionPage>::Create( pParent, *rSet );
return VclPtr<SwFootNoteOptionPage>::Create( pParent.pParent, *rSet );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx
index 4cde50d..386a345 100644
--- a/sw/source/ui/misc/impfnote.hxx
+++ b/sw/source/ui/misc/impfnote.hxx
@@ -73,7 +73,7 @@ public:
virtual ~SwEndNoteOptionPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
virtual bool FillItemSet(SfxItemSet *rSet) override;
virtual void Reset( const SfxItemSet* ) override;
@@ -87,7 +87,7 @@ class SwFootNoteOptionPage : public SwEndNoteOptionPage
virtual ~SwFootNoteOptionPage() override;
public:
static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
};
#endif
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 2bfe5e8..2f7bb7c 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -542,10 +542,10 @@ void SwNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode()
m_pIndentAtMF->Show( bLabelAlignmentPosAndSpaceModeActive );
}
VclPtr<SfxTabPage> SwNumPositionTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SwNumPositionTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
return VclPtr<SwNumPositionTabPage>::Create(pParent, *rAttrSet);
return VclPtr<SwNumPositionTabPage>::Create(pParent.pParent, *rAttrSet);
}
void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh)
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index f0cdf8b..ab00ae4 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -848,10 +848,10 @@ void SwOutlineSettingsTabPage::Reset( const SfxItemSet* rSet )
ActivatePage(*rSet);
}
VclPtr<SfxTabPage> SwOutlineSettingsTabPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SwOutlineSettingsTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
return VclPtr<SwOutlineSettingsTabPage>::Create(pParent, *rAttrSet);
return VclPtr<SwOutlineSettingsTabPage>::Create(pParent.pParent, *rAttrSet);
}
void SwOutlineSettingsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType)
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 5959276..20ba770 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -146,9 +146,9 @@ void SwFootNotePage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SwFootNotePage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
VclPtr<SfxTabPage> SwFootNotePage::Create(TabPageParent pParent, const SfxItemSet *rSet)
{
return VclPtr<SwFootNotePage>::Create(pParent, *rSet);
return VclPtr<SwFootNotePage>::Create(pParent.pParent, *rSet);
}
void SwFootNotePage::Reset(const SfxItemSet *rSet)
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index df37173..0a1185e 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -171,9 +171,9 @@ void SwTextGridPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SwTextGridPage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
VclPtr<SfxTabPage> SwTextGridPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
{
return VclPtr<SwTextGridPage>::Create(pParent, *rSet);
return VclPtr<SwTextGridPage>::Create(pParent.pParent, *rSet);
}
bool SwTextGridPage::FillItemSet(SfxItemSet *rSet)
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index e25d0b1..cfb4010 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -399,10 +399,10 @@ void SwFormatTablePage::ModifyHdl(const Edit * pEdit)
bModified = true;
}
VclPtr<SfxTabPage> SwFormatTablePage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SwFormatTablePage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
return VclPtr<SwFormatTablePage>::Create( pParent, *rAttrSet );
return VclPtr<SwFormatTablePage>::Create( pParent.pParent, *rAttrSet );
}
bool SwFormatTablePage::FillItemSet( SfxItemSet* rCoreSet )
@@ -799,10 +799,10 @@ void SwTableColumnPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SwTableColumnPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SwTableColumnPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
return VclPtr<SwTableColumnPage>::Create( pParent, *rAttrSet );
return VclPtr<SwTableColumnPage>::Create( pParent.pParent, *rAttrSet );
}
void SwTableColumnPage::Reset( const SfxItemSet* )
@@ -1363,10 +1363,10 @@ void SwTextFlowPage::dispose()
SfxTabPage::dispose();
}
VclPtr<SfxTabPage> SwTextFlowPage::Create( vcl::Window* pParent,
VclPtr<SfxTabPage> SwTextFlowPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
return VclPtr<SwTextFlowPage>::Create(pParent, *rAttrSet);
return VclPtr<SwTextFlowPage>::Create(pParent.pParent, *rAttrSet);
}
bool SwTextFlowPage::FillItemSet( SfxItemSet* rSet )
diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx
index 32804af..b5e037b 100644
--- a/sw/source/uibase/app/appopt.cxx
+++ b/sw/source/uibase/app/appopt.cxx
@@ -412,7 +412,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet )
ApplyUsrPref( aViewOpt, pAppView, bTextDialog? SvViewOpt::DestText : SvViewOpt::DestWeb);
}
VclPtr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet )
VclPtr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet )
{
VclPtr<SfxTabPage> pRet;
SfxAllItemSet aSet(*(rSet.GetPool()));
@@ -428,7 +428,7 @@ VclPtr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent
}
case RID_SW_TP_HTML_OPTGRID_PAGE:
case RID_SVXPAGE_GRID:
pRet = SvxGridTabPage::Create(pParent, rSet);
pRet = SvxGridTabPage::Create(pParent.pParent, rSet);
break;
case RID_SW_TP_STD_FONT:
diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx
index 1e89ded..15e86bc 100644
--- a/sw/source/uibase/inc/chrdlg.hxx
+++ b/sw/source/uibase/inc/chrdlg.hxx
@@ -79,7 +79,7 @@ public:
virtual ~SwCharURLPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx
index 4dcb4c8..0fc5e98 100644
--- a/sw/source/uibase/inc/column.hxx
+++ b/sw/source/uibase/inc/column.hxx
@@ -175,7 +175,7 @@ public:
virtual ~SwColumnPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
static const sal_uInt16* GetRanges() { return aPageRg; }
virtual bool FillItemSet(SfxItemSet *rSet) override;
diff --git a/sw/source/uibase/inc/docstdlg.hxx b/sw/source/uibase/inc/docstdlg.hxx
index 4004aea..ab36ec6 100644
--- a/sw/source/uibase/inc/docstdlg.hxx
+++ b/sw/source/uibase/inc/docstdlg.hxx
@@ -33,7 +33,7 @@ public:
virtual ~SwDocStatPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
private:
virtual bool FillItemSet( SfxItemSet *rSet) override;
diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx
index c5e698b..1f51535 100644
--- a/sw/source/uibase/inc/drpcps.hxx
+++ b/sw/source/uibase/inc/drpcps.hxx
@@ -84,7 +84,7 @@ public:
virtual ~SwDropCapsPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
static const sal_uInt16* GetRanges() { return aPageRg; }
diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx
index 2e0c43d..3a21cbdf 100644
--- a/sw/source/uibase/inc/envlop.hxx
+++ b/sw/source/uibase/inc/envlop.hxx
@@ -106,7 +106,7 @@ public:
virtual ~SwEnvPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override;
diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx
index 50ed720..1b191e0 100644
--- a/sw/source/uibase/inc/frmpage.hxx
+++ b/sw/source/uibase/inc/frmpage.hxx
@@ -187,7 +187,7 @@ public:
virtual ~SwFramePage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
static const sal_uInt16* GetRanges() { return aPageRg; }
virtual bool FillItemSet(SfxItemSet *rSet) override;
@@ -240,7 +240,7 @@ class SwGrfExtPage: public SfxTabPage
public:
SwGrfExtPage(vcl::Window *pParent, const SfxItemSet &rSet);
static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
virtual bool FillItemSet(SfxItemSet *rSet) override;
virtual void Reset(const SfxItemSet *rSet) override;
@@ -269,7 +269,7 @@ public:
virtual ~SwFrameURLPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
virtual bool FillItemSet(SfxItemSet *rSet) override;
virtual void Reset(const SfxItemSet *rSet) override;
@@ -320,7 +320,7 @@ public:
virtual ~SwFrameAddPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
static const sal_uInt16* GetRanges() { return aAddPgRg; }
virtual bool FillItemSet(SfxItemSet *rSet) override;
diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx
index 616c4f4..85466b5 100644
--- a/sw/source/uibase/inc/mailconfigpage.hxx
+++ b/sw/source/uibase/inc/mailconfigpage.hxx
@@ -60,7 +60,7 @@ public:
virtual ~SwMailConfigPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx
index 14eb447..d93bd4e 100644
--- a/sw/source/uibase/inc/num.hxx
+++ b/sw/source/uibase/inc/num.hxx
@@ -116,7 +116,7 @@ public:
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
void SetOutlineTabDialog(SwOutlineTabDialog* pDlg){pOutlineDlg = pDlg;}
diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx
index 5c4785f..8f3fc77 100644
--- a/sw/source/uibase/inc/numpara.hxx
+++ b/sw/source/uibase/inc/numpara.hxx
@@ -69,7 +69,7 @@ public:
virtual ~SwParagraphNumTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rSet );
static const sal_uInt16* GetRanges() { return aPageRg; }
diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx
index 85c8b15..fe6c3ec 100644
--- a/sw/source/uibase/inc/optcomp.hxx
+++ b/sw/source/uibase/inc/optcomp.hxx
@@ -65,7 +65,7 @@ public:
virtual ~SwCompatibilityOptPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx
index 6502a9b..5b98e65 100644
--- a/sw/source/uibase/inc/optload.hxx
+++ b/sw/source/uibase/inc/optload.hxx
@@ -74,7 +74,7 @@ public:
virtual ~SwLoadOptPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
@@ -190,7 +190,7 @@ public:
virtual ~SwCaptionOptPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index 7efa595..05b0efb 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -21,14 +21,11 @@
#include <sfx2/tabdlg.hxx>
#include <vcl/group.hxx>
#include <vcl/button.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
#include <vcl/weld.hxx>
#include <svtools/ctrlbox.hxx>
#include <svx/colorbox.hxx>
#include <svx/fntctrl.hxx>
@@ -70,7 +67,7 @@ public:
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet(SfxItemSet* rSet) override;
virtual void Reset(const SfxItemSet* rSet) override;
@@ -79,44 +76,42 @@ public:
// TabPage printer settings additions
class SwAddPrinterTabPage : public SfxTabPage
{
VclPtr<CheckBox> m_pGrfCB;
VclPtr<CheckBox> m_pCtrlFieldCB;
VclPtr<CheckBox> m_pBackgroundCB;
VclPtr<CheckBox> m_pBlackFontCB;
VclPtr<CheckBox> m_pPrintHiddenTextCB;
VclPtr<CheckBox> m_pPrintTextPlaceholderCB;
VclPtr<VclFrame> m_pPagesFrame;
VclPtr<CheckBox> m_pLeftPageCB;
VclPtr<CheckBox> m_pRightPageCB;
VclPtr<CheckBox> m_pProspectCB;
VclPtr<CheckBox> m_pProspectCB_RTL;
VclPtr<VclFrame> m_pCommentsFrame;
VclPtr<RadioButton> m_pNoRB;
VclPtr<RadioButton> m_pOnlyRB;
VclPtr<RadioButton> m_pEndRB;
VclPtr<RadioButton> m_pEndPageRB;
VclPtr<RadioButton> m_pInMarginsRB;
VclPtr<CheckBox> m_pPrintEmptyPagesCB;
VclPtr<CheckBox> m_pPaperFromSetupCB;
VclPtr<ListBox> m_pFaxLB;
OUString sNone;
bool bAttrModified;
bool bPreview;
DECL_LINK(AutoClickHdl, Button*, void);
DECL_LINK(SelectHdl, ListBox&, void);
std::unique_ptr<weld::CheckButton> m_xGrfCB;
std::unique_ptr<weld::CheckButton> m_xCtrlFieldCB;
std::unique_ptr<weld::CheckButton> m_xBackgroundCB;
std::unique_ptr<weld::CheckButton> m_xBlackFontCB;
std::unique_ptr<weld::CheckButton> m_xPrintHiddenTextCB;
std::unique_ptr<weld::CheckButton> m_xPrintTextPlaceholderCB;
std::unique_ptr<weld::Widget> m_xPagesFrame;
std::unique_ptr<weld::CheckButton> m_xLeftPageCB;
std::unique_ptr<weld::CheckButton> m_xRightPageCB;
std::unique_ptr<weld::CheckButton> m_xProspectCB;
std::unique_ptr<weld::CheckButton> m_xProspectCB_RTL;
std::unique_ptr<weld::Widget> m_xCommentsFrame;
std::unique_ptr<weld::RadioButton> m_xNoRB;
std::unique_ptr<weld::RadioButton> m_xOnlyRB;
std::unique_ptr<weld::RadioButton> m_xEndRB;
std::unique_ptr<weld::RadioButton> m_xEndPageRB;
std::unique_ptr<weld::RadioButton> m_xInMarginsRB;
std::unique_ptr<weld::CheckButton> m_xPrintEmptyPagesCB;
std::unique_ptr<weld::CheckButton> m_xPaperFromSetupCB;
std::unique_ptr<weld::ComboBoxText> m_xFaxLB;
DECL_LINK(AutoClickHdl, weld::ToggleButton&, void);
DECL_LINK(SelectHdl, weld::ComboBoxText&, void);
public:
SwAddPrinterTabPage(vcl::Window* pParent, const SfxItemSet& rSet);
SwAddPrinterTabPage(TabPageParent pParent, const SfxItemSet& rSet);
virtual ~SwAddPrinterTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet(SfxItemSet* rSet) override;
virtual void Reset(const SfxItemSet* rSet) override;
@@ -185,7 +180,7 @@ class SwStdFontTabPage : public SfxTabPage
virtual void dispose() override;
public:
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet(SfxItemSet* rSet) override;
virtual void Reset(const SfxItemSet* rSet) override;
@@ -224,7 +219,7 @@ public:
virtual ~SwTableOptionsTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet(SfxItemSet* rSet) override;
virtual void Reset(const SfxItemSet* rSet) override;
@@ -268,7 +263,7 @@ public:
virtual ~SwShdwCursorOptionsTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
@@ -343,7 +338,7 @@ public:
virtual ~SwRedlineOptionsTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
@@ -360,7 +355,7 @@ public:
virtual ~SwTestTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
@@ -403,7 +398,7 @@ public:
virtual ~SwCompareOptionsTabPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx
index 5824d55..14583da 100644
--- a/sw/source/uibase/inc/outline.hxx
+++ b/sw/source/uibase/inc/outline.hxx
@@ -130,7 +130,7 @@ public:
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
void SetNumRule(SwNumRule *pRule)
{
diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx
index 81a69ab..79b8c6c 100644
--- a/sw/source/uibase/inc/pgfnote.hxx
+++ b/sw/source/uibase/inc/pgfnote.hxx
@@ -36,7 +36,7 @@ class SwFootNotePage: public SfxTabPage
static const sal_uInt16 aPageRg[];
SwFootNotePage(vcl::Window *pParent, const SfxItemSet &rSet);
public:
static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
static const sal_uInt16* GetRanges() { return aPageRg; }
virtual bool FillItemSet(SfxItemSet *rSet) override;
diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx
index a5852b7..3795385 100644
--- a/sw/source/uibase/inc/pggrid.hxx
+++ b/sw/source/uibase/inc/pggrid.hxx
@@ -91,7 +91,7 @@ public:
virtual ~SwTextGridPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
static const sal_uInt16* GetRanges();
virtual bool FillItemSet(SfxItemSet *rSet) override;
diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index d9a619d..5d046f6 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.hxx
@@ -201,7 +201,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell
SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) override;
SAL_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL ) override;
SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const override;
SAL_DLLPRIVATE virtual VclPtr<SfxTabPage> CreatePrintOptionsPage(vcl::Window *pParent, const SfxItemSet &rOptions ) override;
SAL_DLLPRIVATE virtual VclPtr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent, const SfxItemSet &rOptions) override;
SAL_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill );
diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx
index 7d24a2b..8348044 100644
--- a/sw/source/uibase/inc/regionsw.hxx
+++ b/sw/source/uibase/inc/regionsw.hxx
@@ -185,7 +185,7 @@ public:
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet* ) override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
};
@@ -228,7 +228,7 @@ public:
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet* ) override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
};
@@ -247,7 +247,7 @@ public:
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet* ) override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
void SetWrtShell(SwWrtShell const & rSh);
diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx
index 2fd75bb..e355c32 100644
--- a/sw/source/uibase/inc/swuiccoll.hxx
+++ b/sw/source/uibase/inc/swuiccoll.hxx
@@ -70,7 +70,7 @@ class SwCondCollPage : public SfxTabPage
public:
SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet);
static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
static const sal_uInt16* GetRanges() { return m_aPageRg; }
virtual bool FillItemSet( SfxItemSet *rSet) override;
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx
index f26bb92..8d377ae 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -227,7 +227,7 @@ public:
virtual void ActivatePage( const SfxItemSet& ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
void SelectType(TOXTypes eSet); //preset TOXType, GlobalDoc
@@ -436,7 +436,7 @@ public:
virtual void ActivatePage( const SfxItemSet& ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
void SetWrtShell(SwWrtShell& rSh);
@@ -484,7 +484,7 @@ public:
virtual void ActivatePage( const SfxItemSet& ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
static VclPtr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
};
diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx
index a2807b1..1ab9564 100644
--- a/sw/source/uibase/inc/wrap.hxx
+++ b/sw/source/uibase/inc/wrap.hxx
@@ -92,7 +92,7 @@ class SwWrapTabPage: public SfxTabPage
public:
SwWrapTabPage(vcl::Window *pParent, const SfxItemSet &rSet);
static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
virtual bool FillItemSet(SfxItemSet *rSet) override;
virtual void Reset(const SfxItemSet *rSet) override;
diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx
index 8ee2fba..4e7319d 100644
--- a/sw/source/uibase/table/tablepg.hxx
+++ b/sw/source/uibase/table/tablepg.hxx
@@ -85,7 +85,7 @@ public:
virtual ~SwFormatTablePage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet);
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
virtual void ActivatePage( const SfxItemSet& rSet ) override;
@@ -136,7 +136,7 @@ public:
virtual ~SwTableColumnPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet);
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
virtual void ActivatePage( const SfxItemSet& rSet ) override;
@@ -186,7 +186,7 @@ public:
SwTextFlowPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~SwTextFlowPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet);
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index dbcef1d..cd22486 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -1706,10 +1706,10 @@ bool SwPagePreview::HasPrintOptionsPage() const
return true;
}
VclPtr<SfxTabPage> SwPagePreview::CreatePrintOptionsPage( vcl::Window *pParent,
VclPtr<SfxTabPage> SwPagePreview::CreatePrintOptionsPage( TabPageParent pParent,
const SfxItemSet &rOptions )
{
return ::CreatePrintOptionsPage( pParent, rOptions, !m_bNormalPrint );
return ::CreatePrintOptionsPage( TabPageParent(pParent.pParent), rOptions, !m_bNormalPrint );
}
void SwPagePreviewWin::SetViewShell( SwViewShell* pShell )
diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx
index cb52705..f840dc3 100644
--- a/sw/source/uibase/uiview/viewprt.cxx
+++ b/sw/source/uibase/uiview/viewprt.cxx
@@ -170,7 +170,7 @@ namespace
// TabPage for application-specific print options
VclPtr<SfxTabPage> SwView::CreatePrintOptionsPage(vcl::Window* pParent,
VclPtr<SfxTabPage> SwView::CreatePrintOptionsPage(TabPageParent pParent,
const SfxItemSet& rSet)
{
return ::CreatePrintOptionsPage( pParent, rSet, false );
@@ -303,7 +303,7 @@ void SwView::NotifyCursor(SfxViewShell* pViewShell) const
// Create page printer/additions for SwView and SwPagePreview
VclPtr<SfxTabPage> CreatePrintOptionsPage( vcl::Window *pParent,
VclPtr<SfxTabPage> CreatePrintOptionsPage( TabPageParent pParent,
const SfxItemSet &rOptions,
bool bPreview )
{
diff --git a/sw/uiconfig/swriter/ui/printoptionspage.ui b/sw/uiconfig/swriter/ui/printoptionspage.ui
index f5a166a..507df01 100644
--- a/sw/uiconfig/swriter/ui/printoptionspage.ui
+++ b/sw/uiconfig/swriter/ui/printoptionspage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
<!-- Generated with glade 3.20.4 -->
<interface domain="sw">
<requires lib="gtk+" version="3.18"/>
<object class="GtkBox" id="PrintOptionsPage">
@@ -45,8 +45,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -62,8 +60,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -79,8 +75,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -96,8 +90,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -113,8 +105,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -130,8 +120,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">5</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
@@ -152,8 +140,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -187,8 +173,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -204,8 +188,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -221,8 +203,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -239,8 +219,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
@@ -261,8 +239,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -290,14 +266,12 @@
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">only</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -309,13 +283,11 @@
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">end</property>
<property name="group">none</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -327,13 +299,11 @@
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">endpage</property>
<property name="group">none</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -345,13 +315,11 @@
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">inmargins</property>
<property name="group">none</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -368,8 +336,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
@@ -390,8 +356,6 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
@@ -434,28 +398,22 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="fax">
<object class="GtkComboBoxText" id="fax">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -471,8 +429,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -488,8 +444,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index 49091b6..30bf126 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -163,6 +163,7 @@ public:
virtual OpenGLContext* CreateOpenGLContext() = 0;
virtual weld::Builder* CreateBuilder(weld::Widget* pParent, const OUString& rUIRoot, const OUString& rUIFile);
virtual weld::Builder* CreateInterimBuilder(vcl::Window* pParent, const OUString& rUIRoot, const OUString& rUIFile);
virtual weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent, VclMessageType eMessageType,
VclButtonsType eButtonType, const OUString& rPrimaryMessage);
virtual weld::Window* GetFrameWeld(const css::uno::Reference<css::awt::XWindow>& rWindow);
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index fcfcdd9..1379984 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -2043,6 +2043,11 @@ weld::Builder* SalInstance::CreateBuilder(weld::Widget* pParent, const OUString&
return new SalInstanceBuilder(pParentWidget, rUIRoot, rUIFile);
}
weld::Builder* SalInstance::CreateInterimBuilder(vcl::Window* pParent, const OUString& rUIRoot, const OUString& rUIFile)
{
return new SalInstanceBuilder(pParent, rUIRoot, rUIFile);
}
weld::MessageDialog* SalInstance::CreateMessageDialog(weld::Widget* pParent, VclMessageType eMessageType, VclButtonsType eButtonsType, const OUString& rPrimaryMessage)
{
SalInstanceWidget* pParentInstance = dynamic_cast<SalInstanceWidget*>(pParent);
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 167094a..0cd56a7 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -130,6 +130,11 @@ weld::Builder* Application::CreateBuilder(weld::Widget* pParent, const OUString
return ImplGetSVData()->mpDefInst->CreateBuilder(pParent, VclBuilderContainer::getUIRootDir(), rUIFile);
}
weld::Builder* Application::CreateInterimBuilder(vcl::Window* pParent, const OUString &rUIFile)
{
return ImplGetSVData()->mpDefInst->CreateInterimBuilder(pParent, VclBuilderContainer::getUIRootDir(), rUIFile);
}
weld::MessageDialog* Application::CreateMessageDialog(weld::Widget* pParent, VclMessageType eMessageType,
VclButtonsType eButtonType, const OUString& rPrimaryMessage)
{
