diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-04-12 13:32:19 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-04-12 13:32:19 +0100 |
| commit | fbc18ae2f2c9ca12e57808583fadba2aea3b7e22 (patch) | |
| tree | 299f141b58895a5aacf03fe9190dcc56031d045b /sfx2 | |
| parent | 7f2ad79813f8b1a30db3c3db86175b455851d0a9 (diff) | |
Resolves: #i108637# after save warn dialog return to original dir
Since 2010-01-25, Lets not make the perfect the enemy of the good FFS
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/guisaveas.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index f6d3fb221b0a..e00121d7e762 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -303,7 +303,7 @@ public: sal_Bool bSetStandardName, ::rtl::OUString& aSuggestedName, sal_Bool bPreselectPassword, - const ::rtl::OUString& aSuggestedDir, + ::rtl::OUString& aSuggestedDir, sal_Int16 nDialog, const ::rtl::OUString& rStandardDir, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList @@ -809,7 +809,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, sal_Bool bSetStandardName, ::rtl::OUString& aSuggestedName, sal_Bool bPreselectPassword, - const ::rtl::OUString& aSuggestedDir, + ::rtl::OUString& aSuggestedDir, sal_Int16 nDialog, const ::rtl::OUString& rStandardDir, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList) @@ -1017,6 +1017,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, INetURLObject aURL( pFileDlg->GetPath() ); // the path should be provided outside since it might be used for further calls to the dialog aSuggestedName = aURL.GetName( INetURLObject::DECODE_WITH_CHARSET ); + aSuggestedDir = pFileDlg->GetDisplayDirectory(); // old filter options should be cleared in case different filter is used @@ -1504,10 +1505,8 @@ sal_Bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >& sal_Bool bExit = sal_False; while ( !bExit ) { + // 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 bUseFilterOptions = aModelData.OutputFileDialog( nStoreMode, aFilterProps, bSetStandardName, aSuggestedName, bPreselectPassword, aSuggestedDir, nDialog, sStandardDir, aBlackList ); - - // in case the dialog is opend a second time the folder should be the same as before, not what was handed over by parameters - aSuggestedDir = ::rtl::OUString(); if ( nStoreMode == SAVEAS_REQUESTED ) { // in case of saving check filter for possible alien warning |