sc/qa/unit/macros-test.cxx | 1 - solenv/gbuild/JavaClassSet.mk | 2 +- solenv/gbuild/WinResTarget.mk | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-)
New commits: commit d781ae9ae1aef10927de6ace368b0cc7d48280ad Author: Michael Stahl <mst...@redhat.com> Date: Mon Oct 24 18:16:09 2011 +0200 WinResTarget: remove realpath calls diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk index 234ab2d..7a4fee9 100644 --- a/solenv/gbuild/WinResTarget.mk +++ b/solenv/gbuild/WinResTarget.mk @@ -60,13 +60,13 @@ endef define gb_WinResTarget_add_file $(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE=$(gb_Helper_SRCDIR_NATIVE)/$(2).rc -$(call gb_WinResTarget_get_target,$(1)) : RCFILE=$(realpath $(SRCDIR)/$(strip $(2)).rc) -$(call gb_WinResTarget_get_target,$(1)) : $(realpath $(SRCDIR)/$(strip $(2)).rc) +$(call gb_WinResTarget_get_target,$(1)) : RCFILE=$(SRCDIR)/$(strip $(2)).rc +$(call gb_WinResTarget_get_target,$(1)) : $(SRCDIR)/$(strip $(2)).rc endef define gb_WinResTarget_add_dependency -$(call gb_WinResTarget_get_target,$(1)) : $(foreach file,$(2),$(realpath $(SRCDIR)/$(strip $(file)))) +$(call gb_WinResTarget_get_target,$(1)) : $(foreach file,$(2),$(SRCDIR)/$(file)) endef commit aa146f46d2688b9f0c7b03f540ca11fc2c6ee80b Author: Michael Stahl <mst...@redhat.com> Date: Mon Oct 24 17:48:06 2011 +0200 macros-test.cxx: unused variable pDoc diff --git a/sc/qa/unit/macros-test.cxx b/sc/qa/unit/macros-test.cxx index 3737869..e97156f 100644 --- a/sc/qa/unit/macros-test.cxx +++ b/sc/qa/unit/macros-test.cxx @@ -305,7 +305,6 @@ void ScMacrosTest::testVba() Sequence< sal_Int16 > aOutParamIndex; Sequence< Any > aOutParam; Sequence< uno::Any > aParams; - ScDocument* pDoc = xDocSh->GetDocument(); xDocSh->CallXScript(sUrl, aParams, aRet, aOutParamIndex,aOutParam); rtl::OUString aStringRes; commit 81042d7a366ad8d5f52fcd78e4b44183f62ce0e1 Author: Michael Stahl <mst...@redhat.com> Date: Mon Oct 24 17:10:06 2011 +0200 JavaClassSet: fix partial rebuilds Partial rebuilds can fail because the reubilt classes may import other classes that are not rebuilt; putting the target directory on the classpath seems to fix it (it would also be possible to use -sourcepath but that seems more complicated). diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 292d7ae..cea27c0 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -43,7 +43,7 @@ $(call gb_Helper_abbreviate_dirs_native,\ $(filter-out $(JARDEPS),$(4))))) && \ $(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \ $(gb_JavaClassSet_JAVACDEBUG) \ - -cp "$(CLASSPATH)" \ + -cp "$(CLASSPATH)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \ -d $(call gb_JavaClassSet_get_classdir,$(2)) \ @$$RESPONSEFILE &&) \ rm -f $$RESPONSEFILE && \ _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits