basctl/uiconfig/basicide/ui/colorscheme.ui       |    1 
 chart2/uiconfig/ui/sidebarcolors.ui              |    3 
 chart2/uiconfig/ui/sidebartype.ui                |    8 
 chart2/uiconfig/ui/tp_ChartType.ui               |    9 
 cui/uiconfig/ui/optsavepage.ui                   |    2 
 cui/uiconfig/ui/optuserpage.ui                   |    2 
 cui/uiconfig/ui/pickbulletpage.ui                |    8 
 cui/uiconfig/ui/textflowpage.ui                  |  418 +++----
 filter/uiconfig/ui/pdfgeneralpage.ui             |    2 
 sc/uiconfig/scalc/ui/duplicaterecordsdlg.ui      |    2 
 sc/uiconfig/scalc/ui/floatingborderstyle.ui      |   16 
 sc/uiconfig/scalc/ui/insertcells.ui              |    2 
 sc/uiconfig/scalc/ui/navigatorpanel.ui           |    7 
 sc/uiconfig/scalc/ui/notebookbar.ui              |    2 
 sc/uiconfig/scalc/ui/notebookbar_compact.ui      |    3 
 sc/uiconfig/scalc/ui/notebookbar_online.ui       |    1 
 sd/uiconfig/simpress/ui/masterpagepanelrecent.ui |    4 
 sd/uiconfig/simpress/ui/slidetransitionspanel.ui |    7 
 sfx2/uiconfig/ui/floatingrecord.ui               |    1 
 sfx2/uiconfig/ui/helpmanual.ui                   |    1 
 sfx2/uiconfig/ui/helpwindow.ui                   |    7 
 sfx2/uiconfig/ui/infobar.ui                      |    1 
 sfx2/uiconfig/ui/templatepanel.ui                |   11 
 svx/uiconfig/ui/dockingfontwork.ui               |   15 
 svx/uiconfig/ui/inspectortextpanel.ui            |    7 
 svx/uiconfig/ui/sidebarparagraph.ui              |   28 
 svx/uiconfig/ui/sidebarpossize.ui                |   14 
 svx/uiconfig/ui/xformspage.ui                    |    5 
 sw/source/core/text/porrst.cxx                   |    7 
 sw/source/core/view/pagepreviewlayout.cxx        |   15 
 sw/uiconfig/swriter/ui/commentspanel.ui          |    1 
 sw/uiconfig/swriter/ui/commentwidget.ui          |    1 
 sw/uiconfig/swriter/ui/converttexttable.ui       | 1302 +++++++++++------------
 sw/uiconfig/swriter/ui/footnotepage.ui           |    2 
 sw/uiconfig/swriter/ui/navigatorpanel.ui         |   43 
 sw/uiconfig/swriter/ui/optformataidspage.ui      |    1 
 sw/uiconfig/swriter/ui/sidebarquickfind.ui       |    6 
 sw/uiconfig/swriter/ui/sidebartableedit.ui       |   23 
 sw/uiconfig/swriter/ui/viewoptionspage.ui        |    3 
 vcl/source/control/imivctl1.cxx                  |   11 
 vcl/source/outdev/gradient.cxx                   |    4 
 41 files changed, 920 insertions(+), 1086 deletions(-)

New commits:
commit 78e89dd2169d04dad719b955951de85e01dd7668
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Thu Jun 5 17:19:09 2025 +0200
Commit:     Noel Grandin <noelgran...@gmail.com>
CommitDate: Fri Jun 6 21:28:25 2025 +0200

    tdf#166842 Use more OutputDevice::Push/Pop
    
    Which is more reliable when dealing with "no fill color".
    
    Change-Id: I88ee41a84416d55257e9649a1de9458b3cb6839d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186227
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index cf96e417e048..53fc1e3eff71 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -654,15 +654,14 @@ void SwHiddenTextPortion::Paint( const SwTextPaintInfo & 
rInf) const
 {
 #ifdef DBG_UTIL
     OutputDevice* pOut = const_cast<OutputDevice*>(rInf.GetOut());
-    Color aCol( rInf.GetOpt().GetFieldShadingsColor() );
-    Color aOldColor( pOut->GetFillColor() );
-    pOut->SetFillColor( aCol );
+    pOut->Push(vcl::PushFlags::FILLCOLOR);
+    pOut->SetFillColor( rInf.GetOpt().GetFieldShadingsColor() );
     Point aPos( rInf.GetPos() );
     aPos.AdjustY( -150 );
     aPos.AdjustX( -25 );
     SwRect aRect( aPos, Size( 100, 200 ) );
     pOut->DrawRect( aRect.SVRect() );
-    pOut->SetFillColor( aOldColor );
+    pOut->Pop();
 #else
     (void)rInf;
 #endif
diff --git a/sw/source/core/view/pagepreviewlayout.cxx 
b/sw/source/core/view/pagepreviewlayout.cxx
index a1627def992b..184d60c30650 100644
--- a/sw/source/core/view/pagepreviewlayout.cxx
+++ b/sw/source/core/view/pagepreviewlayout.cxx
@@ -1214,11 +1214,8 @@ void 
SwPagePreviewLayout::PaintSelectMarkAtPage(vcl::RenderContext& rRenderConte
 {
     OutputDevice* pOutputDev = &rRenderContext;
     MapMode aMapMode( pOutputDev->GetMapMode() );
-    // save mapping mode of output device
-    MapMode aSavedMapMode = aMapMode;
-    // save fill and line color of output device
-    Color aFill( pOutputDev->GetFillColor() );
-    Color aLine( pOutputDev->GetLineColor() );
+    // save fill and line color and mapping mode of output device
+    pOutputDev->Push(vcl::PushFlags::FILLCOLOR | vcl::PushFlags::LINECOLOR | 
vcl::PushFlags::MAPMODE);
 
     // determine selection mark color
     Color aSelPgLineColor(117, 114, 106);
@@ -1253,12 +1250,8 @@ void 
SwPagePreviewLayout::PaintSelectMarkAtPage(vcl::RenderContext& rRenderConte
     aRect = pOutputDev->PixelToLogic( aRect );
     pOutputDev->DrawRect( aRect );
 
-    // reset fill and line color of output device
-    pOutputDev->SetFillColor( aFill );
-    pOutputDev->SetLineColor( aLine );
-
-    // reset mapping mode of output device
-    pOutputDev->SetMapMode( aSavedMapMode );
+    // reset fill and line color and mapping mode of output device
+    pOutputDev->Pop();
 }
 
 /** paint to mark new selected page
diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx
index f85bcf9be57c..fd92b465ef3f 100644
--- a/vcl/source/control/imivctl1.cxx
+++ b/vcl/source/control/imivctl1.cxx
@@ -896,13 +896,14 @@ void SvxIconChoiceCtrl_Impl::LoseFocus()
 void SvxIconChoiceCtrl_Impl::PaintEmphasis(const tools::Rectangle& rTextRect,
                                            vcl::RenderContext& rRenderContext)
 {
-    rRenderContext.Push(vcl::PushFlags::FILLCOLOR);
     const Color& rFillColor = rRenderContext.GetFont().GetFillColor();
-    rRenderContext.SetFillColor(rFillColor);
-    // draw text rectangle
-    if (rFillColor != COL_TRANSPARENT)
-        rRenderContext.DrawRect(rTextRect);
+    if (rFillColor == COL_TRANSPARENT)
+        return;
 
+    // draw text rectangle
+    rRenderContext.Push(vcl::PushFlags::FILLCOLOR);
+    rRenderContext.SetFillColor(rFillColor);
+    rRenderContext.DrawRect(rTextRect);
     rRenderContext.Pop();
 }
 
diff --git a/vcl/source/outdev/gradient.cxx b/vcl/source/outdev/gradient.cxx
index e3803d660d67..1a2c3c7c00bd 100644
--- a/vcl/source/outdev/gradient.cxx
+++ b/vcl/source/outdev/gradient.cxx
@@ -146,10 +146,10 @@ void OutputDevice::DrawGradient( const 
tools::PolyPolygon& rPolyPoly,
 
     if( mpAlphaVDev )
     {
-        const Color aFillCol( mpAlphaVDev->GetFillColor() );
+        mpAlphaVDev->Push(vcl::PushFlags::FILLCOLOR);
         mpAlphaVDev->SetFillColor( COL_ALPHA_OPAQUE );
         mpAlphaVDev->DrawPolyPolygon( rPolyPoly );
-        mpAlphaVDev->SetFillColor( aFillCol );
+        mpAlphaVDev->Pop();
     }
 }
 
commit d55084f1021e48d5c2e4668e50bbc7410025225f
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Thu Jun 5 16:43:29 2025 +0200
Commit:     Noel Grandin <noelgran...@gmail.com>
CommitDate: Fri Jun 6 21:28:12 2025 +0200

    fix some lint-ui warning: adjustment used more than once
    
    Change-Id: I83d8f32489b1602af3a040ec4126ab72af8f87f5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186188
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/basctl/uiconfig/basicide/ui/colorscheme.ui 
b/basctl/uiconfig/basicide/ui/colorscheme.ui
index 7cc51fd7602f..57244abe9e69 100644
--- a/basctl/uiconfig/basicide/ui/colorscheme.ui
+++ b/basctl/uiconfig/basicide/ui/colorscheme.ui
@@ -111,7 +111,6 @@
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
-                        <property name="active">True</property>
                         <property name="draw-indicator">True</property>
                         <property name="group">opt_appcolors</property>
                       </object>
diff --git a/chart2/uiconfig/ui/sidebarcolors.ui 
b/chart2/uiconfig/ui/sidebarcolors.ui
index 95c882ecc6ce..ad602a172c90 100644
--- a/chart2/uiconfig/ui/sidebarcolors.ui
+++ b/chart2/uiconfig/ui/sidebarcolors.ui
@@ -18,7 +18,7 @@
         <child>
           <object class="GtkToolbar" id="colorpalettetype">
             <property name="visible">True</property>
-            <property name="can-focus">False</property>
+            <property name="can-focus">True</property>
             <property name="valign">start</property>
             <property name="toolbar-style">icons</property>
             <property name="show-arrow">False</property>
@@ -26,7 +26,6 @@
             <child>
               <object class="GtkMenuToolButton" id=".uno:ChartColorPalette">
                 <property name="visible">True</property>
-                <property name="can-focus">False</property>
                 <property name="tooltip-text" translatable="yes" 
context="sidebarcellappearance|bordertype|tooltip_text">Allow to select a color 
palette to apply to current chart data series.</property>
                 <property name="halign">start</property>
                 <property name="valign">start</property>
diff --git a/chart2/uiconfig/ui/sidebartype.ui 
b/chart2/uiconfig/ui/sidebartype.ui
index 9d6c348631e1..1d3cb2d1af05 100644
--- a/chart2/uiconfig/ui/sidebartype.ui
+++ b/chart2/uiconfig/ui/sidebartype.ui
@@ -8,6 +8,12 @@
     <property name="step-increment">1</property>
     <property name="page-increment">10</property>
   </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="lower">1</property>
+    <property name="upper">100</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
+  </object>
   <object class="GtkTreeStore" id="liststore1">
     <columns>
       <!-- column-name text -->
@@ -264,7 +270,7 @@
             <property name="no-show-all">True</property>
             <property name="activates-default">True</property>
             <property name="truncate-multiline">True</property>
-            <property name="adjustment">adjustment1</property>
+            <property name="adjustment">adjustment2</property>
           </object>
           <packing>
             <property name="left-attach">1</property>
diff --git a/chart2/uiconfig/ui/tp_ChartType.ui 
b/chart2/uiconfig/ui/tp_ChartType.ui
index bdd9427768b1..631ce5f98360 100644
--- a/chart2/uiconfig/ui/tp_ChartType.ui
+++ b/chart2/uiconfig/ui/tp_ChartType.ui
@@ -9,6 +9,13 @@
     <property name="step-increment">1</property>
     <property name="page-increment">10</property>
   </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="lower">1</property>
+    <property name="upper">100</property>
+    <property name="value">1</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
+  </object>
   <object class="GtkTreeStore" id="liststore1">
     <columns>
       <!-- column-name text -->
@@ -470,7 +477,7 @@
                             <property name="no-show-all">True</property>
                             <property name="activates-default">True</property>
                             <property name="truncate-multiline">True</property>
-                            <property name="adjustment">adjustment1</property>
+                            <property name="adjustment">adjustment2</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" 
id="compositesize-atkobject">
                                 <property 
name="AtkObject::accessible-description" translatable="yes" 
context="tp_ChartType|extended_tip|compositesize">Set the number of entries in 
an of-pie chart composite wedge.</property>
diff --git a/cui/uiconfig/ui/optsavepage.ui b/cui/uiconfig/ui/optsavepage.ui
index fe1f858f1fbe..16484511e63e 100644
--- a/cui/uiconfig/ui/optsavepage.ui
+++ b/cui/uiconfig/ui/optsavepage.ui
@@ -527,7 +527,7 @@
                 </items>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="odfversion-atkobject">
-                      <property name="AtkObject::accessible-description" 
translatable="yes" context="odfversion">Some companies or organizations may 
require ODF documents in the ODF 1.0/1.1/1.2 or ODF 1.3 format. You can select 
these format to save in the listbox. These older formats cannot store all new 
features, so the new format ODF 1.4 (Extended) is recommended where 
possible.</property>
+                    <property name="AtkObject::accessible-description" 
translatable="yes" context="odfversion">Some companies or organizations may 
require ODF documents in the ODF 1.0/1.1/1.2 or ODF 1.3 format. You can select 
these format to save in the listbox. These older formats cannot store all new 
features, so the new format ODF 1.4 (Extended) is recommended where 
possible.</property>
                   </object>
                 </child>
               </object>
diff --git a/cui/uiconfig/ui/optuserpage.ui b/cui/uiconfig/ui/optuserpage.ui
index 81b26e61599e..88ec3244f89f 100644
--- a/cui/uiconfig/ui/optuserpage.ui
+++ b/cui/uiconfig/ui/optuserpage.ui
@@ -1197,6 +1197,7 @@
                 <property name="can-focus">True</property>
                 <property name="hexpand">True</property>
                 <property name="editable">False</property>
+                <property name="truncate-multiline">True</property>
                 <property name="placeholder-text" translatable="yes" 
context="optuserpage|signingkey">No key</property>
               </object>
               <packing>
@@ -1210,6 +1211,7 @@
                 <property name="can-focus">True</property>
                 <property name="hexpand">True</property>
                 <property name="editable">False</property>
+                <property name="truncate-multiline">True</property>
                 <property name="placeholder-text" translatable="yes" 
context="optuserpage|encryptionkey">No key</property>
               </object>
               <packing>
diff --git a/cui/uiconfig/ui/pickbulletpage.ui 
b/cui/uiconfig/ui/pickbulletpage.ui
index fade087747f3..c1457043fe6d 100644
--- a/cui/uiconfig/ui/pickbulletpage.ui
+++ b/cui/uiconfig/ui/pickbulletpage.ui
@@ -55,10 +55,10 @@
         <property name="receives-default">False</property>
         <property name="halign">end</property>
       </object>
-        <packing>
-          <property name="left-attach">1</property>
-          <property name="top-attach">2</property>
-        </packing>
+      <packing>
+        <property name="left-attach">1</property>
+        <property name="top-attach">2</property>
+      </packing>
     </child>
     <child internal-child="accessible">
       <object class="AtkObject" id="PickBulletPage-atkobject">
diff --git a/cui/uiconfig/ui/textflowpage.ui b/cui/uiconfig/ui/textflowpage.ui
index b7fed6abcd19..24e1b4c95781 100644
--- a/cui/uiconfig/ui/textflowpage.ui
+++ b/cui/uiconfig/ui/textflowpage.ui
@@ -393,226 +393,226 @@
         <property name="events">GDK_EXPOSURE_MASK</property>
         <property name="label-xalign">0</property>
         <property name="shadow-type">none</property>
-          <!-- n-columns=2 n-rows=8 -->
+        <!-- n-columns=2 n-rows=8 -->
+        <child>
+          <!-- n-columns=2 n-rows=1 -->
+          <object class="GtkGrid" id="gridHyphenAcross">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="margin-start">12</property>
+            <property name="margin-top">6</property>
+            <property name="row-spacing">6</property>
+            <property name="column-spacing">12</property>
             <child>
-              <!-- n-columns=2 n-rows=1 -->
-              <object class="GtkGrid" id="gridHyphenAcross">
+              <object class="GtkCheckButton" id="checkAcrossParagraph">
+                <property name="label" translatable="yes" 
context="textflowpage|checkAcrossParagraph">Last full line of 
paragraph</property>
                 <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="margin-start">12</property>
-                <property name="margin-top">6</property>
-                <property name="row-spacing">6</property>
-                <property name="column-spacing">12</property>
-                <child>
-                  <object class="GtkCheckButton" id="checkAcrossParagraph">
-                    <property name="label" translatable="yes" 
context="textflowpage|checkAcrossParagraph">Last full line of 
paragraph</property>
-                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="receives-default">False</property>
-                    <property name="use-underline">True</property>
-                    <property name="inconsistent">True</property>
-                    <property name="draw-indicator">True</property>
-                    <child internal-child="accessible">
-                      <object class="AtkObject" 
id="checkAcrossParagraph-atkobject">
-                        <property name="AtkObject::accessible-description" 
translatable="yes" 
context="textflowpage|extended_tip|checkAcrossParagraph">Deselect this check 
box, if you don't want to hyphenate across the last full line of paragraph, 
column, page and spread.</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="checkAcrossColumn">
-                    <property name="label" translatable="yes" 
context="textflowpage|checkAcrossColumn">Column</property>
-                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="receives-default">False</property>
-                    <property name="use-underline">True</property>
-                    <property name="inconsistent">True</property>
-                    <property name="draw-indicator">True</property>
-                    <child internal-child="accessible">
-                      <object class="AtkObject" 
id="checkAcrossColumn-atkobject">
-                        <property name="AtkObject::accessible-description" 
translatable="yes" 
context="textflowpage|extended_tip|checkAcrossColumn">Deselect this check box, 
if you don't want to hyphenate across column, page and spread.</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="checkAcrossPage">
-                    <property name="label" translatable="yes" 
context="textflowpage|checkAcrossPage">Page</property>
-                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="receives-default">False</property>
-                    <property name="use-underline">True</property>
-                    <property name="inconsistent">True</property>
-                    <property name="draw-indicator">True</property>
-                    <child internal-child="accessible">
-                      <object class="AtkObject" id="checkAcrossPage-atkobject">
-                        <property name="AtkObject::accessible-description" 
translatable="yes" context="textflowpage|extended_tip|checkAcrossPage">Deselect 
this check box, if you don't want to hyphenate across page and 
spread.</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="checkAcrossSpread">
-                    <property name="label" translatable="yes" 
context="textflowpage|checkAcrossSpread">Spread</property>
-                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="receives-default">False</property>
-                    <property name="use-underline">True</property>
-                    <property name="inconsistent">True</property>
-                    <property name="draw-indicator">True</property>
-                    <child internal-child="accessible">
-                      <object class="AtkObject" 
id="checkAcrossSpread-atkobject">
-                        <property name="AtkObject::accessible-description" 
translatable="yes" 
context="textflowpage|extended_tip|checkAcrossSpread">Deselect this check box, 
if you don't want to hyphenate across spread.</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSpinButton" id="spinParagraphEndZone">
-                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="activates-default">True</property>
-                    <property name="truncate-multiline">True</property>
-                    <property name="adjustment">adjustment10</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">2</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="labelParagraphEndZone">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="textflowpage|labelParagraphEndZone">Paragraph end _zone:</property>
-                    <property name="use-underline">True</property>
-                    <property 
name="mnemonic-widget">spinParagraphEndZone</property>
-                    <property name="xalign">0</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSpinButton" id="spinColumnEndZone">
-                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="activates-default">True</property>
-                    <property name="truncate-multiline">True</property>
-                    <property name="adjustment">adjustment11</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">2</property>
-                    <property name="top-attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="labelColumnEndZone">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="textflowpage|labelColumnEndZone">Column end _zone:</property>
-                    <property name="use-underline">True</property>
-                    <property 
name="mnemonic-widget">spinColumnEndZone</property>
-                    <property name="xalign">0</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSpinButton" id="spinPageEndZone">
-                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="activates-default">True</property>
-                    <property name="truncate-multiline">True</property>
-                    <property name="adjustment">adjustment12</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="use-underline">True</property>
+                <property name="inconsistent">True</property>
+                <property name="draw-indicator">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" 
id="checkAcrossParagraph-atkobject">
+                    <property name="AtkObject::accessible-description" 
translatable="yes" 
context="textflowpage|extended_tip|checkAcrossParagraph">Deselect this check 
box, if you don't want to hyphenate across the last full line of paragraph, 
column, page and spread.</property>
                   </object>
-                  <packing>
-                    <property name="left-attach">2</property>
-                    <property name="top-attach">2</property>
-                  </packing>
                 </child>
-                <child>
-                  <object class="GtkLabel" id="labelPageEndZone">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="textflowpage|labelPageEndZone">Page end _zone:</property>
-                    <property name="use-underline">True</property>
-                    <property name="mnemonic-widget">spinPageEndZone</property>
-                    <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="checkAcrossColumn">
+                <property name="label" translatable="yes" 
context="textflowpage|checkAcrossColumn">Column</property>
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="use-underline">True</property>
+                <property name="inconsistent">True</property>
+                <property name="draw-indicator">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="checkAcrossColumn-atkobject">
+                    <property name="AtkObject::accessible-description" 
translatable="yes" 
context="textflowpage|extended_tip|checkAcrossColumn">Deselect this check box, 
if you don't want to hyphenate across column, page and spread.</property>
                   </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">2</property>
-                  </packing>
                 </child>
-                <child>
-                  <object class="GtkSpinButton" id="spinSpreadEndZone">
-                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="activates-default">True</property>
-                    <property name="truncate-multiline">True</property>
-                    <property name="adjustment">adjustment13</property>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="checkAcrossPage">
+                <property name="label" translatable="yes" 
context="textflowpage|checkAcrossPage">Page</property>
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="use-underline">True</property>
+                <property name="inconsistent">True</property>
+                <property name="draw-indicator">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="checkAcrossPage-atkobject">
+                    <property name="AtkObject::accessible-description" 
translatable="yes" context="textflowpage|extended_tip|checkAcrossPage">Deselect 
this check box, if you don't want to hyphenate across page and 
spread.</property>
                   </object>
-                  <packing>
-                    <property name="left-attach">2</property>
-                    <property name="top-attach">3</property>
-                  </packing>
                 </child>
-                <child>
-                  <object class="GtkLabel" id="labelSpreadEndZone">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="textflowpage|labelSpreadEndZone">Spread end _zone:</property>
-                    <property name="use-underline">True</property>
-                    <property 
name="mnemonic-widget">spinSpreadEndZone</property>
-                    <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="checkAcrossSpread">
+                <property name="label" translatable="yes" 
context="textflowpage|checkAcrossSpread">Spread</property>
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="use-underline">True</property>
+                <property name="inconsistent">True</property>
+                <property name="draw-indicator">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="checkAcrossSpread-atkobject">
+                    <property name="AtkObject::accessible-description" 
translatable="yes" 
context="textflowpage|extended_tip|checkAcrossSpread">Deselect this check box, 
if you don't want to hyphenate across spread.</property>
                   </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">3</property>
-                  </packing>
                 </child>
-                <child>
-                  <object class="GtkCheckButton" id="checkMoveLine">
-                    <property name="label" translatable="yes" 
context="textflowpage|checkMoveLine">Move Line</property>
-                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="receives-default">False</property>
-                    <property name="use-underline">True</property>
-                    <property name="inconsistent">True</property>
-                    <property name="draw-indicator">True</property>
-                    <child internal-child="accessible">
-                      <object class="AtkObject" id="checkMoveLine-atkobject">
-                        <property name="AtkObject::accessible-description" 
translatable="yes" context="textflowpage|extended_tip|checkMoveLine">Deselect 
this check box, if you don't want to move the entire hyphenated line to the 
next text block.</property>
-                      </object>
-                    </child>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSpinButton" id="spinParagraphEndZone">
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="activates-default">True</property>
+                <property name="truncate-multiline">True</property>
+                <property name="adjustment">adjustment10</property>
+              </object>
+              <packing>
+                <property name="left-attach">2</property>
+                <property name="top-attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="labelParagraphEndZone">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" 
context="textflowpage|labelParagraphEndZone">Paragraph end _zone:</property>
+                <property name="use-underline">True</property>
+                <property 
name="mnemonic-widget">spinParagraphEndZone</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSpinButton" id="spinColumnEndZone">
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="activates-default">True</property>
+                <property name="truncate-multiline">True</property>
+                <property name="adjustment">adjustment11</property>
+              </object>
+              <packing>
+                <property name="left-attach">2</property>
+                <property name="top-attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="labelColumnEndZone">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" 
context="textflowpage|labelColumnEndZone">Column end _zone:</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">spinColumnEndZone</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSpinButton" id="spinPageEndZone">
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="activates-default">True</property>
+                <property name="truncate-multiline">True</property>
+                <property name="adjustment">adjustment12</property>
+              </object>
+              <packing>
+                <property name="left-attach">2</property>
+                <property name="top-attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="labelPageEndZone">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" 
context="textflowpage|labelPageEndZone">Page end _zone:</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">spinPageEndZone</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSpinButton" id="spinSpreadEndZone">
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="activates-default">True</property>
+                <property name="truncate-multiline">True</property>
+                <property name="adjustment">adjustment13</property>
+              </object>
+              <packing>
+                <property name="left-attach">2</property>
+                <property name="top-attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="labelSpreadEndZone">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" 
context="textflowpage|labelSpreadEndZone">Spread end _zone:</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">spinSpreadEndZone</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="checkMoveLine">
+                <property name="label" translatable="yes" 
context="textflowpage|checkMoveLine">Move Line</property>
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="use-underline">True</property>
+                <property name="inconsistent">True</property>
+                <property name="draw-indicator">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="checkMoveLine-atkobject">
+                    <property name="AtkObject::accessible-description" 
translatable="yes" context="textflowpage|extended_tip|checkMoveLine">Deselect 
this check box, if you don't want to move the entire hyphenated line to the 
next text block.</property>
                   </object>
-                  <packing>
-                    <property name="left-attach">3</property>
-                    <property name="top-attach">3</property>
-                  </packing>
                 </child>
               </object>
+              <packing>
+                <property name="left-attach">3</property>
+                <property name="top-attach">3</property>
+              </packing>
             </child>
+          </object>
+        </child>
         <child type="label">
           <object class="GtkLabel" id="labelHyphenAcross">
             <property name="visible">True</property>
@@ -736,9 +736,9 @@
                   <relation type="label-for" target="spinPageNumber"/>
                 </accessibility>
                 <child internal-child="accessible">
-                    <object class="AtkObject" id="pagenumcb-atkobject">
-                        <property name="AtkObject::accessible-description" 
translatable="yes" context="insertbreak|pagenumcb-atkobject">Assigns the page 
number that you specify to the page that follows the manual page break. This 
option is only available if you assign an arbitrary page style to the page that 
follows manual page break.</property>
-                    </object>
+                  <object class="AtkObject" id="pagenumcb-atkobject">
+                    <property name="AtkObject::accessible-description" 
translatable="yes" context="insertbreak|pagenumcb-atkobject">Assigns the page 
number that you specify to the page that follows the manual page break. This 
option is only available if you assign an arbitrary page style to the page that 
follows manual page break.</property>
+                  </object>
                 </child>
               </object>
               <packing>
diff --git a/filter/uiconfig/ui/pdfgeneralpage.ui 
b/filter/uiconfig/ui/pdfgeneralpage.ui
index 0d8c8983424c..5dea05536721 100644
--- a/filter/uiconfig/ui/pdfgeneralpage.ui
+++ b/filter/uiconfig/ui/pdfgeneralpage.ui
@@ -698,7 +698,6 @@
               <object class="GtkGrid" id="forms_grid">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="double-buffered">False</property>
                 <property name="margin-start">12</property>
                 <property name="margin-top">6</property>
                 <property name="row-spacing">3</property>
@@ -707,7 +706,6 @@
                   <object class="GtkGrid" id="forms_options_grid">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="double-buffered">False</property>
                     <property name="margin-start">18</property>
                     <property name="hexpand">True</property>
                     <property name="row-spacing">6</property>
diff --git a/sc/uiconfig/scalc/ui/duplicaterecordsdlg.ui 
b/sc/uiconfig/scalc/ui/duplicaterecordsdlg.ui
index e0086b4480a5..d6637e1d584a 100644
--- a/sc/uiconfig/scalc/ui/duplicaterecordsdlg.ui
+++ b/sc/uiconfig/scalc/ui/duplicaterecordsdlg.ui
@@ -220,7 +220,6 @@
                     <property name="receives-default">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="duplicaterecordsdialog|column">Compare columns.</property>
                     <property name="use-underline">True</property>
-                    <property name="active">True</property>
                     <property name="draw-indicator">True</property>
                     <property name="group">row</property>
                   </object>
@@ -265,7 +264,6 @@
                     <property name="receives-default">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="duplicaterecordsdialog|remove">Remove duplicate records.</property>
                     <property name="use-underline">True</property>
-                    <property name="active">True</property>
                     <property name="draw-indicator">True</property>
                     <property name="group">select</property>
                   </object>
diff --git a/sc/uiconfig/scalc/ui/floatingborderstyle.ui 
b/sc/uiconfig/scalc/ui/floatingborderstyle.ui
index 294185940224..ad2f82c50335 100644
--- a/sc/uiconfig/scalc/ui/floatingborderstyle.ui
+++ b/sc/uiconfig/scalc/ui/floatingborderstyle.ui
@@ -31,7 +31,6 @@
                 <child>
                   <object class="GtkToolButton" id="none">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property 
name="icon-name">sc/res/sidebar/CellBorder_Empty_18x18.png</property>
                   </object>
                   <packing>
@@ -42,7 +41,6 @@
                 <child>
                   <object class="GtkToolButton" id="all">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property 
name="icon-name">sc/res/sidebar/CellBorder_All_18x18.png</property>
                   </object>
                   <packing>
@@ -53,7 +51,6 @@
                 <child>
                   <object class="GtkToolButton" id="outside">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property 
name="icon-name">sc/res/sidebar/CellBorder_FourBorders_18x18.png</property>
                   </object>
                   <packing>
@@ -64,7 +61,6 @@
                 <child>
                   <object class="GtkToolButton" id="thickbox">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property 
name="icon-name">sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.png</property>
                   </object>
                   <packing>
@@ -87,7 +83,6 @@
                 <child>
                   <object class="GtkToolButton" id="thickbottom">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property 
name="icon-name">sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png</property>
                   </object>
                   <packing>
@@ -98,7 +93,6 @@
                 <child>
                   <object class="GtkToolButton" id="doublebottom">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property 
name="icon-name">sc/res/sidebar/CellBorder_Bottom_Double_18x18.png</property>
                   </object>
                   <packing>
@@ -109,7 +103,6 @@
                 <child>
                   <object class="GtkToolButton" id="topthickbottom">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property 
name="icon-name">sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.png</property>
                   </object>
                   <packing>
@@ -120,7 +113,6 @@
                 <child>
                   <object class="GtkToolButton" id="topdoublebottom">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property 
name="icon-name">sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.png</property>
                   </object>
                   <packing>
@@ -143,7 +135,6 @@
                 <child>
                   <object class="GtkToolButton" id="left">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property 
name="icon-name">sc/res/sidebar/CellBorder_Left_18x18.png</property>
                   </object>
                   <packing>
@@ -154,7 +145,6 @@
                 <child>
                   <object class="GtkToolButton" id="right">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property 
name="icon-name">sc/res/sidebar/CellBorder_Right_18x18.png</property>
                   </object>
                   <packing>
@@ -165,7 +155,6 @@
                 <child>
                   <object class="GtkToolButton" id="top">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property 
name="icon-name">sc/res/sidebar/CellBorder_Top_18x18.png</property>
                   </object>
                   <packing>
@@ -176,7 +165,6 @@
                 <child>
                   <object class="GtkToolButton" id="bottom">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property 
name="icon-name">sc/res/sidebar/CellBorder_Bottom_18x18.png</property>
                   </object>
                   <packing>
@@ -199,7 +187,6 @@
                 <child>
                   <object class="GtkToolButton" id="diagup">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                     <property 
name="icon-name">sc/res/sidebar/CellBorder_RightDiagonal_18x18.png</property>
                   </object>
@@ -211,7 +198,6 @@
                 <child>
                   <object class="GtkToolButton" id="diagdown">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                     <property 
name="icon-name">sc/res/sidebar/CellBorder_LeftDiagonal_18x18.png</property>
                   </object>
@@ -223,7 +209,6 @@
                 <child>
                   <object class="GtkToolButton" id="topbottom">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                     <property 
name="icon-name">sc/res/sidebar/CellBorder_TopAndBottom_18x18.png</property>
                   </object>
@@ -235,7 +220,6 @@
                 <child>
                   <object class="GtkToolButton" id="leftright">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                     <property 
name="icon-name">sc/res/sidebar/CellBorder_LeftAndRight_18x18.png</property>
                   </object>
diff --git a/sc/uiconfig/scalc/ui/insertcells.ui 
b/sc/uiconfig/scalc/ui/insertcells.ui
index 1f047b7b4867..00f7f99103bc 100644
--- a/sc/uiconfig/scalc/ui/insertcells.ui
+++ b/sc/uiconfig/scalc/ui/insertcells.ui
@@ -189,6 +189,7 @@
                     <property name="secondary-icon-tooltip-text" 
translatable="yes" context="insertcells|number_of_rows">Number of 
rows</property>
                     <property 
name="adjustment">number_of_rows_adjustment</property>
                     <property name="numeric">True</property>
+                    <property name="truncate-multiline">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="number_of_rows-atkobject">
                         <property name="AtkObject::accessible-description" 
translatable="yes" context="insertcells|extended_tip|number_of_rows">Specify 
the number of rows to insert.</property>
@@ -209,6 +210,7 @@
                     <property name="secondary-icon-tooltip-text" 
translatable="yes" context="insertcells|number_of_columns">Number of 
columns</property>
                     <property 
name="adjustment">number_of_columns_adjustment</property>
                     <property name="numeric">True</property>
+                    <property name="truncate-multiline">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" 
id="number_of_columns-atkobject">
                         <property name="AtkObject::accessible-description" 
translatable="yes" context="insertcells|extended_tip|number_of_columns">Specify 
the number of columns to insert.</property>
diff --git a/sc/uiconfig/scalc/ui/navigatorpanel.ui 
b/sc/uiconfig/scalc/ui/navigatorpanel.ui
index 82609ecbdcfe..1af577a6133b 100644
--- a/sc/uiconfig/scalc/ui/navigatorpanel.ui
+++ b/sc/uiconfig/scalc/ui/navigatorpanel.ui
@@ -183,7 +183,6 @@
                 <child>
                   <object class="GtkToolButton" id="datarange">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="navigatorpanel|datarange|tooltip_text">Data Range</property>
                     <property name="icon-name">sc/res/na03.png</property>
                     <child internal-child="accessible">
@@ -200,7 +199,6 @@
                 <child>
                   <object class="GtkToolButton" id="start">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="navigatorpanel|start|tooltip_text">Start</property>
                     <property name="icon-name">sc/res/na05.png</property>
                     <child internal-child="accessible">
@@ -217,7 +215,6 @@
                 <child>
                   <object class="GtkToolButton" id="end">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="navigatorpanel|end|tooltip_text">End</property>
                     <property name="icon-name">sc/res/na06.png</property>
                     <child internal-child="accessible">
@@ -234,7 +231,6 @@
                 <child>
                   <object class="GtkToggleToolButton" id="contents">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="navigatorpanel|contents|tooltip_text">Contents</property>
                     <property name="icon-name">sc/res/na011.png</property>
                   </object>
@@ -259,7 +255,6 @@
                 <child>
                   <object class="GtkToggleToolButton" id="toggle">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="navigatorpanel|toggle|tooltip_text">Toggle</property>
                     <property name="icon-name">sc/res/na010.png</property>
                     <child internal-child="accessible">
@@ -276,7 +271,6 @@
                 <child>
                   <object class="GtkToggleToolButton" id="scenarios">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="navigatorpanel|scenarios|tooltip_text">Scenarios</property>
                     <property name="icon-name">sc/res/na07.png</property>
                     <child internal-child="accessible">
@@ -293,7 +287,6 @@
                 <child>
                   <object class="GtkMenuToolButton" id="dragmode">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="navigatorpanel|dragmode|tooltip_text">Drag Mode</property>
                     <property name="icon-name">sc/res/na09.png</property>
                     <child internal-child="accessible">
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index 85f1dda0a3a2..ffe980ce2baa 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -7277,7 +7277,6 @@
                                 <child>
                                   <object class="GtkToolButton" 
id="Data-Calculate">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property 
name="action_name">.uno:Calculate</property>
                                   </object>
                                   <packing>
@@ -7300,7 +7299,6 @@
                                 <child>
                                   <object class="GtkToolButton" 
id="Data-HandleDuplicateRecords">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
                                     <property 
name="action_name">.uno:HandleDuplicateRecords</property>
                                   </object>
                                   <packing>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui 
b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
index 513679ec6ce1..0ed02fc4c71e 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
@@ -4742,7 +4742,8 @@
                         </child>
                         <child>
                           <object class="sfxlo-NotebookbarToolBox" 
id="SectionBottom38b">
-                            <property name="visible">False</property> <!-- no 
icon yet -->
+                            <property name="visible">False</property>
+                            <!-- no icon yet -->
                             <property name="can_focus">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_online.ui 
b/sc/uiconfig/scalc/ui/notebookbar_online.ui
index bea44e0eeb61..34c72a531b22 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_online.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_online.ui
@@ -79,6 +79,7 @@
             <property name="top_attach">0</property>
           </packing>
           <object class="GtkToolbar" id="WeldedToolbar">
+            <property name="can-focus">True</property>
             <child>
               <object class="GtkMenuToolButton" id="NumberFormatCurrency">
                 <property name="visible">True</property>
diff --git a/sd/uiconfig/simpress/ui/masterpagepanelrecent.ui 
b/sd/uiconfig/simpress/ui/masterpagepanelrecent.ui
index 20063199c4f5..fca5af7a346a 100644
--- a/sd/uiconfig/simpress/ui/masterpagepanelrecent.ui
+++ b/sd/uiconfig/simpress/ui/masterpagepanelrecent.ui
@@ -10,7 +10,7 @@
       <!-- column-name id -->
       <column type="gchararray"/>
     </columns>
-    </object>
+  </object>
   <object class="GtkBox" id="MasterPagePanel">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
@@ -41,7 +41,7 @@
                 <property name="AtkObject::accessible-description" 
translatable="yes" 
context="masterpagerecentpanel|extended_tip|masterpagerecent_icons">Select 
recently used master slide.</property>
               </object>
             </child>
-        </object>
+          </object>
         </child>
       </object>
       <packing>
diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui 
b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
index bc214c726714..a9cf473d70c2 100644
--- a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
+++ b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
@@ -12,6 +12,11 @@
     <property name="step-increment">1</property>
     <property name="page-increment">10</property>
   </object>
+  <object class="GtkAdjustment" id="adjustment3">
+    <property name="upper">1000</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
+  </object>
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
@@ -397,7 +402,7 @@
                     <property name="can-focus">True</property>
                     <property name="hexpand">True</property>
                     <property name="truncate-multiline">True</property>
-                    <property name="adjustment">adjustment1</property>
+                    <property name="adjustment">adjustment3</property>
                     <property name="digits">2</property>
                     <accessibility>
                       <relation type="labelled-by" target="rb_auto_repeat"/>
diff --git a/sfx2/uiconfig/ui/floatingrecord.ui 
b/sfx2/uiconfig/ui/floatingrecord.ui
index 805cd33afe66..306eeb54075d 100644
--- a/sfx2/uiconfig/ui/floatingrecord.ui
+++ b/sfx2/uiconfig/ui/floatingrecord.ui
@@ -39,7 +39,6 @@
             <child>
               <object class="GtkToolButton" id=".uno:StopRecording">
                 <property name="visible">True</property>
-                <property name="can-focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
                 <property name="use-underline">True</property>
diff --git a/sfx2/uiconfig/ui/helpmanual.ui b/sfx2/uiconfig/ui/helpmanual.ui
index 335845614077..62275ae8ccae 100644
--- a/sfx2/uiconfig/ui/helpmanual.ui
+++ b/sfx2/uiconfig/ui/helpmanual.ui
@@ -85,7 +85,6 @@
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
-                <property name="xalign">0</property>
                 <property name="draw-indicator">True</property>
               </object>
               <packing>
diff --git a/sfx2/uiconfig/ui/helpwindow.ui b/sfx2/uiconfig/ui/helpwindow.ui
index 31692552b468..f4e6e69bda8f 100644
--- a/sfx2/uiconfig/ui/helpwindow.ui
+++ b/sfx2/uiconfig/ui/helpwindow.ui
@@ -46,7 +46,6 @@
                 <child>
                   <object class="GtkToolButton" id="index">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property 
name="icon-name">sfx2/res/indexon_small.png</property>
                   </object>
                   <packing>
@@ -67,7 +66,6 @@
                 <child>
                   <object class="GtkToolButton" id="backward">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="helpwindow|backward|tooltip_text">Previous Page</property>
                     <property name="icon-name">res/sc06301.png</property>
                   </object>
@@ -79,7 +77,6 @@
                 <child>
                   <object class="GtkToolButton" id="forward">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="helpwindow|forward|tooltip_text">Next Page</property>
                     <property name="icon-name">res/sc06300.png</property>
                   </object>
@@ -91,7 +88,6 @@
                 <child>
                   <object class="GtkToolButton" id="start">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="helpwindow|start|tooltip_text">First Page</property>
                     <property name="icon-name">res/sc06303.png</property>
                   </object>
@@ -113,7 +109,6 @@
                 <child>
                   <object class="GtkToolButton" id="print">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="helpwindow|print|tooltip_text">Print</property>
                     <property name="icon-name">res/sc05504.png</property>
                   </object>
@@ -125,7 +120,6 @@
                 <child>
                   <object class="GtkToolButton" id="bookmarks">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="helpwindow|bookmarks|tooltip_text">Add to Bookmarks</property>
                     <property 
name="icon-name">sfx2/res/favourite.png</property>
                   </object>
@@ -137,7 +131,6 @@
                 <child>
                   <object class="GtkToolButton" id="searchdialog">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="helpwindow|searchdialog|tooltip_text">Find on this Page</property>
                     <property name="icon-name">sfx2/res/sc05961.png</property>
                   </object>
diff --git a/sfx2/uiconfig/ui/infobar.ui b/sfx2/uiconfig/ui/infobar.ui
index 0caeecd2a513..3f07a5204dac 100644
--- a/sfx2/uiconfig/ui/infobar.ui
+++ b/sfx2/uiconfig/ui/infobar.ui
@@ -62,7 +62,6 @@
                         <child>
                           <object class="GtkToolButton" id="close">
                             <property name="visible">True</property>
-                            <property name="can-focus">False</property>
                             <property name="tooltip-text" translatable="yes" 
context="infobar|close|tooltip_text">Close Infobar</property>
                             <property 
name="icon-name">window-close-symbolic</property>
                           </object>
diff --git a/sfx2/uiconfig/ui/templatepanel.ui 
b/sfx2/uiconfig/ui/templatepanel.ui
index 239249f2f9f0..cefdcefea1c5 100644
--- a/sfx2/uiconfig/ui/templatepanel.ui
+++ b/sfx2/uiconfig/ui/templatepanel.ui
@@ -43,7 +43,6 @@
             <property name="icon_size">2</property>
             <child>
               <object class="GtkToggleToolButton" id="2">
-                <property name="can-focus">False</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -53,7 +52,6 @@
             </child>
             <child>
               <object class="GtkToggleToolButton" id="1">
-                <property name="can-focus">False</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -63,7 +61,6 @@
             </child>
             <child>
               <object class="GtkToggleToolButton" id="3">
-                <property name="can-focus">False</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -73,7 +70,6 @@
             </child>
             <child>
               <object class="GtkToggleToolButton" id="4">
-                <property name="can-focus">False</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -83,7 +79,6 @@
             </child>
             <child>
               <object class="GtkToggleToolButton" id="5">
-                <property name="can-focus">False</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -93,7 +88,6 @@
             </child>
             <child>
               <object class="GtkToggleToolButton" id="6">
-                <property name="can-focus">False</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -103,7 +97,6 @@
             </child>
             <child>
               <object class="GtkToggleToolButton" id="65535">
-                <property name="can-focus">False</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -128,7 +121,6 @@
             <child>
               <object class="GtkToggleToolButton" id="watercan">
                 <property name="visible">True</property>
-                <property name="can-focus">False</property>
                 <property name="tooltip-text" translatable="yes" 
context="templatepanel|STR_STYLE_FILL_FORMAT_MODE">Fill Format Mode</property>
                 <property name="use-underline">True</property>
                 <property name="icon-name">res/sc05554.png</property>
@@ -147,7 +139,6 @@
             <child>
               <object class="GtkToolButton" id="new">
                 <property name="visible">True</property>
-                <property name="can-focus">False</property>
                 <property name="tooltip-text" translatable="yes" 
context="templatepanel|STR_STYLE_NEW_STYLE_FROM_SELECTION">New Style from 
Selection</property>
                 <property name="use-underline">True</property>
                 <property name="icon-name">res/sc05555.png</property>
@@ -164,7 +155,6 @@
             </child>
             <child>
               <object class="GtkMenuToolButton" id="newmenu">
-                <property name="can-focus">False</property>
                 <property name="no-show-all">True</property>
                 <property name="tooltip-text" translatable="yes" 
context="templatepanel|STR_STYLE_NEW_STYLE_ACTION">Styles actions</property>
                 <property name="use-underline">True</property>
@@ -183,7 +173,6 @@
             <child>
               <object class="GtkToolButton" id="update">
                 <property name="visible">True</property>
-                <property name="can-focus">False</property>
                 <property name="tooltip-text" translatable="yes" 
context="templatepanel|STR_STYLE_UPDATE_STYLE">Update Style</property>
                 <property name="use-underline">True</property>
                 <property name="icon-name">res/sc05556.png</property>
diff --git a/svx/uiconfig/ui/dockingfontwork.ui 
b/svx/uiconfig/ui/dockingfontwork.ui
index 1f2f2fd55638..5ec3b528ad48 100644
--- a/svx/uiconfig/ui/dockingfontwork.ui
+++ b/svx/uiconfig/ui/dockingfontwork.ui
@@ -51,7 +51,6 @@
                 <child>
                   <object class="GtkRadioToolButton" id="off">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|off|tooltip_text">Baseline Off</property>
                     <property name="use-underline">True</property>
                     <property name="icon-name">svx/res/fw01.png</property>
@@ -80,7 +79,6 @@
                 <child>
                   <object class="GtkRadioToolButton" id="rotate">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|rotate|tooltip_text">Rotate</property>
                     <property name="use-underline">True</property>
                     <property name="icon-name">svx/res/fw02.png</property>
@@ -99,7 +97,6 @@
                 <child>
                   <object class="GtkRadioToolButton" id="upright">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|upright|tooltip_text">Upright</property>
                     <property name="use-underline">True</property>
                     <property name="icon-name">svx/res/fw03.png</property>
@@ -118,7 +115,6 @@
                 <child>
                   <object class="GtkRadioToolButton" id="hori">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|hori|tooltip_text">Slant Horizontal</property>
                     <property name="use-underline">True</property>
                     <property name="icon-name">svx/res/fw04.png</property>
@@ -137,7 +133,6 @@
                 <child>
                   <object class="GtkRadioToolButton" id="vert">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|vert|tooltip_text">Slant Vertical</property>
                     <property name="use-underline">True</property>
                     <property name="icon-name">svx/res/fw05.png</property>
@@ -186,7 +181,6 @@
                 <child>
                   <object class="GtkToggleToolButton" id="orientation">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|orientation|tooltip_text">Orientation</property>
                     <property name="use-underline">True</property>
                     <property name="icon-name">svx/res/fw06.png</property>
@@ -214,7 +208,6 @@
                 <child>
                   <object class="GtkRadioToolButton" id="left">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|left|tooltip_text">Align Left</property>
                     <property name="use-underline">True</property>
                     <property name="icon-name">svx/res/fw07.png</property>
@@ -233,7 +226,6 @@
                 <child>
                   <object class="GtkRadioToolButton" id="center">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|center|tooltip_text">Align Center</property>
                     <property name="use-underline">True</property>
                     <property name="icon-name">svx/res/fw08.png</property>
@@ -252,7 +244,6 @@
                 <child>
                   <object class="GtkRadioToolButton" id="right">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|right|tooltip_text">Align Right</property>
                     <property name="use-underline">True</property>
                     <property name="icon-name">svx/res/fw09.png</property>
@@ -271,7 +262,6 @@
                 <child>
                   <object class="GtkRadioToolButton" id="autosize">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|autosize|tooltip_text">AutoSize Text</property>
                     <property name="use-underline">True</property>
                     <property name="icon-name">svx/res/fw010.png</property>
@@ -320,7 +310,6 @@
                 <child>
                   <object class="GtkToggleToolButton" id="contour">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|contour|tooltip_text">Contour</property>
                     <property name="use-underline">True</property>
                     <property name="icon-name">svx/res/fw011.png</property>
@@ -338,7 +327,6 @@
                 <child>
                   <object class="GtkToggleToolButton" id="textcontour">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|textcontour|tooltip_text">Text Contour</property>
                     <property name="use-underline">True</property>
                     <property name="icon-name">svx/res/fw012.png</property>
@@ -366,7 +354,6 @@
                 <child>
                   <object class="GtkRadioToolButton" id="noshadow">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|noshadow|tooltip_text">No Text Shadow</property>
                     <property name="use-underline">True</property>
                     <property name="icon-name">svx/res/fw013.png</property>
@@ -385,7 +372,6 @@
                 <child>
                   <object class="GtkRadioToolButton" id="vertical">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|vertical|tooltip_text">Add Text Shadow</property>
                     <property name="use-underline">True</property>
                     <property name="icon-name">svx/res/fw014.png</property>
@@ -404,7 +390,6 @@
                 <child>
                   <object class="GtkRadioToolButton" id="slant">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|slant|tooltip_text">Slant Text Shadow</property>
                     <property name="use-underline">True</property>
                     <property name="icon-name">svx/res/fw015.png</property>
diff --git a/svx/uiconfig/ui/inspectortextpanel.ui 
b/svx/uiconfig/ui/inspectortextpanel.ui
index e32a7a1be169..b3a44ba5937e 100644
--- a/svx/uiconfig/ui/inspectortextpanel.ui
+++ b/svx/uiconfig/ui/inspectortextpanel.ui
@@ -111,12 +111,11 @@
         <child>
           <object class="GtkToolbar" id="toolbar">
             <property name="visible">True</property>
-            <property name="can-focus">False</property>
+            <property name="can-focus">True</property>
             <property name="toolbar-style">icons</property>
             <child>
               <object class="GtkToggleToolButton" id="paragraphstyles">
                 <property name="visible">True</property>
-                <property name="can-focus">False</property>
                 <property name="tooltip-text" translatable="yes" 
context="paragraph_style_toggle_btn|tooltip_text">Paragraph Styles</property>
                 <property name="use-underline">True</property>
               </object>
@@ -128,7 +127,6 @@
             <child>
               <object class="GtkToggleToolButton" id="characterstyles">
                 <property name="visible">True</property>
-                <property name="can-focus">False</property>
                 <property name="tooltip-text" translatable="yes" 
context="character_style_toggle_btn|tooltip_text">Character Styles</property>
                 <property name="use-underline">True</property>
               </object>
@@ -140,7 +138,6 @@
             <child>
               <object class="GtkToggleToolButton" id="directformatting">
                 <property name="visible">True</property>
-                <property name="can-focus">False</property>
                 <property name="tooltip-text" translatable="yes" 
context="direct_formatting_toggle_btn|tooltip_text">Direct Formatting</property>
                 <property name="use-underline">True</property>
               </object>
@@ -174,4 +171,4 @@
       </packing>
     </child>
   </object>
-</interface>
\ No newline at end of file
+</interface>
diff --git a/svx/uiconfig/ui/sidebarparagraph.ui 
b/svx/uiconfig/ui/sidebarparagraph.ui
index c3f7c10466d5..f698d0bf6908 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -95,7 +95,6 @@
                 <child>
                   <object class="GtkToolButton" id=".uno:LeftPara">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                   </object>
                   <packing>
@@ -106,7 +105,6 @@
                 <child>
                   <object class="GtkToolButton" id=".uno:CenterPara">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                   </object>
                   <packing>
@@ -117,7 +115,6 @@
                 <child>
                   <object class="GtkToolButton" id=".uno:RightPara">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                   </object>
                   <packing>
@@ -128,7 +125,6 @@
                 <child>
                   <object class="GtkToolButton" id=".uno:JustifyPara">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                   </object>
                   <packing>
@@ -155,7 +151,6 @@
                 <child>
                   <object class="GtkToolButton" id=".uno:ParaLeftToRight">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                   </object>
                   <packing>
@@ -166,7 +161,6 @@
                 <child>
                   <object class="GtkToolButton" id=".uno:ParaRightToLeft">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                   </object>
                   <packing>
@@ -192,7 +186,6 @@
                 <child>
                   <object class="GtkToolButton" id=".uno:CellVertTop">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                   </object>
                   <packing>
@@ -203,7 +196,6 @@
                 <child>
                   <object class="GtkToolButton" id=".uno:CellVertCenter">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                   </object>
                   <packing>
@@ -214,7 +206,6 @@
                 <child>
                   <object class="GtkToolButton" id=".uno:CellVertBottom">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                   </object>
                   <packing>
@@ -270,7 +261,6 @@
                 <child>
                   <object class="GtkToolButton" id=".uno:ParaspaceIncrease">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                   </object>
                   <packing>
@@ -281,7 +271,6 @@
                 <child>
                   <object class="GtkToolButton" id=".uno:ParaspaceDecrease">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                   </object>
                   <packing>
@@ -405,7 +394,6 @@
                 <child>
                   <object class="GtkMenuToolButton" id=".uno:LineSpacing">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="sidebarparagraph|setlinespacing|tooltip_text">Line Spacing</property>
                     <property name="use-underline">True</property>
                   </object>
@@ -460,7 +448,6 @@
                 <child>
                   <object class="GtkToolButton" id=".uno:IncrementIndent">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="sidebarparagraph|increaseindent|tooltip_text">Increase 
Indent</property>
                     <property name="use-underline">True</property>
                   </object>
@@ -472,7 +459,6 @@
                 <child>
                   <object class="GtkToolButton" id=".uno:DecrementIndent">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="sidebarparagraph|decreaseindent|tooltip_text">Decrease 
Indent</property>
                     <property name="use-underline">True</property>
                   </object>
@@ -484,7 +470,6 @@
                 <child>
                   <object class="GtkToolButton" id=".uno:HangingIndent">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="sidebarparagraph|hangingindent|tooltip_text">Switch to Hanging 
Indent</property>
                     <property name="use-underline">True</property>
                   </object>
@@ -844,7 +829,6 @@
             <child>
               <object class="GtkMenuToolButton" id=".uno:DefaultBullet">
                 <property name="visible">True</property>
-                <property name="can-focus">False</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -855,7 +839,6 @@
             <child>
               <object class="GtkMenuToolButton" id=".uno:DefaultNumbering">
                 <property name="visible">True</property>
-                <property name="can-focus">False</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -866,7 +849,6 @@
             <child>
               <object class="GtkMenuToolButton" id=".uno:SetOutline">
                 <property name="visible">True</property>
-                <property name="can-focus">False</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -893,7 +875,6 @@
             <child>
               <object class="GtkMenuToolButton" id=".uno:BackgroundColor">
                 <property name="visible">True</property>
-                <property name="can-focus">False</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -936,7 +917,7 @@
                 <child>
                   <object class="GtkToolbar" id="hyphenation">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
+                    <property name="can-focus">True</property>
                     <property name="tooltip-text" translatable="yes" 
context="sidebarparagraph|hyphenation|tooltip_text">Hyphenation</property>
                     <property name="hexpand">True</property>
                     <property name="toolbar-style">icons</property>
@@ -945,7 +926,6 @@
                     <child>
                       <object class="GtkToggleToolButton" id="HyphenateCaps">
                         <property name="visible">True</property>
-                        <property name="can-focus">False</property>
                         <property name="margin-start">1</property>
                         <property name="margin-end">1</property>
                         <property name="label" translatable="yes" 
context="sidebarparagraph|hyphenation|caps">Hyphenate CAPS</property>
@@ -960,7 +940,6 @@
                     <child>
                       <object class="GtkToggleToolButton" 
id="HyphenateLastWord">
                         <property name="visible">True</property>
-                        <property name="can-focus">False</property>
                         <property name="margin-start">1</property>
                         <property name="margin-end">1</property>
                         <property name="label" translatable="yes" 
context="sidebarparagraph|hyphenation|lastword">Hyphenate Last Paragraph 
Word</property>
@@ -975,7 +954,6 @@
                     <child>
                       <object class="GtkToggleToolButton" 
id="HyphenateLastFullLine">
                         <property name="visible">True</property>
-                        <property name="can-focus">False</property>
                         <property name="margin-start">1</property>
                         <property name="margin-end">1</property>
                         <property name="label" translatable="yes" 
context="sidebarparagraph|hyphenation|lastfullline">Hyphenate Last Full 
Paragraph Line</property>
@@ -990,7 +968,6 @@
                     <child>
                       <object class="GtkToggleToolButton" id="HyphenateColumn">
                         <property name="visible">True</property>
-                        <property name="can-focus">False</property>
                         <property name="margin-start">1</property>
                         <property name="margin-end">1</property>
                         <property name="label" translatable="yes" 
context="sidebarparagraph|hyphenation|column">Hyphenate Across Column</property>
@@ -1004,7 +981,6 @@
                     </child>
                     <child>
                       <object class="GtkToggleToolButton" id="HyphenatePage">
-                        <property name="can-focus">False</property>
                         <property name="margin-start">1</property>
                         <property name="margin-end">1</property>
                         <property name="label" translatable="yes" 
context="sidebarparagraph|hyphenation|page">Hyphenate Across Page</property>
@@ -1018,7 +994,6 @@
                     </child>
                     <child>
                       <object class="GtkToggleToolButton" id="HyphenateSpread">
-                        <property name="can-focus">False</property>
                         <property name="margin-start">1</property>
                         <property name="margin-end">1</property>
                         <property name="label" translatable="yes" 
context="sidebarparagraph|hyphenation|spread">Hyphenate Across Spread</property>
@@ -1033,7 +1008,6 @@
                     <child>
                       <object class="GtkToggleToolButton" id="Hyphenate">
                         <property name="visible">True</property>
-                        <property name="can-focus">False</property>
                         <property name="margin-start">1</property>
                         <property name="margin-end">1</property>
                         <property name="label" translatable="yes" 
context="sidebarparagraph|hyphenation|hyphenation">Hyphenation</property>
diff --git a/svx/uiconfig/ui/sidebarpossize.ui 
b/svx/uiconfig/ui/sidebarpossize.ui
index 96308b9e8b64..9ef6fee9028c 100644
--- a/svx/uiconfig/ui/sidebarpossize.ui
+++ b/svx/uiconfig/ui/sidebarpossize.ui
@@ -213,7 +213,6 @@
                 <child>
                   <object class="GtkToolButton" id=".uno:BringToFront">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                   </object>
                   <packing>
@@ -224,7 +223,6 @@
                 <child>
                   <object class="GtkToolButton" id=".uno:ObjectForwardOne">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                   </object>
                   <packing>
@@ -235,7 +233,6 @@
                 <child>
                   <object class="GtkToolButton" id=".uno:ObjectBackOne">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                   </object>
                   <packing>
@@ -246,7 +243,6 @@
                 <child>
                   <object class="GtkToolButton" id=".uno:SendToBack">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                   </object>
                   <packing>
@@ -272,7 +268,6 @@
                 <child>
                   <object class="GtkToolButton" 
id=".uno:SetObjectToBackground">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                   </object>
                   <packing>
@@ -283,7 +278,6 @@
                 <child>
                   <object class="GtkToolButton" 
id=".uno:SetObjectToForeground">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                   </object>
                   <packing>
@@ -398,7 +392,6 @@
                 <child>
                   <object class="GtkToolButton" id=".uno:FlipVertical">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="sidebarpossize|flipvertical|tooltip_text">Flip the selected object 
vertically.</property>
                     <property name="use-underline">True</property>
                   </object>
@@ -410,7 +403,6 @@
                 <child>
                   <object class="GtkToolButton" id=".uno:FlipHorizontal">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="tooltip-text" translatable="yes" 
context="sidebarpossize|fliphorizontal|tooltip_text">Flip the selected object 
horizontally.</property>
                     <property name="use-underline">True</property>
                   </object>
@@ -490,7 +482,6 @@
                 <child>
                   <object class="GtkToggleToolButton" 
id=".uno:ObjectAlignLeft">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                   </object>
                   <packing>
@@ -501,7 +492,6 @@
                 <child>
                   <object class="GtkToggleToolButton" id=".uno:AlignCenter">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                   </object>
                   <packing>
@@ -512,7 +502,6 @@
                 <child>
                   <object class="GtkToggleToolButton" 
id=".uno:ObjectAlignRight">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                   </object>
                   <packing>
@@ -538,7 +527,6 @@
                 <child>
                   <object class="GtkToolButton" id=".uno:AlignUp">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                   </object>
                   <packing>
@@ -549,7 +537,6 @@
                 <child>
                   <object class="GtkToolButton" id=".uno:AlignMiddle">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                   </object>
                   <packing>
@@ -560,7 +547,6 @@
                 <child>
                   <object class="GtkToolButton" id=".uno:AlignDown">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
                     <property name="use-underline">True</property>
                   </object>
                   <packing>
diff --git a/svx/uiconfig/ui/xformspage.ui b/svx/uiconfig/ui/xformspage.ui
index 255439c41264..7292b371b0cb 100644
--- a/svx/uiconfig/ui/xformspage.ui
+++ b/svx/uiconfig/ui/xformspage.ui
@@ -31,7 +31,6 @@
         <child>
           <object class="GtkToolButton" id="additem">
             <property name="visible">True</property>
-            <property name="can-focus">False</property>
             <property name="valign">start</property>
             <property name="label" translatable="yes" 
context="xformspage|TBI_ITEM_ADD">Add Item</property>
             <property name="use-underline">True</property>
@@ -45,7 +44,6 @@
         <child>
           <object class="GtkToolButton" id="addelement">
             <property name="visible">True</property>
-            <property name="can-focus">False</property>
             <property name="valign">start</property>
             <property name="label" translatable="yes" 
context="xformspage|TBI_ITEM_ADD_ELEMENT">Add Element</property>
             <property name="use-underline">True</property>
@@ -59,7 +57,6 @@
         <child>
           <object class="GtkToolButton" id="addattribute">
             <property name="visible">True</property>
-            <property name="can-focus">False</property>
             <property name="valign">start</property>
             <property name="label" translatable="yes" 
context="xformspage|TBI_ITEM_ADD_ATTRIBUTE">Add Attribute</property>
             <property name="use-underline">True</property>
@@ -73,7 +70,6 @@
         <child>
           <object class="GtkToolButton" id="edit">
             <property name="visible">True</property>
-            <property name="can-focus">False</property>
             <property name="valign">start</property>
             <property name="label" translatable="yes" 
context="xformspage|TBI_ITEM_EDIT">Edit</property>
             <property name="use-underline">True</property>
@@ -97,7 +93,6 @@
         <child>
           <object class="GtkToolButton" id="delete">
             <property name="visible">True</property>
-            <property name="can-focus">False</property>
             <property name="valign">start</property>
             <property name="label" translatable="yes" 
context="xformspage|TBI_ITEM_REMOVE">Delete</property>
             <property name="use-underline">True</property>
diff --git a/sw/uiconfig/swriter/ui/commentspanel.ui 
b/sw/uiconfig/swriter/ui/commentspanel.ui
index 5f7c7314a1e0..c5eb823937fc 100644
--- a/sw/uiconfig/swriter/ui/commentspanel.ui
+++ b/sw/uiconfig/swriter/ui/commentspanel.ui
@@ -237,6 +237,7 @@
                         <property name="can-focus">True</property>
                         <property name="focus-on-click">False</property>
                         <property name="receives-default">True</property>
+                        <property name="draw-indicator">True</property>
                         <child>
                           <placeholder/>
                         </child>
diff --git a/sw/uiconfig/swriter/ui/commentwidget.ui 
b/sw/uiconfig/swriter/ui/commentwidget.ui
index 53044de84baa..478ad72e396f 100644
--- a/sw/uiconfig/swriter/ui/commentwidget.ui
+++ b/sw/uiconfig/swriter/ui/commentwidget.ui
@@ -21,7 +21,6 @@
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
         <property name="expanded">True</property>
-        <property name="label-fill">True</property>
         <property name="resize-toplevel">True</property>
         <child>
           <!-- n-columns=1 n-rows=2 -->
diff --git a/sw/uiconfig/swriter/ui/converttexttable.ui 
b/sw/uiconfig/swriter/ui/converttexttable.ui
index 9848d8140a24..b84856586915 100644
--- a/sw/uiconfig/swriter/ui/converttexttable.ui
+++ b/sw/uiconfig/swriter/ui/converttexttable.ui
@@ -1,661 +1,661 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.36.0 -->
-e 
... etc. - the rest is truncated

Reply via email to