[Libreoffice-commits] core.git: Branch 'distro/collabora/lov-6.1' - 2 commits - configure.ac sfx2/source

[Libreoffice Gerrit user]

 configure.ac                |   11 ++++++++++-
 sfx2/source/doc/docfile.cxx |    9 ++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 0bbc4970a1d414e168c26b99c1fe3fa841e5e367
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Wed Nov 21 13:54:28 2018 +0200
Commit:     Tor Lillqvist <tml at iki.fi>
CommitDate: Wed Nov 21 13:54:28 2018 +0200

    Don't create temp file in save destination folder when sandboxed
    
    In a sandboxed environment we don't want to attempt to create
    temporary files in the same directory where the user has selected an
    output file to be stored. The sandboxed process has permission only to
    create the specifically named output file that the user chose in the
    system file dialog in that directory.
    
    Change-Id: I65274b4c433bd66b436429bea4b287a0505b72c9

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index e101aa2e815d..c7f907b3ff3e 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -3532,6 +3532,11 @@ OUString GetLogicBase(std::unique_ptr<SfxMedium_Impl> const & pImpl)
 {
     OUString aLogicBase;
 
+// In a sandboxed environment we don't want to attempt to create temporary files in the same
+// directory where the user has selected an output file to be stored. The sandboxed process has
+// permission only to create the specifically named output file in that directory.
+#if !HAVE_FEATURE_MACOSX_SANDBOX
+
     if (comphelper::isFileUrl(pImpl->m_aLogicName) && !pImpl->m_pInStream)
     {
         // Try to create the temp file in the same directory when storing.
@@ -3547,6 +3552,8 @@ OUString GetLogicBase(std::unique_ptr<SfxMedium_Impl> const & pImpl)
         // Embedded objects would mean a special base, ignore that.
         aLogicBase.clear();
 
+#endif // !HAVE_FEATURE_MACOSX_SANDBOX
+
     return aLogicBase;
 }
 }
commit a6097a0c4d0d9effa44ce65bcece9a441078630b
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Mon Nov 19 22:41:28 2018 +0200
Commit:     Tor Lillqvist <tml at iki.fi>
CommitDate: Wed Nov 21 11:50:04 2018 +0200

    Accept also macOS SDK 10.14
    
    Change-Id: I78039a5ab37c3759dc7c7e1413d5cb05a896d6fd

diff --git a/configure.ac b/configure.ac
index 2eb090f5f292..28d3262023c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2695,7 +2695,7 @@ if test $_os = Darwin -o $_os = iOS; then
     # higher than or equal to the minimum required should be found.
 
     AC_MSG_CHECKING([what Mac OS X SDK to use])
-    for _macosx_sdk in $with_macosx_sdk 10.13 10.12; do
+    for _macosx_sdk in $with_macosx_sdk 10.14 10.13 10.12; do
         MACOSX_SDK_PATH=`xcrun --sdk macosx${_macosx_sdk} --show-sdk-path 2> /dev/null`
         if test -d "$MACOSX_SDK_PATH"; then
             with_macosx_sdk="${_macosx_sdk}"
@@ -2739,6 +2739,9 @@ if test $_os = Darwin -o $_os = iOS; then
     10.13)
         MACOSX_SDK_VERSION=101300
         ;;
+    10.14)
+        MACOSX_SDK_VERSION=101400
+        ;;
     *)
         AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.9--13])
         ;;
@@ -2775,6 +2778,9 @@ if test $_os = Darwin -o $_os = iOS; then
     10.13)
         MAC_OS_X_VERSION_MIN_REQUIRED="101300"
         ;;
+    10.14)
+        MAC_OS_X_VERSION_MIN_REQUIRED="101400"
+        ;;
     *)
         AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.9--13])
         ;;
@@ -2816,6 +2822,9 @@ if test $_os = Darwin -o $_os = iOS; then
     10.13)
         MAC_OS_X_VERSION_MAX_ALLOWED="101300"
         ;;
+    10.14)
+        MAC_OS_X_VERSION_MAX_ALLOWED="101400"
+        ;;
     *)
         AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.9--13])
         ;;