configure.in | 4 ++++ editeng/source/items/frmitems.cxx | 3 ++- solenv/gbuild/platform/solaris.mk | 9 ++++++++- 3 files changed, 14 insertions(+), 2 deletions(-)
New commits: commit d51af3a62a640783993e83566c3a86d62f24637b Author: Michael Stahl <[email protected]> Date: Mon Jun 4 19:09:55 2012 +0200 solaris.mk: re-add nsl and socket libraries Seems these were dropped in 3c4cd1deaf71d0d800957b3580d426c721bf7844. Change-Id: Ib929e322719e4a50d8d2d32e3cd9466242e1c034 diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index d0cbdaf..8639793 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -217,7 +217,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ -Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \ - $(LIBS) -lnsl -lsocket \ + $(LIBS) \ $(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \ -o $(1)) endef @@ -255,6 +255,11 @@ gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT) gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) +gb_STDLIBS := \ + m \ + nsl \ + socket \ + gb_Library_PLAINLIBS_NONE += \ dl \ fontconfig \ @@ -263,7 +268,9 @@ gb_Library_PLAINLIBS_NONE += \ GLU \ ICE \ m \ + nsl \ pthread \ + socket \ SM \ ICE \ X11 \ commit a87f45ab78b61dba6b615a88846682b0c35d7d40 Author: Michael Stahl <[email protected]> Date: Mon Jun 4 19:01:01 2012 +0200 configure.in: refuse to run in sourced solar environment revert one hunk from 909cd34b7b0982078a50b9ed46cf57811d9571df Change-Id: I9eb3f3c1cdab2c0624ab65f540b9c3d6b8f1bfb5 diff --git a/configure.in b/configure.in index 6d6155f..09600f1 100644 --- a/configure.in +++ b/configure.in @@ -49,6 +49,10 @@ PathFormat() fi } +if test -n "$SOLARENV" ; then + AC_MSG_ERROR([You have sourced config_host.mk in this shell. This may lead to trouble, please run in a fresh (login) shell.]) +fi + echo "********************************************************************" echo "*" echo "* Running ${PACKAGE_NAME} build configuration." commit 30aa036181480c76f909c2dda86b2682cac1fd73 Author: Michael Stahl <[email protected]> Date: Mon Jun 4 18:54:34 2012 +0200 fdo#46112: tweak condition to prevent guessing only... ...if there are actually individual line widths given; fixes the sw_rtftok test. Change-Id: If5f6ef54b93c5bfccfd011f25d9d9301637d388e diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index c40bec9..bfdf178 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -1867,7 +1867,8 @@ SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, Svx rSvxLine.SetWidth( bConvert? MM100_TO_TWIP_UNSIGNED( rLine.LineWidth ) : rLine.LineWidth ); // fdo#46112: double does not necessarily mean symmetric // for backwards compatibility - bGuessWidth = (DOUBLE == nStyle); + bGuessWidth = (DOUBLE == nStyle) && + (rLine.InnerLineWidth > 0) && (rLine.OuterLineWidth > 0); } return lcl_lineToSvxLine(rLine, rSvxLine, bConvert, bGuessWidth); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
