Skip to content

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

Use AUTOLAYOUT_TITLE_2CONTENT instead of "deprecated" AUTOLAYOUT_2TEXT 

Change-Id: I8897e31065f69b7fb62f0770e62025f35ecb5eec
üst 2f6d2c0c
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 8 deletions
include/xmloff/autolayout.hxx
Dosyayı görüntüle @ c87cc416
......@@ -43,7 +43,6 @@ enum AutoLayout
// deprecated
AUTOLAYOUT_CHART = 2,
AUTOLAYOUT_2TEXT = 3,
AUTOLAYOUT_TEXTCHART = 4,
AUTOLAYOUT_ORG = 5,
AUTOLAYOUT_TEXTCLIP = 6,
......
sd/source/core/sdpage.cxx
Dosyayı görüntüle @ c87cc416
......@@ -1204,7 +1204,7 @@ static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout )
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_TEXT ), // AUTOLAYOUT_TITLE
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TITLE_CONTENT
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_CHART
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2TEXT
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TITLE_2CONTENT
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTCHART
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_ORG
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTCLbIP
......
sd/source/filter/ppt/pptin.cxx
Dosyayı görüntüle @ c87cc416
......@@ -1124,7 +1124,7 @@ bool ImplSdPPTImport::Import()
case PptSlideLayout::TWOCOLUMNSANDTITLE :
{
eAutoLayout = AUTOLAYOUT_2TEXT;
eAutoLayout = AUTOLAYOUT_TITLE_2CONTENT;
PptPlaceholder nID1 = pSlideLayout->aPlaceholderId[ 1 ];
PptPlaceholder nID2 = pSlideLayout->aPlaceholderId[ 2 ];
if ( nID1 == PptPlaceholder::BODY && nID2 == PptPlaceholder::GRAPH )
......@@ -1150,7 +1150,7 @@ bool ImplSdPPTImport::Import()
case PptSlideLayout::TWOROWSANDTITLE :
{
eAutoLayout = AUTOLAYOUT_2TEXT;
eAutoLayout = AUTOLAYOUT_TITLE_2CONTENT;
PptPlaceholder nID1 = pSlideLayout->aPlaceholderId[ 1 ];
PptPlaceholder nID2 = pSlideLayout->aPlaceholderId[ 2 ];
if ( nID1 == PptPlaceholder::BODY && nID2 == PptPlaceholder::OBJECT )
......
sd/source/ui/controller/slidelayoutcontroller.cxx
Dosyayı görüntüle @ c87cc416
......@@ -108,7 +108,7 @@ static const snewfoil_value_info_layout standard[] =
{BMP_LAYOUT_EMPTY, STR_AUTOLAYOUT_NONE, AUTOLAYOUT_NONE },
{BMP_LAYOUT_HEAD03, STR_AUTOLAYOUT_TITLE, AUTOLAYOUT_TITLE },
{BMP_LAYOUT_HEAD02, STR_AUTOLAYOUT_CONTENT, AUTOLAYOUT_TITLE_CONTENT },
{BMP_LAYOUT_HEAD02A, STR_AUTOLAYOUT_2CONTENT, AUTOLAYOUT_2TEXT },
{BMP_LAYOUT_HEAD02A, STR_AUTOLAYOUT_2CONTENT, AUTOLAYOUT_TITLE_2CONTENT },
{BMP_LAYOUT_HEAD01, STR_AUTOLAYOUT_ONLY_TITLE, AUTOLAYOUT_ONLY_TITLE },
{BMP_LAYOUT_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT, AUTOLAYOUT_ONLY_TEXT },
{BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, AUTOLAYOUT_2OBJTEXT },
......
sd/source/ui/sidebar/LayoutMenu.cxx
Dosyayı görüntüle @ c87cc416
......@@ -102,7 +102,7 @@ static const snewfoil_value_info standard[] =
{BMP_LAYOUT_EMPTY, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE},
{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_2TEXT},
{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_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT},
{BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT},
......
xmloff/source/draw/sdxmlexp.cxx
Dosyayı görüntüle @ c87cc416
......@@ -816,7 +816,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderChart, pInfo->GetPresRectangle());
break;
}
case 3 : // AUTOLAYOUT_2TEXT
case AUTOLAYOUT_TITLE_2CONTENT :
{
Rectangle aLeft(pInfo->GetPresRectangle());
aLeft.setWidth(long(aLeft.GetWidth() * 0.488));
......
xmloff/source/draw/ximpstyl.cxx
Dosyayı görüntüle @ c87cc416
......@@ -566,7 +566,7 @@ void SdXMLPresentationPageLayoutContext::EndElement()
{
if( pObj2->GetName() == "outline" )
{
mnTypeId = 3; // AUTOLAYOUT_2TEXT
mnTypeId = AUTOLAYOUT_TITLE_2CONTENT;
}
else if( pObj2->GetName() == "chart" )
{
......
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