autorecovery: commit resolved merge (after rebase to m71)

1 files changed, 16 insertions, 23 deletions

diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 8ffe27fd8..37aed7b7a 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -31,6 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_extensions.hxx"
 #include <osl/mutex.hxx>
+#include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/io/XPersistObject.hpp>
@@ -887,12 +888,14 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid)
                 case DataType::BINARY:
                 case DataType::VARBINARY:
                 case DataType::LONGVARBINARY:
+                case DataType::BLOB:
                     sCurrentModelType = C2U("TextField");
                     break;
 
                 case DataType::VARCHAR:
                 case DataType::LONGVARCHAR:
                 case DataType::CHAR:
+                case DataType::CLOB:
                     bFormattedIsNumeric = sal_False;
                     // _NO_ break !
                 default:
@@ -1085,20 +1088,16 @@ void BibDataManager::setFilter(const ::rtl::OUString& rQuery)
         return;
     try
     {
-        m_xParser->setFilter(rQuery);
-        ::rtl::OUString aQuery=m_xParser->getFilter();
-        Reference< XPropertySet >  aPropertySet( m_xForm, UNO_QUERY );
-        Any aVal; aVal <<= aQuery;
-        aPropertySet->setPropertyValue(C2U("Filter"), aVal);
-        BOOL bVal = sal_True;
-        aVal.setValue(&bVal, ::getBooleanCppuType());
-        aPropertySet->setPropertyValue(C2U("ApplyFilter"), aVal);
+        m_xParser->setFilter( rQuery );
+        ::rtl::OUString aQuery = m_xParser->getFilter();
+        Reference< XPropertySet >  xFormProps( m_xForm, UNO_QUERY_THROW );
+        xFormProps->setPropertyValue( C2U( "Filter" ), makeAny( aQuery ) );
+        xFormProps->setPropertyValue( C2U( "ApplyFilter" ), makeAny( sal_True ) );
         reload();
     }
     catch(Exception& e )
     {
-        (void) e;	// make compiler happy
-        DBG_ERROR("::setFilterOnActiveDataSource: something went wrong !");
+        DBG_UNHANDLED_EXCEPTION();
     }
 
 
@@ -1110,18 +1109,12 @@ void BibDataManager::setFilter(const ::rtl::OUString& rQuery)
     ::rtl::OUString aQueryString;
     try
     {
-        Reference< XPropertySet >  aPropertySet( m_xForm, UNO_QUERY );
-        Any aQuery=aPropertySet->getPropertyValue(C2U("Filter"));
-
-        if(aQuery.getValueType() == ::getCppuType((::rtl::OUString*)0))
-        {
-            aQueryString=*(::rtl::OUString*)aQuery.getValue();
-        }
+        Reference< XPropertySet > xFormProps( m_xForm, UNO_QUERY_THROW );
+        OSL_VERIFY( xFormProps->getPropertyValue( C2U( "Filter" ) ) >>= aQueryString );
     }
-    catch(Exception& e )
+    catch( const Exception& )
     {
-        (void) e;	// make compiler happy
-        DBG_ERROR("::getFilterOnActiveDataSource: something went wrong !");
+        DBG_UNHANDLED_EXCEPTION();
     }
 
 
@@ -1795,13 +1788,13 @@ void BibDataManager::SetToolbar(BibToolBar* pSet)
 /* -----------------------------08.05.2002 09:26------------------------------
 
  ---------------------------------------------------------------------------*/
-uno::Reference< form::XFormController > BibDataManager::GetFormController()
+uno::Reference< form::runtime::XFormController > BibDataManager::GetFormController()
 {
     if(!m_xFormCtrl.is())
     {
         Reference< lang::XMultiServiceFactory > xMgr = comphelper::getProcessServiceFactory();
-        m_xFormCtrl = uno::Reference< form::XFormController > (
-            xMgr->createInstance(C2U("com.sun.star.form.FormController")), UNO_QUERY);
+        m_xFormCtrl = uno::Reference< form::runtime::XFormController > (
+            xMgr->createInstance(C2U("com.sun.star.form.runtime.FormController")), UNO_QUERY);
         m_xFormCtrl->setModel(uno::Reference< awt::XTabControllerModel > (getForm(), UNO_QUERY));
         // #100312# -------------
         m_xFormDispatch = uno::Reference< frame::XDispatch > ( m_xFormCtrl, UNO_QUERY);