sd/qa/unit/export-tests-ooxml4.cxx | 2 +- sd/qa/unit/uiimpress.cxx | 2 +- sd/source/core/drawdoc4.cxx | 9 +-------- sd/source/core/sdpage.cxx | 8 ++++---- sd/source/ui/view/drtxtob1.cxx | 4 ++-- sd/source/ui/view/drviews3.cxx | 4 ++-- sd/source/ui/view/drviewsf.cxx | 4 ++-- sd/uiconfig/sdraw/menubar/menubar.xml | 7 +++++-- sd/uiconfig/sdraw/popupmenu/formrichtext.xml | 4 ++-- sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml | 6 +++--- sd/uiconfig/sdraw/toolbar/textobjectbar.xml | 4 ++-- sd/uiconfig/sdraw/ui/notebookbar.ui | 8 ++++---- sd/uiconfig/sdraw/ui/notebookbar_compact.ui | 8 ++++---- sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 8 ++++---- sd/uiconfig/sdraw/ui/notebookbar_single.ui | 8 ++++---- sd/uiconfig/simpress/menubar/menubar.xml | 7 +++++-- sd/uiconfig/simpress/popupmenu/formrichtext.xml | 4 ++-- sd/uiconfig/simpress/toolbar/formtextobjectbar.xml | 6 +++--- sd/uiconfig/simpress/toolbar/textobjectbar.xml | 4 ++-- sd/uiconfig/simpress/ui/notebookbar.ui | 8 ++++---- sd/uiconfig/simpress/ui/notebookbar_compact.ui | 8 ++++---- sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui | 8 ++++---- sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui | 8 ++++---- sd/uiconfig/simpress/ui/notebookbar_groups.ui | 4 ++-- sd/uiconfig/simpress/ui/notebookbar_single.ui | 8 ++++---- 25 files changed, 75 insertions(+), 76 deletions(-)
New commits: commit 3227c095fb1476324e9207f479229fa56f5b64cc Author: Jonathan Clark <[email protected]> AuthorDate: Wed Jan 28 06:23:35 2026 -0700 Commit: Jonathan Clark <[email protected]> CommitDate: Thu Jan 29 13:26:32 2026 +0100 tdf#165507 sd: Add align start/end buttons to user interface Replaces the text align left/right buttons with start/end buttons in the Impress and Draw default toolbars and notebook bars. Adds text align start/end items to the default menus. Change-Id: I695ab346abdf92b226947170b1ce7bf52fdb6ffd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198324 Tested-by: Jenkins Reviewed-by: Jonathan Clark <[email protected]> diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index 71a23dde641d..c3e7874085a4 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -325,11 +325,14 @@ </menu:menu> <menu:menu menu:id=".uno:TextAlign"> <menu:menupopup> - <menu:menuitem menu:id=".uno:LeftPara" menu:style="radio"/> + <menu:menuitem menu:id=".uno:StartPara" menu:style="radio"/> <menu:menuitem menu:id=".uno:CenterPara" menu:style="radio"/> - <menu:menuitem menu:id=".uno:RightPara" menu:style="radio"/> + <menu:menuitem menu:id=".uno:EndPara" menu:style="radio"/> <menu:menuitem menu:id=".uno:JustifyPara" menu:style="radio"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:LeftPara" menu:style="radio"/> + <menu:menuitem menu:id=".uno:RightPara" menu:style="radio"/> + <menu:menuseparator/> <menu:menuitem menu:id=".uno:CellVertTop" menu:style="radio"/> <menu:menuitem menu:id=".uno:CellVertCenter" menu:style="radio"/> <menu:menuitem menu:id=".uno:CellVertBottom" menu:style="radio"/> diff --git a/sd/uiconfig/sdraw/popupmenu/formrichtext.xml b/sd/uiconfig/sdraw/popupmenu/formrichtext.xml index f5f8f7a0d209..e29b92d4f27c 100644 --- a/sd/uiconfig/sdraw/popupmenu/formrichtext.xml +++ b/sd/uiconfig/sdraw/popupmenu/formrichtext.xml @@ -30,9 +30,9 @@ </menu:menu> <menu:menu menu:id=".uno:TextAlign"> <menu:menupopup> - <menu:menuitem menu:id=".uno:LeftPara" menu:style="radio"/> + <menu:menuitem menu:id=".uno:StartPara" menu:style="radio"/> <menu:menuitem menu:id=".uno:CenterPara" menu:style="radio"/> - <menu:menuitem menu:id=".uno:RightPara" menu:style="radio"/> + <menu:menuitem menu:id=".uno:EndPara" menu:style="radio"/> <menu:menuitem menu:id=".uno:JustifyPara" menu:style="radio"/> </menu:menupopup> </menu:menu> diff --git a/sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml b/sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml index a055cba036b9..1d4ebcd20ca9 100644 --- a/sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml +++ b/sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml @@ -28,9 +28,9 @@ <toolbar:toolbaritem xlink:href=".uno:SuperScript"/> <toolbar:toolbaritem xlink:href=".uno:SubScript"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:LeftPara"/> + <toolbar:toolbaritem xlink:href=".uno:StartPara"/> <toolbar:toolbaritem xlink:href=".uno:CenterPara"/> - <toolbar:toolbaritem xlink:href=".uno:RightPara"/> + <toolbar:toolbaritem xlink:href=".uno:EndPara"/> <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight"/> @@ -42,4 +42,4 @@ <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FontDialog"/> <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog"/> -</toolbar:toolbar> \ No newline at end of file +</toolbar:toolbar> diff --git a/sd/uiconfig/sdraw/toolbar/textobjectbar.xml b/sd/uiconfig/sdraw/toolbar/textobjectbar.xml index 23d269b01129..646e47120117 100644 --- a/sd/uiconfig/sdraw/toolbar/textobjectbar.xml +++ b/sd/uiconfig/sdraw/toolbar/textobjectbar.xml @@ -45,9 +45,9 @@ <toolbar:toolbaritem xlink:href=".uno:Color"/> <toolbar:toolbaritem xlink:href=".uno:CharBackColor"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:LeftPara"/> + <toolbar:toolbaritem xlink:href=".uno:StartPara"/> <toolbar:toolbaritem xlink:href=".uno:CenterPara"/> - <toolbar:toolbaritem xlink:href=".uno:RightPara"/> + <toolbar:toolbaritem xlink:href=".uno:EndPara"/> <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:CellVertTop"/> diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui index 80022b74edf1..46e55548fca9 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar.ui @@ -8672,7 +8672,7 @@ <property name="visible">True</property> <property name="halign">center</property> <property name="hexpand">True</property> - <property name="action_name">.uno:LeftPara</property> + <property name="action_name">.uno:StartPara</property> </object> <packing> <property name="expand">False</property> @@ -8696,7 +8696,7 @@ <property name="visible">True</property> <property name="halign">center</property> <property name="hexpand">True</property> - <property name="action_name">.uno:RightPara</property> + <property name="action_name">.uno:EndPara</property> </object> <packing> <property name="expand">False</property> @@ -10306,7 +10306,7 @@ <property name="visible">True</property> <property name="halign">center</property> <property name="hexpand">True</property> - <property name="action_name">.uno:LeftPara</property> + <property name="action_name">.uno:StartPara</property> </object> <packing> <property name="expand">False</property> @@ -10330,7 +10330,7 @@ <property name="visible">True</property> <property name="halign">center</property> <property name="hexpand">True</property> - <property name="action_name">.uno:RightPara</property> + <property name="action_name">.uno:EndPara</property> </object> <packing> <property name="expand">False</property> diff --git a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui index 1050185da7b6..8268f1d0e82f 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui @@ -8657,7 +8657,7 @@ <child> <object class="GtkToolButton" id="Text-LeftPara"> <property name="visible">True</property> - <property name="action_name">.uno:LeftPara</property> + <property name="action_name">.uno:StartPara</property> </object> <packing> <property name="expand">False</property> @@ -8677,7 +8677,7 @@ <child> <object class="GtkToolButton" id="Text-RightPara"> <property name="visible">True</property> - <property name="action_name">.uno:RightPara</property> + <property name="action_name">.uno:EndPara</property> </object> <packing> <property name="expand">False</property> @@ -10116,7 +10116,7 @@ <child> <object class="GtkToolButton" id="Table-LeftPara1"> <property name="visible">True</property> - <property name="action_name">.uno:LeftPara</property> + <property name="action_name">.uno:StartPara</property> </object> <packing> <property name="expand">False</property> @@ -10136,7 +10136,7 @@ <child> <object class="GtkToolButton" id="Table-RightPara1"> <property name="visible">True</property> - <property name="action_name">.uno:RightPara</property> + <property name="action_name">.uno:EndPara</property> </object> <packing> <property name="expand">False</property> diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui index 18a9cebb6c2e..338779ac96a0 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui @@ -4775,7 +4775,7 @@ <child> <object class="GtkToolButton" id="Text-Section-LeftPara"> <property name="visible">True</property> - <property name="action_name">.uno:LeftPara</property> + <property name="action_name">.uno:StartPara</property> </object> <packing> <property name="expand">False</property> @@ -4872,7 +4872,7 @@ <child> <object class="GtkToolButton" id="Text-Section-RightPara"> <property name="visible">True</property> - <property name="action_name">.uno:RightPara</property> + <property name="action_name">.uno:EndPara</property> </object> <packing> <property name="expand">False</property> @@ -5701,7 +5701,7 @@ <child> <object class="GtkToolButton" id="Table-LeftPara"> <property name="visible">True</property> - <property name="action_name">.uno:LeftPara</property> + <property name="action_name">.uno:StartPara</property> </object> <packing> <property name="expand">False</property> @@ -5798,7 +5798,7 @@ <child> <object class="GtkToolButton" id="Table-RightPara"> <property name="visible">True</property> - <property name="action_name">.uno:RightPara</property> + <property name="action_name">.uno:EndPara</property> </object> <packing> <property name="expand">False</property> diff --git a/sd/uiconfig/sdraw/ui/notebookbar_single.ui b/sd/uiconfig/sdraw/ui/notebookbar_single.ui index b3ddef0e9ba4..c22e7c91d498 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_single.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_single.ui @@ -2261,7 +2261,7 @@ <child> <object class="GtkToolButton" id="Table-LeftPara1"> <property name="visible">True</property> - <property name="action_name">.uno:LeftPara</property> + <property name="action_name">.uno:StartPara</property> </object> <packing> <property name="expand">False</property> @@ -2281,7 +2281,7 @@ <child> <object class="GtkToolButton" id="Table-RightPara1"> <property name="visible">True</property> - <property name="action_name">.uno:RightPara</property> + <property name="action_name">.uno:EndPara</property> </object> <packing> <property name="expand">False</property> @@ -9722,7 +9722,7 @@ <child> <object class="GtkToolButton" id="Text-LeftPara"> <property name="visible">True</property> - <property name="action_name">.uno:LeftPara</property> + <property name="action_name">.uno:StartPara</property> </object> <packing> <property name="expand">False</property> @@ -9742,7 +9742,7 @@ <child> <object class="GtkToolButton" id="Text-RightPara"> <property name="visible">True</property> - <property name="action_name">.uno:RightPara</property> + <property name="action_name">.uno:EndPara</property> </object> <packing> <property name="expand">False</property> diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 08096057dda6..b721f938b6b2 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -358,11 +358,14 @@ </menu:menu> <menu:menu menu:id=".uno:TextAlign"> <menu:menupopup> - <menu:menuitem menu:id=".uno:LeftPara" menu:style="radio"/> + <menu:menuitem menu:id=".uno:StartPara" menu:style="radio"/> <menu:menuitem menu:id=".uno:CenterPara" menu:style="radio"/> - <menu:menuitem menu:id=".uno:RightPara" menu:style="radio"/> + <menu:menuitem menu:id=".uno:EndPara" menu:style="radio"/> <menu:menuitem menu:id=".uno:JustifyPara" menu:style="radio"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:LeftPara" menu:style="radio"/> + <menu:menuitem menu:id=".uno:RightPara" menu:style="radio"/> + <menu:menuseparator/> <menu:menuitem menu:id=".uno:CellVertTop" menu:style="radio"/> <menu:menuitem menu:id=".uno:CellVertCenter" menu:style="radio"/> <menu:menuitem menu:id=".uno:CellVertBottom" menu:style="radio"/> diff --git a/sd/uiconfig/simpress/popupmenu/formrichtext.xml b/sd/uiconfig/simpress/popupmenu/formrichtext.xml index f5f8f7a0d209..e29b92d4f27c 100644 --- a/sd/uiconfig/simpress/popupmenu/formrichtext.xml +++ b/sd/uiconfig/simpress/popupmenu/formrichtext.xml @@ -30,9 +30,9 @@ </menu:menu> <menu:menu menu:id=".uno:TextAlign"> <menu:menupopup> - <menu:menuitem menu:id=".uno:LeftPara" menu:style="radio"/> + <menu:menuitem menu:id=".uno:StartPara" menu:style="radio"/> <menu:menuitem menu:id=".uno:CenterPara" menu:style="radio"/> - <menu:menuitem menu:id=".uno:RightPara" menu:style="radio"/> + <menu:menuitem menu:id=".uno:EndPara" menu:style="radio"/> <menu:menuitem menu:id=".uno:JustifyPara" menu:style="radio"/> </menu:menupopup> </menu:menu> diff --git a/sd/uiconfig/simpress/toolbar/formtextobjectbar.xml b/sd/uiconfig/simpress/toolbar/formtextobjectbar.xml index a055cba036b9..1d4ebcd20ca9 100644 --- a/sd/uiconfig/simpress/toolbar/formtextobjectbar.xml +++ b/sd/uiconfig/simpress/toolbar/formtextobjectbar.xml @@ -28,9 +28,9 @@ <toolbar:toolbaritem xlink:href=".uno:SuperScript"/> <toolbar:toolbaritem xlink:href=".uno:SubScript"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:LeftPara"/> + <toolbar:toolbaritem xlink:href=".uno:StartPara"/> <toolbar:toolbaritem xlink:href=".uno:CenterPara"/> - <toolbar:toolbaritem xlink:href=".uno:RightPara"/> + <toolbar:toolbaritem xlink:href=".uno:EndPara"/> <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight"/> @@ -42,4 +42,4 @@ <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FontDialog"/> <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog"/> -</toolbar:toolbar> \ No newline at end of file +</toolbar:toolbar> diff --git a/sd/uiconfig/simpress/toolbar/textobjectbar.xml b/sd/uiconfig/simpress/toolbar/textobjectbar.xml index 23d269b01129..646e47120117 100644 --- a/sd/uiconfig/simpress/toolbar/textobjectbar.xml +++ b/sd/uiconfig/simpress/toolbar/textobjectbar.xml @@ -45,9 +45,9 @@ <toolbar:toolbaritem xlink:href=".uno:Color"/> <toolbar:toolbaritem xlink:href=".uno:CharBackColor"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:LeftPara"/> + <toolbar:toolbaritem xlink:href=".uno:StartPara"/> <toolbar:toolbaritem xlink:href=".uno:CenterPara"/> - <toolbar:toolbaritem xlink:href=".uno:RightPara"/> + <toolbar:toolbaritem xlink:href=".uno:EndPara"/> <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:CellVertTop"/> diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui index fe1d6a903a86..caa424a2ffd4 100644 --- a/sd/uiconfig/simpress/ui/notebookbar.ui +++ b/sd/uiconfig/simpress/ui/notebookbar.ui @@ -3705,7 +3705,7 @@ <property name="visible">True</property> <property name="halign">center</property> <property name="hexpand">True</property> - <property name="action_name">.uno:LeftPara</property> + <property name="action_name">.uno:StartPara</property> </object> <packing> <property name="expand">False</property> @@ -3729,7 +3729,7 @@ <property name="visible">True</property> <property name="halign">center</property> <property name="hexpand">True</property> - <property name="action_name">.uno:RightPara</property> + <property name="action_name">.uno:EndPara</property> </object> <packing> <property name="expand">False</property> @@ -9864,7 +9864,7 @@ <property name="visible">True</property> <property name="halign">center</property> <property name="hexpand">True</property> - <property name="action_name">.uno:LeftPara</property> + <property name="action_name">.uno:StartPara</property> </object> <packing> <property name="expand">False</property> @@ -9888,7 +9888,7 @@ <property name="visible">True</property> <property name="halign">center</property> <property name="hexpand">True</property> - <property name="action_name">.uno:RightPara</property> + <property name="action_name">.uno:EndPara</property> </object> <packing> <property name="expand">False</property> diff --git a/sd/uiconfig/simpress/ui/notebookbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_compact.ui index 6ef6ff4dde50..6a9349650434 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_compact.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_compact.ui @@ -4105,7 +4105,7 @@ <child> <object class="GtkToolButton" id="Home-LeftPara"> <property name="visible">True</property> - <property name="action_name">.uno:LeftPara</property> + <property name="action_name">.uno:StartPara</property> </object> <packing> <property name="expand">False</property> @@ -4125,7 +4125,7 @@ <child> <object class="GtkToolButton" id="Home-RightPara"> <property name="visible">True</property> - <property name="action_name">.uno:RightPara</property> + <property name="action_name">.uno:EndPara</property> </object> <packing> <property name="expand">False</property> @@ -9650,7 +9650,7 @@ <child> <object class="GtkToolButton" id="Table-LeftPara1"> <property name="visible">True</property> - <property name="action_name">.uno:LeftPara</property> + <property name="action_name">.uno:StartPara</property> </object> <packing> <property name="expand">False</property> @@ -9670,7 +9670,7 @@ <child> <object class="GtkToolButton" id="Table-RightPara1"> <property name="visible">True</property> - <property name="action_name">.uno:RightPara</property> + <property name="action_name">.uno:EndPara</property> </object> <packing> <property name="expand">False</property> diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui index e2d091a8fe54..8fa7ef7b5f64 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui @@ -4872,7 +4872,7 @@ <child> <object class="GtkToolButton" id="Text-Section-LeftPara"> <property name="visible">True</property> - <property name="action_name">.uno:LeftPara</property> + <property name="action_name">.uno:StartPara</property> </object> <packing> <property name="expand">False</property> @@ -4969,7 +4969,7 @@ <child> <object class="GtkToolButton" id="Text-Section-RightPara"> <property name="visible">True</property> - <property name="action_name">.uno:RightPara</property> + <property name="action_name">.uno:EndPara</property> </object> <packing> <property name="expand">False</property> @@ -5755,7 +5755,7 @@ <child> <object class="GtkToolButton" id="Table-LeftPara"> <property name="visible">True</property> - <property name="action_name">.uno:LeftPara</property> + <property name="action_name">.uno:StartPara</property> </object> <packing> <property name="expand">False</property> @@ -5775,7 +5775,7 @@ <child> <object class="GtkToolButton" id="Table-RightPara"> <property name="visible">True</property> - <property name="action_name">.uno:RightPara</property> + <property name="action_name">.uno:EndPara</property> </object> <packing> <property name="expand">False</property> diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui index 5904d2c613b0..4cc5c40e480b 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui @@ -5448,7 +5448,7 @@ <child> <object class="GtkToolButton" id="LeftPara2"> <property name="visible">True</property> - <property name="action_name">.uno:LeftPara</property> + <property name="action_name">.uno:StartPara</property> </object> <packing> <property name="expand">False</property> @@ -5468,7 +5468,7 @@ <child> <object class="GtkToolButton" id="RightPara2"> <property name="visible">True</property> - <property name="action_name">.uno:RightPara</property> + <property name="action_name">.uno:EndPara</property> </object> <packing> <property name="expand">False</property> @@ -6691,7 +6691,7 @@ <child> <object class="GtkToolButton" id="LeftPara6"> <property name="visible">True</property> - <property name="action_name">.uno:LeftPara</property> + <property name="action_name">.uno:StartPara</property> </object> <packing> <property name="expand">False</property> @@ -6711,7 +6711,7 @@ <child> <object class="GtkToolButton" id="RightPara1"> <property name="visible">True</property> - <property name="action_name">.uno:RightPara</property> + <property name="action_name">.uno:EndPara</property> </object> <packing> <property name="expand">False</property> diff --git a/sd/uiconfig/simpress/ui/notebookbar_groups.ui b/sd/uiconfig/simpress/ui/notebookbar_groups.ui index 7a7b7435a469..3bffedd44f33 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groups.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groups.ui @@ -896,7 +896,7 @@ <property name="can_focus">True</property> <property name="focus_on_click">False</property> <property name="receives_default">True</property> - <property name="action_name">.uno:LeftPara</property> + <property name="action_name">.uno:StartPara</property> <property name="image">lefti</property> <property name="relief">none</property> <property name="xalign">0</property> @@ -934,7 +934,7 @@ <property name="can_focus">True</property> <property name="focus_on_click">False</property> <property name="receives_default">True</property> - <property name="action_name">.uno:RightPara</property> + <property name="action_name">.uno:EndPara</property> <property name="image">righti</property> <property name="relief">none</property> <property name="xalign">0</property> diff --git a/sd/uiconfig/simpress/ui/notebookbar_single.ui b/sd/uiconfig/simpress/ui/notebookbar_single.ui index 22c1f9f1f9da..ce2ff351a3e1 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_single.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_single.ui @@ -1922,7 +1922,7 @@ <child> <object class="GtkToolButton" id="Table-LeftPara1"> <property name="visible">True</property> - <property name="action_name">.uno:LeftPara</property> + <property name="action_name">.uno:StartPara</property> </object> <packing> <property name="expand">False</property> @@ -1942,7 +1942,7 @@ <child> <object class="GtkToolButton" id="Table-RightPara1"> <property name="visible">True</property> - <property name="action_name">.uno:RightPara</property> + <property name="action_name">.uno:EndPara</property> </object> <packing> <property name="expand">False</property> @@ -9321,7 +9321,7 @@ <child> <object class="GtkToolButton" id="Text-LeftPara"> <property name="visible">True</property> - <property name="action_name">.uno:LeftPara</property> + <property name="action_name">.uno:StartPara</property> </object> <packing> <property name="expand">False</property> @@ -9341,7 +9341,7 @@ <child> <object class="GtkToolButton" id="Text-RightPara"> <property name="visible">True</property> - <property name="action_name">.uno:RightPara</property> + <property name="action_name">.uno:EndPara</property> </object> <packing> <property name="expand">False</property> commit fac0e4f913c9991ddf349a49367ad371ef65ebef Author: Jonathan Clark <[email protected]> AuthorDate: Wed Jan 28 04:19:59 2026 -0700 Commit: Jonathan Clark <[email protected]> CommitDate: Thu Jan 29 13:26:19 2026 +0100 tdf#169035 sd: Make para align start/end the default Previously, new Draw/Impress documents defaulted to left/right paragraph alignment, depending on application language. This change updates Draw and Impress to instead use the language-independent start alignment by default. Change-Id: Ic11dd496904d64906f442ace5d850310d1d55a84 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198323 Reviewed-by: Jonathan Clark <[email protected]> Tested-by: Jenkins diff --git a/sd/qa/unit/export-tests-ooxml4.cxx b/sd/qa/unit/export-tests-ooxml4.cxx index a79d299aed7c..3b276468048e 100644 --- a/sd/qa/unit/export-tests-ooxml4.cxx +++ b/sd/qa/unit/export-tests-ooxml4.cxx @@ -1100,7 +1100,7 @@ CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest4, testAutofittedTextboxIndent) // (the behaviour changed). xmlDocUniquePtr pXmlDocContent1 = parseExport(u"ppt/slides/slide1.xml"_ustr); - assertXPath(pXmlDocContent1, "/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:p[1]/a:pPr", "marL", + assertXPath(pXmlDocContent1, "/p:sld/p:cSld/p:spTree/p:sp[1]/p:txBody/a:p[1]/a:pPr", "marL", u"1080000"); } diff --git a/sd/qa/unit/uiimpress.cxx b/sd/qa/unit/uiimpress.cxx index 64681b32ff66..46beee2caefe 100644 --- a/sd/qa/unit/uiimpress.cxx +++ b/sd/qa/unit/uiimpress.cxx @@ -1562,7 +1562,7 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf164855) = pTableObject->getText(0)->GetOutlinerParaObject()->GetTextObject(); const SfxItemSet& rParaAttribs = rEdit.GetParaAttribs(0); auto pAdjust = rParaAttribs.GetItem(EE_PARA_JUST); - CPPUNIT_ASSERT_EQUAL(SvxAdjust::Left, pAdjust->GetAdjust()); + CPPUNIT_ASSERT_EQUAL(SvxAdjust::ParaStart, pAdjust->GetAdjust()); // Without the fix in place, this test would have crashed here dispatchCommand(mxComponent, u".uno:RightPara"_ustr, {}); diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index afe46d51779e..01fe4d913308 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -1200,9 +1200,6 @@ void SdDrawDocument::SetTextDefaults() const SvxNumBulletItem aNumBulletItem( std::move(aNumRule), EE_PARA_NUMBULLET ); m_pItemPool->SetUserDefaultItem( aNumBulletItem ); - - // tdf#169035: Continue using left-alignment as the default - m_pItemPool->SetUserDefaultItem(SvxAdjustItem(SvxAdjust::Left, EE_PARA_JUST)); } css::text::WritingMode SdDrawDocument::GetDefaultWritingMode() const @@ -1246,11 +1243,7 @@ void SdDrawDocument::SetDefaultWritingMode(css::text::WritingMode eMode ) SvxFrameDirectionItem aModeItem( nVal, EE_PARA_WRITINGDIR ); m_pItemPool->SetUserDefaultItem( aModeItem ); - SvxAdjustItem aAdjust( SvxAdjust::Left, EE_PARA_JUST ); - - if( eMode == css::text::WritingMode_RL_TB ) - aAdjust.SetAdjust( SvxAdjust::Right ); - + SvxAdjustItem aAdjust( SvxAdjust::ParaStart, EE_PARA_JUST ); m_pItemPool->SetUserDefaultItem( aAdjust ); } diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index c78bf1e21952..370358d74202 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -549,11 +549,11 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, bool bVertical, const ::t aTempAttr.Put( SvxFontHeightItem( 493, 100, EE_CHAR_FONTHEIGHT_CTL ) ); aTempAttr.Put( SvxFontHeightItem( 493, 100, EE_CHAR_FONTHEIGHT_CJK ) ); - SvxAdjust eH = SvxAdjust::Left; + SvxAdjust eH = SvxAdjust::ParaStart; if( (eObjKind == PresObjKind::DateTime) && (mePageKind != PageKind::Standard ) ) { - eH = SvxAdjust::Right; + eH = SvxAdjust::ParaEnd; } else if( (eObjKind == PresObjKind::Footer) && (mePageKind == PageKind::Standard ) ) { @@ -561,10 +561,10 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, bool bVertical, const ::t } else if( eObjKind == PresObjKind::SlideNumber ) { - eH = SvxAdjust::Right; + eH = SvxAdjust::ParaEnd; } - if( eH != SvxAdjust::Left ) + if( eH != SvxAdjust::ParaStart ) aTempAttr.Put(SvxAdjustItem(eH, EE_PARA_JUST )); pSdrObj->SetMergedItemSet(aTempAttr); diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index de9fe1bbb330..382bf6e4bc9d 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -599,8 +599,8 @@ void TextObjectBar::Execute(SfxRequest& rReq) case SID_ATTR_PARA_ADJUST_CENTER: eAdjst = SvxAdjust::Center; eAnchor = SDRTEXTHORZADJUST_CENTER; goto SET_ADJUST; case SID_ATTR_PARA_ADJUST_RIGHT: eAdjst = SvxAdjust::Right; eAnchor = SDRTEXTHORZADJUST_RIGHT; goto SET_ADJUST; case SID_ATTR_PARA_ADJUST_BLOCK: eAdjst = SvxAdjust::Block; eAnchor = SDRTEXTHORZADJUST_BLOCK; goto SET_ADJUST; - case SID_ATTR_PARA_ADJUST_START: eAdjst = SvxAdjust::Block; eAnchor = SDRTEXTHORZADJUST_LEFT; goto SET_ADJUST; - case SID_ATTR_PARA_ADJUST_END: eAdjst = SvxAdjust::Block; eAnchor = SDRTEXTHORZADJUST_RIGHT; goto SET_ADJUST; + case SID_ATTR_PARA_ADJUST_START: eAdjst = SvxAdjust::ParaStart; eAnchor = SDRTEXTHORZADJUST_LEFT; goto SET_ADJUST; + case SID_ATTR_PARA_ADJUST_END: eAdjst = SvxAdjust::ParaEnd; eAnchor = SDRTEXTHORZADJUST_RIGHT; goto SET_ADJUST; SET_ADJUST: { aNewAttr.Put(SvxAdjustItem(eAdjst, EE_PARA_JUST)); diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 192f7bcdccbf..f56324a0577a 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -782,7 +782,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) } case SID_ATTR_PARA_ADJUST_START: { - SvxAdjustItem aItem( SvxAdjust::Block, EE_PARA_JUST ); + SvxAdjustItem aItem( SvxAdjust::ParaStart, EE_PARA_JUST ); SfxItemSetFixed<EE_PARA_JUST, EE_PARA_JUST> aEditAttr( GetPool() ); aEditAttr.Put( aItem ); @@ -793,7 +793,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) } case SID_ATTR_PARA_ADJUST_END: { - SvxAdjustItem aItem( SvxAdjust::Block, EE_PARA_JUST ); + SvxAdjustItem aItem( SvxAdjust::ParaEnd, EE_PARA_JUST ); SfxItemSetFixed<EE_PARA_JUST, EE_PARA_JUST> aEditAttr( GetPool() ); aEditAttr.Put( aItem ); diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index ab1ec3c24e39..11594f21e2e2 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -351,7 +351,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) mpDrawView->GetAttributes( aAttrs ); SvxAdjust eAdj = aAttrs.Get( EE_PARA_JUST ).GetAdjust(); - if ( eAdj == SvxAdjust::Left) + if ( eAdj == SvxAdjust::ParaStart) { rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_START, true ) ); } @@ -367,7 +367,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) mpDrawView->GetAttributes( aAttrs ); SvxAdjust eAdj = aAttrs.Get( EE_PARA_JUST ).GetAdjust(); - if ( eAdj == SvxAdjust::Left) + if ( eAdj == SvxAdjust::ParaEnd) { rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_END, true ) ); }
