From f681a8623059345ad0103294f22de89e287820de Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 1 Jun 2017 13:25:33 +0100 Subject: merge ofa res file into svt one MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3f22301e4301ab90e4a1090f2c47cf2403422282 Reviewed-on: https://gerrit.libreoffice.org/38309 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- Repository.mk | 1 - scp2/source/ooo/file_resource_ooo.scp | 2 - scp2/source/ooo/module_lang_template.scp | 1 - svtools/AllLangResTarget_svt.mk | 1 + svtools/source/misc/ehdl.cxx | 6 +- svtools/source/misc/errtxt.src | 132 +++++++++++++++++++++++++++++++ svx/AllLangResTarget_ofa.mk | 32 -------- svx/Module_svx.mk | 1 - svx/source/src/errtxt.src | 132 ------------------------------- uui/source/iahndl-errorhandler.cxx | 2 +- 10 files changed, 137 insertions(+), 173 deletions(-) create mode 100644 svtools/source/misc/errtxt.src delete mode 100644 svx/AllLangResTarget_ofa.mk delete mode 100644 svx/source/src/errtxt.src diff --git a/Repository.mk b/Repository.mk index 9b89385f8593..bf38a3b3504a 100644 --- a/Repository.mk +++ b/Repository.mk @@ -1082,7 +1082,6 @@ $(eval $(call gb_Helper_register_resources,\ frm \ fwe \ gal \ - ofa \ $(call gb_Helper_optional,DBCONNECTIVITY,pcr) \ pdffilter \ pricing \ diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp index 77ab890567d9..ac90ee812f5a 100644 --- a/scp2/source/ooo/file_resource_ooo.scp +++ b/scp2/source/ooo/file_resource_ooo.scp @@ -49,8 +49,6 @@ STD_RES_FILE( gid_File_Res_Gal, gal ) STD_RES_FILE( gid_File_Res_Deployment, deployment ) STD_RES_FILE( gid_File_Res_DeploymentGui, deploymentgui ) -STD_RES_FILE( gid_File_Res_Ofa, ofa ) - STD_RES_FILE( gid_File_Res_Pcr, pcr) STD_RES_FILE( gid_File_Res_Pdffilter, pdffilter) diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp index 78a2b51232f6..6711999a0d1f 100644 --- a/scp2/source/ooo/module_lang_template.scp +++ b/scp2/source/ooo/module_lang_template.scp @@ -81,7 +81,6 @@ Module gid_Module_Langpack_Resource_Template gid_File_Res_Gal, gid_File_Res_Deployment, gid_File_Res_DeploymentGui, - gid_File_Res_Ofa, gid_File_Res_Pcr, gid_File_Res_Pdffilter, gid_File_Res_San, diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk index eea65ca9354c..f373af6e4b83 100644 --- a/svtools/AllLangResTarget_svt.mk +++ b/svtools/AllLangResTarget_svt.mk @@ -49,6 +49,7 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\ svtools/source/dialogs/wizardmachine.src \ $(if $(ENABLE_JAVA), \ svtools/source/java/javaerror.src) \ + svtools/source/misc/errtxt.src \ svtools/source/misc/imagemgr.src \ svtools/source/misc/langtab.src \ svtools/source/misc/svtools.src \ diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index 856f4f59a86a..216cf7aba132 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -148,7 +148,7 @@ SfxErrorHandler::SfxErrorHandler(sal_uInt16 nIdP, sal_uLong lStartP, sal_uLong l ErrorRegistry::RegisterDisplay(&aWndFunc); if( ! pMgr ) { - pMgr = ResMgr::CreateResMgr("ofa", Application::GetSettings().GetUILanguageTag() ); + pMgr = ResMgr::CreateResMgr("svt", Application::GetSettings().GetUILanguageTag() ); pFreeMgr.reset(pMgr); } } @@ -202,7 +202,7 @@ void SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) */ { - std::unique_ptr pResMgr(ResMgr::CreateResMgr("ofa", Application::GetSettings().GetUILanguageTag() )); + std::unique_ptr pResMgr(ResMgr::CreateResMgr("svt", Application::GetSettings().GetUILanguageTag() )); if( pResMgr ) { ResStringArray aEr(ResId(RID_ERRHDL, *pResMgr)); @@ -284,7 +284,7 @@ bool SfxErrorContext::GetString(sal_uInt32 nErrId, OUString &rStr) ResMgr* pFreeMgr = nullptr; if( ! pMgr ) { - pFreeMgr = pMgr = ResMgr::CreateResMgr("ofa", Application::GetSettings().GetUILanguageTag() ); + pFreeMgr = pMgr = ResMgr::CreateResMgr("svt", Application::GetSettings().GetUILanguageTag() ); } if( pMgr ) { diff --git a/svtools/source/misc/errtxt.src b/svtools/source/misc/errtxt.src new file mode 100644 index 000000000000..a84c5b32c9ab --- /dev/null +++ b/svtools/source/misc/errtxt.src @@ -0,0 +1,132 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include +#include + +StringArray RID_ERRCTX +{ + ItemList [ en-US ] = + { + < "Error" ; ERRCTX_ERROR ; >; + < "Warning" ; ERRCTX_WARNING ; >; + < "$(ERR) loading the template $(ARG1)" ; ERRCTX_SFX_LOADTEMPLATE ; >; + < "$(ERR) saving the document $(ARG1)"; ERRCTX_SFX_SAVEDOC ; >; + < "$(ERR) saving the document $(ARG1)"; ERRCTX_SFX_SAVEASDOC ; >; + < "$(ERR) displaying doc. information for document $(ARG1)" ; ERRCTX_SFX_DOCINFO ; >; + < "$(ERR) writing document $(ARG1) as template" ; ERRCTX_SFX_DOCTEMPLATE ; >; + < "$(ERR) copying or moving document contents" ; ERRCTX_SFX_MOVEORCOPYCONTENTS ; >; + < "$(ERR) starting the Document Manager" ; ERRCTX_SFX_DOCMANAGER ; >; + < "$(ERR) loading document $(ARG1)" ; ERRCTX_SFX_OPENDOC ; >; + < "$(ERR) creating a new document" ; ERRCTX_SFX_NEWDOCDIRECT ; >; + < "$(ERR) creating a new document" ; ERRCTX_SFX_NEWDOC ; >; + < "$(ERR) expanding entry" ; ERRCTX_SFX_CREATEOBJSH ; >; + < "$(ERR) loading BASIC of document $(ARG1)" ; ERRCTX_SFX_LOADBASIC ; >; + < "$(ERR) searching for an address"; ERRCTX_SFX_SEARCHADDRESS ; >; + }; +}; + +StringArray RID_ERRHDL +{ + ItemList [ en-US ] = + { + < "Abort" ; ERRCODE_CLASS_ABORT ; >; + < "Nonexistent object" ; ERRCODE_CLASS_NOTEXISTS ; >; + < "Object already exists" ; ERRCODE_CLASS_ALREADYEXISTS ; >; + < "Object not accessible" ; ERRCODE_CLASS_ACCESS ; >; + < "Inadmissible path" ; ERRCODE_CLASS_PATH ; >; + < "Locking problem" ; ERRCODE_CLASS_LOCKING ; >; + < "Wrong parameter" ; ERRCODE_CLASS_PARAMETER ; >; + < "Resource exhausted" ; ERRCODE_CLASS_SPACE ; >; + < "Action not supported" ; ERRCODE_CLASS_NOTSUPPORTED ; >; + < "Read Error" ; ERRCODE_CLASS_READ ; >; + < "Write Error" ; ERRCODE_CLASS_WRITE ; >; + < "unknown" ; ERRCODE_CLASS_UNKNOWN ; >; + < "Version Incompatibility" ; ERRCODE_CLASS_VERSION ; >; + < "General Error" ; ERRCODE_CLASS_GENERAL ; >; + < "Incorrect format" ; ERRCODE_CLASS_FORMAT ; >; + < "Error creating object" ; ERRCODE_CLASS_CREATE ; >; + < "Inadmissible value or data type" ; ERRCODE_CLASS_SBX ; >; + < "BASIC runtime error" ; ERRCODE_CLASS_RUNTIME ; >; + < "BASIC syntax error" ; ERRCODE_CLASS_COMPILER ; >; + < "General Error" ; 1 ; >; + < "General input/output error." ; ERRCODE_IO_GENERAL ; >; + < "Invalid file name." ; ERRCODE_IO_MISPLACEDCHAR ; >; + < "Nonexistent file." ; ERRCODE_IO_NOTEXISTS ; >; + < "File already exists." ; ERRCODE_IO_ALREADYEXISTS ; >; + < "The object is not a directory." ; ERRCODE_IO_NOTADIRECTORY ; >; + < "The object is not a file." ; ERRCODE_IO_NOTAFILE ; >; + < "The specified device is invalid." ; ERRCODE_IO_INVALIDDEVICE ; >; + < "The object cannot be accessed\ndue to insufficient user rights." ; ERRCODE_IO_ACCESSDENIED ; >; + < "Sharing violation while accessing the object." ; ERRCODE_IO_LOCKVIOLATION ; >; + < "No more space on device." ; ERRCODE_IO_OUTOFSPACE ; >; + < "This operation cannot be run on\nfiles containing wildcards." ; ERRCODE_IO_ISWILDCARD ; >; + < "This operation is not supported on this operating system." ; ERRCODE_IO_NOTSUPPORTED ; >; + < "There are too many files open." ; ERRCODE_IO_TOOMANYOPENFILES ; >; + < "Data could not be read from the file." ; ERRCODE_IO_CANTREAD ; >; + < "The file could not be written." ; ERRCODE_IO_CANTWRITE ; >; + < "The operation could not be run due to insufficient memory." ; ERRCODE_IO_OUTOFMEMORY ; >; + < "The seek operation could not be run." ; ERRCODE_IO_CANTSEEK ; >; + < "The tell operation could not be run." ; ERRCODE_IO_CANTTELL ; >; + < "Incorrect file version." ; ERRCODE_IO_WRONGVERSION ; >; + < "Incorrect file format." ; ERRCODE_IO_WRONGFORMAT ; >; + < "The file name contains invalid characters." ; ERRCODE_IO_INVALIDCHAR ; >; + < "An unknown I/O error has occurred." ; ERRCODE_IO_UNKNOWN ; >; + < "An invalid attempt was made to access the file." ; ERRCODE_IO_INVALIDACCESS ; >; + < "The file could not be created." ; ERRCODE_IO_CANTCREATE ; >; + < "The operation was started under an invalid parameter." ; ERRCODE_IO_INVALIDPARAMETER ; >; + < "The operation on the file was aborted." ; ERRCODE_IO_ABORT ; >; + < "Path to the file does not exist." ; ERRCODE_IO_NOTEXISTSPATH ; >; + < "An object cannot be copied into itself." ; ERRCODE_IO_RECURSIVE ; >; + < "The specified template could not be found." ; ERRCODE_SFX_TEMPLATENOTFOUND ; >; + < "The file cannot be used as template." ; ERRCODE_SFX_NOTATEMPLATE ; >; + < "This document has already been opened for editing." ; ERRCODE_SFX_ALREADYOPEN ; >; + < "The wrong password has been entered." ; ERRCODE_SFX_WRONGPASSWORD ; >; + < "Error reading file." ; ERRCODE_SFX_DOLOADFAILED ; >; + < "The document was opened as read-only." ; ERRCODE_SFX_DOCUMENTREADONLY ; >; + < "General OLE Error." ; ERRCODE_SFX_OLEGENERAL ; >; + < "The host name $(ARG1) could not be resolved." ; ERRCODE_INET_NAME_RESOLVE ; >; + < "Could not establish Internet connection to $(ARG1)." ; ERRCODE_INET_CONNECT ; >; + < "Error reading data from the Internet.\nServer error message: $(ARG1)." ; ERRCODE_INET_READ ; >; + < "Error transferring data to the Internet.\nServer error message: $(ARG1)." ; ERRCODE_INET_WRITE ; >; + < "General Internet error has occurred." ; ERRCODE_INET_GENERAL ; >; + < "The requested Internet data is not available in the cache and cannot be transmitted as the Online mode has not be activated." ; ERRCODE_INET_OFFLINE ; >; + < "The contents could not be created." ; ERRCODE_SFX_CANTCREATECONTENT ; >; + < "The file name is too long for the target file system." ; ERRCODE_IO_NAMETOOLONG ; >; + < "The input syntax is invalid." ; ERRCODE_SFX_INVALIDSYNTAX ; >; + < "The input syntax is invalid." ; ERRCODE_SFX_CANTCREATEFOLDER ; >; + < "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME %PRODUCTVERSION file format."; ERRCODE_IO_NOTSTORABLEINBINARYFORMAT ; >; + < "The maximum number of documents that can be opened at the same time has been reached. You need to close one or more documents before you can open a new document."; ERRCODE_SFX_NOMOREDOCUMENTSALLOWED ; >; + < "Could not create backup copy." ; ERRCODE_SFX_CANTCREATEBACKUP ; >; + < "An attempt was made to execute a macro.\nFor security reasons, macro support is disabled."; ERRCODE_SFX_MACROS_SUPPORT_DISABLED ; >; + < "This document contains macros.\n\nMacros may contain viruses. Execution of macros is disabled due to the current macro security setting in %PRODUCTNAME - Preferences - %PRODUCTNAME - Security.\n\nTherefore, some functionality may not be available." ; ERRCODE_SFX_DOCUMENT_MACRO_DISABLED_MAC ; >; + < "This document contains macros.\n\nMacros may contain viruses. Execution of macros is disabled due to the current macro security setting in Tools - Options - %PRODUCTNAME - Security.\n\nTherefore, some functionality may not be available." ; ERRCODE_SFX_DOCUMENT_MACRO_DISABLED ; >; + < "The encrypted document contains unexpected non-encrypted streams.\n\nThis could be the result of document manipulation.\n\nWe recommend that you do not trust the content of the current document.\nExecution of macros is disabled for this document.\n " ; ERRCODE_SFX_INCOMPLETE_ENCRYPTION ; >; + < "Invalid data length." ; ERRCODE_IO_INVALIDLENGTH ; >; + < "Function not possible: path contains current directory." ; ERRCODE_IO_CURRENTDIR ; >; + < "Function not possible: device (drive) not identical." ; ERRCODE_IO_NOTSAMEDEVICE ; >; + < "Device (drive) not ready." ; ERRCODE_IO_DEVICENOTREADY ; >; + < "Wrong checksum." ; ERRCODE_IO_BADCRC ; >; + < "Function not possible: write protected." ; ERRCODE_IO_WRITEPROTECTED ; >; + < "The password of a shared spreadsheet cannot be set or changed.\nDeactivate sharing mode first."; ERRCODE_SFX_SHARED_NOPASSWORDCHANGE ; >; + < "File format error found at $(ARG1)(row,col)."; ERRCODE_SFX_FORMAT_ROWCOL ; >; + }; +}; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/AllLangResTarget_ofa.mk b/svx/AllLangResTarget_ofa.mk deleted file mode 100644 index 48d45a05e628..000000000000 --- a/svx/AllLangResTarget_ofa.mk +++ /dev/null @@ -1,32 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,ofa)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,ofa,svx)) - -$(eval $(call gb_AllLangResTarget_add_srs,ofa,svx/ofa)) - -$(eval $(call gb_SrsTarget_SrsTarget,svx/ofa)) - -$(eval $(call gb_SrsTarget_add_files,svx/ofa,\ - svx/source/src/errtxt.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk index c8bf3a3b7729..50a9abc18069 100644 --- a/svx/Module_svx.mk +++ b/svx/Module_svx.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Module_add_targets,svx,\ $(eval $(call gb_Module_add_l10n_targets,svx,\ AllLangResTarget_svx \ - AllLangResTarget_ofa \ AllLangResTarget_gal \ UIConfig_svx \ )) diff --git a/svx/source/src/errtxt.src b/svx/source/src/errtxt.src deleted file mode 100644 index a84c5b32c9ab..000000000000 --- a/svx/source/src/errtxt.src +++ /dev/null @@ -1,132 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include -#include - -StringArray RID_ERRCTX -{ - ItemList [ en-US ] = - { - < "Error" ; ERRCTX_ERROR ; >; - < "Warning" ; ERRCTX_WARNING ; >; - < "$(ERR) loading the template $(ARG1)" ; ERRCTX_SFX_LOADTEMPLATE ; >; - < "$(ERR) saving the document $(ARG1)"; ERRCTX_SFX_SAVEDOC ; >; - < "$(ERR) saving the document $(ARG1)"; ERRCTX_SFX_SAVEASDOC ; >; - < "$(ERR) displaying doc. information for document $(ARG1)" ; ERRCTX_SFX_DOCINFO ; >; - < "$(ERR) writing document $(ARG1) as template" ; ERRCTX_SFX_DOCTEMPLATE ; >; - < "$(ERR) copying or moving document contents" ; ERRCTX_SFX_MOVEORCOPYCONTENTS ; >; - < "$(ERR) starting the Document Manager" ; ERRCTX_SFX_DOCMANAGER ; >; - < "$(ERR) loading document $(ARG1)" ; ERRCTX_SFX_OPENDOC ; >; - < "$(ERR) creating a new document" ; ERRCTX_SFX_NEWDOCDIRECT ; >; - < "$(ERR) creating a new document" ; ERRCTX_SFX_NEWDOC ; >; - < "$(ERR) expanding entry" ; ERRCTX_SFX_CREATEOBJSH ; >; - < "$(ERR) loading BASIC of document $(ARG1)" ; ERRCTX_SFX_LOADBASIC ; >; - < "$(ERR) searching for an address"; ERRCTX_SFX_SEARCHADDRESS ; >; - }; -}; - -StringArray RID_ERRHDL -{ - ItemList [ en-US ] = - { - < "Abort" ; ERRCODE_CLASS_ABORT ; >; - < "Nonexistent object" ; ERRCODE_CLASS_NOTEXISTS ; >; - < "Object already exists" ; ERRCODE_CLASS_ALREADYEXISTS ; >; - < "Object not accessible" ; ERRCODE_CLASS_ACCESS ; >; - < "Inadmissible path" ; ERRCODE_CLASS_PATH ; >; - < "Locking problem" ; ERRCODE_CLASS_LOCKING ; >; - < "Wrong parameter" ; ERRCODE_CLASS_PARAMETER ; >; - < "Resource exhausted" ; ERRCODE_CLASS_SPACE ; >; - < "Action not supported" ; ERRCODE_CLASS_NOTSUPPORTED ; >; - < "Read Error" ; ERRCODE_CLASS_READ ; >; - < "Write Error" ; ERRCODE_CLASS_WRITE ; >; - < "unknown" ; ERRCODE_CLASS_UNKNOWN ; >; - < "Version Incompatibility" ; ERRCODE_CLASS_VERSION ; >; - < "General Error" ; ERRCODE_CLASS_GENERAL ; >; - < "Incorrect format" ; ERRCODE_CLASS_FORMAT ; >; - < "Error creating object" ; ERRCODE_CLASS_CREATE ; >; - < "Inadmissible value or data type" ; ERRCODE_CLASS_SBX ; >; - < "BASIC runtime error" ; ERRCODE_CLASS_RUNTIME ; >; - < "BASIC syntax error" ; ERRCODE_CLASS_COMPILER ; >; - < "General Error" ; 1 ; >; - < "General input/output error." ; ERRCODE_IO_GENERAL ; >; - < "Invalid file name." ; ERRCODE_IO_MISPLACEDCHAR ; >; - < "Nonexistent file." ; ERRCODE_IO_NOTEXISTS ; >; - < "File already exists." ; ERRCODE_IO_ALREADYEXISTS ; >; - < "The object is not a directory." ; ERRCODE_IO_NOTADIRECTORY ; >; - < "The object is not a file." ; ERRCODE_IO_NOTAFILE ; >; - < "The specified device is invalid." ; ERRCODE_IO_INVALIDDEVICE ; >; - < "The object cannot be accessed\ndue to insufficient user rights." ; ERRCODE_IO_ACCESSDENIED ; >; - < "Sharing violation while accessing the object." ; ERRCODE_IO_LOCKVIOLATION ; >; - < "No more space on device." ; ERRCODE_IO_OUTOFSPACE ; >; - < "This operation cannot be run on\nfiles containing wildcards." ; ERRCODE_IO_ISWILDCARD ; >; - < "This operation is not supported on this operating system." ; ERRCODE_IO_NOTSUPPORTED ; >; - < "There are too many files open." ; ERRCODE_IO_TOOMANYOPENFILES ; >; - < "Data could not be read from the file." ; ERRCODE_IO_CANTREAD ; >; - < "The file could not be written." ; ERRCODE_IO_CANTWRITE ; >; - < "The operation could not be run due to insufficient memory." ; ERRCODE_IO_OUTOFMEMORY ; >; - < "The seek operation could not be run." ; ERRCODE_IO_CANTSEEK ; >; - < "The tell operation could not be run." ; ERRCODE_IO_CANTTELL ; >; - < "Incorrect file version." ; ERRCODE_IO_WRONGVERSION ; >; - < "Incorrect file format." ; ERRCODE_IO_WRONGFORMAT ; >; - < "The file name contains invalid characters." ; ERRCODE_IO_INVALIDCHAR ; >; - < "An unknown I/O error has occurred." ; ERRCODE_IO_UNKNOWN ; >; - < "An invalid attempt was made to access the file." ; ERRCODE_IO_INVALIDACCESS ; >; - < "The file could not be created." ; ERRCODE_IO_CANTCREATE ; >; - < "The operation was started under an invalid parameter." ; ERRCODE_IO_INVALIDPARAMETER ; >; - < "The operation on the file was aborted." ; ERRCODE_IO_ABORT ; >; - < "Path to the file does not exist." ; ERRCODE_IO_NOTEXISTSPATH ; >; - < "An object cannot be copied into itself." ; ERRCODE_IO_RECURSIVE ; >; - < "The specified template could not be found." ; ERRCODE_SFX_TEMPLATENOTFOUND ; >; - < "The file cannot be used as template." ; ERRCODE_SFX_NOTATEMPLATE ; >; - < "This document has already been opened for editing." ; ERRCODE_SFX_ALREADYOPEN ; >; - < "The wrong password has been entered." ; ERRCODE_SFX_WRONGPASSWORD ; >; - < "Error reading file." ; ERRCODE_SFX_DOLOADFAILED ; >; - < "The document was opened as read-only." ; ERRCODE_SFX_DOCUMENTREADONLY ; >; - < "General OLE Error." ; ERRCODE_SFX_OLEGENERAL ; >; - < "The host name $(ARG1) could not be resolved." ; ERRCODE_INET_NAME_RESOLVE ; >; - < "Could not establish Internet connection to $(ARG1)." ; ERRCODE_INET_CONNECT ; >; - < "Error reading data from the Internet.\nServer error message: $(ARG1)." ; ERRCODE_INET_READ ; >; - < "Error transferring data to the Internet.\nServer error message: $(ARG1)." ; ERRCODE_INET_WRITE ; >; - < "General Internet error has occurred." ; ERRCODE_INET_GENERAL ; >; - < "The requested Internet data is not available in the cache and cannot be transmitted as the Online mode has not be activated." ; ERRCODE_INET_OFFLINE ; >; - < "The contents could not be created." ; ERRCODE_SFX_CANTCREATECONTENT ; >; - < "The file name is too long for the target file system." ; ERRCODE_IO_NAMETOOLONG ; >; - < "The input syntax is invalid." ; ERRCODE_SFX_INVALIDSYNTAX ; >; - < "The input syntax is invalid." ; ERRCODE_SFX_CANTCREATEFOLDER ; >; - < "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME %PRODUCTVERSION file format."; ERRCODE_IO_NOTSTORABLEINBINARYFORMAT ; >; - < "The maximum number of documents that can be opened at the same time has been reached. You need to close one or more documents before you can open a new document."; ERRCODE_SFX_NOMOREDOCUMENTSALLOWED ; >; - < "Could not create backup copy." ; ERRCODE_SFX_CANTCREATEBACKUP ; >; - < "An attempt was made to execute a macro.\nFor security reasons, macro support is disabled."; ERRCODE_SFX_MACROS_SUPPORT_DISABLED ; >; - < "This document contains macros.\n\nMacros may contain viruses. Execution of macros is disabled due to the current macro security setting in %PRODUCTNAME - Preferences - %PRODUCTNAME - Security.\n\nTherefore, some functionality may not be available." ; ERRCODE_SFX_DOCUMENT_MACRO_DISABLED_MAC ; >; - < "This document contains macros.\n\nMacros may contain viruses. Execution of macros is disabled due to the current macro security setting in Tools - Options - %PRODUCTNAME - Security.\n\nTherefore, some functionality may not be available." ; ERRCODE_SFX_DOCUMENT_MACRO_DISABLED ; >; - < "The encrypted document contains unexpected non-encrypted streams.\n\nThis could be the result of document manipulation.\n\nWe recommend that you do not trust the content of the current document.\nExecution of macros is disabled for this document.\n " ; ERRCODE_SFX_INCOMPLETE_ENCRYPTION ; >; - < "Invalid data length." ; ERRCODE_IO_INVALIDLENGTH ; >; - < "Function not possible: path contains current directory." ; ERRCODE_IO_CURRENTDIR ; >; - < "Function not possible: device (drive) not identical." ; ERRCODE_IO_NOTSAMEDEVICE ; >; - < "Device (drive) not ready." ; ERRCODE_IO_DEVICENOTREADY ; >; - < "Wrong checksum." ; ERRCODE_IO_BADCRC ; >; - < "Function not possible: write protected." ; ERRCODE_IO_WRITEPROTECTED ; >; - < "The password of a shared spreadsheet cannot be set or changed.\nDeactivate sharing mode first."; ERRCODE_SFX_SHARED_NOPASSWORDCHANGE ; >; - < "File format error found at $(ARG1)(row,col)."; ERRCODE_SFX_FORMAT_ROWCOL ; >; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx index 3e90c6ebdb36..c69fc57d435d 100644 --- a/uui/source/iahndl-errorhandler.cxx +++ b/uui/source/iahndl-errorhandler.cxx @@ -152,7 +152,7 @@ UUIInteractionHelper::handleErrorHandlerRequest( OUString aMessage; { enum Source { SOURCE_DEFAULT, SOURCE_SVX, SOURCE_UUI }; - static char const * const aManager[3] = { "ofa", "svx", "uui" }; + static char const * const aManager[3] = { "svt", "svx", "uui" }; static sal_uInt16 const aId[3] = { RID_ERRHDL, RID_SVXERRCODE, -- cgit