Kaydet (Commit) bb1213a7 authored tarafından Korrawit Pruegsanusak's avatar Korrawit Pruegsanusak Kaydeden (comit) Muthu Subramanian K

fdo#71434: don't show master text if PlaceHolder types defined

I've added all of valid PlaceHolder types from
http://www.schemacentral.com/sc/ooxml/t-p_ST_PlaceholderType.html

Change-Id: I038fe43ff83699f92ff5eb9945bce12540058478
Reviewed-on: https://gerrit.libreoffice.org/6814Reviewed-by: 's avatarMuthu Subramanian K <muthusuba@gmail.com>
Tested-by: 's avatarMuthu Subramanian K <muthusuba@gmail.com>
üst eda8111f
......@@ -147,9 +147,26 @@ ContextHandlerRef PPTGraphicShapeContext::onCreateContext( sal_Int32 aElementTok
if ( pPlaceholder.get() )
{
bool bUseText = true;
// TODO: Check if pPlaceholder->getSubType is none (i.e. none explicitly specified)
if( pPlaceholder->getSubType() == XML_obj )
bUseText = false;
switch( pPlaceholder->getSubType() )
{
case XML_title :
case XML_body :
case XML_ctrTitle :
case XML_subTitle :
case XML_dt :
case XML_sldNum :
case XML_ftr :
case XML_hdr :
case XML_obj :
case XML_chart :
case XML_tbl :
case XML_clipArt :
case XML_dgm :
case XML_media :
case XML_sldImg :
case XML_pic :
bUseText = false;
}
mpShapePtr->applyShapeReference( *pPlaceholder.get(), bUseText );
PPTShape* pPPTShape = dynamic_cast< PPTShape* >( pPlaceholder.get() );
if ( pPPTShape )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment