Index: sc/inc/errorcodes.hxx
===================================================================
RCS file: /cvs/sc/sc/inc/errorcodes.hxx,v
retrieving revision 1.2
diff -u -p -u -r1.2 errorcodes.hxx
--- sc/inc/errorcodes.hxx	8 Mar 2004 11:40:52 -0000	1.2
+++ sc/inc/errorcodes.hxx	18 Apr 2005 11:26:47 -0000
@@ -74,7 +74,7 @@ namespace ScErrorCodes
 
 const USHORT errIllegalChar          = 501;
 const USHORT errIllegalArgument      = 502;
-const USHORT errIllegalFPOperation   = 503;
+const USHORT errIllegalFPOperation   = 503; // #NUM!
 const USHORT errIllegalParameter     = 504;
 const USHORT errIllegalJump          = 505;
 const USHORT errSeparator            = 506;
@@ -90,13 +90,13 @@ const USHORT errUnknownState         = 5
 const USHORT errUnknownVariable      = 516;
 const USHORT errUnknownOpCode        = 517;
 const USHORT errUnknownStackVariable = 518;
-const USHORT errNoValue              = 519;
+const USHORT errNoValue              = 519; // #VALUE!
 const USHORT errUnknownToken         = 520;
-const USHORT errNoCode               = 521;
+const USHORT errNoCode               = 521; // #NULL!
 const USHORT errCircularReference    = 522;
 const USHORT errNoConvergence        = 523;
-const USHORT errNoRef                = 524;
-const USHORT errNoName               = 525;
+const USHORT errNoRef                = 524; // #REF!
+const USHORT errNoName               = 525; // #NAME?
 const USHORT errDoubleRef            = 526;
 const USHORT errInterpOverflow       = 527;
 // Not displayed, temporary for TrackFormulas,
@@ -108,6 +108,7 @@ const USHORT errCellNoValue          = 5
 const USHORT errNoAddin              = 530;
 // Interpreter: needed Macro not found
 const USHORT errNoMacro              = 531;
+const USHORT errDivisionByZero       = 532; // #DIV/0!
 
 // Interpreter: NA() not available condition, not a real error
 const USHORT NOVALUE                 = 0x7fff;
Index: sc/inc/globstr.hrc
===================================================================
RCS file: /cvs/sc/sc/inc/globstr.hrc,v
retrieving revision 1.12
diff -u -p -u -r1.12 globstr.hrc
--- sc/inc/globstr.hrc	17 Sep 2004 13:52:04 -0000	1.12
+++ sc/inc/globstr.hrc	18 Apr 2005 11:26:47 -0000
@@ -576,6 +576,11 @@
 
 #define STR_ERR_DATAPILOT_INPUT     411
 
+#define STR_DIV_ZERO                412
+#define STR_LONG_ERR_DIV_ZERO       413
+#define STR_NUM_ERROR               414
+#define STR_NULL_ERROR              415
+
 #define STR_RECALC_MANUAL           416
 #define STR_RECALC_AUTO             417
 
Index: sc/source/ui/src/globstr.src
===================================================================
RCS file: /cvs/sc/sc/source/ui/src/globstr.src,v
retrieving revision 1.61
diff -u -p -u -r1.61 globstr.src
--- sc/source/ui/src/globstr.src	14 Jan 2005 12:15:01 -0000	1.61
+++ sc/source/ui/src/globstr.src	18 Apr 2005 11:26:48 -0000
@@ -2587,7 +2588,38 @@ Resource RID_GLOBSTR
         Text [ de ] = "Sie können diesen Teil der Datenpilot-Tabelle nicht ändern.";
         Text[ en-US ] = "You cannot change this part of the DataPilot table.";
     };
-
+	String STR_DIV_ZERO
+	{
+		Text [ de ] = "#DIV/0!" ;
+		Text [ en-US ] = "#DIV/0!" ;
+		Text [ x-comment ] = " ";
+	};
+	String STR_LONG_ERR_DIV_ZERO
+	{
+		Text [ de ] = "Division by zero" ;
+		Text [ en-US ] = "Division by zero" ;
+		Text[ de ] = "Division durch null";
+		Text[ es ] = "División por cero";
+		Text[ fr ] = "Division par zéro";
+		Text[ it ] = "Divisione per zero";
+		Text[ ja ] = "0による分割";
+		Text[ pt-BR ] = "Divisão por zero";
+		Text[ zh-CN ] = "除以零";
+		Text[ zh-TW ] = "除數為零";
+		Text [ x-comment ] = " ";
+	};
+	String STR_NUM_ERROR
+	{
+		Text [ de ] = "#NUM!" ;
+		Text [ en-US ] = "#NUM!" ;
+		Text [ x-comment ] = " ";
+	};
+	String STR_NULL_ERROR
+	{
+		Text [ de ] = "#NUL!" ;
+		Text [ en-US ] = "#NULL!" ;
+		Text [ x-comment ] = " ";
+	};
     String STR_RECALC_MANUAL
     {
         Text [ de ] = "Manuell";
Index: sc/source/core/data/global.cxx
===================================================================
RCS file: /cvs/sc/sc/source/core/data/global.cxx,v
retrieving revision 1.42
diff -u -p -u -r1.42 global.cxx
--- sc/source/core/data/global.cxx	16 Feb 2005 18:06:28 -0000	1.42
+++ sc/source/core/data/global.cxx	18 Apr 2005 11:26:48 -0000
@@ -422,6 +422,9 @@ String ScGlobal::GetErrorString(USHORT n
         case errNoMacro  : nErrNumber = STR_NO_MACRO; break;
 		case errDoubleRef:
 		case errNoValue  : nErrNumber = STR_NO_VALUE; break;
+		case errNoCode : nErrNumber = STR_NULL_ERROR; break;
+		case errDivisionByZero : nErrNumber = STR_DIV_ZERO; break;
+		case errIllegalFPOperation : nErrNumber = STR_NUM_ERROR; break;
 
 		default		     : sResStr = GetRscString(STR_ERROR_STR);
 						   sResStr += String::CreateFromInt32( nErrNumber );
@@ -508,6 +511,9 @@ String ScGlobal::GetLongErrorString(USHO
         case errNoMacro:
             nErrNumber = STR_LONG_ERR_NO_MACRO;
 		break;
+        case errDivisionByZero:
+            nErrNumber = STR_LONG_ERR_DIV_ZERO;
+		break;
 		case errNoValue:
 			nErrNumber = STR_LONG_ERR_NO_VALUE;
 		break;
