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

Resolves: fdo#36358 Just use the same export dir as save as for all apps

Browse source 
I believe the original idea was that draw/impress export graphics and so
default output dir is the gallery as you might want to export them in there.

Catch is that we cane export in some many different formats there there
isn't a good fit for the whole collection, so lets just use the same
dir for all apps
This commit is contained in:
Caolán McNamara 2011-04-19 12:08:24 +01:00
parent 284a86be43
commit 3437d2196b
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sfx2/source/doc/guisaveas.cxx
View file

@ -311,8 +311,7 @@ public:
sal_Bool ShowDocumentInfoDialog();
::rtl::OUString GetReccomendedDir( const ::rtl::OUString& aSuggestedDir,
const sfx2::FileDialogHelper::Context& rCtxt );
::rtl::OUString GetReccomendedDir( const ::rtl::OUString& aSuggestedDir );
::rtl::OUString GetReccomendedName( const ::rtl::OUString& aSuggestedName,
const ::rtl::OUString& aTypeName );
@ -884,9 +883,11 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
}
if( aDocServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) )
eCtxt = sfx2::FileDialogHelper::SD_EXPORT;
eCtxt = sfx2::FileDialogHelper::SD_EXPORT;
else if( aDocServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) )
eCtxt = sfx2::FileDialogHelper::SI_EXPORT;
eCtxt = sfx2::FileDialogHelper::SI_EXPORT;
else if( aDocServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.TextDocument" ) ) )
eCtxt = sfx2::FileDialogHelper::SW_EXPORT;
if ( eCtxt != sfx2::FileDialogHelper::UNKNOWN_CONTEXT )
pFileDlg->SetContext( eCtxt );
@ -957,7 +958,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
}
}
::rtl::OUString aReccomendedDir = GetReccomendedDir( aSuggestedDir, eCtxt );
::rtl::OUString aReccomendedDir = GetReccomendedDir( aSuggestedDir );
if ( aReccomendedDir.getLength() )
pFileDlg->SetDisplayDirectory( aReccomendedDir );
::rtl::OUString aReccomendedName = GetReccomendedName( aSuggestedName, aAdjustToType );
@ -1143,7 +1144,7 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog()
}
//-------------------------------------------------------------------------
::rtl::OUString ModelData_Impl::GetReccomendedDir( const ::rtl::OUString& aSuggestedDir, const sfx2::FileDialogHelper::Context& rCtxt )
::rtl::OUString ModelData_Impl::GetReccomendedDir( const ::rtl::OUString& aSuggestedDir )
{
::rtl::OUString aReccomendedDir;
@ -1174,13 +1175,7 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog()
}
else
{
::rtl::OUString aConfigSuggestion;
// Set graphic path if context == SD_EXPORT or SI_EXPORT else work path
if (rCtxt == sfx2::FileDialogHelper::SD_EXPORT || rCtxt == sfx2::FileDialogHelper::SI_EXPORT)
aConfigSuggestion = SvtPathOptions().GetGraphicPath();
else
aConfigSuggestion = SvtPathOptions().GetWorkPath();
aReccomendedDir = INetURLObject( aConfigSuggestion ).GetMainURL( INetURLObject::NO_DECODE );
aReccomendedDir = INetURLObject( SvtPathOptions().GetWorkPath() ).GetMainURL( INetURLObject::NO_DECODE );
}
return aReccomendedDir;