[Libreoffice-commits] core.git: 3 commits - external/icu extras/source sw/source

[Caolán McNamara]

 external/icu/icu4c-icu11131.patch.1 |   24 +++++++++++++++++++++++-
 extras/source/palettes/standard.soc |    4 ++--
 sw/source/core/layout/frmtool.cxx   |    3 ++-
 3 files changed, 27 insertions(+), 4 deletions(-)

New commits:
commit a2336d20a5c9562f0c8af21c552aa49c177944b7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Aug 31 12:29:40 2014 +0100

    coverity#1233487 Unchecked dynamic_cast
    
    Change-Id: If6955ba90f2838cfe0b4954b31a760e067518dc6

diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 7eca28a..27ceb44 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -2539,7 +2539,8 @@ void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGro
         pSibling->mpNext = pSav;
         pSibling->_InvalidatePrt();
         pSibling->InvalidatePage( pPage );
-        if ( dynamic_cast<SwFlowFrm*>(pSibling)->GetFollow() )
+        SwFlowFrm *pFlowFrm = dynamic_cast<SwFlowFrm*>(pSibling);
+        if (pFlowFrm && pFlowFrm->GetFollow())
             pSibling->Prepare( PREP_CLEAR, 0, false );
     }
     else
commit a0afc27c45576071d3d802d179a334d27a2183c5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Aug 30 12:25:42 2014 +0100

    remove trailing space
    
    Change-Id: I9fd2912af105b4363560b19ac18e1576ecc80a8c

diff --git a/extras/source/palettes/standard.soc b/extras/source/palettes/standard.soc
index 36ad9da..1ed1412 100644
--- a/extras/source/palettes/standard.soc
+++ b/extras/source/palettes/standard.soc
@@ -195,6 +195,6 @@
   <draw:color draw:name="Chart 10" draw:color="#ff950e"/>
   <draw:color draw:name="Chart 11" draw:color="#c5000b"/>
   <draw:color draw:name="Chart 12" draw:color="#0084d1"/>
-  <draw:color draw:name="Tango: Sky Blue 1" draw:color="#729fcf" />
-  <draw:color draw:name="Tango: Sky Blue 2" draw:color="#3465a4" />
+  <draw:color draw:name="Tango: Sky Blue 1" draw:color="#729fcf"/>
+  <draw:color draw:name="Tango: Sky Blue 2" draw:color="#3465a4"/>
 </office:color-table>
commit c37a25191872aeeef02755061b9af2463e22ea86
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 29 14:34:41 2014 +0100

    Resolves: rhbz#1135410
    
    Change-Id: Iaa62d8438012e32167c9179da29c446850cf1deb

diff --git a/external/icu/icu4c-icu11131.patch.1 b/external/icu/icu4c-icu11131.patch.1
index 58364b0..e9978ab 100644
--- a/external/icu/icu4c-icu11131.patch.1
+++ b/external/icu/icu4c-icu11131.patch.1
@@ -42,5 +42,27 @@
 +	}
 +    	return u_terminateUChars(dest, destCapacity, b2Len, status);
  }
+
+
+--- icu/source/common/ubidi.c.orig	2014-08-29 14:32:24.007259924 +0100
++++ icu/source/common/ubidi.c	2014-08-29 14:33:21.555833532 +0100
+@@ -2521,11 +2521,18 @@
+     pBiDi->trailingWSStart=saveTrailingWSStart;
+     /* free memory for mapping table and visual text */
+     uprv_free(runsOnlyMemory);
++    runsOnlyMemory=NULL;
+     if(pBiDi->runCount>1) {
+         pBiDi->direction=UBIDI_MIXED;
+     }
+   cleanup3:
+-    pBiDi->reorderingMode=UBIDI_REORDER_RUNS_ONLY;
++    if(runsOnlyMemory != NULL)
++    {
++	pBiDi->reorderingMode=UBIDI_REORDER_RUNS_ONLY;
++	uprv_free(runsOnlyMemory);
++    }
++    else
++	pBiDi->reorderingMode=UBIDI_REORDER_RUNS_ONLY;
+ }
  
- 
+ /* ubidi_setPara ------------------------------------------------------------ */