[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/source

[Libreoffice Gerrit user]

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

New commits:
commit c3d7933d0f5df37c69fdf5f238fbbd0bef8131d3
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Dec 14 09:48:19 2018 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Dec 14 12:04:25 2018 +0100

    Resolves: tdf#122059 don't crash with no parent for tabpage
    
    Change-Id: Id27609a86558094e6b53c763aebe77c97cc11672
    Reviewed-on: https://gerrit.libreoffice.org/65148
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index 8cfd6243f9fe..74ab96240ab1 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -60,7 +60,7 @@ void TabPage::ImplInitSettings()
         SetParentClipMode();
         SetPaintTransparent( false );
 
-        if ( IsControlBackground() )
+        if (IsControlBackground() || !pParent)
             SetBackground( GetControlBackground() );
         else
             SetBackground( pParent->GetBackground() );