← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libs/odf/KoOasisSettings.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/odf/KoOasisSettings.cpp
27
27
 
28
28
KoOasisSettings::KoOasisSettings(const KoXmlDocument& doc)
29
29
        : m_settingsElement(KoXml::namedItemNS(doc.documentElement(), KoXmlNS::office, "settings")),
30
 
        m_configNSURI(KoXmlNS::config)
 
30
        m_configNsUri(KoXmlNS::config)
31
31
        , d(0)
32
32
{
33
33
    const KoXmlElement contents = doc.documentElement();
37
37
 
38
38
KoOasisSettings::KoOasisSettings(const KoXmlDocument& doc, const char* officeNSURI, const char* configNSURI)
39
39
        : m_settingsElement(KoXml::namedItemNS(doc.documentElement(), officeNSURI, "settings")),
40
 
        m_configNSURI(configNSURI)
 
40
        m_configNsUri(configNSURI)
41
41
        , d(0)
42
42
{
43
43
    const KoXmlElement contents = doc.documentElement();
55
55
    KoXmlElement e;
56
56
    forEachElement(e, m_settingsElement) {
57
57
        if (e.localName() == "config-item-set" &&
58
 
                e.namespaceURI() == m_configNSURI &&
59
 
                e.attributeNS(m_configNSURI, "name", QString()) == itemSetName) {
 
58
                e.namespaceURI() == m_configNsUri &&
 
59
                e.attributeNS(m_configNsUri, "name", QString()) == itemSetName) {
60
60
            return Items(e, this);
61
61
        }
62
62
    }
69
69
    KoXmlElement configItem;
70
70
    forEachElement(configItem, m_element) {
71
71
        if (configItem.localName() == "config-item-map-indexed" &&
72
 
                configItem.namespaceURI() == m_settings->m_configNSURI &&
73
 
                configItem.attributeNS(m_settings->m_configNSURI, "name", QString()) == itemMapName) {
 
72
                configItem.namespaceURI() == m_settings->m_configNsUri &&
 
73
                configItem.attributeNS(m_settings->m_configNsUri, "name", QString()) == itemMapName) {
74
74
            return IndexedMap(configItem, m_settings);
75
75
        }
76
76
    }
82
82
    KoXmlElement configItem;
83
83
    forEachElement(configItem, m_element) {
84
84
        if (configItem.localName() == "config-item-map-named" &&
85
 
                configItem.namespaceURI() == m_settings->m_configNSURI &&
86
 
                configItem.attributeNS(m_settings->m_configNSURI, "name", QString()) == itemMapName) {
 
85
                configItem.namespaceURI() == m_settings->m_configNsUri &&
 
86
                configItem.attributeNS(m_settings->m_configNsUri, "name", QString()) == itemMapName) {
87
87
            return NamedMap(configItem, m_settings);
88
88
        }
89
89
    }
96
96
    KoXmlElement entry;
97
97
    forEachElement(entry, m_element) {
98
98
        if (entry.localName() == "config-item-map-entry" &&
99
 
                entry.namespaceURI() == m_settings->m_configNSURI) {
 
99
                entry.namespaceURI() == m_settings->m_configNsUri) {
100
100
            if (i == entryIndex)
101
101
                return Items(entry, m_settings);
102
102
            else
111
111
    KoXmlElement entry;
112
112
    forEachElement(entry, m_element) {
113
113
        if (entry.localName() == "config-item-map-entry" &&
114
 
                entry.namespaceURI() == m_settings->m_configNSURI &&
115
 
                entry.attributeNS(m_settings->m_configNSURI, "name", QString()) == entryName) {
 
114
                entry.namespaceURI() == m_settings->m_configNsUri &&
 
115
                entry.attributeNS(m_settings->m_configNsUri, "name", QString()) == entryName) {
116
116
            return Items(entry, m_settings);
117
117
        }
118
118
    }
126
126
    KoXmlElement it;
127
127
    forEachElement(it, element) {
128
128
        if (it.localName() == "config-item" &&
129
 
                it.namespaceURI() == m_settings->m_configNSURI &&
130
 
                it.attributeNS(m_settings->m_configNSURI, "name", QString()) == item) {
 
129
                it.namespaceURI() == m_settings->m_configNsUri &&
 
130
                it.attributeNS(m_settings->m_configNsUri, "name", QString()) == item) {
131
131
            *ok = true;
132
132
            return it.text();
133
133
        }