[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - cui/uiconfig sw/uiconfig

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Wed Oct 21 13:41:46 UTC 2020


 cui/uiconfig/ui/textflowpage.ui             |    2 +-
 sw/uiconfig/swriter/ui/insertbreak.ui       |    2 +-
 sw/uiconfig/swriter/ui/tabletextflowpage.ui |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit af580166b64e1009eb76b750d7cb92121f994d08
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Oct 20 09:35:23 2020 +0100
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Wed Oct 21 15:41:14 2020 +0200

    tdf#137608 allow insert break to use a page number > 9999
    
    writer is using sal_uInt16 for the page number. If we wanted anything bigger
    then the max possible sal_uInt16 then we would need to make real changes to
    writer to change the type.
    
    Leaving the type as sal_uInt16 but allowing 65535 then makes it real easy to
    use the ui to force writer to loop over to page 0 and I can predict the moaning
    about that. So I propose instead of an arbitrary max of 10000-1 to have an
    arbitrary max of 65535-10000 for 55535 instead.
    
    and use same max-page in textflow as insert, break
    
    and table-textflow too as well as para-textflow
    
    Change-Id: Id4c244e144f718c8917786cb9846625e4845b65a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104505
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/cui/uiconfig/ui/textflowpage.ui b/cui/uiconfig/ui/textflowpage.ui
index bcca12f89d48..4edafdc277a0 100644
--- a/cui/uiconfig/ui/textflowpage.ui
+++ b/cui/uiconfig/ui/textflowpage.ui
@@ -15,7 +15,7 @@
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment3">
-    <property name="upper">9999</property>
+    <property name="upper">55535</property>
     <property name="value">1</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
diff --git a/sw/uiconfig/swriter/ui/insertbreak.ui b/sw/uiconfig/swriter/ui/insertbreak.ui
index 7aca5957f514..e8140048487c 100644
--- a/sw/uiconfig/swriter/ui/insertbreak.ui
+++ b/sw/uiconfig/swriter/ui/insertbreak.ui
@@ -3,7 +3,7 @@
 <interface domain="sw">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">9999</property>
+    <property name="upper">55535</property>
     <property name="value">1</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
diff --git a/sw/uiconfig/swriter/ui/tabletextflowpage.ui b/sw/uiconfig/swriter/ui/tabletextflowpage.ui
index fc4baf97632c..be1b0c581354 100644
--- a/sw/uiconfig/swriter/ui/tabletextflowpage.ui
+++ b/sw/uiconfig/swriter/ui/tabletextflowpage.ui
@@ -3,7 +3,7 @@
 <interface domain="sw">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">9999</property>
+    <property name="upper">55535</property>
     <property name="value">1</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>


More information about the Libreoffice-commits mailing list