Related: rhbz#1255200 apparent missing stylesheet

f41
Caolán McNamara 9 years ago
parent f8de58a703
commit 42f0c701a1

@ -0,0 +1,44 @@
From aa2ae6a979c494f1aa6ce534c49edf2763ccb3e0 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
Change-Id: Ice9a860ca839d37308b5c2f2eb639852fefe1d15
(cherry picked from commit dcb0738b631c61999364bd8500f401f93bbfb84e)
---
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 38a41b5..64b40da 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;
+ }
}
}
--
2.4.0

@ -331,6 +331,7 @@ Patch22: 0001-f22-openjdk-for-ppc64le-has-both-these-dirs-but-jawt.patch
Patch23: 0001-implement-undo-for-equalize-marked-objects.patch Patch23: 0001-implement-undo-for-equalize-marked-objects.patch
Patch24: 0001-time-stamp-object-selections-and-use-newest-as-ref-f.patch Patch24: 0001-time-stamp-object-selections-and-use-newest-as-ref-f.patch
Patch25: 0001-Resolves-rhbz-1256843-no-obvious-means-to-close-temp.patch Patch25: 0001-Resolves-rhbz-1256843-no-obvious-means-to-close-temp.patch
Patch26: 0001-Related-rhbz-1255200-apparent-missing-stylesheet.patch
%define instdir %{_libdir} %define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice %define baseinstdir %{instdir}/libreoffice

Loading…
Cancel
Save