From 1b3aa39339f0cf01ad5bd45806b18ea33faad5c4 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Tue, 21 Feb 2017 00:05:38 +0200
Subject: [PATCH] AutoLayout value 33 is "AUTOLAYOUT_4CLIPART" according to
 comments

Change-Id: I082dd08c1caf6f1585e3e16b441ba3b5a0d137f1
---
 include/xmloff/autolayout.hxx   | 2 +-
 xmloff/source/draw/sdxmlexp.cxx | 2 +-
 xmloff/source/draw/ximpstyl.cxx | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/xmloff/autolayout.hxx b/include/xmloff/autolayout.hxx
index 268aaac47d6d..2f1898a4790c 100644
--- a/include/xmloff/autolayout.hxx
+++ b/include/xmloff/autolayout.hxx
@@ -57,7 +57,7 @@ enum AutoLayout
     AUTOLAYOUT_TITLE_2VTEXT = 30,               ///< Title, 2 Vertical Content
     AUTOLAYOUT_HANDOUT9 = 31,
     AUTOLAYOUT_ONLY_TEXT = 32,                  ///< Centered Text
-    // 33 missing
+    AUTOLAYOUT_4CLIPART = 33,
     AUTOLAYOUT_TITLE_6CONTENT = 34,             ///< Title, 6 Content
     AUTOLAYOUT_END
 };
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 740784cd0d51..dec026c3089c 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -1108,7 +1108,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
                         break;
                     }
 
-                    case 33 : // AUTOLAYOUT_4CLIPART
+                    case AUTOLAYOUT_4CLIPART :
                     {
                         Rectangle aTopLeft(pInfo->GetPresRectangle());
                         aTopLeft.setHeight(long(aTopLeft.GetHeight() * 0.477));
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 8c60ec541109..68c95c0984e1 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -650,14 +650,14 @@ void SdXMLPresentationPageLayoutContext::EndElement()
                     }
                     else
                     {
-                        mnTypeId = 33; // AUTOLAYOUT_4CLIPART
+                        mnTypeId = AUTOLAYOUT_4CLIPART;
                     }
                      break;
 
                 }
                 case 7:
                 {
-                    mnTypeId = 33; // AUTOLAYOUT_6CLIPART (huh? 33 is not that)
+                    mnTypeId = AUTOLAYOUT_4CLIPART; // FIXME: not AUTOLAYOUT_TITLE_6CONTENT?
                     break;
                 }
                 default: