summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-02-11 15:57:18 +0100
committerMichael Stahl <mstahl@redhat.com>2014-02-12 09:53:08 +0100
commite3abec3f07f2a710bfce66f77b33f494e2aa4972 (patch)
tree740f34ea017abc08ce444b93ccad57a628e4f444 /m4
parentb62f5c2a22d968d06ea9e638126278bbd1158bf6 (diff)
fdo#74825: fix missing lcms2/libxslt/curl in installation sets
The assumption that all configure variables had been normalized to TRUE/<empty> turned out not to hold; convert a bit more in that direction. (regression from 4af38b099c741c3676aefeb20c515913aaeed666) Change-Id: I2127c515e8a833a07c9b26ed9d693ce5a1853fe4
Diffstat (limited to 'm4')
-rw-r--r--m4/libo_externals.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/m4/libo_externals.m4 b/m4/libo_externals.m4
index c17292d93f49..3fe9fce18648 100644
--- a/m4/libo_externals.m4
+++ b/m4/libo_externals.m4
@@ -14,12 +14,12 @@ AC_ARG_WITH(system-$1,
AC_MSG_CHECKING([which $1 to use])
if test "$with_system_$1" = "yes"; then
AC_MSG_RESULT([external])
- SYSTEM_$2=YES
+ SYSTEM_$2=TRUE
PKG_CHECK_MODULES([$2], [$3])
$2_CFLAGS=$(printf '%s' "${$2_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g")
else
AC_MSG_RESULT([internal])
- SYSTEM_$2=NO
+ SYSTEM_$2=
$2_CFLAGS=$4
$2_LIBS=$5
BUILD_TYPE="$BUILD_TYPE $2"
37b145c984 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155682 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> 2023-08-15ComplexColor various clean-up and (trivial) refactoringsTomaž Vajngerl Don't allow access to member variables of ComplexColor and makes them private. Needs a lot of changes. Change "scheme" to "theme" to be more consistent. In LO we usually call the "theme color" what is usually refered to as "scheme color" in OOXML, where it is sometimes refered to as "scheme" and other times as theme color. Remove ThemeColor class which was replaced with CmplexColor some time ago. Remove un-needed includes and un-needed components. Use isValidThemeColor in many places where we check that the ComplexColor is of "Theme" type and that ThemeColorType is set to a valid value. Change-Id: I325595fa65b8e56a4707e9d22acc6330aac28961 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155359 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> 2023-08-02sc: theme color support for sparklines + ODF & OOXML import/exportTomaž Vajngerl This changes Sparkline colors to use complex colors instead and adds Sparkline theme color import and export support for ODF and OOXML. Change-Id: I58edd525d50f95199bd4fe7825afb51aaa7fc091 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155113 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> 2023-07-12sc: Theme color change undo/redo - styles and direct formatTomaž Vajngerl This adds the code for undo/redo for change of theme colors in styles and direct formatting. Change-Id: I58568b18ab18562e6148ec8530d3d22c62ef2b95 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154305 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> 2023-07-04sc: change theme color for SdrObjectsTomaž Vajngerl Change-Id: I318821c843fe937b7011f1674809f8c78df24a2d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153938 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> 2023-06-25sc: ThemeColorChanger - change theme color for bordersTomaž Vajngerl Change-Id: Id6b08ad48b496d2f1138aeea8d024a5f61bee633 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153500 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> 2023-06-21sc: change text and background theme colors for direct attributesTomaž Vajngerl Change-Id: Ia1ef2d151476bb627a0cb999135f6add827fb341 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151675 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> 2023-06-08lok: send theme palette after the change in ThemeDialogTomaž Vajngerl For some reason the SdrPage is constructed in Online after every change (cursor, selection) so can't use that to send theme change callback. Instead of that send it after the theme is changed with the ThemeDialog. in addition this requires that we transport model::ColorSet in a shared_ptr more, to prevent doing constant copies. This requires that the IThemeColorChanger interface is changed and the signature of apply() method. Change-Id: Iac951fce57a8e9dff467bd27b2f9c64ec65ea30c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152635 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 6c40e4d1796bcb6418dcb5ec17f46f576c171796) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152728 Tested-by: Jenkins 2023-05-17sc: change (char, background) style colors when changing the themeTomaž Vajngerl This adds a Calc specific ThemeColorChanger, which changes the character and background colors in styles. In addition add the changes that make this possible - support in SvxBrushItem for the ComplexColor, making sure that ComplexColor is properly passed to other items (mainly from color picker),... Change-Id: Id2e98c42bbe195a0f75cc8951ff69f6d7eea6be0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151667 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>