This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4195d08bb6 Fold in some linted catches, foxusing on macOS and Linux
4195d08bb6 is described below
commit 4195d08bb6d275e79be010f32f96b4431a16dd51
Author: Jim Jagielski <[email protected]>
AuthorDate: Sun Jul 26 16:58:21 2026 -0400
Fold in some linted catches, foxusing on macOS and Linux
---
main/filter/source/msfilter/msdffimp.cxx | 2 +-
main/redland/raptor/makefile.mk | 7 +++++++
main/redland/rasqal/makefile.mk | 2 +-
main/redland/redland/makefile.mk | 6 +++---
main/svx/inc/svx/msdffdef.hxx | 3 ++-
main/sw/source/filter/ww8/ww8graf.cxx | 3 +++
main/sw/source/filter/ww8/ww8par.cxx | 2 +-
7 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/main/filter/source/msfilter/msdffimp.cxx
b/main/filter/source/msfilter/msdffimp.cxx
index fa4fcaf4fd..4873ebb897 100644
--- a/main/filter/source/msfilter/msdffimp.cxx
+++ b/main/filter/source/msfilter/msdffimp.cxx
@@ -5554,7 +5554,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
?
(MSO_LineStyle)GetPropertyValue(
DFF_Prop_lineStyle,
mso_lineSimple )
- :
(MSO_LineStyle)USHRT_MAX;
+ : mso_lineNone;
pTextImpRec->eLineStyle = pImpRec->eLineStyle;
if( pImpRec->nShapeId )
diff --git a/main/redland/raptor/makefile.mk b/main/redland/raptor/makefile.mk
index 0d9ff29a25..86193bdd69 100644
--- a/main/redland/raptor/makefile.mk
+++ b/main/redland/raptor/makefile.mk
@@ -59,6 +59,7 @@ OOO_PATCH_FILES+=$(TARFILE_NAME).patch.os2
CONFIGURE_DIR=
CONFIGURE_ACTION=libtoolize && aclocal && autoconf && .$/configure
# do not enable grddl parser (#i93768#)
+# www=none: see the unix/macOS stanza near the bottom of this file for why
CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests
--enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb
--without-sqlite --without-mysql --without-postgresql --without-threestore
--with-regex-library=posix --with-decimal=none --with-www=none
--prefix=$(PWD)/$(OUT) --includedir=(PWD)$/$(INCCOM) --libdir=$(PWD)$/$(LB)
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
@@ -78,6 +79,7 @@ raptor_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
# do not enable grddl parser (#i93768#)
+# www=none: see the unix/macOS stanza near the bottom of this file for why
CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests
--enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb
--without-sqlite --without-mysql --without-postgresql --without-threestore
--with-regex-library=posix --with-decimal=none --with-www=none
--build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared"
--prefix=$(PWD)/$(OUT) --includedir=(PWD)$/$(INCCOM) --libdir=$(PWD)$/$(LB)
--CC="$(raptor_CC)" CPPFLAGS="-nostdinc $ [...]
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
@@ -137,6 +139,11 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for
xslt-config
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
# do not enable grddl parser (#i93768#)
+# www=none: raptor's URI-fetch backend is both unused and unbuildable here.
+# Unused: grddl, the only parser that dereferences remote URIs, is excluded
+# above, and AOO's own RDF consumer (unoxml/source/rdf/librdf_repository.cxx)
+# only ever parses local streams; curl is off too (--with-curl-config=no
below).
+# Unbuildable: the libxml backend calls xmlNanoHTTP*, removed in libxml2 2.12.
CONFIGURE_FLAGS=--with-threads --with-curl-config=no --with-icu-config=no
--disable-static --disable-gtk-doc --enable-parsers="rdfxml ntriples turtle
trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql
--without-postgresql --without-threestore --with-regex-library=posix
--with-decimal=none --with-www=none --prefix=$(PDW)/$(OUT)
--includedir=$(PWD)/$(INCCOM) --libdir=$(PWD)/$(LB)
.IF "$(SYSTEM_LIBXML)" == "NO"
CONFIGURE_FLAGS+=--with-xml2-config=${SOLARVERSION}/${INPATH}/bin/xml2-config \
diff --git a/main/redland/rasqal/makefile.mk b/main/redland/rasqal/makefile.mk
index c0eb2585f0..01789a5c60 100644
--- a/main/redland/rasqal/makefile.mk
+++ b/main/redland/rasqal/makefile.mk
@@ -74,7 +74,7 @@ rasqal_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests
--with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql
--without-postgresql --without-threestore --disable-pcre --with-decimal=none
--with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32
lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CPPFLAGS="-nostdinc $(INCLUDE)"
LDFLAGS="-no-undefined
-Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols -L$(ILIB:s/;/ -L/)"
LIBS="$(rasqal_LIBS)" OBJD [...]
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests
--with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql
--without-postgresql --without-threestore --disable-pcre --with-decimal=none
--build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared"
CC="$(rasqal_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined
-Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols -L$(ILIB:s/;/ -L/)"
LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) [...]
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/main/redland/redland/makefile.mk b/main/redland/redland/makefile.mk
index 07af657757..48e75c941e 100644
--- a/main/redland/redland/makefile.mk
+++ b/main/redland/redland/makefile.mk
@@ -59,7 +59,7 @@ PATCH_FILES=$(OOO_PATCH_FILES) \
OOO_PATCH_FILES+=$(TARFILE_NAME).patch.os2
CONFIGURE_DIR=
CONFIGURE_ACTION=libtoolize --force && aclocal && autoconf && .$/configure
RAPTOR2_CFLAGS=-I${PWD}$/..$/${INPATH}/inc
RAPTOR2_LIBS='-L${PWD}/..$/${INPATH}/lib -lraptor2 -lxml2 -lcurl'
PKG_CONFIG_PATH='../raptor2-2.0.15;../rasqal-0.9.33'
-CONFIGURE_FLAGS=--disable-dependency-tracking --disable-static
--disable-gtk-doc --with-threads --with-openssl-digests
--with-xml-parser=libxml --with-raptor=system --with-rasqual=system
--without-bdb --without-sqlite --without-mysql --without-postgresql
--without-threestore -without-iodbc --without-unixodbc --without-datadirect
--without-virtuoso --with-regex-library=posix --with-decimal=none
--with-www=xml --disable-ltdl-install --disable-modular --without-included-ltdl
--disable-ltdl- [...]
+CONFIGURE_FLAGS=--disable-dependency-tracking --disable-static
--disable-gtk-doc --with-threads --with-openssl-digests
--with-xml-parser=libxml --with-raptor=system --with-rasqual=system
--without-bdb --without-sqlite --without-mysql --without-postgresql
--without-threestore -without-iodbc --without-unixodbc --without-datadirect
--without-virtuoso --with-regex-library=posix --with-decimal=none
--disable-ltdl-install --disable-modular --without-included-ltdl
--disable-ltdl-convenience
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
@@ -76,7 +76,7 @@ redland_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests
--with-xml-parser=libxml --with-raptor=system --with-rasqual=system
--without-bdb --without-sqlite --without-mysql --without-postgresql
--without-threestore --with-regex-library=posix --with-decimal=none
--with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32
lt_cv_cc_dll_switch="-shared" CC="$(redland_CC)" CPPFLAGS="-nostdinc
$(INCLUDE)" LDFLAGS="-no-undefined
-Wl,--enable-runtime-pseudo-reloc-v2,--export-al [...]
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests
--with-xml-parser=libxml --with-raptor=system --with-rasqual=system
--without-bdb --without-sqlite --without-mysql --without-postgresql
--without-threestore --with-regex-library=posix --with-decimal=none
--build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared"
CC="$(redland_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined
-Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols -L$(I [...]
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
@@ -129,7 +129,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for
xslt-config
CONFIGURE_DIR=
#CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
RAPTOR2_CFLAGS=-I${PWD}$/..$/${INPATH}/inc
RAPTOR2_LIBS="-L${PWD}/..$/${INPATH}/lib -lraptor2"
PKG_CONFIG_PATH="../raptor2-2.0.15:../rasqal-0.9.33"
CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
PKG_CONFIG_PATH="../raptor2-2.0.15:../rasqal-0.9.33"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads
--with-openssl-digests --with-xml-parser=libxml --with-raptor=system
--with-rasqual=system --without-bdb --without-sqlite --without-mysql
--without-postgresql --without-threestore -without-iodbc --without-unixodbc
--without-datadirect --without-virtuoso --with-regex-library=posix
--with-decimal=none --with-www=xml --disable-ltdl-install --disable-modular
--without-included-ltdl --disable-ltdl-convenience
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads
--with-openssl-digests --with-xml-parser=libxml --with-raptor=system
--with-rasqual=system --without-bdb --without-sqlite --without-mysql
--without-postgresql --without-threestore -without-iodbc --without-unixodbc
--without-datadirect --without-virtuoso --with-regex-library=posix
--with-decimal=none --disable-ltdl-install --disable-modular
--without-included-ltdl --disable-ltdl-convenience
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/main/svx/inc/svx/msdffdef.hxx b/main/svx/inc/svx/msdffdef.hxx
index b9f0265b57..7db2f6ff6e 100644
--- a/main/svx/inc/svx/msdffdef.hxx
+++ b/main/svx/inc/svx/msdffdef.hxx
@@ -1012,7 +1012,8 @@ enum MSO_LineStyle {
mso_lineDouble, // Double lines of equal width
mso_lineThickThin, // Double lines, one thick, one thin
mso_lineThinThick, // Double lines, reverse order
- mso_lineTriple // Three lines, thin, thick, thin
+ mso_lineTriple, // Three lines, thin, thick, thin
+ mso_lineNone = 0xFFFF // sentinel: no line style is set (set by
{Svx,Sw}MSDffManager::ProcessObj)
};
// MSO_LINETYPE - how to "fill" the line contour
diff --git a/main/sw/source/filter/ww8/ww8graf.cxx
b/main/sw/source/filter/ww8/ww8graf.cxx
index 2f84dbed9e..108218f7fd 100644
--- a/main/sw/source/filter/ww8/ww8graf.cxx
+++ b/main/sw/source/filter/ww8/ww8graf.cxx
@@ -1645,6 +1645,9 @@ sal_Int32
SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor,
else
nIdx = WW8_BordersSO::double5;// 180
break;
+ // no line style is set
+ case mso_lineNone:
+ break;
// erroneously not implemented line style is set
default:
ASSERT(sal_False, "eLineStyle is not (yet) implemented!");
diff --git a/main/sw/source/filter/ww8/ww8par.cxx
b/main/sw/source/filter/ww8/ww8par.cxx
index 432bdd5186..b5ebe24cb2 100644
--- a/main/sw/source/filter/ww8/ww8par.cxx
+++ b/main/sw/source/filter/ww8/ww8par.cxx
@@ -965,7 +965,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
? (MSO_LineStyle)GetPropertyValue(
DFF_Prop_lineStyle,
mso_lineSimple )
- : (MSO_LineStyle)USHRT_MAX;
+ : mso_lineNone;
pImpRec->nFlags = rObjData.nSpFlags;
