diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-11 10:35:24 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-11 10:39:03 +0200 |
commit | a92e973b6d0a9ad87fe014442e1678af2ce0c7d0 (patch) | |
tree | b39139c7992a853cc5e4d836fc35cd45c01a3f6d /include | |
parent | 88f84eb1b0eebbb7e0a072f1e7001a9207ebbe9e (diff) |
Change SfxTabPage::Reset param from ref to pointer
...there was a call site that passed undefined "null pointer reference"
(apparently in a case where the passed argument was actually unused)
Change-Id: I663d4264b7a84f44ca69c732f3bc502f614b2b2a
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 a2af178fb6c6..932b0c2486e9 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -220,7 +220,7 @@ protected: SfxDocumentPage( Window* pParent, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& ); @@ -243,7 +243,7 @@ protected: SfxDocumentDescPage( Window* pParent, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& ); @@ -507,7 +507,7 @@ protected: SfxCustomPropertiesPage( Window* pParent, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: @@ -629,7 +629,7 @@ protected: SfxCmisPropertiesPage( Window* pParent, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx index 66d1cd2773d3..4cbbfaf2825e 100644 --- a/include/sfx2/mgetempl.hxx +++ b/include/sfx2/mgetempl.hxx @@ -80,7 +80,7 @@ friend class SfxStyleDialog; protected: virtual bool FillItemSet(SfxItemSet *) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet &) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet *) SAL_OVERRIDE; using TabPage::ActivatePage; virtual void ActivatePage(const SfxItemSet &) SAL_OVERRIDE; diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index 629b5ad080ee..3678d7bced67 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -97,7 +97,7 @@ public: virtual ~SfxCommonPrintOptionsTabPage(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const 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 aeac0ee6a541..5544b9f932a4 100644 --- a/include/sfx2/securitypage.hxx +++ b/include/sfx2/securitypage.hxx @@ -37,7 +37,7 @@ protected: virtual ~SfxSecurityPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& ); diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 34f5ef02a50a..118698991285 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -259,7 +259,7 @@ public: const SfxItemSet& GetItemSet() const { return *pSet; } virtual bool FillItemSet( SfxItemSet* ); - virtual void Reset( const SfxItemSet& ); + virtual void Reset( const SfxItemSet* ); bool HasExchangeSupport() const { return bHasExchangeSupport; } diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index 632b64c1d779..5333af98a717 100644 --- a/include/svx/hdft.hxx +++ b/include/svx/hdft.hxx @@ -45,7 +45,7 @@ class SVX_DLLPUBLIC SvxHFPage: public SfxTabPage public: virtual bool FillItemSet( SfxItemSet* rOutSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) 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 aad434ba93cb..0d15690f0ee9 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -105,7 +105,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; |