[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sd/source

[Gülşah Köse (via logerrit)]

 sd/source/ui/view/drawview.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit ee2f74f480874620b35db95e2e310f16264a3ddc
Author:     Gülşah Köse <gulsah.k...@collabora.com>
AuthorDate: Tue Jul 16 00:48:01 2019 +0300
Commit:     Gülşah Köse <gulsah.k...@collabora.com>
CommitDate: Tue Jul 16 09:22:35 2019 +0200

    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.k...@collabora.com>
    (cherry picked from commit 40bb9ac690d979ef544d5aa759bd734a176912a0)
    Reviewed-on: https://gerrit.libreoffice.org/75674
    Tested-by: Gülşah Köse <gulsah.k...@collabora.com>

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;
         }
    }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits