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 09:22:35 +0200 |
| commit | ee2f74f480874620b35db95e2e310f16264a3ddc (patch) | |
| tree | 082c4fe1222a2b8cb25a71fae1565b2a636f9aaa /sd | |
| parent | 24ead97534d7fde86c3593705f36a39e7e7cbb08 (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>
(cherry picked from commit 40bb9ac690d979ef544d5aa759bd734a176912a0)
Reviewed-on: https://gerrit.libreoffice.org/75674
Tested-by: Gülşah Köse <gulsah.kose@collabora.com>
Diffstat (limited to 'sd')
| -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 b67fb350ca3a..c4c8ad3a3546 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -315,7 +315,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(); @@ -364,6 +364,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--) { @@ -415,6 +417,10 @@ void DrawView::SetMasterAttributes( SdrObject* pObject, SdPage& rPage, SfxItemSe nWhich = aWhichIter.NextWhich(); } + } + + pObject->SetMergedItemSet(rSet); + bOk = true; } } |