diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-02-20 22:39:00 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-02-20 22:39:00 +0200 |
| commit | 9d90993a28420b369b06ab852908f7076521fb6c (patch) | |
| tree | f7ede3a276cfa1760a0939efa22baa681fac1f34 /xmloff | |
| parent | e819494edba7b50e03ccd4da19df790552bcad72 (diff) | |
s/(AUTOLAYOUT)_VERTICAL_TITLE_TEXT_CHART/\1_VTITLE_VCONTENT_OVER_VCONTENT
Change-Id: I996d4a0b01ce9cb78119cba3165b2716f09fd048
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/sdxmlexp.cxx | 12 | ||||
| -rw-r--r-- | xmloff/source/draw/ximpstyl.cxx | 3 |
2 files changed, 6 insertions, 9 deletions
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index f55ec6be7a61..51ac23ed72d4 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 f32ae3ee2b5d..db06f6ee6456 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 { |