[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.1-1-71-g3057a33
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 21049b44b66a551f8bb07284ef240c08251af8e7
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Mar 27 14:10:35 2012 +0200
refresh patch queue
diff --git a/patches/fdo-43895-lp-905355-Never-let-users-save-in-tmp-by-d.diff b/patches/fdo-43895-lp-905355-Never-let-users-save-in-tmp-by-d.diff
index 5016b35..9495da4 100644
--- a/patches/fdo-43895-lp-905355-Never-let-users-save-in-tmp-by-d.diff
+++ b/patches/fdo-43895-lp-905355-Never-let-users-save-in-tmp-by-d.diff
@@ -1,7 +1,9 @@
-From dd2fe95cce75f1157bd1c75d286a0047b2e4175e Mon Sep 17 00:00:00 2001
+From c519ff47d25c273fda15626b56e04bd147cf29b4 Mon Sep 17 00:00:00 2001
From: "Andrzej J. R. Hunt" <andrzej@hunt.org>
Date: Tue, 27 Mar 2012 10:32:52 +0200
Subject: [PATCH] fdo#43895 lp#905355: Never let users save in /tmp by default
+ (cherry picked from commit
+ dd2fe95cce75f1157bd1c75d286a0047b2e4175e)
---
sfx2/source/dialog/filedlghelper.cxx | 23 +++++++++++++++++++++++
@@ -9,12 +11,12 @@ Subject: [PATCH] fdo#43895 lp#905355: Never let users save in /tmp by default
2 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
-index 3bf4fb5..0018912 100644
+index 141b389..79c1e4e 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
-@@ -101,6 +101,9 @@
+@@ -100,6 +100,9 @@
+ #include <helpid.hrc>
#include <sfxlocal.hrc>
- #include <rtl/oustringostreaminserter.hxx>
#include <rtl/strbuf.hxx>
+#ifdef UNX
+#include <sys/stat.h>
@@ -22,7 +24,7 @@ index 3bf4fb5..0018912 100644
//-----------------------------------------------------------------------------
-@@ -1635,6 +1638,24 @@ void FileDialogHelper_Impl::getRealFilter( String& _rFilter ) const
+@@ -1648,6 +1651,24 @@ void FileDialogHelper_Impl::getRealFilter( String& _rFilter ) const
}
}
@@ -47,7 +49,7 @@ index 3bf4fb5..0018912 100644
// ------------------------------------------------------------------------
void FileDialogHelper_Impl::displayFolder( const ::rtl::OUString& _rPath )
{
-@@ -1648,6 +1669,7 @@ void FileDialogHelper_Impl::displayFolder( const ::rtl::OUString& _rPath )
+@@ -1661,6 +1682,7 @@ void FileDialogHelper_Impl::displayFolder( const ::rtl::OUString& _rPath )
try
{
mxFileDlg->setDisplayDirectory( maPath );
@@ -55,7 +57,7 @@ index 3bf4fb5..0018912 100644
}
catch( const IllegalArgumentException& )
{
-@@ -1665,6 +1687,7 @@ void FileDialogHelper_Impl::setFileName( const ::rtl::OUString& _rFile )
+@@ -1678,6 +1700,7 @@ void FileDialogHelper_Impl::setFileName( const ::rtl::OUString& _rFile )
try
{
mxFileDlg->setDefaultName( maFileName );
@@ -64,17 +66,17 @@ index 3bf4fb5..0018912 100644
catch( const IllegalArgumentException& )
{
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
-index 4f4e86d..4c3c68b 100644
+index 6770bb7..3433883 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
-@@ -152,6 +152,8 @@ namespace sfx2
+@@ -155,6 +155,8 @@ namespace sfx2
void implInitializeFileName( );
+ void verifyPath( );
+
void implGetAndCacheFiles( const ::com::sun::star::uno::Reference< XInterface >& xPicker ,
- std::vector<rtl::OUString>& rpURLList,
+ SvStringsDtor*& rpURLList,
const SfxFilter* pFilter );
--
1.7.9.1
--
LibreOffice packaging repository
Reply to: