oox-pptx-import-fix-placeholder-text-style.diff: fix placeholders style.

n#592906, n#479834

oox/source/drawingml/shapecontext.cxx

@@ -95,7 +95,8 @@ Reference< XFastContextHandler > ShapeContext::createFastChildContext( sal_Int32
     }
     case XML_ph:
         mpShapePtr->setSubType( xAttribs->getOptionalValueToken( XML_type, XML_obj ) );
-        mpShapePtr->setSubTypeIndex( xAttribs->getOptionalValue( XML_idx ).toInt32() );
+        if( xAttribs->hasAttribute( XML_idx ) )
+            mpShapePtr->setSubTypeIndex( xAttribs->getOptionalValue( XML_idx ).toInt32() );
         break;
     // nvSpPr CT_ShapeNonVisual end
 

oox/source/drawingml/shapegroupcontext.cxx

@@ -80,7 +80,8 @@ Reference< XFastContextHandler > ShapeGroupContext::createFastChildContext( sal_
     }
     case XML_ph:
         mpGroupShapePtr->setSubType( xAttribs->getOptionalValueToken( XML_type, FastToken::DONTKNOW ) );
-        mpGroupShapePtr->setSubTypeIndex( xAttribs->getOptionalValue( XML_idx ).toInt32() );
+        if( xAttribs->hasAttribute( XML_idx ) )
+            mpGroupShapePtr->setSubTypeIndex( xAttribs->getOptionalValue( XML_idx ).toInt32() );
         break;
     // nvSpPr CT_ShapeNonVisual end
 

oox/source/drawingml/textbodypropertiescontext.cxx

@@ -89,23 +89,26 @@ TextBodyPropertiesContext::TextBodyPropertiesContext( ContextHandler& rParent,
     }
 
     // ST_TextAnchoringType
