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

[Stephan Bergmann (via logerrit)]

 configure.ac   |2 +-
 filter/source/msfilter/msvbahelper.cxx |1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 9ea17a6331ca9491e7012dca837d3815cd4309ac
Author: Stephan Bergmann 
AuthorDate: Fri Apr 8 09:15:19 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Apr 8 12:46:41 2022 +0200

Adapt to latest VS 2022 MSM versions

...as present at least with VS 2022 17.1.3

Change-Id: I6d1cf247c8507ebab56c106aff6933ff739a4314
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132714
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index 1cdd22b0ae66..a19f73031124 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6650,7 +6650,7 @@ find_msms()
 
 case "$VCVER" in
 16.0 | 17.0)
-my_msm_files="Microsoft_VC141_CRT_x86.msm Microsoft_VC142_CRT_x86.msm 
${my_msm_files}"
+my_msm_files="Microsoft_VC141_CRT_x86.msm Microsoft_VC142_CRT_x86.msm 
Microsoft_VC143_CRT_x86.msm ${my_msm_files}"
 ;;
 esac
 for f in $my_msm_files; do
commit f9a094cc0c2f61fd0838a42489b717ede3e24fed
Author: Andrea Gelmini 
AuthorDate: Fri Apr 8 11:14:37 2022 +0200
Commit: Andrea Gelmini 
CommitDate: Fri Apr 8 12:46:28 2022 +0200

Removed duplicated include

Change-Id: I898c24abd5366a85705b5f54258b16b22e044355
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132715
Tested-by: Jenkins
Reviewed-by: Andrea Gelmini 

diff --git a/filter/source/msfilter/msvbahelper.cxx 
b/filter/source/msfilter/msvbahelper.cxx
index 89c5292a3cb3..5ba35cec81a5 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -39,7 +39,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

[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 
AuthorDate: Wed Jul 8 00:57:33 2020 +0200
Commit: Michael Stahl 
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 

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 @@
 
 
+)">
 
 
 
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 @@
 
 vertical-lr; 
 
+
+horizontal-tb; direction:ltr;
+
 
 
 
commit fa654ada6f6a9bd3daf9639119759164cd9ff5a3
Author: Michael Stahl 
AuthorDate: Wed Jul 8 09:51:56 2020 +0200
Commit: Michael Stahl 
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 
Reviewed-by: Michael Stahl 
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"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits