[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kpresenter
From:       Thorsten Zachmann <t.zachmann () zagge ! de>
Date:       2010-02-12 18:26:57
Message-ID: 1265999217.389202.31936.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1089229 by zachmann:

o fix presentation:date-time variable


 M  +2 -2      part/KPrDeclarations.cpp  
 M  +1 -1      plugins/variable/PresentationVariable.cpp  
 M  +1 -1      plugins/variable/PresentationVariableFactory.cpp  


--- trunk/koffice/kpresenter/part/KPrDeclarations.cpp #1089228:1089229
@@ -58,7 +58,7 @@
             }
             else if(element.tagName() == "date-time-decl") {
                 QMap<QString, QVariant> data;
-                data["name"] = element.attributeNS(KoXmlNS::presentation, "name", \
QString()); +                const QString name = \
                element.attributeNS(KoXmlNS::presentation, "name", QString());
                 data["fixed"] = element.attributeNS(KoXmlNS::presentation, "source", \
"fixed") == "fixed";  
                 QString styleName = element.attributeNS(KoXmlNS::style, \
"data-style-name", ""); @@ -75,7 +75,7 @@
                     data["fixed value"] = element.text();
                 }
 
-
+                m_declarations[DateTime].insert(name, data);
             }
         }
         else if (element.tagName() == "page" && element.namespaceURI() == \
                KoXmlNS::draw) {
--- trunk/koffice/kpresenter/plugins/variable/PresentationVariable.cpp \
#1089228:1089229 @@ -107,7 +107,7 @@
         m_type = KPrDeclarations::Header;
     }
     else if (localName == "date-time") {
-        m_type = KPrDeclarations::Header;
+        m_type = KPrDeclarations::DateTime;
     }
     return true;
 }
--- trunk/koffice/kpresenter/plugins/variable/PresentationVariableFactory.cpp \
#1089228:1089229 @@ -52,7 +52,7 @@
 
 
     QStringList elementNames;
-    elementNames << "footer" << "header";
+    elementNames << "footer" << "header" << "date-time";
     setOdfElementNames(KoXmlNS::presentation, elementNames);
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]