summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorSun Ying <sunying@apache.org>2012-08-16 02:28:45 +0000
committerSun Ying <sunying@apache.org>2012-08-16 02:28:45 +0000
commita19ed1cba504e1531df54de9131960f9dc2c94f9 (patch)
tree4cc979809a4530865bef7c38789ab846786a8880 /sd
parentf2bb9c92958a9c1c464c82e1129b8de4be0159cb (diff)
#119458# fix master's subtitle is modified when save .pot template file.
Reported by: liupingtan Patch by: Ying Sun Review by: Jian Yuan Li
Notes
Notes: merged as: febce416485db4f7282b4731fb69453525f66595
Diffstat (limited to 'sd')
-rw-r--r--sd/source/filter/eppt/epptso.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 86848144ad5d..7380482ab9b1 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -4969,14 +4969,18 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
*mpStrm << (sal_Int16)maRect.Top() << (sal_Int16)maRect.Left() << (sal_Int16)maRect.Right() << (sal_Int16)maRect.Bottom(); // oben, links, rechts, unten ????
mpPptEscherEx->OpenContainer( ESCHER_ClientData );
mpPptEscherEx->AddAtom( 8, EPP_OEPlaceholderAtom );
+ sal_uInt8 PlaceHolderID = ( mType == "presentation.Subtitle") ? EPP_PLACEHOLDER_MASTERSUBTITLE:EPP_PLACEHOLDER_MASTERBODY;
*mpStrm << (sal_uInt32)1 // PlacementID
- << (sal_uInt8)EPP_PLACEHOLDER_MASTERBODY // PlaceHolderID
+ << PlaceHolderID/*(sal_uInt8)EPP_PLACEHOLDER_MASTERBODY */ // PlaceHolderID
<< (sal_uInt8)0 // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER )
<< (sal_uInt16)0; // padword
mpPptEscherEx->CloseContainer(); // ESCHER_ClientData
mpPptEscherEx->OpenContainer( ESCHER_ClientTextbox ); // printf
mpPptEscherEx->AddAtom( 4, EPP_TextHeaderAtom );
- *mpStrm << (sal_uInt32)EPP_TEXTTYPE_Body;
+ if ( mType == "presentation.Subtitle")
+ *mpStrm << (sal_uInt32)EPP_TEXTTYPE_CenterBody;
+ else
+ *mpStrm << (sal_uInt32)EPP_TEXTTYPE_Body;
mnTextSize = aTextObj.Count();
aTextObj.Write( mpStrm );
mpPptEscherEx->BeginAtom();