Kaydet (Commit) d07b6ad5 authored tarafından Zhe Wang's avatar Zhe Wang

Fix issue #i120345#: Textbox's position in template file(only title) is displayed incorrectly

* subversion/main/sd/source/core/sdpage.cxx 
[]Should check the subtitle in master page firstly, and set it to layout if exist

Patch by: Ma Bingbing <jiazema@gmail.com>
Suggested by: Wang Zhe <kingwisemmx@gmail.com>
Found by: Ma Bingbing <jiazema@gmail.com>
Review by: Wang Zhe <kingwisemmx@gmail.com>
üst 48401d8f
......@@ -1188,6 +1188,7 @@ static void CalcAutoLayoutRectangles( SdPage& rPage, int nLayout, Rectangle* rRe
{
SdPage& rMasterPage = static_cast<SdPage&>(rPage.TRG_GetMasterPage());
SdrObject* pMasterTitle = rMasterPage.GetPresObj( PRESOBJ_TITLE );
SdrObject* pMasterSubTitle = rMasterPage.GetPresObj( PRESOBJ_TEXT );
SdrObject* pMasterOutline = rMasterPage.GetPresObj( rPage.GetPageKind()==PK_NOTES ? PRESOBJ_NOTES : PRESOBJ_OUTLINE );
if( pMasterTitle )
......@@ -1195,8 +1196,9 @@ static void CalcAutoLayoutRectangles( SdPage& rPage, int nLayout, Rectangle* rRe
if (aTitleRect.IsEmpty() )
aTitleRect = rPage.GetTitleRect();
if( pMasterOutline )
if( pMasterSubTitle )
aLayoutRect = pMasterSubTitle->GetLogicRect();
else if( pMasterOutline )
aLayoutRect = pMasterOutline->GetLogicRect();
if (aLayoutRect.IsEmpty() )
......
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