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

s/AUTOLAYOUT_OBJOVERTEXT/AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT

Browse Source 
Change-Id: Idf9771d3d58520a1a31cea45a6acca89347237f6
This commit is contained in:
Tor Lillqvist
2017-02-20 19:46:24 +02:00
parent 6c897c63f7
commit 056bb6f4f0
7 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/xmloff/autolayout.hxx
View File

@@ -52,7 +52,6 @@ enum AutoLayout
AUTOLAYOUT_TEXTOBJ = 10, AUTOLAYOUT_TEXTOBJ = 10,
AUTOLAYOUT_OBJ = 11, AUTOLAYOUT_OBJ = 11,
AUTOLAYOUT_OBJTEXT = 13, AUTOLAYOUT_OBJTEXT = 13,
AUTOLAYOUT_OBJOVERTEXT = 14,
AUTOLAYOUT_TEXTOVEROBJ = 17, AUTOLAYOUT_TEXTOVEROBJ = 17,
AUTOLAYOUT_4OBJ = 18, AUTOLAYOUT_4OBJ = 18,
AUTOLAYOUT_NOTES = 21, AUTOLAYOUT_NOTES = 21,

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

@@ -1215,7 +1215,7 @@ static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout )
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OBJECT ), // AUTOLAYOUT_OBJ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OBJECT ), // AUTOLAYOUT_OBJ
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TITLE_CONTENT_2CONTENT LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TITLE_CONTENT_2CONTENT
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOBJ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOBJ
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_OBJOVERTEXT LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TITLE_2CONTENT_CONTENT LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TITLE_2CONTENT_CONTENT
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOVEROBJ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOVEROBJ

2
sd/source/filter/ppt/pptin.cxx
View File

@@ -1156,7 +1156,7 @@ bool ImplSdPPTImport::Import()
if ( nID1 == PptPlaceholder::BODY && nID2 == PptPlaceholder::OBJECT ) if ( nID1 == PptPlaceholder::BODY && nID2 == PptPlaceholder::OBJECT )
eAutoLayout = AUTOLAYOUT_TEXTOVEROBJ; eAutoLayout = AUTOLAYOUT_TEXTOVEROBJ;
else if ( nID1 == PptPlaceholder::OBJECT && nID2 == PptPlaceholder::BODY ) else if ( nID1 == PptPlaceholder::OBJECT && nID2 == PptPlaceholder::BODY )
eAutoLayout = AUTOLAYOUT_OBJOVERTEXT; eAutoLayout = AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT;
} }
break; break;

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

@@ -114,7 +114,7 @@ static const snewfoil_value_info_layout standard[] =
{BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, AUTOLAYOUT_TITLE_2CONTENT_CONTENT }, {BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, AUTOLAYOUT_TITLE_2CONTENT_CONTENT },
{BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT, AUTOLAYOUT_TITLE_CONTENT_2CONTENT }, {BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT, AUTOLAYOUT_TITLE_CONTENT_2CONTENT },
{BMP_LAYOUT_HEAD03A, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT }, {BMP_LAYOUT_HEAD03A, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT },
{BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, AUTOLAYOUT_OBJOVERTEXT }, {BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT },
{BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, AUTOLAYOUT_4OBJ }, {BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, AUTOLAYOUT_4OBJ },
{BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, AUTOLAYOUT_6CLIPART }, {BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, AUTOLAYOUT_6CLIPART },
{0, 0, AUTOLAYOUT_NONE} {0, 0, AUTOLAYOUT_NONE}

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

@@ -108,7 +108,7 @@ static const snewfoil_value_info standard[] =
{BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TITLE_2CONTENT_CONTENT}, {BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TITLE_2CONTENT_CONTENT},
{BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TITLE_CONTENT_2CONTENT}, {BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TITLE_CONTENT_2CONTENT},
{BMP_LAYOUT_HEAD03A, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT}, {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_OBJOVERTEXT}, {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_4OBJ}, {BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ},
{BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART}, {BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART},

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

@@ -928,7 +928,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderOutline, aRight); ImpWriteAutoLayoutPlaceholder(XmlPlaceholderOutline, aRight);
break; break;
} }
case 14 : // AUTOLAYOUT_OBJOVERTEXT case AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT :
{ {
Rectangle aTop(pInfo->GetPresRectangle()); Rectangle aTop(pInfo->GetPresRectangle());
aTop.setHeight(long(aTop.GetHeight() * 0.477)); aTop.setHeight(long(aTop.GetHeight() * 0.477));

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

@@ -617,7 +617,7 @@ void SdXMLPresentationPageLayoutContext::EndElement()
} }
else else
{ {
mnTypeId = 14; // AUTOLAYOUT_OBJOVERTEXT -> top, bottom mnTypeId = AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT; // top, bottom
} }
} }
break; break;