sc/uiconfig/scalc/ui/sidebaralignment.ui |  205 +++++++++++++++----------------
 1 file changed, 102 insertions(+), 103 deletions(-)

New commits:
commit 9585e88a811198585d91d37d4454c815529f7be9
Author:     Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Tue Jan 18 07:52:55 2022 +0100
Commit:     Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Tue Jan 18 09:15:46 2022 +0100

    Resolve gtk3 crash of If1ffb50743292f3cc0c3271646d0538337977762
    
    Change-Id: Id1080b71d1252bdcef804a4f8398a3c42073ee0a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128522
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>

diff --git a/sc/uiconfig/scalc/ui/sidebaralignment.ui 
b/sc/uiconfig/scalc/ui/sidebaralignment.ui
index ec153ce81a4b..367efb862285 100644
--- a/sc/uiconfig/scalc/ui/sidebaralignment.ui
+++ b/sc/uiconfig/scalc/ui/sidebaralignment.ui
@@ -4,61 +4,62 @@
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkAdjustment" id="adjustmentIndent">
     <property name="upper">990</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="adjustmentSpinDegrees">
     <property name="upper">359</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="GtkImage" id="image1">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">svx/res/lo03.png</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">svx/res/lo03.png</property>
   </object>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">svx/res/lo02.png</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">svx/res/lo02.png</property>
   </object>
   <object class="GtkImage" id="image3">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">svx/res/lo01.png</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">svx/res/lo01.png</property>
   </object>
   <!-- n-columns=1 n-rows=1 -->
   <object class="GtkGrid" id="AlignmentPropertyPanel">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="hexpand">True</property>
-        <property name="border_width">6</property>
+        <property name="border-width">6</property>
         <property name="orientation">vertical</property>
         <property name="spacing">3</property>
         <child>
           <object class="GtkBox" id="box3">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="hexpand">True</property>
             <property name="spacing">3</property>
             <child>
               <object class="GtkToolbar" id="horizontalalignment">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes" 
context="sidebaralignment|horizontalalignment|tooltip_text">Horizontal 
Alignment</property>
+                <property name="can-focus">True</property>
+                <property name="tooltip-text" translatable="yes" 
context="sidebaralignment|horizontalalignment|tooltip_text">Horizontal 
Alignment</property>
                 <property name="halign">start</property>
-                <property name="toolbar_style">icons</property>
-                <property name="show_arrow">False</property>
+                <property name="toolbar-style">icons</property>
+                <property name="show-arrow">False</property>
                 <property name="icon_size">2</property>
                 <child>
                   <object class="GtkToggleToolButton" id=".uno:AlignLeft">
                     <property name="visible">True</property>
+                    <property name="can-focus">False</property>
                     <property name="valign">start</property>
-                    <property name="use_underline">True</property>
+                    <property name="use-underline">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -68,7 +69,8 @@
                 <child>
                   <object class="GtkToggleToolButton" 
id=".uno:AlignHorizontalCenter">
                     <property name="visible">True</property>
-                    <property name="use_underline">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="use-underline">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -78,7 +80,8 @@
                 <child>
                   <object class="GtkToggleToolButton" id=".uno:AlignRight">
                     <property name="visible">True</property>
-                    <property name="use_underline">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="use-underline">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -88,7 +91,8 @@
                 <child>
                   <object class="GtkToggleToolButton" id=".uno:AlignBlock">
                     <property name="visible">True</property>
-                    <property name="use_underline">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="use-underline">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -105,16 +109,17 @@
             <child>
               <object class="GtkToolbar" id="verticalalignment">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes" 
context="sidebaralignment|verticalalignment|tooltip_text">Vertical 
Alignment</property>
+                <property name="can-focus">True</property>
+                <property name="tooltip-text" translatable="yes" 
context="sidebaralignment|verticalalignment|tooltip_text">Vertical 
Alignment</property>
                 <property name="halign">end</property>
-                <property name="toolbar_style">icons</property>
-                <property name="show_arrow">False</property>
+                <property name="toolbar-style">icons</property>
+                <property name="show-arrow">False</property>
                 <property name="icon_size">2</property>
                 <child>
                   <object class="GtkToggleToolButton" id=".uno:AlignTop">
                     <property name="visible">True</property>
-                    <property name="use_underline">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="use-underline">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -124,7 +129,8 @@
                 <child>
                   <object class="GtkToggleToolButton" id=".uno:AlignVCenter">
                     <property name="visible">True</property>
-                    <property name="use_underline">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="use-underline">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -134,7 +140,8 @@
                 <child>
                   <object class="GtkToggleToolButton" id=".uno:AlignBottom">
                     <property name="visible">True</property>
-                    <property name="use_underline">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="use-underline">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -145,21 +152,22 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="pack_type">end</property>
+                <property name="pack-type">end</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkToolbar" id="writedirection">
                 <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="GtkToggleToolButton" 
id=".uno:ParaLeftToRight">
                     <property name="visible">True</property>
-                    <property name="use_underline">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="use-underline">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -169,7 +177,8 @@
                 <child>
                   <object class="GtkToggleToolButton" 
id=".uno:ParaRightToLeft">
                     <property name="visible">True</property>
-                    <property name="use_underline">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="use-underline">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -180,7 +189,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="pack_type">end</property>
+                <property name="pack-type">end</property>
                 <property name="position">2</property>
               </packing>
             </child>
@@ -194,20 +203,20 @@
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkToolbar" id="indentbuttons">
                 <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=".uno:IncrementIndent">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="use_underline">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="use-underline">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -217,8 +226,8 @@
                 <child>
                   <object class="GtkToolButton" id=".uno:DecrementIndent">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="use_underline">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="use-underline">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -235,18 +244,13 @@
             <child>
               <object class="GtkSpinButton" id="leftindent">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes" 
context="sidebaralignment|leftindent|tooltip_text">Indents from the left 
edge.</property>
+                <property name="can-focus">True</property>
+                <property name="tooltip-text" translatable="yes" 
context="sidebaralignment|leftindent|tooltip_text">Indents from the left 
edge.</property>
                 <property name="halign">end</property>
                 <property name="valign">center</property>
                 <property name="hexpand">True</property>
-                <property name="truncate_multiline">True</property>
+                <property name="truncate-multiline">True</property>
                 <property name="adjustment">adjustmentIndent</property>
-                <child internal_child="accessible">
-                  <object class="AtkObject" id="leftindent_atkobject">
-                    <property name="AtkObject::accessible_name" 
translatable="yes" context="sidebaralignment|leftindent_atkobject">Left 
Indent</property>
-                  </object>
-                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -264,15 +268,15 @@
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkLabel" id="orientationlabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" 
context="sidebaralignment|orientationlabel">Text _orientation:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">orientationdegrees</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">orientationdegrees</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -284,18 +288,13 @@
             <child>
               <object class="GtkSpinButton" id="orientationdegrees">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes" 
context="sidebaralignment|orientationdegrees|tooltip_text">Select the angle for 
rotation.</property>
+                <property name="can-focus">True</property>
+                <property name="tooltip-text" translatable="yes" 
context="sidebaralignment|orientationdegrees|tooltip_text">Select the angle for 
rotation.</property>
                 <property name="halign">end</property>
                 <property name="hexpand">True</property>
-                <property name="truncate_multiline">True</property>
+                <property name="truncate-multiline">True</property>
                 <property name="adjustment">adjustmentSpinDegrees</property>
                 <property name="wrap">True</property>
-                <child internal_child="accessible">
-                  <object class="AtkObject" id="orientationdegrees_atkobject">
-                    <property name="AtkObject::accessible_name" 
translatable="yes" context="sidebaralignment|orientationdegrees_atkobject">Text 
Orientation</property>
-                  </object>
-                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -313,17 +312,17 @@
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkCheckButton" id="stacked">
                 <property name="label" translatable="yes" 
context="sidebaralignment|stacked">Vertically stacked</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
                 <property name="halign">start</property>
-                <property name="use_underline">True</property>
-                <property name="draw_indicator">True</property>
+                <property name="use-underline">True</property>
+                <property name="draw-indicator">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -334,7 +333,7 @@
             <child>
               <object class="GtkBox" id="textorientbox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="halign">end</property>
                 <property name="valign">center</property>
                 <property name="hexpand">True</property>
@@ -342,13 +341,13 @@
                 <child>
                   <object class="GtkToggleButton" id="bottom">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="focus_on_click">False</property>
-                    <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes" 
context="sidebaralignment|bottom|tooltip_text">Text Extension From Lower Cell 
Border</property>
+                    <property name="can-focus">True</property>
+                    <property name="focus-on-click">False</property>
+                    <property name="receives-default">False</property>
+                    <property name="tooltip-text" translatable="yes" 
context="sidebaralignment|bottom|tooltip_text">Text Extension From Lower Cell 
Border</property>
                     <property name="image">image3</property>
-                    <property name="use_underline">True</property>
-                    <property name="always_show_image">True</property>
+                    <property name="use-underline">True</property>
+                    <property name="always-show-image">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -359,13 +358,13 @@
                 <child>
                   <object class="GtkToggleButton" id="top">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="focus_on_click">False</property>
-                    <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes" 
context="sidebaralignment|top|tooltip_text">Text Extension From Upper Cell 
Border</property>
+                    <property name="can-focus">True</property>
+                    <property name="focus-on-click">False</property>
+                    <property name="receives-default">False</property>
+                    <property name="tooltip-text" translatable="yes" 
context="sidebaralignment|top|tooltip_text">Text Extension From Upper Cell 
Border</property>
                     <property name="image">image2</property>
-                    <property name="use_underline">True</property>
-                    <property name="always_show_image">True</property>
+                    <property name="use-underline">True</property>
+                    <property name="always-show-image">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -376,13 +375,13 @@
                 <child>
                   <object class="GtkToggleButton" id="standard">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="focus_on_click">False</property>
-                    <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes" 
context="sidebaralignment|standard|tooltip_text">Text Extension Inside 
Cell</property>
+                    <property name="can-focus">True</property>
+                    <property name="focus-on-click">False</property>
+                    <property name="receives-default">False</property>
+                    <property name="tooltip-text" translatable="yes" 
context="sidebaralignment|standard|tooltip_text">Text Extension Inside 
Cell</property>
                     <property name="image">image1</property>
-                    <property name="use_underline">True</property>
-                    <property name="always_show_image">True</property>
+                    <property name="use-underline">True</property>
+                    <property name="always-show-image">True</property>
                     <property name="active">True</property>
                   </object>
                   <packing>
@@ -409,12 +408,12 @@
           <object class="GtkCheckButton" id="wraptext">
             <property name="label" translatable="yes" 
context="sidebaralignment|wraptext">Wrap text</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="tooltip_text" translatable="yes" 
context="sidebaralignment|wraptext|tooltip_text">Wrap texts 
automatically.</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="tooltip-text" translatable="yes" 
context="sidebaralignment|wraptext|tooltip_text">Wrap texts 
automatically.</property>
             <property name="halign">start</property>
-            <property name="use_underline">True</property>
-            <property name="draw_indicator">True</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -426,12 +425,12 @@
           <object class="GtkCheckButton" id="mergecells">
             <property name="label" translatable="yes" 
context="sidebaralignment|mergecells">Merge cells</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="tooltip_text" translatable="yes" 
context="sidebaralignment|mergecells|tooltip_text">Joins the selected cells 
into one.</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="tooltip-text" translatable="yes" 
context="sidebaralignment|mergecells|tooltip_text">Joins the selected cells 
into one.</property>
             <property name="halign">start</property>
-            <property name="use_underline">True</property>
-            <property name="draw_indicator">True</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -441,10 +440,10 @@
         </child>
         <child>
           <object class="GtkLabel" id="leftindentlabel">
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="label" translatable="yes" 
context="sidebaralignment|leftindentlabel">_Indent:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">leftindent</property>
+            <property name="use-underline">True</property>
+            <property name="mnemonic-widget">leftindent</property>
             <property name="xalign">0</property>
           </object>
           <packing>
@@ -455,8 +454,8 @@
         </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>

Reply via email to