diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 18:36:40 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 18:36:40 +0100 |
commit | cf13f787033a6517877dd38163fdabf1c14e9fbf (patch) | |
tree | 98d35592d02f057fe0682d9a0a0dd9728b0f3b61 /cui/source/options/optopencl.cxx | |
parent | Lots more small re-basing issues fixed. (diff) | |
download | core-cf13f787033a6517877dd38163fdabf1c14e9fbf.tar.gz core-cf13f787033a6517877dd38163fdabf1c14e9fbf.zip |
Lost more cleanup and fixing post re-basing.
Change-Id: Ia5317b93484d31af978a5276bc6697848130225d
Diffstat (limited to 'cui/source/options/optopencl.cxx')
-rw-r--r-- | cui/source/options/optopencl.cxx | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index 9304c364e38f..c98ce9a4a76b 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -113,20 +113,11 @@ void SvxOpenCLTabPage::dispose() delete static_cast<OpenCLConfig::ImplMatcher*>(mpBlackList->GetEntry(i)->GetUserData()); for ( sal_uInt16 i = 0; i < mpWhiteList->GetEntryCount(); ++i ) delete static_cast<OpenCLConfig::ImplMatcher*>(mpWhiteList->GetEntry(i)->GetUserData()); - mpBlackList.disposeAndClear() - mpWhiteList.disposeAndClear() -} + mpBlackList.disposeAndClear(); + mpWhiteList.disposeAndClear(); -SvxOpenCLTabPage::~SvxOpenCLTabPage() -{ - disposeOnce(); -} - -void SvxOpenCLTabPage::dispose() -{ mpUseOpenCL.clear(); mpBlackListFrame.clear(); - mpBlackList.clear(); mpBlackListTable.clear(); mpBlackListEdit.clear(); mpBlackListAdd.clear(); @@ -137,11 +128,11 @@ void SvxOpenCLTabPage::dispose() mpVendor.clear(); mpDrvVersion.clear(); mpWhiteListFrame.clear(); - mpWhiteList.clear(); mpWhiteListTable.clear(); mpWhiteListEdit.clear(); mpWhiteListAdd.clear(); mpWhiteListDelete.clear(); + SfxTabPage::dispose(); } |