Replace some constexpr functions with static data members

(I leave the DOCUMENTBORDER TODO alone, as that one is of type long while
defDocumentBorder is of type sal_uInt16, so cleaning that up likely is a little
more effort.)

Change-Id: Ie9972e2f38b0ca9812e09f1c9d9fbded1046fda0

2 files changed, 2 insertions, 2 deletions

diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 666ea3c252eb..33d53347c605 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1291,7 +1291,7 @@ bool SwLayAction::FormatLayout( OutputDevice *pRenderContext, SwLayoutFrame *pLa
             {
                 const SwViewShell *pSh = pLay->getRootFrame()->GetCurrShell();
                 const SwTwips nHalfDocBorder = pSh ? pSh->GetViewOptions()->GetGapBetweenPages()
-                                                   : SwViewOption::GetDefGapBetweenPages();
+                                                   : SwViewOption::defGapBetweenPages;
                 const bool bLeftToRightViewLayout = m_pRoot->IsLeftToRightViewLayout();
                 const bool bPrev = bLeftToRightViewLayout ? pLay->GetPrev() : pLay->GetNext();
                 const bool bNext = bLeftToRightViewLayout ? pLay->GetNext() : pLay->GetPrev();
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index bb859f58cc62..170428358634 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1965,7 +1965,7 @@ void SwRootFrame::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* p
     const long nVisWidth = mnViewWidth - 2 * nBorder;
     const long nGapBetweenPages = pViewOpt ? pViewOpt->GetGapBetweenPages()
                                            : (pSh ? pSh->GetViewOptions()->GetGapBetweenPages()
-                                                  : SwViewOption::GetDefGapBetweenPages());
+                                                  : SwViewOption::defGapBetweenPages);
 
     // check how many pages fit into the first page layout row:
     SwPageFrame* pPageFrame = static_cast<SwPageFrame*>(Lower());