diff options
| -rw-r--r-- | include/xmloff/autolayout.hxx | 1 | ||||
| -rw-r--r-- | sd/source/core/sdpage.cxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/controller/slidelayoutcontroller.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/sidebar/LayoutMenu.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/draw/sdxmlexp.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/draw/ximpstyl.cxx | 2 |
7 files changed, 7 insertions, 8 deletions
diff --git a/include/xmloff/autolayout.hxx b/include/xmloff/autolayout.hxx index a65267a657b9..0a8a0d5e9e4d 100644 --- a/include/xmloff/autolayout.hxx +++ b/include/xmloff/autolayout.hxx @@ -51,7 +51,6 @@ enum AutoLayout AUTOLAYOUT_CLIPTEXT = 9, AUTOLAYOUT_TEXTOBJ = 10, AUTOLAYOUT_OBJ = 11, - AUTOLAYOUT_TEXT2OBJ = 12, AUTOLAYOUT_OBJTEXT = 13, AUTOLAYOUT_OBJOVERTEXT = 14, AUTOLAYOUT_2OBJTEXT = 15, diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index a75c3c9e710d..2f02bf82b5af 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -1213,7 +1213,7 @@ static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout ) LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_CLIPTEXT LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOBJ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OBJECT ), // AUTOLAYOUT_OBJ - LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXT2OBJ + 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_OBJOVERTEXT LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2OBJTEXT diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 732fe638de4e..37e588881cac 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -1167,7 +1167,7 @@ bool ImplSdPPTImport::Import() eAutoLayout = AUTOLAYOUT_TITLE_ONLY; break; case PptSlideLayout::RIGHTCOLUMN2ROWS : - eAutoLayout = AUTOLAYOUT_TEXT2OBJ; + eAutoLayout = AUTOLAYOUT_TITLE_CONTENT_2CONTENT; break; case PptSlideLayout::LEFTCOLUMN2ROWS : eAutoLayout = AUTOLAYOUT_2OBJTEXT; @@ -1185,7 +1185,7 @@ bool ImplSdPPTImport::Import() eAutoLayout = AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE; break; case PptSlideLayout::TITLERIGHT2BODIESLEFT : - eAutoLayout = AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART; // AUTOLAYOUT_TEXT2OBJ; + eAutoLayout = AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART; break; case PptSlideLayout::BOTTOMROW2COLUMNS : diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index bf8ceee92571..d3f4054129a5 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -112,7 +112,7 @@ static const snewfoil_value_info_layout standard[] = {BMP_LAYOUT_HEAD01, STR_AUTOLAYOUT_ONLY_TITLE, AUTOLAYOUT_TITLE_ONLY }, {BMP_LAYOUT_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT, AUTOLAYOUT_ONLY_TEXT }, {BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, AUTOLAYOUT_2OBJTEXT }, - {BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT, AUTOLAYOUT_TEXT2OBJ }, + {BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT, AUTOLAYOUT_TITLE_CONTENT_2CONTENT }, {BMP_LAYOUT_HEAD03A, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,AUTOLAYOUT_2OBJOVERTEXT }, {BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, AUTOLAYOUT_OBJOVERTEXT }, {BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, AUTOLAYOUT_4OBJ }, diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 69625ba596cd..93730c6e7eb7 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -106,7 +106,7 @@ static const snewfoil_value_info standard[] = {BMP_LAYOUT_HEAD01, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE_ONLY}, {BMP_LAYOUT_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT}, {BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT}, - {BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ}, + {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_2OBJOVERTEXT}, {BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT}, {BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ}, diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index c78887d3ffc9..598c79d52fb0 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -900,7 +900,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos() ImpWriteAutoLayoutPlaceholder(XmlPlaceholderObject, pInfo->GetPresRectangle()); break; } - case 12 : // AUTOLAYOUT_TEXT2OBJ + case AUTOLAYOUT_TITLE_CONTENT_2CONTENT : { 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 e46399d411b0..643d5bac16c5 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -640,7 +640,7 @@ void SdXMLPresentationPageLayoutContext::EndElement() } else { - mnTypeId = 12; // AUTOLAYOUT_TEXT2OBJ + mnTypeId = AUTOLAYOUT_TITLE_CONTENT_2CONTENT; } break; } |