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

50 files changed, 184 insertions, 184 deletions

diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index bd03f177cfc0..c8878e798282 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -134,7 +134,7 @@ void SwCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
 }
 
 SwCharURLPage::SwCharURLPage(Window* pParent, const SfxItemSet& rCoreSet)
-    : SfxTabPage(pParent, "CharURLPage", "modules/swriter/ui/charurlpage.ui", rCoreSet)
+    : SfxTabPage(pParent, "CharURLPage", "modules/swriter/ui/charurlpage.ui", &rCoreSet)
     , pINetItem(0)
     , bModified(false)
 
@@ -279,9 +279,9 @@ bool SwCharURLPage::FillItemSet(SfxItemSet* rSet)
 }
 
 SfxTabPage* SwCharURLPage::Create(  Window* pParent,
-                        const SfxItemSet& rAttrSet )
+                        const SfxItemSet* rAttrSet )
 {
-    return ( new SwCharURLPage( pParent, rAttrSet ) );
+    return ( new SwCharURLPage( pParent, *rAttrSet ) );
 }
 
 IMPL_LINK_NOARG(SwCharURLPage, InsertFileHdl)
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 8b986aee7b44..cb3bbe40050f 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -509,13 +509,13 @@ void SwDropCapsPict::_InitPrinter()
 SwDropCapsDlg::SwDropCapsDlg(Window *pParent, const SfxItemSet &rSet )
     : SfxSingleTabDialog(pParent, rSet)
 {
-    SwDropCapsPage* pNewPage = (SwDropCapsPage*) SwDropCapsPage::Create(get_content_area(), rSet);
+    SwDropCapsPage* pNewPage = (SwDropCapsPage*) SwDropCapsPage::Create(get_content_area(), &rSet);
     pNewPage->SetFormat(false);
     SetTabPage(pNewPage);
 }
 
 SwDropCapsPage::SwDropCapsPage(Window *pParent, const SfxItemSet &rSet)
-    : SfxTabPage(pParent, "DropCapPage","modules/swriter/ui/dropcapspage.ui", rSet)
+    : SfxTabPage(pParent, "DropCapPage","modules/swriter/ui/dropcapspage.ui", &rSet)
     , bModified(false)
     , bFormat(true)
     , rSh(::GetActiveView()->GetWrtShell())
@@ -576,9 +576,9 @@ int  SwDropCapsPage::DeactivatePage(SfxItemSet * _pSet)
 }
 
 SfxTabPage*  SwDropCapsPage::Create(Window *pParent,
-    const SfxItemSet &rSet)
+    const SfxItemSet *rSet)
 {
-    return new SwDropCapsPage(pParent, rSet);
+    return new SwDropCapsPage(pParent, *rSet);
 }
 
 bool  SwDropCapsPage::FillItemSet(SfxItemSet *rSet)
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index b4bcde7e5776..68b042dfca19 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -39,7 +39,7 @@ static const sal_uInt16 aPageRg[] = {
 };
 
 SwParagraphNumTabPage::SwParagraphNumTabPage(Window* pParent, const SfxItemSet& rAttr ) :
-    SfxTabPage(pParent, "NumParaPage", "modules/swriter/ui/numparapage.ui", rAttr),
+    SfxTabPage(pParent, "NumParaPage", "modules/swriter/ui/numparapage.ui", &rAttr),
 
     msOutlineNumbering( SW_RES( STR_OUTLINE_NUMBERING ) ),
     bModified(false),
@@ -91,9 +91,9 @@ SwParagraphNumTabPage::~SwParagraphNumTabPage()
 }
 
 SfxTabPage* SwParagraphNumTabPage::Create(  Window* pParent,
-                                const SfxItemSet& rSet )
+                                const SfxItemSet* rSet )
 {
-    return new SwParagraphNumTabPage(pParent, rSet);
+    return new SwParagraphNumTabPage(pParent, *rSet);
 }
 
 const sal_uInt16* SwParagraphNumTabPage::GetRanges()
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index 0f80203c7dc2..7822bc863a32 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -52,7 +52,7 @@ static long nTabs[] =
 
 SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet)
     : SfxTabPage(pParent, "ConditionPage",
-        "modules/swriter/ui/conditionpage.ui", rSet)
+        "modules/swriter/ui/conditionpage.ui", &rSet)
     ,
     rSh(::GetActiveView()->GetWrtShell()),
     pCmds( SwCondCollItem::GetCmds() ),
@@ -137,9 +137,9 @@ int SwCondCollPage::DeactivatePage(SfxItemSet * _pSet)
     return LEAVE_PAGE;
 }
 
-SfxTabPage* SwCondCollPage::Create(Window *pParent, const SfxItemSet &rSet)
+SfxTabPage* SwCondCollPage::Create(Window *pParent, const SfxItemSet *rSet)
 {
-    return new SwCondCollPage(pParent, rSet);
+    return new SwCondCollPage(pParent, *rSet);
 }
 
 bool SwCondCollPage::FillItemSet(SfxItemSet *rSet)
diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx
index 3d21e60fc9ea..4cab3f7c7f4a 100644
--- a/sw/source/ui/chrdlg/tblnumfm.cxx
+++ b/sw/source/ui/chrdlg/tblnumfm.cxx
@@ -40,7 +40,7 @@ SwNumFmtDlg::SwNumFmtDlg(Window* pParent, const SfxItemSet& rSet)
 
     if ( fnCreatePage )
     {
-        SfxTabPage* pNewPage = (*fnCreatePage)( get_content_area(), rSet );
+        SfxTabPage* pNewPage = (*fnCreatePage)( get_content_area(), &rSet );
         SfxAllItemSet aSet(*(rSet.GetPool()));
         aSet.Put ( SvxNumberInfoItem( (const SvxNumberInfoItem&)pNewPage->GetItemSet().Get( SID_ATTR_NUMBERFORMAT_INFO )));
         pNewPage->PageCreated(aSet);
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 75402da0d1af..448eca502d41 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -113,7 +113,7 @@ public:
 };
 
 SwMailConfigPage::SwMailConfigPage( Window* pParent, const SfxItemSet& rSet ) :
-    SfxTabPage(pParent, "MailConfigPage" , "modules/swriter/ui/mailconfigpage.ui", rSet),
+    SfxTabPage(pParent, "MailConfigPage" , "modules/swriter/ui/mailconfigpage.ui", &rSet),
 
     m_pConfigItem( new SwMailMergeConfigItem )
 {
@@ -138,9 +138,9 @@ SwMailConfigPage::~SwMailConfigPage()
     delete m_pConfigItem;
 }
 
-SfxTabPage*  SwMailConfigPage::Create( Window* pParent, const SfxItemSet& rAttrSet)
+SfxTabPage*  SwMailConfigPage::Create( Window* pParent, const SfxItemSet* rAttrSet)
 {
-    return new SwMailConfigPage(pParent, rAttrSet);
+    return new SwMailConfigPage(pParent, *rAttrSet);
 }
 
 bool SwMailConfigPage::FillItemSet( SfxItemSet* /*rSet*/ )
@@ -355,7 +355,7 @@ SwMailConfigDlg::SwMailConfigDlg(Window* pParent, SfxItemSet& rSet)
     : SfxSingleTabDialog(pParent, rSet)
 {
     // create TabPage
-    SetTabPage(SwMailConfigPage::Create(get_content_area(), rSet));
+    SetTabPage(SwMailConfigPage::Create(get_content_area(), &rSet));
 }
 
 SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog(
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index ce537458eea5..effc5551d3b8 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -93,7 +93,7 @@ struct SwCompatibilityOptPage_Impl
 
 SwCompatibilityOptPage::SwCompatibilityOptPage(Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "OptCompatPage",
-        "modules/swriter/ui/optcompatpage.ui", rSet)
+        "modules/swriter/ui/optcompatpage.ui", &rSet)
     , m_pWrtShell(NULL)
     , m_pImpl(new SwCompatibilityOptPage_Impl)
     , m_nSavedOptions(0)
@@ -400,9 +400,9 @@ void SwCompatibilityOptPage::WriteOptions()
             pItem->m_bExpandWordSpace );
 }
 
