diff options
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/qa/makefile.mk | 9 | ||||
| -rw-r--r-- | forms/source/xforms/xpathlib/xpathlib.cxx | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/forms/qa/makefile.mk b/forms/qa/makefile.mk index 822f67e1bb46..b34529e2fbcf 100644 --- a/forms/qa/makefile.mk +++ b/forms/qa/makefile.mk @@ -73,15 +73,18 @@ ALL: ALLDEP .INCLUDE : target.mk +test: + echo $(SOLARBINDIR) + .IF "$(BUILD_QADEVOOO)" == "YES" show_targets: - +@java $(RUNNER_CLASSPATH) complexlib.ShowTargets $(foreach,i,$(JAVAFILES) $(i:s/.\$///:s/.java//)) + +@$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) complexlib.ShowTargets $(foreach,i,$(JAVAFILES) $(i:s/.\$///:s/.java//)) run: - +$(COPY) integration$/forms$/*.props $(CLASSDIR)$/$(PACKAGE) && java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -sce forms_all.sce + +$(COPY) integration$/forms$/*.props $(CLASSDIR)$/$(PACKAGE) && $(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -sce forms_all.sce run_%: - +$(COPY) integration$/forms$/*.props $(CLASSDIR)$/$(PACKAGE) && java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o integration.$(PRJNAME).$(@:s/run_//) + +$(COPY) integration$/forms$/*.props $(CLASSDIR)$/$(PACKAGE) && $(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o integration.$(PRJNAME).$(@:s/run_//) .ELSE run: show_targets diff --git a/forms/source/xforms/xpathlib/xpathlib.cxx b/forms/source/xforms/xpathlib/xpathlib.cxx index 1c4bf3f6d14f..a4dfbe3b08e6 100644 --- a/forms/source/xforms/xpathlib/xpathlib.cxx +++ b/forms/source/xforms/xpathlib/xpathlib.cxx @@ -293,7 +293,7 @@ void xforms_nowFunction(xmlXPathParserContextPtr ctxt, int /*nargs*/) */ DateTime aDateTime; ::rtl::OString aDateTimeString = makeDateTimeString(aDateTime); - xmlChar *pString = (xmlChar*)rtl_allocateMemory(aDateTimeString.getLength()+1); + xmlChar *pString = static_cast<xmlChar*>(xmlMalloc(aDateTimeString.getLength()+1)); strncpy((char*)pString, (char*)aDateTimeString.getStr(), aDateTimeString.getLength()); pString[aDateTimeString.getLength()] = 0; xmlXPathReturnString(ctxt, pString); |