← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/koffice/oneiric-updates

« back to all changes in this revision

Viewing changes to kword/part/frames/KWFrameSet.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2010-10-27 17:52:57 UTC
  • mfrom: (0.12.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20101027175257-s04zqqk5bs8ckm9o
Tags: 1:2.2.83-0ubuntu1
* Merge with Debian git remaining changes:
 - Add build-deps on librcps-dev, opengtl-dev, libqtgtl-dev, freetds-dev,
   create-resources, libspnav-dev
 - Remove needless build-dep on libwv2-dev
 - koffice-libs recommends create-resources
 - krita recommends pstoedit
 - Keep our patches
* New upstream release 2.3 beta 3
  - Remove debian/patches fixed by upstream
  - Update install files

Show diffs side-by-side

added added

removed removed

Lines of Context:
kword/part/frames/KWFrameSet.cpp
23
23
 
24
24
#include <kdebug.h>
25
25
 
26
 
KWFrameSet::KWFrameSet()
27
 
        : QObject()
 
26
KWFrameSet::KWFrameSet(KWord::FrameSetType type)
 
27
    : QObject(),
 
28
    m_type(type)
28
29
{
29
30
}
30
31
 
61
62
{
62
63
    int i = 1;
63
64
    foreach (KWFrame *frame, frames()) {
64
 
        kDebug(32001) << " +-- Frame" << i++ << " of" << frameCount() << "    (" << frame << ")" <<
65
 
        (frame->isCopy() ? "[copy]" : "") << endl;
 
65
        kDebug(32001) << " +-- Frame" << i++ << "of" << frameCount() << "    (" << frame << frame->shape() << ")"
 
66
            << (frame->isCopy() ? "[copy]" : "");
66
67
        printDebug(frame);
67
68
    }
68
69
}
73
74
    static const char * runaroundSide[] = { "Biggest", "Left", "Right", "Auto", "Both", "ERROR" };
74
75
    static const char * frameBh[] = { "AutoExtendFrame", "AutoCreateNewFrame", "Ignore", "ERROR" };
75
76
    static const char * newFrameBh[] = { "Reconnect", "NoFollowup", "Copy" };
76
 
    kDebug(32001) << "     Rectangle :" << frame->shape()->position().x() << "," << frame->shape()->position().y() << "" << frame->shape()->size().width() << "x" << frame->shape()->size().height();
77
 
    kDebug(32001) << "     RunAround:" << runaround[ frame->textRunAround()] << " side:" << runaroundSide[ frame->runAroundSide()];
78
 
    kDebug(32001) << "     FrameBehavior:" << frameBh[ frame->frameBehavior()];
79
 
    kDebug(32001) << "     NewFrameBehavior:" << newFrameBh[ frame->newFrameBehavior()];
 
77
    kDebug(32001) << "     Rectangle :" << frame->shape()->position().x() << "," << frame->shape()->position().y() << frame->shape()->size().width() << "x" << frame->shape()->size().height();
 
78
    kDebug(32001) << "     RunAround:" << runaround[frame->textRunAround()] << "side:" << runaroundSide[frame->runAroundSide()];
 
79
    kDebug(32001) << "     FrameBehavior:" << frameBh[frame->frameBehavior()];
 
80
    kDebug(32001) << "     NewFrameBehavior:" << newFrameBh[frame->newFrameBehavior()];
80
81
    if (!frame->shape()->background())
81
82
        kDebug(32001) << "     BackgroundColor: Transparent";
82
83
    else {