[Libreoffice-commits] core.git: cui/source include/svx svx/inc

[Szabolcs Toth (via logerrit)]

 cui/source/tabpages/swpossizetabpage.cxx |    6 ++++--
 include/svx/swframeposstrings.hxx        |    1 +
 svx/inc/swframeposstrings.hrc            |    1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 6a10ea009ef590ac13d01d19fbfbc28c916ef1d4
Author:     Szabolcs Toth <toth.szabolcs at nisz.hu>
AuthorDate: Thu Oct 22 12:23:43 2020 +0200
Commit:     László Németh <nemeth at numbertext.org>
CommitDate: Mon Oct 26 10:38:02 2020 +0100

    tdf#137650 sw page top border relative orientation: add UI
    
    as new menu item "page text area top" of Position/Vertical
    popup menu "to:" in Position and Size dialog window of
    shapes.
    
    Follow-up of commit 1c593e1916c9164c7db71da2017cfc26972f8e9f
    (tdf#133045 sw: add shape alignment to the top page border).
    See also commit 8af2c4e3a517e3b75f2ace9719c1ca03153baddf
    (sw from-bottom relative orientation: add UI)
    
    Change-Id: I98671fa9c7c184c8f360ccb35e671df68cd271b5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104661
    Tested-by: László Németh <nemeth at numbertext.org>
    Reviewed-by: László Németh <nemeth at numbertext.org>

diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index b0366bf48053..2b9c8c70a4b4 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -98,8 +98,9 @@ enum class LB {
     VertLine            = 0x080000, // vertical text line
 
     RelPagePrintAreaBottom = 0x100000, // bottom of text area of page
+    RelPagePrintAreaTop = 0x200000,
 
-    LAST = 0x200000
+    LAST = 0x400000
 };
 
 }
@@ -118,6 +119,7 @@ RelationMap const aRelationMap[] =
     {SvxSwFramePosString::REL_FRM_RIGHT, SvxSwFramePosString::MIR_REL_FRM_RIGHT, LB::RelFrameRight,   RelOrientation::FRAME_RIGHT},
     {SvxSwFramePosString::REL_PG_FRAME,  SvxSwFramePosString::REL_PG_FRAME,      LB::RelPageFrame,    RelOrientation::PAGE_FRAME},
     {SvxSwFramePosString::REL_PG_PRTAREA,SvxSwFramePosString::REL_PG_PRTAREA,    LB::RelPagePrintArea,  RelOrientation::PAGE_PRINT_AREA},
+    {SvxSwFramePosString::REL_PG_PRTAREA_TOP,SvxSwFramePosString::REL_PG_PRTAREA_TOP,    LB::RelPagePrintAreaTop,  RelOrientation::PAGE_PRINT_AREA_TOP},
     {SvxSwFramePosString::REL_PG_PRTAREA_BOTTOM,SvxSwFramePosString::REL_PG_PRTAREA_BOTTOM,    LB::RelPagePrintAreaBottom,  RelOrientation::PAGE_PRINT_AREA_BOTTOM},
     {SvxSwFramePosString::REL_CHAR,      SvxSwFramePosString::REL_CHAR,          LB::RelChar,        RelOrientation::CHAR},
 
@@ -259,7 +261,7 @@ FrmMap const aHParaHtmlAbsMap[] =
 
 
 constexpr auto VERT_PARA_REL = LB::VertFrame|LB::VertPrintArea|
-                                      LB::RelPageFrame|LB::RelPagePrintArea|LB::RelPagePrintAreaBottom;
+                                      LB::RelPageFrame|LB::RelPagePrintArea| LB::RelPagePrintAreaTop |LB::RelPagePrintAreaBottom;
 
 FrmMap const aVParaMap[] =
 {
diff --git a/include/svx/swframeposstrings.hxx b/include/svx/swframeposstrings.hxx
index 346553c70ec8..2aca2f195fbb 100644
--- a/include/svx/swframeposstrings.hxx
+++ b/include/svx/swframeposstrings.hxx
@@ -49,6 +49,7 @@ public:
         MIR_REL_FRM_RIGHT          ,
         REL_PG_FRAME               ,
         REL_PG_PRTAREA             ,
+        REL_PG_PRTAREA_TOP         ,
         REL_PG_PRTAREA_BOTTOM      ,
         REL_BASE                   ,
         REL_CHAR                   ,
diff --git a/svx/inc/swframeposstrings.hrc b/svx/inc/swframeposstrings.hrc
index b08a9a3b525b..1d3da664b208 100644
--- a/svx/inc/swframeposstrings.hrc
+++ b/svx/inc/swframeposstrings.hrc
@@ -43,6 +43,7 @@ const char* RID_SVXSW_FRAMEPOSITIONS[] =
     NC_("RID_SVXSW_FRAMEPOSITIONS", "Outer paragraph border"),
     NC_("RID_SVXSW_FRAMEPOSITIONS", "Entire page"),
     NC_("RID_SVXSW_FRAMEPOSITIONS", "Page text area"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Page text area top"),
     NC_("RID_SVXSW_FRAMEPOSITIONS", "Page text area bottom"),
     NC_("RID_SVXSW_FRAMEPOSITIONS", "Base line"),
     NC_("RID_SVXSW_FRAMEPOSITIONS", "Character"),