From fe3c2079117e541e38dc24319bd95d6ed1c622cc Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 9 Feb 2017 14:48:46 +0200
Subject: [PATCH] remove unused enumerators from FTPErrors enum

Change-Id: I30a2cc41d246b5048f2514eb38ee8e3bef0ed41c
---
 ucb/source/ucp/ftp/ftpcontent.cxx | 8 +-------
 ucb/source/ucp/ftp/ftpurl.hxx     | 4 +---
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index b249c6c5ba3e..89c779b58285 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -715,13 +715,7 @@ void FTPContent::insert(const InsertCommandArgument& aInsertCommand,
         } else if(m_aInfo.Type == FTP_FOLDER)
             m_aFTPURL.mkdir(bReplace);
     } catch(const curl_exception& e) {
-        if(e.code() == FILE_EXIST_DURING_INSERT ||
-           e.code() == FOLDER_EXIST_DURING_INSERT) {
-            // Deprecated, not used anymore:
-            NameClashException excep;
-            excep.Name = m_aFTPURL.child();
-            ucbhelper::cancelCommandExecution(Any(excep), Env);
-        } else if(e.code() == FOLDER_MIGHT_EXIST_DURING_INSERT ||
+        if(e.code() == FOLDER_MIGHT_EXIST_DURING_INSERT ||
                   e.code() == FILE_MIGHT_EXIST_DURING_INSERT) {
             // Interact
             Reference<XInteractionHandler> xInt;
diff --git a/ucb/source/ucp/ftp/ftpurl.hxx b/ucb/source/ucp/ftp/ftpurl.hxx
index a0bdf0abb281..cb56f7042e5c 100644
--- a/ucb/source/ucp/ftp/ftpurl.hxx
+++ b/ucb/source/ucp/ftp/ftpurl.hxx
@@ -46,9 +46,7 @@ namespace ftp {
     class FTPContentProvider;
 
 
-    enum FTPErrors { FILE_EXIST_DURING_INSERT = CURL_LAST +1,
-                     FOLDER_EXIST_DURING_INSERT,
-                     FOLDER_MIGHT_EXIST_DURING_INSERT,
+    enum FTPErrors { FOLDER_MIGHT_EXIST_DURING_INSERT = CURL_LAST,
                      FILE_MIGHT_EXIST_DURING_INSERT };
 
     class malformed_exception : public std::exception { };