[Libreoffice-commits] core.git: 2 commits - cui/source

[Caolán McNamara]

 cui/source/options/treeopt.cxx |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit b57f4f2b77cb17cf7c3d5015a426bfb20cc3d48b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 16 13:26:53 2014 +0100

    extensions aren't layout enabled yet
    
    so give them the known final size to work with via a non-layout aware tabpage
    
    Change-Id: Iaae3abfacd78ebc8bcc3ece54ed0603a4b28b9e9

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 7932d89..f6a48c5 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -2179,7 +2179,6 @@ short OfaTreeOptionsDialog::Execute()
 }
 
 // class ExtensionsTabPage -----------------------------------------------
-
 ExtensionsTabPage::ExtensionsTabPage(
     Window* pParent, WinBits nStyle, const OUString& rPageURL,
     const OUString& rEvtHdl, const Reference< awt::XContainerWindowProvider >& rProvider ) :
@@ -2194,8 +2193,6 @@ ExtensionsTabPage::ExtensionsTabPage(
 {
 }
 
-
-
 ExtensionsTabPage::~ExtensionsTabPage()
 {
     Hide();
@@ -2282,8 +2279,6 @@ bool ExtensionsTabPage::DispatchAction( const OUString& rAction )
     return bRet;
 }
 
-
-
 void ExtensionsTabPage::ActivatePage()
 {
     TabPage::ActivatePage();
@@ -2295,7 +2290,7 @@ void ExtensionsTabPage::ActivatePage()
         if ( m_xPage.is() )
         {
             Point aPos = Point();
-            Size aSize = GetSizePixel();
+            Size aSize = GetParent()->get_preferred_size();
             m_xPage->setPosSize( aPos.X() + 1, aPos.Y() + 1,
                                  aSize.Width() - 2, aSize.Height() - 2, awt::PosSize::POSSIZE );
             if ( !m_sEventHdl.isEmpty() )
@@ -2310,8 +2305,6 @@ void ExtensionsTabPage::ActivatePage()
     }
 }
 
-
-
 void ExtensionsTabPage::DeactivatePage()
 {
     TabPage::DeactivatePage();
commit bc05c045c8fcbb8184305cf9b5d03cc5cf14c6a3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 16 13:19:18 2014 +0100

    no need to check for null before delete
    
    Change-Id: Ie8a93a51096471d9d40644741fe3359ee016efe1

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 1b70a81..7932d89 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -577,8 +577,7 @@ OfaTreeOptionsDialog::~OfaTreeOptionsDialog()
                 }
             }
 
-            if( pPageInfo->m_pExtPage )
-                delete pPageInfo->m_pExtPage;
+            delete pPageInfo->m_pExtPage;
 
             delete pPageInfo;
         }