include/svx/swframetypes.hxx | 2 --
sw/source/core/doc/DocumentLayoutManager.cxx | 8 +-------
2 files changed, 1 insertion(+), 9 deletions(-)
New commits:
commit a8e818392d9129f74e751e1db0278cc314722208
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Apr 25 10:53:30 2017 +0200
FOOTERL and FOOTERR are write-only
Change-Id: I65ed01d0bf10409282d9fe5087f5ea84cb084ddc
Reviewed-on: https://gerrit.libreoffice.org/36932
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/svx/swframetypes.hxx b/include/svx/swframetypes.hxx
index 9aa2f8189b8a..34cab05c4b9e 100644
--- a/include/svx/swframetypes.hxx
+++ b/include/svx/swframetypes.hxx
@@ -39,8 +39,6 @@ enum class RndStdIds
FOOTER,
HEADERL,
HEADERR,
- FOOTERL,
- FOOTERR,
DRAW_OBJECT // A draw-Object! For the SwDoc-interface only!
};
diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx
b/sw/source/core/doc/DocumentLayoutManager.cxx
index 55d0192c9775..7c3589a156dd 100644
--- a/sw/source/core/doc/DocumentLayoutManager.cxx
+++ b/sw/source/core/doc/DocumentLayoutManager.cxx
@@ -123,8 +123,6 @@ SwFrameFormat *DocumentLayoutManager::MakeLayoutFormat(
RndStdIds eRequest, cons
SAL_FALLTHROUGH;
}
case RndStdIds::FOOTER:
- case RndStdIds::FOOTERL:
- case RndStdIds::FOOTERR:
{
pFormat = new SwFrameFormat( m_rDoc.GetAttrPool(),
(bHeader ? "Right header" : "Right footer"),
@@ -141,11 +139,7 @@ SwFrameFormat *DocumentLayoutManager::MakeLayoutFormat(
RndStdIds eRequest, cons
: eRequest == RndStdIds::HEADERR
? RES_POOLCOLL_HEADERR
: RES_POOLCOLL_HEADER )
- : ( eRequest == RndStdIds::FOOTERL
- ? RES_POOLCOLL_FOOTERL
- : eRequest == RndStdIds::FOOTERR
- ? RES_POOLCOLL_FOOTERR
- : RES_POOLCOLL_FOOTER )
+ : RES_POOLCOLL_FOOTER
) ) );
pFormat->SetFormatAttr( SwFormatContent( pSttNd ));
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
