summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2017-01-20 15:59:25 +0300
committerAndras Timar <andras.timar@collabora.com>2017-07-31 13:14:59 +0200
commite115163c966b3f7fb9f877ca6e5dc643142138dc (patch)
tree4dcb8c5c613e855771c5922dee496781165cb22a
parent50202eb3686765d0f0f71f6d0dbade2ac0ed1578 (diff)
tdf#80807 guisaveas: never recommend system's tempdir
Various download-and-open mechanisms save to the system's $TEMP dir. If so, don't recomment saving in that same location in the GUI dialog! That's just silly. Change-Id: Ifa20fdfd81d768bbd893f92a50355f08c3aab356 Reviewed-on: https://gerrit.libreoffice.org/33353 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit eb9f90186ae52efa7ff884b3e64f5dd59ddc0329)
-rw-r--r--sfx2/source/doc/guisaveas.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 7dcc6286271c..50a554530260 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1201,6 +1201,10 @@ OUString ModelData_Impl::GetRecommendedDir( const OUString& aSuggestedDir )
aLocation = INetURLObject( SvtPathOptions().GetWorkPath() );
}
+ // Suggest somewhere other than the system's temp directory
+ if( aLocation.GetMainURL( INetURLObject::DecodeMechanism::NONE ).startsWith( SvtPathOptions().GetTempPath() ) )
+ aLocation = INetURLObject( SvtPathOptions().GetWorkPath() );
+
aLocation.setFinalSlash();
if ( !aLocation.HasError() )
aRecommendedDir = aLocation.GetMainURL( INetURLObject::NO_DECODE );