cui/source/tabpages/swpossizetabpage.cxx | 2 +-
svx/inc/swframeposstrings.hrc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 05fa375ff0dba60af7093acb058e07b767f0adab
Author: Seth Chaiklin <sdc.bla...@youmail.dk>
AuthorDate: Sat May 7 22:10:07 2022 +0100
Commit: Seth Chaiklin <sdc.bla...@youmail.dk>
CommitDate: Tue May 10 17:56:23 2022 +0200
tdf#148519 correction to vertical "to frame" mapping for object position
The mapping for the anchor to frame was incorrect, possibly inherited
from OOo. (Thanks to Regina Henschel for identifying this problem.)
This patch changes the mapping and reverts
2c19246a4090df14e8f97c35c7770b25c1974232, which had attempted
to correct the problem of what options were shown in the UI for
Vertical Position for objects that are anchored "to frame".
Change-Id: I30c35475a38824ebc1f926bf63542d19bdf008d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133871
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin <sdc.bla...@youmail.dk>
diff --git a/cui/source/tabpages/swpossizetabpage.cxx
b/cui/source/tabpages/swpossizetabpage.cxx
index e0f20ab9623e..5b0e20264282 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -205,7 +205,7 @@ FrmMap const aHFlyHtmlMap[] =
// #i18732# - own vertical alignment map for to frame anchored objects
// #i22305#
-#define VERT_FRAME_REL (LB::VertFrame|LB::FlyVertPrintArea)
+#define VERT_FRAME_REL (LB::FlyVertFrame|LB::FlyVertPrintArea)
FrmMap const aVFrameMap[] =
{
diff --git a/svx/inc/swframeposstrings.hrc b/svx/inc/swframeposstrings.hrc
index 97369ac2cdec..fd9da2706ac9 100644
--- a/svx/inc/swframeposstrings.hrc
+++ b/svx/inc/swframeposstrings.hrc
@@ -50,7 +50,7 @@ const TranslateId RID_SVXSW_FRAMEPOSITIONS[] =
NC_("RID_SVXSW_FRAMEPOSITIONS", "Base line"),
NC_("RID_SVXSW_FRAMEPOSITIONS", "Character"),
NC_("RID_SVXSW_FRAMEPOSITIONS", "Row"),
- NC_("RID_SVXSW_FRAMEPOSITIONS", "Entire frame"),
+ NC_("RID_SVXSW_FRAMEPOSITIONS", "Margin"),
NC_("RID_SVXSW_FRAMEPOSITIONS", "Paragraph text area"),
NC_("RID_SVXSW_FRAMEPOSITIONS", "Left of frame text area"),
NC_("RID_SVXSW_FRAMEPOSITIONS", "Right of frame text area"),
