summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/sfx2/dinfdlg.hxx8
-rw-r--r--include/sfx2/mgetempl.hxx3
-rw-r--r--include/sfx2/module.hxx2
-rw-r--r--include/sfx2/printopt.hxx2
-rw-r--r--include/sfx2/securitypage.hxx2
-rw-r--r--include/sfx2/tabdlg.hxx2
-rw-r--r--include/svx/hdft.hxx10
-rw-r--r--include/svx/optgrid.hxx2
-rw-r--r--include/svx/svxdlg.hxx4
9 files changed, 18 insertions, 17 deletions
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index a89065ddc1a4..6e2ed6242b81 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -223,7 +223,7 @@ protected:
public:
SfxDocumentPage( vcl::Window* pParent, const SfxItemSet& );
- static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* );
+ static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* );
void EnableUseUserData();
};
@@ -248,7 +248,7 @@ protected:
public:
SfxDocumentDescPage( vcl::Window* pParent, const SfxItemSet& );
- static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* );
+ static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* );
};
// class SfxDocumentInfoDialog -------------------------------------------
@@ -529,7 +529,7 @@ protected:
public:
SfxCustomPropertiesPage( vcl::Window* pParent, const SfxItemSet& );
- static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* );
+ static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* );
};
struct CmisValue : public VclBuilderContainer
@@ -650,7 +650,7 @@ protected:
public:
SfxCmisPropertiesPage( vcl::Window* pParent, const SfxItemSet& );
- static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* );
+ static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* );
};
#endif // #ifndef _ INCLUDED_SFX2_DINFDLG_HXX
diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx
index a47cac9bab8b..cc0f61596bb9 100644
--- a/include/sfx2/mgetempl.hxx
+++ b/include/sfx2/mgetempl.hxx
@@ -82,7 +82,7 @@ friend class SfxStyleDialog;
virtual ~SfxManageStyleSheetPage();
virtual void dispose() SAL_OVERRIDE;
- static SfxTabPage* Create(vcl::Window *pParent, const SfxItemSet *rAttrSet );
+ static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* );
protected:
virtual bool FillItemSet(SfxItemSet *) SAL_OVERRIDE;
@@ -95,6 +95,7 @@ protected:
virtual void ActivatePage(const SfxItemSet &) SAL_OVERRIDE;
using TabPage::DeactivatePage;
virtual int DeactivatePage(SfxItemSet * = 0) SAL_OVERRIDE;
+
public:
SfxManageStyleSheetPage(vcl::Window *pParent, const SfxItemSet &rAttrSet );
};
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index 4c30e4f2cac4..d98b5c9c190d 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -83,7 +83,7 @@ public:
void RegisterStatusBarControl(SfxStbCtrlFactory*);
void RegisterMenuControl(SfxMenuCtrlFactory*);
- virtual SfxTabPage* CreateTabPage( sal_uInt16 nId,
+ virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId,
vcl::Window* pParent,
const SfxItemSet& rSet );
virtual void Invalidate(sal_uInt16 nId = 0) SAL_OVERRIDE;
diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx
index ecb35c96d8cc..f6465ac0160f 100644
--- a/include/sfx2/printopt.hxx
+++ b/include/sfx2/printopt.hxx
@@ -101,7 +101,7 @@ public:
virtual vcl::Window* GetParentLabeledBy( const vcl::Window* pLabel ) const SAL_OVERRIDE;
virtual vcl::Window* GetParentLabelFor( const vcl::Window* pLabel ) const SAL_OVERRIDE;
- static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
+ static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* );
};
#endif // INCLUDED_SFX2_PRINTOPT_HXX
diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx
index a96bd93a8bee..84ad9dc0e609 100644
--- a/include/sfx2/securitypage.hxx
+++ b/include/sfx2/securitypage.hxx
@@ -38,7 +38,7 @@ protected:
public:
SfxSecurityPage( vcl::Window* pParent, const SfxItemSet& );
- static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* );
+ static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* );
};
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index d1758879ca5b..2b80b2878e95 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -37,7 +37,7 @@ class SfxViewFrame;
class SfxTabPage;
class SfxBindings;
-typedef SfxTabPage* (*CreateTabPage)(vcl::Window *pParent, const SfxItemSet *rAttrSet);
+typedef VclPtr<SfxTabPage> (*CreateTabPage)(vcl::Window *pParent, const SfxItemSet *rAttrSet);
typedef const sal_uInt16* (*GetTabPageRanges)(); // provides international Which-value
struct TabPageImpl;
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index ac98a7543da5..01f6792b36d6 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -113,10 +113,10 @@ private:
class SVX_DLLPUBLIC SvxHeaderPage : public SvxHFPage
{
public:
- SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rSet );
- static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
+ static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
// returns the Which values to the range
- static const sal_uInt16* GetRanges() { return pRanges; }
+ static const sal_uInt16* GetRanges() { return pRanges; }
+ SVX_DLLPRIVATE SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rSet );
};
// class SvxFooterPage ---------------------------------------------------
@@ -124,9 +124,9 @@ public:
class SVX_DLLPUBLIC SvxFooterPage : public SvxHFPage
{
public:
+ static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
+ static const sal_uInt16* GetRanges() { return pRanges; }
SVX_DLLPRIVATE SvxFooterPage( vcl::Window* pParent, const SfxItemSet& rSet );
- static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
- static const sal_uInt16* GetRanges() { return pRanges; }
};
class SVX_DLLPUBLIC DeleteHeaderDialog : public MessageDialog
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index 29e7b6224ac7..438ade20c89c 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -104,7 +104,7 @@ public:
virtual ~SvxGridTabPage();
virtual void dispose() SAL_OVERRIDE;
- static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet& rAttrSet );
+ static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet& rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index 080c807aa562..87ada7aa6c11 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -42,8 +42,8 @@ namespace linguistic2{
}}}}
class SvxSpellWrapper;
-typedef SfxTabPage* (*CreateSvxDistributePage)(vcl::Window *pParent, const SfxItemSet &rAttrSet, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer);
-typedef const sal_uInt16* (*DialogGetRanges)();
+typedef VclPtr<SfxTabPage> (*CreateSvxDistributePage)(vcl::Window *pParent, const SfxItemSet &rAttrSet, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer);
+typedef const sal_uInt16* (*DialogGetRanges)();
struct ExchangeData;
class INetURLObject;
generated by cgit (git 2.34.1) at 2024-07-29 00:30:16 +0000