[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - sd/source solenv/bin

Jan Holesovsky (via logerrit) logerrit at kemper.freedesktop.org
Tue Sep 3 11:43:19 UTC 2019


 sd/source/ui/animations/SlideTransitionPane.cxx |    2 ++
 solenv/bin/native-code.py                       |    6 ++++++
 2 files changed, 8 insertions(+)

New commits:
commit 66bf346812026210582cd5f5e697d750c973c48e
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Tue Jun 18 09:54:00 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Sep 3 13:42:44 2019 +0200

    android: Add the sidebar-related constructors to liblo-native-code.so.
    
    Change-Id: I25acb8965d190fc443d75357352e4d02c9b03cc2
    Reviewed-on: https://gerrit.libreoffice.org/74265
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 05eca1ba63a2eca5e6d6be0b7a05bb6f53354ec6)
    Reviewed-on: https://gerrit.libreoffice.org/78449

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 1cde5daa971f..35e5bf98de17 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -202,11 +202,16 @@ core_constructor_list = [
     "com_sun_star_graphic_GraphicObject_get_implementation",
     "com_sun_star_comp_graphic_GraphicProvider_get_implementation",
 # svx/util/svx.component
+    "com_sun_star_comp_svx_NumberingToolBoxControl_get_implementation",
     "com_sun_star_drawing_EnhancedCustomShapeEngine_get_implementation",
     "com_sun_star_drawing_SvxShapeCollection_get_implementation",
+    "com_sun_star_svx_FontHeightToolBoxController_get_implementation",
+    "org_apache_openoffice_comp_svx_sidebar_PanelFactory_get_implementation",
 # svx/util/svxcore.component
     "com_sun_star_comp_graphic_PrimitiveFactory2D_get_implementation",
     "com_sun_star_comp_Draw_GraphicExporter_get_implementation",
+    "com_sun_star_comp_svx_ColorToolBoxControl_get_implementation",
+    "com_sun_star_comp_svx_FontNameToolBoxControl_get_implementation",
     "com_sun_star_comp_Svx_GraphicExportHelper_get_implementation",
     "com_sun_star_comp_Svx_GraphicImportHelper_get_implementation",
 # toolkit/util/tk.component
@@ -268,6 +273,7 @@ edit_factory_list = [
 edit_constructor_list = [
 # framework/util/fwk.component
     "com_sun_star_comp_framework_GlobalAcceleratorConfiguration_get_implementation",
+    "com_sun_star_comp_framework_UICommandDescription_get_implementation",
 # i18npool/util/i18npool.component
     "com_sun_star_i18n_InputSequenceChecker_get_implementation",
     "com_sun_star_i18n_OrdinalSuffix_get_implementation",
commit 42d8008c03b5b0ad92a56992781632aa7f6e2bfe
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri May 24 23:19:53 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Sep 3 13:42:31 2019 +0200

    Transition sidebar: Apply the transition duration right away.
    
    In the desktop version, the value that is entered there always ends up
    applied.  In the Online, there was a scenario when it did not: enter a
    value and switch slide by clicking the slide sorter.
    
    There is no harm to apply the value right away when the user edits,
    because in the desktop version, there was no way to avoid applying the
    value anyway.
    
    Change-Id: I519423d60f682735aeb1d471b3397ff9671c15fd
    Reviewed-on: https://gerrit.libreoffice.org/72923
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit 5eea8c955b7632414c1d6c3ec0cbcf86c558efc6)
    Reviewed-on: https://gerrit.libreoffice.org/78448
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index e43c2f28520f..52b9eedb43ae 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -1129,6 +1129,8 @@ IMPL_LINK_NOARG(SlideTransitionPane, DurationModifiedHdl, Edit&, void)
         mpCBX_duration->SetValue(0);
     else
         mpCBX_duration->SetValue(duration_value);
+
+    applyToSelectedPages();
 }
 
 IMPL_LINK_NOARG(SlideTransitionPane, DurationLoseFocusHdl, Control&, void)


More information about the Libreoffice-commits mailing list