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

11 files changed, 35 insertions, 35 deletions

diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index c816fe933972..6ec8cab83818 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -457,7 +457,7 @@ void SwEnvFmtPage::ActivatePage(const SfxItemSet& rSet)
 int SwEnvFmtPage::DeactivatePage(SfxItemSet* _pSet)
 {
     if( _pSet )
-        FillItemSet(*_pSet);
+        FillItemSet(_pSet);
     return SfxTabPage::LEAVE_PAGE;
 }
 
@@ -485,10 +485,10 @@ void SwEnvFmtPage::FillItem(SwEnvItem& rItem)
     }
 }
 
-bool SwEnvFmtPage::FillItemSet(SfxItemSet& rSet)
+bool SwEnvFmtPage::FillItemSet(SfxItemSet* rSet)
 {
     FillItem(GetParentSwEnvDlg()->aEnvItem);
-    rSet.Put(GetParentSwEnvDlg()->aEnvItem);
+    rSet->Put(GetParentSwEnvDlg()->aEnvItem);
     return true;
 }
 
diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx
index 777cdf25d00b..28cc5cd395b7 100644
--- a/sw/source/ui/envelp/envfmt.hxx
+++ b/sw/source/ui/envelp/envfmt.hxx
@@ -65,7 +65,7 @@ public:
     virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual int  DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE;
             void FillItem(SwEnvItem& rItem);
-    virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE;
+    virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE;
     virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE;
 };
 
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index b4172fe81664..4e56860cfa4d 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -323,7 +323,7 @@ int SwEnvPage::DeactivatePage(SfxItemSet* _pSet)
 {
     FillItem(GetParentSwEnvDlg()->aEnvItem);
     if( _pSet )
-        FillItemSet(*_pSet);
+        FillItemSet(_pSet);
     return SfxTabPage::LEAVE_PAGE;
 }
 
@@ -334,10 +334,10 @@ void SwEnvPage::FillItem(SwEnvItem& rItem)
     rItem.aSendText = m_pSenderEdit->GetText();
 }
 
-bool SwEnvPage::FillItemSet(SfxItemSet& rSet)
+bool SwEnvPage::FillItemSet(SfxItemSet* rSet)
 {
     FillItem(GetParentSwEnvDlg()->aEnvItem);
-    rSet.Put(GetParentSwEnvDlg()->aEnvItem);
+    rSet->Put(GetParentSwEnvDlg()->aEnvItem);
     return true;
 }
 
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index 252cf04ac0d9..304737608b33 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -141,7 +141,7 @@ void SwEnvPrtPage::ActivatePage(const SfxItemSet&)
 int SwEnvPrtPage::DeactivatePage(SfxItemSet* _pSet)
 {
     if( _pSet )
-        FillItemSet(*_pSet);
+        FillItemSet(_pSet);
     return SfxTabPage::LEAVE_PAGE;
 }
 
@@ -163,10 +163,10 @@ void SwEnvPrtPage::FillItem(SwEnvItem& rItem)
     rItem.lShiftDown      = static_cast< sal_Int32 >(GetFldVal(*m_pDownField ));
 }
 
-bool SwEnvPrtPage::FillItemSet(SfxItemSet& rSet)
+bool SwEnvPrtPage::FillItemSet(SfxItemSet* rSet)
 {
     FillItem(GetParentSwEnvDlg()->aEnvItem);
-    rSet.Put(GetParentSwEnvDlg()->aEnvItem);
+    rSet->Put(GetParentSwEnvDlg()->aEnvItem);
     return true;
 }
 
diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index 73eb2ddc5e45..9c937b75adbe 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -64,7 +64,7 @@ public:
     virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual int  DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE;
             void FillItem(SwEnvItem& rItem);
-    virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE;
+    virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE;
     virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE;
 
     inline void SetPrt(Printer* pPrinter) { pPrt = pPrinter; }
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index db98aa82930a..7efb173754f5 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -473,7 +473,7 @@ void SwLabPage::ActivatePage(const SfxItemSet& rSet)
 int SwLabPage::DeactivatePage(SfxItemSet* _pSet)
 {
     if (_pSet)
-        FillItemSet(*_pSet);
+        FillItemSet(_pSet);
 
     return sal_True;
 }
@@ -494,10 +494,10 @@ void SwLabPage::FillItem(SwLabItem& rItem)
     rItem.aLstType = m_pTypeBox->GetSelectEntry();
 }
 
-bool SwLabPage::FillItemSet(SfxItemSet& rSet)
+bool SwLabPage::FillItemSet(SfxItemSet* rSet)
 {
     FillItem( aItem );
-    rSet.Put( aItem );
+    rSet->Put( aItem );
 
     return true;
 }
@@ -610,11 +610,11 @@ void SwVisitingCardPage::ActivatePage(const SfxItemSet& rSet)
 int  SwVisitingCardPage::DeactivatePage(SfxItemSet* _pSet)
 {
     if (_pSet)
-        FillItemSet(*_pSet);
+        FillItemSet(_pSet);
     return LEAVE_PAGE;
 }
 
-bool SwVisitingCardPage::FillItemSet(SfxItemSet& rSet)
+bool SwVisitingCardPage::FillItemSet(SfxItemSet* rSet)
 {
     const OUString* pGroup = (const OUString*)m_pAutoTextGroupLB->GetEntryData(
                                     m_pAutoTextGroupLB->GetSelectEntryPos());
@@ -626,7 +626,7 @@ bool SwVisitingCardPage::FillItemSet(SfxItemSet& rSet)
     SvTreeListEntry* pSelEntry = m_pAutoTextLB->FirstSelected();
     if(pSelEntry)
         aLabItem.sGlossaryBlockName = *(OUString*)pSelEntry->GetUserData();
-    rSet.Put(aLabItem);
+    rSet->Put(aLabItem);
     return true;
 }
 