-    drawing::TextVerticalAdjust eVA( drawing::TextVerticalAdjust_TOP );
-    switch( xAttributes->getOptionalValueToken( XML_anchor, XML_t ) )
-    {
-        case XML_b :    eVA = drawing::TextVerticalAdjust_BOTTOM; break;
-        case XML_dist :
-        case XML_just :
-        case XML_ctr :  eVA = drawing::TextVerticalAdjust_CENTER; break;
-        default:
-        case XML_t :    eVA = drawing::TextVerticalAdjust_TOP; break;
+    if( xAttributes->hasAttribute( XML_anchor ) ) {
+        drawing::TextVerticalAdjust eVA( drawing::TextVerticalAdjust_TOP );
+        switch( xAttributes->getOptionalValueToken( XML_anchor, XML_t ) )
+        {
+            case XML_b :    eVA = drawing::TextVerticalAdjust_BOTTOM; break;
+            case XML_dist :
+            case XML_just :
+            case XML_ctr :  eVA = drawing::TextVerticalAdjust_CENTER; break;
+            default:
+            case XML_t :    eVA = drawing::TextVerticalAdjust_TOP; break;
+        }
+        mrTextBodyProp.maPropertyMap[ PROP_TextVerticalAdjust ] <<= eVA;
     }
-    mrTextBodyProp.maPropertyMap[ PROP_TextVerticalAdjust ] <<= eVA;
 
     bool bAnchorCenter = aAttribs.getBool( XML_anchorCtr, false );
-    if( bAnchorCenter )
-    mrTextBodyProp.maPropertyMap[ PROP_TextHorizontalAdjust ] <<=
-        TextHorizontalAdjust_CENTER;
-
+    if( xAttributes->hasAttribute( XML_anchorCtr ) ) {
+        if( bAnchorCenter )
+            mrTextBodyProp.maPropertyMap[ PROP_TextHorizontalAdjust ] <<=
+                TextHorizontalAdjust_CENTER;
+    }
 //   bool bCompatLineSpacing = aAttribs.getBool( XML_compatLnSpc, false );
 //   bool bForceAA = aAttribs.getBool( XML_forceAA, false );
 //   bool bFromWordArt = aAttribs.getBool( XML_fromWordArt, false );
@@ -128,19 +131,21 @@ TextBodyPropertiesContext::TextBodyPropertiesContext( ContextHandler& rParent,
 //   bool bUpRight = aAttribs.getBool( XML_upright, 0 );
 
     // ST_TextVerticalType
-    mrTextBodyProp.moVert = aAttribs.getToken( XML_vert );
-    bool bRtl = aAttribs.getBool( XML_rtl, false );
-    sal_Int32 tVert = mrTextBodyProp.moVert.get( XML_horz );
-    if( tVert == XML_vert || tVert == XML_eaVert || tVert == XML_vert270 || tVert == XML_mongolianVert ) {
-      mrTextBodyProp.maPropertyMap[ PROP_TextWritingMode ]
-    <<= WritingMode_TB_RL;
-      // workaround for TB_LR as using WritingMode2 doesn't work
-        if( !bAnchorCenter )
-            mrTextBodyProp.maPropertyMap[ PROP_TextHorizontalAdjust ] <<=
-            TextHorizontalAdjust_LEFT;
-    } else
-      mrTextBodyProp.maPropertyMap[ PROP_TextWritingMode ]
-    <<= ( bRtl ? WritingMode_RL_TB : WritingMode_LR_TB );
+    if( xAttributes->hasAttribute( XML_vert ) ) {
+        mrTextBodyProp.moVert = aAttribs.getToken( XML_vert );
+        bool bRtl = aAttribs.getBool( XML_rtl, false );
+        sal_Int32 tVert = mrTextBodyProp.moVert.get( XML_horz );
+        if( tVert == XML_vert || tVert == XML_eaVert || tVert == XML_vert270 || tVert == XML_mongolianVert ) {
+            mrTextBodyProp.maPropertyMap[ PROP_TextWritingMode ]
+                <<= WritingMode_TB_RL;
+            // workaround for TB_LR as using WritingMode2 doesn't work
+            if( !bAnchorCenter )
+                mrTextBodyProp.maPropertyMap[ PROP_TextHorizontalAdjust ] <<=
+                    TextHorizontalAdjust_LEFT;
+        } else
+            mrTextBodyProp.maPropertyMap[ PROP_TextWritingMode ]
+                <<= ( bRtl ? WritingMode_RL_TB : WritingMode_LR_TB );
+    }
 }
 
 // --------------------------------------------------------------------

oox/source/ppt/pptgraphicshapecontext.cxx

@@ -132,7 +132,8 @@ Reference< XFastContextHandler > PPTGraphicShapeContext::createFastChildContext(
         OUString sIdx( xAttribs->getOptionalValue( XML_idx ) );
         sal_Bool bHasIdx = sIdx.getLength() > 0;
         sal_Int32 nIdx = sIdx.toInt32();
-        mpShapePtr->setSubTypeIndex( nIdx );
+        if( xAttribs->hasAttribute( XML_idx ) )
+            mpShapePtr->setSubTypeIndex( nIdx );
 
         if ( nSubType || bHasIdx )
         {

oox/source/ppt/pptshape.cxx

@@ -170,7 +170,11 @@ void PPTShape::addShape(
                 }
             }
 
-/*
+            OSL_TRACE("shape service: %s", rtl::OUStringToOString(sServiceName, RTL_TEXTENCODING_UTF8 ).getStr());
+
+            if( mnSubType && aMasterTextListStyle && getSubTypeIndex() != -1 )
+                aMasterTextListStyle.reset();
+
             // use placeholder index if possible
             if( mnSubType && getSubTypeIndex() && rSlidePersist.getMasterPersist().get() ) {
                 oox::drawingml::ShapePtr pPlaceholder = PPTShape::findPlaceholderByIndex( getSubTypeIndex(), rSlidePersist.getMasterPersist()->getShapes()->getChildren() );
@@ -184,7 +188,7 @@ void PPTShape::addShape(
                 aMasterTextListStyle = pNewTextListStyle;
                 }
             }
-*/
+
             if ( sServiceName.getLength() )
             {
             // use style from master slide for placeholders only, otherwise use slide's style, which might be the default style from presentation

oox/source/ppt/pptshapecontext.cxx

@@ -116,7 +116,8 @@ Reference< XFastContextHandler > PPTShapeContext::createFastChildContext( sal_In
         {
             sal_Int32 nSubType( xAttribs->getOptionalValueToken( XML_type, XML_obj ) );
             mpShapePtr->setSubType( nSubType );
-            mpShapePtr->setSubTypeIndex( xAttribs->getOptionalValue( XML_idx ).toInt32() );
+            if( xAttribs->hasAttribute( XML_idx ) )
+                mpShapePtr->setSubTypeIndex( xAttribs->getOptionalValue( XML_idx ).toInt32() );
             if ( nSubType )
             {
                 PPTShape* pPPTShapePtr = dynamic_cast< PPTShape* >( mpShapePtr.get() );

oox/source/ppt/pptshapegroupcontext.cxx

@@ -82,7 +82,8 @@ Reference< XFastContextHandler > PPTShapeGroupContext::createFastChildContext( s
     }
     case NMSP_PPT|XML_ph:
         mpGroupShapePtr->setSubType( xAttribs->getOptionalValueToken( XML_type, FastToken::DONTKNOW ) );
-        mpGroupShapePtr->setSubTypeIndex( xAttribs->getOptionalValue( XML_idx ).toInt32() );
+        if( xAttribs->hasAttribute( XML_idx ) )
+            mpGroupShapePtr->setSubTypeIndex( xAttribs->getOptionalValue( XML_idx ).toInt32() );
         break;
     // nvSpPr CT_ShapeNonVisual end