include/xmloff/autolayout.hxx | 5 ----- sd/source/core/sdpage.cxx | 10 +++++----- sd/source/filter/ppt/pptin.cxx | 10 +++++----- sd/source/ui/controller/slidelayoutcontroller.cxx | 10 +++++----- sd/source/ui/sidebar/LayoutMenu.cxx | 10 +++++----- xmloff/source/draw/sdxmlexp.cxx | 18 +++++++----------- xmloff/source/draw/ximpstyl.cxx | 14 +++++--------- 7 files changed, 32 insertions(+), 45 deletions(-)
New commits: commit 1324b7f1ce136cb3de617ee72b30468c8717aed9 Author: Tor Lillqvist <t...@collabora.com> Date: Mon Feb 20 22:52:14 2017 +0200 s/AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART/AUTOLAYOUT_TITLE_2VTEXT Change-Id: Ie20c4539b8b66b1e9b40015e6bc611d5bc12ddb4 diff --git a/include/xmloff/autolayout.hxx b/include/xmloff/autolayout.hxx index c567bea..8955f787 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_TITLE_VERTICAL_OUTLINE_CLIPART = 30, AUTOLAYOUT_HANDOUT9 = 31, AUTOLAYOUT_6CLIPART = 34, AUTOLAYOUT_END diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index b7e5525..e8e14bf 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -1233,7 +1233,7 @@ static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout ) LayoutDescriptor( PRESOBJ_TITLE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL, PRESOBJ_OUTLINE ),// AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT LayoutDescriptor( PRESOBJ_TITLE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_VTITLE_VCONTENT LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_TITLE_VCONTENT - LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART + LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_TITLE_2VTEXT LayoutDescriptor( ), // AUTOLAYOUT_HANDOUT9 LayoutDescriptor( PRESOBJ_TEXT, PRESOBJ_NONE ), // AUTOLAYOUT_ONLY_TEXT LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_4CLIPART diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index b51485b..0fdf57c 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -1138,7 +1138,7 @@ bool ImplSdPPTImport::Import() else if ( nID1 == PptPlaceholder::CLIPART && nID2 == PptPlaceholder::BODY ) eAutoLayout = AUTOLAYOUT_CLIPTEXT; else if ( nID1 == PptPlaceholder::CLIPART && nID2 == PptPlaceholder::VERTICALTEXTBODY ) - eAutoLayout = AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART; + eAutoLayout = AUTOLAYOUT_TITLE_2VTEXT; else if ( ( nID1 == PptPlaceholder::BODY ) && ( ( nID2 == PptPlaceholder::OBJECT ) || ( nID2 == PptPlaceholder::MEDIACLIP ) ) ) eAutoLayout = AUTOLAYOUT_TEXTOBJ; diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 1c470b8..7c2b43e 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -128,7 +128,7 @@ static const snewfoil_value_info_layout v_standard[] = {BMP_LAYOUT_VERTICAL02, STR_AL_VERT_TITLE_TEXT_CHART, AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT }, {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE, AUTOLAYOUT_VTITLE_VCONTENT }, {BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, AUTOLAYOUT_TITLE_VCONTENT }, - {BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART }, + {BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART, AUTOLAYOUT_TITLE_2VTEXT }, {0, 0, AUTOLAYOUT_NONE} }; diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 0b3e39f..5ab2633 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -117,7 +117,7 @@ static const snewfoil_value_info standard[] = {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_VTITLE_VCONTENT}, {BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VCONTENT}, - {BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART}, + {BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_2VTEXT}, {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} }; diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index e0086af..3c0b440 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -1090,7 +1090,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos() ImpWriteAutoLayoutPlaceholder(XmlPlaceholderVerticalOutline, pInfo->GetPresRectangle()); break; } - case 30 : // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART + case AUTOLAYOUT_TITLE_2VTEXT : { Rectangle aLeft(pInfo->GetPresRectangle()); aLeft.setWidth(long(aLeft.GetWidth() * 0.488)); diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index 100b1fe..721530c 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -594,8 +594,7 @@ void SdXMLPresentationPageLayoutContext::EndElement() { if( pObj2->GetName() == "vertical_outline" ) { - // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART - mnTypeId = 30; + mnTypeId = AUTOLAYOUT_TITLE_2VTEXT; } else { commit 56917ba7ca0f601b64768351c1daf9205376ec9f Author: Tor Lillqvist <t...@collabora.com> Date: Mon Feb 20 22:49:48 2017 +0200 s/AUTOLAYOUT_TITLE_VERTICAL_OUTLINE/AUTOLAYOUT_TITLE_VCONTENT Change-Id: I6186a2583dff2b142ceee1c4f2c7f0c972ec6c57 diff --git a/include/xmloff/autolayout.hxx b/include/xmloff/autolayout.hxx index 4678533..c567bea 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_TITLE_VERTICAL_OUTLINE = 29, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART = 30, AUTOLAYOUT_HANDOUT9 = 31, AUTOLAYOUT_6CLIPART = 34, diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index f409af8..b7e5525 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -1232,7 +1232,7 @@ static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout ) 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_VTITLE_VCONTENT - LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE + LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_TITLE_VCONTENT LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART LayoutDescriptor( ), // AUTOLAYOUT_HANDOUT9 LayoutDescriptor( PRESOBJ_TEXT, PRESOBJ_NONE ), // AUTOLAYOUT_ONLY_TEXT diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index fb31680..b51485b 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -1117,7 +1117,7 @@ bool ImplSdPPTImport::Import() eAutoLayout = AUTOLAYOUT_OBJ; break; case PptPlaceholder::VERTICALTEXTBODY : - eAutoLayout = AUTOLAYOUT_TITLE_VERTICAL_OUTLINE; + eAutoLayout = AUTOLAYOUT_TITLE_VCONTENT; break; default: break; } diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index e83295e..1c470b8 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -127,7 +127,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_VTITLE_VCONTENT }, - {BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE }, + {BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, AUTOLAYOUT_TITLE_VCONTENT }, {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 670b96b..0b3e39f 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -116,7 +116,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_VTITLE_VCONTENT}, - {BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE}, + {BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VCONTENT}, {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 71fe46b..e0086af 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -1084,7 +1084,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos() ImpWriteAutoLayoutPlaceholder(XmlPlaceholderVerticalOutline, pInfo->GetPresRectangle()); break; } - case 29 : // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE + case AUTOLAYOUT_TITLE_VCONTENT : { ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle()); ImpWriteAutoLayoutPlaceholder(XmlPlaceholderVerticalOutline, pInfo->GetPresRectangle()); diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index aa99678..100b1fe 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -546,8 +546,7 @@ void SdXMLPresentationPageLayoutContext::EndElement() } else { - // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE - mnTypeId = 29; + mnTypeId = AUTOLAYOUT_TITLE_VCONTENT; } } else commit 656af688ecba51a619249a372e468b5abf991345 Author: Tor Lillqvist <t...@collabora.com> Date: Mon Feb 20 22:44:58 2017 +0200 s/AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE/AUTOLAYOUT_VTITLE_VCONTENT Change-Id: Ic423c5a84c887222e38ab411ed218987075f7ced diff --git a/include/xmloff/autolayout.hxx b/include/xmloff/autolayout.hxx index c7df584..4678533 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 6ed228f..f409af8 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 3da8bdc..fb31680 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 b0d5a70..e83295e 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 2995307..670b96b 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 51ac23e..71fe46b 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 db06f6e..aa99678 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 { commit 9d90993a28420b369b06ab852908f7076521fb6c Author: Tor Lillqvist <t...@collabora.com> Date: Mon Feb 20 22:39:00 2017 +0200 s/(AUTOLAYOUT)_VERTICAL_TITLE_TEXT_CHART/\1_VTITLE_VCONTENT_OVER_VCONTENT Change-Id: I996d4a0b01ce9cb78119cba3165b2716f09fd048 diff --git a/include/xmloff/autolayout.hxx b/include/xmloff/autolayout.hxx index 4f66369..c7df584 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_TEXT_CHART = 27, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE = 28, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE = 29, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART = 30, diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index b296b18..6ed228f 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -1230,7 +1230,7 @@ static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout ) LayoutDescriptor( ), // AUTOLAYOUT_HANDOUT3 LayoutDescriptor( ), // AUTOLAYOUT_HANDOUT4 LayoutDescriptor( ), // AUTOLAYOUT_HANDOUT6 - LayoutDescriptor( PRESOBJ_TITLE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL, PRESOBJ_OUTLINE ),// AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART + 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, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 18b19cf..3da8bdc 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -1187,7 +1187,7 @@ bool ImplSdPPTImport::Import() eAutoLayout = AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE; break; case PptSlideLayout::TITLERIGHT2BODIESLEFT : - eAutoLayout = AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART; + eAutoLayout = AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT; break; case PptSlideLayout::BOTTOMROW2COLUMNS : diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 14c5c69..b0d5a70 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -125,7 +125,7 @@ static const snewfoil_value_info_layout standard[] = static const snewfoil_value_info_layout v_standard[] = { // vertical - {BMP_LAYOUT_VERTICAL02, STR_AL_VERT_TITLE_TEXT_CHART, AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART }, + {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_HEAD02, STR_AL_TITLE_VERT_OUTLINE, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE }, {BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART }, diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 74805ea..2995307 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -114,7 +114,7 @@ static const snewfoil_value_info standard[] = {BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART}, // vertical - {BMP_LAYOUT_VERTICAL02, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART}, + {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_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}, diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index f55ec6b..51ac23e 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -282,10 +282,9 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI aTitlePos = aPos; aTitleSize = aSize; } - else if(mnType == 27 || mnType == 28) + else if(mnType == AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT || mnType == 28) { - // AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART or - // AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE + // or AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE Point aClassicTPos( aTitlePos.X() + long( aTitleSize.Width() * 0.0735 ), aTitlePos.Y() + long( aTitleSize.Height() * 0.083 )); @@ -347,10 +346,9 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI if(mnGapY < aPageInnerSize.Height() / 10) mnGapY = aPageInnerSize.Height() / 10; } - else if(mnType == 27 || mnType == 28) + else if(mnType == AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT || mnType == 28) { - // AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART or - // AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE + // or AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE Point aClassicTPos( aTitlePos.X() + long( aTitleSize.Width() * 0.0735 ), aTitlePos.Y() + long( aTitleSize.Height() * 0.083 )); @@ -1070,7 +1068,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos() } break; } - case 27 : // AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART + case AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT : { Rectangle aTop(pInfo->GetPresRectangle()); aTop.setHeight(long(aTop.GetHeight() * 0.488)); diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index f32ae3e..db06f6e 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -606,8 +606,7 @@ void SdXMLPresentationPageLayoutContext::EndElement() } else if( pObj1->GetName() == "vertical_outline" ) { - // AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART - mnTypeId = 27; + mnTypeId = AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT; } else { commit e819494edba7b50e03ccd4da19df790552bcad72 Author: Tor Lillqvist <t...@collabora.com> Date: Mon Feb 20 22:34:09 2017 +0200 s/AUTOLAYOUT_4OBJ/AUTOLAYOUT_TITLE_4CONTENT Change-Id: I8acd349ec7d9424f817981719320f51ac58b9861 diff --git a/include/xmloff/autolayout.hxx b/include/xmloff/autolayout.hxx index 7097111..4f66369 100644 --- a/include/xmloff/autolayout.hxx +++ b/include/xmloff/autolayout.hxx @@ -53,7 +53,6 @@ enum AutoLayout AUTOLAYOUT_OBJ = 11, AUTOLAYOUT_OBJTEXT = 13, AUTOLAYOUT_TEXTOVEROBJ = 17, - AUTOLAYOUT_4OBJ = 18, AUTOLAYOUT_NOTES = 21, AUTOLAYOUT_HANDOUT1 = 22, AUTOLAYOUT_HANDOUT2 = 23, diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 950e4eb..b296b18 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -1220,7 +1220,7 @@ static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout ) 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 ), // AUTOLAYOUT_TEXTOVEROBJ - LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_4OBJ + LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_TITLE_4CONTENT PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_NONE ), // AUTOLAYOUT_TITLE_ONLY LayoutDescriptor( PRESOBJ_NONE ), // AUTOLAYOUT_NONE diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 0f1e42a..18b19cf 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -1178,7 +1178,7 @@ bool ImplSdPPTImport::Import() eAutoLayout = AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT; break; case PptSlideLayout::FOUROBJECTS : - eAutoLayout = AUTOLAYOUT_4OBJ; + eAutoLayout = AUTOLAYOUT_TITLE_4CONTENT; break; case PptSlideLayout::BIGOBJECT : eAutoLayout = AUTOLAYOUT_OBJ; diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 7d81e59..14c5c69 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -117,7 +117,7 @@ static const snewfoil_value_info_layout standard[] = {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_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_TITLE_4CONTENT }, {BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, AUTOLAYOUT_6CLIPART }, {0, 0, AUTOLAYOUT_NONE} }; diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index f074e06..74805ea 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -110,7 +110,7 @@ static const snewfoil_value_info standard[] = {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_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_TITLE_4CONTENT}, {BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART}, // vertical diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index fa00baa..f55ec6b 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -984,7 +984,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos() ImpWriteAutoLayoutPlaceholder(XmlPlaceholderObject, aBottom); break; } - case 18 : // AUTOLAYOUT_4OBJ + case AUTOLAYOUT_TITLE_4CONTENT : { 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 1769176..f32ae3e 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -650,7 +650,7 @@ void SdXMLPresentationPageLayoutContext::EndElement() if( pObj1->GetName() == "object" ) { - mnTypeId = 18; // AUTOLAYOUT_4OBJ + mnTypeId = AUTOLAYOUT_TITLE_4CONTENT; } else { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits