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

List:       kde-commits
Subject:    koffice/kexi/plugins/reportspgz/backend/renderer
From:       Adam Pigg <adam () piggz ! co ! uk>
Date:       2009-05-29 20:37:44
Message-ID: 1243629464.023040.15970.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 975317 by piggz:

Fix indent, post-processed fields, and scripted check-box

 M  +13 -5     orprerender.cpp  


--- trunk/koffice/kexi/plugins/reportspgz/backend/renderer/orprerender.cpp #975316:975317
@@ -591,15 +591,19 @@
             QString cs = f->m_controlSource->value().toString();
             if (cs.left(1) == "=") { //Everything after = is treated as code
                 if (!cs.contains("PageTotal()")) {
-		    #if KDE_IS_VERSION(4,2,88)
+#if KDE_IS_VERSION(4,2,88)
 		      QVariant v = _handler->evaluate(cs.mid(1));
-		    #else
+#else
 		      QVariant v = _handler->evaluate(f->entityName());
-		    #endif
+#endif
                     
                     str = v.toString();
                 } else {
-                    str = f->entityName();
+#if KDE_IS_VERSION(4,2,88)
+		      str = cs.mid(1);
+#else
+		      str = f->entityName();
+#endif
                     _postProcText.append(tb);
                 }
             } else if (cs.left(1) == "$") { //Everything past $ is treated as a string 
@@ -863,7 +867,11 @@
             kDebug() << "EntityCheck CS:" << cs;
 
             if (cs.left(1) == "=") {
-                str = _handler->evaluate(cd->entityName()).toString();
+#if KDE_IS_VERSION(4,2,88)
+		      str = _handler->evaluate(cs.mid(1)).toString();
+#else
+		      str = _handler->evaluate(f->entityName()).toString();
+#endif  
             } else {
                 QString qry = "Data Source";
                 QString clm = cd->m_controlSource->value().toString();

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