summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-06-11 14:34:46 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-06-11 14:39:04 +0200
commitbb761be472ea9a590837dc6c1ca295387ac4c0b7 (patch)
tree178b4187effe2a05f3d77660ad83eea97144a287 /include
parent4d120b6ab181f530d3fedc963b1c6ec777f2608a (diff)
Change SfxTabPage ctor SfxItemSet param from ref to pointer
...and also corresponding param of CreateTabPage function type and corresponding Craete functions. There were some call sites that passed undefined "null pointer references" and SfxTabPage internally uses a pointer member pSet that is checked for null anyway. Change-Id: I4eb3636155eac46c9c9d26e6e6e842e85d7e95af
Diffstat (limited to 'include')
-rw-r--r--include/sfx2/dinfdlg.hxx8
-rw-r--r--include/sfx2/mgetempl.hxx2
-rw-r--r--include/sfx2/printopt.hxx2
-rw-r--r--include/sfx2/securitypage.hxx2
-rw-r--r--include/sfx2/tabdlg.hxx4
-rw-r--r--include/svx/dlgctrl.hxx2
-rw-r--r--include/svx/hdft.hxx4
7 files changed, 12 insertions, 12 deletions
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 932b0c2486e9..945fcd05d320 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -223,7 +223,7 @@ protected:
virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE;
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* );
void EnableUseUserData();
};
@@ -246,7 +246,7 @@ protected:
virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE;
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* );
};
// class SfxDocumentInfoDialog -------------------------------------------
@@ -511,7 +511,7 @@ protected:
virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* );
};
struct CmisValue : public VclBuilderContainer
@@ -633,7 +633,7 @@ protected:
virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* );
};
#endif // #ifndef _ INCLUDED_SFX2_DINFDLG_HXX
diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx
index 4cbbfaf2825e..dbf6538cee72 100644
--- a/include/sfx2/mgetempl.hxx
+++ b/include/sfx2/mgetempl.hxx
@@ -76,7 +76,7 @@ friend class SfxStyleDialog;
SfxManageStyleSheetPage(Window *pParent, const SfxItemSet &rAttrSet );
virtual ~SfxManageStyleSheetPage();
- static SfxTabPage* Create(Window *pParent, const SfxItemSet &rAttrSet );
+ static SfxTabPage* Create(Window *pParent, const SfxItemSet *rAttrSet );
protected:
virtual bool FillItemSet(SfxItemSet *) SAL_OVERRIDE;
diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx
index 3678d7bced67..5d84648453fd 100644
--- a/include/sfx2/printopt.hxx
+++ b/include/sfx2/printopt.hxx
@@ -101,7 +101,7 @@ public:
virtual Window* GetParentLabeledBy( const Window* pLabel ) const SAL_OVERRIDE;
virtual Window* GetParentLabelFor( const Window* pLabel ) const SAL_OVERRIDE;
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
};
#endif // INCLUDED_SFX2_PRINTOPT_HXX
diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx
index 5544b9f932a4..dca4430aa094 100644
--- a/include/sfx2/securitypage.hxx
+++ b/include/sfx2/securitypage.hxx
@@ -40,7 +40,7 @@ protected:
virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE;
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* );
};
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 118698991285..ffc9358ce3e8 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -37,7 +37,7 @@ class SfxViewFrame;
class SfxTabPage;
class SfxBindings;
-typedef SfxTabPage* (*CreateTabPage)(Window *pParent, const SfxItemSet &rAttrSet);
+typedef SfxTabPage* (*CreateTabPage)(Window *pParent, const SfxItemSet *rAttrSet);
typedef const sal_uInt16* (*GetTabPageRanges)(); // provides international Which-value
struct TabPageImpl;
@@ -242,7 +242,7 @@ private:
protected:
SfxTabPage( Window *pParent, const ResId &, const SfxItemSet &rAttrSet );
- SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet);
+ SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet);
sal_uInt16 GetSlot( sal_uInt16 nWhich ) const
{ return pSet->GetPool()->GetSlotId( nWhich ); }
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 7a74c33ba447..0580d7164647 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -47,7 +47,7 @@ public:
{
}
SvxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet)
- : SfxTabPage(pParent, rID, rUIXMLDescription, rAttrSet)
+ : SfxTabPage(pParent, rID, rUIXMLDescription, &rAttrSet)
{
}
virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) = 0;
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index 5333af98a717..fcf59b5439be 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -100,7 +100,7 @@ private:
class SVX_DLLPUBLIC SvxHeaderPage : public SvxHFPage
{
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
private:
@@ -112,7 +112,7 @@ private:
class SVX_DLLPUBLIC SvxFooterPage : public SvxHFPage
{
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
private: