[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - editeng/source

Lionel Elie Mamane lionel at mamane.lu
Sun May 5 10:51:20 PDT 2013


 editeng/source/items/frmitems.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1e2fed7ab5886b2899b14eed4cb8c3b238524289
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri May 3 17:42:12 2013 +0200

    fdo#64150 don't segfault when there is no line
    
    Change-Id: Iab36de3d407925cdb0e092afae457907f0261b3e
    Reviewed-on: https://gerrit.libreoffice.org/3768
    Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>
    Reviewed-by: Andras Timar <atimar at suse.com>
    Tested-by: Andras Timar <atimar at suse.com>

diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index da4ca7d..2afb045 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1980,7 +1980,8 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
                 for (int n(0); n != SAL_N_ELEMENTS(aBorders); ++n)
                 {
                     editeng::SvxBorderLine* pLine = const_cast< editeng::SvxBorderLine* >( GetLine( aBorders[n] ) );
-                    pLine->SetWidth( nWidth );
+                    if( pLine )
+                        pLine->SetWidth( nWidth );
                 }
             }
             return sal_True;


More information about the Libreoffice-commits mailing list