[Libreoffice-commits] core.git: basctl/uiconfig chart2/source chart2/uiconfig cui/source cui/uiconfig dbaccess/uiconfig extensions/uiconfig formula/uiconfig fpicker/uiconfig .git-hooks/pre-commit include/vcl reportdesign/uiconfig sc/source sc/uiconfig sd/uiconfig sfx2/uiconfig svtools/uiconfig svx/uiconfig sw/uiconfig uui/uiconfig vcl/inc vcl/qa vcl/source vcl/uiconfig vcl/unx xmlsecurity/uiconfig

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Tue Dec 22 09:17:47 UTC 2020


 .git-hooks/pre-commit                                     |   14 +
 basctl/uiconfig/basicide/ui/exportdialog.ui               |    2 
 basctl/uiconfig/basicide/ui/gotolinedialog.ui             |    2 
 basctl/uiconfig/basicide/ui/managebreakpoints.ui          |    2 
 basctl/uiconfig/basicide/ui/newlibdialog.ui               |    2 
 chart2/source/controller/dialogs/DataBrowser.cxx          |   12 -
 chart2/uiconfig/ui/combobox.ui                            |    2 
 chart2/uiconfig/ui/dlg_InsertLegend.ui                    |    4 
 chart2/uiconfig/ui/insertaxisdlg.ui                       |    2 
 chart2/uiconfig/ui/insertgriddlg.ui                       |    2 
 chart2/uiconfig/ui/sidebaraxis.ui                         |    2 
 chart2/uiconfig/ui/sidebarelements.ui                     |    2 
 chart2/uiconfig/ui/sidebarseries.ui                       |    2 
 chart2/uiconfig/ui/smoothlinesdlg.ui                      |    2 
 cui/source/options/optcolor.cxx                           |    2 
 cui/uiconfig/ui/aboutdialog.ui                            |    6 
 cui/uiconfig/ui/additionsdialog.ui                        |    2 
 cui/uiconfig/ui/applylocalizedpage.ui                     |    8 -
 cui/uiconfig/ui/cellalignment.ui                          |    4 
 cui/uiconfig/ui/colorconfigwin.ui                         |  100 +++++++-------
 cui/uiconfig/ui/colorfragment.ui                          |    2 
 cui/uiconfig/ui/connpooloptions.ui                        |    4 
 cui/uiconfig/ui/dimensionlinestabpage.ui                  |    4 
 cui/uiconfig/ui/hangulhanjaconversiondialog.ui            |    4 
 cui/uiconfig/ui/hangulhanjaeditdictdialog.ui              |    4 
 cui/uiconfig/ui/iconselectordialog.ui                     |    4 
 cui/uiconfig/ui/insertfloatingframe.ui                    |   14 -
 cui/uiconfig/ui/menuassignpage.ui                         |   26 +--
 cui/uiconfig/ui/optfltrpage.ui                            |    4 
 cui/uiconfig/ui/opthtmlpage.ui                            |    2 
 cui/uiconfig/ui/optsavepage.ui                            |    4 
 cui/uiconfig/ui/optviewpage.ui                            |    8 -
 cui/uiconfig/ui/paragalignpage.ui                         |    4 
 cui/uiconfig/ui/personalization_tab.ui                    |    4 
 cui/uiconfig/ui/qrcodegen.ui                              |    4 
 cui/uiconfig/ui/signatureline.ui                          |    4 
 cui/uiconfig/ui/signsignatureline.ui                      |    6 
 cui/uiconfig/ui/similaritysearchdialog.ui                 |    2 
 cui/uiconfig/ui/swpossizepage.ui                          |    4 
 cui/uiconfig/ui/textanimtabpage.ui                        |    6 
 cui/uiconfig/ui/textflowpage.ui                           |    6 
 cui/uiconfig/ui/transparencytabpage.ui                    |    2 
 dbaccess/uiconfig/ui/finalpagewizard.ui                   |    8 -
 dbaccess/uiconfig/ui/generalpagedialog.ui                 |    2 
 dbaccess/uiconfig/ui/generalpagewizard.ui                 |   14 -
 dbaccess/uiconfig/ui/titlewindow.ui                       |    4 
 extensions/uiconfig/sbibliography/ui/combobox.ui          |    4 
 formula/uiconfig/ui/parameter.ui                          |    4 
 fpicker/uiconfig/ui/remotefilesdialog.ui                  |    2 
 include/vcl/weld.hxx                                      |    8 -
 include/vcl/window.hxx                                    |    8 -
 reportdesign/uiconfig/dbreport/ui/datetimedialog.ui       |    4 
 sc/source/ui/app/inputwin.cxx                             |    4 
 sc/uiconfig/scalc/ui/advancedfilterdialog.ui              |    4 
 sc/uiconfig/scalc/ui/cellprotectionpage.ui                |    4 
 sc/uiconfig/scalc/ui/createnamesdialog.ui                 |    2 
 sc/uiconfig/scalc/ui/dataform.ui                          |    4 
 sc/uiconfig/scalc/ui/definename.ui                        |    2 
 sc/uiconfig/scalc/ui/fourieranalysisdialog.ui             |    2 
 sc/uiconfig/scalc/ui/mergecellsdialog.ui                  |    6 
 sc/uiconfig/scalc/ui/notebookbar.ui                       |   12 -
 sc/uiconfig/scalc/ui/notebookbar_compact.ui               |    2 
 sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui    |   10 -
 sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui       |    8 -
 sc/uiconfig/scalc/ui/notebookbar_groups.ui                |    4 
 sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui            |    4 
 sc/uiconfig/scalc/ui/samplingdialog.ui                    |    4 
 sc/uiconfig/scalc/ui/sidebaralignment.ui                  |    4 
 sc/uiconfig/scalc/ui/solverdlg.ui                         |   10 -
 sc/uiconfig/scalc/ui/sortoptionspage.ui                   |    4 
 sc/uiconfig/scalc/ui/standardfilterdialog.ui              |   10 -
 sc/uiconfig/scalc/ui/subtotaldialog.ui                    |    2 
 sc/uiconfig/scalc/ui/subtotaloptionspage.ui               |    2 
 sc/uiconfig/scalc/ui/validationcriteriapage.ui            |    2 
 sd/uiconfig/sdraw/ui/copydlg.ui                           |    2 
 sd/uiconfig/sdraw/ui/namedesign.ui                        |    2 
 sd/uiconfig/sdraw/ui/notebookbar.ui                       |    6 
 sd/uiconfig/sdraw/ui/notebookbar_compact.ui               |    4 
 sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui    |   14 -
 sd/uiconfig/sdraw/ui/notebookbar_single.ui                |   26 +--
 sd/uiconfig/sdraw/ui/paranumberingtab.ui                  |    2 
 sd/uiconfig/sdraw/ui/vectorize.ui                         |    2 
 sd/uiconfig/simpress/ui/headerfootertab.ui                |    6 
 sd/uiconfig/simpress/ui/notebookbar.ui                    |    6 
 sd/uiconfig/simpress/ui/notebookbar_compact.ui            |    2 
 sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui |   14 -
 sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui    |    4 
 sd/uiconfig/simpress/ui/notebookbar_groups.ui             |    4 
 sd/uiconfig/simpress/ui/notebookbar_single.ui             |   24 +--
 sd/uiconfig/simpress/ui/optimpressgeneralpage.ui          |    2 
 sd/uiconfig/simpress/ui/presentationdialog.ui             |    4 
 sd/uiconfig/simpress/ui/publishingdialog.ui               |    2 
 sd/uiconfig/simpress/ui/remotedialog.ui                   |    4 
 sd/uiconfig/simpress/ui/sidebarslidebackground.ui         |    4 
 sd/uiconfig/simpress/ui/tabviewbar.ui                     |    2 
 sfx2/uiconfig/ui/autoredactdialog.ui                      |    4 
 sfx2/uiconfig/ui/classificationbox.ui                     |    4 
 sfx2/uiconfig/ui/notebookbarpopup.ui                      |    2 
 sfx2/uiconfig/ui/startcenter.ui                           |   54 +++----
 svtools/uiconfig/ui/tabbuttons.ui                         |    6 
 svtools/uiconfig/ui/tabbuttonsmirrored.ui                 |    6 
 svtools/uiconfig/ui/thineditcontrol.ui                    |    2 
 svx/uiconfig/ui/colorwindow.ui                            |    2 
 svx/uiconfig/ui/docking3deffects.ui                       |    2 
 svx/uiconfig/ui/fillctrlbox.ui                            |    2 
 svx/uiconfig/ui/findreplacedialog-mobile.ui               |   12 -
 svx/uiconfig/ui/findreplacedialog.ui                      |   12 -
 svx/uiconfig/ui/navigationbar.ui                          |    4 
 svx/uiconfig/ui/optgridpage.ui                            |    2 
 svx/uiconfig/ui/redlinefilterpage.ui                      |   10 -
 svx/uiconfig/ui/safemodedialog.ui                         |   10 -
 svx/uiconfig/ui/sidebarparagraph.ui                       |   26 +--
 svx/uiconfig/ui/sidebarstylespanel.ui                     |    2 
 sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui    |   20 +-
 sw/uiconfig/swriter/ui/autotext.ui                        |    2 
 sw/uiconfig/swriter/ui/converttexttable.ui                |    4 
 sw/uiconfig/swriter/ui/editfielddialog.ui                 |    4 
 sw/uiconfig/swriter/ui/envformatpage.ui                   |    8 -
 sw/uiconfig/swriter/ui/findentrydialog.ui                 |    2 
 sw/uiconfig/swriter/ui/fldrefpage.ui                      |    6 
 sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui        |   16 +-
 sw/uiconfig/swriter/ui/frmtypepage.ui                     |   12 -
 sw/uiconfig/swriter/ui/indexentry.ui                      |   26 +--
 sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui           |    6 
 sw/uiconfig/swriter/ui/inserttable.ui                     |    4 
 sw/uiconfig/swriter/ui/mailconfigpage.ui                  |    2 
 sw/uiconfig/swriter/ui/mmlayoutpage.ui                    |    2 
 sw/uiconfig/swriter/ui/mmselectpage.ui                    |    6 
 sw/uiconfig/swriter/ui/notebookbar.ui                     |   14 -
 sw/uiconfig/swriter/ui/notebookbar_compact.ui             |   12 -
 sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui  |   12 -
 sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui     |   10 -
 sw/uiconfig/swriter/ui/notebookbar_groups.ui              |    4 
 sw/uiconfig/swriter/ui/notebookbar_single.ui              |   32 ++--
 sw/uiconfig/swriter/ui/numparapage.ui                     |    4 
 sw/uiconfig/swriter/ui/optcaptionpage.ui                  |    2 
 sw/uiconfig/swriter/ui/opttablepage.ui                    |   20 +-
 sw/uiconfig/swriter/ui/picturepage.ui                     |    6 
 sw/uiconfig/swriter/ui/previewzoomdialog.ui               |    4 
 sw/uiconfig/swriter/ui/printeroptions.ui                  |    2 
 sw/uiconfig/swriter/ui/printoptionspage.ui                |    2 
 sw/uiconfig/swriter/ui/sectionpage.ui                     |    2 
 sw/uiconfig/swriter/ui/selectblockdialog.ui               |    2 
 sw/uiconfig/swriter/ui/stringinput.ui                     |    4 
 sw/uiconfig/swriter/ui/tabletextflowpage.ui               |    4 
 sw/uiconfig/swriter/ui/textgridpage.ui                    |    6 
 sw/uiconfig/swriter/ui/tocindexpage.ui                    |   10 -
 sw/uiconfig/swriter/ui/viewoptionspage.ui                 |    2 
 sw/uiconfig/swriter/ui/wordcount-mobile.ui                |    4 
 sw/uiconfig/swriter/ui/wordcount.ui                       |    4 
 uui/uiconfig/ui/setmasterpassworddlg.ui                   |    2 
 uui/uiconfig/ui/sslwarndialog.ui                          |    2 
 vcl/inc/salvtables.hxx                                    |    8 -
 vcl/qa/cppunit/builder/demo.ui                            |    8 -
 vcl/source/app/salvtables.cxx                             |    8 -
 vcl/source/window/layout.cxx                              |   12 -
 vcl/source/window/window2.cxx                             |   18 +-
 vcl/uiconfig/ui/aboutbox.ui                               |    4 
 vcl/uiconfig/ui/printdialog.ui                            |    6 
 vcl/unx/gtk3/gtk3gtkinst.cxx                              |   24 +--
 xmlsecurity/uiconfig/ui/certgeneral.ui                    |    4 
 161 files changed, 575 insertions(+), 561 deletions(-)

New commits:
commit 4491cee27c80bc83493136b323af5bdd128352e7
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Dec 21 14:00:42 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Dec 22 10:16:42 2020 +0100

    replace margin-left with margin-start and margin-right with margin-end
    
    Change-Id: Iee3cc8c22b393ca420d0ed68673c61fe7ef240ba
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108113
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/.git-hooks/pre-commit b/.git-hooks/pre-commit
index fd0cfeea2e62..8470d4b2631b 100755
--- a/.git-hooks/pre-commit
+++ b/.git-hooks/pre-commit
@@ -93,13 +93,21 @@ sub check_whitespaces($)
             {
                 bad_line("OOXMLEXPORT definition used in a ooxmlimport file", $_, "cxx");
             }
-            if (/<property name="use_markup">True<\/property>/)
+            if (/<property name="use[-_]markup">True<\/property>/)
             {
                 bad_line("use font attributes instead of use-markup", $_, "ui");
             }
-            if (/<property name="tooltip_markup"/ )
+            if (/<property name="tooltip[-_]markup"/ )
             {
-                bad_line("use tooltip_text instead of tooltip_markup", $_, "ui");
+                bad_line("use tooltip-text instead of tooltip_markup", $_, "ui");
+            }
+            if (/<property name="margin[-_]left"/ )
+            {
+                bad_line("use margin-start instead of margin-left", $_, "ui");
+            }
+            if (/<property name="margin[-_]right"/ )
+            {
+                bad_line("use margin-end instead of margin-right", $_, "ui");
             }
             if ((/translatable="yes"/) and not(/context=/))
             {
diff --git a/basctl/uiconfig/basicide/ui/exportdialog.ui b/basctl/uiconfig/basicide/ui/exportdialog.ui
index bac3aacf6019..23e9f992a96f 100644
--- a/basctl/uiconfig/basicide/ui/exportdialog.ui
+++ b/basctl/uiconfig/basicide/ui/exportdialog.ui
@@ -59,7 +59,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="margin_right">6</property>
+                <property name="margin-end">6</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
diff --git a/basctl/uiconfig/basicide/ui/gotolinedialog.ui b/basctl/uiconfig/basicide/ui/gotolinedialog.ui
index 1dc7116501c2..1d952bf3b043 100644
--- a/basctl/uiconfig/basicide/ui/gotolinedialog.ui
+++ b/basctl/uiconfig/basicide/ui/gotolinedialog.ui
@@ -55,7 +55,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="margin_right">6</property>
+                <property name="margin-end">6</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
diff --git a/basctl/uiconfig/basicide/ui/managebreakpoints.ui b/basctl/uiconfig/basicide/ui/managebreakpoints.ui
index de6e12c89856..3d069970ff94 100644
--- a/basctl/uiconfig/basicide/ui/managebreakpoints.ui
+++ b/basctl/uiconfig/basicide/ui/managebreakpoints.ui
@@ -102,7 +102,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="margin_right">6</property>
+                <property name="margin-end">6</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
diff --git a/basctl/uiconfig/basicide/ui/newlibdialog.ui b/basctl/uiconfig/basicide/ui/newlibdialog.ui
index 74a55aa4f04a..79d2006a056d 100644
--- a/basctl/uiconfig/basicide/ui/newlibdialog.ui
+++ b/basctl/uiconfig/basicide/ui/newlibdialog.ui
@@ -59,7 +59,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="margin_right">6</property>
+                <property name="margin-end">6</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index eabbdd42ace0..2f29fd09b225 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -98,7 +98,7 @@ public:
     bool HasFocus() const { return m_xControl->has_focus(); }
 
     void set_size_request(int nWidth, int nHeight) { m_xControl->set_size_request(nWidth, nHeight); }
-    void set_margin_left(int nLeft) { m_xControl->set_margin_left(nLeft); }
+    void set_margin_start(int nLeft) { m_xControl->set_margin_start(nLeft); }
 
     void SetModifyHdl(const Link<SeriesHeaderEdit&,void>& rLink) { m_aModifyHdl = rLink; }
     void SetGetFocusHdl(const Link<SeriesHeaderEdit&,void>& rLink) { m_aFocusInHdl = rLink; }
@@ -288,7 +288,7 @@ void SeriesHeader::SetPos()
     m_spSymbol->set_size_request(aSize.Width(), aSize.Height());
 
     // series name edit field
-    m_spSeriesName->set_margin_left(2);
+    m_spSeriesName->set_margin_start(2);
 
     aSize.setWidth(nSymbolHeight);
     aSize.setHeight(12);
@@ -1310,8 +1310,8 @@ void DataBrowser::ImplAdjustHeaderControls()
 
     weld::Container* pWin = m_pColumnsWin;
     weld::Container* pColorWin = m_pColorsWin;
-    pWin->set_margin_left(nCurrentPos);
-    pColorWin->set_margin_left(nCurrentPos);
+    pWin->set_margin_start(nCurrentPos);
+    pColorWin->set_margin_start(nCurrentPos);
 
     tSeriesHeaderContainer::iterator aIt( m_aSeriesHeaders.begin());
     sal_uInt16 i = GetFirstVisibleColNumber();
@@ -1336,8 +1336,8 @@ void DataBrowser::ImplAdjustHeaderControls()
 
                 if (pWin)
                 {
-                    pWin->set_margin_left(nStartPos);
-                    pColorWin->set_margin_left(nStartPos);
+                    pWin->set_margin_start(nStartPos);
+                    pColorWin->set_margin_start(nStartPos);
                     pWin = pColorWin = nullptr;
                 }
 
diff --git a/chart2/uiconfig/ui/combobox.ui b/chart2/uiconfig/ui/combobox.ui
index d8e3046c3b2c..4cd0032993ef 100644
--- a/chart2/uiconfig/ui/combobox.ui
+++ b/chart2/uiconfig/ui/combobox.ui
@@ -10,7 +10,7 @@
       <object class="GtkBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
+        <property name="margin-end">6</property>
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
         <property name="spacing">6</property>
diff --git a/chart2/uiconfig/ui/dlg_InsertLegend.ui b/chart2/uiconfig/ui/dlg_InsertLegend.ui
index 8481f21a29af..236adc2fc742 100644
--- a/chart2/uiconfig/ui/dlg_InsertLegend.ui
+++ b/chart2/uiconfig/ui/dlg_InsertLegend.ui
@@ -58,7 +58,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="margin_right">6</property>
+                <property name="margin-end">6</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -122,7 +122,7 @@
                           <object class="GtkGrid" id="grid1">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_left">12</property>
+                            <property name="margin-start">12</property>
                             <property name="row_spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="left">
diff --git a/chart2/uiconfig/ui/insertaxisdlg.ui b/chart2/uiconfig/ui/insertaxisdlg.ui
index 76cf68ddff20..3dc744ff704c 100644
--- a/chart2/uiconfig/ui/insertaxisdlg.ui
+++ b/chart2/uiconfig/ui/insertaxisdlg.ui
@@ -55,7 +55,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="margin_right">6</property>
+                <property name="margin-end">6</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
diff --git a/chart2/uiconfig/ui/insertgriddlg.ui b/chart2/uiconfig/ui/insertgriddlg.ui
index e0777ff52c14..c85e709f34f4 100644
--- a/chart2/uiconfig/ui/insertgriddlg.ui
+++ b/chart2/uiconfig/ui/insertgriddlg.ui
@@ -55,7 +55,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="margin_right">6</property>
+                <property name="margin-end">6</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
diff --git a/chart2/uiconfig/ui/sidebaraxis.ui b/chart2/uiconfig/ui/sidebaraxis.ui
index b5b8a4adf03b..310e93d1772e 100644
--- a/chart2/uiconfig/ui/sidebaraxis.ui
+++ b/chart2/uiconfig/ui/sidebaraxis.ui
@@ -54,7 +54,7 @@
           <object class="GtkGrid" id="label_props">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">12</property>
+            <property name="margin-start">12</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">5</property>
             <child>
diff --git a/chart2/uiconfig/ui/sidebarelements.ui b/chart2/uiconfig/ui/sidebarelements.ui
index fabf57068eec..60fe8c94b352 100644
--- a/chart2/uiconfig/ui/sidebarelements.ui
+++ b/chart2/uiconfig/ui/sidebarelements.ui
@@ -163,7 +163,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
-                            <property name="margin_left">4</property>
+                            <property name="margin-start">4</property>
                             <property name="label" translatable="yes" context="sidebarelements|placement_label">_Placement:</property>
                             <property name="use_underline">True</property>
                             <property name="ellipsize">end</property>
diff --git a/chart2/uiconfig/ui/sidebarseries.ui b/chart2/uiconfig/ui/sidebarseries.ui
index 4a11d076d7eb..7a227a550bdb 100644
--- a/chart2/uiconfig/ui/sidebarseries.ui
+++ b/chart2/uiconfig/ui/sidebarseries.ui
@@ -60,7 +60,7 @@
                           <object class="GtkBox" id="datalabel_box">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_left">12</property>
+                            <property name="margin-start">12</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkLabel" id="label_box">
diff --git a/chart2/uiconfig/ui/smoothlinesdlg.ui b/chart2/uiconfig/ui/smoothlinesdlg.ui
index 3721363465e7..14b2a134fdc3 100644
--- a/chart2/uiconfig/ui/smoothlinesdlg.ui
+++ b/chart2/uiconfig/ui/smoothlinesdlg.ui
@@ -75,7 +75,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="margin_right">6</property>
+                <property name="margin-end">6</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index b4e992133fef..c17e9a1ce5c0 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -295,7 +295,7 @@ ColorConfigWindow_Impl::Entry::Entry(weld::Window* pTopLevel, weld::Builder& rBu
 
     if (!bCheckBox)
     {
-        m_xText->set_margin_left(m_xText->get_margin_left() +
+        m_xText->set_margin_start(m_xText->get_margin_start() +
             nCheckBoxLabelOffset);
     }
 
diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui
index 8ff8793a49b8..37dcd9fcdaad 100644
--- a/cui/uiconfig/ui/aboutdialog.ui
+++ b/cui/uiconfig/ui/aboutdialog.ui
@@ -64,8 +64,8 @@
                 <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="margin_left">12</property>
-                <property name="margin_right">24</property>
+                <property name="margin-start">12</property>
+                <property name="margin-end">24</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
               </object>
@@ -81,7 +81,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="margin_left">30</property>
+                <property name="margin-start">30</property>
                 <property name="margin_top">24</property>
                 <property name="margin_bottom">24</property>
                 <property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/additionsdialog.ui b/cui/uiconfig/ui/additionsdialog.ui
index 39fc1b34cc39..450cd9f59bef 100644
--- a/cui/uiconfig/ui/additionsdialog.ui
+++ b/cui/uiconfig/ui/additionsdialog.ui
@@ -201,7 +201,7 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="halign">end</property>
-                    <property name="margin_left">1</property>
+                    <property name="margin-start">1</property>
                     <property name="image">imageGear</property>
                     <property name="always_show_image">True</property>
                     <property name="popup">additionsmenu</property>
diff --git a/cui/uiconfig/ui/applylocalizedpage.ui b/cui/uiconfig/ui/applylocalizedpage.ui
index 1beffebd5c08..170b285e1ae9 100644
--- a/cui/uiconfig/ui/applylocalizedpage.ui
+++ b/cui/uiconfig/ui/applylocalizedpage.ui
@@ -265,7 +265,7 @@
                           <object class="GtkLabel" id="startquoteft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_left">12</property>
+                            <property name="margin-start">12</property>
                             <property name="label" translatable="yes" context="applylocalizedpage|startquoteft">_Start quote:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">startsingle</property>
@@ -342,7 +342,7 @@
                           <object class="GtkLabel" id="endquoteft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_left">12</property>
+                            <property name="margin-start">12</property>
                             <property name="label" translatable="yes" context="applylocalizedpage|endquoteft">_End quote:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">endsingle</property>
@@ -461,7 +461,7 @@
                           <object class="GtkLabel" id="label6">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_left">12</property>
+                            <property name="margin-start">12</property>
                             <property name="label" translatable="yes" context="applylocalizedpage|label6">_Start quote:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">startdouble</property>
@@ -538,7 +538,7 @@
                           <object class="GtkLabel" id="label8">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_left">12</property>
+                            <property name="margin-start">12</property>
                             <property name="label" translatable="yes" context="applylocalizedpage|label8">_End quote:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">enddouble</property>
diff --git a/cui/uiconfig/ui/cellalignment.ui b/cui/uiconfig/ui/cellalignment.ui
index a62b935c2678..59820059ef28 100644
--- a/cui/uiconfig/ui/cellalignment.ui
+++ b/cui/uiconfig/ui/cellalignment.ui
@@ -148,7 +148,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="margin_left">12</property>
+                        <property name="margin-start">12</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0.5</property>
                         <property name="inconsistent">True</property>
@@ -280,7 +280,7 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="no_show_all">True</property>
-                    <property name="margin_left">12</property>
+                    <property name="margin-start">12</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="inconsistent">True</property>
diff --git a/cui/uiconfig/ui/colorconfigwin.ui b/cui/uiconfig/ui/colorconfigwin.ui
index 8f66eb29e380..73f230eedd97 100644
--- a/cui/uiconfig/ui/colorconfigwin.ui
+++ b/cui/uiconfig/ui/colorconfigwin.ui
@@ -16,7 +16,7 @@
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
         <property name="use_underline">True</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="draw_indicator">True</property>
       </object>
@@ -29,7 +29,7 @@
       <object class="GtkLabel" id="doccolor">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|doccolor">Document background</property>
       </object>
@@ -109,7 +109,7 @@
       <object class="GtkLabel" id="appback">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|appback">Application background</property>
       </object>
@@ -125,7 +125,7 @@
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
         <property name="use_underline">True</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="draw_indicator">True</property>
       </object>
@@ -158,7 +158,7 @@
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
         <property name="use_underline">True</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="draw_indicator">True</property>
       </object>
@@ -188,7 +188,7 @@
       <object class="GtkLabel" id="font">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|font">Font color</property>
       </object>
@@ -221,7 +221,7 @@
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
         <property name="use_underline">True</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="draw_indicator">True</property>
       </object>
@@ -254,7 +254,7 @@
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
         <property name="use_underline">True</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="draw_indicator">True</property>
       </object>
@@ -284,7 +284,7 @@
       <object class="GtkLabel" id="autospellcheck">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|autospellcheck">AutoSpellcheck</property>
       </object>
@@ -297,7 +297,7 @@
       <object class="GtkLabel" id="smarttags">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|smarttags">Smart Tags</property>
       </object>
@@ -394,7 +394,7 @@
       <object class="GtkLabel" id="writergrid">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|writergrid">Grid</property>
       </object>
@@ -458,7 +458,7 @@
       <object class="GtkLabel" id="script">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|script">Script Indicator</property>
       </object>
@@ -474,7 +474,7 @@
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
         <property name="use_underline">True</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="draw_indicator">True</property>
       </object>
@@ -490,7 +490,7 @@
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
         <property name="use_underline">True</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="draw_indicator">True</property>
       </object>
@@ -506,7 +506,7 @@
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
         <property name="use_underline">True</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="draw_indicator">True</property>
       </object>
@@ -553,7 +553,7 @@
       <object class="GtkLabel" id="hdft">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|hdft">Headers and Footer delimiter</property>
       </object>
@@ -583,7 +583,7 @@
       <object class="GtkLabel" id="pagebreak">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|pagebreak">Page and column breaks</property>
       </object>
@@ -613,7 +613,7 @@
       <object class="GtkLabel" id="direct">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|direct">Direct Cursor</property>
       </object>
@@ -659,7 +659,7 @@
       <object class="GtkLabel" id="sgml">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|sgml">SGML syntax highlighting</property>
       </object>
@@ -689,7 +689,7 @@
       <object class="GtkLabel" id="htmlcomment">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|htmlcomment">Comment highlighting</property>
       </object>
@@ -719,7 +719,7 @@
       <object class="GtkLabel" id="htmlkeyword">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|htmlkeyword">Keyword highlighting</property>
       </object>
@@ -749,7 +749,7 @@
       <object class="GtkLabel" id="unknown">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|unknown">Text</property>
       </object>
@@ -795,7 +795,7 @@
       <object class="GtkLabel" id="calcgrid">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|calcgrid">Grid lines</property>
       </object>
@@ -825,7 +825,7 @@
       <object class="GtkLabel" id="brk">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|brk">Page breaks</property>
       </object>
@@ -855,7 +855,7 @@
       <object class="GtkLabel" id="brkmanual">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|brkmanual">Manual page breaks</property>
       </object>
@@ -885,7 +885,7 @@
       <object class="GtkLabel" id="brkauto">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|brkauto">Automatic page breaks</property>
       </object>
@@ -915,7 +915,7 @@
       <object class="GtkLabel" id="det">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|det">Detective</property>
       </object>
@@ -945,7 +945,7 @@
       <object class="GtkLabel" id="deterror">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|deterror">Detective error</property>
       </object>
@@ -975,7 +975,7 @@
       <object class="GtkLabel" id="ref">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|ref">References</property>
       </object>
@@ -1005,7 +1005,7 @@
       <object class="GtkLabel" id="notes">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|notes">Notes background</property>
       </object>
@@ -1035,7 +1035,7 @@
       <object class="GtkLabel" id="values">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|values">Values</property>
       </object>
@@ -1065,7 +1065,7 @@
       <object class="GtkLabel" id="formulas">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|formulas">Formulas</property>
       </object>
@@ -1095,7 +1095,7 @@
       <object class="GtkLabel" id="text">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|text">Text</property>
       </object>
@@ -1125,7 +1125,7 @@
       <object class="GtkLabel" id="protectedcells">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|protectedcells">Protected cells background</property>
       </object>
@@ -1171,7 +1171,7 @@
       <object class="GtkLabel" id="drawgrid">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|drawgrid">Grid</property>
       </object>
@@ -1217,7 +1217,7 @@
       <object class="GtkLabel" id="basicid">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|basicid">Identifier</property>
       </object>
@@ -1247,7 +1247,7 @@
       <object class="GtkLabel" id="basiccomment">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|basiccomment">Comment</property>
       </object>
@@ -1277,7 +1277,7 @@
       <object class="GtkLabel" id="basicnumber">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|basicnumber">Number</property>
       </object>
@@ -1307,7 +1307,7 @@
       <object class="GtkLabel" id="basicstring">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|basicstring">String</property>
       </object>
@@ -1337,7 +1337,7 @@
       <object class="GtkLabel" id="basicop">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|basicop">Operator</property>
       </object>
@@ -1367,7 +1367,7 @@
       <object class="GtkLabel" id="basickeyword">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|basickeyword">Reserved expression</property>
       </object>
@@ -1397,7 +1397,7 @@
       <object class="GtkLabel" id="error">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|error">Error</property>
       </object>
@@ -1443,7 +1443,7 @@
       <object class="GtkLabel" id="sqlid">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|sqlid">Identifier</property>
       </object>
@@ -1473,7 +1473,7 @@
       <object class="GtkLabel" id="sqlnumber">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|sqlnumber">Number</property>
       </object>
@@ -1503,7 +1503,7 @@
       <object class="GtkLabel" id="sqlstring">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|sqlstring">String</property>
       </object>
@@ -1533,7 +1533,7 @@
       <object class="GtkLabel" id="sqlop">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|sqlop">Operator</property>
       </object>
@@ -1563,7 +1563,7 @@
       <object class="GtkLabel" id="sqlkeyword">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|sqlkeyword">Keyword</property>
       </object>
@@ -1593,7 +1593,7 @@
       <object class="GtkLabel" id="sqlparam">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|sqlparam">Parameter</property>
       </object>
@@ -1623,7 +1623,7 @@
       <object class="GtkLabel" id="sqlcomment">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="colorconfigwin|sqlcomment">Comment</property>
       </object>
@@ -1639,7 +1639,7 @@
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
         <property name="use_underline">True</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="xalign">0</property>
         <property name="draw_indicator">True</property>
       </object>
diff --git a/cui/uiconfig/ui/colorfragment.ui b/cui/uiconfig/ui/colorfragment.ui
index c1055f4292af..a0b1fa636ebe 100644
--- a/cui/uiconfig/ui/colorfragment.ui
+++ b/cui/uiconfig/ui/colorfragment.ui
@@ -13,7 +13,7 @@
       <object class="GtkLabel" id="label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
+        <property name="margin-start">6</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">button</property>
         <property name="xalign">0</property>
diff --git a/cui/uiconfig/ui/connpooloptions.ui b/cui/uiconfig/ui/connpooloptions.ui
index 6dd8cc855ac9..a80c2167cdfb 100644
--- a/cui/uiconfig/ui/connpooloptions.ui
+++ b/cui/uiconfig/ui/connpooloptions.ui
@@ -79,7 +79,7 @@
                   <object class="GtkGrid" id="grid2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
+                    <property name="margin-start">12</property>
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
                     <property name="row_spacing">6</property>
@@ -158,7 +158,7 @@
                       <object class="GtkBox" id="box4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="margin_left">12</property>
+                        <property name="margin-start">12</property>
                         <property name="spacing">12</property>
                         <child>
                           <object class="GtkLabel" id="timeoutlabel">
diff --git a/cui/uiconfig/ui/dimensionlinestabpage.ui b/cui/uiconfig/ui/dimensionlinestabpage.ui
index 53f62d2776c1..94557b047708 100644
--- a/cui/uiconfig/ui/dimensionlinestabpage.ui
+++ b/cui/uiconfig/ui/dimensionlinestabpage.ui
@@ -161,7 +161,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="margin_left">12</property>
+                        <property name="margin-start">12</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="inconsistent">True</property>
@@ -488,7 +488,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="margin_left">12</property>
+                        <property name="margin-start">12</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="LB_UNIT-atkobject">
                             <property name="AtkObject::accessible-description" translatable="yes" context="dimensionlinestabpage|extended_tip|LB_UNIT">Shows or hides the dimension measurement units. You can also select a measurement unit you want to display from the list.</property>
diff --git a/cui/uiconfig/ui/hangulhanjaconversiondialog.ui b/cui/uiconfig/ui/hangulhanjaconversiondialog.ui
index 623de078c193..f69cafa13107 100644
--- a/cui/uiconfig/ui/hangulhanjaconversiondialog.ui
+++ b/cui/uiconfig/ui/hangulhanjaconversiondialog.ui
@@ -84,8 +84,8 @@
           <object class="GtkBox" id="box1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">6</property>
-            <property name="margin_right">6</property>
+            <property name="margin-start">6</property>
+            <property name="margin-end">6</property>
             <property name="margin_top">6</property>
             <property name="margin_bottom">6</property>
             <property name="spacing">12</property>
diff --git a/cui/uiconfig/ui/hangulhanjaeditdictdialog.ui b/cui/uiconfig/ui/hangulhanjaeditdictdialog.ui
index 55a73fd4693d..66fd2e3f7ec9 100644
--- a/cui/uiconfig/ui/hangulhanjaeditdictdialog.ui
+++ b/cui/uiconfig/ui/hangulhanjaeditdictdialog.ui
@@ -63,8 +63,8 @@
           <object class="GtkBox" id="box1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">6</property>
-            <property name="margin_right">6</property>
+            <property name="margin-start">6</property>
+            <property name="margin-end">6</property>
             <property name="margin_top">6</property>
             <property name="margin_bottom">6</property>
             <property name="orientation">vertical</property>
diff --git a/cui/uiconfig/ui/iconselectordialog.ui b/cui/uiconfig/ui/iconselectordialog.ui
index e159da5ee16f..22ecb94e804c 100644
--- a/cui/uiconfig/ui/iconselectordialog.ui
+++ b/cui/uiconfig/ui/iconselectordialog.ui
@@ -124,8 +124,8 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="events">GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
-                                    <property name="margin_left">3</property>
-                                    <property name="margin_right">3</property>
+                                    <property name="margin-start">3</property>
+                                    <property name="margin-end">3</property>
                                     <property name="margin_top">3</property>
                                     <property name="margin_bottom">3</property>
                                     <property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/insertfloatingframe.ui b/cui/uiconfig/ui/insertfloatingframe.ui
index d36c7fc3bce2..ca21ac6f7f7f 100644
--- a/cui/uiconfig/ui/insertfloatingframe.ui
+++ b/cui/uiconfig/ui/insertfloatingframe.ui
@@ -118,7 +118,7 @@
                     <property name="width_request">400</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="margin_right">12</property>
+                    <property name="margin-end">12</property>
                     <property name="hexpand">True</property>
                     <property name="activates_default">True</property>
                     <child internal-child="accessible">
@@ -137,7 +137,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="margin_right">12</property>
+                    <property name="margin-end">12</property>
                     <property name="label" translatable="yes" context="insertfloatingframe|label6">Name:</property>
                   </object>
                   <packing>
@@ -150,7 +150,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="margin_right">12</property>
+                    <property name="margin-end">12</property>
                     <property name="label" translatable="yes" context="insertfloatingframe|label7">Contents:</property>
                   </object>
                   <packing>
@@ -402,7 +402,7 @@
                               <object class="GtkLabel" id="widthlabel">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="margin_right">12</property>
+                                <property name="margin-end">12</property>
                                 <property name="label" translatable="yes" context="insertfloatingframe|widthlabel">Width:</property>
                                 <property name="xalign">0</property>
                               </object>
@@ -415,7 +415,7 @@
                               <object class="GtkLabel" id="heightlabel">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="margin_right">12</property>
+                                <property name="margin-end">12</property>
                                 <property name="label" translatable="yes" context="insertfloatingframe|heightlabel">Height:</property>
                                 <property name="xalign">0</property>
                               </object>
@@ -428,7 +428,7 @@
                               <object class="GtkSpinButton" id="width">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="margin_right">12</property>
+                                <property name="margin-end">12</property>
                                 <property name="activates_default">True</property>
                                 <property name="adjustment">adjustment1</property>
                                 <child internal-child="accessible">
@@ -446,7 +446,7 @@
                               <object class="GtkSpinButton" id="height">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="margin_right">12</property>
+                                <property name="margin-end">12</property>
                                 <property name="activates_default">True</property>
                                 <property name="adjustment">adjustment2</property>
                                 <child internal-child="accessible">
diff --git a/cui/uiconfig/ui/menuassignpage.ui b/cui/uiconfig/ui/menuassignpage.ui
index 2bcc6ce58d32..1f0dfbc2719d 100644
--- a/cui/uiconfig/ui/menuassignpage.ui
+++ b/cui/uiconfig/ui/menuassignpage.ui
@@ -443,7 +443,7 @@
               <object class="GtkComboBoxText" id="savein">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_right">5</property>
+                <property name="margin-end">5</property>
                 <property name="hexpand">True</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="savein-atkobject">
@@ -504,7 +504,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="halign">end</property>
-                <property name="margin_left">1</property>
+                <property name="margin-start">1</property>
                 <property name="image">image7</property>
                 <property name="always_show_image">True</property>
                 <property name="popup">menugearmenu</property>
@@ -526,7 +526,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="halign">end</property>
-                <property name="margin_left">1</property>
+                <property name="margin-start">1</property>
                 <property name="image">image8</property>
                 <property name="always_show_image">True</property>
                 <property name="popup">toolbargearmenu</property>
@@ -680,8 +680,8 @@
           <object class="GtkButtonBox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">5</property>
-            <property name="margin_right">5</property>
+            <property name="margin-start">5</property>
+            <property name="margin-end">5</property>
             <property name="margin_top">5</property>
             <property name="margin_bottom">5</property>
             <property name="hexpand">True</property>
@@ -692,8 +692,8 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="margin_left">5</property>
-                <property name="margin_right">5</property>
+                <property name="margin-start">5</property>
+                <property name="margin-end">5</property>
                 <property name="margin_top">5</property>
                 <property name="margin_bottom">5</property>
                 <property name="use_underline">True</property>
@@ -716,8 +716,8 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="margin_left">5</property>
-                <property name="margin_right">5</property>
+                <property name="margin-start">5</property>
+                <property name="margin-end">5</property>
                 <property name="margin_top">5</property>
                 <property name="margin_bottom">5</property>
                 <property name="use_underline">True</property>
@@ -740,8 +740,8 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="margin_left">5</property>
-                <property name="margin_right">5</property>
+                <property name="margin-start">5</property>
+                <property name="margin-end">5</property>
                 <property name="margin_top">5</property>
                 <property name="margin_bottom">5</property>
                 <property name="use_underline">True</property>
@@ -769,8 +769,8 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="valign">center</property>
-            <property name="margin_left">6</property>
-            <property name="margin_right">6</property>
+            <property name="margin-start">6</property>
+            <property name="margin-end">6</property>
             <property name="row_spacing">6</property>
             <child>
               <!-- n-columns=1 n-rows=1 -->
diff --git a/cui/uiconfig/ui/optfltrpage.ui b/cui/uiconfig/ui/optfltrpage.ui
index 70b182b2d61e..93bb1a4b8731 100644
--- a/cui/uiconfig/ui/optfltrpage.ui
+++ b/cui/uiconfig/ui/optfltrpage.ui
@@ -52,7 +52,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="margin_left">18</property>
+                    <property name="margin-start">18</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
@@ -152,7 +152,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="margin_left">18</property>
+                    <property name="margin-start">18</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
diff --git a/cui/uiconfig/ui/opthtmlpage.ui b/cui/uiconfig/ui/opthtmlpage.ui
index 34d85e88665e..999a2d06cbd4 100644
--- a/cui/uiconfig/ui/opthtmlpage.ui
+++ b/cui/uiconfig/ui/opthtmlpage.ui
@@ -540,7 +540,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="margin_left">12</property>
+                        <property name="margin-start">12</property>
                         <property name="hexpand">True</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
diff --git a/cui/uiconfig/ui/optsavepage.ui b/cui/uiconfig/ui/optsavepage.ui
index d4d89fc3a59a..4554149d74a6 100644
--- a/cui/uiconfig/ui/optsavepage.ui
+++ b/cui/uiconfig/ui/optsavepage.ui
@@ -178,7 +178,7 @@
                     <property name="label" translatable="yes" context="optsavepage|userautosave">Automatically save the document too</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="margin_left">12</property>
+                    <property name="margin-start">12</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
@@ -338,7 +338,7 @@
                   <object class="GtkGrid" id="grid11">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
+                    <property name="margin-start">12</property>
                     <property name="column_spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="odfwarning_label">
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index 59a5ec07e7d2..a7366ad8c156 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -601,7 +601,7 @@
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
                         <property name="tooltip-text" translatable="yes" context="optviewpage|forceskia|tooltip_text">Requires restart. Enabling this will prevent the use of graphics drivers.</property>
-                        <property name="margin-left">12</property>
+                        <property name="margin-start">12</property>
                         <property name="use-underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw-indicator">True</property>
@@ -614,7 +614,7 @@
                     <child>
                       <object class="GtkLabel" id="skiaenabled">
                         <property name="can-focus">False</property>
-                        <property name="margin-left">12</property>
+                        <property name="margin-start">12</property>
                         <property name="label" translatable="yes" context="optviewpage|skiaenabled">Skia is currently enabled.</property>
                         <property name="xalign">0</property>
                       </object>
@@ -626,7 +626,7 @@
                     <child>
                       <object class="GtkLabel" id="skiadisabled">
                         <property name="can-focus">False</property>
-                        <property name="margin-left">12</property>
+                        <property name="margin-start">12</property>
                         <property name="label" translatable="yes" context="optviewpage|skiadisabled">Skia is currently disabled.</property>
                         <property name="xalign">0</property>
                       </object>
@@ -760,7 +760,7 @@
                       <object class="GtkGrid">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="margin-left">18</property>
+                        <property name="margin-start">18</property>
                         <property name="column-spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="aafrom">
diff --git a/cui/uiconfig/ui/paragalignpage.ui b/cui/uiconfig/ui/paragalignpage.ui
index 0d87d98c0505..72597cb60c66 100644
--- a/cui/uiconfig/ui/paragalignpage.ui
+++ b/cui/uiconfig/ui/paragalignpage.ui
@@ -152,7 +152,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="margin_left">22</property>
+                        <property name="margin-start">22</property>
                         <property name="relief">none</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
@@ -169,7 +169,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="margin_left">22</property>
+                        <property name="margin-start">22</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
diff --git a/cui/uiconfig/ui/personalization_tab.ui b/cui/uiconfig/ui/personalization_tab.ui
index 5b668391b7c0..84ef7306266b 100644
--- a/cui/uiconfig/ui/personalization_tab.ui
+++ b/cui/uiconfig/ui/personalization_tab.ui
@@ -68,8 +68,8 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">center</property>
-                    <property name="margin_left">24</property>
-                    <property name="margin_right">6</property>
+                    <property name="margin-start">24</property>
+                    <property name="margin-end">6</property>
                     <property name="row_spacing">6</property>
                     <property name="column_spacing">6</property>
                     <child>
diff --git a/cui/uiconfig/ui/qrcodegen.ui b/cui/uiconfig/ui/qrcodegen.ui
index 1c9b4437479e..45b9f95a5e45 100644
--- a/cui/uiconfig/ui/qrcodegen.ui
+++ b/cui/uiconfig/ui/qrcodegen.ui
@@ -82,8 +82,8 @@
           <object class="GtkGrid">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">6</property>
-            <property name="margin_right">6</property>
+            <property name="margin-start">6</property>
+            <property name="margin-end">6</property>
             <property name="margin_top">6</property>
             <property name="margin_bottom">6</property>
             <property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/signatureline.ui b/cui/uiconfig/ui/signatureline.ui
index 2c38031aaafe..b5ecc79b9b2e 100644
--- a/cui/uiconfig/ui/signatureline.ui
+++ b/cui/uiconfig/ui/signatureline.ui
@@ -76,8 +76,8 @@
           <object class="GtkGrid">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">6</property>
-            <property name="margin_right">6</property>
+            <property name="margin-start">6</property>
+            <property name="margin-end">6</property>
             <property name="margin_top">6</property>
             <property name="margin_bottom">6</property>
             <property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/signsignatureline.ui b/cui/uiconfig/ui/signsignatureline.ui
index 5386cc063060..70a958c0381b 100644
--- a/cui/uiconfig/ui/signsignatureline.ui
+++ b/cui/uiconfig/ui/signsignatureline.ui
@@ -75,8 +75,8 @@
           <object class="GtkGrid">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">6</property>
-            <property name="margin_right">6</property>
+            <property name="margin-start">6</property>
+            <property name="margin-end">6</property>
             <property name="margin_top">6</property>
             <property name="margin_bottom">6</property>
             <property name="hexpand">True</property>
@@ -336,7 +336,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
-                            <property name="margin_left">12</property>
+                            <property name="margin-start">12</property>
                             <property name="mnemonic_widget">edit_comment</property>
                             <attributes>
                               <attribute name="style" value="oblique"/>
diff --git a/cui/uiconfig/ui/similaritysearchdialog.ui b/cui/uiconfig/ui/similaritysearchdialog.ui
index fdc0b48d562c..4539d6e4afb8 100644
--- a/cui/uiconfig/ui/similaritysearchdialog.ui
+++ b/cui/uiconfig/ui/similaritysearchdialog.ui
@@ -74,7 +74,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="margin_right">6</property>
+                <property name="margin-end">6</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
diff --git a/cui/uiconfig/ui/swpossizepage.ui b/cui/uiconfig/ui/swpossizepage.ui
index 5a46b3dd9c32..c249ab1bf6be 100644
--- a/cui/uiconfig/ui/swpossizepage.ui
+++ b/cui/uiconfig/ui/swpossizepage.ui
@@ -566,7 +566,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="margin_left">12</property>
+                    <property name="margin-start">12</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
@@ -588,7 +588,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="margin_left">12</property>
+                    <property name="margin-start">12</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
diff --git a/cui/uiconfig/ui/textanimtabpage.ui b/cui/uiconfig/ui/textanimtabpage.ui
index f0b40e3b22d2..cc478da3c4a1 100644
--- a/cui/uiconfig/ui/textanimtabpage.ui
+++ b/cui/uiconfig/ui/textanimtabpage.ui
@@ -331,7 +331,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="margin_left">12</property>
+                    <property name="margin-start">12</property>
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="TSB_ENDLESS">
@@ -402,7 +402,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="margin_left">12</property>
+                    <property name="margin-start">12</property>
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="TSB_PIXEL">
@@ -473,7 +473,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="margin_left">12</property>
+                    <property name="margin-start">12</property>
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="TSB_AUTO">
diff --git a/cui/uiconfig/ui/textflowpage.ui b/cui/uiconfig/ui/textflowpage.ui
index 8f5af91b5959..16efd57e123e 100644
--- a/cui/uiconfig/ui/textflowpage.ui
+++ b/cui/uiconfig/ui/textflowpage.ui
@@ -96,7 +96,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="halign">start</property>
-                    <property name="margin_left">25</property>
+                    <property name="margin-start">25</property>
                     <property name="activates_default">True</property>
                     <property name="adjustment">adjustment2</property>
                     <child internal-child="accessible">
@@ -115,7 +115,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="halign">start</property>
-                    <property name="margin_left">25</property>
+                    <property name="margin-start">25</property>
                     <property name="activates_default">True</property>
                     <property name="adjustment">adjustment4</property>
                     <child internal-child="accessible">
@@ -134,7 +134,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="halign">start</property>
-                    <property name="margin_left">25</property>
+                    <property name="margin-start">25</property>
                     <property name="activates_default">True</property>
                     <property name="input_purpose">number</property>
                     <property name="adjustment">adjustment1</property>
diff --git a/cui/uiconfig/ui/transparencytabpage.ui b/cui/uiconfig/ui/transparencytabpage.ui
index a993b13dba9b..71f06673650f 100644
--- a/cui/uiconfig/ui/transparencytabpage.ui
+++ b/cui/uiconfig/ui/transparencytabpage.ui
@@ -470,7 +470,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="valign">start</property>
-                <property name="margin_right">12</property>
+                <property name="margin-end">12</property>
                 <property name="hexpand">True</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
diff --git a/dbaccess/uiconfig/ui/finalpagewizard.ui b/dbaccess/uiconfig/ui/finalpagewizard.ui
index c6321b85c59e..07925b5c6455 100644
--- a/dbaccess/uiconfig/ui/finalpagewizard.ui
+++ b/dbaccess/uiconfig/ui/finalpagewizard.ui
@@ -60,7 +60,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="margin_left">12</property>
+                <property name="margin-start">12</property>
                 <property name="use_underline">True</property>
                 <property name="xalign">0</property>
                 <property name="active">True</property>
@@ -77,7 +77,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="margin_left">12</property>
+                <property name="margin-start">12</property>
                 <property name="use_underline">True</property>
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
@@ -121,7 +121,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="margin_left">12</property>
+                <property name="margin-start">12</property>
                 <property name="use_underline">True</property>
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
@@ -137,7 +137,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="margin_left">12</property>
+                <property name="margin-start">12</property>
                 <property name="use_underline">True</property>
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
diff --git a/dbaccess/uiconfig/ui/generalpagedialog.ui b/dbaccess/uiconfig/ui/generalpagedialog.ui
index 2eac6b2ff322..97c1a0e5f1c4 100644
--- a/dbaccess/uiconfig/ui/generalpagedialog.ui
+++ b/dbaccess/uiconfig/ui/generalpagedialog.ui
@@ -27,7 +27,7 @@
       <object class="GtkLabel" id="datasourceTypeLabel">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">48</property>
+        <property name="margin-start">48</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes" context="generalpagedialog|datasourceTypeLabel">Database _type:</property>
         <property name="use_underline">True</property>
diff --git a/dbaccess/uiconfig/ui/generalpagewizard.ui b/dbaccess/uiconfig/ui/generalpagewizard.ui
index 7bb54265a0e6..700c7ebb9e41 100644
--- a/dbaccess/uiconfig/ui/generalpagewizard.ui
+++ b/dbaccess/uiconfig/ui/generalpagewizard.ui
@@ -62,7 +62,7 @@
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
-        <property name="margin_left">12</property>
+        <property name="margin-start">12</property>
         <property name="use_underline">True</property>
         <property name="xalign">0</property>
         <property name="active">True</property>
@@ -77,7 +77,7 @@
       <object class="GtkBox" id="embeddeddbBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">24</property>
+        <property name="margin-start">24</property>
         <property name="spacing">12</property>
         <child>
           <object class="GtkLabel" id="embeddeddbLabel">
@@ -117,7 +117,7 @@
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
-        <property name="margin_left">12</property>
+        <property name="margin-start">12</property>
         <property name="use_underline">True</property>
         <property name="xalign">0</property>
         <property name="active">True</property>
@@ -133,7 +133,7 @@
       <object class="GtkBox" id="docListBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">24</property>
+        <property name="margin-start">24</property>
         <property name="spacing">12</property>
         <child>
           <object class="GtkLabel" id="docListLabel">
@@ -175,7 +175,7 @@
         <property name="can_focus">True</property>
         <property name="receives_default">True</property>
         <property name="halign">start</property>
-        <property name="margin_left">24</property>
+        <property name="margin-start">24</property>
         <property name="always_show_image">True</property>
       </object>
       <packing>
@@ -189,7 +189,7 @@
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
-        <property name="margin_left">12</property>
+        <property name="margin-start">12</property>
         <property name="use_underline">True</property>
         <property name="xalign">0</property>
         <property name="active">True</property>
@@ -206,7 +206,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">start</property>
-        <property name="margin_left">24</property>
+        <property name="margin-start">24</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
diff --git a/dbaccess/uiconfig/ui/titlewindow.ui b/dbaccess/uiconfig/ui/titlewindow.ui
index d7fbd2e5818b..6cafad098a8f 100644
--- a/dbaccess/uiconfig/ui/titlewindow.ui
+++ b/dbaccess/uiconfig/ui/titlewindow.ui
@@ -32,8 +32,8 @@
                   <object class="GtkGrid" id="titleparent">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">1</property>
-                    <property name="margin_right">1</property>
+                    <property name="margin-start">1</property>
+                    <property name="margin-end">1</property>
                     <child>
                       <object class="GtkAlignment">
                         <property name="visible">True</property>
diff --git a/extensions/uiconfig/sbibliography/ui/combobox.ui b/extensions/uiconfig/sbibliography/ui/combobox.ui
index a71b9f241113..9bce67069269 100644
--- a/extensions/uiconfig/sbibliography/ui/combobox.ui
+++ b/extensions/uiconfig/sbibliography/ui/combobox.ui
@@ -5,8 +5,8 @@
   <object class="GtkBox" id="ComboBox">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="margin_left">6</property>
-    <property name="margin_right">6</property>
+    <property name="margin-start">6</property>
+    <property name="margin-end">6</property>
     <property name="spacing">6</property>
     <child>
       <object class="GtkLabel" id="label">
diff --git a/formula/uiconfig/ui/parameter.ui b/formula/uiconfig/ui/parameter.ui
index ec82fc99c4c8..33ee34b26e03 100644
--- a/formula/uiconfig/ui/parameter.ui
+++ b/formula/uiconfig/ui/parameter.ui
@@ -101,8 +101,8 @@
                       <object class="GtkGrid" id="grid2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="margin_left">6</property>
-                        <property name="margin_right">6</property>
+                        <property name="margin-start">6</property>
+                        <property name="margin-end">6</property>
                         <property name="margin_top">6</property>
                         <property name="margin_bottom">6</property>
                         <property name="hexpand">True</property>
diff --git a/fpicker/uiconfig/ui/remotefilesdialog.ui b/fpicker/uiconfig/ui/remotefilesdialog.ui
index f6fcf2ee22d5..5a3bd9b0a311 100644
--- a/fpicker/uiconfig/ui/remotefilesdialog.ui
+++ b/fpicker/uiconfig/ui/remotefilesdialog.ui
@@ -293,7 +293,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="tooltip_text" translatable="yes" context="remotefilesdialog|new_folder|tooltip_text">Create New Folder</property>
-                <property name="margin_left">6</property>
+                <property name="margin-start">6</property>
                 <property name="image">image3</property>
                 <property name="always_show_image">True</property>
               </object>
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 1265bf774ec7..fd9fb9260587 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -184,13 +184,13 @@ public:
 
     virtual void set_margin_top(int nMargin) = 0;
     virtual void set_margin_bottom(int nMargin) = 0;
-    virtual void set_margin_left(int nMargin) = 0;
-    virtual void set_margin_right(int nMargin) = 0;
+    virtual void set_margin_start(int nMargin) = 0;
+    virtual void set_margin_end(int nMargin) = 0;
 
     virtual int get_margin_top() const = 0;
     virtual int get_margin_bottom() const = 0;
-    virtual int get_margin_left() const = 0;
-    virtual int get_margin_right() const = 0;
+    virtual int get_margin_start() const = 0;
+    virtual int get_margin_end() const = 0;
 
     /*
      * Report the extents of this widget relative to the rRelative target widget.
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 43db85d77e5f..d4e96f93a45e 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1395,11 +1395,11 @@ public:
     void set_border_width(sal_Int32 nBorderWidth);
     sal_Int32 get_border_width() const;
 
-    void set_margin_left(sal_Int32 nWidth);
-    sal_Int32 get_margin_left() const;
+    void set_margin_start(sal_Int32 nWidth);
+    sal_Int32 get_margin_start() const;
 
-    void set_margin_right(sal_Int32 nWidth);
-    sal_Int32 get_margin_right() const;
+    void set_margin_end(sal_Int32 nWidth);
+    sal_Int32 get_margin_end() const;
 
     void set_margin_top(sal_Int32 nWidth);
     sal_Int32 get_margin_top() const;
diff --git a/reportdesign/uiconfig/dbreport/ui/datetimedialog.ui b/reportdesign/uiconfig/dbreport/ui/datetimedialog.ui
index b4228da10ac9..ac38265c20ab 100644
--- a/reportdesign/uiconfig/dbreport/ui/datetimedialog.ui
+++ b/reportdesign/uiconfig/dbreport/ui/datetimedialog.ui
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="datelistbox_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">12</property>
+                <property name="margin-start">12</property>
                 <property name="label" translatable="yes" context="datetimedialog|datelistbox_label">_Format:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">datelistbox</property>
@@ -142,7 +142,7 @@
               <object class="GtkLabel" id="timelistbox_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">12</property>
+                <property name="margin-start">12</property>
                 <property name="label" translatable="yes" context="datetimedialog|timelistbox_label">Fo_rmat:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">timelistbox</property>
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index aec31c9f8834..52ce7046b980 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2031,8 +2031,8 @@ void ScTextWnd::SetDrawingArea(weld::DrawingArea* pDrawingArea)
     SetDragDataTransferrable(xHelper, DND_ACTION_COPY);
 
     OutputDevice& rDevice = pDrawingArea->get_ref_device();
-    pDrawingArea->set_margin_left(gnBorderWidth);
-    pDrawingArea->set_margin_right(gnBorderWidth);
+    pDrawingArea->set_margin_start(gnBorderWidth);
+    pDrawingArea->set_margin_end(gnBorderWidth);
     // leave 1 for the width of the scrolledwindow border
     pDrawingArea->set_margin_top(gnBorderHeight - 1);
     pDrawingArea->set_margin_bottom(gnBorderHeight - 1);
diff --git a/sc/uiconfig/scalc/ui/advancedfilterdialog.ui b/sc/uiconfig/scalc/ui/advancedfilterdialog.ui
index a5b139474e6e..2a52c2e9416b 100644
--- a/sc/uiconfig/scalc/ui/advancedfilterdialog.ui
+++ b/sc/uiconfig/scalc/ui/advancedfilterdialog.ui
@@ -199,7 +199,7 @@
               <object class="GtkGrid" id="grid2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">12</property>
+                <property name="margin-start">12</property>
                 <property name="margin_top">6</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
@@ -354,7 +354,7 @@
                   <object class="GtkGrid" id="grid4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
+                    <property name="margin-start">12</property>
                     <property name="hexpand">True</property>
                     <property name="column_spacing">12</property>
                     <child>
diff --git a/sc/uiconfig/scalc/ui/cellprotectionpage.ui b/sc/uiconfig/scalc/ui/cellprotectionpage.ui
index 9c2298697a7a..e131bfe393be 100644
--- a/sc/uiconfig/scalc/ui/cellprotectionpage.ui
+++ b/sc/uiconfig/scalc/ui/cellprotectionpage.ui
@@ -38,7 +38,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="margin_left">12</property>
+                    <property name="margin-start">12</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="active">True</property>
@@ -61,7 +61,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="margin_left">12</property>
+                    <property name="margin-start">12</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="inconsistent">True</property>
diff --git a/sc/uiconfig/scalc/ui/createnamesdialog.ui b/sc/uiconfig/scalc/ui/createnamesdialog.ui
index 472700989a01..647390b348b8 100644
--- a/sc/uiconfig/scalc/ui/createnamesdialog.ui
+++ b/sc/uiconfig/scalc/ui/createnamesdialog.ui
@@ -58,7 +58,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="margin_right">6</property>
+                <property name="margin-end">6</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
diff --git a/sc/uiconfig/scalc/ui/dataform.ui b/sc/uiconfig/scalc/ui/dataform.ui
index f670217fde0a..ed14f861509b 100644
--- a/sc/uiconfig/scalc/ui/dataform.ui
+++ b/sc/uiconfig/scalc/ui/dataform.ui
@@ -84,8 +84,8 @@
                           <object class="GtkBox" id="box2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_left">6</property>
-                            <property name="margin_right">6</property>
+                            <property name="margin-start">6</property>
+                            <property name="margin-end">6</property>
                             <property name="margin_top">6</property>
                             <property name="margin_bottom">6</property>
                             <property name="hexpand">True</property>
diff --git a/sc/uiconfig/scalc/ui/definename.ui b/sc/uiconfig/scalc/ui/definename.ui
index 369768f1d845..f911de4cff3d 100644
--- a/sc/uiconfig/scalc/ui/definename.ui
+++ b/sc/uiconfig/scalc/ui/definename.ui
@@ -235,7 +235,7 @@
                   <object class="GtkGrid" id="grid2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
+                    <property name="margin-start">12</property>
                     <property name="row_spacing">6</property>
                     <property name="column_spacing">12</property>
                     <property name="column_homogeneous">True</property>
diff --git a/sc/uiconfig/scalc/ui/fourieranalysisdialog.ui b/sc/uiconfig/scalc/ui/fourieranalysisdialog.ui
index 7107a252d84c..7e51d2b55112 100644
--- a/sc/uiconfig/scalc/ui/fourieranalysisdialog.ui
+++ b/sc/uiconfig/scalc/ui/fourieranalysisdialog.ui
@@ -346,7 +346,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
-                        <property name="margin_right">5</property>
+                        <property name="margin-end">5</property>
                         <property name="margin_top">4</property>
                         <property name="label" translatable="yes" context="fourieranalysisdialog|label4">Minimum magnitude for polar form output (in dB)</property>
                         <property name="wrap">True</property>
diff --git a/sc/uiconfig/scalc/ui/mergecellsdialog.ui b/sc/uiconfig/scalc/ui/mergecellsdialog.ui
index 0c457529c390..3d5c71f03897 100644
--- a/sc/uiconfig/scalc/ui/mergecellsdialog.ui
+++ b/sc/uiconfig/scalc/ui/mergecellsdialog.ui
@@ -144,7 +144,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="margin_left">24</property>
+                <property name="margin-start">24</property>
                 <property name="margin_bottom">6</property>
                 <property name="hexpand">False</property>
                 <property name="icon_name">vcl/res/MergeFirstCell.png</property>
@@ -159,7 +159,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="margin_left">24</property>
+                <property name="margin-start">24</property>
                 <property name="margin_bottom">6</property>
                 <property name="hexpand">True</property>
                 <property name="icon_name">vcl/res/MergeKeepHidden.png</property>
@@ -174,7 +174,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="margin_left">24</property>
+                <property name="margin-start">24</property>
                 <property name="hexpand">True</property>
                 <property name="icon_name">vcl/res/MergeEmptyHidden.png</property>
               </object>
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index ba90157318e1..45d5c28990c6 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -3347,8 +3347,8 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="valign">center</property>
-                                        <property name="margin_left">5</property>
-                                        <property name="margin_right">5</property>
+                                        <property name="margin-start">5</property>
+                                        <property name="margin-end">5</property>
                                         <child>
                                           <object class="GtkToolButton" id="Home-FontHeight">
                                             <property name="visible">True</property>
@@ -4992,7 +4992,7 @@
                               <object class="GtkToolButton" id="Insert-DataDataPilotRun">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="margin_left">5</property>
+                                <property name="margin-start">5</property>
                                 <property name="action_name">.uno:DataDataPilotRun</property>
                               </object>
                               <packing>
@@ -11174,7 +11174,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
-                        <property name="margin_left">5</property>
+                        <property name="margin-start">5</property>
                         <property name="vexpand">True</property>
                         <child>
                           <object class="GtkSeparator" id="separator123">
@@ -11405,7 +11405,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="valign">center</property>
-                                    <property name="margin_right">5</property>
+                                    <property name="margin-end">5</property>
                                     <property name="action_name">.uno:GrafContrast</property>
                                   </object>
                                   <packing>
@@ -11486,7 +11486,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="valign">center</property>
-                                    <property name="margin_right">5</property>
+                                    <property name="margin-end">5</property>
                                     <property name="action_name">.uno:GrafGamma</property>
                                   </object>
                                   <packing>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
index 8026da6abe1a..3b70f92dd80b 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
@@ -3302,7 +3302,7 @@
                           <object class="sfxlo-NotebookbarToolBox" id="ExtTop7">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_left">5</property>
+                            <property name="margin-start">5</property>
                             <property name="toolbar_style">icons</property>
                             <property name="show_arrow">False</property>
                             <child>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index fa97921c36ab..4d341152cb40 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -3234,13 +3234,13 @@
           <object class="sfxlo-PriorityHBox" id="Toolbar">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">5</property>
-            <property name="margin_right">5</property>
+            <property name="margin-start">5</property>
+            <property name="margin-end">5</property>
             <child>
               <object class="sfxlo-DropdownBox" id="File">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">5</property>
+                <property name="margin-start">5</property>
                 <child>
                   <object class="GtkBox" id="Section">
                     <property name="visible">True</property>
@@ -3624,7 +3624,7 @@
                                   <object class="sfxlo-NotebookbarToolBox" id="SectionBottom4">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list