-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
As has been pointed out, the graphics import error message is less than
ideal. Here's a fix. Anyone else who dislikes the error messages they've
been getting (unless they have to do with missing features :-) should feel
free to suggest suggestions to me.
sam th
[EMAIL PROTECTED]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.1 (GNU/Linux)
Comment: For info see http://www.gnupg.org
iD8DBQE4r7sFt+kM0Mq9M/wRArcrAJ0VbN2mGH9a5AvipFlYjTCQpCp/twCfSrgQ
NGm344mgKCwGP9Pj3UIR5SM=
=L5wQ
-----END PGP SIGNATURE-----
Index: src/af/util/xp/ut_types.h
===================================================================
RCS file: /cvsroot/abi/src/af/util/xp/ut_types.h,v
retrieving revision 1.30
diff -u -r1.30 ut_types.h
--- src/af/util/xp/ut_types.h 2000/01/27 06:15:43 1.30
+++ src/af/util/xp/ut_types.h 2000/02/20 09:54:17
@@ -83,7 +83,8 @@
#define UT_IE_FAKETYPE ((UT_Error) -307)
#define UT_INVALIDFILENAME ((UT_Error) -308)
#define UT_NOPIECETABLE ((UT_Error) -309)
-#define UT_IE_ADDLISTENERERROR ((UT_Error) -310)
+#define UT_IE_ADDLISTENERERROR ((UT_Error) -310)
+#define UT_IE_UNSUPTYPE ((UT_Error) -311)
#define UT_IE_IMPORTERROR ((UT_Error) -300) /* The general case */
Index: src/wp/ap/xp/ap_EditMethods.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/xp/ap_EditMethods.cpp,v
retrieving revision 1.181
diff -u -r1.181 ap_EditMethods.cpp
--- src/wp/ap/xp/ap_EditMethods.cpp 2000/02/17 18:38:07 1.181
+++ src/wp/ap/xp/ap_EditMethods.cpp 2000/02/20 09:54:21
@@ -50,6 +50,7 @@
#include "ap_Dialog_Spell.h"
#include "ap_Dialog_Insert_DateTime.h"
#include "ap_Dialog_Field.h"
+#include "ap_Dialog_WordCount.h"
#include "xap_DialogFactory.h"
#include "xap_Dlg_About.h"
@@ -1184,6 +1185,10 @@
pDialog->setMessage(pSS->getValue(AP_STRING_ID_MSG_IE_FakeType),pNewFile);
break;
+ case -311:
+
+pDialog->setMessage(pSS->getValue(AP_STRING_ID_MSG_IE_UnsupportedType),pNewFile);
+ break;
+
default:
pDialog->setMessage(pSS->getValue(AP_STRING_ID_MSG_ImportError),pNewFile);
}
@@ -1796,16 +1801,6 @@
return (!(strncmp(str, str2, 4)) || !(strncmp(str, str3, 6)));
}
-// This function is no longer needed
-//
-// UT_Error toErrorCode(IEStatus IES)
-// {
-// if (!IES)
-// return UT_OK;
-// else
-// return ((300 + IES - 1) * -1);
-// }
-
Defun1(fileInsertGraphic)
{
XAP_Frame * pFrame = (XAP_Frame *) pAV_View->getParentData();
@@ -1835,7 +1830,7 @@
if(!tmpVar)
{
- errorCode = UT_IE_FAKETYPE;
+ errorCode = UT_IE_UNSUPTYPE;
s_CouldNotLoadFileMessage(pFrame, pNewFile, errorCode);
FREEP(pNewFile);
return UT_FALSE;
/****************************************************************/
/****************************************************************/
Index: src/wp/ap/xp/ap_String_Id.h
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/xp/ap_String_Id.h,v
retrieving revision 1.30
diff -u -r1.30 ap_String_Id.h
--- src/wp/ap/xp/ap_String_Id.h 2000/02/15 07:28:05 1.30
+++ src/wp/ap/xp/ap_String_Id.h 2000/02/20 09:54:21
@@ -38,6 +38,7 @@
dcl(MSG_IE_NoMemory, "Out of memory attempting to open %s")
dcl(MSG_IE_UnknownType, "File %s is of unkown type")
dcl(MSG_IE_FakeType, "File %s is not of the type it claims to be")
+dcl(MSG_IE_UnsupportedType, "File %s is not of a currently supported file type")
dcl(MSG_IE_BogusDocument, "File %s is a bogus document")
dcl(MSG_IE_CouldNotOpen, "Could not open file %s for writing")
dcl(MSG_IE_CouldNotWrite, "Could not write to file %s")
