r14769 by fschmid - Fixed Bug #8852 "Add date formats dd/mm/yy and dd/mm/yyyy"

[scribus-commit]

Revision: 14769
Author: fschmid
Date: 2010-02-19T16:25:21.250487Z
Commit message: Fixed Bug #8852 "Add date formats dd/mm/yy and dd/mm/yyyy"

Changeset: 
M  /branches/Version135/Scribus/scribus/annot.cpp

Diffs:
Index: scribus/annot.cpp
===================================================================
--- scribus/annot.cpp	(revision 14768)
+++ scribus/annot.cpp	(revision 14769)
@@ -876,7 +876,7 @@
 	LayoutFN1c->setSpacing( 5 );
 	LayoutFN1c->setMargin( 0 );
 	Format0c = new QComboBox(DateGroup);
-	QString tmp_form[] = {"m/d", "m/d/yy", "mm/dd/yy", "mm/yy", "d-mmm", "d-mmm-yy", "dd-mmm-yy", "yy-mm-dd",
+	QString tmp_form[] = {"m/d", "m/d/yy", "mm/dd/yy", "mm/yy", "d-mmm", "d-mmm-yy", "dd-mmm-yy", "dd/mm/yy", "dd/mm/yyyy", "yy-mm-dd",
 	                    "mmm-yy", "mmmm-yy", "mmm d, yyyy", "mmmm d, yyyy", "m/d/yy h:MM tt", "m/d/yy HH:MM", "yyyy-mm-dd"};
 	size_t array_form = sizeof(tmp_form) / sizeof(*tmp_form);
 	/* PFJ - 28/02/04 - Altered from uint to int and var name */
@@ -1452,6 +1452,10 @@
 		tmp = "d-MMM-yy";
 	if (ds == "dd-mmm-yy")
 		tmp = "dd-MMM-yy";
+	if (ds == "dd/mm/yy")
+		tmp = "dd/MM/yy";
+	if (ds == "dd/mm/yyyy")
+		tmp = "dd/MM/yyyy";
 	if (ds == "yy-mm-dd")
 		tmp = "yy-MM-dd";
 	if (ds == "mmm-yy")