@@ -743,11 +743,11 @@ void SwPrivateDataPage::ActivatePage(const SfxItemSet& rSet)
 int  SwPrivateDataPage::DeactivatePage(SfxItemSet* _pSet)
 {
     if (_pSet)
-        FillItemSet(*_pSet);
+        FillItemSet(_pSet);
     return LEAVE_PAGE;
 }
 
-bool SwPrivateDataPage::FillItemSet(SfxItemSet& rSet)
+bool SwPrivateDataPage::FillItemSet(SfxItemSet* rSet)
 {
 
     SwLabItem aItem = (const SwLabItem&) GetTabDialog()->GetExampleSet()->Get(FN_LABEL);
@@ -770,7 +770,7 @@ bool SwPrivateDataPage::FillItemSet(SfxItemSet& rSet)
     aItem.aPrivWWW       = m_pHomePageED->GetText(  );
     aItem.aPrivMail      = m_pMailED->GetText(  );
 
-    rSet.Put(aItem);
+    rSet->Put(aItem);
     return true;
 }
 
@@ -831,11 +831,11 @@ void SwBusinessDataPage::ActivatePage(const SfxItemSet& rSet)
 int  SwBusinessDataPage::DeactivatePage(SfxItemSet* _pSet)
 {
     if (_pSet)
-        FillItemSet(*_pSet);
+        FillItemSet(_pSet);
     return LEAVE_PAGE;
 }
 
-bool SwBusinessDataPage::FillItemSet(SfxItemSet& rSet)
+bool SwBusinessDataPage::FillItemSet(SfxItemSet* rSet)
 {
     SwLabItem aItem = (const SwLabItem&) GetTabDialog()->GetExampleSet()->Get(FN_LABEL);
 
@@ -854,7 +854,7 @@ bool SwBusinessDataPage::FillItemSet(SfxItemSet& rSet)
     aItem.aCompWWW       = m_pHomePageED->GetText();
     aItem.aCompMail      = m_pMailED->GetText();
 
-    rSet.Put(aItem);
+    rSet->Put(aItem);
     return true;
 }
 
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 49593db120b8..d2cb08201325 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -478,7 +478,7 @@ void SwLabFmtPage::ActivatePage(const SfxItemSet& rSet)
 int SwLabFmtPage::DeactivatePage(SfxItemSet* _pSet)
 {
     if (_pSet)
-        FillItemSet(*_pSet);
+        FillItemSet(_pSet);
 
     return sal_True;
 }
@@ -503,10 +503,10 @@ void SwLabFmtPage::FillItem(SwLabItem& rItem)
     }
 }
 
-bool SwLabFmtPage::FillItemSet(SfxItemSet& rSet)
+bool SwLabFmtPage::FillItemSet(SfxItemSet* rSet)
 {
     FillItem(aItem);
-    rSet.Put(aItem);
+    rSet->Put(aItem);
 
     return true;
 }
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index 27d93db4e9bb..d84ffc03c1f6 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -108,7 +108,7 @@ public:
     virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual int  DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE;
             void FillItem(SwLabItem& rItem);
-    virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE;
+    virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE;
     virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE;
 
     SwLabDlg* GetParentSwLabDlg() {return (SwLabDlg*)GetParentDialog();}
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index cc5a9e3c152a..65ddb7ebc746 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -107,7 +107,7 @@ void SwLabPrtPage::ActivatePage( const SfxItemSet& rSet )
 int SwLabPrtPage::DeactivatePage(SfxItemSet* _pSet)
 {
     if ( _pSet )
-        FillItemSet(*_pSet);
+        FillItemSet(_pSet);
 
     return sal_True;
 }
@@ -120,12 +120,12 @@ void SwLabPrtPage::FillItem(SwLabItem& rItem)
     rItem.bSynchron = m_pSynchronCB->IsChecked() && m_pSynchronCB->IsEnabled();
 }
 
-bool SwLabPrtPage::FillItemSet(SfxItemSet& rSet)
+bool SwLabPrtPage::FillItemSet(SfxItemSet* rSet)
 {
     SwLabItem aItem;
     GetParentSwLabDlg()->GetLabItem(aItem);
     FillItem(aItem);
-    rSet.Put(aItem);
+    rSet->Put(aItem);
 
     return true;
 }
diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx
index 4cd62fbc3176..011ccea625ff 100644
--- a/sw/source/ui/envelp/labprt.hxx
+++ b/sw/source/ui/envelp/labprt.hxx
@@ -61,7 +61,7 @@ public:
     virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual int  DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE;
             void FillItem(SwLabItem& rItem);
-    virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE;
+    virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE;
     virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE;
     inline Printer* GetPrt() { return (pPrinter); }
 };
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index b00f6fd68f68..62436bd6bdc5 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -69,7 +69,7 @@ public:
     virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual int  DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE;
             void FillItem(SwLabItem& rItem);
-    virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE;
+    virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE;
     virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE;
 
     SwLabDlg* GetParentSwLabDlg() {return (SwLabDlg*) GetParentDialog();}
@@ -120,7 +120,7 @@ public:
 
     virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual int  DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE;
-    virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE;
+    virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE;
     virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE;
 };
 
@@ -158,7 +158,7 @@ public:
 
     virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual int  DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE;
-    virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE;
+    virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE;
     virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE;
 };
 
@@ -194,7 +194,7 @@ public:
 
     virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual int  DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE;
-    virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE;
+    virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE;
     virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE;
 };