diff options
| author | Zhe Wang <wangzcdl@apache.org> | 2012-09-07 04:16:44 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-05 12:06:24 +0100 |
| commit | 07dde82648d9420d9610dc7debda3058fca65084 (patch) | |
| tree | 134a2e263b60565e2412b3e398d38ae5b698e6b2 | |
| parent | 8465cb8e98b9293090e116a8ddef99e0004902a4 (diff) | |
Resolves: #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>
(cherry picked from commit d07b6ad5bf1ef21ad39b688a6953bd4d7ef57884)
Change-Id: Id1843a0e856a1bf98378868c68b1f9216ce71d1b
| -rw-r--r-- | sd/source/core/sdpage.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 71d407b615c3..a94519a9c37e 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -1169,6 +1169,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 ) @@ -1176,8 +1177,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() ) |