summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2015-07-16 13:32:20 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2015-07-16 15:12:22 +0300
commiteeed180959dc45b5be7facd8bdca5597f6c745b7 (patch)
tree89285709fb326b6b609c9b5251f8745e66ad0109
parentec7e3c6dfe6262f2d09629d5c1152cfdf2a4b19b (diff)
Move remotefilesdialog.ui to where it belongs
Change-Id: I9afa6c8f7c9de8ed133f714a4726d3f2d01be1db
-rw-r--r--fpicker/UIConfig_fps.mk1
-rw-r--r--fpicker/source/office/RemoteFilesDialog.cxx2
-rw-r--r--fpicker/uiconfig/ui/remotefilesdialog.ui (renamed from svtools/uiconfig/ui/remotefilesdialog.ui)0
-rw-r--r--svtools/UIConfig_svt.mk1
4 files changed, 2 insertions, 2 deletions
diff --git a/fpicker/UIConfig_fps.mk b/fpicker/UIConfig_fps.mk
index c5582587bda5..ee8fea50d663 100644
--- a/fpicker/UIConfig_fps.mk
+++ b/fpicker/UIConfig_fps.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_UIConfig_UIConfig,fps))
$(eval $(call gb_UIConfig_add_uifiles,fps,\
fpicker/uiconfig/ui/explorerfiledialog \
fpicker/uiconfig/ui/foldernamedialog \
+ fpicker/uiconfig/ui/remotefilesdialog \
))
# vim: set noet sw=4 ts=4:
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index d59c9bd89d1d..9c37347583ce 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -127,7 +127,7 @@ class FileViewContainer : public vcl::Window
};
RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent, WinBits nBits )
- : SvtFileDialog_Base( pParent, "RemoteFilesDialog", "svt/ui/remotefilesdialog.ui" )
+ : SvtFileDialog_Base( pParent, "RemoteFilesDialog", "fps/ui/remotefilesdialog.ui" )
, m_context( comphelper::getProcessComponentContext() )
, m_pSplitter( NULL )
, m_pFileView( NULL )
diff --git a/svtools/uiconfig/ui/remotefilesdialog.ui b/fpicker/uiconfig/ui/remotefilesdialog.ui
index cd73846f27b5..cd73846f27b5 100644
--- a/svtools/uiconfig/ui/remotefilesdialog.ui
+++ b/fpicker/uiconfig/ui/remotefilesdialog.ui
diff --git a/svtools/UIConfig_svt.mk b/svtools/UIConfig_svt.mk
index bca55c7cb9eb..dd6182e50125 100644
--- a/svtools/UIConfig_svt.mk
+++ b/svtools/UIConfig_svt.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_UIConfig_add_uifiles,svt,\
svtools/uiconfig/ui/placeedit \
svtools/uiconfig/ui/printersetupdialog \
svtools/uiconfig/ui/querydeletedialog \
- svtools/uiconfig/ui/remotefilesdialog \
svtools/uiconfig/ui/restartdialog \
svtools/uiconfig/ui/wizarddialog \
))