diff options
| author | Carsten Driesner <cd@openoffice.org> | 2011-02-07 13:06:08 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2011-02-07 13:06:08 +0100 |
| commit | 7fa8864a0f2c4d318c17ee05c19c31c85788a10e (patch) | |
| tree | 70bc1d108e0b5615a90389d03066e1bd786274c4 /forms | |
| parent | f163f1264a44ff606e7431c16c86ad2c9ba4acb6 (diff) | |
| parent | c395e5608ce118f4296083632d6662f278f0b8fc (diff) | |
removetooltypes01: Rebase to DEV300m99
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/qa/makefile.mk | 18 | ||||
| -rw-r--r-- | forms/source/component/FormattedField.cxx | 2 |
2 files changed, 6 insertions, 14 deletions
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 654a2e5a19b4..63195bf74af0 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(); |