From 33b00ec6736db24cac3571904df272a1df59578e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 1 Sep 2015 12:45:03 +0100
Subject: [PATCH] Related: rhbz#1255200 apparent missing stylesheet
(cherry picked from commit dcb0738b631c61999364bd8500f401f93bbfb84e)
Change-Id: Ice9a860ca839d37308b5c2f2eb639852fefe1d15
---
svx/source/table/tablecontroller.cxx | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index f7a5468..ab121bc 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -1054,14 +1054,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 ) == SFX_ITEM_ON) && (aSet.GetItemState( nWhich ) == SFX_ITEM_ON) )
+ 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 ) == SFX_ITEM_ON) && (aSet.GetItemState( nWhich ) == SFX_ITEM_ON) )
+ {
+ aSet.ClearItem( nWhich );
+ bChanges = true;
+ }
}
}
--
2.4.0