cui/inc/strings.hrc | 7 ------- cui/source/dialogs/insrc.cxx | 7 ------- 2 files changed, 14 deletions(-)
New commits: commit 48d7a087b43b523d9d3f2bb296904c5a4ef43759 Author: Heiko Tietze <tietze.he...@gmail.com> AuthorDate: Thu Sep 6 10:26:27 2018 +0200 Commit: Heiko Tietze <tietze.he...@gmail.com> CommitDate: Thu Sep 6 10:43:57 2018 +0200 Revert "tdf#119293 - UI Consistency for inserting rows in Writer table" This reverts commit a3c8250c5b56a2cb40aa01b9a6a59e4daa1fd2f8. "Left/Right" is inappropriate for RTL documents. So we better use Before/After in accordance with tdf#119036. Change-Id: Id9cb721902d246f837c7440c2f0c049c7c1dc4ca Reviewed-on: https://gerrit.libreoffice.org/60073 Reviewed-by: Heiko Tietze <tietze.he...@gmail.com> Tested-by: Heiko Tietze <tietze.he...@gmail.com> diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc index 9581676fed37..99e0b1b69030 100644 --- a/cui/inc/strings.hrc +++ b/cui/inc/strings.hrc @@ -96,19 +96,12 @@ #define RID_SVXSTR_SELECTOR_ADD_COMMANDS NC_("RID_SVXSTR_SELECTOR_ADD_COMMANDS", "Add Commands") #define RID_SVXSTR_SELECTOR_RUN NC_("RID_SVXSTR_SELECTOR_RUN", "Run") #define RID_SVXSTR_ROW NC_("RID_SVXSTR_ROW", "Insert Rows") -// tdf#119293 Labels depending on row/col -#define RID_SVXSTR_INSERTROW_BEFORE NC_("RID_SVXSTR_INSERTROW_BEFORE", "Above the selection") -#define RID_SVXSTR_INSERTROW_AFTER NC_("RID_SVXSTR_INSERTROW_AFTER", "Below the selection") #define RID_SVXSTR_REMOVE_FAVORITES NC_("RID_SVXSTR_REMOVE_FAVORITES", "Remove from Favorites") #define RID_SVXSTR_MISSING_GLYPH NC_("RID_SVXSTR_MISSING_GLYPH", "Missing Glyph") #define RID_SVXSTR_ADD_FAVORITES NC_("RID_SVXSTR_ADD_FAVORITES", "Add to Favorites") // PPI is pixel per inch, %1 is a number #define RID_SVXSTR_PPI NC_("RID_SVXSTR_PPI", "(%1 PPI)") #define RID_SVXSTR_COL NC_("RID_SVXSTR_COL", "Insert Columns") -// tdf#119293 Labels depending on row/col -#define RID_SVXSTR_INSERTCOL_BEFORE NC_("RID_SVXSTR_INSERTCOL_BEFORE", "Left of the selection") -#define RID_SVXSTR_INSERTCOL_AFTER NC_("RID_SVXSTR_INSERTCOL_AFTER", "Right of the selection") - #define RID_SVXSTR_AUTO_ENTRY NC_("RID_SVXSTR_AUTO_ENTRY", "Automatic") #define RID_SVXSTR_EDIT_GRAPHIC NC_("RID_SVXSTR_EDIT_GRAPHIC", "Link") #define RID_SVXSTR_LOADACCELCONFIG NC_("RID_SVXSTR_LOADACCELCONFIG", "Load Keyboard Configuration") diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index eab54d16d6f7..5cecafd62c82 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -40,13 +40,6 @@ SvxInsRowColDlg::SvxInsRowColDlg(weld::Window* pParent, bool bColumn, const OStr , m_xAfterBtn(m_xBuilder->weld_radio_button("insert_after")) { m_xDialog->set_title(bColumn ? CuiResId(RID_SVXSTR_COL) : CuiResId(RID_SVXSTR_ROW)); - if (bColumn) { - m_xBeforeBtn->set_label(CuiResId(RID_SVXSTR_INSERTCOL_BEFORE)); - m_xAfterBtn->set_label(CuiResId(RID_SVXSTR_INSERTCOL_AFTER)); - } else { - m_xBeforeBtn->set_label(CuiResId(RID_SVXSTR_INSERTROW_BEFORE)); - m_xAfterBtn->set_label(CuiResId(RID_SVXSTR_INSERTROW_AFTER)); - } m_xDialog->set_help_id(rHelpId); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits