[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sd/source

[Caolán McNamara]

 sd/source/ui/func/fupage.cxx |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 7f54aa12797d0c2d6dc5c35b3c11a9c37c744edc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jul 24 17:50:23 2016 +0100

    Resolves: tdf#101076 drag-create creates an unfilled shape...
    
    after using the slide properties->background->all slides
    
    This SetAttributes with nothing selected will end up setting the
    default object properties. Here I think we are setting the bg color to
    the master, and then unsetting the bg color of the slides to none
    so the master color shows through.
    
    So the additional SetAttributes call unsets the bg of the default
    object style
    
    Change-Id: I5cfd74eef5637b87d2a8778d4b8c8a0cbc0960db
    Reviewed-on: https://gerrit.libreoffice.org/27487
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    (cherry picked from commit 60ab08c6c5c4b5730c1cb54eca5558be214e8925)
    Reviewed-on: https://gerrit.libreoffice.org/27505
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 11f371e..bcbca0a 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -152,7 +152,6 @@ void FuPage::DoExecute( SfxRequest& )
         if( mpArgs )
         {
             ApplyItemSet( mpArgs );
-            mpView->SetAttributes( *mpArgs );
         }
     }
 }