Author: sunying
Date: Thu Aug 16 03:28:45 2012
New Revision: 1373721
URL: http://svn.apache.org/viewvc?rev=1373721&view=rev
Log:
#119458# fix master's subtitle is modified when save .pot template file.
Reported by: liupingtan
Patch by: Ying Sun
Review by: Jian Yuan Li
Modified:
incubator/ooo/trunk/main/sd/source/filter/eppt/epptso.cxx
Modified: incubator/ooo/trunk/main/sd/source/filter/eppt/epptso.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/source/filter/eppt/epptso.cxx?rev=1373721&r1=1373720&r2=1373721&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/source/filter/eppt/epptso.cxx (original)
+++ incubator/ooo/trunk/main/sd/source/filter/eppt/epptso.cxx Thu Aug 16
03:28:45 2012
@@ -4969,14 +4969,18 @@ void PPTWriter::ImplWritePage( const PHL
*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();
