← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libs/kotext/InsertVariableAction.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/kotext/InsertVariableAction.cpp
20
20
 
21
21
#include "InsertVariableAction_p.h"
22
22
#include "KoVariable.h"
23
 
#include "KoVariableFactory.h"
 
23
#include "KoInlineObjectFactoryBase.h"
24
24
 
25
25
#include <KoCanvasBase.h>
26
26
#include <kpagedialog.h>
28
28
#include <KLocale>
29
29
#include <QLayout>
30
30
 
31
 
InsertVariableAction::InsertVariableAction(KoCanvasBase *base, KoVariableFactory *factory, const KoVariableTemplate &templ)
32
 
        : InsertVariableActionBase(base, templ.name)
 
31
InsertVariableAction::InsertVariableAction(KoCanvasBase *base, KoInlineObjectFactoryBase *factory, const KoInlineObjectTemplate &templ)
 
32
        : InsertInlineObjectActionBase(base, templ.name)
33
33
        , m_factory(factory)
34
34
        , m_templateId(templ.id)
35
35
        , m_properties(templ.properties)
37
37
{
38
38
}
39
39
 
40
 
KoVariable *InsertVariableAction::createVariable()
 
40
KoInlineObject *InsertVariableAction::createInlineObject()
41
41
{
42
 
    KoVariable * variable = m_factory->createVariable(m_properties);
 
42
    KoInlineObject *io = m_factory->createInlineObject(m_properties);
 
43
    KoVariable *variable = dynamic_cast<KoVariable*>(io);
 
44
    Q_ASSERT(variable);
43
45
    QWidget *widget = variable->createOptionsWidget();
44
46
    if (widget) {
45
47
        if (widget->layout()) {
47
49
        }
48
50
        KPageDialog *dialog = new KPageDialog(m_canvas->canvasWidget());
49
51
        dialog->setCaption(i18n("%1 Options", m_templateName));
50
 
        dialog->addPage(widget, "");
 
52
        dialog->addPage(widget, QString());
51
53
        if (dialog->exec() != KPageDialog::Accepted) {
52
54
            delete variable;
53
55
            variable = 0;