summaryrefslogtreecommitdiffstats
path: root/kword/KWMailMergeDataBase.cpp
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-06-08 16:56:40 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-06-08 16:56:40 -0500
commit910a61f9423d69871c2ef9ca8a0d7ace32474f93 (patch)
tree794bd468068d2616d05878f58b0786b07ceff8d9 /kword/KWMailMergeDataBase.cpp
parent420112343c04d209e40c6f03f492cdb6154f70fb (diff)
downloadkoffice-910a61f9423d69871c2ef9ca8a0d7ace32474f93.tar.gz
koffice-910a61f9423d69871c2ef9ca8a0d7ace32474f93.zip
Update XDG information in support of bug report 892.
Diffstat (limited to 'kword/KWMailMergeDataBase.cpp')
-rw-r--r--kword/KWMailMergeDataBase.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp
index b2e2bc73..90606ce1 100644
--- a/kword/KWMailMergeDataBase.cpp
+++ b/kword/KWMailMergeDataBase.cpp
@@ -63,7 +63,7 @@ TQStringList KWMailMergeDataBase::availablePlugins()
KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),TQString());
for (KTrader::OfferList::Iterator it=pluginOffers.begin();*it;++it)
{
- tmp.append((*it)->property("X-KDE-InternalName").toString());
+ tmp.append((*it)->property("X-TDE-InternalName").toString());
kdDebug()<<"Found mail merge plugin: "<< (*it)->name()<<endl;
}
return tmp;
@@ -77,12 +77,12 @@ bool KWMailMergeDataBase::isConfigDialogShown()
bool KWMailMergeDataBase::loadPlugin(const TQString &name,const TQString &command)
{
if (rejectdcopcall)return false;
- TQString constrain=TQString("[X-KDE-InternalName] =='"+name+"'");
+ TQString constrain=TQString("[X-TDE-InternalName] =='"+name+"'");
kdDebug()<<constrain<<endl;
KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),constrain);
KService::Ptr it=pluginOffers.first();
- TQVariant verProp=it->property("X-KDE-PluginVersion");
+ TQVariant verProp=it->property("X-TDE-PluginVersion");
int version=verProp.toInt();
if (it)
@@ -116,7 +116,7 @@ KWMailMergeDataSource *KWMailMergeDataBase::openPluginFor(int type,int &version)
{
version=0;
KWMailMergeDataSource *ret=0;
- TQString constrain=TQString("'%1' in [X-KDE-Capabilities]").arg(((type==KWSLCreate)?KWSLCreate_text:KWSLOpen_text));
+ TQString constrain=TQString("'%1' in [X-TDE-Capabilities]").arg(((type==KWSLCreate)?KWSLCreate_text:KWSLOpen_text));
kdDebug()<<constrain<<endl;
KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),constrain);
@@ -138,7 +138,7 @@ KWMailMergeDataSource *KWMailMergeDataBase::openPluginFor(int type,int &version)
KWMailMergeChoosePluginDialog *dia=new KWMailMergeChoosePluginDialog(pluginOffers);
if (dia->exec()==TQDialog::Accepted)
{
- TQVariant verProp=(*(pluginOffers.at(dia->currentPlugin())))->property("X-KDE-PluginVersion");
+ TQVariant verProp=(*(pluginOffers.at(dia->currentPlugin())))->property("X-TDE-PluginVersion");
version=verProp.toInt();
ret=loadPlugin((*(pluginOffers.at(dia->currentPlugin())))->library());