[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - wsd/ClientSession.cpp wsd/reference.txt

[Pranav Kant]

 wsd/ClientSession.cpp |    4 ++--
 wsd/reference.txt     |    8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit e2287e5c83a9bc8f66a08f4092ba4953afa7c42d
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Thu May 25 14:11:33 2017 +0530

    wsd: Only disable copying when DisableCopy is mentioned
    
    Earlier, DisableCopy was a misnomer disabling both copy and paste. Now
    it only disables copy from the document but allows pasting into the
    document.
    
    Change-Id: I8ddfdd493918331276f0656468d3b94c4283fa4d
    (cherry picked from commit 1a1ab5fd5751f9d6353bb91be918e96cf9c53b90)
    Reviewed-on: https://gerrit.libreoffice.org/38016
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 2fbd221c..026b0513 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -418,12 +418,12 @@ bool ClientSession::filterMessage(const std::string& message) const
                 LOG_WRN("No value of id in downloadas message");
         }
     }
-    else if (tokens[0] == "gettextselection" || tokens[0] == "paste" || tokens[0] == "insertfile")
+    else if (tokens[0] == "gettextselection")
     {
         if (_wopiFileInfo && _wopiFileInfo->_disableCopy)
         {
             allowed = false;
-            LOG_WRN("WOPI host has disabled copying to/from the document");
+            LOG_WRN("WOPI host has disabled copying from the document");
         }
     }
     else if (isReadOnly())
diff --git a/wsd/reference.txt b/wsd/reference.txt
index e1af6d4b..5c706621 100644
--- a/wsd/reference.txt
+++ b/wsd/reference.txt
@@ -41,11 +41,9 @@ DisableExport
 	HideExportOption is assumed to be true
 
 DisableCopy
-	Disables copy/paste from/to the document in libreoffice online backend.
-	However, it is still possible to do an "internal" cut/copy/paste i.e
-	copy from the document and paste to the same document view. The context
-	menu options pertaining to cut/copy/paste would be renamed to 'Internal
-	Cut/Copy/Paste' when this option is mentioned.
+	Disables copying from the document in libreoffice online
+	backend. Pasting into the document would still be possible.
+	However, it is still possible to do an "internal" cut/copy/paste.
 
 EnableOwnerTermination
 	If set to true, it allows the document owner (the one with OwnerId =