mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s/AUTOLAYOUT_6CLIPART/AUTOLAYOUT_TITLE_6CONTENT/, and sort

Browse Source 
Need to sort in this commit so that the AUTOLAYOUT_END keeps being one
more than the highest-valued enumerator.

Change-Id: I0db7c8ba069808e92589d5c4688632440007163b
This commit is contained in:
Tor Lillqvist 2017-02-20 23:25:44 +02:00
parent 3ec3d7ead0
commit 5afef8d531
6 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
include/xmloff/autolayout.hxx
View File

@ -26,23 +26,8 @@ enum AutoLayout
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_CHART = 2,
AUTOLAYOUT_TITLE_2CONTENT = 3, ///< Title and 2 Content
AUTOLAYOUT_TEXTCHART = 4,
AUTOLAYOUT_ORG = 5,
AUTOLAYOUT_TEXTCLIP = 6,
@ -51,16 +36,29 @@ enum AutoLayout
AUTOLAYOUT_CLIPTEXT = 9,
AUTOLAYOUT_TEXTOBJ = 10,
AUTOLAYOUT_OBJ = 11,
AUTOLAYOUT_TITLE_CONTENT_2CONTENT = 12, ///< Title, Content and 2 Content
AUTOLAYOUT_OBJTEXT = 13,
AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT = 14, ///< Title, Content over Content
AUTOLAYOUT_TITLE_2CONTENT_CONTENT = 15, ///< Title, 2 Content and Content
AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT = 16,///< Title, 2 Content over Content
AUTOLAYOUT_TEXTOVEROBJ = 17,
AUTOLAYOUT_TITLE_4CONTENT = 18, ///< Title, 4 Content
AUTOLAYOUT_TITLE_ONLY = 19, ///< Title Only
AUTOLAYOUT_NONE = 20, ///< Blank Slide
AUTOLAYOUT_NOTES = 21,
AUTOLAYOUT_HANDOUT1 = 22,
AUTOLAYOUT_HANDOUT2 = 23,
AUTOLAYOUT_HANDOUT3 = 24,
AUTOLAYOUT_HANDOUT4 = 25,
AUTOLAYOUT_HANDOUT6 = 26,
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
AUTOLAYOUT_HANDOUT9 = 31,
AUTOLAYOUT_6CLIPART = 34,
AUTOLAYOUT_ONLY_TEXT = 32, ///< Centered Text
// 33 missing
AUTOLAYOUT_TITLE_6CONTENT = 34, ///< Title, 6 Content
AUTOLAYOUT_END
};

2
sd/source/core/sdpage.cxx
View File

@ -1238,7 +1238,7 @@ static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout )
LayoutDescriptor( PRESOBJ_TEXT, PRESOBJ_NONE ), // AUTOLAYOUT_ONLY_TEXT
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_4CLIPART
PRESOBJ_GRAPHIC, PRESOBJ_GRAPHIC ),
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_6CLIPART
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_TITLE_6CONTENT
PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE )
};

2
sd/source/ui/controller/slidelayoutcontroller.cxx
View File

@ -118,7 +118,7 @@ static const snewfoil_value_info_layout standard[] =
{BMP_LAYOUT_HEAD03A, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT },
{BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT },
{BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, AUTOLAYOUT_TITLE_4CONTENT },
{BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, AUTOLAYOUT_6CLIPART },
{BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, AUTOLAYOUT_TITLE_6CONTENT },
{0, 0, AUTOLAYOUT_NONE}
};

2
sd/source/ui/sidebar/LayoutMenu.cxx
View File

@ -111,7 +111,7 @@ static const snewfoil_value_info standard[] =
{BMP_LAYOUT_HEAD03A, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT},
{BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT},
{BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TITLE_4CONTENT},
{BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART},
{BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TITLE_6CONTENT},
// vertical
{BMP_LAYOUT_VERTICAL02, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL, AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT},

2
xmloff/source/draw/sdxmlexp.cxx
View File

@ -1128,7 +1128,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
break;
}
case 34 : // AUTOLAYOUT_6CLIPART
case AUTOLAYOUT_TITLE_6CONTENT :
{
Rectangle aTopLeft(pInfo->GetPresRectangle());
aTopLeft.setHeight(long(aTopLeft.GetHeight() * 0.477));

2
xmloff/source/draw/ximpstyl.cxx
View File

@ -657,7 +657,7 @@ void SdXMLPresentationPageLayoutContext::EndElement()
}
case 7:
{
mnTypeId = 33; // AUTOLAYOUT_6CLIPART
mnTypeId = 33; // AUTOLAYOUT_6CLIPART (huh? 33 is not that)
break;
}
default: