diff options
161 files changed, 575 insertions, 561 deletions
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> - <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> @@ -5212,7 +5212,7 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40"> <property name="visible">True</property> <property name="can_focus">True</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_full.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui index 91a3c303a912..68a1de99269f 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui @@ -3167,8 +3167,8 @@ <object class="sfxlo-PriorityHBox" id="DefaultBox1"> <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="baseline_position">bottom</property> <child> <object class="sfxlo-DropdownBox" id="SectionTools"> @@ -3991,7 +3991,7 @@ <object class="GtkToolButton" id="CharFontName"> <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="action_name">.uno:CharFontName</property> </object> <packing> @@ -4003,7 +4003,7 @@ <object class="GtkToolButton" id="FontHeight"> <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:FontHeight</property> </object> <packing> diff --git a/sc/uiconfig/scalc/ui/notebookbar_groups.ui b/sc/uiconfig/scalc/ui/notebookbar_groups.ui index 057baa3aebf9..b27646cf1813 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groups.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groups.ui @@ -352,8 +352,8 @@ <object class="GtkBox" id="box"> <property name="visible">True</property> <property name="can_focus">True</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="hexpand">True</property> <property name="vexpand">True</property> <property name="spacing">6</property> diff --git a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui index f31b2c5fe76c..14eb68e6c400 100644 --- a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui +++ b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui @@ -595,7 +595,7 @@ <object class="GtkGrid" id="grid5"> <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="row_spacing">3</property> <property name="column_spacing">12</property> @@ -750,7 +750,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="row_spacing">6</property> diff --git a/sc/uiconfig/scalc/ui/samplingdialog.ui b/sc/uiconfig/scalc/ui/samplingdialog.ui index 2f5953de821b..e659e55f15f6 100644 --- a/sc/uiconfig/scalc/ui/samplingdialog.ui +++ b/sc/uiconfig/scalc/ui/samplingdialog.ui @@ -245,7 +245,7 @@ <object class="GtkLabel" id="label1"> <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="xpad">12</property> <property name="label" translatable="yes" context="samplingdialog|label1">Sample size:</property> @@ -312,7 +312,7 @@ <object class="GtkLabel" id="label3"> <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="xpad">12</property> <property name="label" translatable="yes" context="samplingdialog|label3">Period:</property> diff --git a/sc/uiconfig/scalc/ui/sidebaralignment.ui b/sc/uiconfig/scalc/ui/sidebaralignment.ui index 54a20179af84..b067300b0e79 100644 --- a/sc/uiconfig/scalc/ui/sidebaralignment.ui +++ b/sc/uiconfig/scalc/ui/sidebaralignment.ui @@ -278,8 +278,8 @@ <object class="GtkSeparator" id="separator1"> <property name="visible">True</property> <property name="can_focus">False</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> </object> <packing> <property name="left_attach">0</property> diff --git a/sc/uiconfig/scalc/ui/solverdlg.ui b/sc/uiconfig/scalc/ui/solverdlg.ui index ccd87c6f54d1..68557a5337ae 100644 --- a/sc/uiconfig/scalc/ui/solverdlg.ui +++ b/sc/uiconfig/scalc/ui/solverdlg.ui @@ -459,7 +459,7 @@ <object class="GtkLabel" id="constraintlabel"> <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="label" translatable="yes" context="solverdlg|constraintlabel">V_alue</property> <property name="use_underline">True</property> <property name="xalign">0</property> @@ -678,7 +678,7 @@ <object class="GtkEntry" id="val1edit"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">6</property> + <property name="margin-start">6</property> <property name="hexpand">True</property> <property name="activates_default">True</property> <property name="width_chars">15</property> @@ -697,7 +697,7 @@ <object class="GtkEntry" id="val2edit"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">6</property> + <property name="margin-start">6</property> <property name="hexpand">True</property> <property name="activates_default">True</property> <property name="width_chars">15</property> @@ -716,7 +716,7 @@ <object class="GtkEntry" id="val3edit"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">6</property> + <property name="margin-start">6</property> <property name="hexpand">True</property> <property name="activates_default">True</property> <property name="width_chars">15</property> @@ -735,7 +735,7 @@ <object class="GtkEntry" id="val4edit"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">6</property> + <property name="margin-start">6</property> <property name="hexpand">True</property> <property name="activates_default">True</property> <property name="width_chars">15</property> diff --git a/sc/uiconfig/scalc/ui/sortoptionspage.ui b/sc/uiconfig/scalc/ui/sortoptionspage.ui index 6bed36c24c59..7360390b3967 100644 --- a/sc/uiconfig/scalc/ui/sortoptionspage.ui +++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui @@ -164,7 +164,7 @@ <object class="GtkComboBoxText" id="outarealb"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> + <property name="margin-start">12</property> <accessibility> <relation type="labelled-by" target="copyresult"/> <relation type="label-for" target="outareaed"/> @@ -229,7 +229,7 @@ <object class="GtkComboBoxText" id="sortuserlb"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> + <property name="margin-start">12</property> <accessibility> <relation type="labelled-by" target="sortuser"/> </accessibility> diff --git a/sc/uiconfig/scalc/ui/standardfilterdialog.ui b/sc/uiconfig/scalc/ui/standardfilterdialog.ui index 4f1857ae8788..a9fd8ec49b35 100644 --- a/sc/uiconfig/scalc/ui/standardfilterdialog.ui +++ b/sc/uiconfig/scalc/ui/standardfilterdialog.ui @@ -621,7 +621,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes" context="standardfilterdialog|remove1|tooltip_text">Remove</property> - <property name="margin_right">8</property> + <property name="margin-end">8</property> <property name="image">image1</property> </object> <packing> @@ -635,7 +635,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes" context="standardfilterdialog|remove2|tooltip_text">Remove</property> - <property name="margin_right">8</property> + <property name="margin-end">8</property> <property name="image">image2</property> </object> <packing> @@ -649,7 +649,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes" context="standardfilterdialog|remove3|tooltip_text">Remove</property> - <property name="margin_right">8</property> + <property name="margin-end">8</property> <property name="image">image3</property> </object> <packing> @@ -663,7 +663,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes" context="standardfilterdialog|remove4|tooltip_text">Remove</property> - <property name="margin_right">8</property> + <property name="margin-end">8</property> <property name="image">image4</property> </object> <packing> @@ -871,7 +871,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/subtotaldialog.ui b/sc/uiconfig/scalc/ui/subtotaldialog.ui index 630e37f2b433..daa9198020bd 100644 --- a/sc/uiconfig/scalc/ui/subtotaldialog.ui +++ b/sc/uiconfig/scalc/ui/subtotaldialog.ui @@ -29,7 +29,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/subtotaloptionspage.ui b/sc/uiconfig/scalc/ui/subtotaloptionspage.ui index 89c8503f57bf..26a9dd38c204 100644 --- a/sc/uiconfig/scalc/ui/subtotaloptionspage.ui +++ b/sc/uiconfig/scalc/ui/subtotaloptionspage.ui @@ -233,7 +233,7 @@ <object class="GtkComboBoxText" id="lbuserdef"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> + <property name="margin-start">12</property> <accessibility> <relation type="labelled-by" target="btnuserdef"/> </accessibility> diff --git a/sc/uiconfig/scalc/ui/validationcriteriapage.ui b/sc/uiconfig/scalc/ui/validationcriteriapage.ui index 46d18eef8233..db22864a700a 100644 --- a/sc/uiconfig/scalc/ui/validationcriteriapage.ui +++ b/sc/uiconfig/scalc/ui/validationcriteriapage.ui @@ -245,7 +245,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> diff --git a/sd/uiconfig/sdraw/ui/copydlg.ui b/sd/uiconfig/sdraw/ui/copydlg.ui index 6eda959e62be..9c216cf4b03d 100644 --- a/sd/uiconfig/sdraw/ui/copydlg.ui +++ b/sd/uiconfig/sdraw/ui/copydlg.ui @@ -150,7 +150,7 @@ <object class="GtkSpinButton" id="copies"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">12</property> + <property name="margin-start">12</property> <property name="hexpand">True</property> <property name="activates_default">True</property> <property name="adjustment">adjustment1</property> diff --git a/sd/uiconfig/sdraw/ui/namedesign.ui b/sd/uiconfig/sdraw/ui/namedesign.ui index 8da030661fc0..bc773be3e9cc 100644 --- a/sd/uiconfig/sdraw/ui/namedesign.ui +++ b/sd/uiconfig/sdraw/ui/namedesign.ui @@ -53,7 +53,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/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui index 8824cc4637cc..ca567a4ee5d9 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar.ui @@ -3160,7 +3160,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="vexpand">True</property> <property name="orientation">vertical</property> <child> @@ -3223,7 +3223,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="margin_left">5</property> + <property name="margin-start">5</property> <property name="margin_top">5</property> <property name="margin_bottom">5</property> <property name="orientation">vertical</property> @@ -8541,7 +8541,7 @@ <object class="sfxlo-NotebookbarToolBox" id="fontheight"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">5</property> + <property name="margin-start">5</property> <child> <object class="GtkToolButton" id="Home-FontHeight"> <property name="visible">True</property> diff --git a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui index bef513927bbe..e705a28e6236 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui @@ -8378,7 +8378,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="show_arrow">False</property> <child> <object class="GtkToolButton" id="Text-FontHeight"> @@ -9885,7 +9885,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="show_arrow">False</property> <child> <object class="GtkToolButton" id="Table-FontHeight1"> diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui index 2c0ab5f3ca11..fcc5554b5eb8 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui @@ -2963,13 +2963,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> @@ -4435,7 +4435,7 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom10"> <property name="visible">True</property> <property name="can_focus">True</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> @@ -5390,7 +5390,7 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom9"> <property name="visible">True</property> <property name="can_focus">True</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> @@ -9782,7 +9782,7 @@ <object class="VclOptionalBox" id="Image-Section-ColorSettings2"> <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="GroupB90"> <property name="visible">True</property> @@ -14293,7 +14293,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="margin_right">5</property> + <property name="margin-end">5</property> <child> <object class="GtkBox" id="Ext2"> <property name="visible">True</property> diff --git a/sd/uiconfig/sdraw/ui/notebookbar_single.ui b/sd/uiconfig/sdraw/ui/notebookbar_single.ui index 106c3f5df571..215000debcc3 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_single.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_single.ui @@ -51,7 +51,7 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom41"> <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="margin_top">4</property> <property name="margin_bottom">4</property> <property name="show_arrow">False</property> @@ -469,7 +469,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="show_arrow">False</property> <child> <object class="GtkToolButton" id="Default-LineWidth2"> @@ -1842,7 +1842,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> <child> <object class="sfxlo-NotebookbarToolBox" id="ExtBottom9"> <property name="visible">True</property> @@ -1887,7 +1887,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="show_arrow">False</property> <child> <object class="GtkToolButton" id="Table-Grow1"> @@ -2535,7 +2535,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_left">1</property> + <property name="margin-start">1</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -3416,7 +3416,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="show_arrow">False</property> <child> <object class="GtkToolButton" id="Graphic-LineWidth1"> @@ -4251,7 +4251,7 @@ <object class="GtkSeparator" id="separator20"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">1</property> + <property name="margin-start">1</property> <property name="margin_top">5</property> <property name="margin_bottom">5</property> <property name="orientation">vertical</property> @@ -4785,7 +4785,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="show_arrow">False</property> <child> <object class="GtkToolButton" id="MultiObject-LineWidth1"> @@ -6037,7 +6037,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="show_arrow">False</property> <child> <object class="GtkToolButton" id="Media-LineWidth1"> @@ -7085,7 +7085,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="show_arrow">False</property> <child> <object class="GtkToolButton" id="Object-LineWidth"> @@ -9375,7 +9375,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="show_arrow">False</property> <child> <object class="GtkToolButton" id="Default-LineWidth1"> @@ -9510,7 +9510,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="show_arrow">False</property> <child> <object class="GtkToolButton" id="Text-FontHeight"> @@ -10790,7 +10790,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="show_arrow">False</property> <child> <object class="GtkToolButton" id="3dObject-LineWidth1"> diff --git a/sd/uiconfig/sdraw/ui/paranumberingtab.ui b/sd/uiconfig/sdraw/ui/paranumberingtab.ui index 153336c64023..e43a062a9776 100644 --- a/sd/uiconfig/sdraw/ui/paranumberingtab.ui +++ b/sd/uiconfig/sdraw/ui/paranumberingtab.ui @@ -63,7 +63,7 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="halign">start</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/sd/uiconfig/sdraw/ui/vectorize.ui b/sd/uiconfig/sdraw/ui/vectorize.ui index 1e049e1657bb..337f353fad21 100644 --- a/sd/uiconfig/sdraw/ui/vectorize.ui +++ b/sd/uiconfig/sdraw/ui/vectorize.ui @@ -185,7 +185,7 @@ <object class="GtkLabel" id="tilesft"> <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="xpad">12</property> <property name="label" translatable="yes" context="vectorize|tilesft">Tile size:</property> <property name="use_underline">True</property> diff --git a/sd/uiconfig/simpress/ui/headerfootertab.ui b/sd/uiconfig/simpress/ui/headerfootertab.ui index a2f7f4704384..bd9c4b6b05aa 100644 --- a/sd/uiconfig/simpress/ui/headerfootertab.ui +++ b/sd/uiconfig/simpress/ui/headerfootertab.ui @@ -65,7 +65,7 @@ <object class="GtkBox" id="header_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">12</property> <child> <object class="GtkLabel" id="header_label"> @@ -141,7 +141,7 @@ <object class="GtkBox" id="datetimebox"> <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="orientation">vertical</property> <property name="spacing">12</property> <child> @@ -366,7 +366,7 @@ <object class="GtkBox" id="footer_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">12</property> <child> <object class="GtkLabel" id="footer_label"> diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui index 318f7c61fd67..dfa0bbd999ca 100644 --- a/sd/uiconfig/simpress/ui/notebookbar.ui +++ b/sd/uiconfig/simpress/ui/notebookbar.ui @@ -3193,7 +3193,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="vexpand">True</property> <property name="orientation">vertical</property> <child> @@ -3256,7 +3256,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="margin_left">5</property> + <property name="margin-start">5</property> <property name="margin_top">5</property> <property name="margin_bottom">5</property> <property name="orientation">vertical</property> @@ -3653,7 +3653,7 @@ <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-start">5</property> <child> <object class="GtkToolButton" id="Home-FontHeight"> <property name="visible">True</property> diff --git a/sd/uiconfig/simpress/ui/notebookbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_compact.ui index e8967b8e0530..b77872b744b9 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_compact.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_compact.ui @@ -3646,7 +3646,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="show_arrow">False</property> <child> <object class="GtkToolButton" id="Home-FontHeight"> diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui index 4d06b92f60a1..db213e880185 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui @@ -3023,13 +3023,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> @@ -4644,7 +4644,7 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom10"> <property name="visible">True</property> <property name="can_focus">True</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> @@ -5488,7 +5488,7 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom9"> <property name="visible">True</property> <property name="can_focus">True</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> @@ -9850,7 +9850,7 @@ <object class="VclOptionalBox" id="Image-Section-ColorSettings2"> <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="GroupB90"> <property name="visible">True</property> @@ -14385,7 +14385,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="margin_right">5</property> + <property name="margin-end">5</property> <child> <object class="GtkBox" id="Ext2"> <property name="visible">True</property> diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui index 18ee3754e2d6..bb12cc1b11bd 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui @@ -2917,8 +2917,8 @@ <object class="sfxlo-PriorityHBox" id="DefaultBox1"> <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="baseline_position">bottom</property> <child> <object class="sfxlo-DropdownBox" id="SectionTools"> diff --git a/sd/uiconfig/simpress/ui/notebookbar_groups.ui b/sd/uiconfig/simpress/ui/notebookbar_groups.ui index 6ef7b31e7467..f52d026b84b0 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groups.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groups.ui @@ -311,8 +311,8 @@ <object class="GtkBox" id="box"> <property name="visible">True</property> <property name="can_focus">True</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="hexpand">True</property> <property name="vexpand">True</property> <property name="spacing">6</property> diff --git a/sd/uiconfig/simpress/ui/notebookbar_single.ui b/sd/uiconfig/simpress/ui/notebookbar_single.ui index 7f5a0fef3804..5da72201f1bc 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_single.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_single.ui @@ -51,7 +51,7 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom41"> <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="margin_top">4</property> <property name="margin_bottom">4</property> <property name="show_arrow">False</property> @@ -1494,7 +1494,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> <child> <object class="sfxlo-NotebookbarToolBox" id="ExtBottom9"> <property name="visible">True</property> @@ -1539,7 +1539,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="show_arrow">False</property> <child> <object class="GtkToolButton" id="Table-Grow1"> @@ -2187,7 +2187,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_left">1</property> + <property name="margin-start">1</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -3068,7 +3068,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="show_arrow">False</property> <child> <object class="GtkToolButton" id="Graphic-LineWidth1"> @@ -3903,7 +3903,7 @@ <object class="GtkSeparator" id="separator20"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">1</property> + <property name="margin-start">1</property> <property name="margin_top">5</property> <property name="margin_bottom">5</property> <property name="orientation">vertical</property> @@ -4437,7 +4437,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="show_arrow">False</property> <child> <object class="GtkToolButton" id="MultiObject-LineWidth1"> @@ -5689,7 +5689,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="show_arrow">False</property> <child> <object class="GtkToolButton" id="Media-LineWidth1"> @@ -6737,7 +6737,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="show_arrow">False</property> <child> <object class="GtkToolButton" id="Object-LineWidth"> @@ -9027,7 +9027,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="show_arrow">False</property> <child> <object class="GtkToolButton" id="Default-LineWidth1"> @@ -9162,7 +9162,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="show_arrow">False</property> <child> <object class="GtkToolButton" id="Text-FontHeight"> @@ -10442,7 +10442,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="show_arrow">False</property> <child> <object class="GtkToolButton" id="3dObject-LineWidth1"> diff --git a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui index 7230f6fa8d4d..ce8ca792c7f3 100644 --- a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui +++ b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui @@ -409,7 +409,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="double_buffered">False</property> - <property name="margin_right">3</property> + <property name="margin-end">3</property> <property name="label" translatable="yes" context="optimpressgeneralpage|label8">_Drawing scale:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">scaleBox</property> diff --git a/sd/uiconfig/simpress/ui/presentationdialog.ui b/sd/uiconfig/simpress/ui/presentationdialog.ui index dfdb9e5ba4ad..872e97523b1c 100644 --- a/sd/uiconfig/simpress/ui/presentationdialog.ui +++ b/sd/uiconfig/simpress/ui/presentationdialog.ui @@ -494,7 +494,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> @@ -515,7 +515,7 @@ <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="tooltip_text" translatable="yes" context="presentationdialog|pauseduration|tooltip_text">Duration of pause</property> - <property name="margin_left">12</property> + <property name="margin-start">12</property> <property name="activates_default">True</property> <property name="adjustment">adjustment1</property> <accessibility> diff --git a/sd/uiconfig/simpress/ui/publishingdialog.ui b/sd/uiconfig/simpress/ui/publishingdialog.ui index 670a34341955..0daa934241c7 100644 --- a/sd/uiconfig/simpress/ui/publishingdialog.ui +++ b/sd/uiconfig/simpress/ui/publishingdialog.ui @@ -1108,7 +1108,7 @@ <object class="GtkBox" id="box19"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">10</property> + <property name="margin-start">10</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="qualityTxtLabel"> diff --git a/sd/uiconfig/simpress/ui/remotedialog.ui b/sd/uiconfig/simpress/ui/remotedialog.ui index 7af9f358ab2c..bf63de796b8d 100644 --- a/sd/uiconfig/simpress/ui/remotedialog.ui +++ b/sd/uiconfig/simpress/ui/remotedialog.ui @@ -112,8 +112,8 @@ <object class="GtkBox" id="tree"> <property name="visible">True</property> <property name="can_focus">False</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/sd/uiconfig/simpress/ui/sidebarslidebackground.ui b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui index 11141c29f827..878ecebc18da 100644 --- a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui +++ b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui @@ -24,8 +24,8 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">center</property> - <property name="margin_left">9</property> - <property name="margin_right">15</property> + <property name="margin-start">9</property> + <property name="margin-end">15</property> <property name="hexpand">True</property> <property name="border_width">6</property> <property name="row_spacing">3</property> diff --git a/sd/uiconfig/simpress/ui/tabviewbar.ui b/sd/uiconfig/simpress/ui/tabviewbar.ui index d611fa05c4f4..8d4f181a1ae3 100644 --- a/sd/uiconfig/simpress/ui/tabviewbar.ui +++ b/sd/uiconfig/simpress/ui/tabviewbar.ui @@ -10,7 +10,7 @@ <object class="GtkNotebook" id="tabcontrol"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">5</property> + <property name="margin-start">5</property> <property name="margin_top">3</property> <property name="hexpand">True</property> <property name="vexpand">True</property> diff --git a/sfx2/uiconfig/ui/autoredactdialog.ui b/sfx2/uiconfig/ui/autoredactdialog.ui index df45b437780b..0b4e8df2a295 100644 --- a/sfx2/uiconfig/ui/autoredactdialog.ui +++ b/sfx2/uiconfig/ui/autoredactdialog.ui @@ -105,7 +105,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="margin_right">5</property> + <property name="margin-end">5</property> <property name="margin_bottom">5</property> <property name="hexpand">True</property> <property name="vexpand">True</property> @@ -197,7 +197,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="valign">center</property> - <property name="margin_right">1</property> + <property name="margin-end">1</property> <property name="margin_bottom">1</property> <property name="label" translatable="yes" context="menuassignpage|contentslabel">_Redaction Targets</property> <property name="use_underline">True</property> diff --git a/sfx2/uiconfig/ui/classificationbox.ui b/sfx2/uiconfig/ui/classificationbox.ui index e79136097fb6..4441818c2dd6 100644 --- a/sfx2/uiconfig/ui/classificationbox.ui +++ b/sfx2/uiconfig/ui/classificationbox.ui @@ -10,8 +10,8 @@ <object class="GtkBox"> <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/sfx2/uiconfig/ui/notebookbarpopup.ui b/sfx2/uiconfig/ui/notebookbarpopup.ui index 3ec1a263b133..8a8916bd0d9c 100644 --- a/sfx2/uiconfig/ui/notebookbarpopup.ui +++ b/sfx2/uiconfig/ui/notebookbarpopup.ui @@ -16,7 +16,7 @@ <object class="GtkBox" id="box"> <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/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui index 12ee1a4cab6a..dca7e7109d89 100644 --- a/sfx2/uiconfig/ui/startcenter.ui +++ b/sfx2/uiconfig/ui/startcenter.ui @@ -156,8 +156,8 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</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="image">open_all_image</property> <property name="relief">none</property> @@ -177,8 +177,8 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</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="image">open_all_image2</property> <property name="relief">none</property> <property name="use_underline">True</property> @@ -195,8 +195,8 @@ <object class="GtkSeparator" id="separator3"> <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> </object> <packing> <property name="expand">False</property> @@ -211,8 +211,8 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</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="image">open_all_image1</property> <property name="relief">none</property> <property name="use_underline">True</property> @@ -235,8 +235,8 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</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="image">templates_all_image</property> <property name="relief">none</property> <property name="use_underline">True</property> @@ -256,8 +256,8 @@ <object class="GtkSeparator" id="separator1"> <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> </object> <packing> <property name="expand">False</property> @@ -269,7 +269,7 @@ <object class="GtkLabel" id="create_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="margin_bottom">6</property> <property name="label" translatable="yes" context="startcenter|create_label">Create:</property> <property name="xalign">0</property> @@ -286,8 +286,8 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</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="image">writer_all_image</property> <property name="relief">none</property> <property name="use_underline">True</property> @@ -306,8 +306,8 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</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="image">calc_all_image</property> <property name="relief">none</property> <property name="use_underline">True</property> @@ -326,8 +326,8 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</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="image">impress_all_image</property> <property name="relief">none</property> <property name="use_underline">True</property> @@ -346,8 +346,8 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</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="image">draw_all_image</property> <property name="relief">none</property> <property name="use_underline">True</property> @@ -366,8 +366,8 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</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="image">math_all_image</property> <property name="relief">none</property> <property name="use_underline">True</property> @@ -386,8 +386,8 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</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="image">database_all_image</property> <property name="relief">none</property> <property name="use_underline">True</property> @@ -436,8 +436,8 @@ <object class="GtkBox" id="small_buttons_box"> <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">6</property> diff --git a/svtools/uiconfig/ui/tabbuttons.ui b/svtools/uiconfig/ui/tabbuttons.ui index ae6c6fa16cb4..96dcfd71f318 100644 --- a/svtools/uiconfig/ui/tabbuttons.ui +++ b/svtools/uiconfig/ui/tabbuttons.ui @@ -35,8 +35,8 @@ <object class="GtkBox" id="TabButtons"> <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="hexpand">True</property> <property name="vexpand">True</property> <child> @@ -121,7 +121,7 @@ <property name="focus-on-click">False</property> <property name="receives-default">True</property> <property name="no-show-all">True</property> - <property name="margin-left">6</property> + <property name="margin-start">6</property> <property name="image">image1</property> <property name="relief">none</property> <property name="always-show-image">True</property> diff --git a/svtools/uiconfig/ui/tabbuttonsmirrored.ui b/svtools/uiconfig/ui/tabbuttonsmirrored.ui index abec1f56c165..50effb83e558 100644 --- a/svtools/uiconfig/ui/tabbuttonsmirrored.ui +++ b/svtools/uiconfig/ui/tabbuttonsmirrored.ui @@ -35,8 +35,8 @@ <object class="GtkBox" id="TabButtons"> <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="hexpand">True</property> <property name="vexpand">True</property> <child> @@ -45,7 +45,7 @@ <property name="focus-on-click">False</property> <property name="receives-default">True</property> <property name="no-show-all">True</property> - <property name="margin-right">6</property> + <property name="margin-end">6</property> <property name="image">image1</property> <property name="relief">none</property> <property name="always-show-image">True</property> diff --git a/svtools/uiconfig/ui/thineditcontrol.ui b/svtools/uiconfig/ui/thineditcontrol.ui index 3cc9a89220a1..77f7f3a59db8 100644 --- a/svtools/uiconfig/ui/thineditcontrol.ui +++ b/svtools/uiconfig/ui/thineditcontrol.ui @@ -57,7 +57,7 @@ <property name="no_show_all">True</property> <property name="halign">end</property> <property name="image">image7</property> - <property name="margin_left">1</property> + <property name="margin-start">1</property> <property name="always_show_image">True</property> <child internal-child="accessible"> <object class="AtkObject" id="button-atkobject"> diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui index 26d6f9701849..0279203fcc37 100644 --- a/svx/uiconfig/ui/colorwindow.ui +++ b/svx/uiconfig/ui/colorwindow.ui @@ -10,7 +10,7 @@ <object class="GtkImage" id="custom_color_icon"> <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="icon_name">cmd/sc_colorsettings.png</property> </object> <object class="GtkImage" id="none_icon"> diff --git a/svx/uiconfig/ui/docking3deffects.ui b/svx/uiconfig/ui/docking3deffects.ui index 95230a1caa65..ae3dc55cbe2f 100644 --- a/svx/uiconfig/ui/docking3deffects.ui +++ b/svx/uiconfig/ui/docking3deffects.ui @@ -539,7 +539,7 @@ <object class="GtkGrid" id="grid6"> <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="margin_bottom">12</property> <property name="hexpand">True</property> <property name="vexpand">True</property> diff --git a/svx/uiconfig/ui/fillctrlbox.ui b/svx/uiconfig/ui/fillctrlbox.ui index e13508f77e1f..996f9bb9ba5a 100644 --- a/svx/uiconfig/ui/fillctrlbox.ui +++ b/svx/uiconfig/ui/fillctrlbox.ui @@ -39,7 +39,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</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="orientation">vertical</property> diff --git a/svx/uiconfig/ui/findreplacedialog-mobile.ui b/svx/uiconfig/ui/findreplacedialog-mobile.ui index 792e334a114d..769b2ce19aaa 100644 --- a/svx/uiconfig/ui/findreplacedialog-mobile.ui +++ b/svx/uiconfig/ui/findreplacedialog-mobile.ui @@ -94,7 +94,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_right">6</property> + <property name="margin-end">6</property> <property name="hexpand">True</property> <child> <object class="GtkComboBoxText" id="searchterm"> @@ -346,7 +346,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_right">6</property> + <property name="margin-end">6</property> <property name="hexpand">True</property> <child> <object class="GtkComboBoxText" id="replaceterm"> @@ -450,8 +450,8 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">center</property> - <property name="margin_left">10</property> - <property name="margin_right">10</property> + <property name="margin-start">10</property> + <property name="margin-end">10</property> <property name="margin_top">15</property> <property name="spacing">12</property> <property name="homogeneous">True</property> @@ -644,7 +644,7 @@ <object class="GtkExpander" id="OptionsExpander"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">6</property> + <property name="margin-start">6</property> <property name="margin_top">1</property> <property name="margin_bottom">1</property> <property name="hexpand">True</property> @@ -1021,7 +1021,7 @@ <object class="GtkBox" id="searchdirection_box"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">4</property> + <property name="margin-start">4</property> <property name="spacing">15</property> <child> <object class="GtkLabel" id="searchdir"> diff --git a/svx/uiconfig/ui/findreplacedialog.ui b/svx/uiconfig/ui/findreplacedialog.ui index ebf0de7a15bc..f06a81ed12e1 100644 --- a/svx/uiconfig/ui/findreplacedialog.ui +++ b/svx/uiconfig/ui/findreplacedialog.ui @@ -91,7 +91,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_right">6</property> + <property name="margin-end">6</property> <property name="hexpand">True</property> <child> <object class="GtkComboBoxText" id="searchterm"> @@ -369,7 +369,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_right">6</property> + <property name="margin-end">6</property> <property name="hexpand">True</property> <child> <object class="GtkComboBoxText" id="replaceterm"> @@ -484,8 +484,8 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">center</property> - <property name="margin_left">10</property> - <property name="margin_right">10</property> + <property name="margin-start">10</property> + <property name="margin-end">10</property> <property name="margin_top">15</property> <property name="spacing">12</property> <property name="homogeneous">True</property> @@ -698,7 +698,7 @@ <object class="GtkExpander" id="OptionsExpander"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">6</property> + <property name="margin-start">6</property> <property name="margin_top">1</property> <property name="margin_bottom">1</property> <property name="hexpand">True</property> @@ -1125,7 +1125,7 @@ <object class="GtkBox" id="searchdirection_box"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">4</property> + <property name="margin-start">4</property> <property name="spacing">15</property> <child> <object class="GtkLabel" id="searchdir"> diff --git a/svx/uiconfig/ui/navigationbar.ui b/svx/uiconfig/ui/navigationbar.ui index a8b1fc917d42..3b35e901f968 100644 --- a/svx/uiconfig/ui/navigationbar.ui +++ b/svx/uiconfig/ui/navigationbar.ui @@ -96,8 +96,8 @@ <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">False</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> </object> <packing> <property name="expand">False</property> diff --git a/svx/uiconfig/ui/optgridpage.ui b/svx/uiconfig/ui/optgridpage.ui index 752783e352dc..213f7ee95023 100644 --- a/svx/uiconfig/ui/optgridpage.ui +++ b/svx/uiconfig/ui/optgridpage.ui @@ -228,7 +228,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/svx/uiconfig/ui/redlinefilterpage.ui b/svx/uiconfig/ui/redlinefilterpage.ui index 9236a5403851..c1ff14eb0898 100644 --- a/svx/uiconfig/ui/redlinefilterpage.ui +++ b/svx/uiconfig/ui/redlinefilterpage.ui @@ -100,7 +100,7 @@ <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> - <property name="margin_left">24</property> + <property name="margin-start">24</property> <property name="hexpand">True</property> <property name="activates_default">True</property> <child internal-child="accessible"> @@ -140,7 +140,7 @@ <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">False</property> - <property name="margin_left">24</property> + <property name="margin-start">24</property> <property name="hexpand">True</property> <accessibility> <relation type="labelled-by" target="action"/> @@ -182,7 +182,7 @@ <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">False</property> - <property name="margin_left">24</property> + <property name="margin-start">24</property> <property name="hexpand">True</property> <accessibility> <relation type="labelled-by" target="author"/> @@ -203,7 +203,7 @@ <object class="GtkBox" id="box2"> <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">6</property> <child> <object class="GtkEntry" id="rangeedit"> @@ -253,7 +253,7 @@ <object class="GtkBox" id="box3"> <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="orientation">vertical</property> <property name="spacing">6</property> <child> diff --git a/svx/uiconfig/ui/safemodedialog.ui b/svx/uiconfig/ui/safemodedialog.ui index 4351b1827cdc..b5f73a502a3a 100644 --- a/svx/uiconfig/ui/safemodedialog.ui +++ b/svx/uiconfig/ui/safemodedialog.ui @@ -132,7 +132,7 @@ You can make one or more of the following changes to your user profile to return <object class="GtkBox" id="group_restore"> <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="margin_bottom">6</property> <property name="orientation">vertical</property> <child> @@ -193,7 +193,7 @@ You can make one or more of the following changes to your user profile to return <object class="GtkBox" id="group_configure"> <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="margin_bottom">6</property> <property name="orientation">vertical</property> <child> @@ -253,7 +253,7 @@ You can make one or more of the following changes to your user profile to return <object class="GtkBox" id="group_deinstall"> <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="margin_bottom">6</property> <property name="orientation">vertical</property> <child> @@ -329,7 +329,7 @@ You can make one or more of the following changes to your user profile to return <object class="GtkBox" id="group_reset"> <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="orientation">vertical</property> <child> <object class="GtkCheckButton" id="check_reset_customizations"> @@ -384,7 +384,7 @@ You can make one or more of the following changes to your user profile to return <object class="GtkBox" id="box2"> <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="orientation">vertical</property> <property name="spacing">12</property> <child> diff --git a/svx/uiconfig/ui/sidebarparagraph.ui b/svx/uiconfig/ui/sidebarparagraph.ui index bc444c077272..b93c6b95c482 100644 --- a/svx/uiconfig/ui/sidebarparagraph.ui +++ b/svx/uiconfig/ui/sidebarparagraph.ui @@ -269,8 +269,8 @@ <property name="can_focus">False</property> <property name="halign">center</property> <property name="valign">center</property> - <property name="margin_left">6</property> - <property name="margin_right">3</property> + <property name="margin-start">6</property> + <property name="margin-end">3</property> <property name="icon_name">svx/res/symphony/spacing1.png</property> </object> <packing> @@ -317,8 +317,8 @@ <property name="can_focus">False</property> <property name="halign">center</property> <property name="valign">center</property> - <property name="margin_left">6</property> - <property name="margin_right">3</property> + <property name="margin-start">6</property> + <property name="margin-end">3</property> <property name="icon_name">svx/res/symphony/spacing2.png</property> </object> <packing> @@ -361,7 +361,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <property name="icon_size">2</property> - <property name="margin_left">3</property> + <property name="margin-start">3</property> <child> <object class="GtkMenuToolButton" id=".uno:LineSpacing"> <property name="visible">True</property> @@ -471,8 +471,8 @@ <property name="can_focus">False</property> <property name="halign">center</property> <property name="valign">center</property> - <property name="margin_left">6</property> - <property name="margin_right">3</property> + <property name="margin-start">6</property> + <property name="margin-end">3</property> <property name="icon_name">svx/res/symphony/Indent4.png</property> </object> <packing> @@ -519,8 +519,8 @@ <property name="can_focus">False</property> <property name="halign">center</property> <property name="valign">center</property> - <property name="margin_left">6</property> - <property name="margin_right">3</property> + <property name="margin-start">6</property> + <property name="margin-end">3</property> <property name="icon_name">svx/res/symphony/Indent3.png</property> </object> <packing> @@ -567,8 +567,8 @@ <property name="can_focus">False</property> <property name="halign">center</property> <property name="valign">center</property> - <property name="margin_left">6</property> - <property name="margin_right">3</property> + <property name="margin-start">6</property> + <property name="margin-end">3</property> <property name="icon_name">svx/res/symphony/Indent2.png</property> </object> <packing> @@ -614,8 +614,8 @@ <object class="GtkSeparator" id="separator1"> <property name="visible">True</property> <property name="can_focus">False</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> </object> <packing> <property name="left_attach">0</property> diff --git a/svx/uiconfig/ui/sidebarstylespanel.ui b/svx/uiconfig/ui/sidebarstylespanel.ui index 463fcec01f43..b85f86ced22e 100644 --- a/svx/uiconfig/ui/sidebarstylespanel.ui +++ b/svx/uiconfig/ui/sidebarstylespanel.ui @@ -75,7 +75,7 @@ <object class="GtkToolbar" id="style"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">3</property> + <property name="margin-start">3</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <property name="icon_size">2</property> diff --git a/sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui b/sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui index 0cf4f43411fd..699f35e3c16c 100644 --- a/sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui +++ b/sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui @@ -114,7 +114,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> @@ -135,7 +135,7 @@ <object class="GtkLabel" id="label1"> <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="label" translatable="yes" context="authenticationsettingsdialog|label1">Outgoing mail server:</property> <property name="xalign">0</property> </object> @@ -167,7 +167,7 @@ <object class="GtkLabel" id="username_label"> <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="label" translatable="yes" context="authenticationsettingsdialog|username_label">_User name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">username</property> @@ -202,7 +202,7 @@ <object class="GtkLabel" id="outpassword_label"> <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="label" translatable="yes" context="authenticationsettingsdialog|outpassword_label">_Password:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">outpassword</property> @@ -219,7 +219,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> @@ -241,7 +241,7 @@ <object class="GtkLabel" id="label2"> <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="label" translatable="yes" context="authenticationsettingsdialog|label2">Incoming mail server:</property> <property name="xalign">0</property> </object> @@ -273,7 +273,7 @@ <object class="GtkLabel" id="server_label"> <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="label" translatable="yes" context="authenticationsettingsdialog|server_label">Server _name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">server</property> @@ -320,7 +320,7 @@ <object class="GtkLabel" id="label3"> <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="label" translatable="yes" context="authenticationsettingsdialog|label3">Type:</property> <property name="xalign">1</property> </object> @@ -414,7 +414,7 @@ <object class="GtkLabel" id="inusername_label"> <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="label" translatable="yes" context="authenticationsettingsdialog|inusername_label">Us_er name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">inusername</property> @@ -429,7 +429,7 @@ <object class="GtkLabel" id="inpassword_label"> <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="label" translatable="yes" context="authenticationsettingsdialog|inpassword_label">Pass_word:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">inpassword</property> diff --git a/sw/uiconfig/swriter/ui/autotext.ui b/sw/uiconfig/swriter/ui/autotext.ui index 03c87b2ad001..b3583e2559b3 100644 --- a/sw/uiconfig/swriter/ui/autotext.ui +++ b/sw/uiconfig/swriter/ui/autotext.ui @@ -376,7 +376,7 @@ <object class="GtkAlignment" id="alignment2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> + <property name="margin-start">12</property> <child> <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="grid2"> diff --git a/sw/uiconfig/swriter/ui/converttexttable.ui b/sw/uiconfig/swriter/ui/converttexttable.ui index b18c93af9d79..35d2204edf84 100644 --- a/sw/uiconfig/swriter/ui/converttexttable.ui +++ b/sw/uiconfig/swriter/ui/converttexttable.ui @@ -308,7 +308,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> @@ -350,7 +350,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="column_spacing">12</property> <child> <object class="GtkLabel" id="label3"> diff --git a/sw/uiconfig/swriter/ui/editfielddialog.ui b/sw/uiconfig/swriter/ui/editfielddialog.ui index d83f3d8ac313..618592676a58 100644 --- a/sw/uiconfig/swriter/ui/editfielddialog.ui +++ b/sw/uiconfig/swriter/ui/editfielddialog.ui @@ -96,7 +96,7 @@ <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes" context="editfielddialog|prev_tip">Previous field of same type</property> <property name="valign">center</property> - <property name="margin_left">8</property> + <property name="margin-start">8</property> <property name="image">image3</property> <property name="image_position">right</property> <child internal-child="accessible"> @@ -137,7 +137,7 @@ <property name="receives_default">True</property> <property name="no_show_all">True</property> <property name="tooltip_text" translatable="yes" context="editfielddialog|edit_tip">Edit variable field content</property> - <property name="margin_left">12</property> + <property name="margin-start">12</property> <property name="use_underline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="edit-atkobject"> diff --git a/sw/uiconfig/swriter/ui/envformatpage.ui b/sw/uiconfig/swriter/ui/envformatpage.ui index 78c2d5a00de3..ace1fa3fac62 100644 --- a/sw/uiconfig/swriter/ui/envformatpage.ui +++ b/sw/uiconfig/swriter/ui/envformatpage.ui @@ -165,7 +165,7 @@ <object class="GtkLabel" id="label5"> <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="envformatpage|label5">from left</property> <property name="use_underline">True</property> <property name="mnemonic_widget">leftaddr</property> @@ -192,7 +192,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="envformatpage|label6">from top</property> <property name="use_underline">True</property> <property name="mnemonic_widget">topaddr</property> @@ -381,7 +381,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="envformatpage|label8">from left</property> <property name="use_underline">True</property> <property name="mnemonic_widget">leftsender</property> @@ -408,7 +408,7 @@ <object class="GtkLabel" id="label9"> <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="envformatpage|label9">from top</property> <property name="use_underline">True</property> <property name="mnemonic_widget">topsender</property> diff --git a/sw/uiconfig/swriter/ui/findentrydialog.ui b/sw/uiconfig/swriter/ui/findentrydialog.ui index 92b812620c1f..b1bd4529ec97 100644 --- a/sw/uiconfig/swriter/ui/findentrydialog.ui +++ b/sw/uiconfig/swriter/ui/findentrydialog.ui @@ -160,7 +160,7 @@ <object class="GtkComboBoxText" id="area"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> + <property name="margin-start">12</property> <accessibility> <relation type="labelled-by" target="findin"/> </accessibility> diff --git a/sw/uiconfig/swriter/ui/fldrefpage.ui b/sw/uiconfig/swriter/ui/fldrefpage.ui index 1b6d31aca004..e906238ae91f 100644 --- a/sw/uiconfig/swriter/ui/fldrefpage.ui +++ b/sw/uiconfig/swriter/ui/fldrefpage.ui @@ -229,13 +229,13 @@ <object class="GtkBox" id="box3"> <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="GtkLabel" id="label4"> <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="label" translatable="yes" context="fldrefpage|label4">Selection</property> <attributes> <attribute name="weight" value="bold"/> diff --git a/sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui b/sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui index 41fbdf6c0398..1acddb43d97d 100644 --- a/sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui +++ b/sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui @@ -48,7 +48,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> @@ -102,7 +102,7 @@ <object class="GtkLabel" id="ftnoffset_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="footnotesendnotestabpage|ftnoffset_label">_Start at:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">ftnoffset</property> @@ -125,7 +125,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> @@ -213,7 +213,7 @@ <object class="GtkLabel" id="ftnprefix_label"> <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="label" translatable="yes" context="footnotesendnotestabpage|ftnprefix_label">Be_fore:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">ftnprefix</property> @@ -327,7 +327,7 @@ <object class="GtkGrid" id="grid6"> <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> @@ -381,7 +381,7 @@ <object class="GtkLabel" id="endoffset_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="footnotesendnotestabpage|endoffset_label">_Start at:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">endoffset</property> @@ -404,7 +404,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> @@ -497,7 +497,7 @@ <object class="GtkLabel" id="endprefix_label"> <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="label" translatable="yes" context="footnotesendnotestabpage|endprefix_label">Be_fore:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">endprefix</property> diff --git a/sw/uiconfig/swriter/ui/frmtypepage.ui b/sw/uiconfig/swriter/ui/frmtypepage.ui index 9cf48e5d96e9..98ccd70b80cc 100644 --- a/sw/uiconfig/swriter/ui/frmtypepage.ui +++ b/sw/uiconfig/swriter/ui/frmtypepage.ui @@ -95,7 +95,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> @@ -162,7 +162,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> @@ -242,7 +242,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> @@ -309,7 +309,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> @@ -792,7 +792,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> @@ -814,7 +814,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/sw/uiconfig/swriter/ui/indexentry.ui b/sw/uiconfig/swriter/ui/indexentry.ui index 752fd30f937c..3477e981185d 100644 --- a/sw/uiconfig/swriter/ui/indexentry.ui +++ b/sw/uiconfig/swriter/ui/indexentry.ui @@ -170,7 +170,7 @@ <object class="GtkLabel" id="typeft"> <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="label" translatable="yes" context="indexentry|typeft">Index</property> <property name="use_underline">True</property> <property name="mnemonic_widget">typecb</property> @@ -212,7 +212,7 @@ <object class="GtkLabel" id="label3"> <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="label" translatable="yes" context="indexentry|label3">Entry</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entryed</property> @@ -228,7 +228,7 @@ <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">False</property> - <property name="margin_right">6</property> + <property name="margin-end">6</property> <property name="label" translatable="yes" context="indexentry|key1ft">1st key</property> <property name="use_underline">True</property> <property name="mnemonic_widget">key1cb</property> @@ -244,7 +244,7 @@ <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">False</property> - <property name="margin_right">6</property> + <property name="margin-end">6</property> <property name="label" translatable="yes" context="indexentry|key2ft">2nd key</property> <property name="use_underline">True</property> <property name="mnemonic_widget">key2cb</property> @@ -259,7 +259,7 @@ <object class="GtkLabel" id="levelft"> <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="label" translatable="yes" context="indexentry|levelft">Level</property> <property name="use_underline">True</property> <property name="mnemonic_widget">levelnf</property> @@ -288,8 +288,8 @@ <object class="GtkLabel" id="phonetic0ft"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="margin_left">12</property> - <property name="margin_right">6</property> + <property name="margin-start">12</property> + <property name="margin-end">6</property> <property name="label" translatable="yes" context="indexentry|phonetic0ft">Phonetic reading</property> <property name="use_underline">True</property> <property name="mnemonic_widget">phonetic0ed</property> @@ -304,8 +304,8 @@ <object class="GtkLabel" id="phonetic1ft"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="margin_left">12</property> - <property name="margin_right">6</property> + <property name="margin-start">12</property> + <property name="margin-end">6</property> <property name="label" translatable="yes" context="indexentry|phonetic1ft">Phonetic reading</property> <property name="use_underline">True</property> <property name="mnemonic_widget">phonetic1ed</property> @@ -320,8 +320,8 @@ <object class="GtkLabel" id="phonetic2ft"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="margin_left">12</property> - <property name="margin_right">6</property> + <property name="margin-start">12</property> + <property name="margin-end">6</property> <property name="label" translatable="yes" context="indexentry|phonetic2ft">Phonetic reading</property> <property name="use_underline">True</property> <property name="mnemonic_widget">phonetic2ed</property> @@ -488,7 +488,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="draw_indicator">True</property> @@ -504,7 +504,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="draw_indicator">True</property> diff --git a/sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui b/sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui index 079e76abcc9c..756bb820a6a3 100644 --- a/sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui +++ b/sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui @@ -654,7 +654,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> @@ -675,7 +675,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> @@ -824,7 +824,7 @@ <object class="GtkComboBoxText" id="numformat"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> + <property name="margin-start">12</property> <accessibility> <relation type="labelled-by" target="userdefined"/> </accessibility> diff --git a/sw/uiconfig/swriter/ui/inserttable.ui b/sw/uiconfig/swriter/ui/inserttable.ui index 3e5bd06258ea..5c001311c22d 100644 --- a/sw/uiconfig/swriter/ui/inserttable.ui +++ b/sw/uiconfig/swriter/ui/inserttable.ui @@ -322,7 +322,7 @@ <property name="sensitive">False</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> @@ -364,7 +364,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">start</property> - <property name="margin_left">30</property> + <property name="margin-start">30</property> <property name="column_spacing">12</property> <child> <object class="GtkSpinButton" id="repeatheaderspin"> diff --git a/sw/uiconfig/swriter/ui/mailconfigpage.ui b/sw/uiconfig/swriter/ui/mailconfigpage.ui index f911713331c5..e856868cabc3 100644 --- a/sw/uiconfig/swriter/ui/mailconfigpage.ui +++ b/sw/uiconfig/swriter/ui/mailconfigpage.ui @@ -219,7 +219,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="orientation">vertical</property> <property name="layout_style">center</property> <child> diff --git a/sw/uiconfig/swriter/ui/mmlayoutpage.ui b/sw/uiconfig/swriter/ui/mmlayoutpage.ui index 9d7c530e5ce1..447fc6b0dd4d 100644 --- a/sw/uiconfig/swriter/ui/mmlayoutpage.ui +++ b/sw/uiconfig/swriter/ui/mmlayoutpage.ui @@ -176,7 +176,7 @@ <object class="GtkLabel" id="leftft"> <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="mmlayoutpage|leftft">From _left</property> <property name="use_underline">True</property> <property name="mnemonic_widget">left</property> diff --git a/sw/uiconfig/swriter/ui/mmselectpage.ui b/sw/uiconfig/swriter/ui/mmselectpage.ui index 124f91b38c99..91de7e0c2456 100644 --- a/sw/uiconfig/swriter/ui/mmselectpage.ui +++ b/sw/uiconfig/swriter/ui/mmselectpage.ui @@ -138,7 +138,7 @@ <object class="GtkComboBoxText" id="recentdoclb"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">18</property> + <property name="margin-start">18</property> <child internal-child="accessible"> <object class="AtkObject" id="recentdoclb-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="mmselectpage|extended_tip|recentdoclb">Select the document.</property> @@ -157,7 +157,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="halign">start</property> - <property name="margin_left">18</property> + <property name="margin-start">18</property> <property name="use_underline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="browsedoc-atkobject"> @@ -177,7 +177,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="halign">start</property> - <property name="margin_left">18</property> + <property name="margin-start">18</property> <property name="use_underline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="browsetemplate-atkobject"> diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui index 6b19befa7417..bda4eaa373b7 100644 --- a/sw/uiconfig/swriter/ui/notebookbar.ui +++ b/sw/uiconfig/swriter/ui/notebookbar.ui @@ -3478,7 +3478,7 @@ <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-start">5</property> <child> <object class="GtkToolButton" id="Home-FontHeight"> <property name="visible">True</property> @@ -4215,7 +4215,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_right">6</property> + <property name="margin-end">6</property> <property name="vexpand">True</property> <child> <object class="GtkBox" id="GroupB86"> @@ -11343,7 +11343,7 @@ <object class="sfxlo-NotebookbarToolBox" id="second3"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_right">5</property> + <property name="margin-end">5</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -12231,7 +12231,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:GrafLuminance</property> </object> <packing> @@ -12257,7 +12257,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> @@ -12582,7 +12582,7 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom49"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_right">5</property> + <property name="margin-end">5</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -15037,7 +15037,7 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom31"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_right">5</property> + <property name="margin-end">5</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_compact.ui index b492952a9af5..02b3a767e64a 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui @@ -3384,7 +3384,7 @@ <object class="sfxlo-NotebookbarToolBox" id="ExtTop8"> <property name="visible">True</property> <property name="can_focus">True</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> @@ -10835,7 +10835,7 @@ <object class="sfxlo-NotebookbarToolBox" id="Wrap11"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">5</property> + <property name="margin-start">5</property> <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Graphic-WrapLeft"> @@ -12271,7 +12271,7 @@ <object class="sfxlo-NotebookbarToolBox" id="Wrap4"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">5</property> + <property name="margin-start">5</property> <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Draw-WrapLeft"> @@ -13754,7 +13754,7 @@ <object class="sfxlo-NotebookbarToolBox" id="Wrap3"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">5</property> + <property name="margin-start">5</property> <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Object-WrapLeft"> @@ -14875,7 +14875,7 @@ <object class="sfxlo-NotebookbarToolBox" id="Wrap8"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">5</property> + <property name="margin-start">5</property> <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Media-WrapLeft"> @@ -16402,7 +16402,7 @@ <object class="sfxlo-NotebookbarToolBox" id="Wrap7"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">5</property> + <property name="margin-start">5</property> <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Media-WrapLeft4"> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui index 8f0d59f1acbf..0782c86827b3 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui @@ -3490,14 +3490,14 @@ <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> <property name="baseline_position">bottom</property> <child> <object class="sfxlo-DropdownBox" id="FileSection"> <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="baseline_position">bottom</property> <child> <object class="GtkBox" id="Section"> @@ -4015,7 +4015,7 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom4"> <property name="visible">True</property> <property name="can_focus">True</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> @@ -5361,7 +5361,7 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom10"> <property name="visible">True</property> <property name="can_focus">True</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> @@ -9133,7 +9133,7 @@ <object class="VclOptionalBox" id="Image-Section-ColorSettings2"> <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="GroupB90"> <property name="visible">True</property> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui index f94e0fe6543c..e43224b041ec 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui @@ -3832,8 +3832,8 @@ <object class="sfxlo-PriorityHBox" id="DefaultBox1"> <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="baseline_position">bottom</property> <child> <object class="sfxlo-DropdownBox" id="SectionTools"> @@ -4740,7 +4740,7 @@ <object class="sfxlo-NotebookbarToolBox" id="first5"> <property name="visible">True</property> <property name="can_focus">True</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> @@ -6540,7 +6540,7 @@ <object class="sfxlo-NotebookbarToolBox" id="first19"> <property name="visible">True</property> <property name="can_focus">True</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> @@ -9422,7 +9422,7 @@ <object class="sfxlo-NotebookbarToolBox" id="first36"> <property name="visible">True</property> <property name="can_focus">True</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/sw/uiconfig/swriter/ui/notebookbar_groups.ui b/sw/uiconfig/swriter/ui/notebookbar_groups.ui index 5ba22a7f7ada..709b1092c937 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groups.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groups.ui @@ -567,8 +567,8 @@ <object class="GtkBox" id="box"> <property name="visible">True</property> <property name="can_focus">True</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="hexpand">True</property> <property name="vexpand">True</property> <property name="spacing">6</property> diff --git a/sw/uiconfig/swriter/ui/notebookbar_single.ui b/sw/uiconfig/swriter/ui/notebookbar_single.ui index 0c3957faaea1..d0358ada97d0 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_single.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_single.ui @@ -51,7 +51,7 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom41"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">5</property> + <property name="margin-start">5</property> <property name="margin_top">4</property> <property name="margin_bottom">4</property> <property name="show_arrow">False</property> @@ -491,7 +491,7 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom54"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">5</property> + <property name="margin-start">5</property> <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Default-FontHeight"> @@ -530,7 +530,7 @@ <object class="sfxlo-NotebookbarToolBox" id="ExtTop3"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_right">5</property> + <property name="margin-end">5</property> <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Default-Grow"> @@ -712,7 +712,7 @@ <object class="sfxlo-NotebookbarToolBox" id="ExtTop10"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">5</property> + <property name="margin-start">5</property> <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Default-SubScript"> @@ -1260,7 +1260,7 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom33"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">5</property> + <property name="margin-start">5</property> <property name="show_arrow">False</property> <child> <object class="GtkMenuToolButton" id="Home-LineSpacing"> @@ -1881,7 +1881,7 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom56"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">5</property> + <property name="margin-start">5</property> <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Default-FontHeight1"> @@ -1920,7 +1920,7 @@ <object class="sfxlo-NotebookbarToolBox" id="ExtTop6"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_right">5</property> + <property name="margin-end">5</property> <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Table-Grow1"> @@ -2037,7 +2037,7 @@ <object class="sfxlo-NotebookbarToolBox" id="ExtTop11"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">5</property> + <property name="margin-start">5</property> <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Table-SubScript"> @@ -2579,7 +2579,7 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">5</property> + <property name="margin-start">5</property> <property name="show_arrow">False</property> <child> <object class="GtkMenuToolButton" id="Table-LineSpacing"> @@ -3640,7 +3640,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> <child> <object class="sfxlo-NotebookbarToolBox" id="Wrap11"> <property name="visible">True</property> @@ -4698,7 +4698,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> <child> <object class="sfxlo-NotebookbarToolBox" id="Wrap5"> <property name="visible">True</property> @@ -5455,7 +5455,7 @@ <object class="sfxlo-NotebookbarToolBox" id="ExtBottom22"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">5</property> + <property name="margin-start">5</property> <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Draw-LineWidth1"> @@ -5986,7 +5986,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> <child> <object class="sfxlo-NotebookbarToolBox" id="Wrap8"> <property name="visible">True</property> @@ -6725,7 +6725,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> <child> <object class="sfxlo-NotebookbarToolBox" id="Wrap3"> <property name="visible">True</property> @@ -7401,7 +7401,7 @@ <object class="GtkToolButton" id="Object-LineStyle"> <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:LineStyle</property> </object> <packing> @@ -7737,7 +7737,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> <child> <object class="sfxlo-NotebookbarToolBox" id="Wrap7"> <property name="visible">True</property> diff --git a/sw/uiconfig/swriter/ui/numparapage.ui b/sw/uiconfig/swriter/ui/numparapage.ui index f1ebb118703c..8f6785caa39b 100644 --- a/sw/uiconfig/swriter/ui/numparapage.ui +++ b/sw/uiconfig/swriter/ui/numparapage.ui @@ -235,7 +235,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> @@ -388,7 +388,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="label" translatable="yes" context="numparapage|labelFT_RESTART_NO">_Start with:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">spinNF_RESTART_PARA</property> diff --git a/sw/uiconfig/swriter/ui/optcaptionpage.ui b/sw/uiconfig/swriter/ui/optcaptionpage.ui index 7f1c87a4dae8..cbb85c77867f 100644 --- a/sw/uiconfig/swriter/ui/optcaptionpage.ui +++ b/sw/uiconfig/swriter/ui/optcaptionpage.ui @@ -552,7 +552,7 @@ when inserting:</property> <property name="can_focus">True</property> <property name="halign">center</property> <property name="valign">start</property> - <property name="margin_left">12</property> + <property name="margin-start">12</property> <property name="hscrollbar_policy">never</property> <property name="vscrollbar_policy">never</property> <property name="shadow_type">in</property> diff --git a/sw/uiconfig/swriter/ui/opttablepage.ui b/sw/uiconfig/swriter/ui/opttablepage.ui index d5337e18156a..34d16cc8e935 100644 --- a/sw/uiconfig/swriter/ui/opttablepage.ui +++ b/sw/uiconfig/swriter/ui/opttablepage.ui @@ -86,7 +86,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> @@ -210,7 +210,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> @@ -231,7 +231,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> @@ -324,7 +324,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> @@ -346,7 +346,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> @@ -369,7 +369,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> @@ -511,7 +511,7 @@ <object class="GtkLabel" id="label5"> <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="opttablepage|label5">_Row:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">rowmove</property> @@ -526,7 +526,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="opttablepage|label6">_Column:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">colmove</property> @@ -594,7 +594,7 @@ <object class="GtkLabel" id="label15"> <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="opttablepage|label15">Ro_w:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">rowinsert</property> @@ -609,7 +609,7 @@ <object class="GtkLabel" id="label16"> <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="opttablepage|label16">Colu_mn:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">colinsert</property> diff --git a/sw/uiconfig/swriter/ui/picturepage.ui b/sw/uiconfig/swriter/ui/picturepage.ui index 7ed69c71971b..fcd558eb8ccc 100644 --- a/sw/uiconfig/swriter/ui/picturepage.ui +++ b/sw/uiconfig/swriter/ui/picturepage.ui @@ -171,7 +171,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> @@ -193,7 +193,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> @@ -215,7 +215,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/sw/uiconfig/swriter/ui/previewzoomdialog.ui b/sw/uiconfig/swriter/ui/previewzoomdialog.ui index a0352bde73a9..7b2d28d88661 100644 --- a/sw/uiconfig/swriter/ui/previewzoomdialog.ui +++ b/sw/uiconfig/swriter/ui/previewzoomdialog.ui @@ -91,8 +91,8 @@ <object class="GtkGrid" id="grid1"> <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="hexpand">True</property> <property name="vexpand">True</property> <property name="row_spacing">6</property> diff --git a/sw/uiconfig/swriter/ui/printeroptions.ui b/sw/uiconfig/swriter/ui/printeroptions.ui index 60fdb887bc0f..dc5b27d47313 100644 --- a/sw/uiconfig/swriter/ui/printeroptions.ui +++ b/sw/uiconfig/swriter/ui/printeroptions.ui @@ -114,7 +114,7 @@ <object class="GtkLabel" id="label1"> <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="label" translatable="yes" context="printeroptions|formcontrols">Comments:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">writercomments</property> diff --git a/sw/uiconfig/swriter/ui/printoptionspage.ui b/sw/uiconfig/swriter/ui/printoptionspage.ui index 7fc31e179697..9cd373a3e714 100644 --- a/sw/uiconfig/swriter/ui/printoptionspage.ui +++ b/sw/uiconfig/swriter/ui/printoptionspage.ui @@ -257,7 +257,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/sw/uiconfig/swriter/ui/sectionpage.ui b/sw/uiconfig/swriter/ui/sectionpage.ui index 3c8e3182c983..fd89795bb5c3 100644 --- a/sw/uiconfig/swriter/ui/sectionpage.ui +++ b/sw/uiconfig/swriter/ui/sectionpage.ui @@ -409,7 +409,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/sw/uiconfig/swriter/ui/selectblockdialog.ui b/sw/uiconfig/swriter/ui/selectblockdialog.ui index 3dda30e1d87d..664f1b5f01bc 100644 --- a/sw/uiconfig/swriter/ui/selectblockdialog.ui +++ b/sw/uiconfig/swriter/ui/selectblockdialog.ui @@ -255,7 +255,7 @@ <object class="GtkEntry" id="country"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">12</property> + <property name="margin-start">12</property> <property name="hexpand">True</property> <property name="activates_default">True</property> <accessibility> diff --git a/sw/uiconfig/swriter/ui/stringinput.ui b/sw/uiconfig/swriter/ui/stringinput.ui index 9af14718aa8b..11bb0ab2bf7f 100644 --- a/sw/uiconfig/swriter/ui/stringinput.ui +++ b/sw/uiconfig/swriter/ui/stringinput.ui @@ -61,8 +61,8 @@ <object class="GtkGrid" id="grid5"> <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="row_spacing">6</property> diff --git a/sw/uiconfig/swriter/ui/tabletextflowpage.ui b/sw/uiconfig/swriter/ui/tabletextflowpage.ui index 1feae586584a..c0b70a3c1078 100644 --- a/sw/uiconfig/swriter/ui/tabletextflowpage.ui +++ b/sw/uiconfig/swriter/ui/tabletextflowpage.ui @@ -188,7 +188,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> @@ -291,7 +291,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="inconsistent">True</property> diff --git a/sw/uiconfig/swriter/ui/textgridpage.ui b/sw/uiconfig/swriter/ui/textgridpage.ui index 5dff5c58796f..7f8e0e413f4f 100644 --- a/sw/uiconfig/swriter/ui/textgridpage.ui +++ b/sw/uiconfig/swriter/ui/textgridpage.ui @@ -135,7 +135,7 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="halign">start</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> @@ -433,7 +433,7 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="halign">start</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> @@ -517,7 +517,7 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="halign">start</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/sw/uiconfig/swriter/ui/tocindexpage.ui b/sw/uiconfig/swriter/ui/tocindexpage.ui index 3eb7f3f3a00f..4920dd9839a1 100644 --- a/sw/uiconfig/swriter/ui/tocindexpage.ui +++ b/sw/uiconfig/swriter/ui/tocindexpage.ui @@ -487,7 +487,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> @@ -1001,7 +1001,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> @@ -1022,7 +1022,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> @@ -1043,7 +1043,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> @@ -1125,7 +1125,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="halign">start</property> - <property name="margin_left">12</property> + <property name="margin-start">12</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <property name="popup">filemenu</property> diff --git a/sw/uiconfig/swriter/ui/viewoptionspage.ui b/sw/uiconfig/swriter/ui/viewoptionspage.ui index 913095f69c8e..82204b0f3d83 100644 --- a/sw/uiconfig/swriter/ui/viewoptionspage.ui +++ b/sw/uiconfig/swriter/ui/viewoptionspage.ui @@ -543,7 +543,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/sw/uiconfig/swriter/ui/wordcount-mobile.ui b/sw/uiconfig/swriter/ui/wordcount-mobile.ui index ef8b5bf71ce8..ccfd753bfe94 100644 --- a/sw/uiconfig/swriter/ui/wordcount-mobile.ui +++ b/sw/uiconfig/swriter/ui/wordcount-mobile.ui @@ -64,8 +64,8 @@ <object class="GtkGrid" id="grid1"> <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="hexpand">True</property> <property name="row_spacing">6</property> <property name="column_spacing">12</property> diff --git a/sw/uiconfig/swriter/ui/wordcount.ui b/sw/uiconfig/swriter/ui/wordcount.ui index 8a9ca2825754..bbafd817dea0 100644 --- a/sw/uiconfig/swriter/ui/wordcount.ui +++ b/sw/uiconfig/swriter/ui/wordcount.ui @@ -74,8 +74,8 @@ <object class="GtkGrid" id="grid1"> <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="hexpand">True</property> <property name="row_spacing">6</property> <property name="column_spacing">12</property> diff --git a/uui/uiconfig/ui/setmasterpassworddlg.ui b/uui/uiconfig/ui/setmasterpassworddlg.ui index 78b57b3f0ce3..13a71d0967d7 100644 --- a/uui/uiconfig/ui/setmasterpassworddlg.ui +++ b/uui/uiconfig/ui/setmasterpassworddlg.ui @@ -25,7 +25,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/uui/uiconfig/ui/sslwarndialog.ui b/uui/uiconfig/ui/sslwarndialog.ui index 6cfb5c49c5b4..01a7fd0d24f5 100644 --- a/uui/uiconfig/ui/sslwarndialog.ui +++ b/uui/uiconfig/ui/sslwarndialog.ui @@ -54,7 +54,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> </object> <packing> <property name="expand">False</property> diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index b68a2fdeba96..47afc48903f2 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -270,17 +270,17 @@ public: virtual void set_margin_bottom(int nMargin) override; - virtual void set_margin_left(int nMargin) override; + virtual void set_margin_start(int nMargin) override; - virtual void set_margin_right(int nMargin) override; + virtual void set_margin_end(int nMargin) override; virtual int get_margin_top() const override; virtual int get_margin_bottom() const override; - virtual int get_margin_left() const override; + virtual int get_margin_start() const override; - virtual int get_margin_right() const override; + virtual int get_margin_end() const override; virtual void set_accessible_name(const OUString& rName) override; diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui index d2cd0cdb0ffb..ad0f6a41ff18 100644 --- a/vcl/qa/cppunit/builder/demo.ui +++ b/vcl/qa/cppunit/builder/demo.ui @@ -1289,8 +1289,8 @@ <object class="GtkBox" id="box18"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">10</property> - <property name="margin_right">10</property> + <property name="margin_start">10</property> + <property name="margin_end">10</property> <child> <object class="GtkFrame" id="frame8"> <property name="visible">True</property> @@ -1612,8 +1612,8 @@ <object class="GtkBox" id="box21"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">10</property> - <property name="margin_right">10</property> + <property name="margin_start">10</property> + <property name="margin_end">10</property> <child> <object class="GtkFrame" id="frame10"> <property name="visible">True</property> diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 2f487c53b6e4..e2e322e725fa 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -357,17 +357,17 @@ void SalInstanceWidget::set_margin_top(int nMargin) { m_xWidget->set_margin_top( void SalInstanceWidget::set_margin_bottom(int nMargin) { m_xWidget->set_margin_bottom(nMargin); } -void SalInstanceWidget::set_margin_left(int nMargin) { m_xWidget->set_margin_left(nMargin); } +void SalInstanceWidget::set_margin_start(int nMargin) { m_xWidget->set_margin_start(nMargin); } -void SalInstanceWidget::set_margin_right(int nMargin) { m_xWidget->set_margin_bottom(nMargin); } +void SalInstanceWidget::set_margin_end(int nMargin) { m_xWidget->set_margin_bottom(nMargin); } int SalInstanceWidget::get_margin_top() const { return m_xWidget->get_margin_top(); } int SalInstanceWidget::get_margin_bottom() const { return m_xWidget->get_margin_bottom(); } -int SalInstanceWidget::get_margin_left() const { return m_xWidget->get_margin_left(); } +int SalInstanceWidget::get_margin_start() const { return m_xWidget->get_margin_start(); } -int SalInstanceWidget::get_margin_right() const { return m_xWidget->get_margin_bottom(); } +int SalInstanceWidget::get_margin_end() const { return m_xWidget->get_margin_bottom(); } void SalInstanceWidget::set_accessible_name(const OUString& rName) { diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index ba144b5a53b4..2dbbedb4601b 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -55,9 +55,9 @@ Size VclContainer::GetOptimalSize() const void VclContainer::setLayoutPosSize(vcl::Window &rWindow, const Point &rPos, const Size &rSize) { sal_Int32 nBorderWidth = rWindow.get_border_width(); - sal_Int32 nLeft = rWindow.get_margin_left() + nBorderWidth; + sal_Int32 nLeft = rWindow.get_margin_start() + nBorderWidth; sal_Int32 nTop = rWindow.get_margin_top() + nBorderWidth; - sal_Int32 nRight = rWindow.get_margin_right() + nBorderWidth; + sal_Int32 nRight = rWindow.get_margin_end() + nBorderWidth; sal_Int32 nBottom = rWindow.get_margin_bottom() + nBorderWidth; Point aPos(rPos.X() + nLeft, rPos.Y() + nTop); Size aSize(rSize.Width() - nLeft - nRight, rSize.Height() - nTop - nBottom); @@ -130,9 +130,9 @@ namespace Size subtractBorder(const vcl::Window &rWindow, const Size& rSize) { sal_Int32 nBorderWidth = rWindow.get_border_width(); - sal_Int32 nLeft = rWindow.get_margin_left() + nBorderWidth; + sal_Int32 nLeft = rWindow.get_margin_start() + nBorderWidth; sal_Int32 nTop = rWindow.get_margin_top() + nBorderWidth; - sal_Int32 nRight = rWindow.get_margin_right() + nBorderWidth; + sal_Int32 nRight = rWindow.get_margin_end() + nBorderWidth; sal_Int32 nBottom = rWindow.get_margin_bottom() + nBorderWidth; Size aSize(rSize); return Size(aSize.Width() + nLeft + nRight, aSize.Height() + nTop + nBottom); @@ -159,7 +159,7 @@ void VclContainer::SetPosPixel(const Point& rAllocPos) { Point aAllocPos = rAllocPos; sal_Int32 nBorderWidth = get_border_width(); - aAllocPos.AdjustX(nBorderWidth + get_margin_left() ); + aAllocPos.AdjustX(nBorderWidth + get_margin_start() ); aAllocPos.AdjustY(nBorderWidth + get_margin_top() ); if (aAllocPos != GetPosPixel()) @@ -170,7 +170,7 @@ void VclContainer::SetSizePixel(const Size& rAllocation) { Size aAllocation = rAllocation; sal_Int32 nBorderWidth = get_border_width(); - aAllocation.AdjustWidth( -(nBorderWidth*2 + get_margin_left() + get_margin_right()) ); + aAllocation.AdjustWidth( -(nBorderWidth*2 + get_margin_start() + get_margin_end()) ); aAllocation.AdjustHeight( -(nBorderWidth*2 + get_margin_top() + get_margin_bottom()) ); bool bSizeChanged = aAllocation != GetSizePixel(); if (bSizeChanged) diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index a6399d24081d..dc3dcdc93db0 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -1531,9 +1531,15 @@ bool Window::set_property(const OString &rKey, const OUString &rValue) else if (rKey == "border-width") set_border_width(rValue.toInt32()); else if (rKey == "margin-start" || rKey == "margin-left") - set_margin_left(rValue.toInt32()); + { + assert(rKey == "margin-start" && "margin-left deprecated in favor of margin-start"); + set_margin_start(rValue.toInt32()); + } else if (rKey == "margin-end" || rKey == "margin-right") - set_margin_right(rValue.toInt32()); + { + assert(rKey == "margin-end" && "margin-right deprecated in favor of margin-end"); + set_margin_end(rValue.toInt32()); + } else if (rKey == "margin-top") set_margin_top(rValue.toInt32()); else if (rKey == "margin-bottom") @@ -1837,7 +1843,7 @@ sal_Int32 Window::get_border_width() const return pWindowImpl->mnBorderWidth; } -void Window::set_margin_left(sal_Int32 nWidth) +void Window::set_margin_start(sal_Int32 nWidth) { WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get(); if (pWindowImpl->mnMarginLeft != nWidth) @@ -1847,13 +1853,13 @@ void Window::set_margin_left(sal_Int32 nWidth) } } -sal_Int32 Window::get_margin_left() const +sal_Int32 Window::get_margin_start() const { WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get(); return pWindowImpl->mnMarginLeft; } -void Window::set_margin_right(sal_Int32 nWidth) +void Window::set_margin_end(sal_Int32 nWidth) { WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get(); if (pWindowImpl->mnMarginRight != nWidth) @@ -1863,7 +1869,7 @@ void Window::set_margin_right(sal_Int32 nWidth) } } -sal_Int32 Window::get_margin_right() const +sal_Int32 Window::get_margin_end() const { WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get(); return pWindowImpl->mnMarginRight; diff --git a/vcl/uiconfig/ui/aboutbox.ui b/vcl/uiconfig/ui/aboutbox.ui index 560c84d89dc1..e435c0e9e8a5 100644 --- a/vcl/uiconfig/ui/aboutbox.ui +++ b/vcl/uiconfig/ui/aboutbox.ui @@ -108,8 +108,8 @@ <object class="GtkLabel" id="copyright"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="margin_right">12</property> + <property name="margin-start">12</property> + <property name="margin-end">12</property> <property name="hexpand">True</property> <property name="justify">center</property> <property name="wrap">True</property> diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui index 8f7a3e148fee..eeb4fd04fe9c 100644 --- a/vcl/uiconfig/ui/printdialog.ui +++ b/vcl/uiconfig/ui/printdialog.ui @@ -137,7 +137,7 @@ <object class="GtkBox" id="box2"> <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="orientation">vertical</property> <property name="spacing">12</property> @@ -152,7 +152,7 @@ <property name="can_focus">False</property> <property name="events">GDK_STRUCTURE_MASK | GDK_SCROLL_MASK</property> <property name="tooltip_text" translatable="yes" context="printdialog|printpreview">Print preview</property> - <property name="margin_right">6</property> + <property name="margin-end">6</property> <child internal-child="accessible"> <object class="AtkObject" id="preview-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="printdialog|extended_tip|preview">The preview shows how each sheet of paper will look. You can browse through all sheets of paper with the buttons below the preview.</property> @@ -345,7 +345,7 @@ <object class="GtkNotebook" id="tabcontrol"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin_left">6</property> + <property name="margin-start">6</property> <property name="vexpand">True</property> <child> <object class="GtkScrolledWindow" id="scrolledwindow"> diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 8b157df99ff9..7c9bc451cc10 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -2757,14 +2757,14 @@ public: gtk_widget_set_margin_bottom(m_pWidget, nMargin); } - virtual void set_margin_left(int nMargin) override + virtual void set_margin_start(int nMargin) override { - gtk_widget_set_margin_left(m_pWidget, nMargin); + gtk_widget_set_margin_start(m_pWidget, nMargin); } - virtual void set_margin_right(int nMargin) override + virtual void set_margin_end(int nMargin) override { - gtk_widget_set_margin_right(m_pWidget, nMargin); + gtk_widget_set_margin_end(m_pWidget, nMargin); } virtual int get_margin_top() const override @@ -2777,14 +2777,14 @@ public: return gtk_widget_get_margin_bottom(m_pWidget); } - virtual int get_margin_left() const override + virtual int get_margin_start() const override { - return gtk_widget_get_margin_left(m_pWidget); + return gtk_widget_get_margin_start(m_pWidget); } - virtual int get_margin_right() const override + virtual int get_margin_end() const override { - return gtk_widget_get_margin_right(m_pWidget); + return gtk_widget_get_margin_end(m_pWidget); } virtual void set_accessible_name(const OUString& rName) override @@ -7940,10 +7940,10 @@ public: gtk_widget_get_margin_top(GTK_WIDGET(pMenuButton))); gtk_widget_set_margin_bottom(GTK_WIDGET(m_pContainer), gtk_widget_get_margin_bottom(GTK_WIDGET(pMenuButton))); - gtk_widget_set_margin_left(GTK_WIDGET(m_pContainer), - gtk_widget_get_margin_left(GTK_WIDGET(pMenuButton))); - gtk_widget_set_margin_right(GTK_WIDGET(m_pContainer), - gtk_widget_get_margin_right(GTK_WIDGET(pMenuButton))); + gtk_widget_set_margin_start(GTK_WIDGET(m_pContainer), + gtk_widget_get_margin_start(GTK_WIDGET(pMenuButton))); + gtk_widget_set_margin_end(GTK_WIDGET(m_pContainer), + gtk_widget_get_margin_end(GTK_WIDGET(pMenuButton))); gtk_menu_detach(m_pMenu); gtk_menu_attach_to_widget(m_pMenu, GTK_WIDGET(m_pToggleButton), nullptr); diff --git a/xmlsecurity/uiconfig/ui/certgeneral.ui b/xmlsecurity/uiconfig/ui/certgeneral.ui index cb7328d47e41..e0c0b48acd59 100644 --- a/xmlsecurity/uiconfig/ui/certgeneral.ui +++ b/xmlsecurity/uiconfig/ui/certgeneral.ui @@ -69,8 +69,8 @@ <object class="GtkLabel" id="hintnotrust"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">36</property> - <property name="margin_right">36</property> + <property name="margin-start">36</property> + <property name="margin-end">36</property> <property name="margin_bottom">108</property> <property name="label" translatable="yes" context="certgeneral|hintnotrust">This certificate is validated.</property> <property name="xalign">0</property> |