[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sfx2/source

[Tor Lillqvist (via logerrit)]

 sfx2/source/doc/docfile.cxx |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 6b55436aa93be01086c93a66b20aa73ab455aa71
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Nov 16 00:43:37 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Nov 24 10:02:29 2020 +0100

    Avoid unused parameter 'pImpl'
    
    Change-Id: I8dd30ed3ffffa0e5340b32ce4399dd05cc57e2b6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105962
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106258
    Tested-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106457
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 09c6f8cbb6ed..57a85ffe16a8 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -3620,10 +3620,12 @@ 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 HAVE_FEATURE_MACOSX_SANDBOX
+    // 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.
+    (void) pImpl;
+#else
 
     if (comphelper::isFileUrl(pImpl->m_aLogicName) && !pImpl->m_pInStream)
     {