solenv/gdb/libreoffice/tl.py         |    9 -
 svx/uiconfig/ui/floatingareastyle.ui |  240 +++++++++++++++++------------------
 2 files changed, 124 insertions(+), 125 deletions(-)

New commits:
commit c88dda7e89a0774b203def3d90475c7b668187c2
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Dec 15 13:49:10 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Dec 15 15:17:07 2022 +0000

    resave with latest glade
    
    Change-Id: I00d1a4e727e411ea91d2a95b081d2a68f2b90ba2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144218
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/svx/uiconfig/ui/floatingareastyle.ui 
b/svx/uiconfig/ui/floatingareastyle.ui
index 140f7c962b21..d50bc73dbf2d 100644
--- a/svx/uiconfig/ui/floatingareastyle.ui
+++ b/svx/uiconfig/ui/floatingareastyle.ui
@@ -1,108 +1,109 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="svx">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">359</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment2">
     <property name="upper">100</property>
-    <property name="step_increment">5</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">5</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment3">
     <property name="upper">100</property>
-    <property name="step_increment">5</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">5</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment4">
     <property name="upper">100</property>
-    <property name="step_increment">5</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">5</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment5">
     <property name="upper">100</property>
-    <property name="step_increment">5</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">5</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment6">
     <property name="upper">100</property>
-    <property name="step_increment">5</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">5</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkPopover" id="FloatingAreaStyle">
-    <property name="can_focus">False</property>
-    <property name="no_show_all">True</property>
-    <property name="border_width">4</property>
+    <property name="can-focus">False</property>
+    <property name="no-show-all">True</property>
+    <property name="border-width">4</property>
     <property name="constrain-to">none</property>
     <child>
-      <!-- n-columns=1 n-rows=1 -->
+      <!-- n-columns=1 n-rows=4 -->
       <object class="GtkGrid" id="container">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
         <property name="orientation">vertical</property>
-        <property name="row_spacing">12</property>
+        <property name="row-spacing">12</property>
         <child>
-          <!-- n-columns=1 n-rows=1 -->
+          <!-- n-columns=1 n-rows=2 -->
           <object class="GtkGrid" id="anglegrid">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="row_spacing">6</property>
+            <property name="can-focus">False</property>
+            <property name="row-spacing">6</property>
             <child>
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="halign">start</property>
                 <property name="label" translatable="yes" 
context="floatingareastyle|label1">_Angle:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">angle</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">angle</property>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">0</property>
               </packing>
             </child>
             <child>
-              <!-- n-columns=1 n-rows=1 -->
+              <!-- n-columns=2 n-rows=1 -->
               <object class="GtkGrid">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="column_spacing">12</property>
-                <property name="column_homogeneous">True</property>
+                <property name="can-focus">False</property>
+                <property name="column-spacing">12</property>
+                <property name="column-homogeneous">True</property>
                 <child>
                   <object class="GtkSpinButton" id="angle">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="tooltip_text" translatable="yes" 
context="floatingareastyle|angle|tooltip_text">Specify the angle of rotation 
for the gradient shading style.</property>
+                    <property name="can-focus">True</property>
+                    <property name="tooltip-text" translatable="yes" 
context="floatingareastyle|angle|tooltip_text">Specify the angle of rotation 
for the gradient shading style.</property>
                     <property name="truncate-multiline">True</property>
                     <property name="adjustment">adjustment1</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
                 <child>
-                  <!-- n-columns=1 n-rows=1 -->
+                  <!-- n-columns=2 n-rows=1 -->
                   <object class="GtkGrid">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <child>
                       <object class="GtkToolbar" id="lefttoolbox">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="toolbar_style">icons</property>
-                        <property name="show_arrow">False</property>
+                        <property name="can-focus">True</property>
+                        <property name="toolbar-style">icons</property>
+                        <property name="show-arrow">False</property>
                         <property name="icon_size">2</property>
                         <child>
                           <object class="GtkToolButton" id="left">
                             <property name="visible">True</property>
-                            <property name="tooltip_text" translatable="yes" 
context="floatingareastyle|left|tooltip_text">Rotate counterclockwise by 45 
degrees.</property>
-                            <property 
name="icon_name">svx/res/symphony/rotate_left.png</property>
+                            <property name="can-focus">False</property>
+                            <property name="tooltip-text" translatable="yes" 
context="floatingareastyle|left|tooltip_text">Rotate counterclockwise by 45 
degrees.</property>
+                            <property 
name="icon-name">svx/res/symphony/rotate_left.png</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -111,22 +112,23 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkToolbar" id="righttoolbox">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="toolbar_style">icons</property>
-                        <property name="show_arrow">False</property>
+                        <property name="can-focus">True</property>
+                        <property name="toolbar-style">icons</property>
+                        <property name="show-arrow">False</property>
                         <property name="icon_size">2</property>
                         <child>
                           <object class="GtkToolButton" id="right">
                             <property name="visible">True</property>
-                            <property name="tooltip_text" translatable="yes" 
context="floatingareastyle|right|tooltip_text">Rotate clockwise by 45 
degrees.</property>
-                            <property 
name="icon_name">svx/res/symphony/rotate_right.png</property>
+                            <property name="can-focus">False</property>
+                            <property name="tooltip-text" translatable="yes" 
context="floatingareastyle|right|tooltip_text">Rotate clockwise by 45 
degrees.</property>
+                            <property 
name="icon-name">svx/res/symphony/rotate_right.png</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -135,199 +137,199 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">0</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
           </packing>
         </child>
         <child>
-          <!-- n-columns=1 n-rows=1 -->
+          <!-- n-columns=2 n-rows=2 -->
           <object class="GtkGrid">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="row_spacing">6</property>
-            <property name="column_spacing">12</property>
+            <property name="can-focus">False</property>
+            <property name="row-spacing">6</property>
+            <property name="column-spacing">12</property>
             <child>
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="halign">start</property>
                 <property name="label" translatable="yes" 
context="floatingareastyle|label4">_Start value:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">start</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">start</property>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="halign">start</property>
                 <property name="label" translatable="yes" 
context="floatingareastyle|label5">_End value:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">end</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">end</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkSpinButton" id="start">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes" 
context="floatingareastyle|start|tooltip_text">Enter a transparency value for 
the beginning point of the gradient, where 0% is fully opaque and 100% is fully 
transparent.</property>
+                <property name="can-focus">True</property>
+                <property name="tooltip-text" translatable="yes" 
context="floatingareastyle|start|tooltip_text">Enter a transparency value for 
the beginning point of the gradient, where 0% is fully opaque and 100% is fully 
transparent.</property>
                 <property name="truncate-multiline">True</property>
                 <property name="adjustment">adjustment4</property>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkSpinButton" id="end">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes" 
context="floatingareastyle|end|tooltip_text">Enter a transparency value for the 
endpoint of the gradient, where 0% is fully opaque and 100% is fully 
transparent.</property>
+                <property name="can-focus">True</property>
+                <property name="tooltip-text" translatable="yes" 
context="floatingareastyle|end|tooltip_text">Enter a transparency value for the 
endpoint of the gradient, where 0% is fully opaque and 100% is fully 
transparent.</property>
                 <property name="truncate-multiline">True</property>
                 <property name="adjustment">adjustment5</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">2</property>
           </packing>
         </child>
         <child>
-          <!-- n-columns=1 n-rows=1 -->
+          <!-- n-columns=1 n-rows=2 -->
           <object class="GtkGrid">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="row_spacing">6</property>
+            <property name="can-focus">False</property>
+            <property name="row-spacing">6</property>
             <child>
               <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="halign">start</property>
                 <property name="label" translatable="yes" 
context="floatingareastyle|label6">_Border:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">border</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">border</property>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkSpinButton" id="border">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes" 
context="floatingareastyle|border|tooltip_text">Specify the border value of 
gradient transparency.</property>
+                <property name="can-focus">True</property>
+                <property name="tooltip-text" translatable="yes" 
context="floatingareastyle|border|tooltip_text">Specify the border value of 
gradient transparency.</property>
                 <property name="truncate-multiline">True</property>
                 <property name="adjustment">adjustment6</property>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">3</property>
           </packing>
         </child>
         <child>
-          <!-- n-columns=1 n-rows=1 -->
+          <!-- n-columns=2 n-rows=2 -->
           <object class="GtkGrid" id="centergrid">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="row_spacing">6</property>
-            <property name="column_spacing">12</property>
+            <property name="can-focus">False</property>
+            <property name="row-spacing">6</property>
+            <property name="column-spacing">12</property>
             <child>
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="halign">start</property>
                 <property name="label" translatable="yes" 
context="floatingareastyle|label2">Center _X:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">centerx</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">centerx</property>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="halign">start</property>
                 <property name="label" translatable="yes" 
context="floatingareastyle|label3">Center _Y:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">centery</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">centery</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkSpinButton" id="centerx">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes" 
context="floatingareastyle|centerx|tooltip_text">Specify the horizontal offset 
percentage from the center for the gradient shading style. 50% is the 
horizontal center.</property>
+                <property name="can-focus">True</property>
+                <property name="tooltip-text" translatable="yes" 
context="floatingareastyle|centerx|tooltip_text">Specify the horizontal offset 
percentage from the center for the gradient shading style. 50% is the 
horizontal center.</property>
                 <property name="truncate-multiline">True</property>
                 <property name="adjustment">adjustment2</property>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkSpinButton" id="centery">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes" 
context="floatingareastyle|centery|tooltip_text">Specify the vertical offset 
percentage from the center for the gradient shading style.  50% is the vertical 
center.</property>
+                <property name="can-focus">True</property>
+                <property name="tooltip-text" translatable="yes" 
context="floatingareastyle|centery|tooltip_text">Specify the vertical offset 
percentage from the center for the gradient shading style.  50% is the vertical 
center.</property>
                 <property name="truncate-multiline">True</property>
                 <property name="adjustment">adjustment3</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
       </object>
commit 8980a7e8d48eeed0d1550c9efecd7f7300d9f0d7
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Dec 15 10:15:05 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Dec 15 15:16:57 2022 +0000

    fix BigInt gdb pretty-printer
    
    since
    
    commit 9536098ff107f1096e7f710c6f1e76c5659a5482
    Date:   Tue Nov 17 10:15:11 2020 +0200
    
        simplify BigInt, remove isSet
    
    and
    
    commit 33b8f7c10baead5fdd24d9b68caab54052bd00ba
    Date:   Wed Jan 6 10:41:22 2021 +0200
    
        bIsBig member is redundant
    
    Change-Id: I877364d4b5ed11812c34f2b5d51ec60dd6cca9de
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144215
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/solenv/gdb/libreoffice/tl.py b/solenv/gdb/libreoffice/tl.py
index 5eb2c45ca54f..6e7a7c25e320 100644
--- a/solenv/gdb/libreoffice/tl.py
+++ b/solenv/gdb/libreoffice/tl.py
@@ -18,13 +18,10 @@ class BigIntPrinter(object):
         self.val = val
 
     def to_string(self):
-        if self.val['bIsSet']:
-            if self.val['bIsBig']:
-                return self._value()
-            else:
-                return self.val['nVal']
+        if self.val['nLen']:
+            return self._value()
         else:
-            return "unset %s" % self.typename
+            return self.val['nVal']
 
     def _value(self):
         len = self.val['nLen']

Reply via email to