Commit cce69b18 authored by Johannes Simon's avatar Johannes Simon

Accidentally committed these

svn path=/trunk/koffice/; revision=838205
parent 65e7a97e
...@@ -293,7 +293,7 @@ QMatrix KoShape::absoluteTransformation(const KoViewConverter *converter) const ...@@ -293,7 +293,7 @@ QMatrix KoShape::absoluteTransformation(const KoViewConverter *converter) const
KoShapeContainer * container = d->parent; KoShapeContainer * container = d->parent;
if( container ) { if( container ) {
if( container->childClipped(this) ) if( container->childClipped(this) )
matrix = container->absoluteTransformation(converter); matrix = container->absoluteTransformation(0);
else { else {
QSizeF containerSize = container->size(); QSizeF containerSize = container->size();
QPointF containerPos = container->absolutePosition() - QPointF( 0.5*containerSize.width(), 0.5*containerSize.height() ); QPointF containerPos = container->absolutePosition() - QPointF( 0.5*containerSize.width(), 0.5*containerSize.height() );
......
...@@ -180,6 +180,9 @@ void KoShapeManager::paint( QPainter &painter, const KoViewConverter &converter, ...@@ -180,6 +180,9 @@ void KoShapeManager::paint( QPainter &painter, const KoViewConverter &converter,
qSort(sortedShapes.begin(), sortedShapes.end(), KoShape::compareShapeZIndex); qSort(sortedShapes.begin(), sortedShapes.end(), KoShape::compareShapeZIndex);
foreach ( KoShape * shape, sortedShapes ) { foreach ( KoShape * shape, sortedShapes ) {
if(shape->parent() != 0 && shape->parent()->childClipped(shape))
continue;
d->strategy->paint( shape, painter, converter, forPrint ); d->strategy->paint( shape, painter, converter, forPrint );
} }
......
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