← Back to branch summary

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

« back to all changes in this revision

Viewing changes to kspread/shape/TableShape.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:
kspread/shape/TableShape.cpp
159
159
    painter.setClipRect(paintRect, Qt::IntersectClip);
160
160
 
161
161
    // painting cell contents
162
 
    d->sheetView->setPaintDevice(painter.device());
163
162
    d->sheetView->setViewConverter(&converter);
164
 
    d->sheetView->paintCells(0 /*paintDevice*/, painter, paintRect, QPointF(0.0, 0.0));
 
163
    d->sheetView->paintCells(painter, paintRect, QPointF(0.0, 0.0));
165
164
}
166
165
 
167
166
bool TableShape::loadOdf(const KoXmlElement &element, KoShapeLoadingContext &context)
172
171
        KoOdfLoadingContext& odfContext = context.odfLoadingContext();
173
172
        OdfLoadingContext tableContext(odfContext);
174
173
        QHash<QString, Conditions> conditionalStyles;
175
 
        Styles autoStyles = sheet()->map()->styleManager()->loadOdfAutoStyles(odfContext.stylesReader(), conditionalStyles);
 
174
        Map *const map = sheet()->map();
 
175
        StyleManager *const styleManager = map->styleManager();
 
176
        ValueParser *const parser = map->parser();
 
177
        Styles autoStyles = styleManager->loadOdfAutoStyles(odfContext.stylesReader(), conditionalStyles, parser);
176
178
 
177
179
        if (!element.attributeNS(KoXmlNS::table, "name", QString()).isEmpty()) {
178
180
            sheet()->setSheetName(element.attributeNS(KoXmlNS::table, "name", QString()), true);