diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-10 17:23:12 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-10 17:25:23 +0200 |
commit | 4dbeadb9c1e46ac0008f076cd6f9c5d0a38a4d40 (patch) | |
tree | a71acd0d466e02c18bf78ffdcfea748135805d21 /include | |
parent | 2f8fd888b42dc41662b54a16d62575c2b15e844a (diff) |
Change SfxTabPage::FillItemSet param from ref to pointer
...there were a number of call sites that passed undefined "null pointer
references" (apparently in cases where the passed argument was actually unused)
Change-Id: I19799e90f0cd8e98367782441a5ea9df27b59830
Diffstat (limited to 'include')
-rw-r--r-- | include/sfx2/dinfdlg.hxx | 8 | ||||
-rw-r--r-- | include/sfx2/mgetempl.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/printopt.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/securitypage.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/tabdlg.hxx | 2 | ||||
-rw-r--r-- | include/svx/hdft.hxx | 2 | ||||
-rw-r--r-- | include/svx/optgrid.hxx | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 917397f3e845..a2af178fb6c6 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -219,7 +219,7 @@ private: protected: SfxDocumentPage( Window* pParent, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; public: @@ -242,7 +242,7 @@ private: protected: SfxDocumentDescPage( Window* pParent, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; public: @@ -506,7 +506,7 @@ private: protected: SfxCustomPropertiesPage( Window* pParent, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; @@ -628,7 +628,7 @@ private: protected: SfxCmisPropertiesPage( Window* pParent, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx index 6082fbe370b3..66d1cd2773d3 100644 --- a/include/sfx2/mgetempl.hxx +++ b/include/sfx2/mgetempl.hxx @@ -79,7 +79,7 @@ friend class SfxStyleDialog; static SfxTabPage* Create(Window *pParent, const SfxItemSet &rAttrSet ); protected: - virtual bool FillItemSet(SfxItemSet &) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet *) SAL_OVERRIDE; virtual void Reset(const SfxItemSet &) SAL_OVERRIDE; using TabPage::ActivatePage; diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index b0d3c8f381b6..629b5ad080ee 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -96,7 +96,7 @@ public: SfxCommonPrintOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); virtual ~SfxCommonPrintOptionsTabPage(); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual Window* GetParentLabeledBy( const Window* pLabel ) const SAL_OVERRIDE; virtual Window* GetParentLabelFor( const Window* pLabel ) const SAL_OVERRIDE; diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx index 96b2017516dc..aeac0ee6a541 100644 --- a/include/sfx2/securitypage.hxx +++ b/include/sfx2/securitypage.hxx @@ -36,7 +36,7 @@ protected: SfxSecurityPage( Window* pParent, const SfxItemSet& ); virtual ~SfxSecurityPage(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; public: diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 98dfeddd87b9..34f5ef02a50a 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -258,7 +258,7 @@ public: const SfxItemSet& GetItemSet() const { return *pSet; } - virtual bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet* ); virtual void Reset( const SfxItemSet& ); bool HasExchangeSupport() const diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index b840ada4198f..632b64c1d779 100644 --- a/include/svx/hdft.hxx +++ b/include/svx/hdft.hxx @@ -44,7 +44,7 @@ class SVX_DLLPUBLIC SvxHFPage: public SfxTabPage public: - virtual bool FillItemSet( SfxItemSet& rOutSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rOutSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual ~SvxHFPage(); diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index 15c3e666ef8d..aad434ba93cb 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -104,7 +104,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; |