summaryrefslogtreecommitdiff
path: root/sc/source/ui/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/inc')
-rw-r--r--sc/source/ui/inc/opredlin.hxx4
-rw-r--r--sc/source/ui/inc/prevwsh.hxx2
-rw-r--r--sc/source/ui/inc/scuitphfedit.hxx20
-rw-r--r--sc/source/ui/inc/tabpages.hxx13
-rw-r--r--sc/source/ui/inc/tabvwsh.hxx2
-rw-r--r--sc/source/ui/inc/tpcalc.hxx11
-rw-r--r--sc/source/ui/inc/tpcompatibility.hxx10
-rw-r--r--sc/source/ui/inc/tpdefaults.hxx10
-rw-r--r--sc/source/ui/inc/tpformula.hxx9
-rw-r--r--sc/source/ui/inc/tphf.hxx17
-rw-r--r--sc/source/ui/inc/tpprint.hxx7
-rw-r--r--sc/source/ui/inc/tpsort.hxx11
-rw-r--r--sc/source/ui/inc/tpstat.hxx8
-rw-r--r--sc/source/ui/inc/tpsubt.hxx33
-rw-r--r--sc/source/ui/inc/tptable.hxx11
-rw-r--r--sc/source/ui/inc/tpusrlst.hxx12
-rw-r--r--sc/source/ui/inc/tpview.hxx19
-rw-r--r--sc/source/ui/inc/validate.hxx14
18 files changed, 71 insertions, 142 deletions
diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx
index 37181873b4d6..dba8539c90d2 100644
--- a/sc/source/ui/inc/opredlin.hxx
+++ b/sc/source/ui/inc/opredlin.hxx
@@ -31,11 +31,9 @@ class ScRedlineOptionsTabPage : public SfxTabPage
std::unique_ptr<ColorListBox> m_xMoveColorLB;
public:
-
ScRedlineOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet );
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
virtual ~ScRedlineOptionsTabPage() override;
- virtual void dispose() override;
- 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 5511d7c661da..8c2660ea5319 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -104,7 +104,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(TabPageParent pParent, const SfxItemSet &rOptions) override;
+ virtual std::unique_ptr<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 d377a12d0cba..0f114fa13d9c 100644
--- a/sc/source/ui/inc/scuitphfedit.hxx
+++ b/sc/source/ui/inc/scuitphfedit.hxx
@@ -115,41 +115,29 @@ private:
class ScRightHeaderEditPage : public ScHFEditPage
{
- friend class VclPtr<ScRightHeaderEditPage>;
public:
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet );
-
-private:
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet );
ScRightHeaderEditPage( TabPageParent pParent, const SfxItemSet& rSet );
};
class ScLeftHeaderEditPage : public ScHFEditPage
{
- friend class VclPtr<ScLeftHeaderEditPage>;
public:
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet );
-
-private:
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet );
ScLeftHeaderEditPage( TabPageParent pParent, const SfxItemSet& rSet );
};
class ScRightFooterEditPage : public ScHFEditPage
{
- friend class VclPtr<ScRightFooterEditPage>;
public:
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet );
-
-private:
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet );
ScRightFooterEditPage( TabPageParent pParent, const SfxItemSet& rSet );
};
class ScLeftFooterEditPage : public ScHFEditPage
{
- friend class VclPtr<ScLeftFooterEditPage>;
public:
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet );
-
-private:
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet );
ScLeftFooterEditPage( TabPageParent pParent, const SfxItemSet& rSet );
};
diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx
index 16046ab4f6bc..9cdffb2144d3 100644
--- a/sc/source/ui/inc/tabpages.hxx
+++ b/sc/source/ui/inc/tabpages.hxx
@@ -24,24 +24,21 @@
class ScTabPageProtection : public SfxTabPage
{
- friend class VclPtr<ScTabPageProtection>;
static const sal_uInt16 pProtectionRanges[];
public:
- static VclPtr<SfxTabPage> Create ( TabPageParent pParent,
- const SfxItemSet* rAttrSet );
+ ScTabPageProtection(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent,
+ const SfxItemSet* rAttrSet);
+ virtual ~ScTabPageProtection() override;
+
static const sal_uInt16* GetRanges () { return pProtectionRanges; }
virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) override;
virtual void Reset ( const SfxItemSet* ) override;
- virtual ~ScTabPageProtection() override;
-
protected:
- using SfxTabPage::DeactivatePage;
virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet ) override;
private:
- ScTabPageProtection(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
-private:
// current status:
bool bTriEnabled; // if before - DontCare
bool bDontCare; // all in TriState
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 50b9a0913c4b..3b6005afa36f 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -319,7 +319,7 @@ public:
SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL ) override;
virtual bool HasPrintOptionsPage() const override;
- virtual VclPtr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent, const SfxItemSet &rOptions) override;
+ virtual std::unique_ptr<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 6c878380c7c8..d32704f496f4 100644
--- a/sc/source/ui/inc/tpcalc.hxx
+++ b/sc/source/ui/inc/tpcalc.hxx
@@ -27,20 +27,15 @@ class ScDocOptions;
class ScTpCalcOptions : public SfxTabPage
{
- friend class VclPtr<ScTpCalcOptions>;
public:
- static VclPtr<SfxTabPage> Create ( TabPageParent pParent,
- const SfxItemSet* rCoreSet );
+ ScTpCalcOptions(TabPageParent pParent, const SfxItemSet& rCoreSet);
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rCoreSet);
+ virtual ~ScTpCalcOptions() override;
virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override;
virtual void Reset ( const SfxItemSet* rCoreSet ) override;
- using SfxTabPage::DeactivatePage;
virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet ) override;
private:
- ScTpCalcOptions(TabPageParent pParent, const SfxItemSet& rCoreSet);
- virtual ~ScTpCalcOptions() override;
-
-private:
std::unique_ptr<ScDocOptions> pOldOptions;
std::unique_ptr<ScDocOptions> pLocalOptions;
sal_uInt16 const nWhichCalc;
diff --git a/sc/source/ui/inc/tpcompatibility.hxx b/sc/source/ui/inc/tpcompatibility.hxx
index 7d895a644279..4bceec955a15 100644
--- a/sc/source/ui/inc/tpcompatibility.hxx
+++ b/sc/source/ui/inc/tpcompatibility.hxx
@@ -14,19 +14,15 @@
class ScTpCompatOptions : public SfxTabPage
{
- friend class VclPtr<ScTpCompatOptions>;
public:
- using SfxTabPage::DeactivatePage;
-
- static VclPtr<SfxTabPage> Create (TabPageParent pParent, const SfxItemSet* rCoreAttrs);
+ explicit ScTpCompatOptions(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rCoreAttrs);
+ virtual ~ScTpCompatOptions() override;
virtual bool FillItemSet(SfxItemSet* rCoreAttrs) override;
virtual void Reset(const SfxItemSet* rCoreAttrs) override;
virtual DeactivateRC DeactivatePage(SfxItemSet* pSet ) override;
- virtual ~ScTpCompatOptions() override;
-private:
- explicit ScTpCompatOptions(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
private:
std::unique_ptr<weld::ComboBox> m_xLbKeyBindings;
};
diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx
index 59be1c7a73b0..a2a88e7e95f9 100644
--- a/sc/source/ui/inc/tpdefaults.hxx
+++ b/sc/source/ui/inc/tpdefaults.hxx
@@ -15,20 +15,16 @@
class ScTpDefaultsOptions : public SfxTabPage
{
- friend class VclPtr<ScTpDefaultsOptions>;
public:
- using SfxTabPage::DeactivatePage;
-
- static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rCoreSet);
+ explicit ScTpDefaultsOptions(TabPageParent pParent, const SfxItemSet& rCoreSet);
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rCoreSet);
+ virtual ~ScTpDefaultsOptions() override;
virtual bool FillItemSet(SfxItemSet* rCoreSet) override;
virtual void Reset(const SfxItemSet* rCoreSet) override;
virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override;
private:
- explicit ScTpDefaultsOptions(TabPageParent pParent, const SfxItemSet& rCoreSet);
- virtual ~ScTpDefaultsOptions() override;
-
void CheckNumSheets();
void CheckPrefix();
void OnFocusPrefixInput();
diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx
index dd7ec5ced453..2aee580c16a3 100644
--- a/sc/source/ui/inc/tpformula.hxx
+++ b/sc/source/ui/inc/tpformula.hxx
@@ -27,19 +27,16 @@
class ScTpFormulaOptions : public SfxTabPage
{
- friend class VclPtr<ScTpFormulaOptions>;
public:
- using SfxTabPage::DeactivatePage;
-
- static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rCoreSet);
+ explicit ScTpFormulaOptions(TabPageParent pParent, const SfxItemSet& rCoreSet);
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rCoreSet);
+ virtual ~ScTpFormulaOptions() override;
virtual bool FillItemSet(SfxItemSet* rCoreSet) override;
virtual void Reset( const SfxItemSet* rCoreSet ) override;
virtual DeactivateRC DeactivatePage(SfxItemSet* pSet ) override;
private:
- explicit ScTpFormulaOptions(TabPageParent pParent, const SfxItemSet& rCoreSet);
- virtual ~ScTpFormulaOptions() override;
void ResetSeparators();
void OnFocusSeparatorInput(weld::Entry* pEdit);
void UpdateCustomCalcRadioButtons(bool bDefault);
diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx
index 94a8b28c1186..17d7c2a598aa 100644
--- a/sc/source/ui/inc/tphf.hxx
+++ b/sc/source/ui/inc/tphf.hxx
@@ -28,7 +28,6 @@ class ScHFPage : public SvxHFPage
{
public:
virtual ~ScHFPage() override;
- virtual void dispose() override;
virtual void Reset( const SfxItemSet* rSet ) override;
virtual bool FillItemSet( SfxItemSet* rOutSet ) override;
@@ -39,8 +38,6 @@ public:
protected:
ScHFPage(TabPageParent pParent, const SfxItemSet& rSet, sal_uInt16 nSetId);
- virtual void ActivatePage() override;
- virtual void DeactivatePage() override;
virtual void ActivatePage( const SfxItemSet& rSet ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
@@ -58,24 +55,18 @@ private:
class ScHeaderPage : public ScHFPage
{
- friend class VclPtr<ScHeaderPage>;
public:
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
- static const sal_uInt16* GetRanges();
-
-private:
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
ScHeaderPage(TabPageParent pParent, const SfxItemSet& rSet);
+ static const sal_uInt16* GetRanges();
};
class ScFooterPage : public ScHFPage
{
- friend class VclPtr<ScFooterPage>;
public:
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
- static const sal_uInt16* GetRanges();
-
-private:
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
ScFooterPage(TabPageParent pParent, const SfxItemSet& rSet);
+ static const sal_uInt16* GetRanges();
};
#endif // INCLUDED_SC_SOURCE_UI_INC_TPHF_HXX
diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx
index 9ddae6ec4dae..ef15a39b7537 100644
--- a/sc/source/ui/inc/tpprint.hxx
+++ b/sc/source/ui/inc/tpprint.hxx
@@ -24,18 +24,17 @@
class ScTpPrintOptions : public SfxTabPage
{
- friend class VclPtr<ScTpPrintOptions>;
std::unique_ptr<weld::CheckButton> m_xSkipEmptyPagesCB;
std::unique_ptr<weld::CheckButton> m_xSelectedSheetsCB;
std::unique_ptr<weld::CheckButton> m_xForceBreaksCB;
- ScTpPrintOptions(TabPageParent pPage, const SfxItemSet& rCoreSet);
public:
+ ScTpPrintOptions(TabPageParent pPage, const SfxItemSet& rCoreSet);
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet );
virtual ~ScTpPrintOptions() override;
- 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;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
};
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index 755b9f8bb529..655ff11747aa 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -43,17 +43,14 @@ class ScTabPageSortFields : public SfxTabPage
{
public:
ScTabPageSortFields(TabPageParent pParent, const SfxItemSet& rArgSet);
- virtual void dispose() override;
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rArgSet);
virtual ~ScTabPageSortFields() override;
- static VclPtr<SfxTabPage> Create ( TabPageParent pParent,
- const SfxItemSet* rArgSet );
+
virtual bool FillItemSet ( SfxItemSet* rArgSet ) override;
virtual void Reset ( const SfxItemSet* rArgSet ) override;
protected:
virtual void ActivatePage ( const SfxItemSet& rSet ) override;
- using SfxTabPage::ActivatePage;
- using SfxTabPage::DeactivatePage;
virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet ) override;
private:
@@ -98,15 +95,13 @@ class ScTabPageSortOptions : public SfxTabPage
{
public:
ScTabPageSortOptions(TabPageParent pParent, const SfxItemSet& rArgSet);
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* pArgSet);
- static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* pArgSet);
virtual bool FillItemSet ( SfxItemSet* rArgSet ) override;
virtual void Reset ( const SfxItemSet* rArgSet ) override;
protected:
virtual void ActivatePage ( const SfxItemSet& rSet ) override;
- using SfxTabPage::ActivatePage;
- using SfxTabPage::DeactivatePage;
virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet ) override;
private:
diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx
index a24bc18fa88b..a317345dcadd 100644
--- a/sc/source/ui/inc/tpstat.hxx
+++ b/sc/source/ui/inc/tpstat.hxx
@@ -24,13 +24,11 @@
class ScDocStatPage: public SfxTabPage
{
- friend class VclPtr<ScDocStatPage>;
public:
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
- virtual ~ScDocStatPage() override;
-
-private:
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
ScDocStatPage(TabPageParent pParent, const SfxItemSet& rSet);
+ virtual ~ScDocStatPage() override;
+
protected:
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset ( const SfxItemSet* rSet ) override;
diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx
index 8051074c93dd..4f3c48ee880e 100644
--- a/sc/source/ui/inc/tpsubt.hxx
+++ b/sc/source/ui/inc/tpsubt.hxx
@@ -75,45 +75,39 @@ private:
class ScTpSubTotalGroup1 final : public ScTpSubTotalGroup
{
- friend class VclPtr<ScTpSubTotalGroup1>;
+public:
ScTpSubTotalGroup1( TabPageParent pParent,
const SfxItemSet& rArgSet );
-
-public:
+ static std::unique_ptr<SfxTabPage> Create ( TabPageParent pParent,
+ const SfxItemSet* rArgSet );
virtual ~ScTpSubTotalGroup1() override;
- static VclPtr<SfxTabPage> Create ( TabPageParent pParent,
- const SfxItemSet* rArgSet );
virtual bool FillItemSet ( SfxItemSet* rArgSet ) override;
virtual void Reset ( const SfxItemSet* rArgSet ) override;
};
class ScTpSubTotalGroup2 final : public ScTpSubTotalGroup
{
- friend class VclPtr<ScTpSubTotalGroup2>;
+public:
ScTpSubTotalGroup2( TabPageParent pParent,
const SfxItemSet& rArgSet );
-
-public:
+ static std::unique_ptr<SfxTabPage> Create ( TabPageParent pParent,
+ const SfxItemSet* rArgSet );
virtual ~ScTpSubTotalGroup2() override;
- static VclPtr<SfxTabPage> Create ( TabPageParent pParent,
- const SfxItemSet* rArgSet );
virtual bool FillItemSet ( SfxItemSet* rArgSet ) override;
virtual void Reset ( const SfxItemSet* rArgSet ) override;
};
class ScTpSubTotalGroup3 final : public ScTpSubTotalGroup
{
- friend class VclPtr<ScTpSubTotalGroup3>;
+public:
ScTpSubTotalGroup3( TabPageParent pParent,
const SfxItemSet& rArgSet );
-
-public:
+ static std::unique_ptr<SfxTabPage> Create ( TabPageParent pParent,
+ const SfxItemSet* rArgSet );
virtual ~ScTpSubTotalGroup3() override;
- static VclPtr<SfxTabPage> Create ( TabPageParent pParent,
- const SfxItemSet* rArgSet );
virtual bool FillItemSet ( SfxItemSet* rArgSet ) override;
virtual void Reset ( const SfxItemSet* rArgSet ) override;
};
@@ -121,16 +115,15 @@ public:
class ScTpSubTotalOptions final : public SfxTabPage
{
public:
- virtual ~ScTpSubTotalOptions() override;
- static VclPtr<SfxTabPage> Create ( TabPageParent pParent,
+ ScTpSubTotalOptions(TabPageParent pParent, const SfxItemSet& rArgSet);
+ static std::unique_ptr<SfxTabPage> Create ( TabPageParent pParent,
const SfxItemSet* rArgSet );
+ virtual ~ScTpSubTotalOptions() override;
+
virtual bool FillItemSet ( SfxItemSet* rArgSet ) override;
virtual void Reset ( const SfxItemSet* rArgSet ) override;
private:
- friend class VclPtr<ScTpSubTotalOptions>;
- ScTpSubTotalOptions(TabPageParent pParent, const SfxItemSet& rArgSet);
-
void Init ();
void FillUserSortListBox ();
diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx
index 52b2a36628a0..fe517c35a5a1 100644
--- a/sc/source/ui/inc/tptable.hxx
+++ b/sc/source/ui/inc/tptable.hxx
@@ -24,21 +24,18 @@
class ScTablePage : public SfxTabPage
{
- friend class VclPtr<ScTablePage>;
static const sal_uInt16 pPageTableRanges[];
public:
- static VclPtr<SfxTabPage> Create ( TabPageParent pParent,
- const SfxItemSet* rCoreSet );
+ ScTablePage(TabPageParent pParent, const SfxItemSet& rCoreSet);
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rCoreSet);
+ virtual ~ScTablePage() override;
+
static const sal_uInt16* GetRanges () { return pPageTableRanges; }
virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override;
virtual void Reset ( const SfxItemSet* rCoreSet ) override;
- using SfxTabPage::DeactivatePage;
virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet ) override;
- virtual void DataChanged ( const DataChangedEvent& rDCEvt ) override;
- virtual ~ScTablePage() override;
private:
- ScTablePage(TabPageParent pParent, const SfxItemSet& rCoreSet);
void ShowImage();
private:
diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx
index 01af1e536767..438d897569a9 100644
--- a/sc/source/ui/inc/tpusrlst.hxx
+++ b/sc/source/ui/inc/tpusrlst.hxx
@@ -32,20 +32,16 @@ class ScRefAddress;
class ScTpUserLists : public SfxTabPage
{
- friend class VclPtr<ScTpUserLists>;
public:
- static VclPtr<SfxTabPage> Create ( TabPageParent pParent,
- const SfxItemSet* rAttrSet );
+ ScTpUserLists(TabPageParent pParent, const SfxItemSet& rArgSet);
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent,
+ const SfxItemSet* rAttrSet);
+ virtual ~ScTpUserLists() override;
virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) override;
virtual void Reset ( const SfxItemSet* rCoreAttrs ) override;
- using SfxTabPage::DeactivatePage;
virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet ) override;
private:
- ScTpUserLists(TabPageParent pParent, const SfxItemSet& rArgSet);
- virtual ~ScTpUserLists() override;
-
-private:
std::unique_ptr<weld::Label> mxFtLists;
std::unique_ptr<weld::TreeView> mxLbLists;
std::unique_ptr<weld::Label> mxFtEntries;
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index f9f992e8be4b..3e47c2d8ae03 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -27,7 +27,6 @@ class ScViewOptions;
class ScTpContentOptions : public SfxTabPage
{
- friend class VclPtr<ScTpContentOptions>;
std::unique_ptr<ScViewOptions> m_xLocalOptions;
std::unique_ptr<weld::ComboBox> m_xGridLB;
@@ -62,17 +61,12 @@ class ScTpContentOptions : public SfxTabPage
DECL_LINK( SelLbObjHdl, weld::ComboBox&, void );
DECL_LINK( CBHdl, weld::ToggleButton&, void );
+public:
ScTpContentOptions(TabPageParent pParent, const SfxItemSet& rArgSet);
- virtual void dispose() override;
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rCoreSet);
virtual ~ScTpContentOptions() override;
-
-public:
- static VclPtr<SfxTabPage> Create ( TabPageParent pParent,
- const SfxItemSet* rCoreSet );
virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override;
virtual void Reset ( const SfxItemSet* rCoreSet ) override;
- using SfxTabPage::ActivatePage;
- using SfxTabPage::DeactivatePage;
virtual void ActivatePage( const SfxItemSet& ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
@@ -81,7 +75,6 @@ public:
class ScDocument;
class ScTpLayoutOptions : public SfxTabPage
{
- friend class VclPtrInstance<ScTpLayoutOptions>;
ScDocument *pDoc;
std::unique_ptr<weld::ComboBox> m_xUnitLB;
@@ -106,15 +99,13 @@ class ScTpLayoutOptions : public SfxTabPage
DECL_LINK( AlignHdl, weld::ToggleButton&, void );
- ScTpLayoutOptions(TabPageParent pParent, const SfxItemSet& rArgSet );
public:
+ ScTpLayoutOptions(TabPageParent pParent, const SfxItemSet& rArgSet );
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent,
+ const SfxItemSet* rCoreSet);
virtual ~ScTpLayoutOptions() override;
- static VclPtr<SfxTabPage> Create ( TabPageParent pParent,
- const SfxItemSet* rCoreSet );
virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override;
virtual void Reset ( const SfxItemSet* rCoreSet ) override;
- using SfxTabPage::ActivatePage;
- using SfxTabPage::DeactivatePage;
virtual void ActivatePage( const SfxItemSet& ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
};
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index 33596c520f7f..d5f33838f818 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -25,12 +25,14 @@
#include "anyrefdg.hxx"
#include <sc.hrc>
-struct ScRefHandlerCaller : public virtual VclReferenceBase {
+struct ScRefHandlerCaller{
+ virtual ~ScRefHandlerCaller(){}
};
+
class ScRefHandlerHelper
{
protected:
- VclPtr<ScRefHandlerCaller> m_pHandler;
+ ScRefHandlerCaller* m_pHandler;
// workaround VS2013 issue with pointers to things that contain virtual base class
#ifdef _WIN32
#pragma pack(push, 16)
@@ -76,9 +78,9 @@ class ScTPValidationValue : public ScRefHandlerCaller, public SfxTabPage
static const sal_uInt16 pValueRanges[];
public:
explicit ScTPValidationValue(TabPageParent pParent, const SfxItemSet& rArgSet);
- virtual void dispose() override;
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rArgSet );
virtual ~ScTPValidationValue() override;
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rArgSet );
+
static const sal_uInt16* GetRanges() { return pValueRanges; }
virtual bool FillItemSet( SfxItemSet* rArgSet ) override;
@@ -236,9 +238,9 @@ private:
public:
ScTPValidationHelp(TabPageParent pParent, const SfxItemSet& rArgSet);
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rArgSet);
virtual ~ScTPValidationHelp() override;
- static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rArgSet);
virtual bool FillItemSet ( SfxItemSet* rArgSet ) override;
virtual void Reset ( const SfxItemSet* rArgSet ) override;
};
@@ -261,9 +263,9 @@ private:
public:
ScTPValidationError(TabPageParent pParent, const SfxItemSet& rArgSet);
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rArgSet);
virtual ~ScTPValidationError() override;
- static VclPtr<SfxTabPage> Create ( TabPageParent pParent, const SfxItemSet* rArgSet );
virtual bool FillItemSet ( SfxItemSet* rArgSet ) override;
virtual void Reset ( const SfxItemSet* rArgSet ) override;
};
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-18 02:00:49 +0000