-SfxTabPage* SwCompatibilityOptPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage* SwCompatibilityOptPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
 {
-    return new SwCompatibilityOptPage( pParent, rAttrSet );
+    return new SwCompatibilityOptPage( pParent, *rAttrSet );
 }
 
 bool SwCompatibilityOptPage::FillItemSet( SfxItemSet*  )
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index cf592b71ba7f..d3067ca9c65d 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -65,7 +65,7 @@ using namespace ::com::sun::star;
 
 SwLoadOptPage::SwLoadOptPage(Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "OptGeneralPage",
-        "modules/swriter/ui/optgeneralpage.ui", rSet)
+        "modules/swriter/ui/optgeneralpage.ui", &rSet)
     , m_pWrtShell(NULL)
     , m_nLastTab(0)
     , m_nOldLinkMode(MANUAL)
@@ -127,9 +127,9 @@ SwLoadOptPage::SwLoadOptPage(Window* pParent, const SfxItemSet& rSet)
 }
 
 SfxTabPage* SwLoadOptPage::Create( Window* pParent,
-                                const SfxItemSet& rAttrSet )
+                                const SfxItemSet* rAttrSet )
 {
-    return new SwLoadOptPage(pParent, rAttrSet );
+    return new SwLoadOptPage(pParent, *rAttrSet );
 }
 
 IMPL_LINK_NOARG(SwLoadOptPage, StandardizedPageCountCheckHdl)
@@ -356,7 +356,7 @@ SwCaptionOptDlg::SwCaptionOptDlg(Window* pParent, const SfxItemSet& rSet)
         "modules/swriter/ui/captiondialog.ui")
 {
     // create TabPage
-    SetTabPage(SwCaptionOptPage::Create(get_content_area(), rSet));
+    SetTabPage(SwCaptionOptPage::Create(get_content_area(), &rSet));
 }
 
 SwCaptionPreview::SwCaptionPreview( Window* pParent, WinBits nStyle )
@@ -411,7 +411,7 @@ void SwCaptionPreview::Paint( const Rectangle& rRect )
 }
 
 SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet )
-    : SfxTabPage(pParent, "OptCaptionPage", "modules/swriter/ui/optcaptionpage.ui", rSet)
+    : SfxTabPage(pParent, "OptCaptionPage", "modules/swriter/ui/optcaptionpage.ui", &rSet)
     , m_sSWTable(SW_RESSTR(STR_CAPTION_TABLE))
     , m_sSWFrame(SW_RESSTR(STR_CAPTION_FRAME))
     , m_sSWGraphic(SW_RESSTR(STR_CAPTION_GRAPHIC))
@@ -524,9 +524,9 @@ SwCaptionOptPage::~SwCaptionOptPage()
 }
 
 SfxTabPage* SwCaptionOptPage::Create( Window* pParent,
-                                const SfxItemSet& rAttrSet )
+                                const SfxItemSet* rAttrSet )
 {
-    return new SwCaptionOptPage(pParent, rAttrSet );
+    return new SwCaptionOptPage(pParent, *rAttrSet );
 }
 
 bool SwCaptionOptPage::FillItemSet( SfxItemSet*  )
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 03ec363a2df0..22b56c43b669 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -74,7 +74,7 @@ using namespace ::com::sun::star;
 SwContentOptPage::SwContentOptPage( Window* pParent,
                                       const SfxItemSet& rCoreSet ) :
     SfxTabPage(pParent, "ViewOptionsPage",
-               "modules/swriter/ui/viewoptionspage.ui", rCoreSet)
+               "modules/swriter/ui/viewoptionspage.ui", &rCoreSet)
 {
     get (m_pCrossCB, "helplines");
 
@@ -159,9 +159,9 @@ SwContentOptPage::~SwContentOptPage()
 }
 
 SfxTabPage* SwContentOptPage::Create( Window* pParent,
-                                const SfxItemSet& rAttrSet)
+                                const SfxItemSet* rAttrSet)
 {
-    return new SwContentOptPage(pParent, rAttrSet);
+    return new SwContentOptPage(pParent, *rAttrSet);
 }
 
 static void lcl_SelectMetricLB(ListBox* rMetric, sal_uInt16 nSID, const SfxItemSet& rSet)
@@ -287,7 +287,7 @@ IMPL_LINK( SwContentOptPage, AnyRulerHdl, CheckBox*, pBox)
 SwAddPrinterTabPage::SwAddPrinterTabPage(Window* pParent,
     const SfxItemSet& rCoreSet)
     : SfxTabPage(pParent, "PrintOptionsPage",
-        "modules/swriter/ui/printoptionspage.ui", rCoreSet)
+        "modules/swriter/ui/printoptionspage.ui", &rCoreSet)
     , sNone(SW_RESSTR(SW_STR_NONE))
     , bAttrModified(false)
     , bPreview(false)
@@ -362,9 +362,9 @@ void SwAddPrinterTabPage::SetPreview(bool bPrev)
 }
 
 SfxTabPage* SwAddPrinterTabPage::Create( Window* pParent,
-                                       const SfxItemSet& rAttrSet )
+                                       const SfxItemSet* rAttrSet )
 {
-    return ( new SwAddPrinterTabPage( pParent, rAttrSet ) );
+    return ( new SwAddPrinterTabPage( pParent, *rAttrSet ) );
 }
 
 bool    SwAddPrinterTabPage::FillItemSet( SfxItemSet* rCoreSet )
@@ -508,7 +508,7 @@ void SwAddPrinterTabPage::PageCreated( const SfxAllItemSet& aSet)
 // Tabpage Standardfonts
 SwStdFontTabPage::SwStdFontTabPage( Window* pParent,
                                        const SfxItemSet& rSet ) :
-    SfxTabPage( pParent, "OptFontTabPage" , "modules/swriter/ui/optfonttabpage.ui" , rSet),
+    SfxTabPage( pParent, "OptFontTabPage" , "modules/swriter/ui/optfonttabpage.ui" , &rSet),
     pPrt(0),
     pFontList(0),
     pFontConfig(0),
@@ -588,9 +588,9 @@ SwStdFontTabPage::~SwStdFontTabPage()
 }
 
 SfxTabPage* SwStdFontTabPage::Create( Window* pParent,
-                                const SfxItemSet& rAttrSet )
+                                const SfxItemSet* rAttrSet )
 {
-    return new SwStdFontTabPage(pParent, rAttrSet);
+    return new SwStdFontTabPage(pParent, *rAttrSet);
 }
 
 static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType,
@@ -1062,7 +1062,7 @@ void SwStdFontTabPage::PageCreated( const SfxAllItemSet& aSet)
 }
 
 SwTableOptionsTabPage::SwTableOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) :
-    SfxTabPage(pParent, "OptTablePage", "modules/swriter/ui/opttablepage.ui", rSet),
+    SfxTabPage(pParent, "OptTablePage", "modules/swriter/ui/opttablepage.ui", &rSet),
     pWrtShell(0),
     bHTMLMode(false)
 {
@@ -1092,9 +1092,9 @@ SwTableOptionsTabPage::~SwTableOptionsTabPage()
 }
 
 SfxTabPage* SwTableOptionsTabPage::Create( Window* pParent,
-                                const SfxItemSet& rAttrSet )
+                                const SfxItemSet* rAttrSet )
 {
-    return new SwTableOptionsTabPage(pParent, rAttrSet );
+    return new SwTableOptionsTabPage(pParent, *rAttrSet );
 }
 
 bool SwTableOptionsTabPage::FillItemSet( SfxItemSet* )
@@ -1262,7 +1262,7 @@ void SwTableOptionsTabPage::PageCreated( const SfxAllItemSet& aSet)
 SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( Window* pParent,
                                                     const SfxItemSet& rSet )
    : SfxTabPage(pParent, "OptFormatAidsPage",
-                "modules/swriter/ui/optformataidspage.ui", rSet),
+                "modules/swriter/ui/optformataidspage.ui", &rSet),
     m_pWrtShell( NULL )
 {
     get(m_pParaCB, "paragraph");
@@ -1325,9 +1325,9 @@ SwShdwCrsrOptionsTabPage::~SwShdwCrsrOptionsTabPage()
 {
 }
 
-SfxTabPage* SwShdwCrsrOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet )
+SfxTabPage* SwShdwCrsrOptionsTabPage::Create( Window* pParent, const SfxItemSet* rSet )
 {
-    return new SwShdwCrsrOptionsTabPage( pParent, rSet );
+    return new SwShdwCrsrOptionsTabPage( pParent, *rSet );
 }
 
 void SwShdwCrsrOptionsTabPage::PageCreated( const SfxAllItemSet& aSet )
@@ -1656,7 +1656,7 @@ namespace
 SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( Window* pParent,
                                                     const SfxItemSet& rSet )
     : SfxTabPage(pParent, "OptRedLinePage",
-        "modules/swriter/ui/optredlinepage.ui" , rSet)
+        "modules/swriter/ui/optredlinepage.ui" , &rSet)
     , sNone(SW_RESSTR(SW_STR_NONE))
 {
     Size aPreviewSize(getPreviewOptionsSize(this));
@@ -1728,9 +1728,9 @@ SwRedlineOptionsTabPage::~SwRedlineOptionsTabPage()
 {
 }
 
-SfxTabPage* SwRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet)
+SfxTabPage* SwRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet* rSet)
 {
-    return new SwRedlineOptionsTabPage( pParent, rSet );
+    return new SwRedlineOptionsTabPage( pParent, *rSet );
 }
 
 bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet* )
@@ -2206,7 +2206,7 @@ void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin)
 }
 
 SwCompareOptionsTabPage::SwCompareOptionsTabPage(  Window* pParent, const SfxItemSet& rSet )
-    : SfxTabPage( pParent,"OptComparison","modules/swriter/ui/optcomparison.ui", rSet )
+    : SfxTabPage( pParent,"OptComparison","modules/swriter/ui/optcomparison.ui", &rSet )
 {
     get(m_pAutoRB,"auto");
     get(m_pWordRB, "byword");
@@ -2228,9 +2228,9 @@ SwCompareOptionsTabPage::~SwCompareOptionsTabPage()
 {
 }
 
-SfxTabPage* SwCompareOptionsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage* SwCompareOptionsTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
 {
-    return new SwCompareOptionsTabPage( pParent, rAttrSet );
+    return new SwCompareOptionsTabPage( pParent, *rAttrSet );
 }
 
 bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet* )
@@ -2334,7 +2334,7 @@ IMPL_LINK_NOARG(SwCompareOptionsTabPage, IgnoreHdl)
 #ifdef DBG_UTIL
 
 SwTestTabPage::SwTestTabPage(Window* pParent, const SfxItemSet& rCoreSet)
-    : SfxTabPage( pParent, "OptTestPage", "modules/swriter/ui/opttestpage.ui", rCoreSet)
+    : SfxTabPage( pParent, "OptTestPage", "modules/swriter/ui/opttestpage.ui", &rCoreSet)
     , bAttrModified( false )
 {
     get(m_pTest1CBox, "unused");
@@ -2353,9 +2353,9 @@ SwTestTabPage::SwTestTabPage(Window* pParent, const SfxItemSet& rCoreSet)
 }
 
 SfxTabPage* SwTestTabPage::Create( Window* pParent,
-                                       const SfxItemSet& rAttrSet )
+                                       const SfxItemSet* rAttrSet )
 {
-    return new SwTestTabPage(pParent, rAttrSet);
+    return new SwTestTabPage(pParent, *rAttrSet);
 }
 
 bool    SwTestTabPage::FillItemSet( SfxItemSet* rCoreSet )
diff --git a/sw/source/ui/dialog/addrdlg.cxx b/sw/source/ui/dialog/addrdlg.cxx
index 5b6a81a5879d..ae1f83cc479c 100644
--- a/sw/source/ui/dialog/addrdlg.cxx
+++ b/sw/source/ui/dialog/addrdlg.cxx
@@ -29,7 +29,7 @@ SwAddrDlg::SwAddrDlg(Window* pParent, const SfxItemSet& rSet)
     ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SFXPAGE_GENERAL );
     if ( fnCreatePage )
     {
-        SfxTabPage* pPage2 = (*fnCreatePage)(get_content_area(), rSet);
+        SfxTabPage* pPage2 = (*fnCreatePage)(get_content_area(), &rSet);
         SetTabPage(pPage2);
     }
 }
diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx
index 15fd2dc931bf..e2154bfb38d7 100644
--- a/sw/source/ui/dialog/docstdlg.cxx
+++ b/sw/source/ui/dialog/docstdlg.cxx
@@ -35,14 +35,14 @@
 #include <unotools/localedatawrapper.hxx>
 #include <vcl/settings.hxx>
 
-SfxTabPage *  SwDocStatPage::Create(Window *pParent, const SfxItemSet &rSet)
+SfxTabPage *  SwDocStatPage::Create(Window *pParent, const SfxItemSet *rSet)
 {
-    return new SwDocStatPage(pParent, rSet);
+    return new SwDocStatPage(pParent, *rSet);
 }
 
 SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet)
 
-    : SfxTabPage(pParent, "StatisticsInfoPage", "modules/swriter/ui/statisticsinfopage.ui", rSet)
+    : SfxTabPage(pParent, "StatisticsInfoPage", "modules/swriter/ui/statisticsinfopage.ui", &rSet)
 
 {
     get(m_pPageNo, "nopages");
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 4c4216788f28..2396a53570bc 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1491,7 +1491,7 @@ short   SwInsertSectionTabDialog::Ok()
 SwInsertSectionTabPage::SwInsertSectionTabPage(
                             Window *pParent, const SfxItemSet &rAttrSet)
     : SfxTabPage(pParent, "SectionPage",
-        "modules/swriter/ui/sectionpage.ui", rAttrSet)
+        "modules/swriter/ui/sectionpage.ui", &rAttrSet)
     , m_pWrtSh(0)
     , m_pDocInserter(NULL)
     , m_pOldDefDlgParent(NULL)
@@ -1636,9 +1636,9 @@ void SwInsertSectionTabPage::Reset( const SfxItemSet* )
 }
 
 SfxTabPage* SwInsertSectionTabPage::Create( Window* pParent,
-                                const SfxItemSet& rAttrSet)
+                                const SfxItemSet* rAttrSet)
 {
-    return new SwInsertSectionTabPage(pParent, rAttrSet);
+    return new SwInsertSectionTabPage(pParent, *rAttrSet);
 }
 
 IMPL_LINK( SwInsertSectionTabPage, ChangeHideHdl, CheckBox *, pBox )
@@ -1795,7 +1795,7 @@ IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFil
 
 SwSectionFtnEndTabPage::SwSectionFtnEndTabPage( Window *pParent,
                                                 const SfxItemSet &rAttrSet)
-    : SfxTabPage( pParent, "FootnotesEndnotesTabPage", "modules/swriter/ui/footnotesendnotestabpage.ui", rAttrSet )
+    : SfxTabPage( pParent, "FootnotesEndnotesTabPage", "modules/swriter/ui/footnotesendnotestabpage.ui", &rAttrSet )
 
 {
     get(pFtnNtAtTextEndCB,"ftnntattextend");
@@ -1976,9 +1976,9 @@ void SwSectionFtnEndTabPage::Reset( const SfxItemSet* rSet )
 }
 
 SfxTabPage* SwSectionFtnEndTabPage::Create( Window* pParent,
-                                const SfxItemSet& rAttrSet)
+                                const SfxItemSet* rAttrSet)
 {
-    return new SwSectionFtnEndTabPage(pParent, rAttrSet);
+    return new SwSectionFtnEndTabPage(pParent, *rAttrSet);
 }
 
 IMPL_LINK( SwSectionFtnEndTabPage, FootEndHdl, CheckBox *, pBox )
@@ -2084,7 +2084,7 @@ void SwSectionPropertyTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage
 }
 
 SwSectionIndentTabPage::SwSectionIndentTabPage(Window *pParent, const SfxItemSet &rAttrSet)
-    : SfxTabPage(pParent, "IndentPage", "modules/swriter/ui/indentpage.ui", rAttrSet)
+    : SfxTabPage(pParent, "IndentPage", "modules/swriter/ui/indentpage.ui", &rAttrSet)
 {
     get(m_pBeforeMF, "before");
     get(m_pAfterMF, "after");
@@ -2137,9 +2137,9 @@ void SwSectionIndentTabPage::Reset( const SfxItemSet* rSet)
     IndentModifyHdl(0);
 }
 
-SfxTabPage*  SwSectionIndentTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet)
+SfxTabPage*  SwSectionIndentTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet)
 {
-    return new SwSectionIndentTabPage(pParent, rAttrSet);
+    return new SwSectionIndentTabPage(pParent, *rAttrSet);
 }
 
 void SwSectionIndentTabPage::SetWrtShell(SwWrtShell& rSh)
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index c2c547cde2fe..072f619389f8 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -122,7 +122,7 @@ static long lUserH = 5669; // 10 cm
 
 SwEnvFmtPage::SwEnvFmtPage(Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "EnvFormatPage",
-        "modules/swriter/ui/envformatpage.ui", rSet)
+        "modules/swriter/ui/envformatpage.ui", &rSet)
 {
     get(m_pAddrLeftField, "leftaddr");
     get(m_pAddrTopField, "topaddr");
@@ -442,9 +442,9 @@ void SwEnvFmtPage::SetMinMax()
     m_pSizeHeightField->Reformat();
 }
 
-SfxTabPage* SwEnvFmtPage::Create(Window* pParent, const SfxItemSet& rSet)
+SfxTabPage* SwEnvFmtPage::Create(Window* pParent, const SfxItemSet* rSet)
 {
-    return new SwEnvFmtPage(pParent, rSet);
+    return new SwEnvFmtPage(pParent, *rSet);
 }
 
 void SwEnvFmtPage::ActivatePage(const SfxItemSet& rSet)
diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx
index fa2eabec5d32..39cb85d94609 100644
--- a/sw/source/ui/envelp/envfmt.hxx
+++ b/sw/source/ui/envelp/envfmt.hxx
@@ -60,7 +60,7 @@ class SwEnvFmtPage : public SfxTabPage
 
 public:
 
-    static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet);
+    static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet);
 
     virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual int  DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE;
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index 9982d5eaa842..a6ca75737946 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -192,7 +192,7 @@ short SwEnvDlg::Ok()
 
 SwEnvPage::SwEnvPage(Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "EnvAddressPage",
-        "modules/swriter/ui/envaddresspage.ui", rSet)
+        "modules/swriter/ui/envaddresspage.ui", &rSet)
 {
     get(m_pAddrEdit, "addredit");
     get(m_pDatabaseLB, "database");
@@ -307,9 +307,9 @@ void SwEnvPage::InitDatabaseBox()
     }
 }
 
-SfxTabPage* SwEnvPage::Create(Window* pParent, const SfxItemSet& rSet)
+SfxTabPage* SwEnvPage::Create(Window* pParent, const SfxItemSet* rSet)
 {
-    return new SwEnvPage(pParent, rSet);
+    return new SwEnvPage(pParent, *rSet);
 }
 
 void SwEnvPage::ActivatePage(const SfxItemSet& rSet)
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index 246b2692a39c..02b65703f3b3 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -31,7 +31,7 @@
 
 SwEnvPrtPage::SwEnvPrtPage(Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "EnvPrinterPage",
-        "modules/swriter/ui/envprinterpage.ui", rSet)
+        "modules/swriter/ui/envprinterpage.ui", &rSet)
     , pPrt(NULL)
 {
     get(m_pAlignBox, "alignbox");
@@ -127,9 +127,9 @@ IMPL_LINK_NOARG(SwEnvPrtPage, AlignHdl)
     return 0;
 }
 
-SfxTabPage* SwEnvPrtPage::Create(Window* pParent, const SfxItemSet& rSet)
+SfxTabPage* SwEnvPrtPage::Create(Window* pParent, const SfxItemSet* rSet)
 {
-    return new SwEnvPrtPage(pParent, rSet);
+    return new SwEnvPrtPage(pParent, *rSet);
 }
 
 void SwEnvPrtPage::ActivatePage(const SfxItemSet&)
diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index 5fa702e218ca..fdd5f1384b60 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -59,7 +59,7 @@ class SwEnvPrtPage : public SfxTabPage
 
 public:
 
-    static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet);
+    static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet);
 
     virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual int  DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE;
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 184cb15296d1..784ecdb8c6f9 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -229,7 +229,7 @@ Printer *SwLabDlg::GetPrt()
 
 SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "CardMediumPage",
-        "modules/swriter/ui/cardmediumpage.ui", rSet)
+        "modules/swriter/ui/cardmediumpage.ui", &rSet)
     , pDBManager(NULL)
     , aItem((const SwLabItem&)rSet.Get(FN_LABEL))
     , m_bLabel(false)
@@ -460,9 +460,9 @@ void SwLabPage::InitDatabaseBox()
     }
 }
 
-SfxTabPage* SwLabPage::Create(Window* pParent, const SfxItemSet& rSet)
+SfxTabPage* SwLabPage::Create(Window* pParent, const SfxItemSet* rSet)
 {
-    return new SwLabPage(pParent, rSet);
+    return new SwLabPage(pParent, *rSet);
 }
 
 void SwLabPage::ActivatePage(const SfxItemSet& rSet)
@@ -565,7 +565,7 @@ void SwVisitingCardPage::SetUserData( sal_uInt32 nCnt,
 
 SwVisitingCardPage::SwVisitingCardPage(Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "CardFormatPage",
-        "modules/swriter/ui/cardformatpage.ui", rSet)
+        "modules/swriter/ui/cardformatpage.ui", &rSet)
     , pExampleFrame(0)
 {
     get(m_pAutoTextLB, "treeview");
@@ -596,9 +596,9 @@ SwVisitingCardPage::~SwVisitingCardPage()
     delete pExampleFrame;
 }
 
-SfxTabPage* SwVisitingCardPage::Create(Window* pParent, const SfxItemSet& rSet)
+SfxTabPage* SwVisitingCardPage::Create(Window* pParent, const SfxItemSet* rSet)
 {
-    return new SwVisitingCardPage(pParent, rSet);
+    return new SwVisitingCardPage(pParent, *rSet);
 }
 
 void SwVisitingCardPage::ActivatePage(const SfxItemSet& rSet)
@@ -706,7 +706,7 @@ void SwVisitingCardPage::Reset(const SfxItemSet* rSet)
 
 SwPrivateDataPage::SwPrivateDataPage(Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "PrivateUserPage",
-        "modules/swriter/ui/privateuserpage.ui", rSet)
+        "modules/swriter/ui/privateuserpage.ui", &rSet)
 {
     get(m_pFirstNameED, "firstname");
     get(m_pNameED, "lastname");
@@ -730,9 +730,9 @@ SwPrivateDataPage::SwPrivateDataPage(Window* pParent, const SfxItemSet& rSet)
     SetExchangeSupport();
 }
 
-SfxTabPage* SwPrivateDataPage::Create(Window* pParent, const SfxItemSet& rSet)
+SfxTabPage* SwPrivateDataPage::Create(Window* pParent, const SfxItemSet* rSet)
 {
-    return new SwPrivateDataPage(pParent, rSet);
+    return new SwPrivateDataPage(pParent, *rSet);
 }
 
 void SwPrivateDataPage::ActivatePage(const SfxItemSet& rSet)
@@ -799,7 +799,7 @@ void SwPrivateDataPage::Reset(const SfxItemSet* rSet)
 
 SwBusinessDataPage::SwBusinessDataPage(Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "BusinessDataPage",
-        "modules/swriter/ui/businessdatapage.ui", rSet)
+        "modules/swriter/ui/businessdatapage.ui", &rSet)
 {
     get(m_pCompanyED, "company");
     get(m_pCompanyExtED, "company2");
@@ -818,9 +818,9 @@ SwBusinessDataPage::SwBusinessDataPage(Window* pParent, const SfxItemSet& rSet)
     SetExchangeSupport();
 }
 
-SfxTabPage* SwBusinessDataPage::Create(Window* pParent, const SfxItemSet& rSet)
+SfxTabPage* SwBusinessDataPage::Create(Window* pParent, const SfxItemSet* rSet)
 {
-    return new SwBusinessDataPage(pParent, rSet);
+    return new SwBusinessDataPage(pParent, *rSet);
 }
 
 void SwBusinessDataPage::ActivatePage(const SfxItemSet& rSet)
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 6af0e42121b7..dda067144928 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -288,7 +288,7 @@ void SwLabPreview::UpdateItem(const SwLabItem& rItem)
 
 SwLabFmtPage::SwLabFmtPage(Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "LabelFormatPage",
-        "modules/swriter/ui/labelformatpage.ui", rSet)
+        "modules/swriter/ui/labelformatpage.ui", &rSet)
     , bModified(false)
     , aItem((const SwLabItem&) rSet.Get(FN_LABEL))
 {
@@ -464,9 +464,9 @@ void SwLabFmtPage::ChangeMinMax()
     m_pPHeightField->Reformat();
 }
 
