[Libreoffice-commits] core.git: sd/source

[Katarina Behrens]

 sd/source/ui/sidebar/SlideBackground.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 83e059af2203ec0cd15dea08cfa538555ba14bd7
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Mon Feb 6 16:49:46 2017 +0100

    tdf#103636: In Draw sidebar, switch fitting objs to paper format off
    
    So FuPage::ExecuteDialog and ::ApplyItemSet misuses SID_ATTR_PAGE_EXT1
    to distinguish between Impress and Draw, making fit objects to paper
    format on in Impress and off in Draw.
    That setting is not persistent, but that is a separate issue and until
    it is fixed, we will do the same here
    
    Change-Id: Ie55a131d375fa32d856bde4d9fda4fb54dd0d29f
    Reviewed-on: https://gerrit.libreoffice.org/33976
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index 78c204f..d80eab5 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -719,7 +719,6 @@ void SlideBackground::NotifyItemUpdate(
                 mpDspMasterObjects->Check(pBoolItem->GetValue());
         }
         break;
-
         case SID_SELECT_BACKGROUND:
         {
             if(eState >= SfxItemState::DEFAULT)
@@ -793,7 +792,12 @@ IMPL_LINK_NOARG(SlideBackground, PaperSizeModifyHdl, ListBox&, void)
 
     mpPageItem->SetLandscape(mpPaperOrientation->GetSelectEntryPos() == 0);
     SvxSizeItem aSizeItem(SID_ATTR_PAGE_SIZE, aSize);
-    GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_PAGE_SIZE, SfxCallMode::RECORD, { &aSizeItem, mpPageItem.get() });
+    // Page/slide properties dialog (FuPage::ExecuteDialog and ::ApplyItemSet) misuses
+    // SID_ATTR_PAGE_EXT1 to distinguish between Impress and Draw, as for whether to fit
+    // objects to paper size. Until that is handled somehow better, we do the same here
+    SfxBoolItem aFitObjs(SID_ATTR_PAGE_EXT1, IsImpress());
+
+    GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_PAGE_SIZE, SfxCallMode::RECORD, { &aSizeItem, mpPageItem.get(), &aFitObjs});
 }
 
 IMPL_LINK_NOARG(SlideBackground, FillColorHdl, SvxColorListBox&, void)