[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara]

 vcl/source/window/dialog.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fe1cbda3b7513e0d3686d347aa991e7231067384
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 30 14:18:40 2013 +0100

    Resolves: fdo#68396 Yield allowed layout timer to run during init layout
    
    There are multiple pages getting generated in the styles dialog because the
    dropcaps preview window calls "Yield" sometimes and sometimes the layout timer
    gets a chance to activate *during* the creation of the dialog so there ends up
    with two consecutive activations of some tabpages which has wonderful eventual
    know on effects resulting in that crash later on.
    
    Easiest thing is to disable the layout timer during the initial size
    calculation
    
    Change-Id: I7fb0a7ff89aa2c6013c5d8014deface107610000

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index eeb70a3..ef14a79 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1256,7 +1256,7 @@ IMPL_LINK( Dialog, ImplHandleLayoutTimerHdl, void*, EMPTYARG )
 
 void Dialog::queue_layout()
 {
-    if (hasPendingLayout())
+    if (hasPendingLayout() || isCalculatingInitialLayoutSize())
         return;
     if (IsInClose())
         return;