summaryrefslogtreecommitdiff
authorthufir <thufir>2002-07-04 17:55:16 (UTC)
committer thufir <thufir>2002-07-04 17:55:16 (UTC)
commitf3eaec3a60e32af8abad6563df32499a096b7e70 (patch) (side-by-side diff)
tree996220ef5b11b20c6482e21b2cdb928ce6a9c6c3
parent3fc06dce797f62393bab41f4ea520bdbeb31eb9f (diff)
downloadopie-f3eaec3a60e32af8abad6563df32499a096b7e70.zip
opie-f3eaec3a60e32af8abad6563df32499a096b7e70.tar.gz
opie-f3eaec3a60e32af8abad6563df32499a096b7e70.tar.bz2
fixed bugs
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-sheet/opie-sheet.control2
-rw-r--r--noncore/apps/opie-sheet/sortdlg.cpp10
2 files changed, 6 insertions, 6 deletions
diff --git a/noncore/apps/opie-sheet/opie-sheet.control b/noncore/apps/opie-sheet/opie-sheet.control
index f772247..38f9083 100644
--- a/noncore/apps/opie-sheet/opie-sheet.control
+++ b/noncore/apps/opie-sheet/opie-sheet.control
@@ -1,2 +1,2 @@
-Files: bin/sheetqt apps/Applications/opie-sheet.desktop help/html/sheetqt.html help/html/sheetqt/* pics/opie-sheet/sheetqt.png
+Files: bin/sheetqt apps/Applications/opie-sheet.desktop help/sheetqt.html help/sheetqt/* pics/opie-sheet/sheetqt.png
Priority: optional
diff --git a/noncore/apps/opie-sheet/sortdlg.cpp b/noncore/apps/opie-sheet/sortdlg.cpp
index 4f18fd3..c60be0d 100644
--- a/noncore/apps/opie-sheet/sortdlg.cpp
+++ b/noncore/apps/opie-sheet/sortdlg.cpp
@@ -116,3 +116,3 @@ int SortDialog::exec(Sheet *s)
{
- QString field1S=comboFieldA->currentText(), field2S=comboFieldA->currentText(), field3S=comboFieldA->currentText();
+ QString field1S=comboFieldA->currentText(), field2S=comboFieldB->currentText(), field3S=comboFieldC->currentText();
field1S=field1S.mid(field1S.find(' ')+1);
@@ -135,3 +135,3 @@ int SortDialog::exec(Sheet *s)
{
- compareResult=compareItems(s->item(field2, j-1), s->item(field2, j), groupOrderA->id(groupOrderB->selected()), checkCase->isChecked());
+ compareResult=compareItems(s->item(field2, j-1), s->item(field2, j), groupOrderB->id(groupOrderB->selected()), checkCase->isChecked());
if (compareResult>0) swap=TRUE;
@@ -139,3 +139,3 @@ int SortDialog::exec(Sheet *s)
{
- compareResult=compareItems(s->item(field3, j-1), s->item(field3, j), groupOrderA->id(groupOrderC->selected()), checkCase->isChecked());
+ compareResult=compareItems(s->item(field3, j-1), s->item(field3, j), groupOrderC->id(groupOrderC->selected()), checkCase->isChecked());
if (compareResult>0) swap=TRUE;
@@ -162,3 +162,3 @@ int SortDialog::exec(Sheet *s)
{
- compareResult=compareItems(s->item(j-1, field2), s->item(j, field2), groupOrderA->id(groupOrderB->selected()), checkCase->isChecked());
+ compareResult=compareItems(s->item(j-1, field2), s->item(j, field2), groupOrderB->id(groupOrderB->selected()), checkCase->isChecked());
if (compareResult>0) swap=TRUE;
@@ -166,3 +166,3 @@ int SortDialog::exec(Sheet *s)
{
- compareResult=compareItems(s->item(j-1, field3), s->item(j, field3), groupOrderA->id(groupOrderC->selected()), checkCase->isChecked());
+ compareResult=compareItems(s->item(j-1, field3), s->item(j, field3), groupOrderC->id(groupOrderC->selected()), checkCase->isChecked());
if (compareResult>0) swap=TRUE;