[Libreoffice-commits] core.git: sw/inc

2023-10-29 Thread Rico Tzschichholz (via logerrit) 
 sw/inc/frameformats.hxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 31fb3045dabdb27d913712f3abcade315e3ea9bd
Author: Rico Tzschichholz 
AuthorDate: Fri Sep 8 17:02:02 2023 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Oct 30 02:39:52 2023 +0100

sw: Drop superfluous template class definitions to avoid linker failure on 
arm

workdir/CxxObject/sw/source/core/access/accdoc.o:(.data.rel.ro+0x41c): 
multiple
definition of `typeinfo for sw::FrameFormats';
workdir/CxxObject/sw/source/core/access/acccontext.o:(.data.rel.ro+0x1d8): 
first
defined here

Change-Id: I1ba9db69a73bd205a9a90cc11259abcadf62a082
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156737
Tested-by: Jenkins
Tested-by: René Engelhard 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sw/inc/frameformats.hxx b/sw/inc/frameformats.hxx
index 4edb1f98b134..ca0d5025fbe2 100644
--- a/sw/inc/frameformats.hxx
+++ b/sw/inc/frameformats.hxx
@@ -237,7 +237,4 @@ typedef FrameFormats<::SwTableFormat*> TableFrameFormats;
 typedef FrameFormats SpzFrameFormats;
 }
 
-template class SW_DLLPUBLIC sw::FrameFormats;
-template class SW_DLLPUBLIC sw::FrameFormats;
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sw/inc

2023-10-27 Thread Rico Tzschichholz (via logerrit) 
 sw/inc/frameformats.hxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 74892dd7f17c501e0fef95fd792c30b12ffda45c
Author: Rico Tzschichholz 
AuthorDate: Fri Sep 8 17:02:02 2023 +0200
Commit: Michael Stahl 
CommitDate: Fri Oct 27 10:36:15 2023 +0200

sw: Drop superfluous template class definitions to avoid linker failure on 
arm

workdir/CxxObject/sw/source/core/access/accdoc.o:(.data.rel.ro+0x41c): 
multiple
definition of `typeinfo for sw::FrameFormats';
workdir/CxxObject/sw/source/core/access/acccontext.o:(.data.rel.ro+0x1d8): 
first
defined here

Change-Id: I1ba9db69a73bd205a9a90cc11259abcadf62a082
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156752
Tested-by: Jenkins
Tested-by: René Engelhard 
Reviewed-by: Michael Stahl 

diff --git a/sw/inc/frameformats.hxx b/sw/inc/frameformats.hxx
index 4edb1f98b134..ca0d5025fbe2 100644
--- a/sw/inc/frameformats.hxx
+++ b/sw/inc/frameformats.hxx
@@ -237,7 +237,4 @@ typedef FrameFormats<::SwTableFormat*> TableFrameFormats;
 typedef FrameFormats SpzFrameFormats;
 }
 
-template class SW_DLLPUBLIC sw::FrameFormats;
-template class SW_DLLPUBLIC sw::FrameFormats;
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

[Libreoffice-commits] core.git: sysui/CustomTarget_share.mk

2023-07-23 Thread Rico Tzschichholz (via logerrit) 
 sysui/CustomTarget_share.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit caddaaa6afd2709f72dfb6160a485d405ac03966
Author: Rico Tzschichholz 
AuthorDate: Tue Jul 11 20:21:15 2023 +0200
Commit: Caolán McNamara 
CommitDate: Sun Jul 23 15:10:47 2023 +0200

Only pass -I... arguments to g-ir-scanner by using pkg-config's 
--cflags-only-I

Otherwise it is possible that e.g. -Wl,--export-dynamic is passed which is 
fatal.

Change-Id: I1735641e3149c86456e1164b67509a719e09d446
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154340
Reviewed-by: René Engelhard 
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
index b86521a3a80f..912048b2ad66 100644
--- a/sysui/CustomTarget_share.mk
+++ b/sysui/CustomTarget_share.mk
@@ -167,7 +167,7 @@ $(share_WORKDIR)/%/LOKDocView-0.1.gir: \
mkdir -p $(dir $@)
PYTHONWARNINGS=default g-ir-scanner 
"${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" \
 
"${SRCDIR}/libreofficekit/source/gtk/lokdocview.cxx" \
- `${PKG_CONFIG} --cflags gobject-introspection-1.0 gtk+-3.0` \
+ `${PKG_CONFIG} --cflags-only-I gobject-introspection-1.0 
gtk+-3.0` \
 -I"${SRCDIR}/include/" \
  --include=GLib-2.0 --include=GObject-2.0 --include=Gio-2.0 \
  --library=libreofficekitgtk 
--library-path="${INSTDIR}/program" \

[Libreoffice-commits] core.git: vcl/inc vcl/source

2023-07-13 Thread Rico Tzschichholz (via logerrit) 
 vcl/inc/TextLayoutCache.hxx|2 +-
 vcl/source/gdi/CommonSalLayout.cxx |1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 55d62057c0ccd533af63b2a01edb0cddbd619721
Author: Rico Tzschichholz 
AuthorDate: Sun Apr 2 11:15:11 2023 +0200
Commit: خالد حسني 
CommitDate: Thu Jul 13 18:24:39 2023 +0200

vcl: Move include of  to the appropriate place

hb_icu_script_to_script is used in CommonSalLayout.cxx only

Change-Id: I1d8de8c420963b42623bb06a7f5e1f37986e1c16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149935
Tested-by: Jenkins
Reviewed-by: خالد حسني 

diff --git a/vcl/inc/TextLayoutCache.hxx b/vcl/inc/TextLayoutCache.hxx
index 46e5c80dc320..304c6d51ebfb 100644
--- a/vcl/inc/TextLayoutCache.hxx
+++ b/vcl/inc/TextLayoutCache.hxx
@@ -25,7 +25,7 @@
 
 #include 
 
-#include 
+#include 
 
 #include 
 
diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index 324b6fb48b07..c3b8fab84595 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -39,6 +39,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include

[Libreoffice-commits] core.git: configure.ac

2023-02-23 Thread Rico Tzschichholz (via logerrit) 
 configure.ac |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 258f3412213954448e6af0fdc252b10ff76c7d50
Author: Rico Tzschichholz 
AuthorDate: Mon Feb 13 15:08:18 2023 +0100
Commit: خالد حسني 
CommitDate: Thu Feb 23 14:38:11 2023 +

Refer directly to static library files for Graphite2 and HarfBuzz on Linux

Just using "-L... -l..." will cause dynamic linking if a matching system
library is found.

Change-Id: I9bc3ee1fb1351336f73c3c9219526749dffe546e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146907
Tested-by: Jenkins
Reviewed-by: خالد حسني 

diff --git a/configure.ac b/configure.ac
index c5afd41afeba..4d523b097109 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10827,9 +10827,17 @@ dnl 
===
 harfbuzz_required_version=5.1.0
 
 GRAPHITE_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/graphite/include 
-DGRAPHITE2_STATIC"
-GRAPHITE_LIBS_internal="-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite"
 HARFBUZZ_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/harfbuzz/src"
-HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs 
-lharfbuzz"
+case "$_os" in
+Linux)
+
GRAPHITE_LIBS_internal="${WORKDIR}/LinkTarget/StaticLibrary/libgraphite.a"
+
HARFBUZZ_LIBS_internal="${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz.a"
+;;
+*)
+GRAPHITE_LIBS_internal="-L${WORKDIR}/LinkTarget/StaticLibrary 
-lgraphite"
+
HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs 
-lharfbuzz"
+;;
+esac
 libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
 libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 
$harfbuzz_required_version])

[Libreoffice-commits] core.git: sdext/source

2021-09-12 Thread Rico Tzschichholz (via logerrit) 
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit bc1b7491436146c3c4b2b69a46bd0cd37bbbecce
Author: Rico Tzschichholz 
AuthorDate: Sat Sep 11 12:09:40 2021 +0200
Commit: Caolán McNamara 
CommitDate: Sun Sep 12 12:50:18 2021 +0200

allow build with poppler <= 0.71

Change-Id: I359c8259ae402f9f22be392c4ab4a23d31a17b4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121937
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 9cd2c55cee21..5d6ce90bc44c 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -435,7 +435,12 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* 
gfxFont, const GfxState* st
 #if POPPLER_CHECK_VERSION(20, 12, 0)
 std::string familyName = gfxFont->getNameWithoutSubsetTag();
 #else
+#if POPPLER_CHECK_VERSION(0, 71, 0) // GooString::toStr()
 std::string familyName = gfxFont->getName()->toStr();
+#else
+const GooString* gooString = gfxFont->getName();
+std::string familyName = std::string(gooString->getCString(), 
gooString->getLength());
+#endif
 if (familyName.length() > 7 && familyName.at(6) == '+')
 {
 familyName = familyName.substr(7);

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0-6' - sysui/desktop

2021-04-30 Thread Rico Tzschichholz (via logerrit) 
 sysui/desktop/apparmor/program.oosplash |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b5bd1c65db2fcc4f31201b3b7938d524a627f2d8
Author: Rico Tzschichholz 
AuthorDate: Wed Apr 28 20:13:48 2021 +0200
Commit: Xisco Fauli 
CommitDate: Fri Apr 30 11:32:37 2021 +0200

apparmor: Fix "oopslash" typo

Change-Id: I8b355bceadeebebc9e6fedbf92a35aa44a356e09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114819
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit f616d96bd8ce8986e4cc204953db0467e6060b5c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114866
Reviewed-by: Xisco Fauli 
(cherry picked from commit 12c9b81927aae792743ce3dbc0b09fecdb15b33c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114870
Reviewed-by: Michael Stahl 
(cherry picked from commit 169afb9fa1d6471becb4d53c010cfd004d5db7fb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114912
Tested-by: Xisco Fauli 

diff --git a/sysui/desktop/apparmor/program.oosplash 
b/sysui/desktop/apparmor/program.oosplash
index bcc06914d112..dd1136bc9b06 100644
--- a/sysui/desktop/apparmor/program.oosplash
+++ b/sysui/desktop/apparmor/program.oosplash
@@ -14,7 +14,7 @@
 
 #include 
 
-profile libreoffice-oopslash INSTDIR-program/oosplash {
+profile libreoffice-oosplash INSTDIR-program/oosplash {
   #include 
   #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sysui/desktop

2021-04-30 Thread Rico Tzschichholz (via logerrit) 
 sysui/desktop/apparmor/program.oosplash |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 169afb9fa1d6471becb4d53c010cfd004d5db7fb
Author: Rico Tzschichholz 
AuthorDate: Wed Apr 28 20:13:48 2021 +0200
Commit: Xisco Fauli 
CommitDate: Fri Apr 30 11:31:07 2021 +0200

apparmor: Fix "oopslash" typo

Change-Id: I8b355bceadeebebc9e6fedbf92a35aa44a356e09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114819
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit f616d96bd8ce8986e4cc204953db0467e6060b5c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114866
Reviewed-by: Xisco Fauli 
(cherry picked from commit 12c9b81927aae792743ce3dbc0b09fecdb15b33c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114870
Reviewed-by: Michael Stahl 

diff --git a/sysui/desktop/apparmor/program.oosplash 
b/sysui/desktop/apparmor/program.oosplash
index bcc06914d112..dd1136bc9b06 100644
--- a/sysui/desktop/apparmor/program.oosplash
+++ b/sysui/desktop/apparmor/program.oosplash
@@ -14,7 +14,7 @@
 
 #include 
 
-profile libreoffice-oopslash INSTDIR-program/oosplash {
+profile libreoffice-oosplash INSTDIR-program/oosplash {
   #include 
   #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sysui/desktop

2021-04-30 Thread Rico Tzschichholz (via logerrit) 
 sysui/desktop/apparmor/program.oosplash |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 12c9b81927aae792743ce3dbc0b09fecdb15b33c
Author: Rico Tzschichholz 
AuthorDate: Wed Apr 28 20:13:48 2021 +0200
Commit: Xisco Fauli 
CommitDate: Fri Apr 30 09:11:24 2021 +0200

apparmor: Fix "oopslash" typo

Change-Id: I8b355bceadeebebc9e6fedbf92a35aa44a356e09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114819
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit f616d96bd8ce8986e4cc204953db0467e6060b5c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114866
Reviewed-by: Xisco Fauli 

diff --git a/sysui/desktop/apparmor/program.oosplash 
b/sysui/desktop/apparmor/program.oosplash
index bcc06914d112..dd1136bc9b06 100644
--- a/sysui/desktop/apparmor/program.oosplash
+++ b/sysui/desktop/apparmor/program.oosplash
@@ -14,7 +14,7 @@
 
 #include 
 
-profile libreoffice-oopslash INSTDIR-program/oosplash {
+profile libreoffice-oosplash INSTDIR-program/oosplash {
   #include 
   #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Rico Tzschichholz license statement

2021-04-29 Thread Rico Tzschichholz 

All of my past & future contributions to LibreOffice may be
licensed under the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sysui/desktop

2021-04-28 Thread Rico Tzschichholz (via logerrit) 
 sysui/desktop/apparmor/program.oosplash |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f616d96bd8ce8986e4cc204953db0467e6060b5c
Author: Rico Tzschichholz 
AuthorDate: Wed Apr 28 20:13:48 2021 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Apr 29 05:51:08 2021 +0200

apparmor: Fix "oopslash" typo

Change-Id: I8b355bceadeebebc9e6fedbf92a35aa44a356e09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114819
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sysui/desktop/apparmor/program.oosplash 
b/sysui/desktop/apparmor/program.oosplash
index bcc06914d112..dd1136bc9b06 100644
--- a/sysui/desktop/apparmor/program.oosplash
+++ b/sysui/desktop/apparmor/program.oosplash
@@ -14,7 +14,7 @@
 
 #include 
 
-profile libreoffice-oopslash INSTDIR-program/oosplash {
+profile libreoffice-oosplash INSTDIR-program/oosplash {
   #include 
   #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - oox/source

2020-03-24 Thread Rico Tzschichholz (via logerrit) 
 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 20350a085110a1baa789e8ba2e3a1a5e57b299e6
Author: Rico Tzschichholz 
AuthorDate: Fri Mar 20 07:51:53 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Mar 24 18:17:40 2020 +0100

Fix build with boost < 1.68

Follow-up fix for 73cac1031131021819a0fbd4d60554196aea230c
"tdf130839: Corrects second level left margin in Smartart"

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

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 1b6a821f3a0a..ff83dde63fa3 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -1224,13 +1224,13 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 aParagraph->getProperties().setLevel(nLevel);
 if (nLevel >= nStartBulletsAtLevel)
 {
-if 
(!aParagraph->getProperties().getParaLeftMargin().has_value())
+if 
(aParagraph->getProperties().getParaLeftMargin().get_ptr() == nullptr)
 {
 sal_Int32 nLeftMargin = 285750 * (nLevel - 
nStartBulletsAtLevel + 1) / EMU_PER_HMM;
 aParagraph->getProperties().getParaLeftMargin() = 
nLeftMargin;
 }
 
-if 
(!aParagraph->getProperties().getFirstLineIndentation().has_value())
+if 
(aParagraph->getProperties().getFirstLineIndentation().get_ptr() == nullptr)
 aParagraph->getProperties().getFirstLineIndentation() 
= -285750 / EMU_PER_HMM;
 
 // It is not possible to change the bullet style for text.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - oox/source

2020-03-24 Thread Rico Tzschichholz (via logerrit) 
 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4f75f6a7434bae5f11e1205130fee1b4ac2df50b
Author: Rico Tzschichholz 
AuthorDate: Fri Mar 20 07:51:53 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Mar 24 18:16:17 2020 +0100

Fix build with boost < 1.68

Follow-up fix for 73cac1031131021819a0fbd4d60554196aea230c
"tdf130839: Corrects second level left margin in Smartart"

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

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 51b4c8c96472..f625dac2cd97 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -1224,13 +1224,13 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 aParagraph->getProperties().setLevel(nLevel);
 if (nLevel >= nStartBulletsAtLevel)
 {
-if 
(!aParagraph->getProperties().getParaLeftMargin().has_value())
+if 
(aParagraph->getProperties().getParaLeftMargin().get_ptr() == nullptr)
 {
 sal_Int32 nLeftMargin = 285750 * (nLevel - 
nStartBulletsAtLevel + 1) / EMU_PER_HMM;
 aParagraph->getProperties().getParaLeftMargin() = 
nLeftMargin;
 }
 
-if 
(!aParagraph->getProperties().getFirstLineIndentation().has_value())
+if 
(aParagraph->getProperties().getFirstLineIndentation().get_ptr() == nullptr)
 aParagraph->getProperties().getFirstLineIndentation() 
= -285750 / EMU_PER_HMM;
 
 // It is not possible to change the bullet style for text.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

2018-02-26 Thread Rico Tzschichholz 
 sw/source/core/txtnode/txatbase.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e075d09557e4637273de03f2f018d95e91b05455
Author: Rico Tzschichholz <ric...@ubuntu.com>
Date:   Mon Feb 26 09:12:48 2018 +0100

sw: Fix build with older boost::optional like 1.54

Change-Id: I2256a52e2017bfda04b3a2395f82b0aff0aa5b22
Reviewed-on: https://gerrit.libreoffice.org/50343
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Jenkins <c...@libreoffice.org>

diff --git a/sw/source/core/txtnode/txatbase.cxx 
b/sw/source/core/txtnode/txatbase.cxx
index 5c53ba78faca..82015ad57df2 100644
--- a/sw/source/core/txtnode/txatbase.cxx
+++ b/sw/source/core/txtnode/txatbase.cxx
@@ -100,21 +100,21 @@ void SwTextAttr::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
 pWhich = "character format";
 if (SwCharFormat* pCharFormat = GetCharFormat().GetCharFormat())
-oValue = "name: " + OUStringToOString(pCharFormat->GetName(), 
RTL_TEXTENCODING_UTF8);
+oValue = OString("name: " + 
OUStringToOString(pCharFormat->GetName(), RTL_TEXTENCODING_UTF8));
 break;
 }
 case RES_TXTATR_INETFMT:
 {
 pWhich = "inet format";
 const SwFormatINetFormat& rFormat = GetINetFormat();
-oValue = "url: " + rFormat.GetValue().toUtf8();
+oValue = OString("url: " + rFormat.GetValue().toUtf8());
 break;
 }
 case RES_TXTATR_CJK_RUBY:
 {
 pWhich = "ruby";
 const SwFormatRuby& rFormat = GetRuby();
-oValue = "rubytext: " + rFormat.GetText().toUtf8();
+oValue = OString("rubytext: " + rFormat.GetText().toUtf8());
 break;
 }
 case RES_TXTATR_META:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/source

2018-02-26 Thread Rico Tzschichholz 
 sw/source/core/txtnode/txatbase.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4c9f01179be9325486047f02d9978d18c592afaa
Author: Rico Tzschichholz <ric...@ubuntu.com>
Date:   Mon Feb 26 09:12:48 2018 +0100

sw: Fix build with older boost::optional like 1.54

Change-Id: I2256a52e2017bfda04b3a2395f82b0aff0aa5b22
Reviewed-on: https://gerrit.libreoffice.org/50342
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/sw/source/core/txtnode/txatbase.cxx 
b/sw/source/core/txtnode/txatbase.cxx
index 5c53ba78faca..82015ad57df2 100644
--- a/sw/source/core/txtnode/txatbase.cxx
+++ b/sw/source/core/txtnode/txatbase.cxx
@@ -100,21 +100,21 @@ void SwTextAttr::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
 pWhich = "character format";
 if (SwCharFormat* pCharFormat = GetCharFormat().GetCharFormat())
-oValue = "name: " + OUStringToOString(pCharFormat->GetName(), 
RTL_TEXTENCODING_UTF8);
+oValue = OString("name: " + 
OUStringToOString(pCharFormat->GetName(), RTL_TEXTENCODING_UTF8));
 break;
 }
 case RES_TXTATR_INETFMT:
 {
 pWhich = "inet format";
 const SwFormatINetFormat& rFormat = GetINetFormat();
-oValue = "url: " + rFormat.GetValue().toUtf8();
+oValue = OString("url: " + rFormat.GetValue().toUtf8());
 break;
 }
 case RES_TXTATR_CJK_RUBY:
 {
 pWhich = "ruby";
 const SwFormatRuby& rFormat = GetRuby();
-oValue = "rubytext: " + rFormat.GetText().toUtf8();
+oValue = OString("rubytext: " + rFormat.GetText().toUtf8());
 break;
 }
 case RES_TXTATR_META:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

2018-02-22 Thread Rico Tzschichholz 
 solenv/gbuild/extensions/post_PackageInfo.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 06db1b3bd9804efbe64784a1dbee11f4690a1038
Author: Rico Tzschichholz <ric...@ubuntu.com>
Date:   Thu Feb 22 14:21:50 2018 +0100

solenv: Update gb_PackageInfo_emit_l10n_for_one_lang

Add cjk_*, ctl_* and ctlseqcheck_$LANG.xcd files to install list

Change-Id: I2c56cf2af3cc444cb7075740a981b6954950e5f5
Reviewed-on: https://gerrit.libreoffice.org/50182
Reviewed-by: Rico Tzschichholz <ric...@ubuntu.com>
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Jenkins <c...@libreoffice.org>

diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk 
b/solenv/gbuild/extensions/post_PackageInfo.mk
index 1abd6e241d9f..331eeb89e194 100644
--- a/solenv/gbuild/extensions/post_PackageInfo.mk
+++ b/solenv/gbuild/extensions/post_PackageInfo.mk
@@ -69,6 +69,9 @@ define gb_PackageInfo_emit_l10n_for_one_lang
 $(if $(filter-out qtz en-US,$(1)),$(foreach packagedir,$(patsubst 
%/,%,$(gb_AllLangPackage_ALLDIRS)),$(call 
gb_PackageInfo_emit_l10n_for_one_alllangpackage,$(packagedir),$(1
 $(if $(filter $(gb_AllLangMoTarget_LANGS),$(1)),$(foreach 
target,$(gb_AllLangMoTarget_REGISTERED),$(call 
gb_PackageInfo_emit_l10n_for_one_mo,$(target),$(1
 $(if $(filter $(gb_Configuration_LANGS),$(1)),$(foreach configfile,Langpack- 
res/fcfg_langpack_ res/registry_,$(call 
gb_PackageInfo_emit_l10n_for_one_configfile,$(1),$(configfile
+$(if $(filter $(gb_CJK_LANGS),$(1)),$(foreach configfile,cjk_,$(call 
gb_PackageInfo_emit_l10n_for_one_configfile,$(1),$(configfile
+$(if $(filter $(gb_CTL_LANGS),$(1)),$(foreach configfile,ctl_,$(call 
gb_PackageInfo_emit_l10n_for_one_configfile,$(1),$(configfile
+$(if $(filter $(gb_CTLSEQCHECK_LANGS),$(1)),$(foreach 
configfile,ctlseqcheck_,$(call 
gb_PackageInfo_emit_l10n_for_one_configfile,$(1),$(configfile
 @echo "$(foreach suf,executables libraries 
files,$(gb_PackageInfo_get_target)/l10n-$(1).$(suf)) \\" >> 
$(WORKDIR)/Dep/packageinfo.d
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/gbuild

2018-02-22 Thread Rico Tzschichholz 
 solenv/gbuild/extensions/post_PackageInfo.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit e27c67107d128d1421e2c09d81c99f43ad0d45a4
Author: Rico Tzschichholz <ric...@ubuntu.com>
Date:   Thu Feb 22 14:21:50 2018 +0100

solenv: Update gb_PackageInfo_emit_l10n_for_one_lang

Add cjk_*, ctl_* and ctlseqcheck_$LANG.xcd files to install list

Change-Id: I2c56cf2af3cc444cb7075740a981b6954950e5f5
Reviewed-on: https://gerrit.libreoffice.org/50181
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Jenkins <c...@libreoffice.org>

diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk 
b/solenv/gbuild/extensions/post_PackageInfo.mk
index 1abd6e241d9f..331eeb89e194 100644
--- a/solenv/gbuild/extensions/post_PackageInfo.mk
+++ b/solenv/gbuild/extensions/post_PackageInfo.mk
@@ -69,6 +69,9 @@ define gb_PackageInfo_emit_l10n_for_one_lang
 $(if $(filter-out qtz en-US,$(1)),$(foreach packagedir,$(patsubst 
%/,%,$(gb_AllLangPackage_ALLDIRS)),$(call 
gb_PackageInfo_emit_l10n_for_one_alllangpackage,$(packagedir),$(1
 $(if $(filter $(gb_AllLangMoTarget_LANGS),$(1)),$(foreach 
target,$(gb_AllLangMoTarget_REGISTERED),$(call 
gb_PackageInfo_emit_l10n_for_one_mo,$(target),$(1
 $(if $(filter $(gb_Configuration_LANGS),$(1)),$(foreach configfile,Langpack- 
res/fcfg_langpack_ res/registry_,$(call 
gb_PackageInfo_emit_l10n_for_one_configfile,$(1),$(configfile
+$(if $(filter $(gb_CJK_LANGS),$(1)),$(foreach configfile,cjk_,$(call 
gb_PackageInfo_emit_l10n_for_one_configfile,$(1),$(configfile
+$(if $(filter $(gb_CTL_LANGS),$(1)),$(foreach configfile,ctl_,$(call 
gb_PackageInfo_emit_l10n_for_one_configfile,$(1),$(configfile
+$(if $(filter $(gb_CTLSEQCHECK_LANGS),$(1)),$(foreach 
configfile,ctlseqcheck_,$(call 
gb_PackageInfo_emit_l10n_for_one_configfile,$(1),$(configfile
 @echo "$(foreach suf,executables libraries 
files,$(gb_PackageInfo_get_target)/l10n-$(1).$(suf)) \\" >> 
$(WORKDIR)/Dep/packageinfo.d
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

2018-02-22 Thread Rico Tzschichholz 
 solenv/gbuild/extensions/post_PackageInfo.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a0d739026d21077e51bfc82ee63d04f6b4b69828
Author: Rico Tzschichholz <ric...@ubuntu.com>
Date:   Fri Feb 9 23:48:32 2018 +0100

solenv: Fix gb_MoTarget_get_install_target argument

This fixes l10n-*.files generation of packageinfo and makes
"install-packages-l10n-*" targets work again.

Change-Id: Ib4d726f1079360cade8d5f398b1f5144d6693152
Reviewed-on: https://gerrit.libreoffice.org/49528
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Rico Tzschichholz <ric...@ubuntu.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk 
b/solenv/gbuild/extensions/post_PackageInfo.mk
index d0e0f15df133..1abd6e241d9f 100644
--- a/solenv/gbuild/extensions/post_PackageInfo.mk
+++ b/solenv/gbuild/extensions/post_PackageInfo.mk
@@ -55,7 +55,7 @@ define gb_PackageInfo_emit_l10n_for_one_alllangpackage
 endef
 
 define gb_PackageInfo_emit_l10n_for_one_mo
-@echo "$(patsubst $(INSTDIR)/%,%,$(call 
gb_MoTarget_get_install_target,$(1)$(2)))" >> 
$(gb_PackageInfo_get_target)/l10n-$(2).files
+@echo "$(patsubst $(INSTDIR)/%,%,$(call gb_MoTarget_get_install_target,$(shell 
$(SRCDIR)/solenv/bin/localestr $(2))/LC_MESSAGES/$(1)))" >> 
$(gb_PackageInfo_get_target)/l10n-$(2).files
 
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/gbuild

2018-02-13 Thread Rico Tzschichholz 
 solenv/gbuild/extensions/post_PackageInfo.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 039bf2792b6cbd8a8ad7059b4e72b7c457522505
Author: Rico Tzschichholz <ric...@ubuntu.com>
Date:   Fri Feb 9 23:48:32 2018 +0100

solenv: Fix gb_MoTarget_get_install_target argument

This fixes l10n-*.files generation of packageinfo and makes
"install-packages-l10n-*" targets work again.

Change-Id: Ib4d726f1079360cade8d5f398b1f5144d6693152
Reviewed-on: https://gerrit.libreoffice.org/49527
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk 
b/solenv/gbuild/extensions/post_PackageInfo.mk
index d0e0f15df133..1abd6e241d9f 100644
--- a/solenv/gbuild/extensions/post_PackageInfo.mk
+++ b/solenv/gbuild/extensions/post_PackageInfo.mk
@@ -55,7 +55,7 @@ define gb_PackageInfo_emit_l10n_for_one_alllangpackage
 endef
 
 define gb_PackageInfo_emit_l10n_for_one_mo
-@echo "$(patsubst $(INSTDIR)/%,%,$(call 
gb_MoTarget_get_install_target,$(1)$(2)))" >> 
$(gb_PackageInfo_get_target)/l10n-$(2).files
+@echo "$(patsubst $(INSTDIR)/%,%,$(call gb_MoTarget_get_install_target,$(shell 
$(SRCDIR)/solenv/bin/localestr $(2))/LC_MESSAGES/$(1)))" >> 
$(gb_PackageInfo_get_target)/l10n-$(2).files
 
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - connectivity/source

2017-07-24 Thread Rico Tzschichholz 
 connectivity/source/drivers/evoab2/EApi.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ffe568afd34be683430e6a31ca2368f957a4876d
Author: Rico Tzschichholz <ric...@ubuntu.com>
Date:   Mon Jul 24 11:24:48 2017 +0200

add libebook-1.2.so.19 in EApi.cxx

Change-Id: I900a190948087360bb4c3cd9235c9848333ad66f
Reviewed-on: https://gerrit.libreoffice.org/40358
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit 5844d813411be8c4c7c394be07a49eaf92885758)
Reviewed-on: https://gerrit.libreoffice.org/40362

diff --git a/connectivity/source/drivers/evoab2/EApi.cxx 
b/connectivity/source/drivers/evoab2/EApi.cxx
index fc81a1944769..81db0b0d83df 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -21,6 +21,7 @@
 #define  DECLARE_FN_POINTERS 1
 #include "EApi.h"
 static const char *eBookLibNames[] = {
+"libebook-1.2.so.19", // evolution-data-server 3.24+
 "libebook-1.2.so.16",
 "libebook-1.2.so.15",
 "libebook-1.2.so.14", // bumped again (evolution-3.6)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: connectivity/source

2017-07-24 Thread Rico Tzschichholz 
 connectivity/source/drivers/evoab2/EApi.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5844d813411be8c4c7c394be07a49eaf92885758
Author: Rico Tzschichholz <ric...@ubuntu.com>
Date:   Mon Jul 24 11:24:48 2017 +0200

add libebook-1.2.so.19 in EApi.cxx

Change-Id: I900a190948087360bb4c3cd9235c9848333ad66f
Reviewed-on: https://gerrit.libreoffice.org/40358
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/connectivity/source/drivers/evoab2/EApi.cxx 
b/connectivity/source/drivers/evoab2/EApi.cxx
index fc81a1944769..81db0b0d83df 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -21,6 +21,7 @@
 #define  DECLARE_FN_POINTERS 1
 #include "EApi.h"
 static const char *eBookLibNames[] = {
+"libebook-1.2.so.19", // evolution-data-server 3.24+
 "libebook-1.2.so.16",
 "libebook-1.2.so.15",
 "libebook-1.2.so.14", // bumped again (evolution-3.6)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - connectivity/source

2017-07-24 Thread Rico Tzschichholz 
 connectivity/source/drivers/evoab2/EApi.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6592b505576a7daab4eb204f67f078f0465aef6c
Author: Rico Tzschichholz <ric...@ubuntu.com>
Date:   Mon Jul 24 11:24:48 2017 +0200

add libebook-1.2.so.19 in EApi.cxx

Change-Id: I900a190948087360bb4c3cd9235c9848333ad66f
Reviewed-on: https://gerrit.libreoffice.org/40359
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/connectivity/source/drivers/evoab2/EApi.cxx 
b/connectivity/source/drivers/evoab2/EApi.cxx
index fc81a1944769..81db0b0d83df 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -21,6 +21,7 @@
 #define  DECLARE_FN_POINTERS 1
 #include "EApi.h"
 static const char *eBookLibNames[] = {
+"libebook-1.2.so.19", // evolution-data-server 3.24+
 "libebook-1.2.so.16",
 "libebook-1.2.so.15",
 "libebook-1.2.so.14", // bumped again (evolution-3.6)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - pyuno/source

2016-02-09 Thread Rico Tzschichholz 
 pyuno/source/module/pyuno.cxx  |2 +-
 pyuno/source/module/pyuno_impl.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 15d65d2d5403e471af9ad17056784a077a83beee
Author: Rico Tzschichholz <ric...@ubuntu.com>
Date:   Tue Feb 9 12:55:24 2016 +0100

pyuno: Fix build with python 2.7

Adjust conditionals to properly respect python 2.7.1+

Change-Id: I32d21a071e054100294e418af5358305eac69944
Reviewed-on: https://gerrit.libreoffice.org/22230
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>

diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index 1f11f3d..eba4f44 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -325,7 +325,7 @@ sal_Int32 lcl_PyNumber_AsSal_Int32( PyObject *pObj )
 
 // Convert Python number to platform long, then check actual value against
 // bounds of sal_Int32
-#if PY_VERSION_HEX >= 0x0207
+#if PY_VERSION_HEX >= 0x0302
 int nOverflow;
 long nResult = PyLong_AsLongAndOverflow( pObj,  );
 if ( nOverflow || nResult > SAL_MAX_INT32 || nResult < SAL_MIN_INT32) {
diff --git a/pyuno/source/module/pyuno_impl.hxx 
b/pyuno/source/module/pyuno_impl.hxx
index 39a0952..69e254c 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -26,7 +26,7 @@
 
 #include 
 
-#if PY_VERSION_HEX < 0x0207
+#if PY_VERSION_HEX < 0x0302
 typedef long Py_hash_t;
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: pyuno/source

2016-02-09 Thread Rico Tzschichholz 
 pyuno/source/module/pyuno.cxx  |2 +-
 pyuno/source/module/pyuno_impl.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e14bd2d6845cf13a35b14762d6e1e160e8315997
Author: Rico Tzschichholz <ric...@ubuntu.com>
Date:   Tue Feb 9 12:55:24 2016 +0100

pyuno: Fix build with python 2.7

Adjust conditionals to properly respect python 2.7.1+

Change-Id: I32d21a071e054100294e418af5358305eac69944
Reviewed-on: https://gerrit.libreoffice.org/22231
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>

diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index d69f195..8b44c64 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -324,7 +324,7 @@ sal_Int32 lcl_PyNumber_AsSal_Int32( PyObject *pObj )
 
 // Convert Python number to platform long, then check actual value against
 // bounds of sal_Int32
-#if PY_VERSION_HEX >= 0x0207
+#if PY_VERSION_HEX >= 0x0302
 int nOverflow;
 long nResult = PyLong_AsLongAndOverflow( pObj,  );
 if ( nOverflow || nResult > SAL_MAX_INT32 || nResult < SAL_MIN_INT32) {
diff --git a/pyuno/source/module/pyuno_impl.hxx 
b/pyuno/source/module/pyuno_impl.hxx
index 39a0952..69e254c 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -26,7 +26,7 @@
 
 #include 
 
-#if PY_VERSION_HEX < 0x0207
+#if PY_VERSION_HEX < 0x0302
 typedef long Py_hash_t;
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits