[Libreoffice-commits] core.git: sd/source

[Zhe Wang]

 sd/source/core/sdpage.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 07dde82648d9420d9610dc7debda3058fca65084
Author: Zhe Wang <wangzcdl at apache.org>
Date:   Fri Sep 7 04:16:44 2012 +0000

    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 at gmail.com>
    Suggested by: Wang Zhe <kingwisemmx at gmail.com>
    Found by: Ma Bingbing <jiazema at gmail.com>
    Review by: Wang Zhe <kingwisemmx at gmail.com>
    
    (cherry picked from commit d07b6ad5bf1ef21ad39b688a6953bd4d7ef57884)
    
    Change-Id: Id1843a0e856a1bf98378868c68b1f9216ce71d1b

diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 71d407b..a94519a 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() )