Skip to content

C
core
Kaydet (Commit) 1324b7f1 authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

s/AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART/AUTOLAYOUT_TITLE_2VTEXT 

Change-Id: Ie20c4539b8b66b1e9b40015e6bc611d5bc12ddb4
üst 56917ba7
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 8 deletions
include/xmloff/autolayout.hxx
Dosyayı görüntüle @ 1324b7f1
...@@ -59,7 +59,6 @@ enum AutoLayout ...@@ -59,7 +59,6 @@ enum AutoLayout
AUTOLAYOUT_HANDOUT3 = 24, AUTOLAYOUT_HANDOUT3 = 24,
AUTOLAYOUT_HANDOUT4 = 25, AUTOLAYOUT_HANDOUT4 = 25,
AUTOLAYOUT_HANDOUT6 = 26, AUTOLAYOUT_HANDOUT6 = 26,
AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART = 30,
AUTOLAYOUT_HANDOUT9 = 31, AUTOLAYOUT_HANDOUT9 = 31,
AUTOLAYOUT_6CLIPART = 34, AUTOLAYOUT_6CLIPART = 34,
AUTOLAYOUT_END AUTOLAYOUT_END
......
sd/source/core/sdpage.cxx
Dosyayı görüntüle @ 1324b7f1
...@@ -1233,7 +1233,7 @@ static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout ) ...@@ -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, PRESOBJ_OUTLINE ),// AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT
LayoutDescriptor( PRESOBJ_TITLE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_VTITLE_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 ), // 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( ), // AUTOLAYOUT_HANDOUT9
LayoutDescriptor( PRESOBJ_TEXT, PRESOBJ_NONE ), // AUTOLAYOUT_ONLY_TEXT LayoutDescriptor( PRESOBJ_TEXT, PRESOBJ_NONE ), // AUTOLAYOUT_ONLY_TEXT
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_4CLIPART LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_4CLIPART
......
sd/source/filter/ppt/pptin.cxx
Dosyayı görüntüle @ 1324b7f1
...@@ -1138,7 +1138,7 @@ bool ImplSdPPTImport::Import() ...@@ -1138,7 +1138,7 @@ bool ImplSdPPTImport::Import()
else if ( nID1 == PptPlaceholder::CLIPART && nID2 == PptPlaceholder::BODY ) else if ( nID1 == PptPlaceholder::CLIPART && nID2 == PptPlaceholder::BODY )
eAutoLayout = AUTOLAYOUT_CLIPTEXT; eAutoLayout = AUTOLAYOUT_CLIPTEXT;
else if ( nID1 == PptPlaceholder::CLIPART && nID2 == PptPlaceholder::VERTICALTEXTBODY ) else if ( nID1 == PptPlaceholder::CLIPART && nID2 == PptPlaceholder::VERTICALTEXTBODY )
eAutoLayout = AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART; eAutoLayout = AUTOLAYOUT_TITLE_2VTEXT;
else if ( ( nID1 == PptPlaceholder::BODY ) else if ( ( nID1 == PptPlaceholder::BODY )
&& ( ( nID2 == PptPlaceholder::OBJECT ) || ( nID2 == PptPlaceholder::MEDIACLIP ) ) ) && ( ( nID2 == PptPlaceholder::OBJECT ) || ( nID2 == PptPlaceholder::MEDIACLIP ) ) )
eAutoLayout = AUTOLAYOUT_TEXTOBJ; eAutoLayout = AUTOLAYOUT_TEXTOBJ;
......
sd/source/ui/controller/slidelayoutcontroller.cxx
Dosyayı görüntüle @ 1324b7f1
...@@ -128,7 +128,7 @@ static const snewfoil_value_info_layout v_standard[] = ...@@ -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_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_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE, AUTOLAYOUT_VTITLE_VCONTENT },
{BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, AUTOLAYOUT_TITLE_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} {0, 0, AUTOLAYOUT_NONE}
}; };
......
sd/source/ui/sidebar/LayoutMenu.cxx
Dosyayı görüntüle @ 1324b7f1
...@@ -117,7 +117,7 @@ static const snewfoil_value_info standard[] = ...@@ -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_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_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_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} {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
}; };
......
xmloff/source/draw/sdxmlexp.cxx
Dosyayı görüntüle @ 1324b7f1
...@@ -1090,7 +1090,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos() ...@@ -1090,7 +1090,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderVerticalOutline, pInfo->GetPresRectangle()); ImpWriteAutoLayoutPlaceholder(XmlPlaceholderVerticalOutline, pInfo->GetPresRectangle());
break; break;
} }
case 30 : // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART case AUTOLAYOUT_TITLE_2VTEXT :
{ {
Rectangle aLeft(pInfo->GetPresRectangle()); Rectangle aLeft(pInfo->GetPresRectangle());
aLeft.setWidth(long(aLeft.GetWidth() * 0.488)); aLeft.setWidth(long(aLeft.GetWidth() * 0.488));
......
xmloff/source/draw/ximpstyl.cxx
Dosyayı görüntüle @ 1324b7f1
...@@ -594,8 +594,7 @@ void SdXMLPresentationPageLayoutContext::EndElement() ...@@ -594,8 +594,7 @@ void SdXMLPresentationPageLayoutContext::EndElement()
{ {
if( pObj2->GetName() == "vertical_outline" ) if( pObj2->GetName() == "vertical_outline" )
{ {
// AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART mnTypeId = AUTOLAYOUT_TITLE_2VTEXT;
mnTypeId = 30;
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment