diff options
| author | Andrzej J. R. Hunt <andrzej@hunt.org> | 2012-03-27 10:32:52 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-04-04 15:14:09 +0200 |
| commit | 2890ca399dd23abd9b8b507d80f7242fce735278 (patch) | |
| tree | b315e476e27d15cb0ee3ad7f7ee5f9d18a693358 | |
| parent | don't skip first cmdline argument (diff) | |
| download | core-2890ca399dd23abd9b8b507d80f7242fce735278.tar.gz core-2890ca399dd23abd9b8b507d80f7242fce735278.zip | |
fdo#43895 lp#905355: Never let users save in /tmp by default
(cherry picked from commit dd2fe95cce75f1157bd1c75d286a0047b2e4175e)
| -rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 23 | ||||
| -rw-r--r-- | sfx2/source/dialog/filedlgimpl.hxx | 2 |
2 files changed, 25 insertions, 0 deletions
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 141b389504d3..79c1e4ee758c 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -100,6 +100,9 @@ #include <helpid.hrc> #include <sfxlocal.hrc> #include <rtl/strbuf.hxx> +#ifdef UNX +#include <sys/stat.h> +#endif //----------------------------------------------------------------------------- @@ -1648,6 +1651,24 @@ void FileDialogHelper_Impl::getRealFilter( String& _rFilter ) const } } +void FileDialogHelper_Impl::verifyPath() +{ +#ifdef UNX + struct stat aFileStat; + const OString sFullPath = OUStringToOString( maPath.copy(RTL_CONSTASCII_LENGTH("file://")) + maFileName, osl_getThreadTextEncoding() ); + stat( sFullPath.getStr(), &aFileStat ); + // lp#905355, fdo#43895 + // Check that the file has read only permission and is in /tmp -- this is + // the case if we have opened the file from the web with firefox only. + if ( maPath.reverseCompareToAsciiL("file:///tmp",11) == 0 && + ( aFileStat.st_mode & (S_IRWXO + S_IRWXG + S_IRWXU) ) == S_IRUSR ) + { + maPath = SvtPathOptions().GetWorkPath(); + mxFileDlg->setDisplayDirectory( maPath ); + } +#endif +} + // ------------------------------------------------------------------------ void FileDialogHelper_Impl::displayFolder( const ::rtl::OUString& _rPath ) { @@ -1661,6 +1682,7 @@ void FileDialogHelper_Impl::displayFolder( const ::rtl::OUString& _rPath ) try { mxFileDlg->setDisplayDirectory( maPath ); + verifyPath(); } catch( const IllegalArgumentException& ) { @@ -1678,6 +1700,7 @@ void FileDialogHelper_Impl::setFileName( const ::rtl::OUString& _rFile ) try { mxFileDlg->setDefaultName( maFileName ); + verifyPath(); } catch( const IllegalArgumentException& ) { diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 6770bb78129c..3433883bf859 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -155,6 +155,8 @@ namespace sfx2 void implInitializeFileName( ); + void verifyPath( ); + void implGetAndCacheFiles( const ::com::sun::star::uno::Reference< XInterface >& xPicker , SvStringsDtor*& rpURLList, const SfxFilter* pFilter ); |