diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-02-20 19:26:41 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-02-20 22:00:29 +0200 |
| commit | 0cab28af329dd53168e99c582ff9c3318ac3c708 (patch) | |
| tree | b4291879d622ee397803d37ab57750fa9dd30b8a /sd/source/ui | |
| parent | c87cc416609e2283d5059d8d1c317211871ddfa6 (diff) | |
Use AUTOLAYOUT_TITLE_ONLY instead of "deprecated" AUTOLAYOUT_ONLY_TITLE
Change-Id: Ib3c2b5f0feb70fea195f022f322c682ecd4f1918
Diffstat (limited to 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/controller/slidelayoutcontroller.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/sidebar/LayoutMenu.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/outlview.cxx | 7 |
3 files changed, 6 insertions, 5 deletions
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 1c6f85f2291b..bf8ceee92571 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -109,7 +109,7 @@ static const snewfoil_value_info_layout standard[] = {BMP_LAYOUT_HEAD03, STR_AUTOLAYOUT_TITLE, AUTOLAYOUT_TITLE }, {BMP_LAYOUT_HEAD02, STR_AUTOLAYOUT_CONTENT, AUTOLAYOUT_TITLE_CONTENT }, {BMP_LAYOUT_HEAD02A, STR_AUTOLAYOUT_2CONTENT, AUTOLAYOUT_TITLE_2CONTENT }, - {BMP_LAYOUT_HEAD01, STR_AUTOLAYOUT_ONLY_TITLE, AUTOLAYOUT_ONLY_TITLE }, + {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 }, diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 29f072cc00a8..69625ba596cd 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -103,7 +103,7 @@ static const snewfoil_value_info standard[] = {BMP_LAYOUT_HEAD03, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE}, {BMP_LAYOUT_HEAD02, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TITLE_CONTENT}, {BMP_LAYOUT_HEAD02A, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TITLE_2CONTENT}, - {BMP_LAYOUT_HEAD01, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE}, + {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}, diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index c94cff433ff4..723e5ff0e5e0 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -42,6 +42,7 @@ #include <editeng/numitem.hxx> #include <editeng/outlobj.hxx> #include <editeng/editeng.hxx> +#include <xmloff/autolayout.hxx> #include <editeng/editobj.hxx> #include <editeng/editund2.hxx> @@ -448,7 +449,7 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) // page AutoLayout eAutoLayout = pExample->GetAutoLayout(); if (eAutoLayout == AUTOLAYOUT_TITLE || - eAutoLayout == AUTOLAYOUT_ONLY_TITLE) + eAutoLayout == AUTOLAYOUT_TITLE_ONLY) { pPage->SetAutoLayout(AUTOLAYOUT_TITLE_CONTENT, true); } @@ -954,7 +955,7 @@ SdrTextObj* OutlineView::CreateTitleTextObject(SdPage* pPage) if( pPage->GetAutoLayout() == AUTOLAYOUT_NONE ) { // simple case - pPage->SetAutoLayout( AUTOLAYOUT_ONLY_TITLE, true ); + pPage->SetAutoLayout( AUTOLAYOUT_TITLE_ONLY, true ); } else { @@ -974,7 +975,7 @@ SdrTextObj* OutlineView::CreateOutlineTextObject(SdPage* pPage) switch( eNewLayout ) { case AUTOLAYOUT_NONE: - case AUTOLAYOUT_ONLY_TITLE: + case AUTOLAYOUT_TITLE_ONLY: case AUTOLAYOUT_TITLE: eNewLayout = AUTOLAYOUT_TITLE_CONTENT; break; case AUTOLAYOUT_CHART: eNewLayout = AUTOLAYOUT_CHARTTEXT; break; |