[Libreoffice-commits] .: 3 commits - comphelper/source sc/source vcl/source

[Libreoffice Gerrit user]

 comphelper/source/container/embeddedobjectcontainer.cxx |    2 +-
 sc/source/ui/src/scfuncs.src                            |    2 +-
 vcl/source/window/split.cxx                             |    6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit ab3c544633612a2079a918bf05bb59a21e17f208
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Sat Jan 12 05:29:25 2013 +0100

    fix crash with new personas when notifying windows
    
    Change-Id: I41e4c747c4662fb066746c0ca87d17ea6742080e

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() )
         {
commit f7515957e09bba964530123eebf500588e2e2a4d
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Sat Jan 12 05:09:02 2013 +0100

    adapt function description to changed place, fdo#58957
    
    Change-Id: I1abdae0f924bf919fbf43e5a07f950a8a10861a9

diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index ce354e6..d30c7dd 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -9172,7 +9172,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
     {
         String 1 // Description
         {
-            Text [ en-US ] = "Converts a value according to a conversion table 
in the configuration (calc.xcu).";
+            Text [ en-US ] = "Converts a value according to a conversion table 
in the configuration (main.xcd).";
         };
         ExtraData =
         {
commit 5dad4d7a23253217573748f1d3a3a90da10c1b60
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Thu Jan 10 05:36:59 2013 +0100

    correct indentation
    
    Change-Id: Ibcbcb69c96e8bbd6bccc0f852240a2a6cef2c1c0

diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx 
b/comphelper/source/container/embeddedobjectcontainer.cxx
index ca0e4f1..1ec18a1 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -722,7 +722,7 @@ uno::Reference < embed::XEmbeddedObject > 
EmbeddedObjectContainer::CopyAndGetEmb
         rName = CreateUniqueObjectName();
 
     // objects without persistance are not really stored by the method
-       if ( xObj.is() && StoreEmbeddedObject( xObj, rName, sal_True ) )
+    if ( xObj.is() && StoreEmbeddedObject( xObj, rName, sal_True ) )
     {
         xResult = Get_Impl( rName, xObj);
         if ( !xResult.is() )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits