summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2017-08-23 20:19:58 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-08-24 07:53:30 +0200
commit02c53f744ed23e2149fc7c83d67cb7d8aa5eb0ed (patch)
treea9b68688e442c0a3a4f2a15336a4403d347458cc
parent311be7d70146e4963e4dfd1f39d6c71d45d241ca (diff)
remove unused error codes in svtools
which seem to be unused since initial import Change-Id: Id5216bac53fafc1020003de10d8dde381b1121cf Reviewed-on: https://gerrit.libreoffice.org/41491 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--include/svtools/sfxecode.hxx1
-rw-r--r--include/svtools/soerr.hxx2
-rw-r--r--sfx2/source/appl/fileobj.cxx8
-rw-r--r--sfx2/source/appl/impldde.cxx8
-rw-r--r--svtools/inc/errtxt.hrc5
5 files changed, 2 insertions, 22 deletions
diff --git a/include/svtools/sfxecode.hxx b/include/svtools/sfxecode.hxx
index 119dac32b74e..7827e6a7146a 100644
--- a/include/svtools/sfxecode.hxx
+++ b/include/svtools/sfxecode.hxx
@@ -32,7 +32,6 @@
#define ERRCODE_SFX_CANTCREATECONTENT ErrCode(ErrCodeArea::Sfx, ERRCODE_CLASS_CREATE | 21)
#define ERRCODE_SFX_INVALIDSYNTAX ErrCode(ErrCodeArea::Sfx, ERRCODE_CLASS_PATH | 36)
-#define ERRCODE_SFX_CANTCREATEFOLDER ErrCode(ErrCodeArea::Sfx, ERRCODE_CLASS_CREATE | 37)
#define ERRCODE_SFX_CANTGETPASSWD ErrCode(ErrCodeArea::Sfx, ERRCODE_CLASS_READ | 42)
#define ERRCODE_SFX_NOMOREDOCUMENTSALLOWED ErrCode(ErrCodeArea::Sfx, ERRCODE_WARNING_MASK | ERRCODE_CLASS_NONE | 44)
#define ERRCODE_SFX_CANTCREATEBACKUP ErrCode(ErrCodeArea::Sfx, ERRCODE_CLASS_CREATE | 50)
diff --git a/include/svtools/soerr.hxx b/include/svtools/soerr.hxx
index 71cc15bc39f4..1d09ca527d00 100644
--- a/include/svtools/soerr.hxx
+++ b/include/svtools/soerr.hxx
@@ -28,8 +28,6 @@
#define SO_WRN(x) ErrCode(ErrCodeArea::So, ERRCODE_CLASS_SO | ERRCODE_WARNING_MASK | x)
#define ERRCODE_SO_GENERALERROR SO_ERR(1)
-#define ERRCODE_SO_FALSE SO_WRN(23)
-#define ERRCODE_SO_PENDING SO_ERR(25)
#define ERRCODE_SO_CANNOT_DOVERB_NOW SO_WRN(28)
#define ERRCODE_SO_NOVERBS SO_ERR(30)
#define ERRCODE_SO_NOTIMPL SO_ERR(33)
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 37e3adb3d046..8ad8fba7c44c 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -514,14 +514,8 @@ IMPL_LINK( SvFileObject, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, vo
aEndEditLink.Call( sFile );
}
-/* [Description]
-
+/*
The method determines whether the data-object can be read from a DDE.
-
- The following can be returned:
- ERRCODE_NONE if it has been completely read
- ERRCODE_SO_PENDING if it has not been completely read
- ERRCODE_SO_FALSE otherwise
*/
bool SvFileObject::IsPending() const
{
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index ff7898eaded1..2ed6388bbe97 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -295,14 +295,8 @@ bool SvDDEObject::ImplHasOtherFormat( DdeTransaction& rReq )
}
bool SvDDEObject::IsPending() const
-/* [Description]
-
+/*
The method determines whether the data-object can be read from a DDE.
-
- Returned is the following:
- ERRCODE_NONE if it has been completely read
- ERRCODE_SO_PENDING if it has not been completely read
- ERRCODE_SO_FALSE otherwise
*/
{
return bWaitForData;
diff --git a/svtools/inc/errtxt.hrc b/svtools/inc/errtxt.hrc
index 1383d224c51b..c80892692d02 100644
--- a/svtools/inc/errtxt.hrc
+++ b/svtools/inc/errtxt.hrc
@@ -112,7 +112,6 @@ const ErrMsgCode RID_ERRHDL[] =
{ NC_("RID_ERRHDL", "The contents could not be created.") , ErrCode(ERRCODE_SFX_CANTCREATECONTENT) },
{ NC_("RID_ERRHDL", "The file name is too long for the target file system.") , ErrCode(ERRCODE_IO_NAMETOOLONG) },
{ NC_("RID_ERRHDL", "The input syntax is invalid.") , ErrCode(ERRCODE_SFX_INVALIDSYNTAX) },
- { NC_("RID_ERRHDL", "The input syntax is invalid.") , ErrCode(ERRCODE_SFX_CANTCREATEFOLDER) },
{ NC_("RID_ERRHDL", "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME %PRODUCTVERSION file format."), ErrCode(ERRCODE_IO_NOTSTORABLEINBINARYFORMAT) },
{ NC_("RID_ERRHDL", "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(ERRCODE_SFX_NOMOREDOCUMENTSALLOWED) },
{ NC_("RID_ERRHDL", "Could not create backup copy.") , ErrCode(ERRCODE_SFX_CANTCREATEBACKUP) },
@@ -134,10 +133,6 @@ const ErrMsgCode RID_SO_ERROR_HANDLER[] =
{
{ NC_("RID_ERRHDL", "General OLE error."),
ErrCode(sal_uInt32(ERRCODE_SO_GENERALERROR) & S_MAX) },
- { NC_("RID_ERRHDL", "False."),
- ErrCode(sal_uInt32(ERRCODE_SO_FALSE) & S_MAX) },
- { NC_("RID_ERRHDL", "Data not available at this time."),
- ErrCode(sal_uInt32(ERRCODE_SO_PENDING) & S_MAX) },
{ NC_("RID_ERRHDL", "The action cannot be executed in the object's current state."),
ErrCode(sal_uInt32(ERRCODE_SO_CANNOT_DOVERB_NOW) & S_MAX) },
{ NC_("RID_ERRHDL", "The object does not support any actions."),