Move AutoLayout enum definition to its own file, and start de-duplicating it

The mysteriously named AUTOLAYOUT_ENUM had the same value as
AUTOLAYOUT_TITLE_CONTENT, and was marked as "deprecated", so just use
the latter instead. Use it also in xmloff instead of the magic number
1 in places where comments indicated that AUTOLAYOYT_ENUM was what the
1 meant.

Will continue with the other "deprecated" and duplicated enumerators
later. (Or you feel free.)

Change-Id: Id5d70e07d30b3bf0d62e5d8719edb784bd23f99d

1 files changed, 2 insertions, 56 deletions

diff --git a/sd/inc/pres.hxx b/sd/inc/pres.hxx
index c43eb8f076ab..242091979850 100644
--- a/sd/inc/pres.hxx
+++ b/sd/inc/pres.hxx
@@ -19,6 +19,8 @@
 #ifndef INCLUDED_SD_INC_PRES_HXX
 #define INCLUDED_SD_INC_PRES_HXX
 
+#include <xmloff/autolayout.hxx>
+
 enum PresObjKind
 {
     PRESOBJ_NONE = 0,
@@ -43,62 +45,6 @@ enum PresObjKind
     PRESOBJ_MAX
 };
 
-enum AutoLayout
-{
-    // new layouts with enum/text/chart/org/clip merged to content
-    AUTOLAYOUT_START = 0,
-    AUTOLAYOUT_TITLE = 0,                       ///< Title Slide
-    AUTOLAYOUT_TITLE_CONTENT = 1,               ///< Title, Content
-    AUTOLAYOUT_TITLE_2CONTENT = 3,              ///< Title and 2 Content
-    AUTOLAYOUT_TITLE_ONLY = 19,                 ///< Title Only
-    AUTOLAYOUT_NONE = 20,                       ///< Blank Slide
-    AUTOLAYOUT_ONLY_TEXT = 32,                  ///< Centered Text
-    AUTOLAYOUT_TITLE_CONTENT_2CONTENT = 12,     ///< Title, Content and 2 Content
-    AUTOLAYOUT_TITLE_2CONTENT_CONTENT = 15,     ///< Title, 2 Content and Content
-    AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT = 16,///< Title, 2 Content over Content
-    AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT = 14, ///< Title, Content over Content
-    AUTOLAYOUT_TITLE_4CONTENT = 18,             ///< Title, 4 Content
-    AUTOLAYOUT_TITLE_6CONTENT = 34,             ///< Title, 6 Content
-    AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT = 27, ///< Vertical Title, Vertical Content over Vertical Content
-    AUTOLAYOUT_VTITLE_VCONTENT = 28,            ///< Vertical Title, Vertical Content over Vertical Content
-    AUTOLAYOUT_TITLE_VCONTENT = 29,             ///< Title, Vertical Content
-    AUTOLAYOUT_TITLE_2VTEXT = 30,               ///< Title, 2 Vertical Content
-
-    // deprecated
-    AUTOLAYOUT_ENUM = 1,
-    AUTOLAYOUT_CHART = 2,
-    AUTOLAYOUT_2TEXT = 3,
-    AUTOLAYOUT_TEXTCHART = 4,
-    AUTOLAYOUT_ORG = 5,
-    AUTOLAYOUT_TEXTCLIP = 6,
-    AUTOLAYOUT_CHARTTEXT = 7,
-    AUTOLAYOUT_TAB = 8,
-    AUTOLAYOUT_CLIPTEXT = 9,
-    AUTOLAYOUT_TEXTOBJ = 10,
-    AUTOLAYOUT_OBJ = 11,
-    AUTOLAYOUT_TEXT2OBJ = 12,
-    AUTOLAYOUT_OBJTEXT = 13,
-    AUTOLAYOUT_OBJOVERTEXT = 14,
-    AUTOLAYOUT_2OBJTEXT = 15,
-    AUTOLAYOUT_2OBJOVERTEXT = 16,
-    AUTOLAYOUT_TEXTOVEROBJ = 17,
-    AUTOLAYOUT_4OBJ = 18,
-    AUTOLAYOUT_ONLY_TITLE = 19,
-    AUTOLAYOUT_NOTES = 21,
-    AUTOLAYOUT_HANDOUT1 = 22,
-    AUTOLAYOUT_HANDOUT2 = 23,
-    AUTOLAYOUT_HANDOUT3 = 24,
-    AUTOLAYOUT_HANDOUT4 = 25,
-    AUTOLAYOUT_HANDOUT6 = 26,
-    AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART = 27,
-    AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE = 28,
-    AUTOLAYOUT_TITLE_VERTICAL_OUTLINE = 29,
-    AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART = 30,
-    AUTOLAYOUT_HANDOUT9 = 31,
-    AUTOLAYOUT_6CLIPART = 34,
-    AUTOLAYOUT_END
-};
-
 enum class PageKind
 {
     Standard,