tdf#91920 sw page gutter margin, from top: add layout

Take the new doc setting into account and if it's true, then undo the
existing "increase left margin" logic, and do an "increase top margin"
one instead.

(cherry picked from commit 59e816faa2a2bc0b88c39f063c53e00a33f23722)

Conflicts:
	sw/source/core/layout/paintfrm.cxx

Change-Id: I358a34790a52e2720ec23e6841d56e66858e28b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110640
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

1 files changed, 9 insertions, 1 deletions

diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index da8731a400d1..6563256804f9 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -1269,11 +1269,19 @@ static void lcl_CalcBorderRect( SwRect &rRect, const SwFrame *pFrame,
         if (pFrame->IsPageFrame() && rAttrs.GetLRSpace())
         {
             long nGutterMargin = rAttrs.GetLRSpace()->GetGutterMargin();
-            if (nGutterMargin)
+            const auto pPageFrame = static_cast<const SwPageFrame*>(pFrame);
+            bool bGutterAtTop = pPageFrame->GetFormat()->getIDocumentSettingAccess().get(
+                DocumentSettingId::GUTTER_AT_TOP);
+            if (nGutterMargin && !bGutterAtTop)
             {
                 // Paint the left border based on the left margin, ignoring the gutter margin.
                 (rRect.*fnRect->fnSubLeft)(nGutterMargin);
             }
+            else if (nGutterMargin)
+            {
+                // Paint the top border based on the top margin, ignoring the gutter margin.
+                (rRect.*fnRect->fnSubTop)(nGutterMargin);
+            }
         }
 
         const SvxBoxItem &rBox = rAttrs.GetBox();