← Back to branch summary

~ubuntu-branches/ubuntu/precise/koffice/precise

« back to all changes in this revision

Viewing changes to kpresenter/part/pagelayout/KPrPlaceholders.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-09-21 15:36:35 UTC
  • mfrom: (1.4.1 upstream) (60.2.11 maverick)
  • Revision ID: james.westby@ubuntu.com-20100921153635-6tejqkiro2u21ydi
Tags: 1:2.2.2-0ubuntu3
Add kubuntu_03_fix-crash-on-closing-sqlite-connection-2.2.2.diff and
kubuntu_04_support-large-memo-values-for-msaccess-2.2.2.diff as
recommended by upstream http://kexi-
project.org/wiki/wikiview/index.php@Kexi2.2_Patches.html#sqlite_stab
ility

Show diffs side-by-side

added added

removed removed

Lines of Context:
kpresenter/part/pagelayout/KPrPlaceholders.cpp
115
115
        QList<QRectF>::const_iterator listIt( list.begin() );
116
116
        for ( ; listIt != list.end(); ++listIt ) {
117
117
             KPrPlaceholderShape * shape = new KPrPlaceholderShape( itPlaceholder.key() );
118
 
             shape->initStrategy( document->dataCenterMap() );
 
118
             shape->initStrategy(document->resourceManager());
119
119
             shape->setAdditionalAttribute( "presentation:placeholder", "true" );
120
120
             shape->setAdditionalAttribute( "presentation:class", itPlaceholder.key() );
121
121
             shape->setSize( ( * listIt ).size() );
236
236
        QTextCursor newCursor( newData->document() );
237
237
        newCursor.select( QTextCursor::Document );
238
238
        KoTextDocument textDocument( newData->document() );
239
 
        KoStyleManager * styleManager = textDocument.styleManager();
240
239
 
241
240
        QTextBlockFormat blockFormat( cursor.blockFormat() );
242
241
        // TODO check if needed