[Libreoffice-commits] core.git: svx/source

[Caolán McNamara]

 svx/source/table/tablecontroller.cxx |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

New commits:
commit dcb0738b631c61999364bd8500f401f93bbfb84e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 1 12:45:03 2015 +0100

    Related: rhbz#1255200 apparent missing stylesheet
    
    Change-Id: Ice9a860ca839d37308b5c2f2eb639852fefe1d15

diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 8b4bd29..2fbb606 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -1081,14 +1081,19 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs )
                     {
                         SfxItemSet aSet( xCell->GetItemSet() );
                         bool bChanges = false;
-                        const SfxItemSet& rStyleAttribs = xCell->GetStyleSheet()->GetItemSet();
-
-                        for ( sal_uInt16 nWhich = SDRATTR_START; nWhich <= SDRATTR_TABLE_LAST; nWhich++ )
+                        SfxStyleSheet *pStyleSheet = xCell->GetStyleSheet();
+                        SAL_WARN_IF(!pStyleSheet, "svx", "no stylesheet for table cell?");
+                        if (pStyleSheet)
                         {
-                            if( (rStyleAttribs.GetItemState( nWhich ) == SfxItemState::SET) && (aSet.GetItemState( nWhich ) == SfxItemState::SET) )
+                            const SfxItemSet& rStyleAttribs = pStyleSheet->GetItemSet();
+
+                            for ( sal_uInt16 nWhich = SDRATTR_START; nWhich <= SDRATTR_TABLE_LAST; nWhich++ )
                             {
-                                aSet.ClearItem( nWhich );
-                                bChanges = true;
+                                if( (rStyleAttribs.GetItemState( nWhich ) == SfxItemState::SET) && (aSet.GetItemState( nWhich ) == SfxItemState::SET) )
+                                {
+                                    aSet.ClearItem( nWhich );
+                                    bChanges = true;
+                                }
                             }
                         }