[Libreoffice-commits] core.git: 4 commits - include/formula sc/inc sc/source
Eike Rathke
erack at redhat.com
Mon Mar 7 19:34:04 UTC 2016
include/formula/errorcodes.hxx | 3
sc/inc/globstr.hrc | 889 +++++++++++++++++++--------------------
sc/source/core/data/global.cxx | 4
sc/source/core/tool/interpr3.cxx | 2
sc/source/core/tool/interpr5.cxx | 18
sc/source/core/tool/scmatrix.cxx | 8
sc/source/ui/src/globstr.src | 4
7 files changed, 471 insertions(+), 457 deletions(-)
New commits:
commit faa379ffb2163b6484650dfeb3eb5e80d3be112f
Author: Eike Rathke <erack at redhat.com>
Date: Mon Mar 7 19:44:35 2016 +0100
add STR_LONG_ERR_MATRIX_SIZE "Error: Array or matrix size"
Change-Id: I81f7b278ba75abca6db59ab12dd1cf79dda15d20
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 9c98402..81e4493 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -211,503 +211,504 @@
#define STR_LONG_ERR_CODE_OVF 151
#define STR_LONG_ERR_STR_OVF 152
#define STR_LONG_ERR_STACK_OVF 153
-#define STR_LONG_ERR_SYNTAX 154
-#define STR_LONG_ERR_CIRC_REF 155
-#define STR_LONG_ERR_NO_NAME 156
-#define STR_LONG_ERR_NO_REF 157
-#define STR_LONG_ERR_NO_CONV 158
-#define STR_LONG_ERR_NO_VALUE 159
-#define STR_LONG_ERR_NV 160
-
-#define STR_GRIDCOLOR 161
-#define STR_MERGE_NOTEMPTY 162
-#define STR_CELL_FILTER 163
-
-#define STR_TARGETNOTFOUND 164
-
-#define STR_INVALID_EPS 165
-#define STR_TABLE_OP 166 // documen4.cxx
-#define STR_UNDO_TABOP 167
-
-#define STR_INVALID_AFNAME 168
-
-#define STR_AREA 169
-#define STR_YES 170
-#define STR_NO 171
-#define STR_PROTECTION 172
-#define STR_FORMULAS 173
-#define STR_HIDE 174
-#define STR_PRINT 175
-
-#define STR_INVALID_AFAREA 176
-
-#define STR_CASCADE 177 // function auto pilot
-#define STR_OPTIONAL 178
-#define STR_REQUIRED 179
-#define STR_EDITFUNCTION 180
-#define STR_INVALID 181
-
-#define STR_NOTES 182
-#define STR_QUERY_DELTAB 183
-
-#define STR_UNDO_DETREFRESH 184
-
-#define STR_UNDO_SHOWNOTE 185
-#define STR_UNDO_HIDENOTE 186
-#define STR_UNDO_DRAGDROP 187
-
-#define STR_EXPORT_ASCII_WARNING 188
-#define STR_IMPORT_ERROR 189
-#define STR_IMPORT_ASCII 190
-#define STR_IMPORT_LOTUS 191
-#define STR_IMPORT_DBF 192
-#define STR_EXPORT_ASCII 193
-
-#define STR_STYLENAME_STANDARD 194
-#define STR_STYLENAME_RESULT 195
-#define STR_STYLENAME_RESULT1 196
-#define STR_STYLENAME_HEADLINE 197
-#define STR_STYLENAME_HEADLINE1 198
-#define STR_STYLENAME_REPORT 199
-#define STR_STYLENAME_REPORT1 200
-
-#define STR_PIVOT_ERROR 201
-#define STR_PIVOT_PROGRESS 202
-#define STR_IMPORT_EXCEL_WARNING 203
-#define STR_SPELLING_STOP_OK 204
-#define STR_THESAURUS_NO_STRING 205
-#define STR_SPELLING_BEGIN_TAB 206
-#define STR_SPELLING_NO_LANG 207 // can be removed later
-
-#define STR_UNDO_GRAFEDIT 208
-
-#define STR_NOLANGERR 209
-
-#define STR_UNDO_INSERT_TAB 210
-#define STR_UNDO_DELETE_TAB 211
-#define STR_UNDO_RENAME_TAB 212
-#define STR_UNDO_MOVE_TAB 213
-#define STR_UNDO_COPY_TAB 214
-#define STR_UNDO_APPEND_TAB 215
-
-#define STR_CHART_MAINTITLE 216
-#define STR_CHART_SUBTITLE 217
-#define STR_CHART_XTITLE 218
-#define STR_CHART_YTITLE 219
-#define STR_CHART_ZTITLE 220
-
-#define STR_ABSREFLOST 221
-#define STR_NAMECONFLICT 222
-
-#define STR_ERR_AUTOFILTER 223
-
-#define STR_CREATENAME_REPLACE 224
-#define STR_CREATENAME_MARKERR 225
-
-#define STR_UNDO_LISTNAMES 226
-#define STR_UNDO_PIVOT_NEW 227
-#define STR_UNDO_PIVOT_MODIFY 228
-#define STR_UNDO_PIVOT_DELETE 229
-#define STR_UNDO_CONSOLIDATE 230
-#define STR_UNDO_USESCENARIO 231
-#define STR_UNDO_MAKESCENARIO 232
-
-#define STR_CONSOLIDATE_ERR1 233
-#define STR_SCENARIO_NOTFOUND 234
+#define STR_LONG_ERR_MATRIX_SIZE 154
+#define STR_LONG_ERR_SYNTAX 155
+#define STR_LONG_ERR_CIRC_REF 156
+#define STR_LONG_ERR_NO_NAME 157
+#define STR_LONG_ERR_NO_REF 158
+#define STR_LONG_ERR_NO_CONV 159
+#define STR_LONG_ERR_NO_VALUE 160
+#define STR_LONG_ERR_NV 161
+
+#define STR_GRIDCOLOR 162
+#define STR_MERGE_NOTEMPTY 163
+#define STR_CELL_FILTER 164
+
+#define STR_TARGETNOTFOUND 165
+
+#define STR_INVALID_EPS 166
+#define STR_TABLE_OP 167 // documen4.cxx
+#define STR_UNDO_TABOP 168
+
+#define STR_INVALID_AFNAME 169
+
+#define STR_AREA 170
+#define STR_YES 171
+#define STR_NO 172
+#define STR_PROTECTION 173
+#define STR_FORMULAS 174
+#define STR_HIDE 175
+#define STR_PRINT 176
+
+#define STR_INVALID_AFAREA 177
+
+#define STR_CASCADE 178 // function auto pilot
+#define STR_OPTIONAL 179
+#define STR_REQUIRED 180
+#define STR_EDITFUNCTION 181
+#define STR_INVALID 182
+
+#define STR_NOTES 183
+#define STR_QUERY_DELTAB 184
+
+#define STR_UNDO_DETREFRESH 185
+
+#define STR_UNDO_SHOWNOTE 186
+#define STR_UNDO_HIDENOTE 187
+#define STR_UNDO_DRAGDROP 188
+
+#define STR_EXPORT_ASCII_WARNING 189
+#define STR_IMPORT_ERROR 190
+#define STR_IMPORT_ASCII 191
+#define STR_IMPORT_LOTUS 192
+#define STR_IMPORT_DBF 193
+#define STR_EXPORT_ASCII 194
+
+#define STR_STYLENAME_STANDARD 195
+#define STR_STYLENAME_RESULT 196
+#define STR_STYLENAME_RESULT1 197
+#define STR_STYLENAME_HEADLINE 198
+#define STR_STYLENAME_HEADLINE1 199
+#define STR_STYLENAME_REPORT 200
+#define STR_STYLENAME_REPORT1 201
+
+#define STR_PIVOT_ERROR 202
+#define STR_PIVOT_PROGRESS 203
+#define STR_IMPORT_EXCEL_WARNING 204
+#define STR_SPELLING_STOP_OK 205
+#define STR_THESAURUS_NO_STRING 206
+#define STR_SPELLING_BEGIN_TAB 207
+#define STR_SPELLING_NO_LANG 208 // can be removed later
+
+#define STR_UNDO_GRAFEDIT 209
+
+#define STR_NOLANGERR 210
+
+#define STR_UNDO_INSERT_TAB 211
+#define STR_UNDO_DELETE_TAB 212
+#define STR_UNDO_RENAME_TAB 213
+#define STR_UNDO_MOVE_TAB 214
+#define STR_UNDO_COPY_TAB 215
+#define STR_UNDO_APPEND_TAB 216
+
+#define STR_CHART_MAINTITLE 217
+#define STR_CHART_SUBTITLE 218
+#define STR_CHART_XTITLE 219
+#define STR_CHART_YTITLE 220
+#define STR_CHART_ZTITLE 221
+
+#define STR_ABSREFLOST 222
+#define STR_NAMECONFLICT 223
+
+#define STR_ERR_AUTOFILTER 224
+
+#define STR_CREATENAME_REPLACE 225
+#define STR_CREATENAME_MARKERR 226
+
+#define STR_UNDO_LISTNAMES 227
+#define STR_UNDO_PIVOT_NEW 228
+#define STR_UNDO_PIVOT_MODIFY 229
+#define STR_UNDO_PIVOT_DELETE 230
+#define STR_UNDO_CONSOLIDATE 231
+#define STR_UNDO_USESCENARIO 232
+#define STR_UNDO_MAKESCENARIO 233
+
+#define STR_CONSOLIDATE_ERR1 234
+#define STR_SCENARIO_NOTFOUND 235
-#define STR_UNDO_APPLYCELLSTYLE 235
+#define STR_UNDO_APPLYCELLSTYLE 236
-#define STR_UNDO_DETADDPRED 236
-#define STR_UNDO_DETDELPRED 237
-#define STR_UNDO_DETADDSUCC 238
-#define STR_UNDO_DETDELSUCC 239
-#define STR_UNDO_DETADDERROR 240
-#define STR_UNDO_DETDELALL 241
-
-#define STR_QUERY_DELENTRY 242
-
-#define STR_VOBJ_OBJECT 243
-#define STR_VOBJ_CHART 244
-#define STR_VOBJ_DRAWINGS 245
-#define STR_VOBJ_MODE_SHOW 246
-#define STR_VOBJ_MODE_HIDE 247
-
-#define STR_SCATTR_PAGE_TOPDOWN 248
-#define STR_SCATTR_PAGE_LEFTRIGHT 249
-#define STR_SCATTR_PAGE_NOTES 250
-#define STR_SCATTR_PAGE_GRID 251
-#define STR_SCATTR_PAGE_HEADERS 252
-#define STR_SCATTR_PAGE_FORMULAS 253
-#define STR_SCATTR_PAGE_NULLVALS 254
-#define STR_SCATTR_PAGE_PRINTDIR 255
-#define STR_SCATTR_PAGE_FIRSTPAGENO 256
-#define STR_SCATTR_PAGE_SCALE 257
-#define STR_SCATTR_PAGE_SCALETOPAGES 258
+#define STR_UNDO_DETADDPRED 237
+#define STR_UNDO_DETDELPRED 238
+#define STR_UNDO_DETADDSUCC 239
+#define STR_UNDO_DETDELSUCC 240
+#define STR_UNDO_DETADDERROR 241
+#define STR_UNDO_DETDELALL 242
+
+#define STR_QUERY_DELENTRY 243
+
+#define STR_VOBJ_OBJECT 244
+#define STR_VOBJ_CHART 245
+#define STR_VOBJ_DRAWINGS 246
+#define STR_VOBJ_MODE_SHOW 247
+#define STR_VOBJ_MODE_HIDE 248
+
+#define STR_SCATTR_PAGE_TOPDOWN 249
+#define STR_SCATTR_PAGE_LEFTRIGHT 250
+#define STR_SCATTR_PAGE_NOTES 251
+#define STR_SCATTR_PAGE_GRID 252
+#define STR_SCATTR_PAGE_HEADERS 253
+#define STR_SCATTR_PAGE_FORMULAS 254
+#define STR_SCATTR_PAGE_NULLVALS 255
+#define STR_SCATTR_PAGE_PRINTDIR 256
+#define STR_SCATTR_PAGE_FIRSTPAGENO 257
+#define STR_SCATTR_PAGE_SCALE 258
+#define STR_SCATTR_PAGE_SCALETOPAGES 259
-#define STR_NOREF_STR 259 /* moved to compiler.src, keep define! */
+#define STR_NOREF_STR 260 /* moved to compiler.src, keep define! */
-#define STR_UNDO_CHARTDATA 260
-#define STR_UNDO_ORIGINALSIZE 261
+#define STR_UNDO_CHARTDATA 261
+#define STR_UNDO_ORIGINALSIZE 262
-#define STR_LINKERROR 262
-#define STR_LINKERRORFILE 263
-#define STR_LINKERRORTAB 264
-#define STR_UNDO_UPDATELINK 265
+#define STR_LINKERROR 263
+#define STR_LINKERRORFILE 264
+#define STR_LINKERRORTAB 265
+#define STR_UNDO_UPDATELINK 266
-#define STR_IMPORT_REPLACE 266
+#define STR_IMPORT_REPLACE 267
-#define STR_UNDO_REMOVELINK 267
+#define STR_UNDO_REMOVELINK 268
-#define STR_OVERVIEW 268
-#define STR_DOC_INFO 269
-#define STR_DOC_CREATED 270
-#define STR_DOC_MODIFIED 271
-#define STR_DOC_PRINTED 272
-#define STR_DOC_THEME 273
-#define STR_DOC_KEYWORDS 274
-#define STR_DOC_COMMENT 275
-#define STR_BY 276
-#define STR_ON 277
+#define STR_OVERVIEW 269
+#define STR_DOC_INFO 270
+#define STR_DOC_CREATED 271
+#define STR_DOC_MODIFIED 272
+#define STR_DOC_PRINTED 273
+#define STR_DOC_THEME 274
+#define STR_DOC_KEYWORDS 275
+#define STR_DOC_COMMENT 276
+#define STR_BY 277
+#define STR_ON 278
-#define STR_RELOAD_TABLES 278
+#define STR_RELOAD_TABLES 279
-#define STR_FILTER_TOOMANY 279
+#define STR_FILTER_TOOMANY 280
-#define STR_UNDO_ENTERMATRIX 280
+#define STR_UNDO_ENTERMATRIX 281
-#define STR_INSERT_FULL 281
-#define STR_TABINSERT_ERROR 282
-#define STR_PASTE_ERROR 283
-#define STR_PASTE_FULL 284
+#define STR_INSERT_FULL 282
+#define STR_TABINSERT_ERROR 283
+#define STR_PASTE_ERROR 284
+#define STR_PASTE_FULL 285
-#define STR_ERR_INVALID_AREA 285
+#define STR_ERR_INVALID_AREA 286
-#define STR_IMPORT_DIF 286
-#define STR_EXPORT_DIF 287
+#define STR_IMPORT_DIF 287
+#define STR_EXPORT_DIF 288
-#define STR_ERR_NOREF 288
-#define STR_FUN_TEXT_COUNT2 289
-#define STR_NO_NAME_REF 290 /* moved to compiler.src, keep define! */
+#define STR_ERR_NOREF 289
+#define STR_FUN_TEXT_COUNT2 290
+#define STR_NO_NAME_REF 291 /* moved to compiler.src, keep define! */
-#define STR_MATRIXFRAGMENTERR 291
+#define STR_MATRIXFRAGMENTERR 292
-#define STR_UNDO_SHOWTAB 292
-#define STR_UNDO_HIDETAB 293
-#define STR_UNDO_INSERTAREALINK 294
+#define STR_UNDO_SHOWTAB 293
+#define STR_UNDO_HIDETAB 294
+#define STR_UNDO_INSERTAREALINK 295
-#define STR_REIMPORT_AFTER_LOAD 295
+#define STR_REIMPORT_AFTER_LOAD 296
-#define STR_DETINVALID_OVERFLOW 296
-#define STR_GRAPHICNAME 297
-#define STR_INVALIDNAME 298
-#define STR_ERR_LINKOVERLAP 299
+#define STR_DETINVALID_OVERFLOW 297
+#define STR_GRAPHICNAME 298
+#define STR_INVALIDNAME 299
+#define STR_ERR_LINKOVERLAP 300
-#define STR_VALID_MACRONOTFOUND 300
-#define STR_VALID_DEFERROR 301
+#define STR_VALID_MACRONOTFOUND 301
+#define STR_VALID_DEFERROR 302
-#define STR_UNDO_DETINVALID 302
+#define STR_UNDO_DETINVALID 303
-#define STR_PROGRESS_CALCULATING 303
-#define STR_PROGRESS_SORTING 304
-#define STR_PROGRESS_HEIGHTING 305
+#define STR_PROGRESS_CALCULATING 304
+#define STR_PROGRESS_SORTING 305
+#define STR_PROGRESS_HEIGHTING 306
-#define STR_QUICKHELP_DELETE 306
+#define STR_QUICKHELP_DELETE 307
-#define STR_FUNCTIONLIST_MORE 307
+#define STR_FUNCTIONLIST_MORE 308
-#define STR_PIVOT_STYLE_INNER 308
-#define STR_PIVOT_STYLE_RESULT 309
-#define STR_PIVOT_STYLE_CATEGORY 310
-#define STR_PIVOT_STYLE_TITLE 311
-#define STR_PIVOT_STYLE_FIELDNAME 312
-#define STR_PIVOT_STYLE_TOP 313
+#define STR_PIVOT_STYLE_INNER 309
+#define STR_PIVOT_STYLE_RESULT 310
+#define STR_PIVOT_STYLE_CATEGORY 311
+#define STR_PIVOT_STYLE_TITLE 312
+#define STR_PIVOT_STYLE_FIELDNAME 313
+#define STR_PIVOT_STYLE_TOP 314
-#define STR_OPERATION_FILTER 314
-#define STR_OPERATION_SORT 315
-#define STR_OPERATION_SUBTOTAL 316
-#define STR_OPERATION_NONE 317
+#define STR_OPERATION_FILTER 315
+#define STR_OPERATION_SORT 316
+#define STR_OPERATION_SUBTOTAL 317
+#define STR_OPERATION_NONE 318
-#define STR_UNDO_PROTECT_TAB 318
-#define STR_UNDO_UNPROTECT_TAB 319
-#define STR_UNDO_PROTECT_DOC 320
-#define STR_UNDO_UNPROTECT_DOC 321
+#define STR_UNDO_PROTECT_TAB 319
+#define STR_UNDO_UNPROTECT_TAB 320
+#define STR_UNDO_PROTECT_DOC 321
+#define STR_UNDO_UNPROTECT_DOC 322
-#define STR_PROGRESS_IMPORT 322
+#define STR_PROGRESS_IMPORT 323
-#define STR_SORT_ERR_MERGED 323
+#define STR_SORT_ERR_MERGED 324
-#define STR_TIP_WIDTH 324
-#define STR_TIP_HEIGHT 325
-#define STR_TIP_HIDE 326
+#define STR_TIP_WIDTH 325
+#define STR_TIP_HEIGHT 326
+#define STR_TIP_HIDE 327
-#define STR_UNDO_REMOVEBREAKS 327
-#define STR_UNDO_PRINTSCALE 328
-#define STR_UNDO_DRAG_BREAK 329
+#define STR_UNDO_REMOVEBREAKS 328
+#define STR_UNDO_PRINTSCALE 329
+#define STR_UNDO_DRAG_BREAK 330
-#define STR_QUICKHELP_REF 330
+#define STR_QUICKHELP_REF 331
-#define STR_PIVOT_OVERLAP 331
-#define STR_PIVOT_NOTEMPTY 332
+#define STR_PIVOT_OVERLAP 332
+#define STR_PIVOT_NOTEMPTY 333
-#define STR_QUERY_NOTFOUND 333
+#define STR_QUERY_NOTFOUND 334
-#define STR_ERR_INSERTOBJ 334
+#define STR_ERR_INSERTOBJ 335
-#define STR_PROGRESS_COMPARING 335
+#define STR_PROGRESS_COMPARING 336
-#define STR_CHANGED_BLANK 336
-#define STR_CHANGED_CELL 337
-#define STR_CHANGED_INSERT 338
-#define STR_CHANGED_DELETE 339
-#define STR_CHANGED_MOVE 340
+#define STR_CHANGED_BLANK 337
+#define STR_CHANGED_CELL 338
+#define STR_CHANGED_INSERT 339
+#define STR_CHANGED_DELETE 340
+#define STR_CHANGED_MOVE 341
-#define STR_QUERY_DELSCENARIO 341
-#define STR_UNDO_EDITSCENARIO 342
+#define STR_QUERY_DELSCENARIO 342
+#define STR_UNDO_EDITSCENARIO 343
-#define STR_END_REDLINING_TITLE 343
-#define STR_END_REDLINING 344
+#define STR_END_REDLINING_TITLE 344
+#define STR_END_REDLINING 345
-#define STR_UNDO_EDITNOTE 345
-#define STR_TABREMOVE_ERROR 346
-#define STR_CLOSE_ERROR_LINK 347
-#define STR_UNDO_RANGENAMES 348
+#define STR_UNDO_EDITNOTE 346
+#define STR_TABREMOVE_ERROR 347
+#define STR_CLOSE_ERROR_LINK 348
+#define STR_UNDO_RANGENAMES 349
-#define STR_UNDO_RESIZEMATRIX 349
-#define STR_TIP_RESIZEMATRIX 350
+#define STR_UNDO_RESIZEMATRIX 350
+#define STR_TIP_RESIZEMATRIX 351
-#define STR_READONLYERR 351
+#define STR_READONLYERR 352
-#define STR_PASTE_BIGGER 352
+#define STR_PASTE_BIGGER 353
-#define STR_MACRO_WARNING 353
+#define STR_MACRO_WARNING 354
-#define STR_EXPORT_DBF 354
+#define STR_EXPORT_DBF 355
-#define STR_UNDO_APPLYPAGESTYLE 355
-#define STR_UNDO_EDITCELLSTYLE 356
-#define STR_UNDO_EDITPAGESTYLE 357
+#define STR_UNDO_APPLYPAGESTYLE 356
+#define STR_UNDO_EDITCELLSTYLE 357
+#define STR_UNDO_EDITPAGESTYLE 358
-#define STR_DATAPILOT_SUBTOTAL 358
+#define STR_DATAPILOT_SUBTOTAL 359
-#define STR_UNDO_TRANSLITERATE 359
+#define STR_UNDO_TRANSLITERATE 360
-#define STR_NO_ADDIN 360
-#define STR_LONG_ERR_NO_ADDIN 361
-#define STR_NO_MACRO 362
-#define STR_LONG_ERR_NO_MACRO 363
+#define STR_NO_ADDIN 361
+#define STR_LONG_ERR_NO_ADDIN 362
+#define STR_NO_MACRO 363
+#define STR_LONG_ERR_NO_MACRO 364
-#define STR_SCATTR_PAGE_SCALETO 364
-#define STR_SCATTR_PAGE_SCALE_WIDTH 365
-#define STR_SCATTR_PAGE_SCALE_HEIGHT 366
-#define STR_SCATTR_PAGE_SCALE_PAGES 367
-#define STR_SCATTR_PAGE_SCALE_AUTO 368
+#define STR_SCATTR_PAGE_SCALETO 365
+#define STR_SCATTR_PAGE_SCALE_WIDTH 366
+#define STR_SCATTR_PAGE_SCALE_HEIGHT 367
+#define STR_SCATTR_PAGE_SCALE_PAGES 368
+#define STR_SCATTR_PAGE_SCALE_AUTO 369
-#define STR_UNDO_TAB_RTL 369
-#define STR_UNDO_HANGULHANJA 370
-#define STR_UNDO_CHINESE_TRANSLATION 371
-
-#define STR_NAME_INPUT_CELL 372
-#define STR_NAME_INPUT_RANGE 373
-#define STR_NAME_INPUT_DBRANGE 374
-#define STR_NAME_INPUT_ROW 375
-#define STR_NAME_INPUT_SHEET 376
-#define STR_NAME_INPUT_DEFINE 377
-#define STR_NAME_ERROR_SELECTION 378
-#define STR_NAME_ERROR_NAME 379
-
-#define STR_CHANGED_MOVE_REJECTION_WARNING 380
-#define STR_CHANGED_DELETE_REJECTION_WARNING 381
-
-#define STR_ERR_DATAPILOT_INPUT 382
-
-#define STR_DIV_ZERO 383 /* moved to compiler.src, keep define! */
-#define STR_LONG_ERR_DIV_ZERO 384
-#define STR_NUM_ERROR 385 /* moved to compiler.src, keep define! */
-#define STR_NULL_ERROR 386 /* moved to compiler.src, keep define! */
-
-#define STR_RECALC_MANUAL 387
-#define STR_RECALC_AUTO 388
-
-#define STR_UNDO_TAB_R1C1 389
-
-#define STR_ERR_LONG_NESTED_ARRAY 390
-#define STR_UNDO_TEXTTOCOLUMNS 391
-
-#define STR_DOC_UPDATED 392
-#define STR_DOC_WILLBESAVED 393
-#define STR_DOC_WILLNOTBESAVED 394
-#define STR_DOC_DISABLESHARED 395
-#define STR_DOC_NOLONGERSHARED 396
-#define STR_SHARED_DOC_WARNING 397
-#define STR_FILE_LOCKED_TRY_LATER 398
-#define STR_FILE_LOCKED_SAVE_LATER 399
-#define STR_UNKNOWN_USER 400
-#define STR_LONG_ERR_NULL 401
-
-#define STR_UNDO_INSERTNOTE 402
-#define STR_UNDO_DELETENOTE 403
-#define STR_STYLE_FAMILY_CELL 404
-#define STR_STYLE_FAMILY_PAGE 405
-
-#define STR_ERR_DATAPILOTSOURCE 406
-#define STR_PIVOT_FIRSTROWEMPTYERR 407
-#define STR_PIVOT_ONLYONEROWERR 408
-
-#define STR_UNDO_SET_TAB_BG_COLOR 409
-#define STR_UNDO_SET_MULTI_TAB_BG_COLOR 410
-#define STR_UNDO_INSERT_CURRENT_DATE 411
-#define STR_UNDO_INSERT_CURRENT_TIME 412
-
-#define STR_OPTIONS_WARN_SEPARATORS 413
-#define STR_SHAPE_AUTOSHAPE 414
-#define STR_SHAPE_RECTANGLE 415
-#define STR_SHAPE_LINE 416
-#define STR_SHAPE_OVAL 417
-#define STR_SHAPE_TEXTBOX 418
-
-#define STR_FORM_BUTTON 419
-#define STR_FORM_CHECKBOX 420
-#define STR_FORM_OPTIONBUTTON 421
-#define STR_FORM_LABEL 422
-#define STR_FORM_LISTBOX 423
-#define STR_FORM_GROUPBOX 424
-#define STR_FORM_DROPDOWN 425
-#define STR_FORM_SPINNER 426
-#define STR_FORM_SCROLLBAR 427
-
-#define STR_PGNUM 428
-
-#define STR_MANAGE_NAMES 429
-
-#define STR_HEADER_NAME 430
-#define STR_HEADER_RANGE_OR_EXPR 431
-#define STR_HEADER_SCOPE 432
-#define STR_GLOBAL_SCOPE 433
-#define STR_ERR_NAME_EXISTS 434
-#define STR_ERR_NAME_INVALID 435
-
-#define STR_UNSAVED_EXT_REF 436
-#define STR_CLOSE_WITH_UNSAVED_REFS 437
-#define STR_PIVOT_GROUP 438
-#define STR_HEADER_RANGE 439
-#define STR_HEADER_COND 440
-
-#define STR_COND_CONDITION 441
-#define STR_COND_COLORSCALE 442
-#define STR_COND_DATABAR 443
-#define STR_COND_ICONSET 444
-#define STR_COND_FORMULA 445
-#define STR_COND_BETWEEN 446
-#define STR_COND_NOTBETWEEN 447
-#define STR_COND_UNIQUE 448
-#define STR_COND_DUPLICATE 449
-#define STR_COND_TOP10 450
-#define STR_COND_BOTTOM10 451
-#define STR_COND_TOP_PERCENT 452
-#define STR_COND_BOTTOM_PERCENT 453
-#define STR_COND_ABOVE_AVERAGE 454
-#define STR_COND_BELOW_AVERAGE 455
-#define STR_COND_ERROR 456
-#define STR_COND_NOERROR 457
-#define STR_COND_BEGINS_WITH 458
-#define STR_COND_ENDS_WITH 459
-#define STR_COND_CONTAINS 460
-#define STR_COND_NOT_CONTAINS 461
-#define STR_COND_DATE 462
+#define STR_UNDO_TAB_RTL 370
+#define STR_UNDO_HANGULHANJA 371
+#define STR_UNDO_CHINESE_TRANSLATION 372
+
+#define STR_NAME_INPUT_CELL 373
+#define STR_NAME_INPUT_RANGE 374
+#define STR_NAME_INPUT_DBRANGE 375
+#define STR_NAME_INPUT_ROW 376
+#define STR_NAME_INPUT_SHEET 377
+#define STR_NAME_INPUT_DEFINE 378
+#define STR_NAME_ERROR_SELECTION 379
+#define STR_NAME_ERROR_NAME 380
+
+#define STR_CHANGED_MOVE_REJECTION_WARNING 381
+#define STR_CHANGED_DELETE_REJECTION_WARNING 382
+
+#define STR_ERR_DATAPILOT_INPUT 383
+
+#define STR_DIV_ZERO 384 /* moved to compiler.src, keep define! */
+#define STR_LONG_ERR_DIV_ZERO 385
+#define STR_NUM_ERROR 386 /* moved to compiler.src, keep define! */
+#define STR_NULL_ERROR 387 /* moved to compiler.src, keep define! */
+
+#define STR_RECALC_MANUAL 388
+#define STR_RECALC_AUTO 389
+
+#define STR_UNDO_TAB_R1C1 390
+
+#define STR_ERR_LONG_NESTED_ARRAY 391
+#define STR_UNDO_TEXTTOCOLUMNS 392
+
+#define STR_DOC_UPDATED 393
+#define STR_DOC_WILLBESAVED 394
+#define STR_DOC_WILLNOTBESAVED 395
+#define STR_DOC_DISABLESHARED 396
+#define STR_DOC_NOLONGERSHARED 397
+#define STR_SHARED_DOC_WARNING 398
+#define STR_FILE_LOCKED_TRY_LATER 399
+#define STR_FILE_LOCKED_SAVE_LATER 400
+#define STR_UNKNOWN_USER 401
+#define STR_LONG_ERR_NULL 402
+
+#define STR_UNDO_INSERTNOTE 403
+#define STR_UNDO_DELETENOTE 404
+#define STR_STYLE_FAMILY_CELL 405
+#define STR_STYLE_FAMILY_PAGE 406
+
+#define STR_ERR_DATAPILOTSOURCE 407
+#define STR_PIVOT_FIRSTROWEMPTYERR 408
+#define STR_PIVOT_ONLYONEROWERR 409
+
+#define STR_UNDO_SET_TAB_BG_COLOR 410
+#define STR_UNDO_SET_MULTI_TAB_BG_COLOR 411
+#define STR_UNDO_INSERT_CURRENT_DATE 412
+#define STR_UNDO_INSERT_CURRENT_TIME 413
+
+#define STR_OPTIONS_WARN_SEPARATORS 414
+#define STR_SHAPE_AUTOSHAPE 415
+#define STR_SHAPE_RECTANGLE 416
+#define STR_SHAPE_LINE 417
+#define STR_SHAPE_OVAL 418
+#define STR_SHAPE_TEXTBOX 419
+
+#define STR_FORM_BUTTON 420
+#define STR_FORM_CHECKBOX 421
+#define STR_FORM_OPTIONBUTTON 422
+#define STR_FORM_LABEL 423
+#define STR_FORM_LISTBOX 424
+#define STR_FORM_GROUPBOX 425
+#define STR_FORM_DROPDOWN 426
+#define STR_FORM_SPINNER 427
+#define STR_FORM_SCROLLBAR 428
+
+#define STR_PGNUM 429
+
+#define STR_MANAGE_NAMES 430
+
+#define STR_HEADER_NAME 431
+#define STR_HEADER_RANGE_OR_EXPR 432
+#define STR_HEADER_SCOPE 433
+#define STR_GLOBAL_SCOPE 434
+#define STR_ERR_NAME_EXISTS 435
+#define STR_ERR_NAME_INVALID 436
+
+#define STR_UNSAVED_EXT_REF 437
+#define STR_CLOSE_WITH_UNSAVED_REFS 438
+#define STR_PIVOT_GROUP 439
+#define STR_HEADER_RANGE 440
+#define STR_HEADER_COND 441
+
+#define STR_COND_CONDITION 442
+#define STR_COND_COLORSCALE 443
+#define STR_COND_DATABAR 444
+#define STR_COND_ICONSET 445
+#define STR_COND_FORMULA 446
+#define STR_COND_BETWEEN 447
+#define STR_COND_NOTBETWEEN 448
+#define STR_COND_UNIQUE 449
+#define STR_COND_DUPLICATE 450
+#define STR_COND_TOP10 451
+#define STR_COND_BOTTOM10 452
+#define STR_COND_TOP_PERCENT 453
+#define STR_COND_BOTTOM_PERCENT 454
+#define STR_COND_ABOVE_AVERAGE 455
+#define STR_COND_BELOW_AVERAGE 456
+#define STR_COND_ERROR 457
+#define STR_COND_NOERROR 458
+#define STR_COND_BEGINS_WITH 459
+#define STR_COND_ENDS_WITH 460
+#define STR_COND_CONTAINS 461
+#define STR_COND_NOT_CONTAINS 462
+#define STR_COND_DATE 463
/* Values from STR_COND_TODAY to STR_COND_NEXTYEAR must be in sequence for
* sc/source/ui/condformat/condformathelper.cxx getDateString() */
-#define STR_COND_TODAY 463
-#define STR_COND_YESTERDAY 464
-#define STR_COND_TOMORROW 465
-#define STR_COND_LAST7DAYS 466
-#define STR_COND_THISWEEK 467
-#define STR_COND_LASTWEEK 468
-#define STR_COND_NEXTWEEK 469
-#define STR_COND_THISMONTH 470
-#define STR_COND_LASTMONTH 471
-#define STR_COND_NEXTMONTH 472
-#define STR_COND_THISYEAR 473
-#define STR_COND_LASTYEAR 474
-#define STR_COND_NEXTYEAR 475
-
-#define STR_ERR_CONDFORMAT_PROTECTED 476
-#define STR_EDIT_EXISTING_COND_FORMATS 477
-
-#define STR_QUERY_FORMULA_RECALC_ONLOAD_ODS 478
-#define STR_QUERY_FORMULA_RECALC_ONLOAD_XLS 479
-#define STR_ALWAYS_PERFORM_SELECTED 480
-
-#define STR_NO_INSERT_DELETE_OVER_PIVOT_TABLE 481
-
-#define STR_CHG_INSERT_COLS 482
-#define STR_CHG_INSERT_ROWS 483
-#define STR_CHG_INSERT_TABS 484
-#define STR_CHG_DELETE_COLS 485
-#define STR_CHG_DELETE_ROWS 486
-#define STR_CHG_DELETE_TABS 487
-#define STR_CHG_MOVE 488
-#define STR_CHG_CONTENT 489
-#define STR_CHG_REJECT 490
-#define STR_CHG_ACCEPTED 491
-#define STR_CHG_REJECTED 492
-#define STR_CHG_NO_ENTRY 493
-#define STR_CHG_CONTENT_WITH_CHILD 494
-#define STR_CHG_CHILD_CONTENT 495
-#define STR_CHG_CHILD_ORGCONTENT 496
-#define STR_CHG_EMPTY 497
-
-#define STR_UNDO_HIDETABS 498
-#define STR_UNDO_SHOWTABS 499
-
-#define STR_DPFIELD_GROUP_BY_SECONDS 500
-#define STR_DPFIELD_GROUP_BY_MINUTES 501
-#define STR_DPFIELD_GROUP_BY_HOURS 502
-#define STR_DPFIELD_GROUP_BY_DAYS 503
-#define STR_DPFIELD_GROUP_BY_MONTHS 504
-#define STR_DPFIELD_GROUP_BY_QUARTERS 505
-#define STR_DPFIELD_GROUP_BY_YEARS 506
-
-#define STR_COND_ABOVE_EQUAL_AVERAGE 507
-#define STR_COND_BELOW_EQUAL_AVERAGE 508
-
-#define STR_MULTI_SELECT 509
-
-#define STR_INVALIDVAL 510
-#define STR_INVALIDVAR 511
-#define STR_INVALIDFORM 512
-#define STR_NOFORMULA 513
-
-#define STR_INVALIDINPUT 514
-#define STR_INVALIDCONDITION 515
-
-#define STR_FUN_TEXT_SELECTION_COUNT 516
-
-#define STR_QUERYREMOVE 517
-#define STR_COPYLIST 518
-#define STR_COPYFROM 519
-#define STR_COPYERR 520
-
-#define STR_CTRLCLICKHYPERLINK 521
-#define STR_CLICKHYPERLINK 522
-
-#define STR_ROWCOL_SELCOUNT 523
-
-#define STR_PRINT_PREVIEW_NODATA 524
-#define STR_PRINT_PREVIEW_EMPTY_RANGE 525
-
-#define STR_UNDO_CONDFORMAT 526
-#define STR_UNDO_FORMULA_TO_VALUE 527
-
-#define STR_UNQUOTED_STRING 528
-#define STR_ENTER_VALUE 529
-
-#define STR_TABLE_COUNT 530
-
-#define STR_FUNCTIONS_FOUND 531
-
-#define STR_FILTER_SELCOUNT 532
-
-#define SC_GLOBSTR_STR_COUNT 533 /**< the count of permanently resident strings */
+#define STR_COND_TODAY 464
+#define STR_COND_YESTERDAY 465
+#define STR_COND_TOMORROW 466
+#define STR_COND_LAST7DAYS 467
+#define STR_COND_THISWEEK 468
+#define STR_COND_LASTWEEK 469
+#define STR_COND_NEXTWEEK 470
+#define STR_COND_THISMONTH 471
+#define STR_COND_LASTMONTH 472
+#define STR_COND_NEXTMONTH 473
+#define STR_COND_THISYEAR 474
+#define STR_COND_LASTYEAR 475
+#define STR_COND_NEXTYEAR 476
+
+#define STR_ERR_CONDFORMAT_PROTECTED 477
+#define STR_EDIT_EXISTING_COND_FORMATS 478
+
+#define STR_QUERY_FORMULA_RECALC_ONLOAD_ODS 479
+#define STR_QUERY_FORMULA_RECALC_ONLOAD_XLS 480
+#define STR_ALWAYS_PERFORM_SELECTED 481
+
+#define STR_NO_INSERT_DELETE_OVER_PIVOT_TABLE 482
+
+#define STR_CHG_INSERT_COLS 483
+#define STR_CHG_INSERT_ROWS 484
+#define STR_CHG_INSERT_TABS 485
+#define STR_CHG_DELETE_COLS 486
+#define STR_CHG_DELETE_ROWS 487
+#define STR_CHG_DELETE_TABS 488
+#define STR_CHG_MOVE 489
+#define STR_CHG_CONTENT 490
+#define STR_CHG_REJECT 491
+#define STR_CHG_ACCEPTED 492
+#define STR_CHG_REJECTED 493
+#define STR_CHG_NO_ENTRY 494
+#define STR_CHG_CONTENT_WITH_CHILD 495
+#define STR_CHG_CHILD_CONTENT 496
+#define STR_CHG_CHILD_ORGCONTENT 497
+#define STR_CHG_EMPTY 498
+
+#define STR_UNDO_HIDETABS 499
+#define STR_UNDO_SHOWTABS 500
+
+#define STR_DPFIELD_GROUP_BY_SECONDS 501
+#define STR_DPFIELD_GROUP_BY_MINUTES 502
+#define STR_DPFIELD_GROUP_BY_HOURS 503
+#define STR_DPFIELD_GROUP_BY_DAYS 504
+#define STR_DPFIELD_GROUP_BY_MONTHS 505
+#define STR_DPFIELD_GROUP_BY_QUARTERS 506
+#define STR_DPFIELD_GROUP_BY_YEARS 507
+
+#define STR_COND_ABOVE_EQUAL_AVERAGE 508
+#define STR_COND_BELOW_EQUAL_AVERAGE 509
+
+#define STR_MULTI_SELECT 510
+
+#define STR_INVALIDVAL 511
+#define STR_INVALIDVAR 512
+#define STR_INVALIDFORM 513
+#define STR_NOFORMULA 514
+
+#define STR_INVALIDINPUT 515
+#define STR_INVALIDCONDITION 516
+
+#define STR_FUN_TEXT_SELECTION_COUNT 517
+
+#define STR_QUERYREMOVE 518
+#define STR_COPYLIST 519
+#define STR_COPYFROM 520
+#define STR_COPYERR 521
+
+#define STR_CTRLCLICKHYPERLINK 522
+#define STR_CLICKHYPERLINK 523
+
+#define STR_ROWCOL_SELCOUNT 524
+
+#define STR_PRINT_PREVIEW_NODATA 525
+#define STR_PRINT_PREVIEW_EMPTY_RANGE 526
+
+#define STR_UNDO_CONDFORMAT 527
+#define STR_UNDO_FORMULA_TO_VALUE 528
+
+#define STR_UNQUOTED_STRING 529
+#define STR_ENTER_VALUE 530
+
+#define STR_TABLE_COUNT 531
+
+#define STR_FUNCTIONS_FOUND 532
+
+#define STR_FILTER_SELCOUNT 533
+
+#define SC_GLOBSTR_STR_COUNT 534 /**< the count of permanently resident strings */
#endif
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index e886829..08aba82 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -428,6 +428,9 @@ OUString ScGlobal::GetLongErrorString(sal_uInt16 nErrNumber)
case errStackOverflow:
nErrNumber = STR_LONG_ERR_STACK_OVF;
break;
+ case errMatrixSize:
+ nErrNumber = STR_LONG_ERR_MATRIX_SIZE;
+ break;
case errIllegalJump:
case errUnknownState:
case errUnknownVariable:
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 01fa1e4..c74373f 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -910,6 +910,10 @@ Resource RID_GLOBSTR
{
Text [ en-US ] = "Error: Internal overflow" ;
};
+ String STR_LONG_ERR_MATRIX_SIZE
+ {
+ Text [ en-US ] = "Error: Array or matrix size" ;
+ };
String STR_LONG_ERR_CIRC_REF
{
Text [ en-US ] = "Error: Circular reference" ;
commit b3253b2bdc7d9545ef9f430d0b7bcca3cd685812
Author: Eike Rathke <erack at redhat.com>
Date: Mon Mar 7 19:34:39 2016 +0100
remove unused errInterpOverflow
Change-Id: Iaac45af141220f5a7460b7313507d3927a2b2581
diff --git a/include/formula/errorcodes.hxx b/include/formula/errorcodes.hxx
index a85c682..6c20d8a 100644
--- a/include/formula/errorcodes.hxx
+++ b/include/formula/errorcodes.hxx
@@ -51,7 +51,6 @@ const sal_uInt16 errNoConvergence = 523;
const sal_uInt16 errNoRef = 524; // #REF!
const sal_uInt16 errNoName = 525; // #NAME?
const sal_uInt16 errDoubleRef = 526;
-const sal_uInt16 errInterpOverflow = 527;
// Not displayed, temporary for TrackFormulas,
// Cell depends on another cell that has errCircularReference
const sal_uInt16 errTrackFromCircRef = 528;
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 56919b6..e886829 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -426,7 +426,6 @@ OUString ScGlobal::GetLongErrorString(sal_uInt16 nErrNumber)
nErrNumber = STR_LONG_ERR_STR_OVF;
break;
case errStackOverflow:
- case errInterpOverflow:
nErrNumber = STR_LONG_ERR_STACK_OVF;
break;
case errIllegalJump:
commit 25d8652796f7cae024dbfcbd5347280f9689797c
Author: Eike Rathke <erack at redhat.com>
Date: Mon Mar 7 19:30:30 2016 +0100
a few more candidates for errMatrixSize
Change-Id: Ia3ea04d15ce73526e87dfb5670eedff983daa40e
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index db7ee19..4dc2530 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -3775,7 +3775,7 @@ void ScInterpreter::GetSortArray( sal_uInt8 nParamCount, vector<double>& rSortAr
{
GetNumberSequenceArray( nParamCount, rSortArray, bConvertTextInArray );
if (rSortArray.size() > MAX_ANZ_DOUBLE_FOR_SORT)
- SetError( errStackOverflow);
+ SetError( errMatrixSize);
else if ( rSortArray.empty() )
{
if ( bAllowEmptyArray )
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index ef55138..479b9ca 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -331,7 +331,7 @@ ScMatrixRef ScInterpreter::GetNewMat(SCSIZE nC, SCSIZE nR, bool bEmpty)
pMat->GetDimensions( nCols, nRows);
if ( nCols != nC || nRows != nR )
{ // arbitray limit of elements exceeded
- SetError( errStackOverflow);
+ SetError( errMatrixSize);
pMat.reset();
}
return pMat;
@@ -2994,7 +2994,7 @@ void ScInterpreter::CalculateTrendGrowth(bool _bGrowth)
ScMatrixRef pCopyY = pMatY->CloneIfConst();
if (!pCopyX || !pCopyY)
{
- PushError(errStackOverflow);
+ PushError(errMatrixSize);
return;
}
pMatX = pCopyX;
commit 36483fde78b872a362b7f606d8e5371c231a2957
Author: Eike Rathke <erack at redhat.com>
Date: Mon Mar 7 19:19:07 2016 +0100
introduce a dedicated errMatrixSize
... to distinguish from other errors, and really, errStackOverflow
should mean exactly that.
Change-Id: I3d2bfbd38b056c7d0a346797db560717312de069
diff --git a/include/formula/errorcodes.hxx b/include/formula/errorcodes.hxx
index e2279f3..a85c682 100644
--- a/include/formula/errorcodes.hxx
+++ b/include/formula/errorcodes.hxx
@@ -81,6 +81,8 @@ const sal_uInt16 errElementNaN = 536;
// ScInterpreter/ScFormulaCell internal: keep dirty, retry interpreting next
// round.
const sal_uInt16 errRetryCircular = 537;
+// If matrix could not be allocated.
+const sal_uInt16 errMatrixSize = 538;
// Interpreter: NA() not available condition, not a real error
const sal_uInt16 NOTAVAILABLE = 0x7fff;
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index bd73ecc..ef55138 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -353,7 +353,7 @@ ScMatrixRef ScInterpreter::CreateMatrixFromDoubleRef( const FormulaToken* pToken
if (!ScMatrix::IsSizeAllocatable( nMatCols, nMatRows))
{
- SetError(errStackOverflow);
+ SetError(errMatrixSize);
return nullptr;
}
@@ -601,8 +601,10 @@ void ScInterpreter::ScEMat()
if ( MustHaveParamCount( GetByte(), 1 ) )
{
SCSIZE nDim = static_cast<SCSIZE>(::rtl::math::approxFloor(GetDouble()));
- if (nDim == 0 || !ScMatrix::IsSizeAllocatable( nDim, nDim))
+ if (nDim == 0)
PushIllegalArgument();
+ else if (!ScMatrix::IsSizeAllocatable( nDim, nDim))
+ PushError( errMatrixSize);
else
{
ScMatrixRef pRMat = GetNewMat(nDim, nDim);
@@ -800,8 +802,10 @@ void ScInterpreter::ScMatDet()
}
SCSIZE nC, nR;
pMat->GetDimensions(nC, nR);
- if ( nC != nR || nC == 0 || !ScMatrix::IsSizeAllocatable( nC, nR) )
+ if ( nC != nR || nC == 0 )
PushIllegalArgument();
+ else if (!ScMatrix::IsSizeAllocatable( nC, nR))
+ PushError( errMatrixSize);
else
{
// LUP decomposition is done inplace, use copy.
@@ -923,8 +927,10 @@ void ScInterpreter::ScMatInv()
}
}
- if ( nC != nR || nC == 0 || !ScMatrix::IsSizeAllocatable( nC, nR) )
+ if ( nC != nR || nC == 0 )
PushIllegalArgument();
+ else if (!ScMatrix::IsSizeAllocatable( nC, nR))
+ PushError( errMatrixSize);
else
{
// LUP decomposition is done inplace, use copy.
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 1477d9d..0f237e1 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -345,7 +345,7 @@ void ScMatrixImpl::Resize(SCSIZE nC, SCSIZE nR)
else
{
// Invalid matrix size, allocate 1x1 matrix with error value.
- maMat.resize(1, 1, CreateDoubleError( errStackOverflow));
+ maMat.resize(1, 1, CreateDoubleError( errMatrixSize));
maMatFlag.resize(1, 1);
}
}
@@ -2399,7 +2399,7 @@ ScFullMatrix::ScFullMatrix( SCSIZE nC, SCSIZE nR) :
pImpl.reset( new ScMatrixImpl( nC, nR));
else
// Invalid matrix size, allocate 1x1 matrix with error value.
- pImpl.reset( new ScMatrixImpl( 1,1, CreateDoubleError( errStackOverflow)));
+ pImpl.reset( new ScMatrixImpl( 1,1, CreateDoubleError( errMatrixSize)));
}
ScFullMatrix::ScFullMatrix(SCSIZE nC, SCSIZE nR, double fInitVal) :
@@ -2409,7 +2409,7 @@ ScFullMatrix::ScFullMatrix(SCSIZE nC, SCSIZE nR, double fInitVal) :
pImpl.reset( new ScMatrixImpl( nC, nR, fInitVal));
else
// Invalid matrix size, allocate 1x1 matrix with error value.
- pImpl.reset( new ScMatrixImpl( 1,1, CreateDoubleError( errStackOverflow)));
+ pImpl.reset( new ScMatrixImpl( 1,1, CreateDoubleError( errMatrixSize)));
}
ScFullMatrix::ScFullMatrix( size_t nC, size_t nR, const std::vector<double>& rInitVals ) :
@@ -2419,7 +2419,7 @@ ScFullMatrix::ScFullMatrix( size_t nC, size_t nR, const std::vector<double>& rIn
pImpl.reset( new ScMatrixImpl( nC, nR, rInitVals));
else
// Invalid matrix size, allocate 1x1 matrix with error value.
- pImpl.reset( new ScMatrixImpl( 1,1, CreateDoubleError( errStackOverflow)));
+ pImpl.reset( new ScMatrixImpl( 1,1, CreateDoubleError( errMatrixSize)));
}
ScFullMatrix::~ScFullMatrix()
More information about the Libreoffice-commits
mailing list