summaryrefslogtreecommitdiff
path: root/include/sfx2
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-17 17:53:05 +0200
committerNoel Grandin <noel@peralex.com>2015-04-17 17:53:05 +0200
commitd8ebd9044177e1269c8c81c4c0e3ff53d875247a (patch)
treef919736414decd3e217af3463d2fa66953d3eb36 /include/sfx2
parent3f5733216541c5b1e9d86861812a7a857703740c (diff)
sfx2: convert new to ::Create.
Change-Id: I53f95a65702c144ba4c4b0caac1e172015fec0fa
Diffstat (limited to 'include/sfx2')
-rw-r--r--include/sfx2/dinfdlg.hxx9
-rw-r--r--include/sfx2/mgetempl.hxx3
-rw-r--r--include/sfx2/objsh.hxx3
-rw-r--r--include/sfx2/printer.hxx4
-rw-r--r--include/sfx2/securitypage.hxx3
5 files changed, 11 insertions, 11 deletions
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 3cd589333ec7..a89065ddc1a4 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -215,7 +215,6 @@ private:
void ImplCheckPasswordState();
protected:
- SfxDocumentPage( vcl::Window* pParent, const SfxItemSet& );
virtual ~SfxDocumentPage();
virtual void dispose() SAL_OVERRIDE;
@@ -223,6 +222,7 @@ protected:
virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE;
public:
+ SfxDocumentPage( vcl::Window* pParent, const SfxItemSet& );
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* );
void EnableUseUserData();
@@ -240,7 +240,6 @@ private:
SfxDocumentInfoItem* m_pInfoItem;
protected:
- SfxDocumentDescPage( vcl::Window* pParent, const SfxItemSet& );
virtual ~SfxDocumentDescPage();
virtual void dispose() SAL_OVERRIDE;
@@ -248,6 +247,7 @@ protected:
virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE;
public:
+ SfxDocumentDescPage( vcl::Window* pParent, const SfxItemSet& );
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* );
};
@@ -520,7 +520,6 @@ private:
using TabPage::DeactivatePage;
protected:
- SfxCustomPropertiesPage( vcl::Window* pParent, const SfxItemSet& );
virtual ~SfxCustomPropertiesPage();
virtual void dispose() SAL_OVERRIDE;
@@ -529,6 +528,7 @@ protected:
virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
public:
+ SfxCustomPropertiesPage( vcl::Window* pParent, const SfxItemSet& );
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* );
};
@@ -644,13 +644,12 @@ private:
DECL_LINK(UpdateHdl, void *);
protected:
- SfxCmisPropertiesPage( vcl::Window* pParent, const SfxItemSet& );
-
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
public:
+ SfxCmisPropertiesPage( vcl::Window* pParent, const SfxItemSet& );
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* );
};
diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx
index 00b8309e1a0b..a47cac9bab8b 100644
--- a/include/sfx2/mgetempl.hxx
+++ b/include/sfx2/mgetempl.hxx
@@ -79,7 +79,6 @@ friend class SfxStyleDialog;
void UpdateName_Impl(ListBox *, const OUString &rNew);
void SetDescriptionText_Impl();
- SfxManageStyleSheetPage(vcl::Window *pParent, const SfxItemSet &rAttrSet );
virtual ~SfxManageStyleSheetPage();
virtual void dispose() SAL_OVERRIDE;
@@ -96,6 +95,8 @@ 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 );
};
#endif
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 423e0fb4b39b..67e134f4f616 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -36,6 +36,7 @@
#include <com/sun/star/document/CmisVersion.hpp>
#include <vcl/timer.hxx>
+#include <vcl/vclptr.hxx>
#include <svl/poolitem.hxx>
#include <vcl/bitmap.hxx>
#include <sot/storage.hxx>
@@ -341,7 +342,7 @@ public:
sal_uInt16 GetScriptingSignatureState();
void SignScriptingContent();
- virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog(
+ virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog(
vcl::Window *pParent, const SfxItemSet& );
ErrCode CallBasic( const OUString& rMacro, const OUString& rBasicName,
diff --git a/include/sfx2/printer.hxx b/include/sfx2/printer.hxx
index 694e2e8f0758..d419b356507d 100644
--- a/include/sfx2/printer.hxx
+++ b/include/sfx2/printer.hxx
@@ -53,9 +53,9 @@ public:
virtual ~SfxPrinter();
virtual void dispose() SAL_OVERRIDE;
- SfxPrinter* Clone() const;
+ VclPtr<SfxPrinter> Clone() const;
- static SfxPrinter* Create( SvStream &rStream, SfxItemSet *pOptions );
+ static VclPtr<SfxPrinter> Create( SvStream &rStream, SfxItemSet *pOptions );
SvStream& Store( SvStream &rStream ) const;
const JobSetup& GetOrigJobSetup() const { return aOrigJobSetup; }
diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx
index eaf83e751a90..a96bd93a8bee 100644
--- a/include/sfx2/securitypage.hxx
+++ b/include/sfx2/securitypage.hxx
@@ -33,12 +33,11 @@ class SfxSecurityPage : public SfxTabPage
std::unique_ptr< SfxSecurityPage_Impl > m_pImpl;
protected:
- SfxSecurityPage( vcl::Window* pParent, const SfxItemSet& );
-
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE;
public:
+ SfxSecurityPage( vcl::Window* pParent, const SfxItemSet& );
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* );
};