diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2009-12-11 13:27:24 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2009-12-11 13:27:24 +0100 |
| commit | 75dfa86ab548eb3d1a807e7bfe1e056be666d9aa (patch) | |
| tree | f2e3856abb8886f485743b1acec6301525c1418d /connectivity | |
| parent | e469ee0ef7a27b7fe74de6961bb2fca7836bf9b9 (diff) | |
| parent | 31b72c3f3b632329d01b295d449eac0e38cea58c (diff) | |
dba33d: merge after pulling the latest changes from CWS dba33b
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/qa/connectivity/tools/makefile.mk | 2 | ||||
| -rw-r--r-- | connectivity/source/commontools/FValue.cxx | 10 | ||||
| -rw-r--r-- | connectivity/source/commontools/dbtools.cxx | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/connectivity/qa/connectivity/tools/makefile.mk b/connectivity/qa/connectivity/tools/makefile.mk index c4f2b68f53f1..32aa94c77312 100644 --- a/connectivity/qa/connectivity/tools/makefile.mk +++ b/connectivity/qa/connectivity/tools/makefile.mk @@ -46,7 +46,7 @@ all: #----- compile .java files ----------------------------------------- JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunnerLight.jar -JAVAFILES := $(shell @$(FIND) -name "*.java") +JAVAFILES := $(shell @$(FIND) . -name "*.java") JAVACLASSFILES := $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:d)$(i:b).class) #----- make a jar from compiled files ------------------------------ diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index 7ea68e099dc3..b3254a0165a8 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -1921,8 +1921,8 @@ namespace detail virtual Sequence< sal_Int8 > getBytes() const = 0; virtual Reference< XInputStream > getBinaryStream() const = 0; virtual Reference< XInputStream > getCharacterStream() const = 0; - virtual Reference< XClob > getClob() const = 0; virtual Reference< XBlob > getBlob() const = 0; + virtual Reference< XClob > getClob() const = 0; virtual Any getObject() const = 0; virtual sal_Bool wasNull() const = 0; @@ -1953,8 +1953,8 @@ namespace detail virtual Sequence< sal_Int8 > getBytes() const { return m_xRow->getBytes( m_nPos ); }; virtual Reference< XInputStream > getBinaryStream() const { return m_xRow->getBinaryStream( m_nPos ); }; virtual Reference< XInputStream > getCharacterStream() const { return m_xRow->getCharacterStream( m_nPos ); }; - virtual Reference< XClob > getClob() const { return m_xRow->getClob( m_nPos ); }; virtual Reference< XBlob > getBlob() const { return m_xRow->getBlob( m_nPos ); }; + virtual Reference< XClob > getClob() const { return m_xRow->getClob( m_nPos ); }; virtual Any getObject() const { return m_xRow->getObject( m_nPos ,NULL); }; virtual sal_Bool wasNull() const { return m_xRow->wasNull( ); }; @@ -1986,10 +1986,10 @@ namespace detail virtual Sequence< sal_Int8 > getBytes() const { return m_xColumn->getBytes(); }; virtual Reference< XInputStream > getBinaryStream() const { return m_xColumn->getBinaryStream(); }; virtual Reference< XInputStream > getCharacterStream() const { return m_xColumn->getCharacterStream(); }; - virtual Reference< XClob > getClob() const { return m_xColumn->getClob(); }; virtual Reference< XBlob > getBlob() const { return m_xColumn->getBlob(); }; - virtual Any getObject() const { return m_xColumn->getObject(NULL); }; - virtual sal_Bool wasNull() const { return m_xColumn->wasNull( ); }; + virtual Reference< XClob > getClob() const { return m_xColumn->getClob(); }; + virtual Any getObject() const { return m_xColumn->getObject( NULL ); }; + virtual sal_Bool wasNull() const { return m_xColumn->wasNull(); }; private: const Reference< XColumn > m_xColumn; diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index d5502fc0272c..79f9f9707c26 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -1968,7 +1968,8 @@ void setObjectWithInfo(const Reference<XParameters>& _xParams, case DataType::BOOLEAN: _xParams->setBoolean(parameterIndex,_rValue); break; - if ( _rValue.isSigned() ) + case DataType::TINYINT: + if ( _rValue.isSigned() ) _xParams->setByte(parameterIndex,_rValue); else _xParams->setShort(parameterIndex,_rValue); |