diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-11-07 14:17:02 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-11-07 14:19:35 +0000 |
| commit | b123e4c42b2393ef359e0cc418961a4fa9ac5b36 (patch) | |
| tree | df1f275c2abf6871fcfb092e519252dbcb91f980 /fpicker | |
| parent | 14f6de30ce3896704f06aa4259e6a0a2cc0895a8 (diff) | |
gtk: fix issue with built-in file/folder picker settings
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/generic/fpicker.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx index 845e775f4323..5113018b2854 100644 --- a/fpicker/source/generic/fpicker.cxx +++ b/fpicker/source/generic/fpicker.cxx @@ -85,9 +85,11 @@ static Reference< css::uno::XInterface > FilePicker_createInstance ( return xResult; Reference< css::lang::XMultiComponentFactory > xFactory (rxContext->getServiceManager()); - if (xFactory.is()) + if (xFactory.is() && SvtMiscOptions().UseSystemFileDialog()) { - if (SvtMiscOptions().UseSystemFileDialog()) + xResult = Reference< css::uno::XInterface >( Application::createFilePicker( rxContext ) ); + + if (!xResult.is()) { try { @@ -102,8 +104,6 @@ static Reference< css::uno::XInterface > FilePicker_createInstance ( } } - if (!xResult.is()) - xResult = Reference< css::uno::XInterface >( Application::createFilePicker( rxContext ) ); if (!xResult.is() && xFactory.is()) { @@ -162,9 +162,10 @@ static Reference< css::uno::XInterface > FolderPicker_createInstance ( return xResult; Reference< css::lang::XMultiComponentFactory > xFactory (rxContext->getServiceManager()); - if (xFactory.is()) + if (xFactory.is() && SvtMiscOptions().UseSystemFileDialog()) { - if (SvtMiscOptions().UseSystemFileDialog()) + xResult = Reference< css::uno::XInterface >( Application::createFolderPicker( rxContext ) ); + if (!xResult.is()) { try { @@ -178,8 +179,6 @@ static Reference< css::uno::XInterface > FolderPicker_createInstance ( } } } - if (!xResult.is()) - xResult = Reference< css::uno::XInterface >( Application::createFolderPicker( rxContext ) ); if (!xResult.is() && xFactory.is() ) { // Always fall back to OfficeFolderPicker. |