diff options
| -rw-r--r-- | cui/source/customize/cfg.cxx | 20 | ||||
| -rw-r--r-- | cui/source/inc/cfg.hxx | 24 |
2 files changed, 22 insertions, 22 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 6c2b3ff30945..aeb08d88615b 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -2594,7 +2594,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog( SvxConfigEntry* pEntry; SvTreeListEntry* pLBEntry; - pEntries = new SvxEntries(); + mpEntries = new SvxEntries(); SvxEntries::const_iterator iter = entries->begin(); while ( iter != entries->end() ) @@ -2603,7 +2603,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog( pLBEntry = m_pMenuListBox->InsertEntry( stripHotKey( pEntry->GetName() ) ); pLBEntry->SetUserData( pEntry ); - pEntries->push_back( pEntry ); + mpEntries->push_back( pEntry ); if ( pEntry == selection ) { @@ -2619,7 +2619,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog( OUString prefix = CUI_RES( RID_SVXSTR_NEW_MENU ); OUString newname = generateCustomName( prefix, entries ); - OUString newurl = generateCustomMenuURL( pEntries ); + OUString newurl = generateCustomMenuURL( mpEntries ); SvxConfigEntry* pNewEntryData = new SvxConfigEntry( newname, newurl, true ); @@ -2632,7 +2632,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog( pNewMenuEntry->SetUserData( pNewEntryData ); - pEntries->push_back( pNewEntryData ); + mpEntries->push_back( pNewEntryData ); m_pMenuNameEdit->SetText( newname ); m_pMenuNameEdit->SetModifyHdl( @@ -2786,25 +2786,25 @@ SvxConfigEntry::SvxConfigEntry( const OUString& rDisplayName, , bIsParentData( bParentData ) , bIsVisible( true ) , nStyle( 0 ) - , pEntries( 0 ) + , mpEntries( 0 ) { if (bPopUp) { - pEntries = new SvxEntries(); + mpEntries = new SvxEntries(); } } SvxConfigEntry::~SvxConfigEntry() { - if ( pEntries != NULL ) + if ( mpEntries != NULL ) { - SvxEntries::const_iterator iter = pEntries->begin(); + SvxEntries::const_iterator iter = mpEntries->begin(); - for ( ; iter != pEntries->end(); ++iter ) + for ( ; iter != mpEntries->end(); ++iter ) { delete *iter; } - delete pEntries; + delete mpEntries; } } diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index ebbff4af7b1f..2079666c9f51 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -214,11 +214,11 @@ class SvxConfigEntry private: /// common properties - sal_uInt16 nId; - OUString aHelpText; - OUString aLabel; - OUString aCommand; - OUString aHelpURL; + sal_uInt16 nId; + OUString aHelpText; + OUString aLabel; + OUString aCommand; + OUString aHelpURL; bool bPopUp; bool bStrEdited; @@ -233,7 +233,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > xBackupGraphic; - SvxEntries *pEntries; + SvxEntries *mpEntries; public: @@ -252,7 +252,7 @@ public: bIsParentData( false ), bIsVisible( true ), nStyle( 0 ), - pEntries( 0 ) + mpEntries( 0 ) {} ~SvxConfigEntry(); @@ -279,9 +279,9 @@ public: bool IsBinding() const { return !bPopUp; } bool IsSeparator() const { return nId == 0; } - SvxEntries* GetEntries() const { return pEntries; } - void SetEntries( SvxEntries* entries ) { pEntries = entries; } - bool HasEntries() const { return pEntries != NULL; } + SvxEntries* GetEntries() const { return mpEntries; } + void SetEntries( SvxEntries* entries ) { mpEntries = entries; } + bool HasEntries() const { return mpEntries != NULL; } void SetMain( bool bValue = true ) { bIsMain = bValue; } bool IsMain() { return bIsMain; } @@ -501,7 +501,7 @@ class SvxMainMenuOrganizerDialog : public ModalDialog PushButton* m_pMoveUpButton; PushButton* m_pMoveDownButton; - SvxEntries* pEntries; + SvxEntries* mpEntries; SvTreeListEntry* pNewMenuEntry; bool bModified; @@ -518,7 +518,7 @@ public: virtual ~SvxMainMenuOrganizerDialog (); - SvxEntries* GetEntries() { return pEntries;} + SvxEntries* GetEntries() { return mpEntries;} void SetEntries( SvxEntries* ); SvxConfigEntry* GetSelectedEntry(); }; |