diff options
author | Tor Lillqvist <tml@collabora.com> | 2017-02-16 16:20:18 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2017-02-16 16:59:39 +0200 |
commit | 7ecbffb3e4879d2fbcf6b20e57d37b8eb1efa660 (patch) | |
tree | b29ec993050ecf2950fcc5de78003555fe7d3c3c /sd | |
parent | ba0f920cc141eb6ab896f650e9ac7b25ffe073a5 (diff) |
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
Diffstat (limited to 'sd')
-rw-r--r-- | sd/inc/pres.hxx | 58 | ||||
-rw-r--r-- | sd/source/core/sdpage.cxx | 2 | ||||
-rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/controller/slidelayoutcontroller.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/func/fuexpand.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/func/fusumry.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/sidebar/LayoutMenu.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/outlview.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/viewshe3.cxx | 2 |
9 files changed, 13 insertions, 67 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, diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index e21b6fdce434..6ce90c921e50 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -1202,7 +1202,7 @@ static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout ) static const LayoutDescriptor aLayouts[AUTOLAYOUT_END-AUTOLAYOUT_START] = { LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_TEXT ), // AUTOLAYOUT_TITLE - LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_ENUM + LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TITLE_CONTENT LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_CHART LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2TEXT LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTCHART diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index d1ae32eb4e21..58917360fcc2 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -1095,12 +1095,12 @@ bool ImplSdPPTImport::Import() { case PptSlideLayout::TITLEANDBODYSLIDE : { - eAutoLayout = AUTOLAYOUT_ENUM; + eAutoLayout = AUTOLAYOUT_TITLE_CONTENT; PptPlaceholder nID1 = pSlideLayout->aPlaceholderId[ 1 ]; switch ( nID1 ) { case PptPlaceholder::BODY : - eAutoLayout = AUTOLAYOUT_ENUM; + eAutoLayout = AUTOLAYOUT_TITLE_CONTENT; break; case PptPlaceholder::TABLE : eAutoLayout = AUTOLAYOUT_TAB; @@ -1182,7 +1182,7 @@ bool ImplSdPPTImport::Import() eAutoLayout = AUTOLAYOUT_OBJ; break; case PptSlideLayout::TITLERIGHTBODYLEFT : - eAutoLayout = AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE; // AUTOLAYOUT_ENUM; + eAutoLayout = AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE; break; case PptSlideLayout::TITLERIGHT2BODIESLEFT : eAutoLayout = AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART; // AUTOLAYOUT_TEXT2OBJ; diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index ea56c4a8b6ac..9ecadb06b796 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -107,7 +107,7 @@ static const snewfoil_value_info_layout standard[] = { {BMP_LAYOUT_EMPTY, STR_AUTOLAYOUT_NONE, AUTOLAYOUT_NONE }, {BMP_LAYOUT_HEAD03, STR_AUTOLAYOUT_TITLE, AUTOLAYOUT_TITLE }, - {BMP_LAYOUT_HEAD02, STR_AUTOLAYOUT_CONTENT, AUTOLAYOUT_ENUM }, + {BMP_LAYOUT_HEAD02, STR_AUTOLAYOUT_CONTENT, AUTOLAYOUT_TITLE_CONTENT }, {BMP_LAYOUT_HEAD02A, STR_AUTOLAYOUT_2CONTENT, AUTOLAYOUT_2TEXT }, {BMP_LAYOUT_HEAD01, STR_AUTOLAYOUT_ONLY_TITLE, AUTOLAYOUT_ONLY_TITLE }, {BMP_LAYOUT_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT, AUTOLAYOUT_ONLY_TEXT }, diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx index 1adf9646cb91..11e3eba04e1e 100644 --- a/sd/source/ui/func/fuexpand.cxx +++ b/sd/source/ui/func/fuexpand.cxx @@ -152,7 +152,7 @@ void FuExpandPage::DoExecute( SfxRequest& ) // use MasterPage of the current page pPage->TRG_SetMasterPage(pActualPage->TRG_GetMasterPage()); pPage->SetLayoutName(pActualPage->GetLayoutName()); - pPage->SetAutoLayout(AUTOLAYOUT_ENUM, true); + pPage->SetAutoLayout(AUTOLAYOUT_TITLE_CONTENT, true); pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); // notes-page diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx index 4bde60a6503d..9dfef1a0dee0 100644 --- a/sd/source/ui/func/fusumry.cxx +++ b/sd/source/ui/func/fusumry.cxx @@ -133,7 +133,7 @@ void FuSummaryPage::DoExecute( SfxRequest& ) // use MasterPage of the current page pSummaryPage->TRG_SetMasterPage(pActualPage->TRG_GetMasterPage()); pSummaryPage->SetLayoutName(pActualPage->GetLayoutName()); - pSummaryPage->SetAutoLayout(AUTOLAYOUT_ENUM, true); + pSummaryPage->SetAutoLayout(AUTOLAYOUT_TITLE_CONTENT, true); pSummaryPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); pSummaryPage->setHeaderFooterSettings(pActualPage->getHeaderFooterSettings()); diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index c46f20741ce0..41230a57da72 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -101,7 +101,7 @@ static const snewfoil_value_info standard[] = { {BMP_LAYOUT_EMPTY, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE}, {BMP_LAYOUT_HEAD03, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE}, - {BMP_LAYOUT_HEAD02, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM}, + {BMP_LAYOUT_HEAD02, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TITLE_CONTENT}, {BMP_LAYOUT_HEAD02A, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2TEXT}, {BMP_LAYOUT_HEAD01, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE}, {BMP_LAYOUT_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT}, diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 9eda921bb7a9..c94cff433ff4 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -450,7 +450,7 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) if (eAutoLayout == AUTOLAYOUT_TITLE || eAutoLayout == AUTOLAYOUT_ONLY_TITLE) { - pPage->SetAutoLayout(AUTOLAYOUT_ENUM, true); + pPage->SetAutoLayout(AUTOLAYOUT_TITLE_CONTENT, true); } else { @@ -975,7 +975,7 @@ SdrTextObj* OutlineView::CreateOutlineTextObject(SdPage* pPage) { case AUTOLAYOUT_NONE: case AUTOLAYOUT_ONLY_TITLE: - case AUTOLAYOUT_TITLE: eNewLayout = AUTOLAYOUT_ENUM; break; + case AUTOLAYOUT_TITLE: eNewLayout = AUTOLAYOUT_TITLE_CONTENT; break; case AUTOLAYOUT_CHART: eNewLayout = AUTOLAYOUT_CHARTTEXT; break; diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index f769a3bf7da8..2f6c3c0aa381 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -234,7 +234,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( { eStandardLayout = pTemplatePage->GetAutoLayout(); if( eStandardLayout == AUTOLAYOUT_TITLE ) - eStandardLayout = AUTOLAYOUT_ENUM; + eStandardLayout = AUTOLAYOUT_TITLE_CONTENT; SdPage* pNotesTemplatePage = static_cast<SdPage*>(pDocument->GetPage(pTemplatePage->GetPageNum()+1)); if (pNotesTemplatePage != nullptr) |