external/liborcus/include.patch.0 | 21 +++++++++++++++++++++
i18npool/source/calendar/calendar_gregorian.cxx | 2 +-
svx/source/dialog/fntctrl.cxx | 2 +-
sw/source/uibase/wrtsh/wrtsh2.cxx | 2 +-
unotools/source/i18n/resmgr.cxx | 5 +++++
5 files changed, 29 insertions(+), 3 deletions(-)
New commits:
commit 95e1347cb2d4144ce97431a33b6d4ecda4d679aa
Author: Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Wed Dec 6 12:15:44 2023 +0100
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Wed Dec 6 12:15:44 2023 +0100
No FrameWeld yet on ViewFrame
This was only added via https://gerrit.libreoffice.org/c/core/+/113795
Change-Id: Ibe7c57c83a5c6fe0fd3b6f8e7682811e3549e0bd
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx
b/sw/source/uibase/wrtsh/wrtsh2.cxx
index 1cb9e1b46861..57769ab6e881 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -495,7 +495,7 @@ static void LoadURL(SwView& rView, const OUString& rURL,
LoadUrlFlags nFilter,
OSL_ENSURE( pDShell, "No DocShell?!");
SfxViewFrame& rViewFrame = *rView.GetViewFrame();
- if (!SfxObjectShell::AllowedLinkProtocolFromDocument(rURL, pDShell,
rViewFrame.GetFrameWeld()))
+ if (!SfxObjectShell::AllowedLinkProtocolFromDocument(rURL, pDShell,
rView.GetFrameWeld()))
return;
// We are doing tiledRendering, let the client handles the URL loading,
commit 403bf61489eaded6982fe5700b4dbf58d869aa12
Author: Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Wed Dec 6 11:44:15 2023 +0100
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Wed Dec 6 12:15:15 2023 +0100
Fix build for gcc13
This was part of the following commit:
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon May 23 10:21:54 2022 +0200
Missing #include <stdint.h> in various external code
...which is a problem presumably since GCC 13 trunk
<https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=6f038efd93593da6e661b829d1bd3877e75550f1>
"libstdc++: Avoid including <cstdint> for std::char_traits". (All the
broken
C++ code used unqualified uintptr_t etc. rather than std::uintptr_t
etc., so I
deemed it more appropriate to include <stdint.h> rather than <cstdint>.)
Change-Id: Id9dfc383c5986126a425971c4557b90ac45ac963
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134760
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Plus the gist of this one:
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Nov 3 14:10:31 2020 +0000
presumably 'true' is sufficient in all cases
Change-Id: I9366193085a4c46ef64f0a9660e51b8678ca35f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105252
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Change-Id: Iae063b6270dfe60cebe27833b1a22f7af1fc312c
diff --git a/external/liborcus/include.patch.0
b/external/liborcus/include.patch.0
index 9555dd534b3e..3bed5aebf865 100644
--- a/external/liborcus/include.patch.0
+++ b/external/liborcus/include.patch.0
@@ -1,3 +1,24 @@
+--- include/orcus/base64.hpp
++++ include/orcus/base64.hpp
+@@ -9,6 +9,7 @@
+ #define __ORCUS_BASE64_HPP__
+
+ #include "env.hpp"
++#include <stdint.h>
+ #include <vector>
+ #include <string>
+
+--- include/orcus/types.hpp
++++ include/orcus/types.hpp
+@@ -16,6 +16,7 @@
+ #pragma GCC diagnostic ignored "-Wshadow"
+ #endif
+
++#include <stdint.h>
+ #include <cstdlib>
+ #include <vector>
+ #include <string>
+
--- src/liborcus/orcus_xlsx.cpp
+++ src/liborcus/orcus_xlsx.cpp
@@ -32,6 +32,7 @@
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx
b/i18npool/source/calendar/calendar_gregorian.cxx
index f3dc6ede1f66..1dacd8868265 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -347,7 +347,7 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDays )
"Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << "
rounded to " << fR);
int32_t nZoneOffset, nDSTOffset;
UErrorCode status = U_ZERO_ERROR;
- body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status );
+ body->getTimeZone().getOffset( fR, true, nZoneOffset, nDSTOffset, status );
if ( !U_SUCCESS(status) ) throw ERROR;
status = U_ZERO_ERROR;
body->setTime( fR - (nZoneOffset + nDSTOffset), status );
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index d312d7ad5f49..10c84ca95222 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -1014,7 +1014,7 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSet
&rSet, bool bPreviewBack
rCTLFont.SetFillColor( rColor );
}
else
- bTransparent = TRUE;
+ bTransparent = true;
rFont.SetTransparent( bTransparent );
rCJKFont.SetTransparent( bTransparent );
commit 5badca42b45f23f35e6dcdb482a222e4ebbd7bb3
Author: Đoàn Trần Công Danh <congdan...@gmail.com>
AuthorDate: Sun Nov 27 18:59:24 2022 +0700
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Wed Dec 6 11:36:18 2023 +0100
i18n: fix build with Boost 1.81.0
Boost.Locale since 1.81.0 switch to enum classes for facet type [1].
Switch our resource manager accordingly.
1:
https://github.com/boostorg/locale/commit/e5ed439ea39a4de915e9fb939cca95cae7d9d8d1
Change-Id: Ief215363ceb79b2019606b20a7cde55c8df6a042
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143343
Reviewed-by: Heiko Becker <heire...@exherbo.org>
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx
index 786c83df2e7b..07e604be7ed7 100644
--- a/unotools/source/i18n/resmgr.cxx
+++ b/unotools/source/i18n/resmgr.cxx
@@ -121,8 +121,13 @@ namespace Translate
if (aFind != aCache.end())
return aFind->second;
boost::locale::generator gen;
+#if BOOST_VERSION < 108100
gen.characters(boost::locale::char_facet);
gen.categories(boost::locale::message_facet |
boost::locale::information_facet);
+#else
+ gen.characters(boost::locale::char_facet_t::char_f);
+ gen.categories(boost::locale::category_t::message |
boost::locale::category_t::information);
+#endif
OUString uri("$BRAND_BASE_DIR/$BRAND_SHARE_RESOURCE_SUBDIR/");
rtl::Bootstrap::expandMacros(uri);
OUString path;
