[Libreoffice-commits] core.git: 2 commits - configure.ac filter/source

[Svante Schubert (via logerrit)]

 configure.ac                                                            |    5 +++
 filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl   |   13 ++++++----
 filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl |    3 ++
 3 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 646cf598633bacc3959fc126c9117f06f3d0f9e3
Author:     Svante Schubert <svante.schubert at gmail.com>
AuthorDate: Wed Jul 8 00:57:33 2020 +0200
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Wed Jul 8 14:57:32 2020 +0200

    Fixing top border style by fixing three XSLT issues triggered by...
    
    ... new properties in ODF 1.3
    
    * check for fo:border='none'
    * missing @ in @fo:background-color
    * without default case (xsl:otherwise), end delimiter for "page"
      missing in CSS
    
    Change-Id: Ie5d0c3e8a32de0403534c5a4fa33a5f20393ce69
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98365
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
index f9b5aff1b363..d1c8f189be85 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
@@ -705,11 +705,16 @@
         <xsl:choose>
             <xsl:when test="
                 $style/@style:family='paragraph'
-                and((
+                and
+            (
+                (
                     (
                         $style/*/@fo:border-top
                         or $style/*/@fo:border-bottom
-                        or $style/*/@fo:border
+                        or ($style/*/@fo:border
+                        and
+                        not($style/*/@fo:border='none')
+                        )
                     )
                     and
                     (
@@ -727,10 +732,10 @@
                     and
                     (     $style/*/@fo:background-color
                     and
-                        not($style/*/fo:background-color='transparent')
+                        not($style/*/@fo:background-color='transparent')
                     )
                 )
-                )">
+            )">
                 <xsl:element name="style" namespace="">
                     <xsl:copy-of select="$style/@style:family" />
                     <xsl:attribute name="style:name"><xsl:value-of select="concat($style/@style:name, '_borderStart')" /></xsl:attribute>
diff --git a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
index dc07f7e2918b..ec5b680df150 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
@@ -303,6 +303,9 @@
             <xsl:when test=".='tb-lr'">
                 <xsl:text>vertical-lr; </xsl:text>
             </xsl:when>
+            <xsl:otherwise>
+                <xsl:text>horizontal-tb; direction:ltr;</xsl:text>
+            </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
     <!-- *** Properties with a no 'fo:' or 'style:' prefix *** -->
commit fa654ada6f6a9bd3daf9639119759164cd9ff5a3
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Jul 8 09:51:56 2020 +0200
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Wed Jul 8 14:57:21 2020 +0200

    configure: try to fix qconfig.h check
    
    Change-Id: Ie88d36d2f00c920a2d2a3e8fc6a84fdca4552b86
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98314
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index 0be03f347d2a..ba23b7211e27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11930,8 +11930,13 @@ then
         AC_MSG_ERROR([Qt5 headers not found.  Please specify the root of your Qt5 installation by exporting QT5DIR before running "configure".])
     fi
     # check for scenario: qt5-qtbase-devel-*.86_64 installed but host is i686
+    AC_LANG_PUSH([C++])
+    save_CPPFLAGS=$CPPFLAGS
+    CPPFLAGS="${CPPFLAGS} -I${qt5_incdir}"
     AC_CHECK_HEADER(QtCore/qconfig.h, [],
         [AC_MSG_ERROR(qconfig.h header not found.)], [])
+    CPPFLAGS=$save_CPPFLAGS
+    AC_LANG_POP([C++])
 
     AC_MSG_CHECKING([for Qt5 libraries])
     qt5_libdir="no"