Commit bf0abd6c authored by Thorsten Zachmann's avatar Thorsten Zachmann

o Fix loading of styles with familiy presentation

svn path=/trunk/koffice/; revision=793654
parent 92259d42
......@@ -733,7 +733,7 @@ void KoShape::loadStyle( const KoXmlElement & element, KoShapeLoadingContext &co
else if( element.hasAttributeNS( KoXmlNS::presentation, "style-name" ) )
{
context.odfLoadingContext().fillStyleStack( element, KoXmlNS::presentation, "style-name", "presentation" );
styleStack.setTypeProperties( "presentation" );
styleStack.setTypeProperties( "graphic" );
}
setBackground( loadOdfFill( element, context ) );
......@@ -797,15 +797,8 @@ QString KoShape::getStyleProperty( const char *property, const KoXmlElement & el
KoStyleStack &styleStack = context.odfLoadingContext().styleStack();
QString value;
if( element.hasAttributeNS( KoXmlNS::draw, "style-name" ) )
{
if( styleStack.hasProperty( KoXmlNS::draw, property ) )
value = styleStack.property( KoXmlNS::draw, property );
}
else if( element.hasAttributeNS( KoXmlNS::presentation, "style-name" ) )
{
if ( styleStack.hasProperty( KoXmlNS::presentation, property ) )
value = styleStack.property( KoXmlNS::presentation, property );
if ( styleStack.hasProperty( KoXmlNS::draw, property ) ) {
value = styleStack.property( KoXmlNS::draw, property );
}
return value;
......
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