[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/source

[Samuel Mehrbrodt (via logerrit)]

 sfx2/source/view/viewsh.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 926b39e6c7acbaace8e311dba0a2527ac8c20b09
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Mon Dec 2 16:10:06 2019 +0100
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Tue Dec 3 09:12:24 2019 +0100

    Don't disable "Send doc via email" when LockExport is set
    
    Only sending as other formats should be disabled in this case
    
    Change-Id: I985d43ba314a1bda16dab33897d212ad27d3d115
    Reviewed-on: https://gerrit.libreoffice.org/84240
    Tested-by: Jenkins
    Reviewed-by: Serge Krot (CIB) <Serge.Krot at cib.de>
    (cherry picked from commit b9930d0d05db39a8466b18dccf626bc3d8ae5c4e)
    Reviewed-on: https://gerrit.libreoffice.org/84292
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 80cd8a122d07..8a199623fa58 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -684,7 +684,7 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet )
 #if HAVE_FEATURE_MACOSX_SANDBOX
                 rSet.DisableItem(nSID);
 #endif
-                if (isExportLocked())
+                if (isExportLocked() && nSID != SID_MAIL_SENDDOC)
                     rSet.DisableItem(nSID);
                 break;
             }