PAL10212

diff --git a/src/Qtx/QtxPopupMgr.cxx b/src/Qtx/QtxPopupMgr.cxx
index d0f2fda9d5f9ee42dd9342f7657b574943dd0b86..6f9d284279ee1b2ee4e2e9ab76f2ab5b8a4313fd 100644 (file)
--- a/src/Qtx/QtxPopupMgr.cxx
+++ b/src/Qtx/QtxPopupMgr.cxx
@@ -232,11 +232,11 @@ QtxPopupMgr::~QtxPopupMgr()
 void QtxPopupMgr::createOperations()
 {
     myOperations = new QtxListOfOperations;
-    myOperations->append( "logic",   new QtxLogic(),           0 );
-    myOperations->append( "arithm",  new QtxArithmetics(),    50 );
-    myOperations->append( "strings", new QtxStrings(),       100 );
-    myOperations->append( "sets",    new QtxSets(),          150 );
-    myOperations->append( "custom",  new Operations( this ), 200 );
+    myOperations->prepend( "logic",   new QtxLogic(),           0 );
+    myOperations->prepend( "arithm",  new QtxArithmetics(),    50 );
+    myOperations->prepend( "strings", new QtxStrings(),       100 );
+    myOperations->prepend( "sets",    new QtxSets(),          150 );
+    myOperations->prepend( "custom",  new Operations( this ), 200 );
 }
 
 //================================================================

diff --git a/src/Qtx/QtxStdOperations.cxx b/src/Qtx/QtxStdOperations.cxx
index 69a7453c9b2f33fecc87f136d00d59a9a46aad12..f6c34bd759057f99aa1dd658d3b2441bc41135e4 100644 (file)
--- a/src/Qtx/QtxStdOperations.cxx
+++ b/src/Qtx/QtxStdOperations.cxx
@@ -777,9 +777,9 @@ QtxParser::Error QtxSets::calculate( const QString& op, QtxValue& v1, QtxValue&
                 remove( aNewList, v2.toList() );
 
                 if( op=="=" )
-                    set( v1, aNewList.isEmpty() );
+                    set( v1, aNewList.isEmpty() && v1.toList().count()==v2.toList().count() );
                 else if( op=="<>" || op=="!=" )
-                    set( v1, !aNewList.isEmpty() );
+                    set( v1, !aNewList.isEmpty() || v1.toList().count()!=v2.toList().count() );
                 else
                     v1 = aNewList;
             }