strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gtk: fix issue with built-in file/folder picker settings

Browse source
This commit is contained in:
Michael Meeks 2011-11-07 14:17:02 +00:00
parent 14f6de30ce
commit b123e4c42b
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
fpicker/source/generic/fpicker.cxx
View file

@ -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.