Merge branch 'gui' into cache

[mdictionary] / trunk / src / plugins / xdxf / src / TranslationXdxf.cpp

diff --git a/trunk/src/plugins/xdxf/src/TranslationXdxf.cpp b/trunk/src/plugins/xdxf/src/TranslationXdxf.cpp
index caf16ba..39caf28 100644 (file)
--- a/trunk/src/plugins/xdxf/src/TranslationXdxf.cpp
+++ b/trunk/src/plugins/xdxf/src/TranslationXdxf.cpp
@@ -28,8 +28,11 @@
 TranslationXdxf::TranslationXdxf() {
 }
 
-TranslationXdxf::TranslationXdxf(QString _key, QString _dictionaryInfo, XdxfPlugin *xdxfPlugin): _key(_key),_dictionaryInfo(_dictionaryInfo) {
+TranslationXdxf::TranslationXdxf(QString _key, QString _dictionaryInfo,
+         XdxfPlugin *xdxfPlugin): _key(_key),_dictionaryInfo(_dictionaryInfo) {
     this->xdxfPlugin=xdxfPlugin;
+    if(xdxfPlugin)
+        _dictHash = xdxfPlugin->hash();
 }
 
 QString TranslationXdxf::key() const {
@@ -42,8 +45,12 @@ QString TranslationXdxf::dictionaryInfo() const {
 
 QString TranslationXdxf::toHtml() const {
     QString result("");
+    
+    if(!xdxfPlugin)
+        return result;
     result+="<dict>" + _dictionaryInfo + xdxfPlugin->search(_key) + "</dict>";
     result.replace("&","&amp;");
+    
     return result;
 }