[Libreoffice-commits] core.git: include/svtools svtools/source
Gabor Kelemen
kelemeng at ubuntu.com
Mon Apr 24 09:16:35 UTC 2017
include/svtools/soerr.hxx | 28 -------------------
svtools/source/dialogs/so3res.src | 56 --------------------------------------
2 files changed, 84 deletions(-)
New commits:
commit 1c8f03b48a02a56bc4eb364d8a4e9bd4715a530a
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date: Sun Apr 23 21:15:30 2017 +0200
Drop unused string resources from svtools/soerr.hxx
Change-Id: If3060b101dc0692f47d9d5eaf649bce60965b04f
Reviewed-on: https://gerrit.libreoffice.org/36864
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svtools/soerr.hxx b/include/svtools/soerr.hxx
index c44f9e2b4dfb..4f02c70cfecd 100644
--- a/include/svtools/soerr.hxx
+++ b/include/svtools/soerr.hxx
@@ -28,39 +28,11 @@
#define SO_WRN() (ERRCODE_AREA_SO | ERRCODE_CLASS_SO | ERRCODE_WARNING_MASK)
#define ERRCODE_SO_GENERALERROR (SO_ERR() | 1)
-#define ERRCODE_SO_CANT_BINDTOSOURCE (SO_ERR() | 2)
-#define ERRCODE_SO_NOCACHE_UPDATED (SO_ERR() | 3)
-#define ERRCODE_SO_SOMECACHES_NOTUPDATED (SO_WRN() | 4)
-#define ERRCODE_SO_MK_UNAVAILABLE (SO_ERR() | 5)
-#define ERRCODE_SO_E_CLASSDIFF (SO_ERR() | 6)
-#define ERRCODE_SO_MK_NO_OBJECT (SO_ERR() | 7)
-#define ERRCODE_SO_MK_EXCEEDED_DEADLINE (SO_ERR() | 8)
-#define ERRCODE_SO_MK_CONNECT_MANUALLY (SO_ERR() | 9)
-#define ERRCODE_SO_MK_INTERMEDIATE_INTERFACE_NOT_SUPPORTED (SO_ERR() | 10)
-#define ERRCODE_SO_NO_INTERFACE (SO_ERR() | 11)
-#define ERRCODE_SO_OUT_OF_MEMORY (SO_ERR() | 12)
-#define ERRCODE_SO_MK_SYNTAX (SO_ERR() | 13)
-#define ERRCODE_SO_MK_REDUCED_TO_SELF (SO_WRN() | 14)
-#define ERRCODE_SO_MK_NO_INVERSE (SO_ERR() | 15)
-#define ERRCODE_SO_MK_NO_PREFIX (SO_ERR() | 16)
-#define ERRCODE_SO_MK_HIM (SO_WRN() | 17)
-#define ERRCODE_SO_MK_US (SO_WRN() | 18)
-#define ERRCODE_SO_MK_ME (SO_WRN() | 19)
-#define ERRCODE_SO_MK_NOT_BINDABLE (SO_ERR() | 20)
-#define ERRCODE_SO_NOT_IMPLEMENTED (SO_ERR() | 21)
-#define ERRCODE_SO_MK_NO_STORAGE (SO_ERR() | 22)
#define ERRCODE_SO_FALSE (SO_WRN() | 23)
-#define ERRCODE_SO_MK_NEED_GENERIC (SO_ERR() | 24)
#define ERRCODE_SO_PENDING (SO_ERR() | 25)
-#define ERRCODE_SO_NOT_INPLACEACTIVE (SO_ERR() | 26)
-#define ERRCODE_SO_LINDEX (SO_ERR() | 27)
#define ERRCODE_SO_CANNOT_DOVERB_NOW (SO_WRN() | 28)
-#define ERRCODE_SO_OLEOBJ_INVALIDHWND (SO_WRN() | 29)
#define ERRCODE_SO_NOVERBS (SO_ERR() | 30)
-#define ERRCODE_SO_INVALIDVERB (SO_WRN() | 31)
-#define ERRCODE_SO_MK_CONNECT (SO_ERR() | 32)
#define ERRCODE_SO_NOTIMPL (SO_ERR() | 33)
-#define ERRCODE_SO_MK_CANTOPENFILE (SO_ERR() | 34)
// error contexts
#define RID_SO_ERRCTX 32001
diff --git a/svtools/source/dialogs/so3res.src b/svtools/source/dialogs/so3res.src
index 38dcb1780969..3ffd4cb482f7 100644
--- a/svtools/source/dialogs/so3res.src
+++ b/svtools/source/dialogs/so3res.src
@@ -28,72 +28,16 @@ StringArray RID_SO_ERROR_HANDLER
{
< "General OLE error." ;
ERRCODE_SO_GENERALERROR&S_MAX ; >;
- < "The connection to the object cannot be established." ;
- ERRCODE_SO_CANT_BINDTOSOURCE&S_MAX ; >;
- < "No cache files were updated." ;
- ERRCODE_SO_NOCACHE_UPDATED&S_MAX ; >;
- < "Some cache files were not updated." ;
- ERRCODE_SO_SOMECACHES_NOTUPDATED&S_MAX ; >;
- < "Status of object cannot be determined in a timely manner." ;
- ERRCODE_SO_MK_UNAVAILABLE&S_MAX ; >;
- < "Source of the OLE link has been converted." ;
- ERRCODE_SO_E_CLASSDIFF&S_MAX ; >;
- < "The object could not be found." ;
- ERRCODE_SO_MK_NO_OBJECT&S_MAX ; >;
- < "The process could not be completed within the specified time period." ;
- ERRCODE_SO_MK_EXCEEDED_DEADLINE&S_MAX ; >;
- < "OLE could not connect to a network device (server)." ;
- ERRCODE_SO_MK_CONNECT_MANUALLY&S_MAX ; >;
- < "The object found does not support the interface required for the desired operation." ;
- ERRCODE_SO_MK_INTERMEDIATE_INTERFACE_NOT_SUPPORTED&S_MAX ; >;
- < "Interface not supported." ;
- ERRCODE_SO_NO_INTERFACE&S_MAX ; >;
- < "Insufficient memory." ;
- ERRCODE_SO_OUT_OF_MEMORY&S_MAX ; >;
- < "The connection name could not be processed." ;
- ERRCODE_SO_MK_SYNTAX&S_MAX ; >;
- < "The connection name could not be reduced further." ;
- ERRCODE_SO_MK_REDUCED_TO_SELF&S_MAX ; >;
- < "The connection name has no inverse." ;
- ERRCODE_SO_MK_NO_INVERSE&S_MAX ; >;
- < "No common prefix exists." ;
- ERRCODE_SO_MK_NO_PREFIX&S_MAX ; >;
- < "The connection name is contained in the other one." ;
- ERRCODE_SO_MK_HIM&S_MAX ; >;
- < "The connection names (the receiver and the other moniker) are identical." ;
- ERRCODE_SO_MK_US&S_MAX ; >;
- < "The connection name is contained in the other one." ;
- ERRCODE_SO_MK_ME&S_MAX ; >;
- < "The connection name cannot be connected. This is a relative name." ;
- ERRCODE_SO_MK_NOT_BINDABLE&S_MAX ; >;
- < "Operation not implemented." ;
- ERRCODE_SO_NOT_IMPLEMENTED&S_MAX ; >;
- < "No storage." ;
- ERRCODE_SO_MK_NO_STORAGE&S_MAX ; >;
< "False." ;
ERRCODE_SO_FALSE&S_MAX ; >;
- < "Monikers must be composed generically." ;
- ERRCODE_SO_MK_NEED_GENERIC&S_MAX ; >;
< "Data not available at this time." ;
ERRCODE_SO_PENDING&S_MAX ; >;
- < "Object could not be activated InPlace." ;
- ERRCODE_SO_NOT_INPLACEACTIVE & S_MAX ; >;
- < "Invalid index." ;
- ERRCODE_SO_LINDEX & S_MAX ; >;
< "The action cannot be executed in the object's current state." ;
ERRCODE_SO_CANNOT_DOVERB_NOW & S_MAX ; >;
- < "An invalid window was passed when activated." ;
- ERRCODE_SO_OLEOBJ_INVALIDHWND & S_MAX ; >;
< "The object does not support any actions." ;
ERRCODE_SO_NOVERBS & S_MAX ; >;
- < "The action is not defined. The default action will be executed." ;
- ERRCODE_SO_INVALIDVERB & S_MAX ; >;
- < "A link to the network could not be re-established." ;
- ERRCODE_SO_MK_CONNECT & S_MAX ; >;
< "Object does not support this action." ;
ERRCODE_SO_NOTIMPL & S_MAX ; >;
- < "The specified file could not be opened." ;
- ERRCODE_SO_MK_CANTOPENFILE & S_MAX ; >;
};
};
More information about the Libreoffice-commits
mailing list