[Libreoffice-commits] core.git: dtrans/source offapi/com

[Julien Nabet (via logerrit)]

 dtrans/source/win32/clipb/WinClipbImpl.cxx                           |    2 +-
 offapi/com/sun/star/datatransfer/clipboard/RenderingCapabilities.idl |    6 ++++++
 offapi/com/sun/star/datatransfer/clipboard/XSystemClipboard.idl      |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit e738683f98559af330a1cc36d8d0a1be11abb355
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sat Sep 12 12:00:49 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Sep 17 15:20:27 2020 +0200

    Add "Persistent", deprecate "Persistant" in RenderingCapabilities
    
    Change-Id: Ib86b715dcf3514d038519d0f495e3d98b9f01190
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102511
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Jenkins

diff --git a/dtrans/source/win32/clipb/WinClipbImpl.cxx b/dtrans/source/win32/clipb/WinClipbImpl.cxx
index 8d59be7ca430..e991a81cecd8 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.cxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.cxx
@@ -145,7 +145,7 @@ OUString CWinClipbImpl::getName(  )
 
 sal_Int8 CWinClipbImpl::getRenderingCapabilities(  )
 {
-    return ( Delayed | Persistant );
+    return ( Delayed | Persistent );
 }
 
 void CWinClipbImpl::flushClipboard( )
diff --git a/offapi/com/sun/star/datatransfer/clipboard/RenderingCapabilities.idl b/offapi/com/sun/star/datatransfer/clipboard/RenderingCapabilities.idl
index 6b0cdc96c230..b254cbf5f39d 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/RenderingCapabilities.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/RenderingCapabilities.idl
@@ -36,8 +36,14 @@ published constants RenderingCapabilities
 
     /** The implementation is able to store the data persistent in the system
         so that it does not get lost when the source application no longer exist.
+        @deprecated since 7.1, rather use "Persistent" const
     */
     const byte Persistant = 2;
+
+    /** The implementation is able to store the data persistent in the system
+        so that it does not get lost when the source application no longer exist.
+    */
+    const byte Persistent = 2;
 };
 
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XSystemClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/XSystemClipboard.idl
index 1cb96db1ece8..32f8bf39db4e 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XSystemClipboard.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XSystemClipboard.idl
@@ -46,7 +46,7 @@ published interface XSystemClipboard
     /** Provides the ability to render the complete clipboard content. This
         interface is only available if the method
         com::sun::star::datatransfer::clipboard::XClipboardEx::getRenderingCapabilities()
-        returns Persistant
+        returns Persistent
     */
     [optional] interface XFlushableClipboard;