diff options
| author | Gülşah Köse <gulsah.kose@collabora.com> | 2019-07-16 00:48:01 +0300 |
|---|---|---|
| committer | Gülşah Köse <gulsah.kose@collabora.com> | 2019-07-16 08:45:39 +0200 |
| commit | 40bb9ac690d979ef544d5aa759bd734a176912a0 (patch) | |
| tree | 71811e5cdac27119306d43f2d7b9deff421ef97e /sd/source | |
| parent | bd2eed385f5827e3b7f3510d4f83be03d548d418 (diff) | |
tdf#126067 Fix slide scope feature.
Change-Id: I6e2450572b9c6a30526a8a2a91a6e0bf89103475
Reviewed-on: https://gerrit.libreoffice.org/75669
Tested-by: Jenkins
Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/view/drawview.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 702e7bd08cc6..d53c19561b04 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -316,7 +316,7 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet, return bOk; } -void DrawView::SetMasterAttributes( SdrObject* pObject, SdPage& rPage, SfxItemSet rSet, SfxStyleSheetBasePool* pStShPool, bool& bOk, bool /*bMaster*/, bool bSlide ) +void DrawView::SetMasterAttributes( SdrObject* pObject, SdPage& rPage, SfxItemSet rSet, SfxStyleSheetBasePool* pStShPool, bool& bOk, bool bMaster, bool bSlide ) { SdrInventor nInv = pObject->GetObjInventor(); @@ -365,6 +365,8 @@ void DrawView::SetMasterAttributes( SdrObject* pObject, SdPage& rPage, SfxItemSe } else if (eObjKind == OBJ_OUTLINETEXT) { + if (bMaster) + { // Presentation object outline for (sal_uInt16 nLevel = 9; nLevel > 0; nLevel--) { @@ -416,6 +418,10 @@ void DrawView::SetMasterAttributes( SdrObject* pObject, SdPage& rPage, SfxItemSe nWhich = aWhichIter.NextWhich(); } + } + + pObject->SetMergedItemSet(rSet); + bOk = true; } } |