[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-2' - sd/source

[Noel Grandin]

 sd/source/core/sdpage.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 31423b7d44216606cac52ebaf4eab02f469c478f
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Tue Oct 3 10:43:00 2017 +0200

    tdf#112836 master view, bottom areas are wrongly positioned
    
    Bug was introduced in
        commit 12b2803f196b897ffb901b0eebe271c5ee43d03e
        "drop unused PRESOBJ_IMAGE"
    
    Change-Id: I50be74b505a674439bd8b67545b89a9660a85a33
    Reviewed-on: https://gerrit.libreoffice.org/43062
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit d352dda3dbfc9e26b7f80746e1502f3cb4cd45c1)
    Reviewed-on: https://gerrit.libreoffice.org/43068
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 6cb7963bcacd..94be400fd3b6 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -903,7 +903,7 @@ const char* const PresObjKindVector[] = {
     "PRESOBJ_NONE", "PRESOBJ_TITLE", "PRESOBJ_OUTLINE",
     "PRESOBJ_TEXT" ,"PRESOBJ_GRAPHIC" , "PRESOBJ_OBJECT",
     "PRESOBJ_CHART", "PRESOBJ_ORGCHART", "PRESOBJ_TABLE",
-    "PRESOBJ_IMAGE", "PRESOBJ_PAGE", "PRESOBJ_HANDOUT",
+    "PRESOBJ_PAGE", "PRESOBJ_HANDOUT",
     "PRESOBJ_NOTES","PRESOBJ_HEADER", "PRESOBJ_FOOTER",
     "PRESOBJ_DATETIME", "PRESOBJ_SLIDENUMBER", "PRESOBJ_CALC",
     "PRESOBJ_MEDIA", "PRESOBJ_MAX"