diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-17 08:55:36 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 11:33:58 +0100 |
| commit | e35bc27fdc648ee433c755312fa79263b49f1339 (patch) | |
| tree | bb84b18a4958f85f3da393c68201fe0ead5eb0fd /accessibility | |
| parent | 683cb12163803af2888b17ee4902e319c8bc49b4 (diff) | |
vclwidget: make sure we have an explicit destructor
Change-Id: I50490ad8957e8069e72e855f0f5a3b694218fd6b
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/source/standard/vclxaccessiblebox.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index c5b862623a20..6db5a54fc3f2 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -76,7 +76,7 @@ void VCLXAccessibleBox::ProcessWindowChildEvent( const VclWindowEvent& rVclWindo if (m_aBoxType==COMBOBOX) { VclPtr< ComboBox > pComboBox = GetAs< ComboBox >(); - if ( ( pComboBox != NULL ) && ( pChildWindow != NULL ) ) + if ( ( pComboBox != nullptr ) && ( pChildWindow != NULL ) ) if (pChildWindow == pComboBox->GetSubEdit()) { if (rVclWindowEvent.GetId() == VCLEVENT_WINDOW_SHOW) @@ -328,7 +328,7 @@ Reference<XAccessible> SAL_CALL VCLXAccessibleBox::getAccessibleChild (sal_Int32 if (m_aBoxType==COMBOBOX) { VclPtr< ComboBox > pComboBox = GetAs< ComboBox >(); - if (pComboBox!=NULL && pComboBox->GetSubEdit()!=NULL) + if (pComboBox!=nullptr && pComboBox->GetSubEdit()!=NULL) //Set the edit's acc name the same as parent { pComboBox->GetSubEdit()->SetAccessibleName(getAccessibleName()); @@ -399,7 +399,7 @@ sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex) if (m_aBoxType == COMBOBOX) { VclPtr< ComboBox > pComboBox = GetAs< ComboBox >(); - if (pComboBox != NULL) + if (pComboBox != nullptr) { pComboBox->ToggleDropDown(); bNotify = true; @@ -408,7 +408,7 @@ sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex) else if (m_aBoxType == LISTBOX) { VclPtr< ListBox > pListBox = GetAs< ListBox >(); - if (pListBox != NULL) + if (pListBox != nullptr) { pListBox->ToggleDropDown(); bNotify = true; @@ -533,7 +533,7 @@ void VCLXAccessibleBox::FillAccessibleStateSet( utl::AccessibleStateSetHelper& r OUString sText; sal_Int32 nEntryCount = 0; VclPtr< ComboBox > pComboBox = GetAs< ComboBox >(); - if (pComboBox != NULL) + if (pComboBox != nullptr) { Edit* pSubEdit = pComboBox->GetSubEdit(); if ( pSubEdit) @@ -547,7 +547,7 @@ void VCLXAccessibleBox::FillAccessibleStateSet( utl::AccessibleStateSetHelper& r { sal_Int32 nSelectedEntryCount = 0; VclPtr< ListBox > pListBox = GetAs< ListBox >(); - if (pListBox != NULL && pListBox->GetEntryCount() > 0) + if (pListBox != nullptr && pListBox->GetEntryCount() > 0) { nSelectedEntryCount = pListBox->GetSelectEntryCount(); if ( nSelectedEntryCount == 0) |