diff --git a/0001-Related-rhbz-1255200-apparent-missing-stylesheet.patch b/0001-Related-rhbz-1255200-apparent-missing-stylesheet.patch new file mode 100644 index 0000000..b92f56c --- /dev/null +++ b/0001-Related-rhbz-1255200-apparent-missing-stylesheet.patch @@ -0,0 +1,45 @@ +From 33b00ec6736db24cac3571904df272a1df59578e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +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 + diff --git a/libreoffice.spec b/libreoffice.spec index 8c7ef19..ba85b06 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -407,6 +407,7 @@ Patch97: 0001-fix-langtag-test-with-liblangtag-0.5.7.patch Patch98: 0001-support-en-GB-oxendict-additionally-to-now-deprecate.patch Patch99: 0001-Resolves-rhbz-1255811-implement-Edit-modify-handler.patch Patch100: 0001-Resolves-rhbz-1256843-no-obvious-means-to-close-temp.patch +Patch101: 0001-Related-rhbz-1255200-apparent-missing-stylesheet.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -2382,8 +2383,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog -* Tue Sep 01 2015 Caolán McNamara - 1:4.3.7.2-11-UNBUILT +* Tue Sep 01 2015 Caolán McNamara - 1:4.3.7.2-11 - Resolves: rhbz#1256843 no obvious means to close template dialog +- Related: rhbz#1255200 apparent missing stylesheet * Wed Aug 26 2015 Eike Rathke - 1:4.3.7.2-10 - Resolves: tdf#92767 use ISO 8601 for internal date string representation