Lines 231-237
Link Here
|
231 |
sal_Bool bSetStandardName, |
231 |
sal_Bool bSetStandardName, |
232 |
::rtl::OUString& aSuggestedName, |
232 |
::rtl::OUString& aSuggestedName, |
233 |
sal_Bool bPreselectPassword, |
233 |
sal_Bool bPreselectPassword, |
234 |
const ::rtl::OUString& aSuggestedDir, |
234 |
::rtl::OUString& aSuggestedDir, |
235 |
sal_Int16 nDialog, |
235 |
sal_Int16 nDialog, |
236 |
const ::rtl::OUString& rStandardDir, |
236 |
const ::rtl::OUString& rStandardDir, |
237 |
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList |
237 |
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList |
Lines 731-737
Link Here
|
731 |
sal_Bool bSetStandardName, |
731 |
sal_Bool bSetStandardName, |
732 |
::rtl::OUString& aSuggestedName, |
732 |
::rtl::OUString& aSuggestedName, |
733 |
sal_Bool bPreselectPassword, |
733 |
sal_Bool bPreselectPassword, |
734 |
const ::rtl::OUString& aSuggestedDir, |
734 |
::rtl::OUString& aSuggestedDir, |
735 |
sal_Int16 nDialog, |
735 |
sal_Int16 nDialog, |
736 |
const ::rtl::OUString& rStandardDir, |
736 |
const ::rtl::OUString& rStandardDir, |
737 |
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList) |
737 |
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList) |
Lines 927-932
Link Here
|
927 |
INetURLObject aURL( pFileDlg->GetPath() ); |
927 |
INetURLObject aURL( pFileDlg->GetPath() ); |
928 |
// the path should be provided outside since it might be used for further calls to the dialog |
928 |
// the path should be provided outside since it might be used for further calls to the dialog |
929 |
aSuggestedName = aURL.GetName( INetURLObject::DECODE_WITH_CHARSET ); |
929 |
aSuggestedName = aURL.GetName( INetURLObject::DECODE_WITH_CHARSET ); |
|
|
930 |
aSuggestedDir = pFileDlg->GetDisplayDirectory(); |
930 |
|
931 |
|
931 |
// old filter options should be cleared in case different filter is used |
932 |
// old filter options should be cleared in case different filter is used |
932 |
|
933 |
|
Lines 1412-1421
Link Here
|
1412 |
sal_Bool bExit = sal_False; |
1413 |
sal_Bool bExit = sal_False; |
1413 |
while ( !bExit ) |
1414 |
while ( !bExit ) |
1414 |
{ |
1415 |
{ |
|
|
1416 |
// in case the dialog is opened a second time the folder should be the same as previously navigated to by the user, not what was handed over by initial parameters |
1415 |
bUseFilterOptions = aModelData.OutputFileDialog( nStoreMode, aFilterProps, bSetStandardName, aSuggestedName, bPreselectPassword, aSuggestedDir, nDialog, sStandardDir, aBlackList ); |
1417 |
bUseFilterOptions = aModelData.OutputFileDialog( nStoreMode, aFilterProps, bSetStandardName, aSuggestedName, bPreselectPassword, aSuggestedDir, nDialog, sStandardDir, aBlackList ); |
1416 |
|
|
|
1417 |
// in case the dialog is opend a second time the folder should be the same as before, not what was handed over by parameters |
1418 |
aSuggestedDir = ::rtl::OUString(); |
1419 |
if ( nStoreMode == SAVEAS_REQUESTED ) |
1418 |
if ( nStoreMode == SAVEAS_REQUESTED ) |
1420 |
{ |
1419 |
{ |
1421 |
// in case of saving check filter for possible alien warning |
1420 |
// in case of saving check filter for possible alien warning |