Makefile.in | 2 +- filter/source/msfilter/eschesdo.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit fcdf75d9460c933670a03b5d88de17838db23ee2 Author: Michael Stahl <[email protected]> Date: Fri Sep 23 17:05:54 2016 +0200 Makefile.in: check JAVA_HOME/bin, not JAVA_HOME/include On Mac OS X 10.8, the directory contains "bin" but not "include", so it re-runs autogen.sh all the time. JAVA_HOME=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home Change-Id: I9065c8daef47df535f60267fc2c3e7cb23fc3910 diff --git a/Makefile.in b/Makefile.in index 15bbf4b..4a16e46 100644 --- a/Makefile.in +++ b/Makefile.in @@ -47,7 +47,7 @@ $(BUILDDIR)/config_host.mk : $(wildcard \ $(BUILDDIR)/autogen.sh \ ) \ $(shell . $(SRCDIR)/bin/get_config_variables JAVA_HOME && \ - if test -n "$${JAVA_HOME}" -a ! -d "$${JAVA_HOME}/include"; then echo force-restart; fi) + if test -n "$${JAVA_HOME}" -a ! -d "$${JAVA_HOME}/bin"; then echo force-restart; fi) sh -c $(SRCDIR)/autogen.sh else # MAKE_RESTARTS commit 7ac64b9afa00f5d8b7da94d48793cd6f70812730 Author: Michael Stahl <[email protected]> Date: Fri Sep 23 15:36:05 2016 +0200 fix denglish comment Change-Id: I118e06b9664bdfc82de3c75471c28ec8e5dd84d2 diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index 0eb7c28..c80b387 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -1209,7 +1209,7 @@ const SdrObject* ImplEESdrObject::GetSdrObject() const return EscherEx::GetSdrObject( mXShape ); } -// loads and converts text from shape, result is being saved in mnTextSize respeichert +// loads and converts text from shape, result is saved in mnTextSize sal_uInt32 ImplEESdrObject::ImplGetText() { Reference< XText > xXText( mXShape, UNO_QUERY ); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
