editeng/source/items/frmitems.cxx | 3 ++-
include/editeng/editrids.hrc | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit f17e09661e3ffc001a2ed5be0d6302debe3d109d
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Wed Sep 25 18:33:12 2019 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Sep 26 12:05:32 2019 +0200
tdf#127748: crash on modify a frame style, which has writing-mode bt-lr
bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=154474
Change-Id: I6e6e0927ea85c4f0f4f59bf327ce5468fc428328
Reviewed-on: https://gerrit.libreoffice.org/79572
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
(cherry picked from commit 2a38ec580b3b6ffe11276462547a41c467a51197)
Reviewed-on: https://gerrit.libreoffice.org/79582
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/editeng/source/items/frmitems.cxx
b/editeng/source/items/frmitems.cxx
index 0d49c25681b6..4cb09608cf2e 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -3327,7 +3327,8 @@ const char* getFrmDirResId(size_t nIndex)
RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP,
RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT,
RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT,
- RID_SVXITEMS_FRMDIR_ENVIRONMENT
+ RID_SVXITEMS_FRMDIR_ENVIRONMENT,
+ RID_SVXITEMS_FRMDIR_VERT_BOT_LEFT
};
return RID_SVXITEMS_FRMDIR[nIndex];
}
diff --git a/include/editeng/editrids.hrc b/include/editeng/editrids.hrc
index 5a75b4ff8c85..ebb1de7ee277 100644
--- a/include/editeng/editrids.hrc
+++ b/include/editeng/editrids.hrc
@@ -263,6 +263,7 @@
#define RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT
NC_("RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT", "Text direction right-to-left
(vertical)")
#define RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT
NC_("RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT", "Text direction left-to-right
(vertical)")
#define RID_SVXITEMS_FRMDIR_ENVIRONMENT
NC_("RID_SVXITEMS_FRMDIR_ENVIRONMENT", "Use superordinate object text direction
setting")
+#define RID_SVXITEMS_FRMDIR_VERT_BOT_LEFT
NC_("RID_SVXITEMS_FRMDIR_VERT_BOT_LEFT", "Text direction left-to-right
(vertical from bottom)")
#define RID_SVXITEMS_PARASNAPTOGRID_ON
NC_("RID_SVXITEMS_PARASNAPTOGRID_ON", "Paragraph snaps to text grid (if
active)")
#define RID_SVXITEMS_PARASNAPTOGRID_OFF
NC_("RID_SVXITEMS_PARASNAPTOGRID_OFF", "Paragraph does not snap to text grid")
#define RID_SVXITEMS_CHARHIDDEN_FALSE
NC_("RID_SVXITEMS_CHARHIDDEN_FALSE", "Not hidden")
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
