summaryrefslogtreecommitdiff
path: root/sc/source/ui/inc/validate.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/inc/validate.hxx')
-rw-r--r--sc/source/ui/inc/validate.hxx14
1 files changed, 8 insertions, 6 deletions
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;
};