diff options
| author | Ocke Janssen <Ocke.Janssen@sun.com> | 2009-11-11 14:29:22 +0100 |
|---|---|---|
| committer | Ocke Janssen <Ocke.Janssen@sun.com> | 2009-11-11 14:29:22 +0100 |
| commit | fe866adeb5bcf32bbb0ce23a85e20fcefce84986 (patch) | |
| tree | 52fac7bb5df81783c1d6c21517b780f3c16d153d /forms | |
| parent | b987042c0867017b7f355c4e29b8c466e36d980c (diff) | |
| parent | 3191f5add38f67750386c4f2e162e0bb63973de5 (diff) | |
Automated merge with file:///z:\so-cwsserv02\dba33b\DEV300\ooo
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/FormComponent.cxx | 4 | ||||
| -rw-r--r-- | forms/source/component/ImageControl.cxx | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 23c05be9f89f..070806e814fb 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -2217,7 +2217,7 @@ sal_Bool OBoundControlModel::approveDbColumnType(sal_Int32 _nColumnType) || (_nColumnType == DataType::LONGVARBINARY) || (_nColumnType == DataType::OTHER) || (_nColumnType == DataType::OBJECT) || (_nColumnType == DataType::DISTINCT) || (_nColumnType == DataType::STRUCT) || (_nColumnType == DataType::ARRAY) - || (_nColumnType == DataType::BLOB) || (_nColumnType == DataType::CLOB) + || (_nColumnType == DataType::BLOB) /*|| (_nColumnType == DataType::CLOB)*/ || (_nColumnType == DataType::REF) || (_nColumnType == DataType::SQLNULL)) return sal_False; @@ -2553,7 +2553,7 @@ void OBoundControlModel::reset() throw (RuntimeException) || ( nFieldType == DataType::LONGVARBINARY ) || ( nFieldType == DataType::OBJECT ) || ( nFieldType == DataType::BLOB ) - || ( nFieldType == DataType::CLOB ) + /*|| ( nFieldType == DataType::CLOB )*/ ) m_xColumn->getBinaryStream(); else diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 5d30c2776659..b15b5641cc4e 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -115,6 +115,7 @@ namespace || ( _nFieldType == DataType::OBJECT ) || ( _nFieldType == DataType::BLOB ) || ( _nFieldType == DataType::LONGVARCHAR ) + || ( _nFieldType == DataType::CLOB ) ) return ImageStoreBinary; |