#i105086# fix for clob and blob

3 files changed, 56 insertions, 55 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;
 
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index 05c8ad587902..2cc91945ae3d 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -31,61 +31,61 @@
 #ifndef _FORMS_FORMCOMPONENT_HXX_
 #define _FORMS_FORMCOMPONENT_HXX_
 
-#include "cloneable.hxx"

-#include "ids.hxx"

-#include "property.hrc"

-#include "property.hxx"

-#include "propertybaghelper.hxx"

+#include "cloneable.hxx"
+#include "ids.hxx"
+#include "property.hrc"
+#include "property.hxx"
+#include "propertybaghelper.hxx"
 #include "resettable.hxx"
-#include "services.hxx"

-#include "windowstateguard.hxx"

-

-/** === begin UNO includes === **/

-#include <com/sun/star/awt/XControl.hpp>

-#include <com/sun/star/beans/XPropertyAccess.hpp>

-#include <com/sun/star/beans/XPropertyContainer.hpp>

-#include <com/sun/star/container/XChild.hpp>

-#include <com/sun/star/container/XNamed.hpp>

-#include <com/sun/star/form/binding/XBindableValue.hpp>

-#include <com/sun/star/form/FormComponentType.hpp>

-#include <com/sun/star/form/validation/XValidatableFormComponent.hpp>

-#include <com/sun/star/form/validation/XValidityConstraintListener.hpp>

-#include <com/sun/star/form/XBoundComponent.hpp>

-#include <com/sun/star/form/XBoundControl.hpp>

-#include <com/sun/star/form/XFormComponent.hpp>

-#include <com/sun/star/form/XLoadListener.hpp>

-#include <com/sun/star/form/XReset.hpp>

-#include <com/sun/star/io/XMarkableStream.hpp>

-#include <com/sun/star/io/XPersistObject.hpp>

-#include <com/sun/star/lang/DisposedException.hpp>

-#include <com/sun/star/lang/XEventListener.hpp>

-#include <com/sun/star/lang/XMultiServiceFactory.hpp>

-#include <com/sun/star/lang/XServiceInfo.hpp>

-#include <com/sun/star/sdb/XColumn.hpp>

-#include <com/sun/star/sdb/XColumnUpdate.hpp>

-#include <com/sun/star/sdb/XRowSetChangeListener.hpp>

-#include <com/sun/star/sdbc/XRowSet.hpp>

-#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>

-#include <com/sun/star/uno/XAggregation.hpp>

-#include <com/sun/star/util/XCloneable.hpp>

+#include "services.hxx"
+#include "windowstateguard.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/awt/XControl.hpp>
+#include <com/sun/star/beans/XPropertyAccess.hpp>
+#include <com/sun/star/beans/XPropertyContainer.hpp>
+#include <com/sun/star/container/XChild.hpp>
+#include <com/sun/star/container/XNamed.hpp>
+#include <com/sun/star/form/binding/XBindableValue.hpp>
+#include <com/sun/star/form/FormComponentType.hpp>
+#include <com/sun/star/form/validation/XValidatableFormComponent.hpp>
+#include <com/sun/star/form/validation/XValidityConstraintListener.hpp>
+#include <com/sun/star/form/XBoundComponent.hpp>
+#include <com/sun/star/form/XBoundControl.hpp>
+#include <com/sun/star/form/XFormComponent.hpp>
+#include <com/sun/star/form/XLoadListener.hpp>
+#include <com/sun/star/form/XReset.hpp>
+#include <com/sun/star/io/XMarkableStream.hpp>
+#include <com/sun/star/io/XPersistObject.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/lang/XEventListener.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/sdb/XColumn.hpp>
+#include <com/sun/star/sdb/XColumnUpdate.hpp>
+#include <com/sun/star/sdb/XRowSetChangeListener.hpp>
+#include <com/sun/star/sdbc/XRowSet.hpp>
+#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
+#include <com/sun/star/uno/XAggregation.hpp>
+#include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
-#include <com/sun/star/form/XLoadable.hpp>

-/** === end UNO includes === **/

-

-#include <comphelper/componentcontext.hxx>

-#include <comphelper/propagg.hxx>

-#include <comphelper/propertybag.hxx>

-#include <comphelper/propmultiplex.hxx>

-#include <comphelper/sequence.hxx>

-#include <comphelper/uno3.hxx>

-#include <cppuhelper/component.hxx>

-#include <cppuhelper/implbase1.hxx>

-#include <cppuhelper/implbase2.hxx>

-#include <cppuhelper/implbase3.hxx>

-#include <cppuhelper/implbase4.hxx>

-#include <cppuhelper/implbase7.hxx>

-#include <osl/mutex.hxx>

-#include <rtl/ustring.hxx>

+#include <com/sun/star/form/XLoadable.hpp>
+/** === end UNO includes === **/
+
+#include <comphelper/componentcontext.hxx>
+#include <comphelper/propagg.hxx>
+#include <comphelper/propertybag.hxx>
+#include <comphelper/propmultiplex.hxx>
+#include <comphelper/sequence.hxx>
+#include <comphelper/uno3.hxx>
+#include <cppuhelper/component.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase7.hxx>
+#include <osl/mutex.hxx>
+#include <rtl/ustring.hxx>
 
 #include <memory>