i124623 - Dispose extension's Options page to avoid memory leaks

1 files changed, 16 insertions, 0 deletions

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 8928896b9a6d..e8df439ebe3a 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -2679,6 +2679,22 @@ ExtensionsTabPage::~ExtensionsTabPage()
 {
     Hide();
     DeactivatePage();
+
+    if ( m_xPage.is() )
+    {
+        Reference< XComponent > xComponent( m_xPage, UNO_QUERY );
+        if ( xComponent.is() )
+        {
+            try
+            {
+                xComponent->dispose();
+            }
+            catch ( const Exception & )
+            {
+            }
+        }
+        m_xPage.clear();
+    }
 }
 
 // -----------------------------------------------------------------------