[Libreoffice-commits] .: Branch 'libreoffice-4-0' - vcl/source

[Libreoffice Gerrit user]

 vcl/source/window/split.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 2bafa7dacd6ddb9045f5327762334f323f46b1b0
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Jan 12 05:29:25 2013 +0100

    fix crash with new personas when notifying windows
    
    Change-Id: I41e4c747c4662fb066746c0ca87d17ea6742080e
    Reviewed-on: https://gerrit.libreoffice.org/1658
    Reviewed-by: Noel Power <noel.power at suse.com>
    Tested-by: Noel Power <noel.power at suse.com>

diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index 4877004..9e79c8f 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -729,7 +729,11 @@ void Splitter::DataChanged( const DataChangedEvent& rDCEvt )
     Window::DataChanged( rDCEvt );
     if( rDCEvt.GetType() == DATACHANGED_SETTINGS )
     {
-        Color oldFaceColor = ((AllSettings *) rDCEvt.GetData())->GetStyleSettings().GetFaceColor();
+        AllSettings* pOldSettings = static_cast<AllSettings*>(rDCEvt.GetData());
+        if(!pOldSettings)
+            return;
+
+        Color oldFaceColor = pOldSettings->GetStyleSettings().GetFaceColor();
         Color newFaceColor = Application::GetSettings().GetStyleSettings().GetFaceColor();
         if( oldFaceColor.IsDark() != newFaceColor.IsDark() )
         {