From d388db8d412d4e6ac26c6d0cb1d6cd90af47feb0 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" <frank.schoenheit@sun.com>
Date: Thu, 30 Sep 2010 13:10:28 +0200
Subject: dba34b: tweaked the makefile

---
 forms/qa/makefile.mk | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'forms')

diff --git a/forms/qa/makefile.mk b/forms/qa/makefile.mk
index afafcca427aa..b19f7864c2b1 100644
--- a/forms/qa/makefile.mk
+++ b/forms/qa/makefile.mk
@@ -66,14 +66,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_//)
-- 
cgit 


From d03b7460241df9cf8f3101b54b24c97715f22ef3 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" <frank.schoenheit@sun.com>
Date: Thu, 7 Oct 2010 10:07:59 +0200
Subject: dba34b: slightly simplified makefile

---
 forms/qa/makefile.mk | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'forms')

diff --git a/forms/qa/makefile.mk b/forms/qa/makefile.mk
index b19f7864c2b1..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 ----------------------------------------------
 
-- 
cgit 


From 6a7bbc11c1039e78ca10849bcad6c1c389a6e3b9 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" <frank.schoenheit@oracle.com>
Date: Tue, 23 Nov 2010 21:55:13 +0100
Subject: dba34b: #i115250# DBTypeConversion::getValue: do not use the target
 format to determine how to obtain the column value, instead, use the column
 type

---
 forms/source/component/FormattedField.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'forms')

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();
 
-- 
cgit