Commit 982764c3 authored by Jan Hambrecht's avatar Jan Hambrecht

SVN_SILENT cleanup


svn path=/trunk/koffice/; revision=821219
parent c1fc6650
......@@ -191,8 +191,6 @@ void KoPatternBackground::fillStyle( KoGenStyle &style, KoShapeSavingContext &co
if( ! d->imageData )
return;
QSizeF size = d->imageData->imageSize();
switch( d->repeat )
{
case Original:
......
......@@ -1032,48 +1032,6 @@ void KoShape::saveOdfAttributes(KoShapeSavingContext &context, int attributes) c
}
if(attributes & OdfTransformation) {
// just like in shapes; ODF allows you to manipulate the 'matrix' after setting an
// ofset on the shape (using the x and y positions). Lets save them here.
/*
bool rotate = qAbs(d->angle) > 1E-6;
bool skew = qAbs(d->shearX) > 1E-6 || qAbs(d->shearY) > 1E-6;
bool scale = qAbs(d->scaleX - 1) > 1E-6 || qAbs(d->scaleY -1) > 1E-6;
if(rotate && (skew || scale)) {
QMatrix matrix; // can't use absoluteTransformation() as that includes transformation of the container as well.
QSizeF size(this->size());
if ( d->angle != 0 )
{
matrix.translate( size.width() / 2.0 * d->scaleX, size.height() / 2.0 * d->scaleY );
matrix.translate( size.height() / 2.0 * d->shearX, size.width() / 2.0 * d->shearY );
matrix.rotate( d->angle );
matrix.translate( -size.width() / 2.0 * d->scaleX, -size.height() / 2.0 * d->scaleY );
matrix.translate( -size.height() / 2.0 * d->shearX, -size.width() / 2.0 * d->shearY );
}
matrix.shear( d->shearX, d->shearY );
matrix.scale( d->scaleX, d->scaleY );
QString m = QString( "matrix(0 0 %3 %4 %5pt %6pt)" ).arg( matrix.m11() ).arg( matrix.m12() )
.arg( matrix.m21() ).arg( matrix.m22() )
.arg( matrix.dx() ) .arg( matrix.dy() );
context.xmlWriter().addAttribute( "draw:transform", m );
}
else if(rotate || skew || scale) {
QString transform;
if(rotate)
transform = "rotate("+ QString::number(d->angle) +')';
if(skew)
transform = "skewX("+ QString::number(d->shearX) +") skewY("+ QString::number(d->shearY) +')';
if(scale) {
transform += "scale("+ QString::number(d->scaleX);
if(d->scaleX != d->scaleY)
transform += ','+ QString::number(d->scaleY);
transform += ')';
}
context.xmlWriter().addAttribute( "draw:transform", transform );
}
*/
QMatrix matrix = absoluteTransformation(0);
if( ! matrix.isIdentity() )
{
......
......@@ -69,7 +69,6 @@ void KoShapeShadow::paint(KoShape *shape, QPainter &painter, const KoViewConvert
KoShape::applyConversion( painter, converter );
painter.setPen( d->color );
//if( shape->background().style() != Qt::NoBrush )
if( shape->background() )
painter.setBrush( QBrush(d->color) );
QMatrix tm;
......
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