[Libreoffice-commits] core.git: 3 commits - include/xmloff sd/source xmloff/source
Tor Lillqvist
tml at collabora.com
Mon Feb 20 22:21:28 UTC 2017
include/xmloff/autolayout.hxx | 32 +++++++-------
sd/source/core/sdpage.cxx | 2
sd/source/ui/controller/slidelayoutcontroller.cxx | 2
sd/source/ui/sidebar/LayoutMenu.cxx | 2
xmloff/source/draw/sdxmlexp.cxx | 47 ++++++++++------------
xmloff/source/draw/ximpstyl.cxx | 46 ++++++++++-----------
6 files changed, 64 insertions(+), 67 deletions(-)
New commits:
commit c72a91512caceec6b47ab397bc3514945af462d8
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Feb 21 00:14:01 2017 +0200
Use symbolic AUTOLAYOUT_* names
Change-Id: I76a23c99bf92f33ebea1e138ccb3e948dee5ab84
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index dec026c..5fb48ca 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -326,7 +326,7 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI
aLayoutSize.Width() = long( aLayoutSize.Width() * 0.854 );
aLayoutSize.Height() = long( aLayoutSize.Height() * 0.444 );
}
- else if((mnType >= 22 && mnType <= 26) || (mnType == 31)) // AUTOLAYOUT_HANDOUT
+ else if((mnType >= 22 && mnType <= 26) || (mnType == 31)) // AUTOLAYOUT_HANDOUT*
{
// keep info for inner area in maPresRect, put info for gap size
// to maTitleRect position
@@ -366,9 +366,8 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI
- (aClassicTSize.Height() + (aClassicLPos.Y() - (aClassicTPos.Y() + aClassicTSize.Height())));
aLayoutSize.Height() = (aClassicLPos.Y() + aClassicLSize.Height()) - aClassicTPos.Y();
}
- else if( mnType == 32 )
+ else if( mnType == AUTOLAYOUT_ONLY_TEXT )
{
- // AUTOLAYOUT_ONLY_TEXT
aLayoutPos = aTitlePos;
aLayoutSize.Width() = aTitleSize.Width();
aLayoutSize.Height() = long( aLayoutSize.Height() * 0.825 );
@@ -794,7 +793,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
// write presentation placeholders
switch(pInfo->GetLayoutType())
{
- case 0 : // AUTOLAYOUT_TITLE
+ case AUTOLAYOUT_TITLE :
{
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderSubtitle, pInfo->GetPresRectangle());
@@ -806,7 +805,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderOutline, pInfo->GetPresRectangle());
break;
}
- case 2 : // AUTOLAYOUT_CHART
+ case AUTOLAYOUT_CHART :
{
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderChart, pInfo->GetPresRectangle());
@@ -824,7 +823,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderOutline, aRight);
break;
}
- case 4 : // AUTOLAYOUT_TEXTCHART
+ case AUTOLAYOUT_TEXTCHART :
{
Rectangle aLeft(pInfo->GetPresRectangle());
aLeft.setWidth(long(aLeft.GetWidth() * 0.488));
@@ -836,7 +835,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderChart, aRight);
break;
}
- case 6 : // AUTOLAYOUT_TEXTCLIP
+ case AUTOLAYOUT_TEXTCLIP :
{
Rectangle aLeft(pInfo->GetPresRectangle());
aLeft.setWidth(long(aLeft.GetWidth() * 0.488));
@@ -848,7 +847,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aRight);
break;
}
- case 7 : // AUTOLAYOUT_CHARTTEXT
+ case AUTOLAYOUT_CHARTTEXT :
{
Rectangle aLeft(pInfo->GetPresRectangle());
aLeft.setWidth(long(aLeft.GetWidth() * 0.488));
@@ -860,13 +859,13 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderOutline, aRight);
break;
}
- case 8 : // AUTOLAYOUT_TAB
+ case AUTOLAYOUT_TAB :
{
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTable, pInfo->GetPresRectangle());
break;
}
- case 9 : // AUTOLAYOUT_CLIPTEXT
+ case AUTOLAYOUT_CLIPTEXT :
{
Rectangle aLeft(pInfo->GetPresRectangle());
aLeft.setWidth(long(aLeft.GetWidth() * 0.488));
@@ -878,7 +877,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderOutline, aRight);
break;
}
- case 10 : // AUTOLAYOUT_TEXTOBJ
+ case AUTOLAYOUT_TEXTOBJ :
{
Rectangle aLeft(pInfo->GetPresRectangle());
aLeft.setWidth(long(aLeft.GetWidth() * 0.488));
@@ -890,7 +889,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderObject, aRight);
break;
}
- case 11 : // AUTOLAYOUT_OBJ
+ case AUTOLAYOUT_OBJ :
{
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderObject, pInfo->GetPresRectangle());
@@ -912,7 +911,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderObject, aRightBottom);
break;
}
- case 13 : // AUTOLAYOUT_OBJTEXT
+ case AUTOLAYOUT_OBJTEXT :
{
Rectangle aLeft(pInfo->GetPresRectangle());
aLeft.setWidth(long(aLeft.GetWidth() * 0.488));
@@ -968,7 +967,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderOutline, aBottom);
break;
}
- case 17 : // AUTOLAYOUT_TEXTOVEROBJ
+ case AUTOLAYOUT_TEXTOVEROBJ :
{
Rectangle aTop(pInfo->GetPresRectangle());
aTop.setHeight(long(aTop.GetHeight() * 0.477));
@@ -1004,18 +1003,18 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
break;
}
- case 21 : // AUTOLAYOUT_NOTES
+ case AUTOLAYOUT_NOTES :
{
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderPage, pInfo->GetTitleRectangle());
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderNotes, pInfo->GetPresRectangle());
break;
}
- case 22 : // AUTOLAYOUT_HANDOUT1
- case 23 : // AUTOLAYOUT_HANDOUT2
- case 24 : // AUTOLAYOUT_HANDOUT3
- case 25 : // AUTOLAYOUT_HANDOUT4
- case 26 : // AUTOLAYOUT_HANDOUT6
- case 31 : // AUTOLAYOUT_HANDOUT9
+ case AUTOLAYOUT_HANDOUT1 :
+ case AUTOLAYOUT_HANDOUT2 :
+ case AUTOLAYOUT_HANDOUT3 :
+ case AUTOLAYOUT_HANDOUT4 :
+ case AUTOLAYOUT_HANDOUT6 :
+ case AUTOLAYOUT_HANDOUT9 :
{
sal_Int32 nColCnt, nRowCnt;
sal_Int32 nGapX = pInfo->GetGapX();
@@ -1102,7 +1101,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderVerticalOutline, aRight);
break;
}
- case 32 : // AUTOLAYOUT_TITLE
+ case AUTOLAYOUT_ONLY_TEXT :
{
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderSubtitle, pInfo->GetPresRectangle());
break;
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 68c95c0..88efe5b 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -423,7 +423,7 @@ SdXMLPresentationPageLayoutContext::SdXMLPresentationPageLayoutContext(
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList)
: SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_SD_PRESENTATIONPAGELAYOUT_ID),
- mnTypeId( 20 ) // AUTOLAYOUT_NONE
+ mnTypeId( AUTOLAYOUT_NONE )
{
// set family to something special at SvXMLStyleContext
// for differences in search-methods
@@ -480,22 +480,22 @@ void SdXMLPresentationPageLayoutContext::EndElement()
switch( maList.size() )
{
case 1:
- mnTypeId = 22; // AUTOLAYOUT_HANDOUT1
+ mnTypeId = AUTOLAYOUT_HANDOUT1;
break;
case 2:
- mnTypeId = 23; // AUTOLAYOUT_HANDOUT2
+ mnTypeId = AUTOLAYOUT_HANDOUT2;
break;
case 3:
- mnTypeId = 24; // AUTOLAYOUT_HANDOUT3
+ mnTypeId = AUTOLAYOUT_HANDOUT3;
break;
case 4:
- mnTypeId = 25; // AUTOLAYOUT_HANDOUT4
+ mnTypeId = AUTOLAYOUT_HANDOUT4;
break;
case 9:
- mnTypeId = 31; // AUTOLAYOUT_HANDOUT9
+ mnTypeId = AUTOLAYOUT_HANDOUT9;
break;
default:
- mnTypeId = 26; // AUTOLAYOUT_HANDOUT6
+ mnTypeId = AUTOLAYOUT_HANDOUT6;
}
}
else
@@ -510,7 +510,7 @@ void SdXMLPresentationPageLayoutContext::EndElement()
}
else
{
- mnTypeId = 32; // AUTOLAYOUT_ONLY_TEXT
+ mnTypeId = AUTOLAYOUT_ONLY_TEXT;
}
break;
}
@@ -520,7 +520,7 @@ void SdXMLPresentationPageLayoutContext::EndElement()
if( pObj1->GetName() == "subtitle" )
{
- mnTypeId = 0; // AUTOLAYOUT_TITLE
+ mnTypeId = AUTOLAYOUT_TITLE;
}
else if( pObj1->GetName() == "outline" )
{
@@ -528,15 +528,15 @@ void SdXMLPresentationPageLayoutContext::EndElement()
}
else if( pObj1->GetName() == "chart" )
{
- mnTypeId = 2; // AUTOLAYOUT_CHART
+ mnTypeId = AUTOLAYOUT_CHART;
}
else if( pObj1->GetName() == "table" )
{
- mnTypeId = 8; // AUTOLAYOUT_TAB
+ mnTypeId = AUTOLAYOUT_TAB;
}
else if( pObj1->GetName() == "object" )
{
- mnTypeId = 11; // AUTOLAYOUT_OBJ
+ mnTypeId = AUTOLAYOUT_OBJ;
}
else if( pObj1->GetName() == "vertical_outline" )
{
@@ -551,7 +551,7 @@ void SdXMLPresentationPageLayoutContext::EndElement()
}
else
{
- mnTypeId = 21; // AUTOLAYOUT_NOTES
+ mnTypeId = AUTOLAYOUT_NOTES;
}
break;
}
@@ -568,27 +568,27 @@ void SdXMLPresentationPageLayoutContext::EndElement()
}
else if( pObj2->GetName() == "chart" )
{
- mnTypeId = 4; // AUTOLAYOUT_TEXTCHART
+ mnTypeId = AUTOLAYOUT_TEXTCHART;
}
else if( pObj2->GetName() == "graphic" )
{
- mnTypeId = 6; // AUTOLAYOUT_TEXTCLIP
+ mnTypeId = AUTOLAYOUT_TEXTCLIP;
}
else
{
if(pObj1->GetX() < pObj2->GetX())
{
- mnTypeId = 10; // AUTOLAYOUT_TEXTOBJ -> outline left, object right
+ mnTypeId = AUTOLAYOUT_TEXTOBJ; // outline left, object right
}
else
{
- mnTypeId = 17; // AUTOLAYOUT_TEXTOVEROBJ -> outline top, object right
+ mnTypeId = AUTOLAYOUT_TEXTOVEROBJ; // outline top, object right
}
}
}
else if( pObj1->GetName() == "chart" )
{
- mnTypeId = 7; // AUTOLAYOUT_CHARTTEXT
+ mnTypeId = AUTOLAYOUT_CHARTTEXT;
}
else if( pObj1->GetName() == "graphic" )
{
@@ -598,7 +598,7 @@ void SdXMLPresentationPageLayoutContext::EndElement()
}
else
{
- mnTypeId = 9; // AUTOLAYOUT_CLIPTEXT
+ mnTypeId = AUTOLAYOUT_CLIPTEXT;
}
}
else if( pObj1->GetName() == "vertical_outline" )
@@ -609,7 +609,7 @@ void SdXMLPresentationPageLayoutContext::EndElement()
{
if(pObj1->GetX() < pObj2->GetX())
{
- mnTypeId = 13; // AUTOLAYOUT_OBJTEXT -> left, right
+ mnTypeId = AUTOLAYOUT_OBJTEXT; // left, right
}
else
{
@@ -662,7 +662,7 @@ void SdXMLPresentationPageLayoutContext::EndElement()
}
default:
{
- mnTypeId = 20; // AUTOLAYOUT_NONE
+ mnTypeId = AUTOLAYOUT_NONE;
break;
}
}
commit 1b3aa39339f0cf01ad5bd45806b18ea33faad5c4
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Feb 21 00:05:38 2017 +0200
AutoLayout value 33 is "AUTOLAYOUT_4CLIPART" according to comments
Change-Id: I082dd08c1caf6f1585e3e16b441ba3b5a0d137f1
diff --git a/include/xmloff/autolayout.hxx b/include/xmloff/autolayout.hxx
index 268aaac..2f1898a 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 740784c..dec026c 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 8c60ec5..68c95c0 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:
commit 5afef8d53134ae7cefdada93e32b3e94d90d4c98
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Feb 20 23:25:44 2017 +0200
s/AUTOLAYOUT_6CLIPART/AUTOLAYOUT_TITLE_6CONTENT/, and sort
Need to sort in this commit so that the AUTOLAYOUT_END keeps being one
more than the highest-valued enumerator.
Change-Id: I0db7c8ba069808e92589d5c4688632440007163b
diff --git a/include/xmloff/autolayout.hxx b/include/xmloff/autolayout.hxx
index 8955f787..268aaac 100644
--- a/include/xmloff/autolayout.hxx
+++ b/include/xmloff/autolayout.hxx
@@ -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
};
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index e8e14bf..15e35df 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -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 )
};
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 7c2b43e..db34b25 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -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}
};
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 5ab2633..73f7daf 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -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},
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 3c0b440..740784c 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -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));
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 721530c..8c60ec5 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -657,7 +657,7 @@ void SdXMLPresentationPageLayoutContext::EndElement()
}
case 7:
{
- mnTypeId = 33; // AUTOLAYOUT_6CLIPART
+ mnTypeId = 33; // AUTOLAYOUT_6CLIPART (huh? 33 is not that)
break;
}
default:
More information about the Libreoffice-commits
mailing list