diff options
| author | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
| commit | 06ec1c089519ef3249464aa09eadf03a8db93a39 (patch) | |
| tree | 85b2eb6d8ba6ca95e18e1ff82151224cb14106f6 /dbaccess/source/ui/dlg/ConnectionHelper.cxx | |
| parent | Add some check to renewpo (diff) | |
| parent | oox: ZipStorage: better exception tracing (diff) | |
| download | core-06ec1c089519ef3249464aa09eadf03a8db93a39.tar.gz core-06ec1c089519ef3249464aa09eadf03a8db93a39.zip | |
Merge branch 'master' into feature/killsdf
Conflicts:
Repository.mk
RepositoryFixes.mk
connectivity/prj/build.lst
extensions/prj/build.lst
filter/prj/build.lst
fpicker/prj/build.lst
l10ntools/StaticLibrary_transex.mk
saxon/build.xml
shell/prj/build.lst
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/Configuration.mk
solenv/gbuild/UI.mk
ucb/source/ucp/webdav/webdavcontent.cxx
Diffstat (limited to 'dbaccess/source/ui/dlg/ConnectionHelper.cxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/ConnectionHelper.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index ac7e55f21a55..c33685de305a 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -45,7 +45,7 @@ #include "dsselect.hxx" #include <svl/filenotation.hxx> #include "dbustrings.hrc" -#include <com/sun/star/ui/dialogs/XFolderPicker.hpp> +#include <com/sun/star/ui/dialogs/FolderPicker.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/awt/XWindow.hpp> @@ -172,13 +172,7 @@ DBG_NAME(OConnectionHelper) { try { - ::rtl::OUString sFolderPickerService(SERVICE_UI_FOLDERPICKER); - Reference< XFolderPicker > xFolderPicker(m_xORB->createInstance(sFolderPickerService), UNO_QUERY); - if (!xFolderPicker.is()) - { - ShowServiceNotAvailableError(GetParent(), sFolderPickerService, sal_True); - break; - } + Reference< XFolderPicker2 > xFolderPicker = FolderPicker::create(comphelper::getComponentContext(m_xORB)); sal_Bool bDoBrowse = sal_False; String sOldPath = getURLNoPrefix(); |