diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-02-20 22:34:09 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-02-20 22:34:09 +0200 |
| commit | e819494edba7b50e03ccd4da19df790552bcad72 (patch) | |
| tree | 7df221a29ae40ca96568e79b86873b64ceb1afdb /sd | |
| parent | 6a7749cf33354010a279948807029eb322c8f113 (diff) | |
s/AUTOLAYOUT_4OBJ/AUTOLAYOUT_TITLE_4CONTENT
Change-Id: I8acd349ec7d9424f817981719320f51ac58b9861
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/sdpage.cxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/controller/slidelayoutcontroller.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/sidebar/LayoutMenu.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 950e4eb84888..b296b184a696 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 0f1e42a8f161..18b19cfc0949 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 7d81e59bf210..14c5c69973fa 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 f074e06c858f..74805eab50c7 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 |