-SfxTabPage* SwLabFmtPage::Create(Window* pParent, const SfxItemSet& rSet)
+SfxTabPage* SwLabFmtPage::Create(Window* pParent, const SfxItemSet* rSet)
 {
-    return new SwLabFmtPage(pParent, rSet);
+    return new SwLabFmtPage(pParent, *rSet);
 }
 
 void SwLabFmtPage::ActivatePage(const SfxItemSet& rSet)
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index 547efa5d40c7..0616008ecae8 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -103,7 +103,7 @@ class SwLabFmtPage : public SfxTabPage
 
 public:
 
-    static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet);
+    static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet);
 
     virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual int  DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE;
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index d0fb4fbb961c..5518ce8f173a 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -31,7 +31,7 @@
 
 SwLabPrtPage::SwLabPrtPage(Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "LabelOptionsPage",
-        "modules/swriter/ui/labeloptionspage.ui", rSet)
+        "modules/swriter/ui/labeloptionspage.ui", &rSet)
     , pPrinter(0)
 {
     get(m_pPageButton, "entirepage");
@@ -94,9 +94,9 @@ IMPL_LINK( SwLabPrtPage, CountHdl, Button *, pButton )
     return 0;
 }
 
-SfxTabPage* SwLabPrtPage::Create(Window* pParent, const SfxItemSet& rSet)
+SfxTabPage* SwLabPrtPage::Create(Window* pParent, const SfxItemSet* rSet)
 {
-    return new SwLabPrtPage( pParent, rSet );
+    return new SwLabPrtPage( pParent, *rSet );
 }
 
 void SwLabPrtPage::ActivatePage( const SfxItemSet& rSet )
diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx
index 258cdfeb2f56..9a979586b2bf 100644
--- a/sw/source/ui/envelp/labprt.hxx
+++ b/sw/source/ui/envelp/labprt.hxx
@@ -56,7 +56,7 @@ class SwLabPrtPage : public SfxTabPage
 
 public:
 
-    static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet);
+    static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet);
 
     virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual int  DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE;
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index 806d302164df..38d5a79d1ae7 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -64,7 +64,7 @@ class SwLabPage : public SfxTabPage
 
 public:
 
-    static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet);
+    static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet);
 
     virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual int  DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE;
@@ -116,7 +116,7 @@ class SwVisitingCardPage : public SfxTabPage
 
 public:
 
-    static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet);
+    static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet);
 
     virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual int  DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE;
@@ -154,7 +154,7 @@ class SwPrivateDataPage : public SfxTabPage
 
 public:
 
-    static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet);
+    static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet);
 
     virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual int  DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE;
@@ -190,7 +190,7 @@ class SwBusinessDataPage : public SfxTabPage
 
 public:
 
-    static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet);
+    static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet);
 
     virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual int  DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE;
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 7b09a0ac465a..eee381038623 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -247,9 +247,9 @@ bool SwFldDBPage::FillItemSet(SfxItemSet* )
 }
 
 SfxTabPage* SwFldDBPage::Create(    Window* pParent,
-                        const SfxItemSet& rAttrSet )
+                        const SfxItemSet* rAttrSet )
 {
-    return ( new SwFldDBPage( pParent, rAttrSet ) );
+    return ( new SwFldDBPage( pParent, *rAttrSet ) );
 }
 
 sal_uInt16 SwFldDBPage::GetGroup()
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index a1de7421bea6..08a7b0b464e3 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -72,7 +72,7 @@ public:
 
                         virtual ~SwFldDBPage();
 
-    static SfxTabPage*  Create(Window* pParent, const SfxItemSet& rAttrSet);
+    static SfxTabPage*  Create(Window* pParent, const SfxItemSet* rAttrSet);
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 256c1d3deb76..3d6aad2d700a 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -451,9 +451,9 @@ bool SwFldDokInfPage::FillItemSet(SfxItemSet* )
 }
 
 SfxTabPage* SwFldDokInfPage::Create(    Window* pParent,
-                        const SfxItemSet& rAttrSet )
+                        const SfxItemSet* rAttrSet )
 {
-    return ( new SwFldDokInfPage( pParent, rAttrSet ) );
+    return ( new SwFldDokInfPage( pParent, *rAttrSet ) );
 }
 
 sal_uInt16 SwFldDokInfPage::GetGroup()
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index 60668fa32063..c80e25492904 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -63,7 +63,7 @@ public:
 
                         virtual ~SwFldDokInfPage();
 
-    static SfxTabPage*  Create(Window* pParent, const SfxItemSet& rAttrSet);
+    static SfxTabPage*  Create(Window* pParent, const SfxItemSet* rAttrSet);
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 2ca5876aad56..abf1b45179c3 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -633,9 +633,9 @@ bool SwFldDokPage::FillItemSet(SfxItemSet* )
 }
 
 SfxTabPage* SwFldDokPage::Create(   Window* pParent,
-                        const SfxItemSet& rAttrSet )
+                        const SfxItemSet* rAttrSet )
 {
-    return ( new SwFldDokPage( pParent, rAttrSet ) );
+    return ( new SwFldDokPage( pParent, *rAttrSet ) );
 }
 
 sal_uInt16 SwFldDokPage::GetGroup()
diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx
index e89d1484d53a..702ebdc5b09c 100644
--- a/sw/source/ui/fldui/flddok.hxx
+++ b/sw/source/ui/fldui/flddok.hxx
@@ -65,7 +65,7 @@ public:
 
                         virtual ~SwFldDokPage();
 
-    static SfxTabPage*  Create(Window* pParent, const SfxItemSet& rAttrSet);
+    static SfxTabPage*  Create(Window* pParent, const SfxItemSet* rAttrSet);
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index c69391281622..794485a51914 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -148,13 +148,13 @@ SfxTabPage* SwFldEditDlg::CreatePage(sal_uInt16 nGroup)
     switch (nGroup)
     {
         case GRP_DOC:
-            pTabPage = SwFldDokPage::Create(get_content_area(), *(SfxItemSet*)0);
+            pTabPage = SwFldDokPage::Create(get_content_area(), 0);
             break;
         case GRP_FKT:
-            pTabPage = SwFldFuncPage::Create(get_content_area(), *(SfxItemSet*)0);
+            pTabPage = SwFldFuncPage::Create(get_content_area(), 0);
             break;
         case GRP_REF:
-            pTabPage = SwFldRefPage::Create(get_content_area(), *(SfxItemSet*)0);
+            pTabPage = SwFldRefPage::Create(get_content_area(), 0);
             break;
         case GRP_REG:
             {
@@ -169,15 +169,15 @@ SfxTabPage* SwFldEditDlg::CreatePage(sal_uInt16 nGroup)
                     xDocProps->getUserDefinedProperties(),
                     uno::UNO_QUERY_THROW);
                 pSet->Put( SfxUnoAnyItem( SID_DOCINFO, uno::makeAny(xUDProps) ) );
-                pTabPage = SwFldDokInfPage::Create(get_content_area(), *pSet);
+                pTabPage = SwFldDokInfPage::Create(get_content_area(), pSet);
                 break;
             }
         case GRP_DB:
-            pTabPage = SwFldDBPage::Create(get_content_area(), *(SfxItemSet*)0);
+            pTabPage = SwFldDBPage::Create(get_content_area(), 0);
             static_cast<SwFldDBPage*>(pTabPage)->SetWrtShell(*pSh);
             break;
         case GRP_VAR:
-            pTabPage = SwFldVarPage::Create(get_content_area(), *(SfxItemSet*)0);
+            pTabPage = SwFldVarPage::Create(get_content_area(), 0);
             break;
 
     }
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 8be5ffed1e84..9b9bb40ce69e 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -598,9 +598,9 @@ OUString SwFldFuncPage::TurnMacroString(const OUString &rMacro)
 }
 
 SfxTabPage* SwFldFuncPage::Create(  Window* pParent,
-                        const SfxItemSet& rAttrSet )
+                        const SfxItemSet* rAttrSet )
 {
-    return ( new SwFldFuncPage( pParent, rAttrSet ) );
+    return ( new SwFldFuncPage( pParent, *rAttrSet ) );
 }
 
 sal_uInt16 SwFldFuncPage::GetGroup()
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index 89c5089f39db..06140a23f7e5 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -87,7 +87,7 @@ public:
 
                         virtual ~SwFldFuncPage();
 
-    static SfxTabPage*  Create(Window* pParent, const SfxItemSet& rAttrSet);
+    static SfxTabPage*  Create(Window* pParent, const SfxItemSet* rAttrSet);
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index 108402c47f8b..cd21a1275f2e 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star;
 
 SwFldPage::SwFldPage(Window *pParent, const OString& rID,
     const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet)
-    : SfxTabPage(pParent, rID, rUIXMLDescription, rAttrSet)
+    : SfxTabPage(pParent, rID, rUIXMLDescription, &rAttrSet)
     , m_pCurFld(0)
     , m_pWrtShell(0)
     , m_nTypeSel(LISTBOX_ENTRY_NOTFOUND)
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index f992ad6e28da..08b822ff9bf2 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -938,9 +938,9 @@ bool SwFldRefPage::FillItemSet(SfxItemSet* )
 }
 
 SfxTabPage* SwFldRefPage::Create(   Window* pParent,
-                        const SfxItemSet& rAttrSet )
+                        const SfxItemSet* rAttrSet )
 {
-    return ( new SwFldRefPage( pParent, rAttrSet ) );
+    return ( new SwFldRefPage( pParent, *rAttrSet ) );
 }
 
 sal_uInt16 SwFldRefPage::GetGroup()
diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx
index 6d736541d244..93f8c75beb0d 100644
--- a/sw/source/ui/fldui/fldref.hxx
+++ b/sw/source/ui/fldui/fldref.hxx
@@ -78,7 +78,7 @@ public:
 
                         virtual ~SwFldRefPage();
 
-    static SfxTabPage*  Create(Window* pParent, const SfxItemSet& rAttrSet);
+    static SfxTabPage*  Create(Window* pParent, const SfxItemSet* rAttrSet);
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 8c32b5a15b37..a017599c51cd 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -1217,9 +1217,9 @@ bool SwFldVarPage::FillItemSet(SfxItemSet* )
 }
 
 SfxTabPage* SwFldVarPage::Create(   Window* pParent,
-                        const SfxItemSet& rAttrSet )
+                        const SfxItemSet* rAttrSet )
 {
-    return ( new SwFldVarPage( pParent, rAttrSet ) );
+    return ( new SwFldVarPage( pParent, *rAttrSet ) );
 }
 
 sal_uInt16 SwFldVarPage::GetGroup()
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index 86fcba3c83af..98ebece0702e 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -94,7 +94,7 @@ public:
 
                         virtual ~SwFldVarPage();
 
-    static SfxTabPage*  Create(Window* pParent, const SfxItemSet& rAttrSet);
+    static SfxTabPage*  Create(Window* pParent, const SfxItemSet* rAttrSet);
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 0e71adf72a2d..ce66d33cc966 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -161,7 +161,7 @@ SwColumnDlg::SwColumnDlg(Window* pParent, SwWrtShell& rSh)
     assert(pColPgSet);
 
     // create TabPage
-    pTabPage = (SwColumnPage*) SwColumnPage::Create(get_content_area(), *pColPgSet);
+    pTabPage = (SwColumnPage*) SwColumnPage::Create(get_content_area(), pColPgSet);
     pTabPage->get<Window>("applytoft")->Show();
     pTabPage->get(m_pApplyToLB, "applytolb");
     m_pApplyToLB->Show();
@@ -394,7 +394,7 @@ void SwColumnPage::ResetColWidth()
 
 // Now as TabPage
 SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet)
-    : SfxTabPage(pParent, "ColumnPage", "modules/swriter/ui/columnpage.ui", rSet)
+    : SfxTabPage(pParent, "ColumnPage", "modules/swriter/ui/columnpage.ui", &rSet)
     , pColMgr(0)
     , nFirstVis(0)
     , nMinWidth(MINLAY)
@@ -622,9 +622,9 @@ void SwColumnPage::Reset(const SfxItemSet *rSet)
 }
 
 // create TabPage
-SfxTabPage* SwColumnPage::Create(Window *pParent, const SfxItemSet &rSet)
+SfxTabPage* SwColumnPage::Create(Window *pParent, const SfxItemSet *rSet)
 {
-    return new SwColumnPage(pParent, rSet);
+    return new SwColumnPage(pParent, *rSet);
 }
 // stuff attributes into the Set when OK
 bool SwColumnPage::FillItemSet(SfxItemSet *rSet)
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 30a986b72362..6ef28119b7b6 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -598,7 +598,7 @@ namespace
 
 SwFrmPage::SwFrmPage(Window *pParent, const SfxItemSet &rSet)
     : SfxTabPage(pParent, "FrmTypePage",
-        "modules/swriter/ui/frmtypepage.ui", rSet)
+        "modules/swriter/ui/frmtypepage.ui", &rSet)
     ,
     bAtHorzPosModified( false ),
     bAtVertPosModified( false ),
@@ -821,9 +821,9 @@ SwFrmPage::~SwFrmPage()
 {
 }
 
-SfxTabPage* SwFrmPage::Create(Window *pParent, const SfxItemSet &rSet)
+SfxTabPage* SwFrmPage::Create(Window *pParent, const SfxItemSet *rSet)
 {
-    return new SwFrmPage( pParent, rSet );
+    return new SwFrmPage( pParent, *rSet );
 }
 
 void SwFrmPage::EnableGraficMode( void )
@@ -2350,7 +2350,7 @@ void SwFrmPage::EnableVerticalPositioning( bool bEnable )
 
 SwGrfExtPage::SwGrfExtPage(Window *pParent, const SfxItemSet &rSet)
     : SfxTabPage(pParent, "PicturePage",
-        "modules/swriter/ui/picturepage.ui", rSet)
+        "modules/swriter/ui/picturepage.ui", &rSet)
     , pGrfDlg(0)
     , bHtmlMode(false)
 {
@@ -2376,9 +2376,9 @@ SwGrfExtPage::~SwGrfExtPage()
     delete pGrfDlg;
 }
 
-SfxTabPage* SwGrfExtPage::Create( Window *pParent, const SfxItemSet &rSet )
+SfxTabPage* SwGrfExtPage::Create( Window *pParent, const SfxItemSet *rSet )
 {
-    return new SwGrfExtPage( pParent, rSet );
+    return new SwGrfExtPage( pParent, *rSet );
 }
 
 void SwGrfExtPage::Reset(const SfxItemSet *rSet)
@@ -2695,7 +2695,7 @@ void BmpWindow::SetBitmapEx(const BitmapEx& rBmp)
 
 // set URL and ImageMap at frames
 SwFrmURLPage::SwFrmURLPage( Window *pParent, const SfxItemSet &rSet ) :
-    SfxTabPage(pParent, "FrmURLPage" , "modules/swriter/ui/frmurlpage.ui", rSet)
+    SfxTabPage(pParent, "FrmURLPage" , "modules/swriter/ui/frmurlpage.ui", &rSet)
 {
     get(pURLED,"url");
     get(pSearchPB,"search");
@@ -2790,9 +2790,9 @@ bool SwFrmURLPage::FillItemSet(SfxItemSet *rSet)
     return bModified;
 }
 
-SfxTabPage* SwFrmURLPage::Create(Window *pParent, const SfxItemSet &rSet)
+SfxTabPage* SwFrmURLPage::Create(Window *pParent, const SfxItemSet *rSet)
 {
-    return new SwFrmURLPage( pParent, rSet );
+    return new SwFrmURLPage( pParent, *rSet );
 }
 
 IMPL_LINK_NOARG(SwFrmURLPage, InsertFileHdl)
@@ -2819,7 +2819,7 @@ IMPL_LINK_NOARG(SwFrmURLPage, InsertFileHdl)
 }
 
 SwFrmAddPage::SwFrmAddPage(Window *pParent, const SfxItemSet &rSet)
