← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libs/koreport/renderer/renderobjects.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:
libs/koreport/renderer/renderobjects.cpp
29
29
 
30
30
ORODocument::~ORODocument()
31
31
{
32
 
    while (!m_pages.isEmpty()) {
33
 
        OROPage * p = m_pages.takeFirst();
34
 
        p->m_document = 0;
35
 
        delete p;
36
 
    }
 
32
    //while (!m_pages.isEmpty()) {
 
33
    //    OROPage * p = m_pages.takeFirst();
 
34
    //    p->m_document = 0;
 
35
    //    delete p;
 
36
    //}
 
37
    qDeleteAll(m_pages);
 
38
    m_pages.clear();
 
39
 
 
40
    qDeleteAll(m_sections);
 
41
    m_sections.clear();
37
42
}
38
43
 
39
44
void ORODocument::setTitle(const QString & pTitle)
94
99
        m_document = 0;
95
100
    }
96
101
 
97
 
    while (!m_primitives.isEmpty()) {
98
 
        OROPrimitive* p = m_primitives.takeFirst();
99
 
        p->m_page = 0;
100
 
        delete p;
101
 
    }
 
102
    //while (!m_primitives.isEmpty()) {
 
103
    //    OROPrimitive* p = m_primitives.takeFirst();
 
104
    //    p->m_page = 0;
 
105
    //    delete p;
 
106
    //}
 
107
 
 
108
    qDeleteAll(m_primitives);
 
109
    m_primitives.clear();
102
110
}
103
111
 
104
112
int OROPage::page() const
149
157
        m_document = 0;
150
158
    }
151
159
 
152
 
    while (!m_primitives.isEmpty()) {
153
 
        OROPrimitive* p = m_primitives.takeFirst();
154
 
        delete p;
155
 
    }
 
160
    //while (!m_primitives.isEmpty()) {
 
161
   //     OROPrimitive* p = m_primitives.takeFirst();
 
162
    //    delete p;
 
163
    //}
 
164
    qDeleteAll(m_primitives);
 
165
    m_primitives.clear();
 
166
    
156
167
}
157
168
 
158
169
long OROSection::row() const