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

19 files changed, 110 insertions, 110 deletions

diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 573a8feafa65..00648f52da29 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -278,25 +278,25 @@ namespace dbaui
         OConnectionHelper::fillControls(_rControlList);
     }
 
-    bool OConnectionTabPage::FillItemSet(SfxItemSet& _rSet)
+    bool OConnectionTabPage::FillItemSet(SfxItemSet* _rSet)
     {
         bool bChangedSomething = false;
 
         if (m_aUserName.IsValueChangedFromSaved())
         {
-            _rSet.Put(SfxStringItem(DSID_USER, m_aUserName.GetText()));
-            _rSet.Put(SfxStringItem(DSID_PASSWORD, OUString()));
+            _rSet->Put(SfxStringItem(DSID_USER, m_aUserName.GetText()));
+            _rSet->Put(SfxStringItem(DSID_PASSWORD, OUString()));
             bChangedSomething = true;
         }
 
-        fillBool(_rSet,&m_aPasswordRequired,DSID_PASSWORDREQUIRED,bChangedSomething);
+        fillBool(*_rSet,&m_aPasswordRequired,DSID_PASSWORDREQUIRED,bChangedSomething);
 
         if ( m_pCollection->determineType(m_eType) ==  ::dbaccess::DST_JDBC )
         {
-            fillString(_rSet,&m_aJavaDriver, DSID_JDBCDRIVERCLASS, bChangedSomething);
+            fillString(*_rSet,&m_aJavaDriver, DSID_JDBCDRIVERCLASS, bChangedSomething);
         }
 
-        fillString(_rSet,&m_aConnectionURL, DSID_CONNECTURL, bChangedSomething);
+        fillString(*_rSet,&m_aConnectionURL, DSID_CONNECTURL, bChangedSomething);
 
         return bChangedSomething;
     }
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx
index df10774033f8..8ce9296020dc 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx
@@ -58,7 +58,7 @@ namespace dbaui
 
     public:
         static  SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet );
-        virtual bool        FillItemSet (SfxItemSet& _rCoreAttrs) SAL_OVERRIDE;
+        virtual bool        FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE;
 
         virtual void        implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
 
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index cc25f65f0a51..e775dbcaba86 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -180,10 +180,10 @@ namespace dbaui
         return commitURL();
     }
 
-    bool OConnectionTabPageSetup::FillItemSet(SfxItemSet& _rSet)
+    bool OConnectionTabPageSetup::FillItemSet(SfxItemSet* _rSet)
     {
         bool bChangedSomething = false;
-        fillString(_rSet,&m_aConnectionURL, DSID_CONNECTURL, bChangedSomething);
+        fillString(*_rSet,&m_aConnectionURL, DSID_CONNECTURL, bChangedSomething);
         return bChangedSomething;
     }
     bool OConnectionTabPageSetup::checkTestConnection()
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
index f5aac6ec8400..a7b707fa52f5 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
@@ -51,7 +51,7 @@ namespace dbaui
         static  OGenericAdministrationPage* CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
         static  OGenericAdministrationPage* CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
 
-        virtual bool        FillItemSet (SfxItemSet& _rCoreAttrs) SAL_OVERRIDE;
+        virtual bool        FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE;
 
         virtual void        implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
         virtual bool        commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 853e5cbe60c2..27d5b97134f1 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -116,10 +116,10 @@ using namespace ::com::sun::star;
         m_pTextConnectionHelper->implInitControls(_rSet, bValid);
     }
 
-    bool OTextConnectionPageSetup::FillItemSet( SfxItemSet& _rSet )
+    bool OTextConnectionPageSetup::FillItemSet( SfxItemSet* _rSet )
     {
         bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet);
-        bChangedSomething = m_pTextConnectionHelper->FillItemSet(_rSet, bChangedSomething);
+        bChangedSomething = m_pTextConnectionHelper->FillItemSet(*_rSet, bChangedSomething);
         return bChangedSomething;
     }
 
@@ -156,15 +156,15 @@ using namespace ::com::sun::star;
         FreeResource();
     }
 
-    bool OLDAPConnectionPageSetup::FillItemSet( SfxItemSet& _rSet )
+    bool OLDAPConnectionPageSetup::FillItemSet( SfxItemSet* _rSet )
     {
         bool bChangedSomething = false;
-        fillString(_rSet,&m_aETBaseDN,DSID_CONN_LDAP_BASEDN, bChangedSomething);
-        fillInt32(_rSet,&m_aNFPortNumber,DSID_CONN_LDAP_PORTNUMBER,bChangedSomething);
+        fillString(*_rSet,&m_aETBaseDN,DSID_CONN_LDAP_BASEDN, bChangedSomething);
+        fillInt32(*_rSet,&m_aNFPortNumber,DSID_CONN_LDAP_PORTNUMBER,bChangedSomething);
 
         if ( m_aETHostServer.IsValueChangedFromSaved() )
         {
-            DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem, _rSet.GetItem(DSID_TYPECOLLECTION));
+            DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem, _rSet->GetItem(DSID_TYPECOLLECTION));
             ::dbaccess::ODsnTypeCollection* pCollection = NULL;
             if (pCollectionItem)
                 pCollection = pCollectionItem->getCollection();
@@ -173,12 +173,12 @@ using namespace ::com::sun::star;
             {
                 OUString sUrl = pCollection->getPrefix( OUString("sdbc:address:ldap:"));
                 sUrl += m_aETHostServer.GetText();
-                _rSet.Put(SfxStringItem(DSID_CONNECTURL, sUrl));
+                _rSet->Put(SfxStringItem(DSID_CONNECTURL, sUrl));
                 bChangedSomething = true;
             }
         }
 
-        fillBool(_rSet,&m_aCBUseSSL,DSID_CONN_LDAP_USESSL,bChangedSomething);
+        fillBool(*_rSet,&m_aCBUseSSL,DSID_CONN_LDAP_USESSL,bChangedSomething);
         return bChangedSomething;
     }
     void OLDAPConnectionPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList)
@@ -283,7 +283,7 @@ using namespace ::com::sun::star;
     {
     }
 
-    bool OMySQLIntroPageSetup::FillItemSet(SfxItemSet& /*_rSet*/)
+    bool OMySQLIntroPageSetup::FillItemSet(SfxItemSet* /*_rSet*/)
     {
         OSL_FAIL("Who called me?! Please ask oj for more information.");
         return true;
@@ -331,7 +331,7 @@ using namespace ::com::sun::star;
         m_aMySQLSettings.fillWindows( _rControlList );
     }
 
-    bool MySQLNativeSetupPage::FillItemSet( SfxItemSet& _rSet )
+    bool MySQLNativeSetupPage::FillItemSet( SfxItemSet* _rSet )
     {
         return m_aMySQLSettings.FillItemSet( _rSet );
     }
@@ -441,13 +441,13 @@ using namespace ::com::sun::star;
         _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDriverClass));
     }
 
-    bool OGeneralSpecialJDBCConnectionPageSetup::FillItemSet( SfxItemSet& _rSet )
+    bool OGeneralSpecialJDBCConnectionPageSetup::FillItemSet( SfxItemSet* _rSet )
     {
         bool bChangedSomething = false;
-        fillString(_rSet,&m_aETDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething);
-        fillString(_rSet,&m_aETHostname,DSID_CONN_HOSTNAME,bChangedSomething);
-        fillString(_rSet,&m_aETDatabasename,DSID_DATABASENAME,bChangedSomething);
-        fillInt32(_rSet,&m_aNFPortNumber,m_nPortId,bChangedSomething );
+        fillString(*_rSet,&m_aETDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething);
+        fillString(*_rSet,&m_aETHostname,DSID_CONN_HOSTNAME,bChangedSomething);
+        fillString(*_rSet,&m_aETDatabasename,DSID_DATABASENAME,bChangedSomething);
+        fillInt32(*_rSet,&m_aNFPortNumber,m_nPortId,bChangedSomething );
         return bChangedSomething;
     }
 
@@ -553,10 +553,10 @@ using namespace ::com::sun::star;
         _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDriverClass));
     }
 
-    bool OJDBCConnectionPageSetup::FillItemSet( SfxItemSet& _rSet )
+    bool OJDBCConnectionPageSetup::FillItemSet( SfxItemSet* _rSet )
     {
         bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet);
-        fillString(_rSet,&m_aETDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething);
+        fillString(*_rSet,&m_aETDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething);
         return bChangedSomething;
     }
 
@@ -670,10 +670,10 @@ using namespace ::com::sun::star;
         OConnectionTabPageSetup::implInitControls(_rSet, _bSaveValue);
     }
 
-    bool OSpreadSheetConnectionPageSetup::FillItemSet( SfxItemSet& _rSet )
+    bool OSpreadSheetConnectionPageSetup::FillItemSet( SfxItemSet* _rSet )
     {
         bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet);
-        fillBool(_rSet,&m_aCBPasswordrequired,DSID_PASSWORDREQUIRED,bChangedSomething);
+        fillBool(*_rSet,&m_aCBPasswordrequired,DSID_PASSWORDREQUIRED,bChangedSomething);
         return bChangedSomething;
     }
 
@@ -734,17 +734,17 @@ using namespace ::com::sun::star;
         m_aETUserName.ClearModifyFlag();
     }
 
-    bool OAuthentificationPageSetup::FillItemSet( SfxItemSet& _rSet )
+    bool OAuthentificationPageSetup::FillItemSet( SfxItemSet* _rSet )
     {
         bool bChangedSomething = false;
 
         if (m_aETUserName.IsValueChangedFromSaved())
         {
-            _rSet.Put(SfxStringItem(DSID_USER, m_aETUserName.GetText()));
-            _rSet.Put(SfxStringItem(DSID_PASSWORD, OUString()));
+            _rSet->Put(SfxStringItem(DSID_USER, m_aETUserName.GetText()));
+            _rSet->Put(SfxStringItem(DSID_PASSWORD, OUString()));
             bChangedSomething = true;
         }
-        fillBool(_rSet,&m_aCBPasswordRequired,DSID_PASSWORDREQUIRED,bChangedSomething);
+        fillBool(*_rSet,&m_aCBPasswordRequired,DSID_PASSWORDREQUIRED,bChangedSomething);
         return bChangedSomething;
     }
 
@@ -818,7 +818,7 @@ using namespace ::com::sun::star;
         m_pCBStartTableWizard->Enable(_bSupportsTableCreation);
     }
 
-    bool OFinalDBPageSetup::FillItemSet( SfxItemSet& /*_rSet*/ )
+    bool OFinalDBPageSetup::FillItemSet( SfxItemSet* /*_rSet*/ )
     {
         return true;
     }
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index f903b6824036..a8c3d7c65a5a 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -39,7 +39,7 @@ namespace dbaui
     class OSpreadSheetConnectionPageSetup : public OConnectionTabPageSetup
     {
     public:
-        virtual bool        FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
+        virtual bool        FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
         static  OGenericAdministrationPage* CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
         OSpreadSheetConnectionPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs);
 
@@ -58,7 +58,7 @@ namespace dbaui
     class OTextConnectionPageSetup : public OConnectionTabPageSetup
     {
     public:
-        virtual bool        FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
+        virtual bool        FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
            static   OGenericAdministrationPage* CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
         OTextConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs );
         OTextConnectionHelper*  m_pTextConnectionHelper;
@@ -80,7 +80,7 @@ namespace dbaui
     class OLDAPConnectionPageSetup : public OGenericAdministrationPage
     {
     public:
-        virtual bool        FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
+        virtual bool        FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
         static  OGenericAdministrationPage* CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
         OLDAPConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs );
         virtual Link getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OLDAPConnectionPageSetup, OnEditModified); }
@@ -121,7 +121,7 @@ namespace dbaui
         virtual void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ) SAL_OVERRIDE;
         virtual void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ) SAL_OVERRIDE;
 
-        virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
+        virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
         virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
 
         virtual Link getControlModifiedLink() SAL_OVERRIDE;
@@ -146,7 +146,7 @@ namespace dbaui
     static  OGenericAdministrationPage* CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
 
     protected:
-        virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
+        virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
         virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
         virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
         virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
@@ -181,7 +181,7 @@ namespace dbaui
     protected:
         virtual bool checkTestConnection() SAL_OVERRIDE;
 
-        virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
+        virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
         virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
         virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
         virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
@@ -214,7 +214,7 @@ namespace dbaui
         DECL_LINK(ImplClickHdl, OMySQLIntroPageSetup*);
 
     protected:
-        virtual bool FillItemSet(SfxItemSet& _rSet) SAL_OVERRIDE;
+        virtual bool FillItemSet(SfxItemSet* _rSet) SAL_OVERRIDE;
         virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
         virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
         virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
@@ -236,7 +236,7 @@ namespace dbaui
     class OAuthentificationPageSetup : public OGenericAdministrationPage
     {
     public:
-        virtual bool        FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
+        virtual bool        FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
         static  OGenericAdministrationPage* CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
         OAuthentificationPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs);
 
@@ -259,7 +259,7 @@ namespace dbaui
     class OFinalDBPageSetup : public OGenericAdministrationPage
     {
     public:
-        virtual bool        FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
+        virtual bool        FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
            static   OGenericAdministrationPage* CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet);
 
         FixedText*   m_pFTFinalHeader;
diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index a33958dc4b7f..e87ba7d33df8 100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -192,17 +192,17 @@ namespace dbaui
         _rControlList.push_back( new ODisableWrapper< RadioButton >( &m_aNamedPipeRadio ) );
     }
 
-    bool MySQLNativeSettings::FillItemSet( SfxItemSet& _rSet )
+    bool MySQLNativeSettings::FillItemSet( SfxItemSet* _rSet )
     {
         bool bChangedSomething = false;
 
-        OGenericAdministrationPage::fillString( _rSet, &m_aHostName,     DSID_CONN_HOSTNAME,    bChangedSomething );
-        OGenericAdministrationPage::fillString( _rSet, &m_aDatabaseName, DSID_DATABASENAME,     bChangedSomething );
-        OGenericAdministrationPage::fillInt32 ( _rSet, &m_aPort,         DSID_MYSQL_PORTNUMBER, bChangedSomething );
+        OGenericAdministrationPage::fillString( *_rSet, &m_aHostName,     DSID_CONN_HOSTNAME,    bChangedSomething );
+        OGenericAdministrationPage::fillString( *_rSet, &m_aDatabaseName, DSID_DATABASENAME,     bChangedSomething );
+        OGenericAdministrationPage::fillInt32 ( *_rSet, &m_aPort,         DSID_MYSQL_PORTNUMBER, bChangedSomething );
 #ifdef UNX
-        OGenericAdministrationPage::fillString( _rSet, &m_aSocket,       DSID_CONN_SOCKET,      bChangedSomething );
+        OGenericAdministrationPage::fillString( *_rSet, &m_aSocket,       DSID_CONN_SOCKET,      bChangedSomething );
 #else
-        OGenericAdministrationPage::fillString( _rSet, &m_aNamedPipe,    DSID_NAMED_PIPE,       bChangedSomething );
+        OGenericAdministrationPage::fillString( *_rSet, &m_aNamedPipe,    DSID_NAMED_PIPE,       bChangedSomething );
 #endif
 
         return bChangedSomething;
diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx
index c2621933aca9..8147c9c73faa 100644
--- a/dbaccess/source/ui/dlg/admincontrols.hxx
+++ b/dbaccess/source/ui/dlg/admincontrols.hxx
@@ -58,7 +58,7 @@ namespace dbaui
         void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList );
         void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList );
 
-        bool FillItemSet( SfxItemSet& _rCoreAttrs );
+        bool FillItemSet( SfxItemSet* _rCoreAttrs );
         void implInitControls( const SfxItemSet& _rSet );
 
         bool canAdvance() const;
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 24a66a4d1d54..5f62953bb30d 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -92,7 +92,7 @@ namespace dbaui
         {
             if (!prepareLeave())
                 return KEEP_PAGE;
-            FillItemSet(*_pSet);
+            FillItemSet(_pSet);
         }
 
         return LEAVE_PAGE;
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 288f94377d7f..8ebc9967f92c 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -264,7 +264,7 @@ namespace dbaui
         OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue);
     }
 
-    bool SpecialSettingsPage::FillItemSet( SfxItemSet& _rSet )
+    bool SpecialSettingsPage::FillItemSet( SfxItemSet* _rSet )
     {
         bool bChangedSomething = false;
 
@@ -276,7 +276,7 @@ namespace dbaui
         {
             if ( !*setting->ppControl )
                 continue;
-            fillBool( _rSet, *setting->ppControl, setting->nItemId, bChangedSomething, setting->bInvertedDisplay );
+            fillBool( *_rSet, *setting->ppControl, setting->nItemId, bChangedSomething, setting->bInvertedDisplay );
         }
 
         // the non-boolean items
@@ -284,13 +284,13 @@ namespace dbaui
         {
             if ( m_pBooleanComparisonMode->IsValueChangedFromSaved() )
             {
-                _rSet.Put( SfxInt32Item( DSID_BOOLEANCOMPARISON, m_pBooleanComparisonMode->GetSelectEntryPos() ) );
+                _rSet->Put( SfxInt32Item( DSID_BOOLEANCOMPARISON, m_pBooleanComparisonMode->GetSelectEntryPos() ) );
                 bChangedSomething = true;
             }
         }
         if ( m_bHasMaxRowScan )
         {
-            fillInt32(_rSet,m_pMaxRowScan,DSID_MAX_ROW_SCAN,bChangedSomething);
+            fillInt32(*_rSet,m_pMaxRowScan,DSID_MAX_ROW_SCAN,bChangedSomething);
         }
         return bChangedSomething;
     }
@@ -357,13 +357,13 @@ namespace dbaui
         OGenericAdministrationPage::implInitControls( _rSet, _bSaveValue );
     }
 
-    bool GeneratedValuesPage::FillItemSet(SfxItemSet& _rSet)
+    bool GeneratedValuesPage::FillItemSet(SfxItemSet* _rSet)
     {
         bool bChangedSomething = false;
 
-        fillString( _rSet, m_pAutoIncrement, DSID_AUTOINCREMENTVALUE, bChangedSomething );
-        fillBool( _rSet, m_pAutoRetrievingEnabled, DSID_AUTORETRIEVEENABLED, bChangedSomething );
-        fillString( _rSet, m_pAutoRetrieving, DSID_AUTORETRIEVEVALUE, bChangedSomething );
+        fillString( *_rSet, m_pAutoIncrement, DSID_AUTOINCREMENTVALUE, bChangedSomething );
+        fillBool( *_rSet, m_pAutoRetrievingEnabled, DSID_AUTORETRIEVEENABLED, bChangedSomething );
+        fillString( *_rSet, m_pAutoRetrieving, DSID_AUTORETRIEVEVALUE, bChangedSomething );
 
         return bChangedSomething;
     }
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx
index acb3532b42f9..543d82a3bcbd 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -72,7 +72,7 @@ namespace dbaui
         bool                m_bHasMaxRowScan;
 
     public:
-        virtual bool        FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
+        virtual bool        FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
 
         SpecialSettingsPage(Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta );
 
@@ -108,7 +108,7 @@ namespace dbaui
                     m_aControlDependencies;
 
     public:
-        virtual bool        FillItemSet (SfxItemSet& _rCoreAttrs) SAL_OVERRIDE;
+        virtual bool        FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE;
 
         GeneratedValuesPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
     protected:
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 30779c7ad23b..559e9c373170 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -300,7 +300,7 @@ bool ODbTypeWizDialog::leaveState(WizardState _nState)
 {
     SfxTabPage* pPage = static_cast<SfxTabPage*>(WizardDialog::GetPage(_nState));
     if ( pPage )
-        pPage->FillItemSet(*m_pOutSet);
+        pPage->FillItemSet(m_pOutSet);
     return true;
 }
 
@@ -324,7 +324,7 @@ bool ODbTypeWizDialog::saveDatasource()
 {
     SfxTabPage* pPage = static_cast<SfxTabPage*>(WizardDialog::GetPage(getCurrentState()));
     if ( pPage )
-        pPage->FillItemSet(*m_pOutSet);
+        pPage->FillItemSet(m_pOutSet);
 
     OUString sOldURL;
     if ( m_pImpl->getCurrentDataSource().is() )
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 39a655ba7bcb..b2db57842934 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -642,7 +642,7 @@ bool ODbTypeWizDialogSetup::saveDatasource()
 {
     SfxTabPage* pPage = static_cast<SfxTabPage*>(WizardDialog::GetPage(getCurrentState()));
     if ( pPage )
-        pPage->FillItemSet(*m_pOutSet);
+        pPage->FillItemSet(m_pOutSet);
     return true;
 }
 
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 16b192ef171e..7786afd89990 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -183,18 +183,18 @@ namespace dbaui
         OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue);
     }
 
-    bool OCommonBehaviourTabPage::FillItemSet(SfxItemSet& _rSet)
+    bool OCommonBehaviourTabPage::FillItemSet(SfxItemSet* _rSet)
     {
         bool bChangedSomething = false;
 
         if ((m_nControlFlags & CBTP_USE_OPTIONS) == CBTP_USE_OPTIONS)
         {
-            fillString(_rSet,m_pOptions,DSID_ADDITIONALOPTIONS,bChangedSomething);
+            fillString(*_rSet,m_pOptions,DSID_ADDITIONALOPTIONS,bChangedSomething);
         }
 
         if ((m_nControlFlags & CBTP_USE_CHARSET) == CBTP_USE_CHARSET)
         {
-            if ( m_pCharset->StoreSelectedCharSet( _rSet, DSID_CHARSET ) )
+            if ( m_pCharset->StoreSelectedCharSet( *_rSet, DSID_CHARSET ) )
                 bChangedSomething = true;
         }
 
@@ -266,11 +266,11 @@ namespace dbaui
         OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue);
     }
 
-    bool ODbaseDetailsPage::FillItemSet( SfxItemSet& _rSet )
+    bool ODbaseDetailsPage::FillItemSet( SfxItemSet* _rSet )
     {
         bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet);
 
-        fillBool(_rSet,&m_aShowDeleted,DSID_SHOWDELETEDROWS,bChangedSomething);
+        fillBool(*_rSet,&m_aShowDeleted,DSID_SHOWDELETEDROWS,bChangedSomething);
         return bChangedSomething;
     }
 
@@ -330,10 +330,10 @@ namespace dbaui
         return ( new OOdbcDetailsPage( pParent, _rAttrSet ) );
     }
 
-    bool OOdbcDetailsPage::FillItemSet( SfxItemSet& _rSet )
+    bool OOdbcDetailsPage::FillItemSet( SfxItemSet* _rSet )
     {
         bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet);
-        fillBool(_rSet,&m_aUseCatalog,DSID_USECATALOG,bChangedSomething);
+        fillBool(*_rSet,&m_aUseCatalog,DSID_USECATALOG,bChangedSomething);
         return bChangedSomething;
     }
     void OOdbcDetailsPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList)
@@ -378,13 +378,13 @@ namespace dbaui
         return ( new OUserDriverDetailsPage( pParent, _rAttrSet ) );
     }
 
-    bool OUserDriverDetailsPage::FillItemSet( SfxItemSet& _rSet )
+    bool OUserDriverDetailsPage::FillItemSet( SfxItemSet* _rSet )
     {
         bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet);
 
-        fillInt32(_rSet,&m_aNFPortNumber,DSID_CONN_PORTNUMBER,bChangedSomething);
-        fillString(_rSet,&m_aEDHostname,DSID_CONN_HOSTNAME,bChangedSomething);
-        fillBool(_rSet,&m_aUseCatalog,DSID_USECATALOG,bChangedSomething);
+        fillInt32(*_rSet,&m_aNFPortNumber,DSID_CONN_PORTNUMBER,bChangedSomething);
+        fillString(*_rSet,&m_aEDHostname,DSID_CONN_HOSTNAME,bChangedSomething);
+        fillBool(*_rSet,&m_aUseCatalog,DSID_USECATALOG,bChangedSomething);
 
         return bChangedSomething;
     }
@@ -511,14 +511,14 @@ namespace dbaui
         _rControlList.push_back(new ODisableWrapper<FixedLine>(&m_aFL_1));
     }
 
-    bool OGeneralSpecialJDBCDetailsPage::FillItemSet( SfxItemSet& _rSet )
+    bool OGeneralSpecialJDBCDetailsPage::FillItemSet( SfxItemSet* _rSet )
     {
         bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet);
         if ( m_bUseClass )
-            fillString(_rSet,&m_aEDDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething);
-        fillString(_rSet,&m_aEDHostname,DSID_CONN_HOSTNAME,bChangedSomething);
-        fillString(_rSet,&m_aEDSocket,DSID_CONN_SOCKET,bChangedSomething);
-        fillInt32(_rSet,&m_aNFPortNumber,m_nPortId,bChangedSomething );
+            fillString(*_rSet,&m_aEDDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething);
+        fillString(*_rSet,&m_aEDHostname,DSID_CONN_HOSTNAME,bChangedSomething);
+        fillString(*_rSet,&m_aEDSocket,DSID_CONN_SOCKET,bChangedSomething);
+        fillInt32(*_rSet,&m_aNFPortNumber,m_nPortId,bChangedSomething );
 
         return bChangedSomething;
     }
@@ -638,7 +638,7 @@ namespace dbaui
         _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aUserNameLabel));
     }
 
-    bool MySQLNativePage::FillItemSet( SfxItemSet& _rSet )
+    bool MySQLNativePage::FillItemSet( SfxItemSet* _rSet )
     {
         bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet( _rSet );
 
@@ -646,11 +646,11 @@ namespace dbaui
 
         if ( m_aUserName.IsValueChangedFromSaved() )
         {
-            _rSet.Put( SfxStringItem( DSID_USER, m_aUserName.GetText() ) );
-            _rSet.Put( SfxStringItem( DSID_PASSWORD, OUString()));
+            _rSet->Put( SfxStringItem( DSID_USER, m_aUserName.GetText() ) );
+            _rSet->Put( SfxStringItem( DSID_PASSWORD, OUString()));
             bChangedSomething = true;
         }
-        fillBool(_rSet,&m_aPasswordRequired,DSID_PASSWORDREQUIRED,bChangedSomething);
+        fillBool(*_rSet,&m_aPasswordRequired,DSID_PASSWORDREQUIRED,bChangedSomething);
 
         return bChangedSomething;
     }
