forms/source/richtext/richtextvclcontrol.cxx | 2 forms/source/richtext/rtattributehandler.cxx | 4 icon-themes/breeze/links.txt | 18 ++ icon-themes/breeze_dark/links.txt | 18 ++ icon-themes/colibre/links.txt | 18 ++ icon-themes/colibre_dark/links.txt | 18 ++ icon-themes/elementary/links.txt | 18 ++ icon-themes/karasa_jaga/links.txt | 18 ++ icon-themes/sifr/links.txt | 18 ++ icon-themes/sifr_dark/links.txt | 18 ++ icon-themes/sukapura/links.txt | 18 ++ icon-themes/sukapura_dark/links.txt | 18 ++ include/editeng/editids.hrc | 2 include/svx/svxids.hrc | 3 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 38 +++++ reportdesign/source/ui/report/ReportController.cxx | 20 ++ sc/sdi/drawsh.sdi | 2 sc/sdi/drtxtob.sdi | 4 sc/sdi/formatsh.sdi | 2 sc/source/ui/docshell/docfunc.cxx | 4 sc/source/ui/drawfunc/drawsh2.cxx | 2 sc/source/ui/drawfunc/drtxtob.cxx | 22 +++ sc/source/ui/drawfunc/futext.cxx | 4 sc/source/ui/view/drawview.cxx | 4 sc/source/ui/view/formatsh.cxx | 4 sc/source/ui/view/tabview3.cxx | 4 sd/sdi/_drvwsh.sdi | 10 + sd/sdi/drtxtob.sdi | 14 ++ sd/source/ui/func/fuparagr.cxx | 2 sd/source/ui/func/futext.cxx | 2 sd/source/ui/view/drtxtob.cxx | 28 ++++ sd/source/ui/view/drtxtob1.cxx | 12 + sd/source/ui/view/drviews3.cxx | 22 +++ sd/source/ui/view/drviewsf.cxx | 32 ++++ svx/sdi/fmslots.sdi | 10 + svx/sdi/svx.sdi | 70 ++++++++++ svx/source/form/fmtextcontrolshell.cxx | 2 sw/sdi/_annotsh.sdi | 14 ++ sw/sdi/_textsh.sdi | 12 + sw/sdi/_viewsh.sdi | 10 + sw/sdi/drwtxtsh.sdi | 14 ++ sw/source/uibase/shells/annotsh.cxx | 12 + sw/source/uibase/shells/drwtxtex.cxx | 12 + sw/source/uibase/shells/txtattr.cxx | 20 ++ sw/source/uibase/uiview/view.cxx | 3 sw/source/uibase/uiview/view2.cxx | 4 sw/source/uibase/uiview/viewstat.cxx | 4 47 files changed, 607 insertions(+), 3 deletions(-)
New commits: commit 1fe134353a7146a0288ec486f1f9a2c8eb249560 Author: Jonathan Clark <[email protected]> AuthorDate: Thu Nov 13 13:20:05 2025 -0700 Commit: Jonathan Clark <[email protected]> CommitDate: Tue Nov 18 01:55:54 2025 +0100 tdf#165507 Add para align start and end toolbar and menu buttons Added the following commands: .uno:StartPara .uno:EndPara .uno:CommonAlignStart .uno:CommandAlignEnd Currently, the Start/End align commands use the same icons as the Left/Right align commands, respectively, but they are mirrored automatically in RTL context to reflect the appearance of the text. Unique icons may be added in a future commit. Change-Id: I0fbf7039d2bc20e025af3d30c775f270354e5aca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194125 Reviewed-by: Jonathan Clark <[email protected]> Tested-by: Jenkins diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index e4f1f0d1f77a..f82c5b2969e5 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -123,6 +123,8 @@ namespace frm case SID_ATTR_PARA_ADJUST_CENTER: case SID_ATTR_PARA_ADJUST_RIGHT: case SID_ATTR_PARA_ADJUST_BLOCK: + case SID_ATTR_PARA_ADJUST_START: + case SID_ATTR_PARA_ADJUST_END: case SID_SET_SUPER_SCRIPT: case SID_SET_SUB_SCRIPT: case SID_ATTR_PARA_LINESPACE_10: diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx index 3af36d914033..cc3602642c79 100644 --- a/forms/source/richtext/rtattributehandler.cxx +++ b/forms/source/richtext/rtattributehandler.cxx @@ -123,6 +123,8 @@ namespace frm case SID_ATTR_PARA_ADJUST_CENTER: case SID_ATTR_PARA_ADJUST_RIGHT : case SID_ATTR_PARA_ADJUST_BLOCK : + case SID_ATTR_PARA_ADJUST_START : + case SID_ATTR_PARA_ADJUST_END : pReturn = new ParaAlignmentHandler( _nAttributeId ); break; @@ -174,6 +176,8 @@ namespace frm case SID_ATTR_PARA_ADJUST_CENTER: m_eAdjust = SvxAdjust::Center; break; case SID_ATTR_PARA_ADJUST_RIGHT : m_eAdjust = SvxAdjust::Right; break; case SID_ATTR_PARA_ADJUST_BLOCK : m_eAdjust = SvxAdjust::Block; break; + case SID_ATTR_PARA_ADJUST_START : m_eAdjust = SvxAdjust::ParaStart; break; + case SID_ATTR_PARA_ADJUST_END : m_eAdjust = SvxAdjust::ParaEnd; break; default: OSL_FAIL( "ParaAlignmentHandler::ParaAlignmentHandler: invalid slot!" ); break; diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt index e30be20e094f..d4bd61cebdc2 100644 --- a/icon-themes/breeze/links.txt +++ b/icon-themes/breeze/links.txt @@ -856,10 +856,12 @@ cmd/sc_datastreamsstop.png cmd/sc_basicstop.png # Alignment cmd/32/alignvcenter.png cmd/32/alignverticalcenter.png +cmd/32/commonalignend.png cmd/32/alignright.png cmd/32/commonalignhorizontalcenter.png cmd/32/alignhorizontalcenter.png cmd/32/commonalignjustified.png cmd/32/alignblock.png cmd/32/commonalignleft.png cmd/32/alignleft.png cmd/32/commonalignright.png cmd/32/alignright.png +cmd/32/commonalignstart.png cmd/32/alignleft.png cmd/32/objectalign.png cmd/32/objectalignleft.png cmd/32/sectionalignbottom.png cmd/32/aligndown.png cmd/32/sectionalignleft.png cmd/32/objectalignleft.png @@ -867,10 +869,12 @@ cmd/32/sectionalignright.png cmd/32/objectalignright.png cmd/32/sectionaligntop.png cmd/32/alignup.png cmd/lc_alignvcenter.png cmd/lc_alignverticalcenter.png +cmd/lc_commonalignend.png cmd/lc_alignright.png cmd/lc_commonalignhorizontalcenter.png cmd/lc_alignhorizontalcenter.png cmd/lc_commonalignjustified.png cmd/lc_alignblock.png cmd/lc_commonalignleft.png cmd/lc_alignleft.png cmd/lc_commonalignright.png cmd/lc_alignright.png +cmd/lc_commonalignstart.png cmd/lc_alignleft.png cmd/lc_objectalign.png cmd/lc_objectalignleft.png cmd/lc_sectionalignbottom.png cmd/lc_aligndown.png cmd/lc_sectionalignleft.png cmd/lc_objectalignleft.png @@ -878,10 +882,12 @@ cmd/lc_sectionalignright.png cmd/lc_objectalignright.png cmd/lc_sectionaligntop.png cmd/lc_alignup.png cmd/sc_alignvcenter.png cmd/sc_alignverticalcenter.png +cmd/sc_commonalignend.png cmd/sc_alignright.png cmd/sc_commonalignhorizontalcenter.png cmd/sc_alignhorizontalcenter.png cmd/sc_commonalignjustified.png cmd/sc_alignblock.png cmd/sc_commonalignleft.png cmd/sc_alignleft.png cmd/sc_commonalignright.png cmd/sc_alignright.png +cmd/sc_commonalignstart.png cmd/sc_alignleft.png cmd/sc_objectalign.png cmd/sc_objectalignleft.png cmd/sc_sectionalignbottom.png cmd/sc_aligndown.png cmd/sc_sectionalignleft.png cmd/sc_objectalignleft.png @@ -1306,23 +1312,35 @@ cmd/sc_fontcolor.png cmd/sc_color.png cmd/sc_tablecellbackgroundcolor.png cmd/sc_backgroundcolor.png # Paragraph Alignment +cmd/32/alignend.png cmd/32/alignright.png +cmd/32/alignstart.png cmd/32/alignleft.png cmd/32/centerpara.png cmd/32/alignhorizontalcenter.png +cmd/32/endpara.png cmd/32/alignright.png cmd/32/fontworkalignmentfloater.png cmd/32/alignhorizontalcenter.png cmd/32/justifypara.png cmd/32/alignblock.png cmd/32/leftpara.png cmd/32/alignleft.png cmd/32/rightpara.png cmd/32/alignright.png +cmd/32/startpara.png cmd/32/alignleft.png +cmd/lc_alignend.png cmd/lc_alignright.png +cmd/lc_alignstart.png cmd/lc_alignleft.png cmd/lc_centerpara.png cmd/lc_alignhorizontalcenter.png +cmd/lc_endpara.png cmd/lc_alignright.png cmd/lc_fontworkalignmentfloater.png cmd/lc_alignhorizontalcenter.png cmd/lc_justifypara.png cmd/lc_alignblock.png cmd/lc_leftpara.png cmd/lc_alignleft.png cmd/lc_rightpara.png cmd/lc_alignright.png +cmd/lc_startpara.png cmd/lc_alignleft.png +cmd/sc_alignend.png cmd/sc_alignright.png +cmd/sc_alignstart.png cmd/sc_alignleft.png cmd/sc_centerpara.png cmd/sc_alignhorizontalcenter.png +cmd/sc_endpara.png cmd/sc_alignright.png cmd/sc_fontworkalignmentfloater.png cmd/sc_alignhorizontalcenter.png cmd/sc_justifypara.png cmd/sc_alignblock.png cmd/sc_leftpara.png cmd/sc_alignleft.png cmd/sc_rightpara.png cmd/sc_alignright.png +cmd/sc_startpara.png cmd/sc_alignleft.png # View menu cmd/32/changetheme.png cmd/32/symbolshapes.moon.png diff --git a/icon-themes/breeze_dark/links.txt b/icon-themes/breeze_dark/links.txt index 4b5855e2682e..b568ad205063 100644 --- a/icon-themes/breeze_dark/links.txt +++ b/icon-themes/breeze_dark/links.txt @@ -855,10 +855,12 @@ cmd/sc_datastreamsstop.png cmd/sc_basicstop.png # Alignment cmd/32/alignvcenter.png cmd/32/alignverticalcenter.png +cmd/32/commonalignend.png cmd/32/alignright.png cmd/32/commonalignhorizontalcenter.png cmd/32/alignhorizontalcenter.png cmd/32/commonalignjustified.png cmd/32/alignblock.png cmd/32/commonalignleft.png cmd/32/alignleft.png cmd/32/commonalignright.png cmd/32/alignright.png +cmd/32/commonalignstart.png cmd/32/alignleft.png cmd/32/objectalign.png cmd/32/objectalignleft.png cmd/32/sectionalignbottom.png cmd/32/aligndown.png cmd/32/sectionalignleft.png cmd/32/objectalignleft.png @@ -866,10 +868,12 @@ cmd/32/sectionalignright.png cmd/32/objectalignright.png cmd/32/sectionaligntop.png cmd/32/alignup.png cmd/lc_alignvcenter.png cmd/lc_alignverticalcenter.png +cmd/lc_commonalignend.png cmd/lc_alignright.png cmd/lc_commonalignhorizontalcenter.png cmd/lc_alignhorizontalcenter.png cmd/lc_commonalignjustified.png cmd/lc_alignblock.png cmd/lc_commonalignleft.png cmd/lc_alignleft.png cmd/lc_commonalignright.png cmd/lc_alignright.png +cmd/lc_commonalignstart.png cmd/lc_alignleft.png cmd/lc_objectalign.png cmd/lc_objectalignleft.png cmd/lc_sectionalignbottom.png cmd/lc_aligndown.png cmd/lc_sectionalignleft.png cmd/lc_objectalignleft.png @@ -877,10 +881,12 @@ cmd/lc_sectionalignright.png cmd/lc_objectalignright.png cmd/lc_sectionaligntop.png cmd/lc_alignup.png cmd/sc_alignvcenter.png cmd/sc_alignverticalcenter.png +cmd/sc_commonalignend.png cmd/sc_alignright.png cmd/sc_commonalignhorizontalcenter.png cmd/sc_alignhorizontalcenter.png cmd/sc_commonalignjustified.png cmd/sc_alignblock.png cmd/sc_commonalignleft.png cmd/sc_alignleft.png cmd/sc_commonalignright.png cmd/sc_alignright.png +cmd/sc_commonalignstart.png cmd/sc_alignleft.png cmd/sc_objectalign.png cmd/sc_objectalignleft.png cmd/sc_sectionalignbottom.png cmd/sc_aligndown.png cmd/sc_sectionalignleft.png cmd/sc_objectalignleft.png @@ -1305,23 +1311,35 @@ cmd/sc_fontcolor.png cmd/sc_color.png cmd/sc_tablecellbackgroundcolor.png cmd/sc_backgroundcolor.png # Paragraph Alignment +cmd/32/alignend.png cmd/32/alignright.png +cmd/32/alignstart.png cmd/32/alignleft.png cmd/32/centerpara.png cmd/32/alignhorizontalcenter.png +cmd/32/endpara.png cmd/32/alignright.png cmd/32/fontworkalignmentfloater.png cmd/32/alignhorizontalcenter.png cmd/32/justifypara.png cmd/32/alignblock.png cmd/32/leftpara.png cmd/32/alignleft.png cmd/32/rightpara.png cmd/32/alignright.png +cmd/32/startpara.png cmd/32/alignleft.png +cmd/lc_alignend.png cmd/lc_alignright.png +cmd/lc_alignstart.png cmd/lc_alignleft.png cmd/lc_centerpara.png cmd/lc_alignhorizontalcenter.png +cmd/lc_endpara.png cmd/lc_alignright.png cmd/lc_fontworkalignmentfloater.png cmd/lc_alignhorizontalcenter.png cmd/lc_justifypara.png cmd/lc_alignblock.png cmd/lc_leftpara.png cmd/lc_alignleft.png cmd/lc_rightpara.png cmd/lc_alignright.png +cmd/lc_startpara.png cmd/lc_alignleft.png +cmd/sc_alignend.png cmd/sc_alignright.png +cmd/sc_alignstart.png cmd/sc_alignleft.png cmd/sc_centerpara.png cmd/sc_alignhorizontalcenter.png +cmd/sc_endpara.png cmd/sc_alignright.png cmd/sc_fontworkalignmentfloater.png cmd/sc_alignhorizontalcenter.png cmd/sc_justifypara.png cmd/sc_alignblock.png cmd/sc_leftpara.png cmd/sc_alignleft.png cmd/sc_rightpara.png cmd/sc_alignright.png +cmd/sc_startpara.png cmd/sc_alignleft.png # View menu diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt index aad650fe6220..a3f9ec33c678 100644 --- a/icon-themes/colibre/links.txt +++ b/icon-themes/colibre/links.txt @@ -1165,23 +1165,35 @@ cmd/sc_formatarea.png cmd/sc_backgroundcolor.png cmd/sc_tablecellbackgroundcolor.png cmd/sc_backgroundcolor.png # Paragraph Alignment +cmd/32/alignend.png cmd/32/alignright.png +cmd/32/alignstart.png cmd/32/alignleft.png cmd/32/centerpara.png cmd/32/alignhorizontalcenter.png +cmd/32/endpara.png cmd/32/alignright.png cmd/32/fontworkalignmentfloater.png cmd/32/alignhorizontalcenter.png cmd/32/justifypara.png cmd/32/alignblock.png cmd/32/leftpara.png cmd/32/alignleft.png cmd/32/rightpara.png cmd/32/alignright.png +cmd/32/startpara.png cmd/32/alignleft.png +cmd/lc_alignend.png cmd/lc_alignright.png +cmd/lc_alignstart.png cmd/lc_alignleft.png cmd/lc_centerpara.png cmd/lc_alignhorizontalcenter.png +cmd/lc_endpara.png cmd/lc_alignright.png cmd/lc_fontworkalignmentfloater.png cmd/lc_alignhorizontalcenter.png cmd/lc_justifypara.png cmd/lc_alignblock.png cmd/lc_leftpara.png cmd/lc_alignleft.png cmd/lc_rightpara.png cmd/lc_alignright.png +cmd/lc_startpara.png cmd/lc_alignleft.png +cmd/sc_alignend.png cmd/sc_alignright.png +cmd/sc_alignstart.png cmd/sc_alignleft.png cmd/sc_centerpara.png cmd/sc_alignhorizontalcenter.png +cmd/sc_endpara.png cmd/sc_alignright.png cmd/sc_fontworkalignmentfloater.png cmd/sc_alignhorizontalcenter.png cmd/sc_justifypara.png cmd/sc_alignblock.png cmd/sc_leftpara.png cmd/sc_alignleft.png cmd/sc_rightpara.png cmd/sc_alignright.png +cmd/sc_startpara.png cmd/sc_alignleft.png # Thesaurus cmd/32/thesaurusdialog.png cmd/32/thesaurus.png @@ -1207,10 +1219,12 @@ cmd/32/cellvertbottom.png cmd/32/alignbottom.png cmd/32/cellvertcenter.png cmd/32/alignverticalcenter.png cmd/32/cellverttop.png cmd/32/aligntop.png cmd/32/commonalignbottom.png cmd/32/alignbottom.png +cmd/32/commonalignend.png cmd/32/alignright.png cmd/32/commonalignhorizontalcenter.png cmd/32/alignhorizontalcenter.png cmd/32/commonalignjustified.png cmd/32/alignblock.png cmd/32/commonalignleft.png cmd/32/alignleft.png cmd/32/commonalignright.png cmd/32/alignright.png +cmd/32/commonalignstart.png cmd/32/alignleft.png cmd/32/commonaligntop.png cmd/32/aligntop.png cmd/32/commonalignverticalcenter.png cmd/32/alignverticalcenter.png @@ -1218,10 +1232,12 @@ cmd/lc_cellvertbottom.png cmd/lc_alignbottom.png cmd/lc_cellvertcenter.png cmd/lc_alignverticalcenter.png cmd/lc_cellverttop.png cmd/lc_aligntop.png cmd/lc_commonalignbottom.png cmd/lc_alignbottom.png +cmd/lc_commonalignend.png cmd/lc_alignright.png cmd/lc_commonalignhorizontalcenter.png cmd/lc_alignhorizontalcenter.png cmd/lc_commonalignjustified.png cmd/lc_alignblock.png cmd/lc_commonalignleft.png cmd/lc_alignleft.png cmd/lc_commonalignright.png cmd/lc_alignright.png +cmd/lc_commonalignstart.png cmd/lc_alignleft.png cmd/lc_commonaligntop.png cmd/lc_aligntop.png cmd/lc_commonalignverticalcenter.png cmd/lc_alignverticalcenter.png @@ -1229,10 +1245,12 @@ cmd/sc_cellvertbottom.png cmd/sc_alignbottom.png cmd/sc_cellvertcenter.png cmd/sc_alignverticalcenter.png cmd/sc_cellverttop.png cmd/sc_aligntop.png cmd/sc_commonalignbottom.png cmd/sc_alignbottom.png +cmd/sc_commonalignend.png cmd/sc_alignright.png cmd/sc_commonalignhorizontalcenter.png cmd/sc_alignhorizontalcenter.png cmd/sc_commonalignjustified.png cmd/sc_alignblock.png cmd/sc_commonalignleft.png cmd/sc_alignleft.png cmd/sc_commonalignright.png cmd/sc_alignright.png +cmd/sc_commonalignstart.png cmd/sc_alignleft.png cmd/sc_commonaligntop.png cmd/sc_aligntop.png cmd/sc_commonalignverticalcenter.png cmd/sc_alignverticalcenter.png diff --git a/icon-themes/colibre_dark/links.txt b/icon-themes/colibre_dark/links.txt index cf4e34b24fc1..259269611798 100644 --- a/icon-themes/colibre_dark/links.txt +++ b/icon-themes/colibre_dark/links.txt @@ -1164,23 +1164,35 @@ cmd/sc_formatarea.png cmd/sc_backgroundcolor.png cmd/sc_tablecellbackgroundcolor.png cmd/sc_backgroundcolor.png # Paragraph Alignment +cmd/32/alignend.png cmd/32/alignright.png +cmd/32/alignstart.png cmd/32/alignleft.png cmd/32/centerpara.png cmd/32/alignhorizontalcenter.png +cmd/32/endpara.png cmd/32/alignright.png cmd/32/fontworkalignmentfloater.png cmd/32/alignhorizontalcenter.png cmd/32/justifypara.png cmd/32/alignblock.png cmd/32/leftpara.png cmd/32/alignleft.png cmd/32/rightpara.png cmd/32/alignright.png +cmd/32/startpara.png cmd/32/alignleft.png +cmd/lc_alignend.png cmd/lc_alignright.png +cmd/lc_alignstart.png cmd/lc_alignleft.png cmd/lc_centerpara.png cmd/lc_alignhorizontalcenter.png +cmd/lc_endpara.png cmd/lc_alignright.png cmd/lc_fontworkalignmentfloater.png cmd/lc_alignhorizontalcenter.png cmd/lc_justifypara.png cmd/lc_alignblock.png cmd/lc_leftpara.png cmd/lc_alignleft.png cmd/lc_rightpara.png cmd/lc_alignright.png +cmd/lc_startpara.png cmd/lc_alignleft.png +cmd/sc_alignend.png cmd/sc_alignright.png +cmd/sc_alignstart.png cmd/sc_alignleft.png cmd/sc_centerpara.png cmd/sc_alignhorizontalcenter.png +cmd/sc_endpara.png cmd/sc_alignright.png cmd/sc_fontworkalignmentfloater.png cmd/sc_alignhorizontalcenter.png cmd/sc_justifypara.png cmd/sc_alignblock.png cmd/sc_leftpara.png cmd/sc_alignleft.png cmd/sc_rightpara.png cmd/sc_alignright.png +cmd/sc_startpara.png cmd/sc_alignleft.png # Thesaurus cmd/32/thesaurusdialog.png cmd/32/thesaurus.png @@ -1206,10 +1218,12 @@ cmd/32/cellvertbottom.png cmd/32/alignbottom.png cmd/32/cellvertcenter.png cmd/32/alignverticalcenter.png cmd/32/cellverttop.png cmd/32/aligntop.png cmd/32/commonalignbottom.png cmd/32/alignbottom.png +cmd/32/commonalignend.png cmd/32/alignright.png cmd/32/commonalignhorizontalcenter.png cmd/32/alignhorizontalcenter.png cmd/32/commonalignjustified.png cmd/32/alignblock.png cmd/32/commonalignleft.png cmd/32/alignleft.png cmd/32/commonalignright.png cmd/32/alignright.png +cmd/32/commonalignstart.png cmd/32/alignleft.png cmd/32/commonaligntop.png cmd/32/aligntop.png cmd/32/commonalignverticalcenter.png cmd/32/alignverticalcenter.png @@ -1217,10 +1231,12 @@ cmd/lc_cellvertbottom.png cmd/lc_alignbottom.png cmd/lc_cellvertcenter.png cmd/lc_alignverticalcenter.png cmd/lc_cellverttop.png cmd/lc_aligntop.png cmd/lc_commonalignbottom.png cmd/lc_alignbottom.png +cmd/lc_commonalignend.png cmd/lc_alignright.png cmd/lc_commonalignhorizontalcenter.png cmd/lc_alignhorizontalcenter.png cmd/lc_commonalignjustified.png cmd/lc_alignblock.png cmd/lc_commonalignleft.png cmd/lc_alignleft.png cmd/lc_commonalignright.png cmd/lc_alignright.png +cmd/lc_commonalignstart.png cmd/lc_alignleft.png cmd/lc_commonaligntop.png cmd/lc_aligntop.png cmd/lc_commonalignverticalcenter.png cmd/lc_alignverticalcenter.png @@ -1228,10 +1244,12 @@ cmd/sc_cellvertbottom.png cmd/sc_alignbottom.png cmd/sc_cellvertcenter.png cmd/sc_alignverticalcenter.png cmd/sc_cellverttop.png cmd/sc_aligntop.png cmd/sc_commonalignbottom.png cmd/sc_alignbottom.png +cmd/sc_commonalignend.png cmd/sc_alignright.png cmd/sc_commonalignhorizontalcenter.png cmd/sc_alignhorizontalcenter.png cmd/sc_commonalignjustified.png cmd/sc_alignblock.png cmd/sc_commonalignleft.png cmd/sc_alignleft.png cmd/sc_commonalignright.png cmd/sc_alignright.png +cmd/sc_commonalignstart.png cmd/sc_alignleft.png cmd/sc_commonaligntop.png cmd/sc_aligntop.png cmd/sc_commonalignverticalcenter.png cmd/sc_alignverticalcenter.png diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt index 34024878102b..36b2bb0ebdc1 100644 --- a/icon-themes/elementary/links.txt +++ b/icon-themes/elementary/links.txt @@ -328,6 +328,8 @@ cmd/sc_datastreamsstop.png cmd/sc_basicstop.png # Alignment cmd/32/alignvcenter.png cmd/32/alignverticalcenter.png cmd/32/commonalignbottom.png cmd/32/alignbottom.png +cmd/32/commonalignend.png cmd/32/alignright.png +cmd/32/commonalignstart.png cmd/32/alignleft.png cmd/32/commonaligntop.png cmd/32/aligntop.png cmd/32/commonalignverticalcenter.png cmd/32/alignverticalcenter.png cmd/32/objectalign.png cmd/32/objectalignleft.png @@ -338,6 +340,8 @@ cmd/32/sectionaligntop.png cmd/32/alignup.png cmd/lc_alignvcenter.png cmd/lc_alignverticalcenter.png cmd/lc_commonalignbottom.png cmd/lc_alignbottom.png +cmd/lc_commonalignend.png cmd/lc_alignright.png +cmd/lc_commonalignstart.png cmd/lc_alignleft.png cmd/lc_commonaligntop.png cmd/lc_aligntop.png cmd/lc_commonalignverticalcenter.png cmd/lc_alignverticalcenter.png cmd/lc_objectalign.png cmd/lc_objectalignleft.png @@ -348,6 +352,8 @@ cmd/lc_sectionaligntop.png cmd/lc_alignup.png cmd/sc_alignvcenter.png cmd/sc_alignverticalcenter.png cmd/sc_commonalignbottom.png cmd/sc_alignbottom.png +cmd/sc_commonalignend.png cmd/sc_alignright.png +cmd/sc_commonalignstart.png cmd/sc_alignleft.png cmd/sc_commonaligntop.png cmd/sc_aligntop.png cmd/sc_commonalignverticalcenter.png cmd/sc_alignverticalcenter.png cmd/sc_objectalign.png cmd/sc_objectalignleft.png @@ -1197,22 +1203,34 @@ cmd/sc_settabbgcolor.png cmd/sc_backgroundcolor.png cmd/sc_tablecellbackgroundcolor.png cmd/sc_backgroundcolor.png # Paragraph Alignment +cmd/32/alignend.png cmd/32/alignright.png +cmd/32/alignstart.png cmd/32/alignleft.png +cmd/32/endpara.png cmd/32/alignright.png cmd/32/leftpara.png cmd/32/alignleft.png cmd/32/centerpara.png cmd/32/alignhorizontalcenter.png cmd/32/fontworkalignmentfloater.png cmd/32/alignhorizontalcenter.png cmd/32/rightpara.png cmd/32/alignright.png +cmd/32/startpara.png cmd/32/alignleft.png cmd/32/justifypara.png cmd/32/alignblock.png +cmd/lc_alignend.png cmd/lc_alignright.png +cmd/lc_alignstart.png cmd/lc_alignleft.png +cmd/lc_endpara.png cmd/lc_alignright.png cmd/lc_leftpara.png cmd/lc_alignleft.png cmd/lc_centerpara.png cmd/lc_alignhorizontalcenter.png cmd/lc_fontworkalignmentfloater.png cmd/lc_alignhorizontalcenter.png cmd/lc_rightpara.png cmd/lc_alignright.png +cmd/lc_startpara.png cmd/lc_alignleft.png cmd/lc_justifypara.png cmd/lc_alignblock.png +cmd/sc_alignend.png cmd/sc_alignright.png +cmd/sc_alignstart.png cmd/sc_alignleft.png +cmd/sc_endpara.png cmd/sc_alignright.png cmd/sc_leftpara.png cmd/sc_alignleft.png cmd/sc_centerpara.png cmd/sc_alignhorizontalcenter.png cmd/sc_fontworkalignmentfloater.png cmd/sc_alignhorizontalcenter.png cmd/sc_rightpara.png cmd/sc_alignright.png +cmd/sc_startpara.png cmd/sc_alignleft.png cmd/sc_justifypara.png cmd/sc_alignblock.png # Vertical Text Alignment diff --git a/icon-themes/karasa_jaga/links.txt b/icon-themes/karasa_jaga/links.txt index bca59a3ab726..a5668119f767 100644 --- a/icon-themes/karasa_jaga/links.txt +++ b/icon-themes/karasa_jaga/links.txt @@ -26,7 +26,9 @@ cmd/32/adddatefield.png cmd/32/datefield.png cmd/32/addtextbox.png cmd/32/insertfixedtext.png cmd/32/adjust.png cmd/32/zoomoptimal.png cmd/32/advancedmode.png cmd/32/toggleobjectrotatemode.png +cmd/32/alignend.png cmd/32/alignright.png cmd/32/alignframemenu.png cmd/32/objectalign.png +cmd/32/alignstart.png cmd/32/alignleft.png cmd/32/alignvcenter.png cmd/32/alignverticalcenter.png cmd/32/anchormenu.png cmd/32/toggleanchortype.png cmd/32/ar/bulletliststyle.png cmd/rltb/32/defaultbullet.png @@ -77,10 +79,12 @@ cmd/32/columnoperations.png cmd/32/entirecolumn.png cmd/32/com.sun.star.deployment.ui.packagemanagerdialog.png cmd/32/addons.png cmd/32/commentchange.png cmd/32/commentchangetracking.png cmd/32/commonalignbottom.png cmd/32/alignbottom.png +cmd/32/commonalignend.png cmd/32/alignright.png cmd/32/commonalignhorizontalcenter.png cmd/32/alignhorizontalcenter.png cmd/32/commonalignjustified.png cmd/32/alignblock.png cmd/32/commonalignleft.png cmd/32/alignleft.png cmd/32/commonalignright.png cmd/32/alignright.png +cmd/32/commonalignstart.png cmd/32/alignleft.png cmd/32/commonaligntop.png cmd/32/aligntop.png cmd/32/commonalignverticalcenter.png cmd/32/alignverticalcenter.png cmd/32/commontaskbarvisible.png cmd/32/autopilotmenu.png @@ -119,6 +123,7 @@ cmd/32/editregion.png cmd/32/insertsection.png cmd/32/editselectmenu.png cmd/32/selecttables.png cmd/32/ellipse.png cmd/32/basicshapes.ellipse.png cmd/32/ellipsetoolbox.png cmd/32/basicshapes.ellipse.png +cmd/32/endpara.png cmd/32/alignright.png cmd/32/es/italic.png cmd/32/de/italic.png cmd/32/es/numberformatdecdecimals.png cmd/32/de/numberformatdecdecimals.png cmd/32/es/numberformatdecimal.png cmd/32/de/numberformatdecimal.png @@ -461,6 +466,7 @@ cmd/32/square.png cmd/32/basicshapes.quadrat.png cmd/32/square_rounded.png cmd/32/basicshapes.round-quadrat.png cmd/32/starchartdialog.png cmd/32/drawchart.png cmd/32/starshapes.png cmd/32/starshapes.star5.png +cmd/32/startpara.png cmd/32/alignleft.png cmd/32/stylewatercanmode cmd/32/styleapply.png cmd/32/sv/bold.png cmd/32/de/bold.png cmd/32/sv/italic.png cmd/32/de/italic.png @@ -711,7 +717,9 @@ cmd/lc_adddatefield.png cmd/lc_datefield.png cmd/lc_addtextbox.png cmd/lc_insertfixedtext.png cmd/lc_adjust.png cmd/lc_zoomoptimal.png cmd/lc_advancedmode.png cmd/lc_toggleobjectrotatemode.png +cmd/lc_alignend.png cmd/lc_alignright.png cmd/lc_alignframemenu.png cmd/lc_objectalign.png +cmd/lc_alignstart.png cmd/lc_alignleft.png cmd/lc_alignvcenter.png cmd/lc_alignverticalcenter.png cmd/lc_anchormenu.png cmd/lc_toggleanchortype.png cmd/lc_arrangeframemenu.png cmd/lc_bringtofront.png @@ -752,10 +760,12 @@ cmd/lc_columnoperations.png cmd/lc_entirecolumn.png cmd/lc_com.sun.star.deployment.ui.packagemanagerdialog.png cmd/lc_addons.png cmd/lc_commentchange.png cmd/lc_commentchangetracking.png cmd/lc_commonalignbottom.png cmd/lc_alignbottom.png +cmd/lc_commonalignend.png cmd/lc_alignright.png cmd/lc_commonalignhorizontalcenter.png cmd/lc_alignhorizontalcenter.png cmd/lc_commonalignjustified.png cmd/lc_alignblock.png cmd/lc_commonalignleft.png cmd/lc_alignleft.png cmd/lc_commonalignright.png cmd/lc_alignright.png +cmd/lc_commonalignstart.png cmd/lc_alignleft.png cmd/lc_commonaligntop.png cmd/lc_aligntop.png cmd/lc_commonalignverticalcenter.png cmd/lc_alignverticalcenter.png cmd/lc_commontaskbarvisible.png cmd/lc_autopilotmenu.png @@ -794,6 +804,7 @@ cmd/lc_editregion.png cmd/lc_insertsection.png cmd/lc_editselectmenu.png cmd/lc_selecttables.png cmd/lc_ellipse.png cmd/lc_basicshapes.ellipse.png cmd/lc_ellipsetoolbox.png cmd/lc_basicshapes.ellipse.png +cmd/lc_endpara.png cmd/lc_alignright.png cmd/lc_exitsearch.png cmd/lc_closepreview.png cmd/lc_exportasgraphic.png cmd/lc_graphic.png cmd/lc_exportasmenu.png cmd/lc_exportto.png @@ -1038,6 +1049,7 @@ cmd/lc_square.png cmd/lc_basicshapes.quadrat.png cmd/lc_square_rounded.png cmd/lc_basicshapes.round-quadrat.png cmd/lc_starchartdialog.png cmd/lc_drawchart.png cmd/lc_starshapes.png cmd/lc_starshapes.star5.png +cmd/lc_startpara.png cmd/lc_alignleft.png cmd/lc_stylewatercanmode cmd/lc_styleapply.png cmd/lc_symbolcatalogue.png cmd/lc_insertsymbol.png cmd/lc_symbolshapes.png cmd/lc_symbolshapes.smiley.png @@ -1131,7 +1143,9 @@ cmd/sc_adddatefield.png cmd/sc_datefield.png cmd/sc_addtextbox.png cmd/sc_insertfixedtext.png cmd/sc_adjust.png cmd/sc_zoomoptimal.png cmd/sc_advancedmode.png cmd/sc_toggleobjectrotatemode.png +cmd/sc_alignend.png cmd/sc_alignright.png cmd/sc_alignframemenu.png cmd/sc_objectalign.png +cmd/sc_alignstart.png cmd/sc_alignleft.png cmd/sc_alignvcenter.png cmd/sc_alignverticalcenter.png cmd/sc_anchormenu.png cmd/sc_toggleanchortype.png cmd/sc_arrangeframemenu.png cmd/sc_bringtofront.png @@ -1172,10 +1186,12 @@ cmd/sc_columnoperations.png cmd/sc_entirecolumn.png cmd/sc_com.sun.star.deployment.ui.packagemanagerdialog.png cmd/sc_addons.png cmd/sc_commentchange.png cmd/sc_commentchangetracking.png cmd/sc_commonalignbottom.png cmd/sc_alignbottom.png +cmd/sc_commonalignend.png cmd/sc_alignright.png cmd/sc_commonalignhorizontalcenter.png cmd/sc_alignhorizontalcenter.png cmd/sc_commonalignjustified.png cmd/sc_alignblock.png cmd/sc_commonalignleft.png cmd/sc_alignleft.png cmd/sc_commonalignright.png cmd/sc_alignright.png +cmd/sc_commonalignstart.png cmd/sc_alignleft.png cmd/sc_commonaligntop.png cmd/sc_aligntop.png cmd/sc_commonalignverticalcenter.png cmd/sc_alignverticalcenter.png cmd/sc_commontaskbarvisible.png cmd/sc_autopilotmenu.png @@ -1214,6 +1230,7 @@ cmd/sc_editregion.png cmd/sc_insertsection.png cmd/sc_editselectmenu.png cmd/sc_selecttables.png cmd/sc_ellipse.png cmd/sc_basicshapes.ellipse.png cmd/sc_ellipsetoolbox.png cmd/sc_basicshapes.ellipse.png +cmd/sc_endpara.png cmd/sc_alignright.png cmd/sc_endnotedialog.png cmd/sc_footnotedialog.png cmd/sc_exitsearch.png cmd/sc_closepreview.png cmd/sc_exportasgraphic.png cmd/sc_graphic.png @@ -1462,6 +1479,7 @@ cmd/sc_starchartdialog.png cmd/sc_drawchart.png cmd/sc_stars-empty.png sc/res/icon-set-stars-empty.png cmd/sc_stars-full.png sc/res/icon-set-stars-full.png cmd/sc_starshapes.png cmd/sc_starshapes.star5.png +cmd/sc_startpara.png cmd/sc_alignleft.png cmd/sc_stylewatercanmode cmd/sc_styleapply.png cmd/sc_symbolcatalogue.png cmd/sc_insertsymbol.png cmd/sc_symbolshapes.png cmd/sc_symbolshapes.smiley.png diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt index 1dfbcac08be6..bb5136583883 100644 --- a/icon-themes/sifr/links.txt +++ b/icon-themes/sifr/links.txt @@ -1184,23 +1184,35 @@ cmd/sc_fontcolor.png cmd/sc_color.png cmd/sc_tablecellbackgroundcolor.png cmd/sc_backgroundcolor.png # Paragraph Alignment +cmd/32/alignend.png cmd/32/alignright.png +cmd/32/alignstart.png cmd/32/alignleft.png cmd/32/centerpara.png cmd/32/alignhorizontalcenter.png +cmd/32/endpara.png cmd/32/alignright.png cmd/32/fontworkalignmentfloater.png cmd/32/alignhorizontalcenter.png cmd/32/justifypara.png cmd/32/alignblock.png cmd/32/leftpara.png cmd/32/alignleft.png cmd/32/rightpara.png cmd/32/alignright.png +cmd/32/startpara.png cmd/32/alignleft.png +cmd/lc_alignend.png cmd/lc_alignright.png +cmd/lc_alignstart.png cmd/lc_alignleft.png cmd/lc_centerpara.png cmd/lc_alignhorizontalcenter.png +cmd/lc_endpara.png cmd/lc_alignright.png cmd/lc_fontworkalignmentfloater.png cmd/lc_alignhorizontalcenter.png cmd/lc_justifypara.png cmd/lc_alignblock.png cmd/lc_leftpara.png cmd/lc_alignleft.png cmd/lc_rightpara.png cmd/lc_alignright.png +cmd/lc_startpara.png cmd/lc_alignleft.png +cmd/sc_alignend.png cmd/sc_alignright.png +cmd/sc_alignstart.png cmd/sc_alignleft.png cmd/sc_centerpara.png cmd/sc_alignhorizontalcenter.png +cmd/sc_endpara.png cmd/sc_alignright.png cmd/sc_fontworkalignmentfloater.png cmd/sc_alignhorizontalcenter.png cmd/sc_justifypara.png cmd/sc_alignblock.png cmd/sc_leftpara.png cmd/sc_alignleft.png cmd/sc_rightpara.png cmd/sc_alignright.png +cmd/sc_startpara.png cmd/sc_alignleft.png # View cmd/32/availabletoolbars.png cmd/32/showtoolbar.png @@ -1226,10 +1238,12 @@ cmd/32/cellvertbottom.png cmd/32/alignbottom.png cmd/32/cellvertcenter.png cmd/32/alignverticalcenter.png cmd/32/cellverttop.png cmd/32/aligntop.png cmd/32/commonalignbottom.png cmd/32/alignbottom.png +cmd/32/commonalignend.png cmd/32/alignright.png cmd/32/commonalignhorizontalcenter.png cmd/32/alignhorizontalcenter.png cmd/32/commonalignjustified.png cmd/32/alignblock.png cmd/32/commonalignleft.png cmd/32/alignleft.png cmd/32/commonalignright.png cmd/32/alignright.png +cmd/32/commonalignstart.png cmd/32/alignleft.png cmd/32/commonaligntop.png cmd/32/aligntop.png cmd/32/commonalignverticalcenter.png cmd/32/alignverticalcenter.png @@ -1237,10 +1251,12 @@ cmd/lc_cellvertbottom.png cmd/lc_alignbottom.png cmd/lc_cellvertcenter.png cmd/lc_alignverticalcenter.png cmd/lc_cellverttop.png cmd/lc_aligntop.png cmd/lc_commonalignbottom.png cmd/lc_alignbottom.png +cmd/lc_commonalignend.png cmd/lc_alignright.png cmd/lc_commonalignhorizontalcenter.png cmd/lc_alignhorizontalcenter.png cmd/lc_commonalignjustified.png cmd/lc_alignblock.png cmd/lc_commonalignleft.png cmd/lc_alignleft.png cmd/lc_commonalignright.png cmd/lc_alignright.png +cmd/lc_commonalignstart.png cmd/lc_alignleft.png cmd/lc_commonaligntop.png cmd/lc_aligntop.png cmd/lc_commonalignverticalcenter.png cmd/lc_alignverticalcenter.png @@ -1248,10 +1264,12 @@ cmd/sc_cellvertbottom.png cmd/sc_alignbottom.png cmd/sc_cellvertcenter.png cmd/sc_alignverticalcenter.png cmd/sc_cellverttop.png cmd/sc_aligntop.png cmd/sc_commonalignbottom.png cmd/sc_alignbottom.png +cmd/sc_commonalignend.png cmd/sc_alignright.png cmd/sc_commonalignhorizontalcenter.png cmd/sc_alignhorizontalcenter.png cmd/sc_commonalignjustified.png cmd/sc_alignblock.png cmd/sc_commonalignleft.png cmd/sc_alignleft.png cmd/sc_commonalignright.png cmd/sc_alignright.png +cmd/sc_commonalignstart.png cmd/sc_alignleft.png cmd/sc_commonaligntop.png cmd/sc_aligntop.png cmd/sc_commonalignverticalcenter.png cmd/sc_alignverticalcenter.png diff --git a/icon-themes/sifr_dark/links.txt b/icon-themes/sifr_dark/links.txt index 7df67381dec2..12a4e25e905b 100644 --- a/icon-themes/sifr_dark/links.txt +++ b/icon-themes/sifr_dark/links.txt @@ -1183,23 +1183,35 @@ cmd/sc_fontcolor.png cmd/sc_color.png cmd/sc_tablecellbackgroundcolor.png cmd/sc_backgroundcolor.png # Paragraph Alignment +cmd/32/alignend.png cmd/32/alignright.png +cmd/32/alignstart.png cmd/32/alignleft.png cmd/32/centerpara.png cmd/32/alignhorizontalcenter.png +cmd/32/endpara.png cmd/32/alignright.png cmd/32/fontworkalignmentfloater.png cmd/32/alignhorizontalcenter.png cmd/32/justifypara.png cmd/32/alignblock.png cmd/32/leftpara.png cmd/32/alignleft.png cmd/32/rightpara.png cmd/32/alignright.png +cmd/32/startpara.png cmd/32/alignleft.png +cmd/lc_alignend.png cmd/lc_alignright.png +cmd/lc_alignstart.png cmd/lc_alignleft.png cmd/lc_centerpara.png cmd/lc_alignhorizontalcenter.png +cmd/lc_endpara.png cmd/lc_alignright.png cmd/lc_fontworkalignmentfloater.png cmd/lc_alignhorizontalcenter.png cmd/lc_justifypara.png cmd/lc_alignblock.png cmd/lc_leftpara.png cmd/lc_alignleft.png cmd/lc_rightpara.png cmd/lc_alignright.png +cmd/lc_startpara.png cmd/lc_alignleft.png +cmd/sc_alignend.png cmd/sc_alignright.png +cmd/sc_alignstart.png cmd/sc_alignleft.png cmd/sc_centerpara.png cmd/sc_alignhorizontalcenter.png +cmd/sc_endpara.png cmd/sc_alignright.png cmd/sc_fontworkalignmentfloater.png cmd/sc_alignhorizontalcenter.png cmd/sc_justifypara.png cmd/sc_alignblock.png cmd/sc_leftpara.png cmd/sc_alignleft.png cmd/sc_rightpara.png cmd/sc_alignright.png +cmd/sc_startpara.png cmd/sc_alignleft.png # View cmd/32/availabletoolbars.png cmd/32/showtoolbar.png @@ -1225,10 +1237,12 @@ cmd/32/cellvertbottom.png cmd/32/alignbottom.png cmd/32/cellvertcenter.png cmd/32/alignverticalcenter.png cmd/32/cellverttop.png cmd/32/aligntop.png cmd/32/commonalignbottom.png cmd/32/alignbottom.png +cmd/32/commonalignend.png cmd/32/alignright.png cmd/32/commonalignhorizontalcenter.png cmd/32/alignhorizontalcenter.png cmd/32/commonalignjustified.png cmd/32/alignblock.png cmd/32/commonalignleft.png cmd/32/alignleft.png cmd/32/commonalignright.png cmd/32/alignright.png +cmd/32/commonalignstart.png cmd/32/alignleft.png cmd/32/commonaligntop.png cmd/32/aligntop.png cmd/32/commonalignverticalcenter.png cmd/32/alignverticalcenter.png @@ -1236,10 +1250,12 @@ cmd/lc_cellvertbottom.png cmd/lc_alignbottom.png cmd/lc_cellvertcenter.png cmd/lc_alignverticalcenter.png cmd/lc_cellverttop.png cmd/lc_aligntop.png cmd/lc_commonalignbottom.png cmd/lc_alignbottom.png +cmd/lc_commonalignend.png cmd/lc_alignright.png cmd/lc_commonalignhorizontalcenter.png cmd/lc_alignhorizontalcenter.png cmd/lc_commonalignjustified.png cmd/lc_alignblock.png cmd/lc_commonalignleft.png cmd/lc_alignleft.png cmd/lc_commonalignright.png cmd/lc_alignright.png +cmd/lc_commonalignstart.png cmd/lc_alignleft.png cmd/lc_commonaligntop.png cmd/lc_aligntop.png cmd/lc_commonalignverticalcenter.png cmd/lc_alignverticalcenter.png @@ -1247,10 +1263,12 @@ cmd/sc_cellvertbottom.png cmd/sc_alignbottom.png cmd/sc_cellvertcenter.png cmd/sc_alignverticalcenter.png cmd/sc_cellverttop.png cmd/sc_aligntop.png cmd/sc_commonalignbottom.png cmd/sc_alignbottom.png +cmd/sc_commonalignend.png cmd/sc_alignright.png cmd/sc_commonalignhorizontalcenter.png cmd/sc_alignhorizontalcenter.png cmd/sc_commonalignjustified.png cmd/sc_alignblock.png cmd/sc_commonalignleft.png cmd/sc_alignleft.png cmd/sc_commonalignright.png cmd/sc_alignright.png +cmd/sc_commonalignstart.png cmd/sc_alignleft.png cmd/sc_commonaligntop.png cmd/sc_aligntop.png cmd/sc_commonalignverticalcenter.png cmd/sc_alignverticalcenter.png diff --git a/icon-themes/sukapura/links.txt b/icon-themes/sukapura/links.txt index 59be6c441e6e..df24ea694997 100644 --- a/icon-themes/sukapura/links.txt +++ b/icon-themes/sukapura/links.txt @@ -1200,23 +1200,35 @@ cmd/sc_formatarea.png cmd/sc_backgroundcolor.png cmd/sc_tablecellbackgroundcolor.png cmd/sc_backgroundcolor.png # Paragraph Alignment +cmd/32/alignend.png cmd/32/alignright.png +cmd/32/alignstart.png cmd/32/alignleft.png cmd/32/centerpara.png cmd/32/alignhorizontalcenter.png +cmd/32/endpara.png cmd/32/alignright.png cmd/32/fontworkalignmentfloater.png cmd/32/alignhorizontalcenter.png cmd/32/justifypara.png cmd/32/alignblock.png cmd/32/leftpara.png cmd/32/alignleft.png cmd/32/rightpara.png cmd/32/alignright.png +cmd/32/startpara.png cmd/32/alignleft.png +cmd/lc_alignend.png cmd/lc_alignright.png +cmd/lc_alignstart.png cmd/lc_alignleft.png cmd/lc_centerpara.png cmd/lc_alignhorizontalcenter.png +cmd/lc_endpara.png cmd/lc_alignright.png cmd/lc_fontworkalignmentfloater.png cmd/lc_alignhorizontalcenter.png cmd/lc_justifypara.png cmd/lc_alignblock.png cmd/lc_leftpara.png cmd/lc_alignleft.png cmd/lc_rightpara.png cmd/lc_alignright.png +cmd/lc_startpara.png cmd/lc_alignleft.png +cmd/sc_alignend.png cmd/sc_alignright.png +cmd/sc_alignstart.png cmd/sc_alignleft.png cmd/sc_centerpara.png cmd/sc_alignhorizontalcenter.png +cmd/sc_endpara.png cmd/sc_alignright.png cmd/sc_fontworkalignmentfloater.png cmd/sc_alignhorizontalcenter.png cmd/sc_justifypara.png cmd/sc_alignblock.png cmd/sc_leftpara.png cmd/sc_alignleft.png cmd/sc_rightpara.png cmd/sc_alignright.png +cmd/sc_startpara.png cmd/sc_alignleft.png # Thesaurus cmd/32/thesaurusdialog.png cmd/32/thesaurus.png @@ -1242,10 +1254,12 @@ cmd/32/cellvertbottom.png cmd/32/alignbottom.png cmd/32/cellvertcenter.png cmd/32/alignverticalcenter.png cmd/32/cellverttop.png cmd/32/aligntop.png cmd/32/commonalignbottom.png cmd/32/alignbottom.png +cmd/32/commonalignend.png cmd/32/alignright.png cmd/32/commonalignhorizontalcenter.png cmd/32/alignhorizontalcenter.png cmd/32/commonalignjustified.png cmd/32/alignblock.png cmd/32/commonalignleft.png cmd/32/alignleft.png cmd/32/commonalignright.png cmd/32/alignright.png +cmd/32/commonalignstart.png cmd/32/alignleft.png cmd/32/commonaligntop.png cmd/32/aligntop.png cmd/32/commonalignverticalcenter.png cmd/32/alignverticalcenter.png @@ -1253,10 +1267,12 @@ cmd/lc_cellvertbottom.png cmd/lc_alignbottom.png cmd/lc_cellvertcenter.png cmd/lc_alignverticalcenter.png cmd/lc_cellverttop.png cmd/lc_aligntop.png cmd/lc_commonalignbottom.png cmd/lc_alignbottom.png +cmd/lc_commonalignend.png cmd/lc_alignright.png cmd/lc_commonalignhorizontalcenter.png cmd/lc_alignhorizontalcenter.png cmd/lc_commonalignjustified.png cmd/lc_alignblock.png cmd/lc_commonalignleft.png cmd/lc_alignleft.png cmd/lc_commonalignright.png cmd/lc_alignright.png +cmd/lc_commonalignstart.png cmd/lc_alignleft.png cmd/lc_commonaligntop.png cmd/lc_aligntop.png cmd/lc_commonalignverticalcenter.png cmd/lc_alignverticalcenter.png @@ -1264,10 +1280,12 @@ cmd/sc_cellvertbottom.png cmd/sc_alignbottom.png cmd/sc_cellvertcenter.png cmd/sc_alignverticalcenter.png cmd/sc_cellverttop.png cmd/sc_aligntop.png cmd/sc_commonalignbottom.png cmd/sc_alignbottom.png +cmd/sc_commonalignend.png cmd/sc_alignright.png cmd/sc_commonalignhorizontalcenter.png cmd/sc_alignhorizontalcenter.png cmd/sc_commonalignjustified.png cmd/sc_alignblock.png cmd/sc_commonalignleft.png cmd/sc_alignleft.png cmd/sc_commonalignright.png cmd/sc_alignright.png +cmd/sc_commonalignstart.png cmd/sc_alignleft.png cmd/sc_commonaligntop.png cmd/sc_aligntop.png cmd/sc_commonalignverticalcenter.png cmd/sc_alignverticalcenter.png diff --git a/icon-themes/sukapura_dark/links.txt b/icon-themes/sukapura_dark/links.txt index 12860a154b5f..1700fbe983c4 100644 --- a/icon-themes/sukapura_dark/links.txt +++ b/icon-themes/sukapura_dark/links.txt @@ -1200,23 +1200,35 @@ cmd/sc_formatarea.png cmd/sc_backgroundcolor.png cmd/sc_tablecellbackgroundcolor.png cmd/sc_backgroundcolor.png # Paragraph Alignment +cmd/32/alignend.png cmd/32/alignright.png +cmd/32/alignstart.png cmd/32/alignleft.png cmd/32/centerpara.png cmd/32/alignhorizontalcenter.png +cmd/32/endpara.png cmd/32/alignright.png cmd/32/fontworkalignmentfloater.png cmd/32/alignhorizontalcenter.png cmd/32/justifypara.png cmd/32/alignblock.png cmd/32/leftpara.png cmd/32/alignleft.png cmd/32/rightpara.png cmd/32/alignright.png +cmd/32/startpara.png cmd/32/alignleft.png +cmd/lc_alignend.png cmd/lc_alignright.png +cmd/lc_alignstart.png cmd/lc_alignleft.png cmd/lc_centerpara.png cmd/lc_alignhorizontalcenter.png +cmd/lc_endpara.png cmd/lc_alignright.png cmd/lc_fontworkalignmentfloater.png cmd/lc_alignhorizontalcenter.png cmd/lc_justifypara.png cmd/lc_alignblock.png cmd/lc_leftpara.png cmd/lc_alignleft.png cmd/lc_rightpara.png cmd/lc_alignright.png +cmd/lc_startpara.png cmd/lc_alignleft.png +cmd/sc_alignend.png cmd/sc_alignright.png +cmd/sc_alignstart.png cmd/sc_alignleft.png cmd/sc_centerpara.png cmd/sc_alignhorizontalcenter.png +cmd/sc_endpara.png cmd/sc_alignright.png cmd/sc_fontworkalignmentfloater.png cmd/sc_alignhorizontalcenter.png cmd/sc_justifypara.png cmd/sc_alignblock.png cmd/sc_leftpara.png cmd/sc_alignleft.png cmd/sc_rightpara.png cmd/sc_alignright.png +cmd/sc_startpara.png cmd/sc_alignleft.png # Thesaurus cmd/32/thesaurusdialog.png cmd/32/thesaurus.png @@ -1242,10 +1254,12 @@ cmd/32/cellvertbottom.png cmd/32/alignbottom.png cmd/32/cellvertcenter.png cmd/32/alignverticalcenter.png cmd/32/cellverttop.png cmd/32/aligntop.png cmd/32/commonalignbottom.png cmd/32/alignbottom.png +cmd/32/commonalignend.png cmd/32/alignright.png cmd/32/commonalignhorizontalcenter.png cmd/32/alignhorizontalcenter.png cmd/32/commonalignjustified.png cmd/32/alignblock.png cmd/32/commonalignleft.png cmd/32/alignleft.png cmd/32/commonalignright.png cmd/32/alignright.png +cmd/32/commonalignstart.png cmd/32/alignleft.png cmd/32/commonaligntop.png cmd/32/aligntop.png cmd/32/commonalignverticalcenter.png cmd/32/alignverticalcenter.png @@ -1253,10 +1267,12 @@ cmd/lc_cellvertbottom.png cmd/lc_alignbottom.png cmd/lc_cellvertcenter.png cmd/lc_alignverticalcenter.png cmd/lc_cellverttop.png cmd/lc_aligntop.png cmd/lc_commonalignbottom.png cmd/lc_alignbottom.png +cmd/lc_commonalignend.png cmd/lc_alignright.png cmd/lc_commonalignhorizontalcenter.png cmd/lc_alignhorizontalcenter.png cmd/lc_commonalignjustified.png cmd/lc_alignblock.png cmd/lc_commonalignleft.png cmd/lc_alignleft.png cmd/lc_commonalignright.png cmd/lc_alignright.png +cmd/lc_commonalignstart.png cmd/lc_alignleft.png cmd/lc_commonaligntop.png cmd/lc_aligntop.png cmd/lc_commonalignverticalcenter.png cmd/lc_alignverticalcenter.png @@ -1264,10 +1280,12 @@ cmd/sc_cellvertbottom.png cmd/sc_alignbottom.png cmd/sc_cellvertcenter.png cmd/sc_alignverticalcenter.png cmd/sc_cellverttop.png cmd/sc_aligntop.png cmd/sc_commonalignbottom.png cmd/sc_alignbottom.png +cmd/sc_commonalignend.png cmd/sc_alignright.png cmd/sc_commonalignhorizontalcenter.png cmd/sc_alignhorizontalcenter.png cmd/sc_commonalignjustified.png cmd/sc_alignblock.png cmd/sc_commonalignleft.png cmd/sc_alignleft.png cmd/sc_commonalignright.png cmd/sc_alignright.png +cmd/sc_commonalignstart.png cmd/sc_alignleft.png cmd/sc_commonaligntop.png cmd/sc_aligntop.png cmd/sc_commonalignverticalcenter.png cmd/sc_alignverticalcenter.png diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc index 72b4a5a6d8ad..2b29c3e34fde 100644 --- a/include/editeng/editids.hrc +++ b/include/editeng/editids.hrc @@ -185,6 +185,8 @@ class SvxScriptHintItem; #define SID_ATTR_CHAR_BOX ( SID_EDIT_START + 76 ) #define SID_ATTR_CHAR_SHADOW ( SID_EDIT_START + 77 ) #define SID_ATTR_PARA_GRABBAG TypedWhichId<SfxGrabBagItem>( SID_EDIT_START + 78 ) +#define SID_ATTR_PARA_ADJUST_START ( SID_EDIT_START + 79 ) +#define SID_ATTR_PARA_ADJUST_END ( SID_EDIT_START + 80 ) #if 95 > (SID_EDIT_END-SID_EDIT_START) diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index d45ea15666fe..4563591571aa 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -844,7 +844,7 @@ class XFillGradientItem; #define SID_ATTR_TRANSFORM_HORI_POSITION TypedWhichId<SfxInt32Item>( SID_SVX_START + 999 ) #define SID_ATTR_TRANSFORM_VERT_POSITION TypedWhichId<SfxInt32Item>( SID_SVX_START + 1000 ) -// Available for use 1001 +#define SID_ALIGN_ANY_START ( SID_SVX_START + 1001 ) #define SID_ALIGN_ANY_LEFT ( SID_SVX_START + 1002 ) #define SID_ALIGN_ANY_HCENTER ( SID_SVX_START + 1003 ) #define SID_ALIGN_ANY_RIGHT ( SID_SVX_START + 1004 ) @@ -889,6 +889,7 @@ class XFillGradientItem; #define SID_SHRINK_FONT_SIZE ( SID_SVX_START + 1043 ) // color subtoolbar on graphictoolbar #define SID_COLOR_SETTINGS TypedWhichId<SfxBoolItem>( SID_SVX_START + 1044 ) +#define SID_ALIGN_ANY_END ( SID_SVX_START + 1045 ) #define SID_FM_FORM_DESIGN_TOOLS TypedWhichId<SfxBoolItem>( SID_SVX_START + 1046 ) #define SID_DRAWTBX_CS_BASIC ( SID_SVX_START + 1047 ) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 3d158cff95db..88718fecb8f5 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -1943,6 +1943,28 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8 <value>11</value> </prop> </node> + <node oor:name=".uno:StartPara" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Start</value> + </prop> + <prop oor:name="TooltipLabel" oor:type="xs:string"> + <value xml:lang="en-US">Align Start</value> + </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>15</value> + </prop> + </node> + <node oor:name=".uno:EndPara" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">End</value> + </prop> + <prop oor:name="TooltipLabel" oor:type="xs:string"> + <value xml:lang="en-US">Align End</value> + </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>15</value> + </prop> + </node> <node oor:name=".uno:JustifyPara" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Justified</value> @@ -6819,6 +6841,14 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8 <value>1</value> </prop> </node> + <node oor:name=".uno:CommonAlignEnd" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">End</value> + </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>7</value> + </prop> + </node> <node oor:name=".uno:CommonAlignHorizontalCenter" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Centered</value> @@ -6835,6 +6865,14 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8 <value>1</value> </prop> </node> + <node oor:name=".uno:CommonAlignStart" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Start</value> + </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>7</value> + </prop> + </node> <node oor:name=".uno:CommonAlignTop" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Top</value> diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index cc4922842ff5..236d008dc278 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -857,6 +857,8 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const case SID_ATTR_PARA_ADJUST_CENTER: case SID_ATTR_PARA_ADJUST_RIGHT: case SID_ATTR_PARA_ADJUST_BLOCK: + case SID_ATTR_PARA_ADJUST_START: + case SID_ATTR_PARA_ADJUST_END: impl_fillState_nothrow(PROPERTY_PARAADJUST,aReturn); if ( aReturn.bEnabled ) { @@ -878,6 +880,12 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const case style::ParagraphAdjust_CENTER: aReturn.bChecked = _nId == SID_ATTR_PARA_ADJUST_CENTER; break; + case style::ParagraphAdjust_START: + aReturn.bChecked = _nId == SID_ATTR_PARA_ADJUST_START; + break; + case style::ParagraphAdjust_END: + aReturn.bChecked = _nId == SID_ATTR_PARA_ADJUST_END; + break; default: break; } } @@ -1495,6 +1503,8 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > case SID_ATTR_PARA_ADJUST_CENTER: case SID_ATTR_PARA_ADJUST_RIGHT: case SID_ATTR_PARA_ADJUST_BLOCK: + case SID_ATTR_PARA_ADJUST_START: + case SID_ATTR_PARA_ADJUST_END: { style::ParagraphAdjust eParagraphAdjust = style::ParagraphAdjust_LEFT; switch(_nId) @@ -1511,6 +1521,12 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > case SID_ATTR_PARA_ADJUST_BLOCK: eParagraphAdjust = style::ParagraphAdjust_BLOCK; break; + case SID_ATTR_PARA_ADJUST_START: + eParagraphAdjust = style::ParagraphAdjust_START; + break; + case SID_ATTR_PARA_ADJUST_END: + eParagraphAdjust = style::ParagraphAdjust_END; + break; } impl_setPropertyAtControls_throw(RID_STR_UNDO_ALIGNMENT,PROPERTY_PARAADJUST,uno::Any(static_cast<sal_Int16>(eParagraphAdjust)),aArgs); @@ -1518,6 +1534,8 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > InvalidateFeature(SID_ATTR_PARA_ADJUST_CENTER); InvalidateFeature(SID_ATTR_PARA_ADJUST_RIGHT); InvalidateFeature(SID_ATTR_PARA_ADJUST_BLOCK); + InvalidateFeature(SID_ATTR_PARA_ADJUST_START); + InvalidateFeature(SID_ATTR_PARA_ADJUST_END); } break; case SID_CHAR_DLG: @@ -1814,6 +1832,8 @@ void OReportController::describeSupportedFeatures() implDescribeSupportedFeature( u".uno:CenterPara"_ustr, SID_ATTR_PARA_ADJUST_CENTER, CommandGroup::FORMAT ); implDescribeSupportedFeature( u".uno:RightPara"_ustr, SID_ATTR_PARA_ADJUST_RIGHT, CommandGroup::FORMAT ); implDescribeSupportedFeature( u".uno:JustifyPara"_ustr, SID_ATTR_PARA_ADJUST_BLOCK, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:StartPara"_ustr, SID_ATTR_PARA_ADJUST_START, CommandGroup::FORMAT ); + implDescribeSupportedFeature( u".uno:EndPara"_ustr, SID_ATTR_PARA_ADJUST_END, CommandGroup::FORMAT ); implDescribeSupportedFeature( u".uno:FontHeight"_ustr, SID_ATTR_CHAR_FONTHEIGHT, CommandGroup::FORMAT ); implDescribeSupportedFeature( u".uno:CharFontName"_ustr, SID_ATTR_CHAR_FONT, CommandGroup::FORMAT ); diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi index 35e8093ba3b7..dc13528984e0 100644 --- a/sc/sdi/drawsh.sdi +++ b/sc/sdi/drawsh.sdi @@ -119,6 +119,8 @@ interface TableDraw SID_ALIGN_ANY_LEFT [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; ] SID_ALIGN_ANY_HCENTER [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; ] SID_ALIGN_ANY_RIGHT [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; ] + SID_ALIGN_ANY_START [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; ] + SID_ALIGN_ANY_END [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; ] SID_ALIGN_ANY_TOP [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; ] SID_ALIGN_ANY_VCENTER [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; ] SID_ALIGN_ANY_BOTTOM [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; ] diff --git a/sc/sdi/drtxtob.sdi b/sc/sdi/drtxtob.sdi index 5302b5bf1b63..c8787afc83ad 100644 --- a/sc/sdi/drtxtob.sdi +++ b/sc/sdi/drtxtob.sdi @@ -75,6 +75,8 @@ interface TableDrawText SID_ATTR_PARA_ADJUST_CENTER [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] SID_ATTR_PARA_ADJUST_RIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] SID_ATTR_PARA_ADJUST_BLOCK [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] + SID_ATTR_PARA_ADJUST_START [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] + SID_ATTR_PARA_ADJUST_END [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] SID_ATTR_PARA_LRSPACE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] SID_ATTR_PARA_LINESPACE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] SID_ATTR_PARA_ULSPACE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] @@ -100,6 +102,8 @@ interface TableDrawText SID_ALIGN_ANY_HCENTER [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] SID_ALIGN_ANY_RIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] SID_ALIGN_ANY_JUSTIFIED [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] + SID_ALIGN_ANY_START [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] + SID_ALIGN_ANY_END [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] SID_FORMTEXT_STYLE [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; ] SID_FORMTEXT_ADJUST [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; ] diff --git a/sc/sdi/formatsh.sdi b/sc/sdi/formatsh.sdi index 3cb4c050feaa..ba0c30649397 100644 --- a/sc/sdi/formatsh.sdi +++ b/sc/sdi/formatsh.sdi @@ -57,6 +57,8 @@ interface FormatForSelection SID_ALIGN_ANY_LEFT [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] SID_ALIGN_ANY_HCENTER [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] SID_ALIGN_ANY_RIGHT [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] + SID_ALIGN_ANY_START [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] + SID_ALIGN_ANY_END [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] SID_ALIGN_ANY_JUSTIFIED [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] SID_ALIGN_ANY_TOP [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] SID_ALIGN_ANY_VCENTER [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ] diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 4e72ede58f49..ab8009e0a0fd 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -4276,11 +4276,15 @@ bool ScDocFunc::ChangeIndent( const ScMarkData& rMark, bool bIncrement, bool bAp pBindings->Invalidate( SID_ATTR_PARA_ADJUST_RIGHT ); pBindings->Invalidate( SID_ATTR_PARA_ADJUST_BLOCK ); pBindings->Invalidate( SID_ATTR_PARA_ADJUST_CENTER); + pBindings->Invalidate( SID_ATTR_PARA_ADJUST_START ); + pBindings->Invalidate( SID_ATTR_PARA_ADJUST_END ); // pseudo slots for Format menu pBindings->Invalidate( SID_ALIGN_ANY_HDEFAULT ); pBindings->Invalidate( SID_ALIGN_ANY_LEFT ); pBindings->Invalidate( SID_ALIGN_ANY_HCENTER ); pBindings->Invalidate( SID_ALIGN_ANY_RIGHT ); + pBindings->Invalidate( SID_ALIGN_ANY_START ); + pBindings->Invalidate( SID_ALIGN_ANY_END ); pBindings->Invalidate( SID_ALIGN_ANY_JUSTIFIED ); } diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index aa707cfd191a..a91927310e97 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -195,6 +195,8 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // disable functions rSet.DisableItem( SID_ALIGN_ANY_LEFT ); rSet.DisableItem( SID_ALIGN_ANY_HCENTER ); rSet.DisableItem( SID_ALIGN_ANY_RIGHT ); + rSet.DisableItem( SID_ALIGN_ANY_START ); + rSet.DisableItem( SID_ALIGN_ANY_END ); rSet.DisableItem( SID_ALIGN_ANY_TOP ); rSet.DisableItem( SID_ALIGN_ANY_VCENTER ); rSet.DisableItem( SID_ALIGN_ANY_BOTTOM ); diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index c3bfca0aa71a..ed3c04f6a3a8 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -705,6 +705,16 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq ) aNewAttr.Put( SvxAdjustItem( SvxAdjust::Block, EE_PARA_JUST ) ); break; + case SID_ALIGN_ANY_START: + case SID_ATTR_PARA_ADJUST_START: + aNewAttr.Put( SvxAdjustItem( SvxAdjust::ParaStart, EE_PARA_JUST ) ); + break; + + case SID_ALIGN_ANY_END: + case SID_ATTR_PARA_ADJUST_END: + aNewAttr.Put( SvxAdjustItem( SvxAdjust::ParaEnd, EE_PARA_JUST ) ); + break; + case SID_ATTR_PARA_LINESPACE_10: { SvxLineSpacingItem aItem( LINE_SPACE_DEFAULT_HEIGHT, EE_PARA_SBL ); @@ -1079,6 +1089,16 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, true ) ); } break; + case SvxAdjust::ParaStart: + { + rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_START, true ) ); + } + break; + case SvxAdjust::ParaEnd: + { + rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_END, true ) ); + } + break; default: { // added to avoid warnings @@ -1088,6 +1108,8 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) rDestSet.Put( SfxBoolItem( SID_ALIGN_ANY_LEFT, eAdj == SvxAdjust::Left ) ); rDestSet.Put( SfxBoolItem( SID_ALIGN_ANY_HCENTER, eAdj == SvxAdjust::Center ) ); rDestSet.Put( SfxBoolItem( SID_ALIGN_ANY_RIGHT, eAdj == SvxAdjust::Right ) ); + rDestSet.Put( SfxBoolItem( SID_ALIGN_ANY_START, eAdj == SvxAdjust::ParaStart ) ); + rDestSet.Put( SfxBoolItem( SID_ALIGN_ANY_END, eAdj == SvxAdjust::ParaEnd ) ); rDestSet.Put( SfxBoolItem( SID_ALIGN_ANY_JUSTIFIED, eAdj == SvxAdjust::Block ) ); SvxLRSpaceItem aLR = aAttrSet.Get( EE_PARA_LRSPACE ); diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index ce3b1d71dfe8..f9022e05a2b3 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -62,6 +62,8 @@ static void lcl_InvalidateAttribs( SfxBindings& rBindings ) rBindings.Invalidate( SID_ATTR_PARA_ADJUST_RIGHT ); rBindings.Invalidate( SID_ATTR_PARA_ADJUST_BLOCK ); rBindings.Invalidate( SID_ATTR_PARA_ADJUST_CENTER); + rBindings.Invalidate( SID_ATTR_PARA_ADJUST_START ); + rBindings.Invalidate( SID_ATTR_PARA_ADJUST_END ); rBindings.Invalidate( SID_ALIGNLEFT ); rBindings.Invalidate( SID_ALIGNCENTERHOR ); rBindings.Invalidate( SID_ALIGNRIGHT ); @@ -83,6 +85,8 @@ static void lcl_InvalidateAttribs( SfxBindings& rBindings ) rBindings.Invalidate( SID_ALIGN_ANY_LEFT ); rBindings.Invalidate( SID_ALIGN_ANY_HCENTER ); rBindings.Invalidate( SID_ALIGN_ANY_RIGHT ); + rBindings.Invalidate( SID_ALIGN_ANY_START ); + rBindings.Invalidate( SID_ALIGN_ANY_END ); rBindings.Invalidate( SID_ALIGN_ANY_JUSTIFIED ); rBindings.Invalidate( SID_ATTR_CHAR_KERNING ); rBindings.Invalidate( SID_SET_SUPER_SCRIPT ); diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index c92e52d4e985..5952db8fbad1 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -174,6 +174,8 @@ void ScDrawView::InvalidateDrawTextAttrs() rBindings.Invalidate( SID_ATTR_PARA_ADJUST_RIGHT ); rBindings.Invalidate( SID_ATTR_PARA_ADJUST_BLOCK ); rBindings.Invalidate( SID_ATTR_PARA_ADJUST_CENTER); + rBindings.Invalidate( SID_ATTR_PARA_ADJUST_START ); + rBindings.Invalidate( SID_ATTR_PARA_ADJUST_END ); rBindings.Invalidate( SID_ALIGNLEFT ); rBindings.Invalidate( SID_ALIGNCENTERHOR ); rBindings.Invalidate( SID_ALIGNRIGHT ); @@ -197,6 +199,8 @@ void ScDrawView::InvalidateDrawTextAttrs() rBindings.Invalidate( SID_ALIGN_ANY_LEFT ); rBindings.Invalidate( SID_ALIGN_ANY_HCENTER ); rBindings.Invalidate( SID_ALIGN_ANY_RIGHT ); + rBindings.Invalidate( SID_ALIGN_ANY_START ); + rBindings.Invalidate( SID_ALIGN_ANY_END ); rBindings.Invalidate( SID_ALIGN_ANY_JUSTIFIED ); } diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index ca7a81aa822a..4db75c83c215 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -619,6 +619,8 @@ void ScFormatShell::ExecuteAlignment( SfxRequest& rReq ) rBindings.Invalidate( SID_ATTR_PARA_ADJUST_RIGHT ); rBindings.Invalidate( SID_ATTR_PARA_ADJUST_BLOCK ); rBindings.Invalidate( SID_ATTR_PARA_ADJUST_CENTER); + rBindings.Invalidate( SID_ATTR_PARA_ADJUST_START ); + rBindings.Invalidate( SID_ATTR_PARA_ADJUST_END ); rBindings.Invalidate( SID_ALIGNLEFT ); rBindings.Invalidate( SID_ALIGNRIGHT ); rBindings.Invalidate( SID_ALIGNCENTERHOR ); @@ -633,6 +635,8 @@ void ScFormatShell::ExecuteAlignment( SfxRequest& rReq ) rBindings.Invalidate( SID_ALIGN_ANY_LEFT ); rBindings.Invalidate( SID_ALIGN_ANY_HCENTER ); rBindings.Invalidate( SID_ALIGN_ANY_RIGHT ); + rBindings.Invalidate( SID_ALIGN_ANY_START ); + rBindings.Invalidate( SID_ALIGN_ANY_END ); rBindings.Invalidate( SID_ALIGN_ANY_JUSTIFIED ); rBindings.Invalidate( SID_ALIGN_ANY_VDEFAULT ); rBindings.Invalidate( SID_ALIGN_ANY_TOP ); diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index 8fd45f493c68..dd890e911d47 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -291,6 +291,8 @@ void ScTabView::InvalidateAttribs() rBindings.Invalidate( SID_ATTR_PARA_ADJUST_RIGHT ); rBindings.Invalidate( SID_ATTR_PARA_ADJUST_BLOCK ); rBindings.Invalidate( SID_ATTR_PARA_ADJUST_CENTER); + rBindings.Invalidate( SID_ATTR_PARA_ADJUST_START ); + rBindings.Invalidate( SID_ATTR_PARA_ADJUST_END ); rBindings.Invalidate( SID_NUMBER_TYPE_FORMAT); rBindings.Invalidate( SID_ALIGNLEFT ); @@ -333,6 +335,8 @@ void ScTabView::InvalidateAttribs() rBindings.Invalidate( SID_ALIGN_ANY_LEFT ); rBindings.Invalidate( SID_ALIGN_ANY_HCENTER ); rBindings.Invalidate( SID_ALIGN_ANY_RIGHT ); + rBindings.Invalidate( SID_ALIGN_ANY_START ); + rBindings.Invalidate( SID_ALIGN_ANY_END ); rBindings.Invalidate( SID_ALIGN_ANY_JUSTIFIED ); rBindings.Invalidate( SID_ALIGN_ANY_VDEFAULT ); rBindings.Invalidate( SID_ALIGN_ANY_TOP ); diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index a6fe096036f4..c574c2cf62ef 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -1687,6 +1687,16 @@ interface DrawView ExecMethod = ExecRuler ; StateMethod = GetAttrState ; ] + SID_ATTR_PARA_ADJUST_START + [ + ExecMethod = ExecRuler ; + StateMethod = GetAttrState ; + ] + SID_ATTR_PARA_ADJUST_END + [ + ExecMethod = ExecRuler ; + StateMethod = GetAttrState ; + ] SID_ATTR_POSITION // ole : no, status : ? [ ExecMethod = ExecStatusBar ; diff --git a/sd/sdi/drtxtob.sdi b/sd/sdi/drtxtob.sdi index 38a4fa7f210b..97e5a6193765 100644 --- a/sd/sdi/drtxtob.sdi +++ b/sd/sdi/drtxtob.sdi @@ -156,6 +156,20 @@ shell TextObjectBar // AutoUpdate; ] + SID_ATTR_PARA_ADJUST_START // ole : ?, status : ? + [ + ExecMethod = Execute; + StateMethod = GetAttrState; +// AutoUpdate; + ] + + SID_ATTR_PARA_ADJUST_END // ole : ?, status : ? + [ + ExecMethod = Execute; + StateMethod = GetAttrState; +// AutoUpdate; + ] + SID_ATTR_PARA_LEFT_TO_RIGHT // ole : ?, status : ? [ ExecMethod = Execute; diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx index 063895ea69a3..f8e0f54a6855 100644 --- a/sd/source/ui/func/fuparagr.cxx +++ b/sd/source/ui/func/fuparagr.cxx @@ -145,6 +145,8 @@ void FuParagraph::DoExecute( SfxRequest& rReq ) SID_RULER_TEXT_RIGHT_TO_LEFT, SID_PARASPACE_INCREASE, SID_PARASPACE_DECREASE, + SID_ATTR_PARA_ADJUST_START, + SID_ATTR_PARA_ADJUST_END, 0 }; mrViewShell.GetViewFrame()->GetBindings().Invalidate( SidArray ); diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index a9f5c8ad7326..420cb7c0bfbb 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -124,6 +124,8 @@ const sal_uInt16 SidArray[] = { SID_ATTR_PARA_RIGHT_TO_LEFT, // 10951 SID_PARASPACE_INCREASE, // 11145 SID_PARASPACE_DECREASE, // 11146 + SID_ATTR_PARA_ADJUST_START, // 11579 + SID_ATTR_PARA_ADJUST_END, // 11580 FN_NUM_BULLET_ON, // 20138 FN_NUM_NUMBERING_ON, // 20144 0 }; diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 52372010b0be..3efb4d996046 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -503,6 +503,8 @@ void TextObjectBar::GetAttrStateImpl(ViewShell& rViewShell, ::sd::View* pView, S rSet.DisableItem( SID_ATTR_PARA_ADJUST_RIGHT ); rSet.DisableItem( SID_ATTR_PARA_ADJUST_CENTER ); rSet.DisableItem( SID_ATTR_PARA_ADJUST_BLOCK ); + rSet.DisableItem( SID_ATTR_PARA_ADJUST_START ); + rSet.DisableItem( SID_ATTR_PARA_ADJUST_END ); rSet.DisableItem( SID_ATTR_PARA_LINESPACE_10 ); rSet.DisableItem( SID_ATTR_PARA_LINESPACE_15 ); rSet.DisableItem( SID_ATTR_PARA_LINESPACE_20 ); @@ -559,24 +561,48 @@ void TextObjectBar::GetAttrStateImpl(ViewShell& rViewShell, ::sd::View* pView, S rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, false ) ); rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, false ) ); rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, false ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_START, false ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_END, false ) ); break; case SvxAdjust::Center: rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, true ) ); rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, false ) ); rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, false ) ); rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, false ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_START, false ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_END, false ) ); break; case SvxAdjust::Right: rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, true ) ); rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, false ) ); rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, false ) ); rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, false ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_START, false ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_END, false ) ); break; case SvxAdjust::Block: rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, true ) ); rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, false ) ); rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, false ) ); rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, false ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_START, false ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_END, false ) ); + break; + case SvxAdjust::ParaStart: + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, false ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, false ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, false ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, false ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_START, true ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_END, false ) ); + break; + case SvxAdjust::ParaEnd: + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, false ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, false ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, false ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, false ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_START, false ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_END, true ) ); break; default: break; @@ -588,6 +614,8 @@ void TextObjectBar::GetAttrStateImpl(ViewShell& rViewShell, ::sd::View* pView, S pTextObjectBar->Invalidate(SID_ATTR_PARA_ADJUST_CENTER); pTextObjectBar->Invalidate(SID_ATTR_PARA_ADJUST_RIGHT); pTextObjectBar->Invalidate(SID_ATTR_PARA_ADJUST_BLOCK); + pTextObjectBar->Invalidate(SID_ATTR_PARA_ADJUST_START); + pTextObjectBar->Invalidate(SID_ATTR_PARA_ADJUST_END); pTextObjectBar->Invalidate(SID_ATTR_PARA_LINESPACE); pTextObjectBar->Invalidate(SID_ATTR_PARA_ULSPACE); } diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 5e3902ab2471..85abbc5c54e8 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -598,6 +598,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; SET_ADJUST: { aNewAttr.Put(SvxAdjustItem(eAdjst, EE_PARA_JUST)); @@ -747,7 +749,9 @@ SET_ADJUST: else if (nSlot == SID_ATTR_PARA_ADJUST_LEFT || nSlot == SID_ATTR_PARA_ADJUST_CENTER || nSlot == SID_ATTR_PARA_ADJUST_RIGHT || - nSlot == SID_ATTR_PARA_ADJUST_BLOCK) + nSlot == SID_ATTR_PARA_ADJUST_BLOCK || + nSlot == SID_ATTR_PARA_ADJUST_START || + nSlot == SID_ATTR_PARA_ADJUST_END ) { SvxAdjust eAdjst; SdrTextHorzAdjust eAnchor; @@ -760,6 +764,12 @@ SET_ADJUST: else if (nSlot == SID_ATTR_PARA_ADJUST_RIGHT) { eAdjst = SvxAdjust::Right; eAnchor = SDRTEXTHORZADJUST_RIGHT; } + else if (nSlot == SID_ATTR_PARA_ADJUST_START) { + eAdjst = SvxAdjust::ParaStart; eAnchor = SDRTEXTHORZADJUST_LEFT; + } + else if (nSlot == SID_ATTR_PARA_ADJUST_END) { + eAdjst = SvxAdjust::ParaEnd; eAnchor = SDRTEXTHORZADJUST_RIGHT; + } else { eAdjst = SvxAdjust::Block; eAnchor = SDRTEXTHORZADJUST_BLOCK; } diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 729274038514..3617806833e5 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -773,6 +773,28 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) Invalidate(SID_ATTR_PARA_ADJUST_BLOCK); break; } + case SID_ATTR_PARA_ADJUST_START: + { + SvxAdjustItem aItem( SvxAdjust::Block, EE_PARA_JUST ); + SfxItemSetFixed<EE_PARA_JUST, EE_PARA_JUST> aEditAttr( GetPool() ); + + aEditAttr.Put( aItem ); + mpDrawView->SetAttributes( aEditAttr ); + + Invalidate(SID_ATTR_PARA_ADJUST_START); + break; + } + case SID_ATTR_PARA_ADJUST_END: + { + SvxAdjustItem aItem( SvxAdjust::Block, EE_PARA_JUST ); + SfxItemSetFixed<EE_PARA_JUST, EE_PARA_JUST> aEditAttr( GetPool() ); + + aEditAttr.Put( aItem ); + mpDrawView->SetAttributes( aEditAttr ); + + Invalidate(SID_ATTR_PARA_ADJUST_END); + break; + } case SID_ATTR_PARA_ULSPACE: if (pArgs) { diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 4377b3282bc0..ab1ec3c24e39 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -345,6 +345,38 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) Invalidate(nSlotId); } break; + case SID_ATTR_PARA_ADJUST_START: + { + SfxItemSet aAttrs( GetDoc()->GetPool() ); + mpDrawView->GetAttributes( aAttrs ); + + SvxAdjust eAdj = aAttrs.Get( EE_PARA_JUST ).GetAdjust(); + if ( eAdj == SvxAdjust::Left) + { + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_START, true ) ); + } + + bAttr = true; + + Invalidate(nSlotId); + } + break; + case SID_ATTR_PARA_ADJUST_END: + { + SfxItemSet aAttrs( GetDoc()->GetPool() ); + mpDrawView->GetAttributes( aAttrs ); + + SvxAdjust eAdj = aAttrs.Get( EE_PARA_JUST ).GetAdjust(); + if ( eAdj == SvxAdjust::Left) + { + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_END, true ) ); + } + + bAttr = true; + + Invalidate(nSlotId); + } + break; case SID_ATTR_PARA_LRSPACE: { SfxItemSet aAttrs( GetDoc()->GetPool() ); diff --git a/svx/sdi/fmslots.sdi b/svx/sdi/fmslots.sdi index d1dd4fdb4678..af6724b26061 100644 --- a/svx/sdi/fmslots.sdi +++ b/svx/sdi/fmslots.sdi @@ -387,6 +387,16 @@ interface FormTextAttributeShell ExecMethod = ExecuteTextAttribute; StateMethod = GetTextAttributeState; ] + SID_ATTR_PARA_ADJUST_START + [ + ExecMethod = ExecuteTextAttribute; + StateMethod = GetTextAttributeState; + ] + SID_ATTR_PARA_ADJUST_END + [ + ExecMethod = ExecuteTextAttribute; + StateMethod = GetTextAttributeState; + ] SID_SET_SUPER_SCRIPT [ ExecMethod = ExecuteTextAttribute; diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index 46d2210e53f1..8fb8cf205f10 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -5422,6 +5422,42 @@ SfxBoolItem LeftPara SID_ATTR_PARA_ADJUST_LEFT ] +SfxBoolItem StartPara SID_ATTR_PARA_ADJUST_START + +[ + AutoUpdate = TRUE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = TRUE, + MenuConfig = TRUE, + ToolBoxConfig = TRUE, + GroupId = SfxGroupId::Format; +] + + +SfxBoolItem EndPara SID_ATTR_PARA_ADJUST_END + +[ + AutoUpdate = TRUE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = TRUE, + MenuConfig = TRUE, + ToolBoxConfig = TRUE, + GroupId = SfxGroupId::Format; +] + + SvxLRSpaceItem LeftRightMargin SID_ATTR_LRSPACE [ @@ -10989,6 +11025,40 @@ SfxVoidItem CommonAlignRight SID_ALIGN_ANY_RIGHT GroupId = SfxGroupId::Format; ] +SfxVoidItem CommonAlignStart SID_ALIGN_ANY_START +() +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = TRUE, + MenuConfig = TRUE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Format; +] + +SfxVoidItem CommonAlignEnd SID_ALIGN_ANY_END +() +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = TRUE, + MenuConfig = TRUE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Format; +] + SfxVoidItem CommonAlignJustified SID_ALIGN_ANY_JUSTIFIED () [ diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index bc5a2b72f792..b006a3faacd6 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -124,6 +124,8 @@ namespace svx SID_ATTR_PARA_LEFT_TO_RIGHT, /* 950 */ SID_ATTR_PARA_RIGHT_TO_LEFT, SID_ATTR_CHAR_OVERLINE, + SID_ATTR_PARA_ADJUST_START, + SID_ATTR_PARA_ADJUST_END, 0 }; diff --git a/sw/sdi/_annotsh.sdi b/sw/sdi/_annotsh.sdi index 1a0a35a93390..2193edeb3283 100644 --- a/sw/sdi/_annotsh.sdi +++ b/sw/sdi/_annotsh.sdi @@ -425,6 +425,20 @@ interface _Annotation DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; ] + SID_ATTR_PARA_ADJUST_START // api: + [ + ExecMethod = Exec ; + StateMethod = GetState ; + DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; + ] + + SID_ATTR_PARA_ADJUST_END // api: + [ + ExecMethod = Exec ; + StateMethod = GetState ; + DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; + ] + SID_ATTR_PARA_LINESPACE_10 // api: [ ExecMethod = Exec ; diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi index 543ae83111d9..87aeb4c9935d 100644 --- a/sw/sdi/_textsh.sdi +++ b/sw/sdi/_textsh.sdi @@ -1290,6 +1290,18 @@ interface BaseText StateMethod = GetAttrState ; DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; ] + SID_ATTR_PARA_ADJUST_START + [ + ExecMethod = ExecParaAttr ; + StateMethod = GetAttrState ; + DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; + ] + SID_ATTR_PARA_ADJUST_END + [ + ExecMethod = ExecParaAttr ; + StateMethod = GetAttrState ; + DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; + ] SID_ATTR_PARA_LINESPACE_10 [ ExecMethod = ExecParaAttr ; diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi index c0c018ae762f..8c51d3fadef6 100644 --- a/sw/sdi/_viewsh.sdi +++ b/sw/sdi/_viewsh.sdi @@ -845,6 +845,16 @@ interface BaseTextEditView ExecMethod = Execute ; StateMethod = GetState ; ] + SID_ALIGN_ANY_START + [ + ExecMethod = Execute ; + StateMethod = GetState ; + ] + SID_ALIGN_ANY_END + [ + ExecMethod = Execute ; + StateMethod = GetState ; + ] SID_ALIGN_ANY_JUSTIFIED [ ExecMethod = Execute ; diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi index ab34cebf9007..a2eb0d24c387 100644 --- a/sw/sdi/drwtxtsh.sdi +++ b/sw/sdi/drwtxtsh.sdi @@ -313,6 +313,20 @@ interface TextDrawText DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; ] + SID_ATTR_PARA_ADJUST_START // api: + [ + ExecMethod = Execute ; + StateMethod = GetState ; + DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; + ] + + SID_ATTR_PARA_ADJUST_END // api: + [ + ExecMethod = Execute ; + StateMethod = GetState ; + DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; + ] + SID_ATTR_PARA_LINESPACE_10 // api: [ ExecMethod = Execute ; diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index 4fe1f29f8d8c..c340e67b71a9 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -329,6 +329,12 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) case SID_ATTR_PARA_ADJUST_BLOCK: aNewAttr.Put(SvxAdjustItem(SvxAdjust::Block, EE_PARA_JUST)); break; + case SID_ATTR_PARA_ADJUST_START: + aNewAttr.Put(SvxAdjustItem(SvxAdjust::ParaStart, EE_PARA_JUST)); + break; + case SID_ATTR_PARA_ADJUST_END: + aNewAttr.Put(SvxAdjustItem(SvxAdjust::ParaEnd, EE_PARA_JUST)); + break; case SID_ATTR_PARA_LINESPACE_10: { @@ -786,6 +792,8 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet) case SID_ATTR_PARA_ADJUST_RIGHT: case SID_ATTR_PARA_ADJUST_CENTER: case SID_ATTR_PARA_ADJUST_BLOCK: + case SID_ATTR_PARA_ADJUST_START: + case SID_ATTR_PARA_ADJUST_END: { SvxAdjust eAdjust = SvxAdjust::Left; if (nWhich==SID_ATTR_PARA_ADJUST_LEFT) @@ -796,6 +804,10 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet) eAdjust = SvxAdjust::Center; else if (nWhich==SID_ATTR_PARA_ADJUST_BLOCK) eAdjust = SvxAdjust::Block; + else if (nWhich==SID_ATTR_PARA_ADJUST_START) + eAdjust = SvxAdjust::ParaStart; + else if (nWhich==SID_ATTR_PARA_ADJUST_END) + eAdjust = SvxAdjust::ParaEnd; const SvxAdjustItem *pAdjust = aEditAttr.GetItemIfSet( EE_PARA_JUST, false ); diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index cf9b5a1203d5..a209877f1286 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -229,6 +229,12 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) case SID_ATTR_PARA_ADJUST_BLOCK: aNewAttr.Put(SvxAdjustItem(SvxAdjust::Block, EE_PARA_JUST)); break; + case SID_ATTR_PARA_ADJUST_START: + aNewAttr.Put(SvxAdjustItem(SvxAdjust::ParaStart, EE_PARA_JUST)); + break; + case SID_ATTR_PARA_ADJUST_END: + aNewAttr.Put(SvxAdjustItem(SvxAdjust::ParaEnd, EE_PARA_JUST)); + break; case SID_ATTR_PARA_LRSPACE: { SvxLRSpaceItem aParaMargin(static_cast<const SvxLRSpaceItem&>(rReq. @@ -755,6 +761,12 @@ void SwDrawTextShell::GetState(SfxItemSet& rSet) case SID_ATTR_PARA_ADJUST_BLOCK: eAdjust = SvxAdjust::Block; goto ASK_ADJUST; + case SID_ATTR_PARA_ADJUST_START: + eAdjust = SvxAdjust::ParaStart; + goto ASK_ADJUST; + case SID_ATTR_PARA_ADJUST_END: + eAdjust = SvxAdjust::ParaEnd; + goto ASK_ADJUST; ASK_ADJUST: { if (!pAdjust) diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx index 8197b5682323..4da0d850c672 100644 --- a/sw/source/uibase/shells/txtattr.cxx +++ b/sw/source/uibase/shells/txtattr.cxx @@ -353,6 +353,8 @@ void SwTextShell::ExecParaAttr(SfxRequest &rReq) case SID_ATTR_PARA_ADJUST_RIGHT: eAdjst = SvxAdjust::Right; goto SET_ADJUST; case SID_ATTR_PARA_ADJUST_CENTER: eAdjst = SvxAdjust::Center; goto SET_ADJUST; case SID_ATTR_PARA_ADJUST_BLOCK: eAdjst = SvxAdjust::Block; goto SET_ADJUST; + case SID_ATTR_PARA_ADJUST_START: eAdjst = SvxAdjust::ParaStart; goto SET_ADJUST; + case SID_ATTR_PARA_ADJUST_END: eAdjst = SvxAdjust::ParaEnd; goto SET_ADJUST; SET_ADJUST: { aSet.Put(SvxAdjustItem(eAdjst,RES_PARATR_ADJUST)); @@ -672,6 +674,24 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) } } break; + case SID_ATTR_PARA_ADJUST_START: + if (!bAdjustGood) + { + rSet.InvalidateItem( nSlot ); + nSlot = 0; + } + else + bFlag = SvxAdjust::ParaStart == eAdjust; + break; + case SID_ATTR_PARA_ADJUST_END: + if (!bAdjustGood) + { + rSet.InvalidateItem( nSlot ); + nSlot = 0; + } + else + bFlag = SvxAdjust::ParaEnd == eAdjust; + break; case SID_ATTR_PARA_LINESPACE_10: bFlag = nLineSpace == 100; break; diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index ff4e4e46f985..f458607815d5 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -655,7 +655,8 @@ void SwView::CheckReadonlyState() SID_ATTR_CHAR_COLOR_BACKGROUND_EXT, SID_CHARMAP, FN_SVX_SET_NUMBER, FN_SVX_SET_BULLET, FN_SVX_SET_OUTLINE, SID_ATTR_CHAR_BACK_COLOR, SID_ULINE_VAL_SINGLE, SID_ULINE_VAL_DOUBLE, SID_ULINE_VAL_DOTTED, - SID_ATTR_CHAR_OVERLINE, SID_AUTOSPELL_CHECK, SID_SBA_BRW_INSERT, + SID_ATTR_CHAR_OVERLINE, SID_ATTR_PARA_ADJUST_START, SID_ATTR_PARA_ADJUST_END, + SID_AUTOSPELL_CHECK, SID_SBA_BRW_INSERT, FN_NUM_BULLET_ON, FN_NUM_NUMBERING_ON, FN_SELECT_PARA, FN_INSERT_BOOKMARK, FN_INSERT_BREAK, FN_INSERT_BREAK_DLG, FN_INSERT_COLUMN_BREAK, FN_INSERT_LINEBREAK, FN_INSERT_CONTENT_CONTROL, diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index a115460dd1c2..a1abdb77bd8d 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -1614,6 +1614,8 @@ void SwView::Execute(SfxRequest &rReq) case SID_ALIGN_ANY_LEFT : case SID_ALIGN_ANY_HCENTER : case SID_ALIGN_ANY_RIGHT : + case SID_ALIGN_ANY_START : + case SID_ALIGN_ANY_END : case SID_ALIGN_ANY_JUSTIFIED: case SID_ALIGN_ANY_TOP : case SID_ALIGN_ANY_VCENTER : @@ -1629,6 +1631,8 @@ void SwView::Execute(SfxRequest &rReq) case SID_ALIGN_ANY_LEFT : nAlias = SID_ATTR_PARA_ADJUST_LEFT; break; case SID_ALIGN_ANY_HCENTER : nAlias = SID_ATTR_PARA_ADJUST_CENTER; break; case SID_ALIGN_ANY_RIGHT : nAlias = SID_ATTR_PARA_ADJUST_RIGHT; break; + case SID_ALIGN_ANY_START : nAlias = SID_ATTR_PARA_ADJUST_START; break; + case SID_ALIGN_ANY_END : nAlias = SID_ATTR_PARA_ADJUST_END; break; case SID_ALIGN_ANY_JUSTIFIED: nAlias = SID_ATTR_PARA_ADJUST_BLOCK; break; case SID_ALIGN_ANY_TOP : nAlias = SID_TABLE_VERT_NONE; break; case SID_ALIGN_ANY_VCENTER : nAlias = SID_TABLE_VERT_CENTER; break; diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx index 6d24a8244257..a5b2c3d42e3e 100644 --- a/sw/source/uibase/uiview/viewstat.cxx +++ b/sw/source/uibase/uiview/viewstat.cxx @@ -557,6 +557,8 @@ void SwView::GetState(SfxItemSet &rSet) case SID_ALIGN_ANY_LEFT : case SID_ALIGN_ANY_HCENTER : case SID_ALIGN_ANY_RIGHT : + case SID_ALIGN_ANY_START : + case SID_ALIGN_ANY_END : case SID_ALIGN_ANY_JUSTIFIED: case SID_ALIGN_ANY_TOP : case SID_ALIGN_ANY_VCENTER : @@ -574,6 +576,8 @@ void SwView::GetState(SfxItemSet &rSet) case SID_ALIGN_ANY_LEFT : nAlias = SID_ATTR_PARA_ADJUST_LEFT; break; case SID_ALIGN_ANY_HCENTER : nAlias = SID_ATTR_PARA_ADJUST_CENTER; break; case SID_ALIGN_ANY_RIGHT : nAlias = SID_ATTR_PARA_ADJUST_RIGHT; break; + case SID_ALIGN_ANY_START : nAlias = SID_ATTR_PARA_ADJUST_START; break; + case SID_ALIGN_ANY_END : nAlias = SID_ATTR_PARA_ADJUST_END; break; case SID_ALIGN_ANY_JUSTIFIED: nAlias = SID_ATTR_PARA_ADJUST_BLOCK; break; case SID_ALIGN_ANY_TOP : nAlias = SID_TABLE_VERT_NONE; break; case SID_ALIGN_ANY_VCENTER : nAlias = SID_TABLE_VERT_CENTER; break;
