SfxTabDialog: rename members missing their prefixes

Change-Id: I6c739d4c64fb0b460e993f2a326a0acfec98b1c7
Reviewed-on: https://gerrit.libreoffice.org/23902Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

dbaccess/source/ui/dlg/UserAdminDlg.cxx

@@ -62,8 +62,8 @@ namespace dbaui
         m_pImpl->translateProperties(xDatasource, *_pItems);
         SetInputSet(_pItems);
         // propagate this set as our new input set and reset the example set
-        delete pExampleSet;
-        pExampleSet = new SfxItemSet(*GetInputSetImpl());
+        delete m_pExampleSet;
+        m_pExampleSet = new SfxItemSet(*GetInputSetImpl());
 
         AddTabPage("settings", OUserAdmin::Create, nullptr);
 
@@ -90,7 +90,7 @@ namespace dbaui
         }
 
         SetInputSet(nullptr);
-        DELETEZ(pExampleSet);
+        DELETEZ(m_pExampleSet);
         SfxTabDialog::dispose();
     }
 

dbaccess/source/ui/dlg/advancedsettings.cxx

@@ -425,8 +425,8 @@ namespace dbaui
         m_pImpl->translateProperties(xDatasource, *_pItems);
         SetInputSet(_pItems);
         // propagate this set as our new input set and reset the example set
-        delete pExampleSet;
-        pExampleSet = new SfxItemSet(*GetInputSetImpl());
+        delete m_pExampleSet;
+        m_pExampleSet = new SfxItemSet(*GetInputSetImpl());
 
         const OUString eType = dbaui::ODbDataSourceAdministrationHelper::getDatasourceType(*_pItems);
 
@@ -457,7 +457,7 @@ namespace dbaui
     void AdvancedSettingsDialog::dispose()
     {
         SetInputSet(nullptr);
-        DELETEZ(pExampleSet);
+        DELETEZ(m_pExampleSet);
         SfxTabDialog::dispose();
     }
 
@@ -475,8 +475,8 @@ namespace dbaui
         short nRet = SfxTabDialog::Execute();
         if ( nRet == RET_OK )
         {
-            pExampleSet->Put(*GetOutputItemSet());
-            m_pImpl->saveChanges(*pExampleSet);
+            m_pExampleSet->Put(*GetOutputItemSet());
+            m_pImpl->saveChanges(*m_pExampleSet);
         }
         return nRet;
     }
@@ -496,12 +496,12 @@ namespace dbaui
 
     const SfxItemSet* AdvancedSettingsDialog::getOutputSet() const
     {
-        return pExampleSet;
+        return m_pExampleSet;
     }
 
     SfxItemSet* AdvancedSettingsDialog::getWriteOutputSet()
     {
-        return pExampleSet;
+        return m_pExampleSet;
     }
 
     ::std::pair< Reference< XConnection >, sal_Bool > AdvancedSettingsDialog::createConnection()

dbaccess/source/ui/dlg/dbadmin.cxx

@@ -72,7 +72,7 @@ ODbAdminDialog::~ODbAdminDialog()
 void ODbAdminDialog::dispose()
 {
     SetInputSet(nullptr);
-    DELETEZ(pExampleSet);
+    DELETEZ(m_pExampleSet);
     SfxTabDialog::dispose();
 }
 
@@ -195,14 +195,14 @@ void ODbAdminDialog::impl_resetPages(const Reference< XPropertySet >& _rxDatasou
     m_pImpl->translateProperties(_rxDatasource, *GetInputSetImpl());
 
     // reset the example set
-    delete pExampleSet;
-    pExampleSet = new SfxItemSet(*GetInputSetImpl());
+    delete m_pExampleSet;
+    m_pExampleSet = new SfxItemSet(*GetInputSetImpl());
 
     // special case: MySQL Native does not have the generic "advanced" page
 
     const DbuTypeCollectionItem& rCollectionItem = dynamic_cast<const DbuTypeCollectionItem&>(*getOutputSet()->GetItem(DSID_TYPECOLLECTION));
     ::dbaccess::ODsnTypeCollection* pCollection = rCollectionItem.getCollection();
-    if ( pCollection->determineType(getDatasourceType( *pExampleSet )) == ::dbaccess::DST_MYSQL_NATIVE )
+    if ( pCollection->determineType(getDatasourceType( *m_pExampleSet )) == ::dbaccess::DST_MYSQL_NATIVE )
     {
         AddTabPage( PAGE_MYSQL_NATIVE, OUString( ModuleRes( STR_PAGETITLE_CONNECTION ) ), ODriversSettings::CreateMySQLNATIVE, nullptr );
         RemoveTabPage("advanced");
@@ -241,7 +241,7 @@ ODbAdminDialog::ApplyResult ODbAdminDialog::implApplyChanges()
         return AR_KEEP;
     }
 
-    if ( !m_pImpl->saveChanges(*pExampleSet) )
+    if ( !m_pImpl->saveChanges(*m_pExampleSet) )
         return AR_KEEP;
 
     if ( isUIEnabled() )
@@ -267,7 +267,7 @@ const SfxItemSet* ODbAdminDialog::getOutputSet() const
 
 SfxItemSet* ODbAdminDialog::getWriteOutputSet()
 {
-    return pExampleSet;
+    return m_pExampleSet;
 }
 
 ::std::pair< Reference<XConnection>,sal_Bool> ODbAdminDialog::createConnection()

include/sfx2/tabdlg.hxx

@@ -78,13 +78,13 @@ friend class SfxTabDialogController;
     bool m_bOwnsResetBtn;
     bool m_bOwnsBaseFmtBtn;
 
-    SfxItemSet*         pSet;
-    SfxItemSet*         pOutSet;
-    TabDlg_Impl*        pImpl;
-    sal_uInt16*         pRanges;
-    sal_uInt16          nAppPageId;
-    bool                bItemsReset;
-    bool                bStandardPushed;
+    SfxItemSet*         m_pSet;
+    SfxItemSet*         m_pOutSet;
+    TabDlg_Impl*        m_pImpl;
+    sal_uInt16*         m_pRanges;
+    sal_uInt16          m_nAppPageId;
+    bool                m_bItemsReset;
+    bool                m_bStandardPushed;
 
     DECL_DLLPRIVATE_LINK_TYPED(ActivatePageHdl, TabControl*, void );
     DECL_DLLPRIVATE_LINK_TYPED(DeactivatePageHdl, TabControl*, bool );
@@ -104,7 +104,7 @@ protected:
     virtual void                PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
 
     VclPtr<VclButtonBox>   m_pActionArea;
-    SfxItemSet*     pExampleSet;
+    SfxItemSet*     m_pExampleSet;
     SfxItemSet*     GetInputSetImpl();
     SfxTabPage*     GetTabPage( sal_uInt16 nPageId ) const;
 
@@ -146,11 +146,11 @@ public:
 
     void                SetCurPageId(sal_uInt16 nId)
     {
-        nAppPageId = nId;
+        m_nAppPageId = nId;
     }
     void                SetCurPageId(const OString& rName)
     {
-        nAppPageId = m_pTabCtrl->GetPageId(rName);
+        m_nAppPageId = m_pTabCtrl->GetPageId(rName);
     }
     sal_uInt16          GetCurPageId() const
     {
@@ -172,7 +172,7 @@ public:
     // may provide local slots converted by Map
     const sal_uInt16*       GetInputRanges( const SfxItemPool& );
     void                SetInputSet( const SfxItemSet* pInSet );
-    const SfxItemSet*   GetOutputItemSet() const { return pOutSet; }
+    const SfxItemSet*   GetOutputItemSet() const { return m_pOutSet; }
 
     const PushButton&   GetOKButton() const { return *m_pOKBtn; }
     PushButton&         GetOKButton() { return *m_pOKBtn; }
@@ -188,8 +188,8 @@ public:
     void                StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) override;
     void                Start();
 
-    const SfxItemSet*   GetExampleSet() const { return pExampleSet; }
-    SfxItemSet*         GetExampleSet() { return pExampleSet; }
+    const SfxItemSet*   GetExampleSet() const { return m_pExampleSet; }
+    SfxItemSet*         GetExampleSet() { return m_pExampleSet; }
 
     void                SetApplyHandler(const Link<Button*,void>& _rHdl);
 

sfx2/source/dialog/styledlg.cxx

@@ -62,8 +62,8 @@ SfxStyleDialog::SfxStyleDialog
         OUString sTxt = GetText() + ": " + rStyle.GetName();
         SetText( sTxt );
     }
-    delete pExampleSet; // in SfxTabDialog::Ctor() already created
-    pExampleSet = &pStyle->GetItemSet();
+    delete m_pExampleSet; // in SfxTabDialog::Ctor() already created
+    m_pExampleSet = &pStyle->GetItemSet();
 
     GetCancelButton().SetClickHdl( LINK(this, SfxStyleDialog, CancelHdl) );
 }
@@ -82,7 +82,7 @@ SfxStyleDialog::~SfxStyleDialog()
 
 void SfxStyleDialog::dispose()
 {
-    pExampleSet = nullptr;
+    m_pExampleSet = nullptr;
     pStyle = nullptr;
     SfxTabDialog::dispose();
 }
@@ -134,9 +134,9 @@ IMPL_LINK_NOARG_TYPED( SfxStyleDialog, CancelHdl, Button *, void )
         SfxItemState eState = pInSet->GetItemState( nWhich, false );
 
         if ( SfxItemState::DEFAULT == eState )
-            pExampleSet->ClearItem( nWhich );
+            m_pExampleSet->ClearItem( nWhich );
         else
-            pExampleSet->Put( pInSet->Get( nWhich ) );
+            m_pExampleSet->Put( pInSet->Get( nWhich ) );
         nWhich = aIter.NextWhich();
     }
 

sw/source/ui/envelp/label1.cxx

@@ -162,8 +162,8 @@ SwLabDlg::SwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet,
     if ( !aMakes.empty() )
         _ReplaceGroup( aMakes[nLstGroup] );
 
-    if (pExampleSet)
-        pExampleSet->Put(aItem);
+    if (m_pExampleSet)
+        m_pExampleSet->Put(aItem);
 }
 
 SwLabDlg::~SwLabDlg()

sw/source/ui/fmtui/tmpdlg.cxx

@@ -334,7 +334,7 @@ short SwTemplateDlg::Ok()
     if( RET_OK == nRet )
     {
         const SfxPoolItem *pOutItem, *pExItem;
-        if( SfxItemState::SET == pExampleSet->GetItemState(
+        if( SfxItemState::SET == m_pExampleSet->GetItemState(
             SID_ATTR_NUMBERING_RULE, false, &pExItem ) &&
             ( !GetOutputItemSet() ||
             SfxItemState::SET != GetOutputItemSet()->GetItemState(

sw/source/ui/misc/num.cxx

@@ -1025,7 +1025,7 @@ void SwSvxNumBulletTabDialog::PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage)
 short  SwSvxNumBulletTabDialog::Ok()
 {
     short nRet = SfxTabDialog::Ok();
-    pExampleSet->ClearItem(SID_PARAM_NUM_PRESET);
+    m_pExampleSet->ClearItem(SID_PARAM_NUM_PRESET);
     return nRet;
 }