@@ -718,14 +718,14 @@ namespace dbaui
         return ( new OLDAPDetailsPage( pParent, _rAttrSet ) );
     }
 
-    bool OLDAPDetailsPage::FillItemSet( SfxItemSet& _rSet )
+    bool OLDAPDetailsPage::FillItemSet( SfxItemSet* _rSet )
     {
         bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet);
 
-        fillString(_rSet,&m_aETBaseDN,DSID_CONN_LDAP_BASEDN,bChangedSomething);
-        fillInt32(_rSet,&m_aNFPortNumber,DSID_CONN_LDAP_PORTNUMBER,bChangedSomething);
-        fillInt32(_rSet,&m_aNFRowCount,DSID_CONN_LDAP_ROWCOUNT,bChangedSomething);
-        fillBool(_rSet,&m_aCBUseSSL,DSID_CONN_LDAP_USESSL,bChangedSomething);
+        fillString(*_rSet,&m_aETBaseDN,DSID_CONN_LDAP_BASEDN,bChangedSomething);
+        fillInt32(*_rSet,&m_aNFPortNumber,DSID_CONN_LDAP_PORTNUMBER,bChangedSomething);
+        fillInt32(*_rSet,&m_aNFRowCount,DSID_CONN_LDAP_ROWCOUNT,bChangedSomething);
+        fillBool(*_rSet,&m_aCBUseSSL,DSID_CONN_LDAP_USESSL,bChangedSomething);
         return bChangedSomething;
     }
     IMPL_LINK( OLDAPDetailsPage, OnCheckBoxClick, CheckBox*, pCheckBox )
@@ -826,10 +826,10 @@ namespace dbaui
         OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue);
     }
 
-    bool OTextDetailsPage::FillItemSet( SfxItemSet& rSet )
+    bool OTextDetailsPage::FillItemSet( SfxItemSet* rSet )
     {
         bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(rSet);
-        bChangedSomething = m_pTextConnectionHelper->FillItemSet(rSet, bChangedSomething);
+        bChangedSomething = m_pTextConnectionHelper->FillItemSet(*rSet, bChangedSomething);
         return bChangedSomething;
     }
 
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index 1b0b5c9f76ae..bf74cd6a03a4 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -67,7 +67,7 @@ namespace dbaui
         sal_uInt32          m_nControlFlags;
 
     public:
-        virtual bool        FillItemSet (SfxItemSet& _rCoreAttrs) SAL_OVERRIDE;
+        virtual bool        FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE;
 
         // nControlFlags is a combination of the CBTP_xxx-constants
         OCommonBehaviourTabPage(Window* pParent, sal_uInt16 nResId, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags,bool _bFreeResource = true);
@@ -89,7 +89,7 @@ namespace dbaui
     class ODbaseDetailsPage : public OCommonBehaviourTabPage
     {
     public:
-        virtual bool        FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
+        virtual bool        FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
 
         ODbaseDetailsPage(Window* pParent, const SfxItemSet& _rCoreAttrs);
     private:
@@ -128,7 +128,7 @@ namespace dbaui
     class OOdbcDetailsPage : public OCommonBehaviourTabPage
     {
     public:
-        virtual bool        FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
+        virtual bool        FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
 
         OOdbcDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
     protected:
@@ -144,7 +144,7 @@ namespace dbaui
     class OUserDriverDetailsPage : public OCommonBehaviourTabPage
     {
     public:
-        virtual bool        FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
+        virtual bool        FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
 
         OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
     protected:
@@ -178,7 +178,7 @@ namespace dbaui
 
     protected:
 
-        virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
+        virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
         virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
         virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
         virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
@@ -220,7 +220,7 @@ namespace dbaui
         CheckBox            m_aPasswordRequired;
 
     protected:
-        virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
+        virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
         virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
         virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
         virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
@@ -230,7 +230,7 @@ namespace dbaui
     class OLDAPDetailsPage : public OCommonBehaviourTabPage
     {
     public:
-        virtual bool        FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
+        virtual bool        FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
 
         OLDAPDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
     protected:
@@ -266,7 +266,7 @@ namespace dbaui
     class OTextDetailsPage : public OCommonBehaviourTabPage
     {
     public:
-        virtual bool        FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
+        virtual bool        FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
 
         OTextDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
         OTextConnectionHelper*  m_pTextConnectionHelper;
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 5f5ba276c58f..b4b24832b61c 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -466,7 +466,7 @@ namespace dbaui
         m_pDatasourceType->Enable( bValid );
     }
 
-    bool OGeneralPageDialog::FillItemSet( SfxItemSet& _rCoreAttrs )
+    bool OGeneralPageDialog::FillItemSet( SfxItemSet* _rCoreAttrs )
     {
         bool bChangedSomething = false;
 
@@ -475,7 +475,7 @@ namespace dbaui
 
         if ( m_pDatasourceType->IsValueChangedFromSaved() )
         {
-            _rCoreAttrs.Put( SfxStringItem( DSID_CONNECTURL, sURLPrefix ) );
+            _rCoreAttrs->Put( SfxStringItem( DSID_CONNECTURL, sURLPrefix ) );
             bChangedSomething = true;
         }
 
@@ -626,7 +626,7 @@ namespace dbaui
         return OGeneralPage::approveDatasourceType( eType, _inout_rDisplayName );
     }
 
-    bool OGeneralPageWizard::FillItemSet(SfxItemSet& _rCoreAttrs)
+    bool OGeneralPageWizard::FillItemSet(SfxItemSet* _rCoreAttrs)
     {
         bool bChangedSomething = false;
 
@@ -634,7 +634,7 @@ namespace dbaui
 
         if ( m_pRB_CreateDatabase->IsChecked() )
         {
-            _rCoreAttrs.Put( SfxStringItem( DSID_CONNECTURL, OUString( "sdbc:dbase:" ) ) );
+            _rCoreAttrs->Put( SfxStringItem( DSID_CONNECTURL, OUString( "sdbc:dbase:" ) ) );
             bChangedSomething = true;
             bCommitTypeSelection = false;
         }
@@ -656,7 +656,7 @@ namespace dbaui
                 || ( GetDatabaseCreationMode() != m_eOriginalCreationMode )
                 )
             {
-                _rCoreAttrs.Put( SfxStringItem( DSID_CONNECTURL,sURLPrefix ) );
+                _rCoreAttrs->Put( SfxStringItem( DSID_CONNECTURL,sURLPrefix ) );
                 bChangedSomething = true;
             }
             else
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index dd54e145788d..48f5b6d01741 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -105,7 +105,7 @@ namespace dbaui
         OGeneralPageDialog( Window* pParent, const SfxItemSet& _rItems );
 
     protected:
-        virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
+        virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
 
         virtual void implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) SAL_OVERRIDE;
         virtual void setParentTitle( const OUString& _sURLPrefix ) SAL_OVERRIDE;
@@ -170,7 +170,7 @@ namespace dbaui
         DocumentDescriptor      GetSelectedDocument() const;
 
     protected:
-        virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE;
+        virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
 
         virtual void GetFocus() SAL_OVERRIDE;
 
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index 9f1a4a77b530..a4b2860a9b93 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -546,10 +546,10 @@ namespace dbaui
         return pReturn;
     }
 
-    bool OTableSubscriptionPage::FillItemSet( SfxItemSet& _rCoreAttrs )
+    bool OTableSubscriptionPage::FillItemSet( SfxItemSet* _rCoreAttrs )
     {
         bool bValid, bReadonly;
-        getFlags(_rCoreAttrs, bValid, bReadonly);
+        getFlags(*_rCoreAttrs, bValid, bReadonly);
 
         if (!bValid || bReadonly)
             // don't store anything if the data we're working with is invalid or readonly
@@ -568,7 +568,7 @@ namespace dbaui
             {
                 aTableFilter = collectDetailedSelection();
             }
-            _rCoreAttrs.Put( OStringListItem(DSID_TABLEFILTER, aTableFilter) );
+            _rCoreAttrs->Put( OStringListItem(DSID_TABLEFILTER, aTableFilter) );
         }
 
         return true;
diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx
index b0cc2885dc90..acfeaa45834f 100644
--- a/dbaccess/source/ui/dlg/tablespage.hxx
+++ b/dbaccess/source/ui/dlg/tablespage.hxx
@@ -51,7 +51,7 @@ namespace dbaui
         OTableSubscriptionDialog* m_pTablesDlg;
 
     public:
-        virtual bool            FillItemSet(SfxItemSet& _rCoreAttrs) SAL_OVERRIDE;
+        virtual bool            FillItemSet(SfxItemSet* _rCoreAttrs) SAL_OVERRIDE;
         virtual int             DeactivatePage(SfxItemSet* _pSet) SAL_OVERRIDE;
         using OGenericAdministrationPage::DeactivatePage;