[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - offapi/com

[Stephan Bergmann (via logerrit)]

 offapi/com/sun/star/style/ParagraphProperties.idl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e2be27e4bf562978361b29cfcfaa91086271303a
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Feb 26 17:40:17 2020 +0100
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Feb 27 07:29:26 2020 +0100

    Fix @since tag
    
    This UNOIDL entity had been included in libreoffice-6-4 prior to the first
    LO 6.4 release at libreoffice-6.4.0.3-buildfix1 with
    ad86ebb1f86f6347ccb9bbe40b0ca080562cbae8 "tdf#121658 Add option to not hyphenate
    words in CAPS".
    
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89564
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit bf749968d0bed09234192862bcc709c9ca7af66d)
    Conflicts:
            offapi/com/sun/star/style/ParagraphProperties.idl
    
    Change-Id: I34df2ebeb56fdfe72bc9e19cc77eddd8a97a5c59
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89602
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/offapi/com/sun/star/style/ParagraphProperties.idl b/offapi/com/sun/star/style/ParagraphProperties.idl
index 30aa9a28c608..a806c7c479ae 100644
--- a/offapi/com/sun/star/style/ParagraphProperties.idl
+++ b/offapi/com/sun/star/style/ParagraphProperties.idl
@@ -410,7 +410,7 @@ published service ParagraphProperties
         /** Specifies whether words written in CAPS will be hyphenated.
             Setting to `true` will disable hyphenation of words written in CAPS for this paragraph.
 
-            @since LibreOffice 6.5
+            @since LibreOffice 6.4
          */
         [optional, property] boolean ParaHyphenationNoCaps;