← Back to branch summary

~smartboyhw/ubuntu/raring/calligra/2.6.0-0ubuntu1

« back to all changes in this revision

Viewing changes to stage/part/animations/strategy/KPrAttributeRotate.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-10-23 21:09:16 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20121023210916-m82w6zxnxhaxz7va
Tags: 1:2.5.90-0ubuntu1
https://launchpad.net/bugs/1070436
https://launchpad.net/bugs/1071686
* New upstream alpha release (LP: #1070436)
  - Add libkactivities-dev and libopenimageio-dev to build-depends
  - Add kubuntu_build_calligraactive.diff to build calligraactive by default
  - Add package for calligraauthor and move files that are shared between
    calligrawords and calligraauthor to calligrawords-common
* Document the patches
* Remove numbers from patches so they follow the same naming scheme as
  the rest of our patches.
* calligra-data breaks replaces krita-data (<< 1:2.5.3) (LP: #1071686)

Show diffs side-by-side

added added

removed removed

Lines of Context:
stage/part/animations/strategy/KPrAttributeRotate.cpp
35
35
{
36
36
    qreal tx = 0.0, ty = 0.0;
37
37
    KoShape * shape = shapeAnimation->shape();
38
 
    KoTextBlockData * textBlockData = shapeAnimation->textBlockData();
 
38
    QTextBlockUserData *textBlockData = shapeAnimation->textBlockUserData();
39
39
    QTransform transform;
40
40
    if (textBlockData) {
41
41
        if (KoTextShapeData *textShapeData = dynamic_cast<KoTextShapeData*>(shape->userData())) {
55
55
        ty = shape->size().height() * cache->zoom() / 2;
56
56
    }
57
57
    transform.translate(tx, ty).rotate(value).translate(-tx, -ty);
58
 
    cache->update(shape, shapeAnimation->textBlockData(),"transform", transform);
 
58
    cache->update(shape, textBlockData,"transform", transform);
59
59
}
60
60
 
61
61
void KPrAttributeRotate::initCache(KPrAnimationCache *animationCache, int step, KPrShapeAnimation * shapeAnimation, qreal startValue, qreal endValue)
62
62
{
63
63
    qreal tx = 0.0, ty = 0.0;
64
64
    KoShape * shape = shapeAnimation->shape();
65
 
    KoTextBlockData * textBlockData = shapeAnimation->textBlockData();
 
65
    QTextBlockUserData * textBlockData = shapeAnimation->textBlockUserData();
66
66
    if (textBlockData) {
67
67
        if (KoTextShapeData *textShapeData = dynamic_cast<KoTextShapeData*>(shape->userData())) {
68
68
            QTextDocument *textDocument = textShapeData->document();