-    : SfxTabPage(pParent, "FrmAddPage" , "modules/swriter/ui/frmaddpage.ui", rSet)
+    : SfxTabPage(pParent, "FrmAddPage" , "modules/swriter/ui/frmaddpage.ui", &rSet)
     , pWrtSh(0)
     , bHtmlMode(false)
     , bFormat(false)
@@ -2855,9 +2855,9 @@ SwFrmAddPage::~SwFrmAddPage()
 {
 }
 
-SfxTabPage* SwFrmAddPage::Create(Window *pParent, const SfxItemSet &rSet)
+SfxTabPage* SwFrmAddPage::Create(Window *pParent, const SfxItemSet *rSet)
 {
-    return new SwFrmAddPage(pParent, rSet);
+    return new SwFrmAddPage(pParent, *rSet);
 }
 
 void SwFrmAddPage::Reset(const SfxItemSet *rSet )
diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx
index 6aea64ef33bf..29c1fc276f18 100644
--- a/sw/source/ui/frmdlg/pattern.cxx
+++ b/sw/source/ui/frmdlg/pattern.cxx
@@ -33,7 +33,7 @@ SwBackgroundDlg::SwBackgroundDlg(Window* pParent, const SfxItemSet& rSet)
     ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND );
     if ( fnCreatePage )
     {
-        SetTabPage((*fnCreatePage)(get_content_area(), rSet));
+        SetTabPage((*fnCreatePage)(get_content_area(), &rSet));
     }
 
 }
diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx
index 5ed679f3f570..56f669f4b5b2 100644
--- a/sw/source/ui/frmdlg/uiborder.cxx
+++ b/sw/source/ui/frmdlg/uiborder.cxx
@@ -41,7 +41,7 @@ SwBorderDlg::SwBorderDlg(Window* pParent, SfxItemSet& rSet, sal_uInt16 nType) :
 
     if ( fnCreatePage )
     {
-        SfxTabPage* pNewPage = (*fnCreatePage)( get_content_area(), rSet );
+        SfxTabPage* pNewPage = (*fnCreatePage)( get_content_area(), &rSet );
         SfxAllItemSet aSet(*(rSet.GetPool()));
         aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,nType));
         if(SW_BORDER_MODE_TABLE == nType)
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 397d1910c91d..746d0fed4bd0 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -56,14 +56,14 @@ SwWrapDlg::SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bD
 
 {
     // create TabPage
-    SwWrapTabPage* pNewPage = (SwWrapTabPage*) SwWrapTabPage::Create(get_content_area(), rSet);
+    SwWrapTabPage* pNewPage = (SwWrapTabPage*) SwWrapTabPage::Create(get_content_area(), &rSet);
     pNewPage->SetFormatUsed(false, bDrawMode);
     pNewPage->SetShell(pWrtShell);
     SetTabPage(pNewPage);
 }
 
 SwWrapTabPage::SwWrapTabPage(Window *pParent, const SfxItemSet &rSet)
-    : SfxTabPage(pParent, "WrapPage" , "modules/swriter/ui/wrappage.ui", rSet)
+    : SfxTabPage(pParent, "WrapPage" , "modules/swriter/ui/wrappage.ui", &rSet)
     , nOldLeftMargin(0)
     , nOldRightMargin(0)
     , nOldUpperMargin(0)
@@ -134,9 +134,9 @@ SwWrapTabPage::~SwWrapTabPage()
 {
 }
 
-SfxTabPage* SwWrapTabPage::Create(Window *pParent, const SfxItemSet &rSet)
+SfxTabPage* SwWrapTabPage::Create(Window *pParent, const SfxItemSet *rSet)
 {
-    return new SwWrapTabPage(pParent, rSet);
+    return new SwWrapTabPage(pParent, *rSet);
 }
 
 void SwWrapTabPage::Reset(const SfxItemSet *rSet)
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index c93ffe92e1fc..79268fdcf006 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -768,7 +768,7 @@ IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, PushButton*, pBtn)
 
 SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrSet)
     : SfxTabPage(pParent, "TocIndexPage",
-        "modules/swriter/ui/tocindexpage.ui", rAttrSet)
+        "modules/swriter/ui/tocindexpage.ui", &rAttrSet)
     , aFromNames(SW_RES(RES_SRCTYPES))
     , pIndexRes(0)
     , sAutoMarkType(SW_RESSTR(STR_AUTOMARK_TYPE))
@@ -1247,9 +1247,9 @@ int SwTOXSelectTabPage::DeactivatePage( SfxItemSet* _pSet )
     return LEAVE_PAGE;
 }
 
-SfxTabPage* SwTOXSelectTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet)
+SfxTabPage* SwTOXSelectTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet)
 {
-    return new SwTOXSelectTabPage(pParent, rAttrSet);
+    return new SwTOXSelectTabPage(pParent, *rAttrSet);
 }
 
 IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl,   ListBox*, pBox)
@@ -1724,7 +1724,7 @@ void SwIdxTreeListBox::RequestHelp( const HelpEvent& rHEvt )
 
 SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet)
     : SfxTabPage(pParent, "TocEntriesPage",
-        "modules/swriter/ui/tocentriespage.ui", rAttrSet)
+        "modules/swriter/ui/tocentriespage.ui", &rAttrSet)
     , sDelimStr(SW_RESSTR(STR_DELIM))
     , sNoCharStyle(SW_RESSTR(STR_NO_CHAR_STYLE))
     , sNoCharSortKey(SW_RESSTR(STR_NOSORTKEY))
@@ -2077,9 +2077,9 @@ int SwTOXEntryTabPage::DeactivatePage( SfxItemSet* /*pSet*/)
     return LEAVE_PAGE;
 }
 
-SfxTabPage* SwTOXEntryTabPage::Create( Window* pParent,     const SfxItemSet& rAttrSet)
+SfxTabPage* SwTOXEntryTabPage::Create( Window* pParent,     const SfxItemSet* rAttrSet)
 {
-    return new SwTOXEntryTabPage(pParent, rAttrSet);
+    return new SwTOXEntryTabPage(pParent, *rAttrSet);
 }
 
 IMPL_LINK(SwTOXEntryTabPage, EditStyleHdl, PushButton*, pBtn)
@@ -3484,7 +3484,7 @@ sal_uInt32 SwTokenWindow::GetControlIndex(FormTokenType eType) const
 
 SwTOXStylesTabPage::SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrSet )
     : SfxTabPage(pParent, "TocStylesPage",
-        "modules/swriter/ui/tocstylespage.ui", rAttrSet)
+        "modules/swriter/ui/tocstylespage.ui", &rAttrSet)
     , m_pCurrentForm(0)
 {
     get(m_pLevelLB, "levels");
@@ -3593,9 +3593,9 @@ int SwTOXStylesTabPage::DeactivatePage( SfxItemSet* /*pSet*/  )
 }
 
 SfxTabPage* SwTOXStylesTabPage::Create( Window* pParent,
-                                const SfxItemSet& rAttrSet)
+                                const SfxItemSet* rAttrSet)
 {
-    return new SwTOXStylesTabPage(pParent, rAttrSet);
+    return new SwTOXStylesTabPage(pParent, *rAttrSet);
 }
 
 IMPL_LINK( SwTOXStylesTabPage, EditStyleHdl, Button *, pBtn )
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 4d0a8ff51bf1..f1cc191491ff 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -74,7 +74,7 @@ SwEndNoteOptionPage::SwEndNoteOptionPage(Window *pParent, bool bEN,
     : SfxTabPage(pParent,
         bEN ? OString("EndnotePage") : OString("FootnotePage"),
         bEN ? OUString("modules/swriter/ui/endnotepage.ui") : OUString("modules/swriter/ui/footnotepage.ui"),
-        rSet)
+        &rSet)
     , m_pNumCountBox(NULL)
     , m_pPosFT(NULL)
     , m_pPosPageBox(NULL)
@@ -223,9 +223,9 @@ SwEndNoteOptionPage::~SwEndNoteOptionPage()
 {
 }
 
-SfxTabPage *SwEndNoteOptionPage::Create( Window *pParent, const SfxItemSet &rSet )
+SfxTabPage *SwEndNoteOptionPage::Create( Window *pParent, const SfxItemSet *rSet )
 {
-    return new SwEndNoteOptionPage( pParent, true, rSet );
+    return new SwEndNoteOptionPage( pParent, true, *rSet );
 }
 
 // Different kinds of numbering; because the Listbox has varying numbers of
