sd/source/ui/dlg/prltempl.cxx | 2 +-
sd/source/ui/func/futempl.cxx | 20 --------------------
2 files changed, 1 insertion(+), 21 deletions(-)
New commits:
commit b6e16872490a12a6b0f9a214bb5e4eef8b236903
Author: Tamás Zolnai <tamas.zol...@collabora.com>
Date: Fri Aug 18 20:07:16 2017 +0200
Related to tdf#109863: Crash when close slide style dialog with OK
Use item conversion implemented inside the background tab page.
Change-Id: I4cb0fa60e6d2024a2e6e08e06af337d85b7f49fa
Reviewed-on: https://gerrit.libreoffice.org/41266
Reviewed-by: Michael Stahl <mst...@redhat.com>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
Tested-by: Katarina Behrens <katarina.behr...@cib.de>
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index ea873f8e802e..d261946720f6 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -280,7 +280,7 @@ void SdPresLayoutTemplateDlg::PageCreated( sal_uInt16 nId,
SfxTabPage &rPage )
}
else if (nId == mnBackground)
{
-
aSet.Put(SfxUInt32Item(SID_FLAG_TYPE,static_cast<sal_uInt32>(SvxBackgroundTabFlags::SHOW_HIGHLIGHTING)));
+
aSet.Put(SfxUInt32Item(SID_FLAG_TYPE,static_cast<sal_uInt32>(SvxBackgroundTabFlags::SHOW_CHAR_BKGCOLOR)));
rPage.PageCreated(aSet);
}
}
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 51a074342c25..dade95970d5f 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -105,10 +105,6 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
SfxStyleSheetBase* pStyleSheet = nullptr;
const SfxPoolItem* pItem;
- static const sal_uInt16 aRanges[] = {
- EE_ITEMS_START, EE_ITEMS_END,
- SID_ATTR_BRUSH_CHAR, SID_ATTR_BRUSH_CHAR
- };
SfxStyleFamily nFamily = (SfxStyleFamily)USHRT_MAX;
if( pArgs && SfxItemState::SET == pArgs->GetItemState( SID_STYLE_FAMILY,
false, &pItem ))
@@ -305,15 +301,6 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
ScopedVclPtr<SfxAbstractTabDialog> pPresDlg;
SdAbstractDialogFactory* pFact =
SdAbstractDialogFactory::Create();
bool bOldDocInOtherLanguage = false;
- SfxItemSet aNewAttr(mpViewShell->GetPool(), aRanges);
-
- if( aNewAttr.GetItemState( XATTR_FILLBACKGROUND, true, &pItem
) == SfxItemState::SET)
- {
- Color aBackColor = static_cast<const
SvxBackgroundColorItem*>(pItem)->GetValue();
- SvxBrushItem aBrushItem(aBackColor, XATTR_FILLBACKGROUND);
- aNewAttr.ClearItem(XATTR_FILLBACKGROUND);
- aNewAttr.Put(aBrushItem);
- }
SfxStyleFamily eFamily = pStyleSheet->GetFamily();
@@ -414,13 +401,6 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
SfxItemSet aTempSet(*pOutSet);
static_cast<SdStyleSheet*>(pStyleSheet)->AdjustToFontHeight(aTempSet);
- const SvxBrushItem* pBrushItem =
aTempSet.GetItem<SvxBrushItem>(XATTR_FILLBACKGROUND);
- if( pBrushItem )
- {
- SvxBackgroundColorItem aBackColorItem(
pBrushItem->GetColor(), EE_CHAR_BKGCOLOR);
- aTempSet.ClearItem(XATTR_FILLBACKGROUND);
- aTempSet.Put(aBackColorItem);
- }
/* Special treatment: reset the INVALIDS to
NULL-Pointer (otherwise INVALIDs or pointer
point
to DefaultItems in the template; both would
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
