diff options
| author | Sun Ying <sunying@apache.org> | 2012-08-16 02:28:45 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-23 15:19:10 +0100 |
| commit | febce416485db4f7282b4731fb69453525f66595 (patch) | |
| tree | 00c8c2b3aacb92c301c5250cb14715222c8cf0e0 /sd | |
| parent | be9034ec5c43a3dcbebaa75e9eb47a024d4c6072 (diff) | |
Resolves: #i119458# fix master's subtitle is modified when save .pot template
Reported by: liupingtan
Patch by: Ying Sun
Review by: Jian Yuan Li(cherry picked from commit a19ed1cba504e1531df54de9131960f9dc2c94f9)
Change-Id: Ied47d7f1421d3e27d8c7ad6529234f188af23787
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/eppt/epptso.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 4d4c3ee3d83a..f8f1a78ea793 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -3004,14 +3004,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(); // top, left, right, bottom ???? 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(); |