[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 3 commits - configure.ac scp2/source sw/qa sw/source

[Andras Timar]

 configure.ac                                  |    2 +-
 scp2/source/ooo/common_brand.scp              |    2 +-
 sw/qa/extras/ooxmlexport/data/tdf106001-2.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx     |   10 ++++++++++
 sw/source/filter/ww8/docxattributeoutput.cxx  |    5 ++++-
 5 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 93f59794b58d2e60c0dee87631eabff23e6a7791
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sat Mar 18 19:57:01 2017 +0100

    Bump version to 5.3-1
    
    Change-Id: I92462b715c59f606bc116a4338e368b3c589bc51

diff --git a/configure.ac b/configure.ac
index 266cc4deb008..9dd05a9c5d65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
 
-AC_INIT([Collabora Office],[5.3.10.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.3.10.2],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
commit d9d905115d56cc2d0f7f0b24353e60e47eb140f8
Author: Aron Budea <aron.budea at collabora.com>
Date:   Tue Feb 28 07:28:30 2017 +0100

    tdf#106001: Clamp CharScaleWidth outliers when exporting to DOCX
    
    Atribute is of type ST_TextScale, which has to be
    between 1 and 600.
    
    Change-Id: I9b9cddc47d194f1364d91675c9b825752b2f5e06
    Reviewed-on: https://gerrit.libreoffice.org/34713
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    (cherry picked from commit a3a0eac099831de6fd7c53b66f85b964e41a5a13)
    Reviewed-on: https://gerrit.libreoffice.org/35335
    Reviewed-by: Khaled Hosny <khaledhosny at eglug.org>
    (cherry picked from commit e35f5ceefd586f03ace4cb3909bf5dd46007f49b)

diff --git a/sw/qa/extras/ooxmlexport/data/tdf106001-2.odt b/sw/qa/extras/ooxmlexport/data/tdf106001-2.odt
new file mode 100644
index 000000000000..36d2650f4c18
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf106001-2.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 001f5b026251..786074a40849 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -207,6 +207,16 @@ DECLARE_OOXMLEXPORT_TEST(testTdf106001, "tdf106001.docx")
     CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int16>( 100 ), getProperty<sal_Int16>(getRun(getParagraph(1), 1), "CharScaleWidth" ));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf106001_2, "tdf106001-2.odt")
+{
+    // In test ODT CharScaleWidth = 900, this was not changed upon OOXML export to stay in [1..600], now it's clamped to 600
+    // Note: we disregard what's set in pPr / rPr and only care about r / rPr
+    xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+    if (!pXmlDoc)
+        return;
+    assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r/w:rPr/w:w","val","600");
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf103931, "tdf103931.docx")
 {
     uno::Reference<text::XTextSectionsSupplier> xTextSectionsSupplier(mxComponent, uno::UNO_QUERY);
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 36872e7bc19f..1b6b786c8b7f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6563,8 +6563,11 @@ void DocxAttributeOutput::CharTwoLines( const SvxTwoLinesItem& rTwoLines )
 
 void DocxAttributeOutput::CharScaleWidth( const SvxCharScaleWidthItem& rScaleWidth )
 {
+    // Clamp CharScaleWidth to OOXML limits ([1..600])
+    const sal_Int16 nScaleWidth( std::max<sal_Int16>( 1,
+        std::min<sal_Int16>( rScaleWidth.GetValue(), 600 ) ) );
     m_pSerializer->singleElementNS( XML_w, XML_w,
-            FSNS( XML_w, XML_val ), OString::number( rScaleWidth.GetValue() ).getStr(), FSEND );
+        FSNS( XML_w, XML_val ), OString::number( nScaleWidth ).getStr(), FSEND );
 }
 
 void DocxAttributeOutput::CharRelief( const SvxCharReliefItem& rRelief )
commit 02448a95b68d4fde04a1a058d2f5408c705b6e16
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Mar 16 17:05:09 2017 +0100

    Revert "Don't package unoinfo in case of Mac OS X like app structure"
    
    This reverts commit 3a663f7a4580b97518aee4e0c797b549c67ef1a5.  Whatever that
    commit was supposed to be good for, not packaging unoinfo on macOS breaks
    functionality, see e.g.
    <https://bugs.documentfoundation.org/show_bug.cgi?id=106292#c10> comment 10 to
    "XMessageBox#execute() in Java fails to draw a window on macOS Sierra".
    
    (cherry picked from commit 3e5aa33ef4ea8f5839e358dd62acdc09fe64dda8)
    
    Change-Id: I51cb79d157887bfcaf2dce6900675439d33d0be0
    Reviewed-on: https://gerrit.libreoffice.org/35314
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    (cherry picked from commit b0c3d69c7e763048270bb39ff1dc29f563d2cc0f)

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index d9d9864ec298..6dbce4845834 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -517,7 +517,7 @@ File gid_Brand_File_Desktophelper_Txt
 End
 #endif
 
-#if !defined WNT && !defined MACOSX
+#if !defined WNT
 File gid_Brand_File_Bin_Unoinfo
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;