diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-04-07 20:16:26 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-04-08 07:11:34 +0000 |
commit | 5f3360957009b5cf05a592443df61a37536a9f1c (patch) | |
tree | fd4228bc249a187d505f782fc966b7e46fa89f5e | |
parent | 753c474b199a9c12f182c89c487133f9fa88e352 (diff) |
SfxTabDialog: rename members missing their prefixes
Change-Id: I6c739d4c64fb0b460e993f2a326a0acfec98b1c7
Reviewed-on: https://gerrit.libreoffice.org/23902
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r-- | dbaccess/source/ui/dlg/UserAdminDlg.cxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/advancedsettings.cxx | 14 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/dbadmin.cxx | 12 | ||||
-rw-r--r-- | include/sfx2/tabdlg.hxx | 26 | ||||
-rw-r--r-- | sfx2/source/dialog/styledlg.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 210 | ||||
-rw-r--r-- | sw/source/ui/envelp/label1.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/fmtui/tmpdlg.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/misc/num.cxx | 2 |
9 files changed, 143 insertions, 143 deletions
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index ec3421f59b1f..a2bf8d096c21 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/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(); } diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index bf9ddb1c4d66..de4f42bc97f4 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/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() diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index b6abd363239e..75f1e40073fc 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/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() diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index c4397fcc1e95..382c250d933a 100644 --- a/include/sfx2/tabdlg.hxx +++ b/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); diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index bd7b1a73faeb..f2cac5859b15 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/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(); } diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 0e0cab947aee..d57d37116d94 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -321,13 +321,13 @@ SfxTabDialog::SfxTabDialog bool bEditFmt // when yes -> additional Button for standard ) : TabDialog(pParent, rID, rUIXMLDescription) - , pSet(pItemSet ? new SfxItemSet(*pItemSet) : nullptr) - , pOutSet(nullptr) - , pRanges(nullptr) - , nAppPageId(USHRT_MAX) - , bItemsReset(false) - , bStandardPushed(false) - , pExampleSet(nullptr) + , m_pSet(pItemSet ? new SfxItemSet(*pItemSet) : nullptr) + , m_pOutSet(nullptr) + , m_pRanges(nullptr) + , m_nAppPageId(USHRT_MAX) + , m_bItemsReset(false) + , m_bStandardPushed(false) + , m_pExampleSet(nullptr) { Init_Impl(bEditFmt); } @@ -342,7 +342,7 @@ void SfxTabDialog::dispose() { SavePosAndId(); - for ( SfxTabDlgData_Impl::const_iterator it = pImpl->aData.begin(); it != pImpl->aData.end(); ++it ) + for ( SfxTabDlgData_Impl::const_iterator it = m_pImpl->aData.begin(); it != m_pImpl->aData.end(); ++it ) { Data_Impl* pDataObject = *it; @@ -374,16 +374,16 @@ void SfxTabDialog::dispose() pDataObject = nullptr; } - delete pImpl; - pImpl = nullptr; - delete pSet; - pSet = nullptr; - delete pOutSet; - pOutSet = nullptr; - delete pExampleSet; - pExampleSet = nullptr; - delete [] pRanges; - pRanges = nullptr; + delete m_pImpl; + m_pImpl = nullptr; + delete m_pSet; + m_pSet = nullptr; + delete m_pOutSet; + m_pOutSet = nullptr; + delete m_pExampleSet; + m_pExampleSet = nullptr; + delete [] m_pRanges; + m_pRanges = nullptr; if (m_bOwnsBaseFmtBtn) m_pBaseFmtBtn.disposeAndClear(); @@ -419,7 +419,7 @@ void SfxTabDialog::Init_Impl(bool bFmtFlag) assert(m_pBox); m_pUIBuilder->get(m_pTabCtrl, "tabcontrol"); - pImpl = new TabDlg_Impl(m_pTabCtrl->GetPageCount()); + m_pImpl = new TabDlg_Impl(m_pTabCtrl->GetPageCount()); m_pActionArea = get_action_area(); assert(m_pActionArea); @@ -446,7 +446,7 @@ void SfxTabDialog::Init_Impl(bool bFmtFlag) if (m_bOwnsResetBtn) m_pResetBtn = VclPtr<PushButton>::Create(m_pActionArea.get()); else - pImpl->bHideResetBtn = !m_pResetBtn->IsVisible(); + m_pImpl->bHideResetBtn = !m_pResetBtn->IsVisible(); m_pBaseFmtBtn = m_pUIBuilder->get<PushButton>("standard"); m_bOwnsBaseFmtBtn = m_pBaseFmtBtn == nullptr; @@ -484,17 +484,17 @@ void SfxTabDialog::Init_Impl(bool bFmtFlag) m_pBaseFmtBtn->Show(); } - if ( pSet ) + if ( m_pSet ) { - pExampleSet = new SfxItemSet( *pSet ); - pOutSet = new SfxItemSet( *pSet->GetPool(), pSet->GetRanges() ); + m_pExampleSet = new SfxItemSet( *m_pSet ); + m_pOutSet = new SfxItemSet( *m_pSet->GetPool(), m_pSet->GetRanges() ); } } void SfxTabDialog::RemoveResetButton() { m_pResetBtn->Hide(); - pImpl->bHideResetBtn = true; + m_pImpl->bHideResetBtn = true; } void SfxTabDialog::RemoveStandardButton() @@ -522,7 +522,7 @@ void SfxTabDialog::StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) void SfxTabDialog::Start() { - pImpl->bModal = false; + m_pImpl->bModal = false; Start_Impl(); Show(); @@ -542,7 +542,7 @@ void SfxTabDialog::SetApplyHandler(const Link<Button*, void>& _rHdl) void SfxTabDialog::Start_Impl() { - assert(pImpl->aData.size() == m_pTabCtrl->GetPageCount() + assert(m_pImpl->aData.size() == m_pTabCtrl->GetPageCount() && "not all pages registered"); sal_uInt16 nActPage = m_pTabCtrl->GetPageId( 0 ); @@ -555,8 +555,8 @@ void SfxTabDialog::Start_Impl() // initial TabPage from Program/Help/config nActPage = (sal_uInt16)aDlgOpt.GetPageID(); - if ( USHRT_MAX != nAppPageId ) - nActPage = nAppPageId; + if ( USHRT_MAX != m_nAppPageId ) + nActPage = m_nAppPageId; else { sal_uInt16 nAutoTabPageId = SfxGetpApp()->Get_Impl()->nAutoTabPageId; @@ -567,8 +567,8 @@ void SfxTabDialog::Start_Impl() if ( TAB_PAGE_NOTFOUND == m_pTabCtrl->GetPagePos( nActPage ) ) nActPage = m_pTabCtrl->GetPageId( 0 ); } - else if ( USHRT_MAX != nAppPageId && TAB_PAGE_NOTFOUND != m_pTabCtrl->GetPagePos( nAppPageId ) ) - nActPage = nAppPageId; + else if ( USHRT_MAX != m_nAppPageId && TAB_PAGE_NOTFOUND != m_pTabCtrl->GetPagePos( m_nAppPageId ) ) + nActPage = m_nAppPageId; m_pTabCtrl->SetCurPageId( nActPage ); ActivatePageHdl( m_pTabCtrl ); @@ -592,7 +592,7 @@ sal_uInt16 SfxTabDialog::AddTabPage ) { sal_uInt16 nId = m_pTabCtrl->GetPageId(rName); - pImpl->aData.push_back( + m_pImpl->aData.push_back( new Data_Impl( nId, pCreateFunc, pRangesFunc, false/*bItemsOnDemand*/ ) ); return nId; } @@ -613,7 +613,7 @@ sal_uInt16 SfxTabDialog::AddTabPage assert(pCreateFunc); GetTabPageRanges pRangesFunc = pFact->GetTabPageRangesFunc(nPageCreateId); sal_uInt16 nPageId = m_pTabCtrl->GetPageId(rName); - pImpl->aData.push_back(new Data_Impl(nPageId, pCreateFunc, pRangesFunc, false)); + m_pImpl->aData.push_back(new Data_Impl(nPageId, pCreateFunc, pRangesFunc, false)); return nPageId; } @@ -637,7 +637,7 @@ void SfxTabDialog::AddTabPage DBG_ASSERT( TAB_PAGE_NOTFOUND == m_pTabCtrl->GetPagePos( nId ), "Double Page-Ids in the Tabpage" ); m_pTabCtrl->InsertPage( nId, rRiderText, nPos ); - pImpl->aData.push_back( + m_pImpl->aData.push_back( new Data_Impl( nId, pCreateFunc, pRangesFunc, false/*bItemsOnDemand*/ ) ); } @@ -651,7 +651,7 @@ void SfxTabDialog::RemoveTabPage( sal_uInt16 nId ) { sal_uInt16 nPos = 0; m_pTabCtrl->RemovePage( nId ); - Data_Impl* pDataObject = Find( pImpl->aData, nId, &nPos ); + Data_Impl* pDataObject = Find( m_pImpl->aData, nId, &nPos ); if ( pDataObject ) { @@ -680,7 +680,7 @@ void SfxTabDialog::RemoveTabPage( sal_uInt16 nId ) } delete pDataObject; - pImpl->aData.erase( pImpl->aData.begin() + nPos ); + m_pImpl->aData.erase( m_pImpl->aData.begin() + nPos ); } else { @@ -720,7 +720,7 @@ SfxItemSet* SfxTabDialog::GetInputSetImpl() */ { - return pSet; + return m_pSet; } @@ -733,7 +733,7 @@ SfxTabPage* SfxTabDialog::GetTabPage( sal_uInt16 nPageId ) const { sal_uInt16 nPos = 0; - Data_Impl* pDataObject = Find( pImpl->aData, nPageId, &nPos ); + Data_Impl* pDataObject = Find( m_pImpl->aData, nPageId, &nPos ); if ( pDataObject ) return pDataObject->pTabPage; @@ -771,16 +771,16 @@ short SfxTabDialog::Ok() { SavePosAndId(); //See fdo#38828 "Apply" resetting window position - if ( !pOutSet ) + if ( !m_pOutSet ) { - if ( !pExampleSet && pSet ) - pOutSet = pSet->Clone( false ); // without Items - else if ( pExampleSet ) - pOutSet = new SfxItemSet( *pExampleSet ); + if ( !m_pExampleSet && m_pSet ) + m_pOutSet = m_pSet->Clone( false ); // without Items + else if ( m_pExampleSet ) + m_pOutSet = new SfxItemSet( *m_pExampleSet ); } bool bModified = false; - for ( SfxTabDlgData_Impl::const_iterator it = pImpl->aData.begin(); it != pImpl->aData.end(); ++it ) + for ( SfxTabDlgData_Impl::const_iterator it = m_pImpl->aData.begin(); it != m_pImpl->aData.end(); ++it ) { Data_Impl* pDataObject = *it; SfxTabPage* pTabPage = pDataObject->pTabPage; @@ -793,25 +793,25 @@ short SfxTabDialog::Ok() rSet.ClearItem(); bModified |= pTabPage->FillItemSet( &rSet ); } - else if ( pSet && !pTabPage->HasExchangeSupport() ) + else if ( m_pSet && !pTabPage->HasExchangeSupport() ) { - SfxItemSet aTmp( *pSet->GetPool(), pSet->GetRanges() ); + SfxItemSet aTmp( *m_pSet->GetPool(), m_pSet->GetRanges() ); if ( pTabPage->FillItemSet( &aTmp ) ) { bModified = true; - if (pExampleSet) - pExampleSet->Put( aTmp ); - pOutSet->Put( aTmp ); + if (m_pExampleSet) + m_pExampleSet->Put( aTmp ); + m_pOutSet->Put( aTmp ); } } } } - if ( pImpl->bModified || ( pOutSet && pOutSet->Count() > 0 ) ) + if ( m_pImpl->bModified || ( m_pOutSet && m_pOutSet->Count() > 0 ) ) bModified = true; - if (bStandardPushed) + if (m_bStandardPushed) bModified = true; return bModified ? RET_OK : RET_CANCEL; } @@ -863,7 +863,7 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, OkHdl, Button*, void) { if (PrepareLeaveCurrentPage()) { - if ( pImpl->bModal ) + if ( m_pImpl->bModal ) EndDialog( Ok() ); else { @@ -902,9 +902,9 @@ bool SfxTabDialog::PrepareLeaveCurrentPage() if ( pPage ) { int nRet = SfxTabPage::LEAVE_PAGE; - if ( pSet ) + if ( m_pSet ) { - SfxItemSet aTmp( *pSet->GetPool(), pSet->GetRanges() ); + SfxItemSet aTmp( *m_pSet->GetPool(), m_pSet->GetRanges() ); if ( pPage->HasExchangeSupport() ) nRet = pPage->DeactivatePage( &aTmp ); @@ -914,8 +914,8 @@ bool SfxTabDialog::PrepareLeaveCurrentPage() if ( ( SfxTabPage::LEAVE_PAGE & nRet ) == SfxTabPage::LEAVE_PAGE && aTmp.Count() ) { - pExampleSet->Put( aTmp ); - pOutSet->Put( aTmp ); + m_pExampleSet->Put( aTmp ); + m_pOutSet->Put( aTmp ); } } else @@ -962,7 +962,7 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, ResetHdl, Button*, void) { const sal_uInt16 nId = m_pTabCtrl->GetCurPageId(); - Data_Impl* pDataObject = Find( pImpl->aData, nId ); + Data_Impl* pDataObject = Find( m_pImpl->aData, nId ); DBG_ASSERT( pDataObject, "Id not known" ); if ( pDataObject->bOnDemand ) @@ -972,7 +972,7 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, ResetHdl, Button*, void) pDataObject->pTabPage->Reset( pItemSet ); } else - pDataObject->pTabPage->Reset( pSet ); + pDataObject->pTabPage->Reset( m_pSet ); } @@ -986,20 +986,20 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, BaseFmtHdl, Button*, void) */ { - bStandardPushed = true; + m_bStandardPushed = true; const sal_uInt16 nId = m_pTabCtrl->GetCurPageId(); - Data_Impl* pDataObject = Find( pImpl->aData, nId ); + Data_Impl* pDataObject = Find( m_pImpl->aData, nId ); DBG_ASSERT( pDataObject, "Id not known" ); if ( pDataObject->fnGetRanges ) { - if ( !pExampleSet ) - pExampleSet = new SfxItemSet( *pSet ); + if ( !m_pExampleSet ) + m_pExampleSet = new SfxItemSet( *m_pSet ); - const SfxItemPool* pPool = pSet->GetPool(); + const SfxItemPool* pPool = m_pSet->GetPool(); const sal_uInt16* pTmpRanges = (pDataObject->fnGetRanges)(); - SfxItemSet aTmpSet( *pExampleSet ); + SfxItemSet aTmpSet( *m_pExampleSet ); while ( *pTmpRanges ) { @@ -1009,11 +1009,11 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, BaseFmtHdl, Button*, void) { // Range which two identical values -> only set one Item sal_uInt16 nWh = pPool->GetWhich( *pTmpRanges ); - pExampleSet->ClearItem( nWh ); + m_pExampleSet->ClearItem( nWh ); aTmpSet.ClearItem( nWh ); // At the Outset of InvalidateItem, // so that the change takes effect - pOutSet->InvalidateItem( nWh ); + m_pOutSet->InvalidateItem( nWh ); } else { @@ -1033,11 +1033,11 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, BaseFmtHdl, Button*, void) { // Iterate over the Range and set the Items sal_uInt16 nWh = pPool->GetWhich( nTmp ); - pExampleSet->ClearItem( nWh ); + m_pExampleSet->ClearItem( nWh ); aTmpSet.ClearItem( nWh ); // At the Outset of InvalidateItem, // so that the change takes effect - pOutSet->InvalidateItem( nWh ); + m_pOutSet->InvalidateItem( nWh ); nTmp++; } } @@ -1066,12 +1066,12 @@ IMPL_LINK_TYPED( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) { sal_uInt16 nId = pTabCtrl->GetCurPageId(); - DBG_ASSERT( pImpl->aData.size(), "no Pages registered" ); + DBG_ASSERT( m_pImpl->aData.size(), "no Pages registered" ); SfxGetpApp(); // Tab Page schon da? VclPtr<SfxTabPage> pTabPage = dynamic_cast<SfxTabPage*> (pTabCtrl->GetTabPage( nId )); - Data_Impl* pDataObject = Find( pImpl->aData, nId ); + Data_Impl* pDataObject = Find( m_pImpl->aData, nId ); //UUUU fallback to 1st page when requested one does not exist if(!pDataObject && pTabCtrl->GetPageCount()) @@ -1079,7 +1079,7 @@ IMPL_LINK_TYPED( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) pTabCtrl->SetCurPageId(pTabCtrl->GetPageId(0)); nId = pTabCtrl->GetCurPageId(); pTabPage = dynamic_cast< SfxTabPage* >(pTabCtrl->GetTabPage(nId)); - pDataObject = Find(pImpl->aData, nId); + pDataObject = Find(m_pImpl->aData, nId); } if (!pDataObject) @@ -1093,12 +1093,12 @@ IMPL_LINK_TYPED( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) { const SfxItemSet* pTmpSet = nullptr; - if ( pSet ) + if ( m_pSet ) { - if ( bItemsReset && pSet->GetParent() ) - pTmpSet = pSet->GetParent(); + if ( m_bItemsReset && m_pSet->GetParent() ) + pTmpSet = m_pSet->GetParent(); else - pTmpSet = pSet; + pTmpSet = m_pSet; } if ( pTmpSet && !pDataObject->bOnDemand ) @@ -1137,18 +1137,18 @@ IMPL_LINK_TYPED( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) if ( pDataObject->bOnDemand ) pTabPage->Reset( &pTabPage->GetItemSet() ); else - pTabPage->Reset( pSet ); + pTabPage->Reset( m_pSet ); pTabCtrl->SetTabPage( nId, pTabPage ); } else if ( pDataObject->bRefresh ) - pTabPage->Reset( pSet ); + pTabPage->Reset( m_pSet ); pDataObject->bRefresh = false; - if ( pExampleSet ) - pTabPage->ActivatePage( *pExampleSet ); + if ( m_pExampleSet ) + pTabPage->ActivatePage( *m_pExampleSet ); - if ( pTabPage->IsReadOnly() || pImpl->bHideResetBtn ) + if ( pTabPage->IsReadOnly() || m_pImpl->bHideResetBtn ) m_pResetBtn->Hide(); else m_pResetBtn->Show(); @@ -1174,7 +1174,7 @@ IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool ) if (!pPage) return false; #ifdef DBG_UTIL - Data_Impl* pDataObject = Find( pImpl->aData, pTabCtrl->GetCurPageId() ); + Data_Impl* pDataObject = Find( m_pImpl->aData, pTabCtrl->GetCurPageId() ); DBG_ASSERT( pDataObject, "no Data structure for current page" ); if ( pPage->HasExchangeSupport() && pDataObject->bOnDemand ) { @@ -1184,12 +1184,12 @@ IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool ) int nRet = SfxTabPage::LEAVE_PAGE; - if ( !pExampleSet && pPage->HasExchangeSupport() && pSet ) - pExampleSet = new SfxItemSet( *pSet->GetPool(), pSet->GetRanges() ); + if ( !m_pExampleSet && pPage->HasExchangeSupport() && m_pSet ) + m_pExampleSet = new SfxItemSet( *m_pSet->GetPool(), m_pSet->GetRanges() ); - if ( pSet ) + if ( m_pSet ) { - SfxItemSet aTmp( *pSet->GetPool(), pSet->GetRanges() ); + SfxItemSet aTmp( *m_pSet->GetPool(), m_pSet->GetRanges() ); if ( pPage->HasExchangeSupport() ) nRet = pPage->DeactivatePage( &aTmp ); @@ -1198,21 +1198,21 @@ IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool ) if ( ( SfxTabPage::LEAVE_PAGE & nRet ) == SfxTabPage::LEAVE_PAGE && aTmp.Count() ) { - pExampleSet->Put( aTmp ); - pOutSet->Put( aTmp ); + m_pExampleSet->Put( aTmp ); + m_pOutSet->Put( aTmp ); } } else { if ( pPage->HasExchangeSupport() ) //!!! { - if ( !pExampleSet ) + if ( !m_pExampleSet ) { SfxItemPool* pPool = pPage->GetItemSet().GetPool(); - pExampleSet = + m_pExampleSet = new SfxItemSet( *pPool, GetInputRanges( *pPool ) ); } - nRet = pPage->DeactivatePage( pExampleSet ); + nRet = pPage->DeactivatePage( m_pExampleSet ); } else nRet = pPage->DeactivatePage( nullptr ); @@ -1223,7 +1223,7 @@ IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool ) RefreshInputSet(); // Flag all Pages as to be initialized as new - for ( SfxTabDlgData_Impl::const_iterator it = pImpl->aData.begin(); it != pImpl->aData.end(); ++it ) + for ( SfxTabDlgData_Impl::const_iterator it = m_pImpl->aData.begin(); it != m_pImpl->aData.end(); ++it ) { Data_Impl* pObj = *it; @@ -1274,17 +1274,17 @@ const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool ) */ { - if ( pSet ) + if ( m_pSet ) { SAL_WARN( "sfx.dialog", "Set already exists!" ); - return pSet->GetRanges(); + return m_pSet->GetRanges(); } - if ( pRanges ) - return pRanges; + if ( m_pRanges ) + return m_pRanges; std::vector<sal_uInt16> aUS; - for ( SfxTabDlgData_Impl::const_iterator it = pImpl->aData.begin(); it != pImpl->aData.end(); ++it ) + for ( SfxTabDlgData_Impl::const_iterator it = m_pImpl->aData.begin(); it != m_pImpl->aData.end(); ++it ) { Data_Impl* pDataObject = *it; @@ -1313,10 +1313,10 @@ const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool ) std::sort( aUS.begin(), aUS.end() ); } - pRanges = new sal_uInt16[aUS.size() + 1]; - std::copy( aUS.begin(), aUS.end(), pRanges ); - pRanges[aUS.size()] = 0; - return pRanges; + m_pRanges = new sal_uInt16[aUS.size() + 1]; + std::copy( aUS.begin(), aUS.end(), m_pRanges ); + m_pRanges[aUS.size()] = 0; + return m_pRanges; } @@ -1328,14 +1328,14 @@ void SfxTabDialog::SetInputSet( const SfxItemSet* pInSet ) */ { - bool bSet = ( pSet != nullptr ); - delete pSet; - pSet = pInSet ? new SfxItemSet(*pInSet) : nullptr; + bool bSet = ( m_pSet != nullptr ); + delete m_pSet; + m_pSet = pInSet ? new SfxItemSet(*pInSet) : nullptr; - if (!bSet && !pExampleSet && !pOutSet && pSet) + if (!bSet && !m_pExampleSet && !m_pOutSet && m_pSet) { - pExampleSet = new SfxItemSet( *pSet ); - pOutSet = new SfxItemSet( *pSet->GetPool(), pSet->GetRanges() ); + m_pExampleSet = new SfxItemSet( *m_pSet ); + m_pOutSet = new SfxItemSet( *m_pSet->GetPool(), m_pSet->GetRanges() ); } } diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 395de1168ee0..9280d67e368e 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/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() diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 2abc0d820384..3e53d6bfa2a6 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/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( diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index ff67892ed4f3..50db6dc257f5 100644 --- a/sw/source/ui/misc/num.cxx +++ b/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; } |