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

[Samuel Mehrbrodt]

 sd/uiconfig/simpress/ui/photoalbum.ui |    4 +---
 sw/source/uibase/uiview/view2.cxx     |    2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 583aec2552ed7f8eb22ea7ab7fff7d42e09a506d
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Wed Sep 7 20:41:38 2016 +0200

    tdf#90597 Revert "Jump to next change when accepting or rejecting a change"
    
    This reverts commit 1deaa9d304239b2d603cc85bbcb8b8f50d8714da.
    
    Change-Id: I4718ffea3f288b654cb037a5edbfa66f704a6eb5

diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index a0828a9..b79c929 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -710,8 +710,6 @@ void SwView::Execute(SfxRequest &rReq)
                         m_pWrtShell->RejectRedline(nRedline);
                 }
             }
-            // Go to next change after accepting or rejecting one (fdo#83953)
-            GetViewFrame()->GetDispatcher()->Execute(FN_REDLINE_NEXT_CHANGE, SfxCallMode::ASYNCHRON);
         }
         break;
 
commit 7acb661bebc052125bb7362ed594737e1d387dfb
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Wed Sep 7 20:40:34 2016 +0200

    Photo Album Dialog: Don't add caption by default
    
    Change-Id: I025a42b765200cfa6ac9664c03051a9f523700a0

diff --git a/sd/uiconfig/simpress/ui/photoalbum.ui b/sd/uiconfig/simpress/ui/photoalbum.ui
index 9b2e5ef..ecf3992a 100644
--- a/sd/uiconfig/simpress/ui/photoalbum.ui
+++ b/sd/uiconfig/simpress/ui/photoalbum.ui
@@ -349,7 +349,6 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="xalign">0</property>
-                        <property name="active">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -374,14 +373,13 @@
                         <property name="position">2</property>
                       </packing>
                     </child>
-		    <child>
+                    <child>
                       <object class="GtkCheckButton" id="asr_check_crop">
                         <property name="label" translatable="yes">Fill Screen</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="xalign">0</property>
-                        <property name="active">False</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>