[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - extensions/source

Caolán McNamara caolanm at redhat.com
Thu Apr 9 05:27:14 PDT 2015


 extensions/source/bibliography/bibview.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 81cb36b2678f41240829de10a0783a3040f8ec85
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Apr 9 12:16:55 2015 +0100

    Resolves: tdf#90473 bibliography doesn't resize after reload
    
    resize *after* setting visibility of controls and not before
    
    Change-Id: I9318b8a5bc1f4afc6f4ceb4503af3425d0f6364b
    (cherry picked from commit 1ad3ed20071c81e031c1ed7f546c37fd280803c0)
    Reviewed-on: https://gerrit.libreoffice.org/15212
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx
index 64929b2..2d715d0 100644
--- a/extensions/source/bibliography/bibview.cxx
+++ b/extensions/source/bibliography/bibview.cxx
@@ -115,8 +115,6 @@ namespace bib
         m_xGeneralPage = m_pGeneralPage = new BibGeneralPage( this, m_pDatMan );
         m_pGeneralPage->Show();
 
-        Resize();
-
         if( HasFocus() )
             // "delayed" GetFocus() because GetFocus() is initially called before GeneralPage is created
             m_pGeneralPage->GrabFocus();
@@ -156,12 +154,14 @@ namespace bib
     {
         UpdatePages();
         FormControlContainer::_loaded( _rEvent );
+        Resize();
     }
 
     void BibView::_reloaded( const EventObject& _rEvent )
     {
         UpdatePages();
         FormControlContainer::_loaded( _rEvent );
+        Resize();
     }
 
     IMPL_STATIC_LINK( BibView, CallMappingHdl, BibView*, EMPTYARG )


More information about the Libreoffice-commits mailing list