@@ -399,9 +399,9 @@ SwFootNoteOptionPage::~SwFootNoteOptionPage()
 {
 }
 
-SfxTabPage *SwFootNoteOptionPage::Create(Window *pParent, const SfxItemSet &rSet )
+SfxTabPage *SwFootNoteOptionPage::Create(Window *pParent, const SfxItemSet *rSet )
 {
-    return new SwFootNoteOptionPage( pParent, rSet );
+    return new SwFootNoteOptionPage( pParent, *rSet );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx
index 14f2a2f06e7c..63d227dc41be 100644
--- a/sw/source/ui/misc/impfnote.hxx
+++ b/sw/source/ui/misc/impfnote.hxx
@@ -71,7 +71,7 @@ public:
                          const SfxItemSet &rSet );
     virtual ~SwEndNoteOptionPage();
 
-    static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
+    static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet);
     virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE;
     virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE;
 
@@ -84,7 +84,7 @@ class SwFootNoteOptionPage : public SwEndNoteOptionPage
     virtual ~SwFootNoteOptionPage();
 
 public:
-    static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
+    static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet);
 };
 
 #endif
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index bd05757d7f36..fc4831177d83 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -63,7 +63,7 @@ static bool bLastRelative = false;
 SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent,
                                const SfxItemSet& rSet)
     : SfxTabPage(pParent, "OutlinePositionPage",
-        "modules/swriter/ui/outlinepositionpage.ui", rSet)
+        "modules/swriter/ui/outlinepositionpage.ui", &rSet)
     , pActNum(0)
     , pSaveNum(0)
     , pWrtSh(0)
@@ -513,9 +513,9 @@ void SwNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode()
 }
 
 SfxTabPage* SwNumPositionTabPage::Create( Window* pParent,
-                                const SfxItemSet& rAttrSet)
+                                const SfxItemSet* rAttrSet)
 {
-    return new SwNumPositionTabPage(pParent, rAttrSet);
+    return new SwNumPositionTabPage(pParent, *rAttrSet);
 }
 
 void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh)
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 1fe589e836c6..92e109a7e001 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -405,7 +405,7 @@ short SwOutlineTabDialog::Ok()
 SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent,
     const SfxItemSet& rSet)
     : SfxTabPage(pParent, "OutlineNumberingPage",
-        "modules/swriter/ui/outlinenumberingpage.ui", rSet)
+        "modules/swriter/ui/outlinenumberingpage.ui", &rSet)
     , aNoFmtName(SW_RESSTR(SW_STR_NONE))
     , pSh(NULL)
     , pNumRule(NULL)
@@ -828,9 +828,9 @@ void SwOutlineSettingsTabPage::Reset( const SfxItemSet* rSet )
 }
 
 SfxTabPage* SwOutlineSettingsTabPage::Create( Window* pParent,
-                                const SfxItemSet& rAttrSet)
+                                const SfxItemSet* rAttrSet)
 {
-    return new SwOutlineSettingsTabPage(pParent, rAttrSet);
+    return new SwOutlineSettingsTabPage(pParent, *rAttrSet);
 }
 
 void SwOutlineSettingsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType)
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index a447814121bf..a4b32cbd0111 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -107,7 +107,7 @@ IMPL_LINK_NOARG(SwFootNotePage, LineColorSelected_Impl)
 
 SwFootNotePage::SwFootNotePage(Window *pParent, const SfxItemSet &rSet)
     : SfxTabPage(pParent, "FootnoteAreaPage",
-        "modules/swriter/ui/footnoteareapage.ui", rSet)
+        "modules/swriter/ui/footnoteareapage.ui", &rSet)
     , lMaxHeight(0)
 {
     get(m_pMaxHeightPageBtn, "maxheightpage");
@@ -136,9 +136,9 @@ SwFootNotePage::~SwFootNotePage()
 {
 }
 
-SfxTabPage* SwFootNotePage::Create(Window *pParent, const SfxItemSet &rSet)
+SfxTabPage* SwFootNotePage::Create(Window *pParent, const SfxItemSet *rSet)
 {
-    return new SwFootNotePage(pParent, rSet);
+    return new SwFootNotePage(pParent, *rSet);
 }
 
 void SwFootNotePage::Reset(const SfxItemSet *rSet)
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 452be968e796..130a23df89b3 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -41,7 +41,7 @@
 #include "view.hxx"
 
 SwTextGridPage::SwTextGridPage(Window *pParent, const SfxItemSet &rSet) :
-    SfxTabPage(pParent, "TextGridPage", "modules/swriter/ui/textgridpage.ui", rSet),
+    SfxTabPage(pParent, "TextGridPage", "modules/swriter/ui/textgridpage.ui", &rSet),
     m_nRubyUserValue(0),
     m_bRubyUserValue(false),
     m_aPageSize(MM50, MM50),
@@ -153,9 +153,9 @@ SwTextGridPage::~SwTextGridPage()
 {
 }
 
-SfxTabPage *SwTextGridPage::Create(Window *pParent, const SfxItemSet &rSet)
+SfxTabPage *SwTextGridPage::Create(Window *pParent, const SfxItemSet *rSet)
 {
-    return new SwTextGridPage(pParent, rSet);
+    return new SwTextGridPage(pParent, *rSet);
 }
 
 bool    SwTextGridPage::FillItemSet(SfxItemSet *rSet)
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index aa2bb48264d8..fa6800b3ff53 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -62,7 +62,7 @@
 using namespace ::com::sun::star;
 
 SwFormatTablePage::SwFormatTablePage(Window* pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "FormatTablePage", "modules/swriter/ui/formattablepage.ui", rSet)
+    : SfxTabPage(pParent, "FormatTablePage", "modules/swriter/ui/formattablepage.ui", &rSet)
     , pTblData(0)
     , nSaveWidth(0)
     , nMinTableWidth(MINLAY)
@@ -369,9 +369,9 @@ void  SwFormatTablePage::ModifyHdl(const Edit * pEdit)
 }
 
 SfxTabPage*  SwFormatTablePage::Create( Window* pParent,
-                                   const SfxItemSet& rAttrSet)
+                                   const SfxItemSet* rAttrSet)
 {
-    return new SwFormatTablePage( pParent, rAttrSet );
+    return new SwFormatTablePage( pParent, *rAttrSet );
 }
 
 bool  SwFormatTablePage::FillItemSet( SfxItemSet* rCoreSet )
@@ -711,7 +711,7 @@ int  SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet )
 //Description: Page column configuration
 SwTableColumnPage::SwTableColumnPage(Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "TableColumnPage",
-        "modules/swriter/ui/tablecolumnpage.ui", rSet)
+        "modules/swriter/ui/tablecolumnpage.ui", &rSet)
     , pTblData(0)
     , nTableWidth(0)
     , nMinWidth(MINLAY)
@@ -755,9 +755,9 @@ SwTableColumnPage::SwTableColumnPage(Window* pParent, const SfxItemSet& rSet)
 }
 
 SfxTabPage*   SwTableColumnPage::Create( Window* pParent,
-                                const SfxItemSet& rAttrSet)
+                                const SfxItemSet* rAttrSet)
 {
-    return new SwTableColumnPage( pParent, rAttrSet );
+    return new SwTableColumnPage( pParent, *rAttrSet );
 }
 
 void  SwTableColumnPage::Reset( const SfxItemSet* )
@@ -1245,7 +1245,7 @@ void  SwTableTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
 
 SwTextFlowPage::SwTextFlowPage(Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "TableTextFlowPage",
-        "modules/swriter/ui/tabletextflowpage.ui", rSet)
+        "modules/swriter/ui/tabletextflowpage.ui", &rSet)
     , pShell(0)
     , bPageBreak(true)
     , bHtmlMode(false)
@@ -1316,9 +1316,9 @@ SwTextFlowPage::SwTextFlowPage(Window* pParent, const SfxItemSet& rSet)
 }
 
 SfxTabPage*   SwTextFlowPage::Create( Window* pParent,
-                                const SfxItemSet& rAttrSet)
+                                const SfxItemSet* rAttrSet)
 {
-    return new SwTextFlowPage(pParent, rAttrSet);
+    return new SwTextFlowPage(pParent, *rAttrSet);
 }
 
 bool  SwTextFlowPage::FillItemSet( SfxItemSet* rSet )