summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/xmloff/autolayout.hxx1
-rw-r--r--sd/source/core/sdpage.cxx2
-rw-r--r--sd/source/filter/ppt/pptin.cxx2
-rw-r--r--sd/source/ui/controller/slidelayoutcontroller.cxx2
-rw-r--r--sd/source/ui/sidebar/LayoutMenu.cxx2
-rw-r--r--xmloff/source/draw/sdxmlexp.cxx8
-rw-r--r--xmloff/source/draw/ximpstyl.cxx3
7 files changed, 8 insertions, 12 deletions
diff --git a/include/xmloff/autolayout.hxx b/include/xmloff/autolayout.hxx
index c7df5849498d..46785337dbb3 100644
--- a/include/xmloff/autolayout.hxx
+++ b/include/xmloff/autolayout.hxx
@@ -59,7 +59,6 @@ enum AutoLayout
AUTOLAYOUT_HANDOUT3 = 24,
AUTOLAYOUT_HANDOUT4 = 25,
AUTOLAYOUT_HANDOUT6 = 26,
- AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE = 28,
AUTOLAYOUT_TITLE_VERTICAL_OUTLINE = 29,
AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART = 30,
AUTOLAYOUT_HANDOUT9 = 31,
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 6ed228f40fe3..f409af88156f 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1231,7 +1231,7 @@ static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout )
LayoutDescriptor( ), // AUTOLAYOUT_HANDOUT4
LayoutDescriptor( ), // AUTOLAYOUT_HANDOUT6
LayoutDescriptor( PRESOBJ_TITLE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL, PRESOBJ_OUTLINE ),// AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT
- LayoutDescriptor( PRESOBJ_TITLE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE
+ LayoutDescriptor( PRESOBJ_TITLE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_VTITLE_VCONTENT
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART
LayoutDescriptor( ), // AUTOLAYOUT_HANDOUT9
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 3da8bdc6f730..fb316805373f 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1184,7 +1184,7 @@ bool ImplSdPPTImport::Import()
eAutoLayout = AUTOLAYOUT_OBJ;
break;
case PptSlideLayout::TITLERIGHTBODYLEFT :
- eAutoLayout = AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE;
+ eAutoLayout = AUTOLAYOUT_VTITLE_VCONTENT;
break;
case PptSlideLayout::TITLERIGHT2BODIESLEFT :
eAutoLayout = AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT;
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index b0d5a7049ce2..e83295eb6b76 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -126,7 +126,7 @@ static const snewfoil_value_info_layout v_standard[] =
{
// vertical
{BMP_LAYOUT_VERTICAL02, STR_AL_VERT_TITLE_TEXT_CHART, AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT },
- {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE },
+ {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE, AUTOLAYOUT_VTITLE_VCONTENT },
{BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE },
{BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART },
{0, 0, AUTOLAYOUT_NONE}
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 29953072f0d5..670b96be48b2 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -115,7 +115,7 @@ static const snewfoil_value_info standard[] =
// vertical
{BMP_LAYOUT_VERTICAL02, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL, AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT},
- {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE},
+ {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VTITLE_VCONTENT},
{BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE},
{BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART},
{0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 51ac23ed72d4..71fe46bf35a6 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -282,9 +282,8 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI
aTitlePos = aPos;
aTitleSize = aSize;
}
- else if(mnType == AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT || mnType == 28)
+ else if(mnType == AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT || mnType == AUTOLAYOUT_VTITLE_VCONTENT)
{
- // or AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE
Point aClassicTPos(
aTitlePos.X() + long( aTitleSize.Width() * 0.0735 ),
aTitlePos.Y() + long( aTitleSize.Height() * 0.083 ));
@@ -346,9 +345,8 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI
if(mnGapY < aPageInnerSize.Height() / 10)
mnGapY = aPageInnerSize.Height() / 10;
}
- else if(mnType == AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT || mnType == 28)
+ else if(mnType == AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT || mnType == AUTOLAYOUT_VTITLE_VCONTENT)
{
- // or AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE
Point aClassicTPos(
aTitlePos.X() + long( aTitleSize.Width() * 0.0735 ),
aTitlePos.Y() + long( aTitleSize.Height() * 0.083 ));
@@ -1080,7 +1078,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderChart, aBottom);
break;
}
- case 28 : // AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE
+ case AUTOLAYOUT_VTITLE_VCONTENT :
{
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderVerticalTitle, pInfo->GetTitleRectangle());
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderVerticalOutline, pInfo->GetPresRectangle());
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index db06f6ee6456..aa996780b1d9 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -542,8 +542,7 @@ void SdXMLPresentationPageLayoutContext::EndElement()
{
if( pObj0->GetName() == "vertical_title" )
{
- // AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE
- mnTypeId = 28;
+ mnTypeId = AUTOLAYOUT_VTITLE_VCONTENT;
}
else
{
generated by cgit (git 2.34.1) at 2025-02-07 19:47:59 +0000