RemoteFilesDialog moved to fpicker

Change-Id: I8e978d40ee022d15f482aec4567c3171b75b9720

5 files changed, 18 insertions, 7 deletions

diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk
index c109dce3a978..6c484a0a4a31 100644
--- a/fpicker/Library_fps_office.mk
+++ b/fpicker/Library_fps_office.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Library_add_exception_objects,fps_office,\
 	fpicker/source/office/OfficeFilePicker \
 	fpicker/source/office/OfficeFolderPicker \
 	fpicker/source/office/PlacesListBox \
+	fpicker/source/office/RemoteFilesDialog \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 5846e588face..917a5200fafd 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -20,7 +20,7 @@
 
 #include "OfficeFilePicker.hxx"
 #include "iodlg.hxx"
-#include <svtools/RemoteFilesDialog.hxx>
+#include "RemoteFilesDialog.hxx"
 
 #include <list>
 #include <functional>
diff --git a/svtools/source/dialogs/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index 2eea4599ff2c..533940d91f76 100644
--- a/svtools/source/dialogs/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <svtools/RemoteFilesDialog.hxx>
+#include "RemoteFilesDialog.hxx"
 
 class FileViewContainer : public vcl::Window
 {
@@ -757,7 +757,15 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, OkHdl )
         bExists = false;
     }
 
-    if ( !bExists )
+    if ( bExists )
+    {
+        OUString sMsg = ResId( STR_SVT_ALREADYEXISTOVERWRITE, *ResMgrHolder::getOrCreate() );
+        sMsg = sMsg.replaceFirst( "$filename$", sName );
+        ScopedVclPtrInstance< MessageDialog > aBox( this, sMsg, VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO );
+        if( aBox->Execute() != RET_YES )
+            return 0;
+    }
+    else
     {
         if( m_eMode == REMOTEDLG_MODE_OPEN )
             return 0;
diff --git a/include/svtools/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx
index db61e1759290..34623056a8b0 100644
--- a/include/svtools/RemoteFilesDialog.hxx
+++ b/fpicker/source/office/RemoteFilesDialog.hxx
@@ -11,13 +11,15 @@
 #define INCLUDED_SVTOOLS_REMOTEFILESDIALOG_HXX
 
 #include <svtools/foldertree.hxx>
-#include <svtools/svtdllapi.h>
 #include <svtools/place.hxx>
 #include <svtools/PlaceEditDialog.hxx>
 #include <svtools/breadcrumb.hxx>
 #include <svtools/fileview.hxx>
 
+#include <tools/resid.hxx>
+
 #include <vcl/button.hxx>
+#include <vcl/fpicker.hrc>
 #include <vcl/menubtn.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/vclptr.hxx>
@@ -30,7 +32,8 @@
 
 #include <vector>
 
-#include "../../../fpicker/source/office/fpdialogbase.hxx"
+#include "fpdialogbase.hxx"
+#include "fpsofficeResMgr.hxx"
 
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::uno;
@@ -53,7 +56,7 @@ typedef ::com::sun::star::uno::Sequence< OUString >  OUStringList;
 
 class FileViewContainer;
 
-class SVT_DLLPUBLIC RemoteFilesDialog : public SvtFileDialog_Base
+class RemoteFilesDialog : public SvtFileDialog_Base
 {
 public:
     RemoteFilesDialog( vcl::Window* pParent, WinBits nBits );
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 20a4c2ff2bb8..f6c834da9765 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -139,7 +139,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/dialogs/mcvmath \
     svtools/source/dialogs/PlaceEditDialog \
     svtools/source/dialogs/prnsetup \
-    svtools/source/dialogs/RemoteFilesDialog \
     svtools/source/dialogs/restartdialog \
     svtools/source/dialogs/roadmapwizard \
     svtools/source/dialogs/ServerDetailsControls \