external/libxml2/UnpackedTarball_libxml2.mk | 2 +-
sw/source/uibase/docvw/AnnotationWin2.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ffcdd3a72bcacce6c16dec9adc88556fcb83894f
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Feb 22 12:09:10 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Mar 1 12:00:43 2024 +0100
tdf#157158: always paint the arrow black
The background doesn't change so do not change the arrow color either
Change-Id: I7a5f80e639570e94975b7e033619783d24c95a6f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163737
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
(cherry picked from commit c4553ae6e06ce84c2f477ec85bc2056645eb4833)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163756
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx
b/sw/source/uibase/docvw/AnnotationWin2.cxx
index 3f8a1752e890..74310ba99125 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -504,7 +504,7 @@ void SwAnnotationWin::SetMenuButtonColors()
const tools::Long nBorderDistanceBottom = ((aSymbolRect.GetHeight() * 150)
+ 500) / 1000;
aSymbolRect.AdjustBottom( -nBorderDistanceBottom );
DecorationView aDecoView(xVirDev.get());
- aDecoView.DrawSymbol(aSymbolRect, SymbolType::SPIN_DOWN, GetTextColor(),
+ aDecoView.DrawSymbol(aSymbolRect, SymbolType::SPIN_DOWN, COL_BLACK,
DrawSymbolFlags::NONE);
mxMenuButton->set_image(xVirDev);
mxMenuButton->set_size_request(aSize.Width() + 4, aSize.Height() + 4);
commit 1f8e5f673f7dd0cd531b3fb0a5cb5a7d2535b36f
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Thu Feb 15 18:51:27 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Mar 1 12:00:33 2024 +0100
tdf#159502 libxml2: apply Solaris ld patch only on Solaris
Diverging from upstream by inventing a LIBXML2_GLOBAL_VARIABLES version
should only be done if actually required.
Change-Id: I1520ca5078dc24ffd83e927f9c857d625e71749b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163455
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit eebdda4e221327cae5a9177893394819ca510d5f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163492
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/external/libxml2/UnpackedTarball_libxml2.mk
b/external/libxml2/UnpackedTarball_libxml2.mk
index d50d52cbeef8..489fb007572b 100644
--- a/external/libxml2/UnpackedTarball_libxml2.mk
+++ b/external/libxml2/UnpackedTarball_libxml2.mk
@@ -14,7 +14,7 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,libxml2,$(LIBXML_TARBALL),,libxml2)
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libxml2))
$(eval $(call gb_UnpackedTarball_add_patches,libxml2,\
- external/libxml2/libxml2-global-symbols.patch \
+ $(if $(filter
SOLARIS,$(OS)),external/libxml2/libxml2-global-symbols.patch) \
external/libxml2/libxml2-vc10.patch \
external/libxml2/libxml2-XMLCALL-redefine.patch.0 \
$(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \
