Kaydet (Commit) 2239b486 authored tarafından Szymon Kłos's avatar Szymon Kłos

RemoteFilesDialog moved to fpicker

Change-Id: I8e978d40ee022d15f482aec4567c3171b75b9720
üst 1abade4f
...@@ -49,6 +49,7 @@ $(eval $(call gb_Library_add_exception_objects,fps_office,\ ...@@ -49,6 +49,7 @@ $(eval $(call gb_Library_add_exception_objects,fps_office,\
fpicker/source/office/OfficeFilePicker \ fpicker/source/office/OfficeFilePicker \
fpicker/source/office/OfficeFolderPicker \ fpicker/source/office/OfficeFolderPicker \
fpicker/source/office/PlacesListBox \ fpicker/source/office/PlacesListBox \
fpicker/source/office/RemoteFilesDialog \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "OfficeFilePicker.hxx" #include "OfficeFilePicker.hxx"
#include "iodlg.hxx" #include "iodlg.hxx"
#include <svtools/RemoteFilesDialog.hxx> #include "RemoteFilesDialog.hxx"
#include <list> #include <list>
#include <functional> #include <functional>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#include <svtools/RemoteFilesDialog.hxx> #include "RemoteFilesDialog.hxx"
class FileViewContainer : public vcl::Window class FileViewContainer : public vcl::Window
{ {
...@@ -757,7 +757,15 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, OkHdl ) ...@@ -757,7 +757,15 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, OkHdl )
bExists = false; 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 ) if( m_eMode == REMOTEDLG_MODE_OPEN )
return 0; return 0;
......
...@@ -11,13 +11,15 @@ ...@@ -11,13 +11,15 @@
#define INCLUDED_SVTOOLS_REMOTEFILESDIALOG_HXX #define INCLUDED_SVTOOLS_REMOTEFILESDIALOG_HXX
#include <svtools/foldertree.hxx> #include <svtools/foldertree.hxx>
#include <svtools/svtdllapi.h>
#include <svtools/place.hxx> #include <svtools/place.hxx>
#include <svtools/PlaceEditDialog.hxx> #include <svtools/PlaceEditDialog.hxx>
#include <svtools/breadcrumb.hxx> #include <svtools/breadcrumb.hxx>
#include <svtools/fileview.hxx> #include <svtools/fileview.hxx>
#include <tools/resid.hxx>
#include <vcl/button.hxx> #include <vcl/button.hxx>
#include <vcl/fpicker.hrc>
#include <vcl/menubtn.hxx> #include <vcl/menubtn.hxx>
#include <vcl/dialog.hxx> #include <vcl/dialog.hxx>
#include <vcl/vclptr.hxx> #include <vcl/vclptr.hxx>
...@@ -30,7 +32,8 @@ ...@@ -30,7 +32,8 @@
#include <vector> #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::beans;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
...@@ -53,7 +56,7 @@ typedef ::com::sun::star::uno::Sequence< OUString > OUStringList; ...@@ -53,7 +56,7 @@ typedef ::com::sun::star::uno::Sequence< OUString > OUStringList;
class FileViewContainer; class FileViewContainer;
class SVT_DLLPUBLIC RemoteFilesDialog : public SvtFileDialog_Base class RemoteFilesDialog : public SvtFileDialog_Base
{ {
public: public:
RemoteFilesDialog( vcl::Window* pParent, WinBits nBits ); RemoteFilesDialog( vcl::Window* pParent, WinBits nBits );
......
...@@ -139,7 +139,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ ...@@ -139,7 +139,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/dialogs/mcvmath \ svtools/source/dialogs/mcvmath \
svtools/source/dialogs/PlaceEditDialog \ svtools/source/dialogs/PlaceEditDialog \
svtools/source/dialogs/prnsetup \ svtools/source/dialogs/prnsetup \
svtools/source/dialogs/RemoteFilesDialog \
svtools/source/dialogs/restartdialog \ svtools/source/dialogs/restartdialog \
svtools/source/dialogs/roadmapwizard \ svtools/source/dialogs/roadmapwizard \
svtools/source/dialogs/ServerDetailsControls \ svtools/source/dialogs/ServerDetailsControls \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment