diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-01-25 09:21:17 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-01-25 09:21:17 +0100 |
| commit | acb0bbd76e63c13e2601f71bee219a89debc8457 (patch) | |
| tree | d6893f917798d45abca7f6dbbdc540ccf4804a83 /forms | |
| parent | 16932cb2060d4f3965a8db131a6b6123c2b7760f (diff) | |
| parent | 94ee4db6592539ff60bdf25a06fb5faaacfa8370 (diff) | |
gridsort: pulled CWS dba34b
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/prj/build.lst | 2 | ||||
| -rw-r--r-- | forms/qa/makefile.mk | 18 | ||||
| -rw-r--r-- | forms/source/component/FormattedField.cxx | 2 |
3 files changed, 7 insertions, 15 deletions
diff --git a/forms/prj/build.lst b/forms/prj/build.lst index 2d7c5f49c7e5..115c035edbbc 100644 --- a/forms/prj/build.lst +++ b/forms/prj/build.lst @@ -1,4 +1,4 @@ -fm forms : l10n oovbaapi svx sfx2 qadevOOo NULL +fm forms : l10n oovbaapi svx sfx2 qadevOOo LIBXSLT:libxslt NULL fm forms usr1 - all fm_mkofrm NULL fm forms\inc nmake - all fm_inc NULL fm forms\source\inc get - all fm_sinc NULL diff --git a/forms/qa/makefile.mk b/forms/qa/makefile.mk index afafcca427aa..693183d47e2d 100644 --- a/forms/qa/makefile.mk +++ b/forms/qa/makefile.mk @@ -37,15 +37,10 @@ PRJNAME = forms JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar ConnectivityTools.jar JAVAFILES := $(shell @$(FIND) org -name "*.java") \ $(shell @$(FIND) integration -name "*.java") -JAVACLASSFILES := $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(i:d)$/$(i:b).class) #----- make a jar from compiled files ------------------------------ -MAXLINELENGTH = 100000 - -#JARCLASSDIRS = JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE # --- Runner Settings ---------------------------------------------- @@ -66,14 +61,11 @@ ALL: ALLDEP .INCLUDE : target.mk -test: - echo $(SOLARBINDIR) - -show_targets: +show_targets: $(CLASSDIR)$/$(JARTARGET) +@$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) complexlib.ShowTargets $(foreach,i,$(JAVAFILES) $(i:s/.\$///:s/.java//)) -run: - +$(COPY) integration$/forms$/*.props $(CLASSDIR)$/$(PACKAGE) && $(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -sce forms_all.sce +run: $(CLASSDIR)$/$(JARTARGET) + +$(COPY) integration$/forms$/*.props $(CLASSDIR) && $(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -sce forms_all.sce -run_%: - +$(COPY) integration$/forms$/*.props $(CLASSDIR)$/$(PACKAGE) && $(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o integration.$(PRJNAME).$(@:s/run_//) +run_%: $(CLASSDIR)$/$(JARTARGET) + +$(COPY) integration$/forms$/*.props $(CLASSDIR) && $(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o integration.$(PRJNAME).$(@:s/run_//) diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index a35a300dda78..697b39d4931e 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -1199,7 +1199,7 @@ Any OFormattedModel::translateControlValueToExternalValue( ) const Any OFormattedModel::translateDbColumnToControlValue() { if ( m_bNumeric ) - m_aSaveValue <<= DBTypeConversion::getValue( m_xColumn, m_aNullDate, m_nKeyType ); // #100056# OJ + m_aSaveValue <<= DBTypeConversion::getValue( m_xColumn, m_aNullDate ); // #100056# OJ else m_aSaveValue <<= m_xColumn->getString(); |