vcl113: #i112411# fix output format handling (thanks muthusuba!)
This commit is contained in:
@@ -935,6 +935,9 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw
|
|||||||
{
|
{
|
||||||
static const OUString aStarDot = OUString::createFromAscii( "*." );
|
static const OUString aStarDot = OUString::createFromAscii( "*." );
|
||||||
|
|
||||||
|
::rtl::OUString aNewFilter;
|
||||||
|
::rtl::OUString aOldFilter = getCurrentFilter();
|
||||||
|
sal_Bool bChangeFilter = sal_True;
|
||||||
for ( FilterList::iterator aListIter = m_pFilterList->begin();
|
for ( FilterList::iterator aListIter = m_pFilterList->begin();
|
||||||
aListIter != m_pFilterList->end();
|
aListIter != m_pFilterList->end();
|
||||||
++aListIter
|
++aListIter
|
||||||
@@ -942,11 +945,17 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw
|
|||||||
{
|
{
|
||||||
if( aListIter->getFilter().indexOf( aStarDot+sExtension ) >= 0 )
|
if( aListIter->getFilter().indexOf( aStarDot+sExtension ) >= 0 )
|
||||||
{
|
{
|
||||||
setCurrentFilter( aListIter->getTitle() );
|
if( !aNewFilter.getLength() )
|
||||||
|
aNewFilter = aListIter->getTitle();
|
||||||
|
|
||||||
|
if( aOldFilter == aListIter->getTitle() )
|
||||||
|
bChangeFilter = sal_False;
|
||||||
|
|
||||||
bExtensionTypedIn = true;
|
bExtensionTypedIn = true;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if( bChangeFilter )
|
||||||
|
setCurrentFilter( aNewFilter );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user