[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source

Caolán McNamara caolanm at redhat.com
Mon Jan 5 12:35:00 PST 2015


 sw/source/filter/ww8/ww8par2.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 1b98b475d1885583d1b6ae059806d76b272ea30d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 5 17:15:14 2015 +0000

    asan: cast is totally wrong here
    
    Change-Id: I7341813b706faad60888e374fa50542abeb6842d
    (cherry picked from commit 3fab95491940160a1ee288491090b2f8b5875731)
    Reviewed-on: https://gerrit.libreoffice.org/13746
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 3f7897e..b81f630 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -1272,8 +1272,9 @@ void WW8TabBandDesc::ProcessSprmTTableBorders(int nBrcVer, const sal_uInt8* pPar
     // sprmTTableBorders
     if( nBrcVer == 6 )
     {
-        for( int i = 0; i < 6; ++i )
-            aDefBrcs[i] = WW8_BRC( ((WW8_BRCVer6*)&pParams)[i] );
+        WW8_BRCVer6 *pVer6 = (WW8_BRCVer6*)pParams;
+        for (int i = 0; i < 6; ++i)
+            aDefBrcs[i] = WW8_BRC(pVer6[i]);
     }
     else if ( nBrcVer == 8 )
     {


More information about the Libreoffice-commits mailing list