need of MultiServiceFactory

11 files changed, 195 insertions, 168 deletions

diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 16ba2aae122d..d335d745b54c 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmgridcl.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: hr $ $Date: 2000-10-27 09:45:49 $
+ *  last change: $Author: oj $ $Date: 2000-11-03 14:56:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -248,9 +248,6 @@
 #include "trace.hxx"
 #endif
 
-#define IFACECAST(c)        ((const com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >&)c)
-    // SUN C52 has some ambiguities without this cast ....
-
 static sal_uInt32 nFormat = 0;
 
 //==============================================================================
@@ -421,16 +418,15 @@ sal_Bool FmGridHeader::Drop( const DropEvent& rEvt )
         if (!xDatabaseAccess.is())
         {   // aDatabaseName isn't a database path. maybe a favorite name ?
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XNamingService >  xDatabaseAccesses(
-                static_cast<FmGridControl*>(GetParent())->getServiceManager()->createInstance(SRV_SDB_DATABASE_ACCESS_CONTEXT), ::com::sun::star::uno::UNO_QUERY);
+                static_cast<FmGridControl*>(GetParent())->getServiceManager()->createInstance(SRV_SDB_DATABASE_CONTEXT), ::com::sun::star::uno::UNO_QUERY);
             if (xDatabaseAccesses.is())
             {
                 try
                 {
                     xDatabaseAccess = ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDatabaseAccess > (xDatabaseAccesses->getRegisteredObject(sDatabaseName), ::com::sun::star::uno::UNO_QUERY);
                 }
-                catch(::com::sun::star::container::NoSuchElementException& e)
+                catch(::com::sun::star::container::NoSuchElementException&)
                 {   // allowed, means aDatabaseName isn't a valid favorite name ....
-                    e; // make the compiler happy
                 }
             }
         }
@@ -1176,7 +1172,7 @@ void FmGridControl::DeleteSelectedRows()
         if (xConfirm.is())
         {
             ::com::sun::star::sdb::RowChangeEvent aEvent;
-            aEvent.Source = IFACECAST(*getDataSource());
+            aEvent.Source = (::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > )(::com::sun::star::uno::XInterface*)(*getDataSource());
             aEvent.Rows = nSelectedRows;
             aEvent.Action = ::com::sun::star::sdb::RowChangeAction::DELETE;
             if (!xConfirm->confirmDelete(aEvent))
@@ -1184,7 +1180,7 @@ void FmGridControl::DeleteSelectedRows()
         }
     }
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XDeleteRows >  xDeleteThem(IFACECAST(*getDataSource()), ::com::sun::star::uno::UNO_QUERY);
+    ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XDeleteRows >  xDeleteThem(*getDataSource(), ::com::sun::star::uno::UNO_QUERY);
 
     // colect the bookmarks of the selected rows
     ::com::sun::star::uno::Sequence < ::com::sun::star::uno::Any> aBookmarks = getSelectionBookmarks();
@@ -1265,19 +1261,19 @@ void FmGridControl::DeleteSelectedRows()
                     // no valid bookmark so move to the insert row
                     else
                     {
-                        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate >  xUpdateCursor(IFACECAST(*getDataSource()), ::com::sun::star::uno::UNO_QUERY);
+                        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate >  xUpdateCursor(*getDataSource(), ::com::sun::star::uno::UNO_QUERY);
                         xUpdateCursor->moveToInsertRow();
                     }
                 }
                 else
                 {
-                    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  xSet(IFACECAST(*m_pDataCursor), ::com::sun::star::uno::UNO_QUERY);
+                    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  xSet(*m_pDataCursor, ::com::sun::star::uno::UNO_QUERY);
                     sal_Int32 nRecordCount;
                     xSet->getPropertyValue(FM_PROP_ROWCOUNT) >>= nRecordCount;
                     // there are no rows left and we have an insert row
                     if (!nRecordCount && GetEmptyRow().Is())
                     {
-                        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate >  xUpdateCursor(IFACECAST(*getDataSource()), ::com::sun::star::uno::UNO_QUERY);
+                        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate >  xUpdateCursor(*getDataSource(), ::com::sun::star::uno::UNO_QUERY);
                         xUpdateCursor->moveToInsertRow();
                     }
                     else if (nRecordCount)
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 7b43a9a2e46a..707fcf648300 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmgridif.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-31 11:47:53 $
+ *  last change: $Author: oj $ $Date: 2000-11-03 14:56:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -951,7 +951,8 @@ sal_Bool SAL_CALL FmXGridControl::supportsMode(const ::rtl::OUString& Mode) thro
         static_cast< ::com::sun::star::util::XModeSelector*>(this),
         static_cast< ::com::sun::star::frame::XDispatchProvider*>(this),
         static_cast< ::com::sun::star::frame::XDispatchProviderInterception*>(this),
-        static_cast< ::com::sun::star::form::XResetListener*>(this)
+        static_cast< ::com::sun::star::form::XResetListener*>(this),
+        static_cast< ::com::sun::star::form::XGridPeer*>(this)
     );
 
     if (!aReturn.hasValue())
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 3a9796aae933..f7feac45e7f1 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: gridcell.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: hr $ $Date: 2000-10-27 09:45:49 $
+ *  last change: $Author: oj $ $Date: 2000-11-03 14:56:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,10 +59,6 @@
  *
  ************************************************************************/
 
-#ifndef _SVT_SDBPARSE_HXX //autogen wg. SdbSqlParser
-#include <svtools/sdbparse.hxx>
-#endif
-
 #ifndef _SVX_GRIDCELL_HXX
 #include "gridcell.hxx"
 #endif
@@ -165,12 +161,17 @@
 #ifndef _CPPUHELPER_EXTRACT_HXX_
 #include <cppuhelper/extract.hxx>
 #endif
-
-#define IFACECAST(c)        ((const com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >&)c)
-    // SUN C52 has some ambiguities without this cast ....
+#ifndef _ISOLANG_HXX
+#include <tools/isolang.hxx>
+#endif
+#ifndef _CONNECTIVITY_SQLNODE_HXX
+#include <connectivity/sqlnode.hxx>
+#endif
 
 #include <math.h>
 
+
+using namespace connectivity;
 // An irgendeiner Stelle dieser include-Orgie hier gehen die defines fuer WB_LEFT und WB_RIGHT verloren, und ich habe einfach
 // nicht herausgefunden, wo. Also eben ein Hack.
 #define WB_LEFT                 ((WinBits)0x00004000)
@@ -223,7 +224,7 @@ void DbGridColumn::CreateControl(sal_Int32 _nFieldPos, const ::com::sun::star::u
     DbCellControl* pCellControl = NULL;
     if (m_rParent.IsFilterMode())
     {
-        pCellControl = new DbFilterField(*this);
+        pCellControl = new DbFilterField(m_rParent.getServiceManager(),*this);
     }
     else
     {
@@ -248,7 +249,7 @@ void DbGridColumn::CreateControl(sal_Int32 _nFieldPos, const ::com::sun::star::u
     }
     ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >  xCur;
     if (m_rParent.getDataSource())
-        xCur = ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > (IFACECAST(*m_rParent.getDataSource()), ::com::sun::star::uno::UNO_QUERY);
+        xCur = ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > (*m_rParent.getDataSource(), ::com::sun::star::uno::UNO_QUERY);
         // TODO : the cursor wrapper should use an ::com::sun::star::sdbc::XRowSet interface, too
 
     pCellControl->Init(&m_rParent.GetDataWindow(), xCur );
@@ -1911,12 +1912,13 @@ sal_Bool DbListBox::Commit()
 
 DBG_NAME(DbFilterField);
 /*************************************************************************/
-DbFilterField::DbFilterField(DbGridColumn& _rColumn)
+DbFilterField::DbFilterField(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,DbGridColumn& _rColumn)
               :DbCellControl(_rColumn)
               ,m_bFilterList(sal_False)
               ,m_nControlClass(::com::sun::star::form::FormComponentType::TEXTFIELD)
               ,m_bFilterListFilled(sal_False)
               ,m_bBound(sal_False)
+              ,m_aParser(_rxORB)
 {
     DBG_CTOR(DbFilterField,NULL);
 
@@ -2125,23 +2127,27 @@ sal_Bool DbFilterField::Commit()
         aNewText.EraseTrailingChars();
         if (aNewText.Len() != 0)
         {
-            XubString aErrorMsg;
+            ::rtl::OUString aErrorMsg;
             ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >  xNumberFormatter(m_rColumn.GetParent().getNumberFormatter());
-            SdbSqlParseNode* pParseNode =
-                    getSQLParser().PredicateTree(aErrorMsg, aNewText,
-                    xNumberFormatter, Application::GetAppInternational(), m_rColumn.GetField());
+
+            OSQLParseNode* pParseNode = m_aParser.predicateTree(aErrorMsg, aNewText,xNumberFormatter, m_rColumn.GetField());
             if (pParseNode)
             {
-                XubString aPreparedText;
+                ::rtl::OUString aPreparedText;
+
+                XubString sLanguage, sCountry;
+                ConvertLanguageToIsoNames(Application::GetAppInternational().GetLanguage(), sLanguage, sCountry);
+                ::com::sun::star::lang::Locale aAppLocale(sLanguage, sCountry, ::rtl::OUString());
+
                 ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > xDataSourceRowSet(
-                    IFACECAST(*m_rColumn.GetParent().getDataSource()), ::com::sun::star::uno::UNO_QUERY);
+                    *m_rColumn.GetParent().getDataSource(), ::com::sun::star::uno::UNO_QUERY);
                 ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >  xConnection(
                     ::dbtools::getConnection(xDataSourceRowSet));
-                pParseNode->ParseNodeToPredicateStr(aPreparedText,
+
+                pParseNode->parseNodeToPredicateStr(aPreparedText,
                                                     xConnection->getMetaData(),
                                                     xNumberFormatter,
-                                                    Application::GetAppInternational(),
-                                                    m_rColumn.GetField());
+                                                    m_rColumn.GetField(),aAppLocale,'.');
                 delete pParseNode;
                 m_aText = aPreparedText;
             }
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 99a4cf96cac8..250ea6f60786 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: gridctrl.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-31 09:34:15 $
+ *  last change: $Author: oj $ $Date: 2000-11-03 14:56:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -189,10 +189,6 @@ String OBJECTTEXT   = String::CreateFromAscii("<OBJECT>");
 
 using namespace dbtools;
 
-#define IFACECAST(c)        ((const com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >&)c)
-    // SUN C52 has some ambiguities without this cast ....
-
-
 #define ROWSTATUS(row)  !row.Is() ? "NULL" : row->GetStatus() == GRS_CLEAN ? "CLEAN" : row->GetStatus() == GRS_MODIFIED ? "MODIFIED" : row->GetStatus() == GRS_DELETED ? "DELETED" : "INVALID"
 
 //==============================================================================
@@ -881,7 +877,7 @@ DbGridRow::DbGridRow(CursorWrapper* pCur, sal_Bool bPaintCursor)
                 m_eStatus = (pCur->isAfterLast() || pCur->isBeforeFirst()) ? GRS_INVALID : GRS_CLEAN;
             else
             {
-                ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  xSet(IFACECAST(*pCur),::com::sun::star::uno::UNO_QUERY);
+                ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  xSet(*pCur,::com::sun::star::uno::UNO_QUERY);
                 if (xSet.is())
                 {
                     m_bIsNew = ::comphelper::getBOOL(xSet->getPropertyValue(FM_PROP_ISNEW));
@@ -928,7 +924,7 @@ void DbGridRow::SetState(CursorWrapper* pCur, sal_Bool bPaintCursor)
             m_eStatus = GRS_CLEAN;
             if (!bPaintCursor)
             {
-                ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  xSet(IFACECAST(*pCur), ::com::sun::star::uno::UNO_QUERY);
+                ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  xSet(*pCur, ::com::sun::star::uno::UNO_QUERY);
                 DBG_ASSERT(xSet.is(), "DbGridRow::SetState : invalid cursor !");
 
                 if (::comphelper::getBOOL(xSet->getPropertyValue(FM_PROP_ISMODIFIED)))
@@ -1301,7 +1297,7 @@ sal_uInt16 DbGridControl::SetOptions(sal_uInt16 nOpt)
     m_nOptionMask = nOpt;
 
     // normalize the new options
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  xDataSourceSet(IFACECAST(*m_pDataCursor), ::com::sun::star::uno::UNO_QUERY);
+    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  xDataSourceSet(*m_pDataCursor, ::com::sun::star::uno::UNO_QUERY);
     if (xDataSourceSet.is())
     {
         // feststellen welche Updatem�glichkeiten bestehen
@@ -1477,7 +1473,7 @@ void DbGridControl::setDataSource(const ::com::sun::star::uno::Reference< ::com:
             {
                 xSupplier->getNumberFormatSettings()->getPropertyValue(rtl::OUString::createFromAscii("NullDate")) >>= m_aNullDate;
             }
-            catch(com::sun::star::uno::Exception&)
+            catch(::com::sun::star::uno::Exception&)
             {
             }
         }
@@ -1506,7 +1502,7 @@ void DbGridControl::setDataSource(const ::com::sun::star::uno::Reference< ::com:
     if (m_pDataCursor)
     {
         m_pDataSourcePropListener = new FmXGridSourcePropListener(this);
-        m_pDataSourcePropMultiplexer = new ::comphelper::OPropertyChangeMultiplexer(m_pDataSourcePropListener, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > (IFACECAST(*m_pDataCursor), ::com::sun::star::uno::UNO_QUERY));
+        m_pDataSourcePropMultiplexer = new ::comphelper::OPropertyChangeMultiplexer(m_pDataSourcePropListener, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > (*m_pDataCursor, ::com::sun::star::uno::UNO_QUERY));
         m_pDataSourcePropMultiplexer->acquire();
         m_pDataSourcePropMultiplexer->addProperty(FM_PROP_ISMODIFIED);
         m_pDataSourcePropMultiplexer->addProperty(FM_PROP_ISNEW);
@@ -1569,7 +1565,7 @@ void DbGridControl::setDataSource(const ::com::sun::star::uno::Reference< ::com:
 
         if (m_pSeekCursor)
         {
-            ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  xSet(IFACECAST(*m_pDataCursor), ::com::sun::star::uno::UNO_QUERY);
+            ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  xSet(*m_pDataCursor, ::com::sun::star::uno::UNO_QUERY);
             xSet->getPropertyValue(FM_PROP_ROWCOUNT) >>= nRecordCount;
             m_bRecordCountFinal = ::comphelper::getBOOL(xSet->getPropertyValue(FM_PROP_ROWCOUNTFINAL));
 
@@ -1622,7 +1618,7 @@ void DbGridControl::setDataSource(const ::com::sun::star::uno::Reference< ::com:
 
     // start listening on the seek cursor
     if (m_pSeekCursor)
-        m_pCursorDisposeListener = new DisposeListenerGridBridge(*this, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > (IFACECAST(*m_pSeekCursor), ::com::sun::star::uno::UNO_QUERY), 0);
+        m_pCursorDisposeListener = new DisposeListenerGridBridge(*this, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > (*m_pSeekCursor, ::com::sun::star::uno::UNO_QUERY), 0);
 }
 
 //------------------------------------------------------------------------------
@@ -1831,7 +1827,7 @@ void DbGridControl::RecalcRows(long nNewTopRow, sal_uInt16 nLinesOnScreen, sal_B
         EnablePaint(sal_False);
 
     // Cache an den sichtbaren Bereich anpassen
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  xSet(IFACECAST(*m_pSeekCursor), ::com::sun::star::uno::UNO_QUERY);
+    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  xSet(*m_pSeekCursor, ::com::sun::star::uno::UNO_QUERY);
     sal_Int32 nCacheSize;
     xSet->getPropertyValue(FM_PROP_FETCHSIZE) >>= nCacheSize;
     sal_Bool bCacheAligned   = sal_False;
@@ -1919,7 +1915,7 @@ void DbGridControl::AdjustRows()
     if (!m_pSeekCursor)
         return;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  xSet(IFACECAST(*m_pDataCursor), ::com::sun::star::uno::UNO_QUERY);
+    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  xSet(*m_pDataCursor, ::com::sun::star::uno::UNO_QUERY);
 
     // Aktualisieren des RecordCounts
     sal_Int32 nRecordCount;
@@ -2055,10 +2051,10 @@ sal_Bool DbGridControl::SetCurrent(long nNewRow, sal_Bool bForceInsertIfNewRow)
                     // to we need to move the cursor to the insert row?
                     // we need to insert the if the current row isn't the insert row or if the
                     // cursor triggered the move by itselt and we need a reinitialization of the row
-                    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xCursorProps(IFACECAST(*m_pDataCursor), ::com::sun::star::uno::UNO_QUERY);
+                    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xCursorProps(*m_pDataCursor, ::com::sun::star::uno::UNO_QUERY);
                     if (bForceInsertIfNewRow || !::comphelper::getBOOL(xCursorProps->getPropertyValue(FM_PROP_ISNEW)))
                     {
-                        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate >  xUpdateCursor(IFACECAST(*m_pDataCursor), ::com::sun::star::uno::UNO_QUERY);
+                        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate >  xUpdateCursor(*m_pDataCursor, ::com::sun::star::uno::UNO_QUERY);
                         xUpdateCursor->moveToInsertRow();
                     }
                     bNewRowInserted = sal_True;
@@ -2205,7 +2201,7 @@ void DbGridControl::AdjustDataSource(sal_Bool bFull)
     // may not be correct
     else if (m_xCurrentRow.Is() && !m_xCurrentRow->IsNew() &&
         CompareBookmark(m_xCurrentRow->GetBookmark(), m_pDataCursor->getBookmark()) &&
-        !::comphelper::getBOOL(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > (IFACECAST(*m_pDataCursor), ::com::sun::star::uno::UNO_QUERY)->getPropertyValue(FM_PROP_ISNEW)))
+        !::comphelper::getBOOL(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > (*m_pDataCursor, ::com::sun::star::uno::UNO_QUERY)->getPropertyValue(FM_PROP_ISNEW)))
     {
         // Position ist ein und dieselbe
         // Status uebernehmen, neuzeichnen fertig
@@ -2261,7 +2257,7 @@ sal_Int32 DbGridControl::AlignSeekCursor()
     if (!m_pSeekCursor)
         return -1;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  xSet(IFACECAST(*m_pDataCursor), ::com::sun::star::uno::UNO_QUERY);
+    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  xSet(*m_pDataCursor, ::com::sun::star::uno::UNO_QUERY);
 
     // jetzt den seekcursor an den DatenCursor angleichen
     if (::comphelper::getBOOL(xSet->getPropertyValue(FM_PROP_ISNEW)))
@@ -3002,7 +2998,7 @@ void DbGridControl::Undo()
         try
         {
             // Editieren abbrechen
-            ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate >  xUpdateCursor(IFACECAST(*m_pDataCursor), ::com::sun::star::uno::UNO_QUERY);
+            ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate >  xUpdateCursor(*m_pDataCursor, ::com::sun::star::uno::UNO_QUERY);
             // no effects if we're not updating currently
             if (bAppending)
                 // just refresh the row
@@ -3048,7 +3044,7 @@ void DbGridControl::resetCurrentRow()
         // would never delete the obsolet "second insert row". Thus in this special case this method here
         // is the only possibility to determine the redundance of the row (resetCurrentRow is called when the
         // "first insert row" is about to be cleaned, so of course the "second insert row" is redundant now)
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  xDataSource(IFACECAST(*getDataSource()), ::com::sun::star::uno::UNO_QUERY);
+        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  xDataSource(*getDataSource(), ::com::sun::star::uno::UNO_QUERY);
         if (xDataSource.is() && !::comphelper::getBOOL(xDataSource->getPropertyValue(FM_PROP_ISMODIFIED)))
         {
             // are we on a new row currently ?
@@ -3157,7 +3153,7 @@ sal_Bool DbGridControl::SaveRow()
     sal_Bool bSuccess = sal_False;
     try
     {
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate >  xUpdateCursor(IFACECAST(*m_pDataCursor), ::com::sun::star::uno::UNO_QUERY);
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate >  xUpdateCursor(*m_pDataCursor, ::com::sun::star::uno::UNO_QUERY);
         if (bAppending)
             xUpdateCursor->insertRow();
         else
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index dfb4c96a1430..ec997ebe9837 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: filtnav.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:01:19 $
+ *  last change: $Author: oj $ $Date: 2000-11-03 14:54:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -127,6 +127,9 @@
 #ifndef _SVX_FMTOOLS_HXX
 #include <fmtools.hxx>
 #endif // _SVX_FMTOOLS_HXX
+#ifndef _CONNECTIVITY_SQLPARSE_HXX
+#include <connectivity/sqlparse.hxx>
+#endif
 
 class FmFormShell;
 class FmFilterItem;
@@ -139,13 +142,17 @@ class FmFilterAdapter;
 //========================================================================
 class FmFilterData
 {
-    FmParentData* m_pParent;
-    ::rtl::OUString       m_aText;
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB;
+    FmParentData*           m_pParent;
+    ::rtl::OUString         m_aText;
 
 public:
     TYPEINFO();
-    FmFilterData(FmParentData* pParent = NULL, const ::rtl::OUString& rText = ::rtl::OUString())
-        :m_pParent(pParent), m_aText(rText){}
+    FmFilterData(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmParentData* pParent = NULL, const ::rtl::OUString& rText = ::rtl::OUString())
+        :m_pParent(pParent)
+        ,m_aText(rText)
+        ,m_xORB()
+    {}
     virtual ~FmFilterData(){}
 
     void    SetText( const ::rtl::OUString& rText ){ m_aText = rText; }
@@ -160,9 +167,12 @@ class FmParentData : public FmFilterData
 protected:
     vector<FmFilterData*> m_aChilds;
 
+
 public:
     TYPEINFO();
-    FmParentData(FmParentData* pParent, const ::rtl::OUString& rText):FmFilterData(pParent, rText){}
+    FmParentData(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmParentData* pParent, const ::rtl::OUString& rText)
+        : FmFilterData(_rxFactory,pParent, rText)
+    {}
     virtual ~FmParentData();
 
     vector<FmFilterData*>& GetChilds() {return m_aChilds;}
@@ -177,10 +187,10 @@ class FmFormItem : public FmParentData
 
 public:
     TYPEINFO();
-    FmFormItem():FmParentData(NULL, ::rtl::OUString()){}
-    FmFormItem(FmParentData* _pParent,
+    FmFormItem(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory):FmParentData(_rxFactory,NULL, ::rtl::OUString()){}
+    FmFormItem(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmParentData* _pParent,
                  const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > & _xController,
-                 const ::rtl::OUString& _rText):FmParentData(_pParent, _rText)
+                 const ::rtl::OUString& _rText):FmParentData(_rxFactory,_pParent, _rText)
                                      ,m_xController(_xController)
                                      ,m_nCurrent(0){}
 
@@ -195,8 +205,8 @@ class FmFilterItems : public FmParentData
 {
 public:
     TYPEINFO();
-    FmFilterItems():FmParentData(NULL, ::rtl::OUString()){}
-    FmFilterItems(FmFormItem* pParent, const ::rtl::OUString& rText ):FmParentData(pParent, rText){}
+    FmFilterItems(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory):FmParentData(_rxFactory,NULL, ::rtl::OUString()){}
+    FmFilterItems(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmFormItem* pParent, const ::rtl::OUString& rText ):FmParentData(_rxFactory,pParent, rText){}
 
     FmFilterItem* Find(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent > & xText) const;
     virtual Image GetImage() const;
@@ -210,7 +220,8 @@ class FmFilterItem : public FmFilterData
 
 public:
     TYPEINFO();
-    FmFilterItem(FmFilterItems* pParent,
+    FmFilterItem(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,
+                FmFilterItems* pParent,
               const ::rtl::OUString& aFieldName,
               const ::rtl::OUString& aCondition,
               const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent > & xText);
@@ -227,14 +238,16 @@ class FmFilterModel : public FmParentData
 {
     friend class FmFilterAdapter;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >           m_xControllers;
+    connectivity::OSQLParser    m_aParser;
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >       m_xControllers;
     ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController >         m_xController;
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    m_xORB;
     FmFilterAdapter*        m_pAdapter;
     FmFilterItems*          m_pCurrentItems;
 
 public:
     TYPEINFO();
-    FmFilterModel();
+    FmFilterModel(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory);
     virtual ~FmFilterModel();
 
     void Update(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & xControllers, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > & xCurrent);
@@ -246,6 +259,7 @@ public:
     FmFormItem* GetCurrentForm() const {return m_pCurrentItems ? (FmFormItem*)m_pCurrentItems->GetParent() : NULL;}
     FmFilterItems* GetCurrentItems() const {return m_pCurrentItems;}
     void SetCurrentItems(FmFilterItems* pCurrent);
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const { return m_xORB; }
 
     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & GetControllers() const {return m_xControllers;}
     const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > & GetCurrentController() const {return m_xController;}
diff --git a/svx/source/inc/fmctrler.hxx b/svx/source/inc/fmctrler.hxx
index ec72e22d80a8..bab45d556d37 100644
--- a/svx/source/inc/fmctrler.hxx
+++ b/svx/source/inc/fmctrler.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmctrler.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-20 14:12:06 $
+ *  last change: $Author: oj $ $Date: 2000-11-03 14:54:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -167,6 +167,9 @@
 #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #endif
+#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#endif
 #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
 #include <com/sun/star/beans/XPropertySet.hpp>
 #endif
@@ -221,8 +224,14 @@
 #include "fmtools.hxx"
 #endif
 
-#ifndef _CPPUHELPER_IMPLBASE2_HXX_
-#include <cppuhelper/implbase2.hxx>
+#ifndef _CPPUHELPER_IMPLBASE1_HXX_
+#include <cppuhelper/implbase1.hxx>
+#endif
+#ifndef _CPPUHELPER_IMPLBASE12_HXX_
+#include <cppuhelper/implbase12.hxx>
+#endif
+#ifndef _CPPUHELPER_COMPBASE12_HXX_
+#include <cppuhelper/compbase12.hxx>
 #endif
 #ifndef _CPPUHELPER_PROPSHLP_HXX
 #include <cppuhelper/propshlp.hxx>
@@ -236,6 +245,12 @@
 #ifndef _TOOLS_DEBUG_HXX
 #include <tools/debug.hxx>
 #endif
+#ifndef _CONNECTIVITY_SQLPARSE_HXX
+#include <connectivity/sqlparse.hxx>
+#endif
+#ifndef _COMPHELPER_BROADCASTHELPER_HXX_
+#include <comphelper/broadcasthelper.hxx>
+#endif
 
 struct FmXTextComponentLess : public binary_function< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent> , sal_Bool>
 {
@@ -255,73 +270,77 @@ class FmXFormController;
 class FmFormView;
 class Window;
 
+typedef ::cppu::WeakAggComponentImplHelper12<   ::com::sun::star::form::XFormController
+                                            ,::com::sun::star::container::XChild
+                                            ,::com::sun::star::container::XIndexAccess      //  access of child contoller
+                                            ,::com::sun::star::container::XEnumerationAccess
+                                            ,::com::sun::star::awt::XFocusListener
+                                            ,::com::sun::star::form::XLoadListener
+                                            ,::com::sun::star::beans::XPropertyChangeListener
+                                            ,::com::sun::star::awt::XTextListener
+                                            ,::com::sun::star::awt::XItemListener
+                                            ,::com::sun::star::container::XContainerListener
+                                            ,::com::sun::star::util::XModifyListener
+                                            ,::com::sun::star::util::XModifyBroadcaster> FmXFormController_BASE1;
+
+typedef ::cppu::ImplHelper12<               ::com::sun::star::util::XModeSelector
+                                            ,::com::sun::star::form::XConfirmDeleteListener
+                                            ,::com::sun::star::form::XConfirmDeleteBroadcaster
+                                            ,::com::sun::star::sdb::XSQLErrorListener
+                                            ,::com::sun::star::sdb::XSQLErrorBroadcaster
+                                            ,::com::sun::star::sdbc::XRowSetListener
+                                            ,::com::sun::star::sdb::XRowSetApproveListener
+                                            ,::com::sun::star::sdb::XRowSetApproveBroadcaster
+                                            ,::com::sun::star::form::XDatabaseParameterListener
+                                            ,::com::sun::star::form::XDatabaseParameterBroadcaster
+                                            ,::com::sun::star::lang::XServiceInfo
+                                            ,::com::sun::star::form::XResetListener> FmXFormController_BASE2;
+typedef ::cppu::ImplHelper1<                ::com::sun::star::lang::XUnoTunnel> FmXFormController_BASE3;
+
 //==================================================================
 // FmXFormController
 //==================================================================
-class FmXFormController     :public ::cppu::OComponentHelper
+class FmXFormController     : public ::comphelper::OBaseMutex
+                            ,public FmXFormController_BASE1
+                            ,public FmXFormController_BASE2
+                            ,public FmXFormController_BASE3
                             ,public ::cppu::OPropertySetHelper
-                            ,public ::com::sun::star::form::XFormController
-                            ,public ::com::sun::star::container::XChild
-                            ,public ::com::sun::star::container::XIndexAccess               // zugriff auf child contoller
-                            ,public ::com::sun::star::container::XEnumerationAccess
-                            ,public ::com::sun::star::awt::XFocusListener
-                            ,public ::com::sun::star::form::XLoadListener
-                            ,public ::com::sun::star::beans::XPropertyChangeListener
-                            ,public ::com::sun::star::awt::XTextListener
-                            ,public ::com::sun::star::awt::XItemListener
-                            ,public ::com::sun::star::container::XContainerListener
-                            ,public ::com::sun::star::util::XModifyListener
-                            ,public ::com::sun::star::util::XModifyBroadcaster
-                            ,public ::com::sun::star::util::XModeSelector
-                            ,public ::com::sun::star::form::XConfirmDeleteListener
-                            ,public ::com::sun::star::form::XConfirmDeleteBroadcaster
-                            ,public ::com::sun::star::sdb::XSQLErrorListener
-                            ,public ::com::sun::star::sdb::XSQLErrorBroadcaster
-                            ,public ::com::sun::star::sdbc::XRowSetListener
-                            ,public ::com::sun::star::sdb::XRowSetApproveListener
-                            ,public ::com::sun::star::sdb::XRowSetApproveBroadcaster
-                            ,public ::com::sun::star::form::XDatabaseParameterListener
-                            ,public ::com::sun::star::form::XDatabaseParameterBroadcaster
-                            ,public ::com::sun::star::lang::XServiceInfo
-                            ,public ::com::sun::star::form::XResetListener
-                            ,public ::com::sun::star::lang::XUnoTunnel
                             ,public FmDispatchInterceptor
                             ,public ::comphelper::OAggregationArrayUsageHelper< FmXFormController>
 {
     friend class FmXPageViewWinRec;
 
-    //  friend Reflection* FmXFormController_getReflection();
-
-    ::osl::Mutex    m_aMutex;
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation>          m_xAggregate;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController>        m_xTabController, m_xNavigationController;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>              m_xActiveControl, m_xCurrentControl;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>            m_xModelAsIndex;
-    ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacherManager> m_xModelAsManager;
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>            m_xParent;
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation>              m_xAggregate;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController>            m_xTabController, m_xNavigationController;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>                  m_xActiveControl, m_xCurrentControl;
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>        m_xModelAsIndex;
+    ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacherManager>  m_xModelAsManager;
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>                m_xParent;
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    m_xORB;
     // Composer used for checking filter conditions
     ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLQueryComposer> m_xComposer;
 
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> >   m_aControls;
     ::cppu::OInterfaceContainerHelper
-                            m_aActivateListeners,
-                            m_aModifyListeners,
-                            m_aErrorListeners,
-                            m_aDeleteListeners,
-                            m_aRowSetApproveListeners,
-                            m_aParameterListeners;
-
-    FmFormControllers       m_aChilds;
-    FmFilterControls        m_aFilterControls;
-    FmFilterRows            m_aFilters;
+                                m_aActivateListeners,
+                                m_aModifyListeners,
+                                m_aErrorListeners,
+                                m_aDeleteListeners,
+                                m_aRowSetApproveListeners,
+                                m_aParameterListeners;
+
+    FmFormControllers           m_aChilds;
+    FmFilterControls            m_aFilterControls;
+    FmFilterRows                m_aFilters;
     ::form::OImplementationIdsRef   m_aHoldImplIdHelper;
 
-    Timer                   m_aInsertTimer;
+    Timer                       m_aInsertTimer;
+    connectivity::OSQLParser    m_aParser;
 
-    FmFormView*             m_pView;
-    Window*                 m_pWindow;
+    FmFormView*                 m_pView;
+    Window*                     m_pWindow;
 
-    ::rtl::OUString                 m_aMode;
+    ::rtl::OUString             m_aMode;
 
     sal_uInt32                  m_nLoadEvent;
     sal_uInt32                  m_nUpdateDispatcherEvent;
@@ -350,15 +369,16 @@ class FmXFormController     :public ::cppu::OComponentHelper
     Interceptors    m_aControlDispatchInterceptors;
 
 public:
-    FmXFormController(FmFormView* _pView = NULL, Window* _pWindow = NULL, const UniString& _sDispatchPrefix = UniString());
+    FmXFormController(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _rxORB,
+                      FmFormView* _pView = NULL, Window* _pWindow = NULL, const UniString& _sDispatchPrefix = UniString());
     ~FmXFormController();
 
     // UNO Anbindung
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException )
-            { return OComponentHelper::queryInterface( type ); }
+            { return FmXFormController_BASE1::queryInterface( type ); }
     virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL acquire() { OComponentHelper::acquire(); }
-    virtual void SAL_CALL release() { OComponentHelper::release(); }
+    virtual void SAL_CALL acquire();
+    virtual void SAL_CALL release();
 
 // XTypeProvider
     virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException)
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 4cdc0cb9ff97..a0f65adad01a 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmexpl.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:01:19 $
+ *  last change: $Author: oj $ $Date: 2000-11-03 14:54:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -458,6 +458,7 @@ class FmExplorer : public SvTreeListBox, public SfxListener
     // die Images, die ich brauche (und an FormDatas und EntryDatas weiterreiche)
     ImageList           m_ilNavigatorImages;
 
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    m_xORB;
     FmExplorerModel*    m_pExplModel;
     SvLBoxEntry*        m_pRootEntry;
     SvLBoxEntry*        m_pEditEntry;
@@ -536,7 +537,7 @@ protected:
     virtual void Command( const CommandEvent& rEvt );
 
 public:
-    FmExplorer( Window* pParent );
+    FmExplorer(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&  _xORB, Window* pParent );
     virtual ~FmExplorer();
 
     void Clear();
diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx
index 23a6ff29014b..ea218468377f 100644
--- a/svx/source/inc/fmservs.hxx
+++ b/svx/source/inc/fmservs.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmservs.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-31 09:29:59 $
+ *  last change: $Author: oj $ $Date: 2000-11-03 14:54:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -166,11 +166,10 @@ DECLARE_CONSTASCII_USTRING(SRV_SDB_CONNECTION);
 DECLARE_CONSTASCII_USTRING(SRV_SDBC_STATEMENT);
 DECLARE_CONSTASCII_USTRING(SRV_SDB_DATABASE_ENVIRONMENT);
 DECLARE_CONSTASCII_USTRING(SRV_SDB_DATABASE_ACCESS_CONNECTION);
-DECLARE_CONSTASCII_USTRING(SRV_SDB_DATABASE_ACCESS_CONTEXT);
+DECLARE_CONSTASCII_USTRING(SRV_SDB_DATABASE_CONTEXT);
 DECLARE_CONSTASCII_USTRING(SRV_SDB_INTERACTION_HANDLER);
 
 
-
 DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_FORM);
 DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_TEXTFIELD);
 DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_LISTBOX);
diff --git a/svx/source/inc/fmtools.hxx b/svx/source/inc/fmtools.hxx
index 5868d0c26b60..b1f3aafbcae8 100644
--- a/svx/source/inc/fmtools.hxx
+++ b/svx/source/inc/fmtools.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmtools.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-31 11:57:54 $
+ *  last change: $Author: oj $ $Date: 2000-11-03 14:54:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -242,11 +242,6 @@
 #endif
 
 
-class SdbSqlParser;
-
-// one SQLParser for the form layer
-SdbSqlParser& getSQLParser();
-
 //==================================================================
 // allgemeine Typen
 //==================================================================
@@ -318,7 +313,6 @@ double ToNullDate(const Date& rNullDate, double rVal);
 class CursorWrapper
 {
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>                m_xGeneric;
     ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>               m_xMoveOperations;
     ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XRowLocate>              m_xBookmarkOperations;
     ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier>        m_xColumnsSupplier;
@@ -340,7 +334,8 @@ public:
     sal_Bool Is() const { return m_xMoveOperations.is(); }
 
     CursorWrapper* operator ->() { return this; }
-    operator const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& () const{ return m_xGeneric; }
+    operator ::com::sun::star::uno::XInterface* () const { return (::com::sun::star::uno::XInterface *)m_xMoveOperations.get(); }
+    operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> () const{ return (::com::sun::star::uno::XInterface *)m_xMoveOperations.get(); }
 
     // 'Konvertierungen'
     const CursorWrapper& operator=(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& xCursor);
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index bafc9b398165..0d6c26a46d02 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmvwimp.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-24 15:21:21 $
+ *  last change: $Author: oj $ $Date: 2000-11-03 14:54:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,6 +84,9 @@
 #ifndef _COM_SUN_STAR_CONTAINER_CONTAINEREVENT_HPP_
 #include <com/sun/star/container/ContainerEvent.hpp>
 #endif
+#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#endif
 
 #ifndef _LINK_HXX //autogen
 #include <tools/link.hxx>
@@ -117,17 +120,16 @@ class FmXPageViewWinRec : public ::cppu::WeakImplHelper1< ::com::sun::star::cont
     friend class FmXFormView;
 
     ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > >    m_aControllerList;
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >                m_xORB;
     FmXFormView*                m_pViewImpl;
     Window*                     m_pWindow;
 
 public:
-    FmXPageViewWinRec(const SdrPageViewWinRec*, FmXFormView* pView);
+    FmXPageViewWinRec(  const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB,
+                        const SdrPageViewWinRec*, FmXFormView* pView);
     ~FmXPageViewWinRec();
 
 // UNO Anbindung
-    //  DECLARE_UNO3_AGG_DEFAULTS(FmXPageViewWinRec, WeakImplHelper1< ::com::sun::star::container::XIndexAccess> );
-    //  virtual sal_Bool queryInterface( ::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rOut );
-    //  virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > >  getIdlClasses();
 
 // ::com::sun::star::container::XElementAccess
     virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException);
@@ -174,32 +176,29 @@ class FmXFormView : public ::cppu::WeakImplHelper2<
     SdrPageView*    m_pPageViewForActivation;
     sal_uInt32      m_nEvent;
     sal_uInt32      m_nErrorMessageEvent;
-    sal_uInt32      m_nAutoFocusEvent;
 
     String          m_sErrorMessage;
 
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB;
+
     void AttachControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& rControl, sal_Bool bDetach );
     void AttachControls( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >&, sal_Bool bDetach );
 
     FmFormShell* GetFormShell() const;
 
 protected:
-    FmXFormView(FmFormView* _pView)
+    FmXFormView(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB,
+                FmFormView* _pView)
         :m_pView(_pView)
         ,m_pPageViewForActivation(NULL)
         ,m_nEvent(0)
         ,m_nErrorMessageEvent(0)
-        ,m_nAutoFocusEvent(0)
+        ,m_xORB(_xORB)
     { }
     ~FmXFormView();
 
 public:
     // UNO Anbindung
-    //  DECLARE_UNO3_AGG_DEFAULTS(FmXFormView, WeakImplHelper2<
-                            //  ::com::sun::star::form::XFormControllerListener,
-                            //  ::com::sun::star::container::XContainerListener>);
-    //  virtual sal_Bool queryInterface( ::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rOut );
-    //  virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > >  getIdlClasses();
 
 // ::com::sun::star::lang::XEventListener
     virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException);
@@ -224,11 +223,7 @@ protected:
     void Activate(SdrPageView* pPageView, sal_Bool bSync = sal_False);
     void Deactivate(SdrPageView* pPageView, BOOL bDeactivateController = TRUE);
 
-    /// the the auto focus to the first (in terms of the tab order) control
-    void AutoFocus();
-
     DECL_LINK(OnActivate, void* );
-    DECL_LINK(OnAutoFocus, void* );
     DECL_LINK(OnDelayedErrorMessage, void*);
 };
 
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 7b79bcaa565f..69ca5aa3f654 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: gridcell.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-20 14:12:06 $
+ *  last change: $Author: oj $ $Date: 2000-11-03 14:54:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -108,6 +108,9 @@
 #ifndef _COMPHELPER_PROPERTY_MULTIPLEX_HXX_
 #include <comphelper/propmultiplex.hxx>
 #endif
+#ifndef _CONNECTIVITY_SQLPARSE_HXX
+#include <connectivity/sqlparse.hxx>
+#endif
 
 class DbCellControl;
 class Edit;
@@ -464,6 +467,7 @@ public:
 class DbFilterField : public DbCellControl
 {
     ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aValueList;
+    connectivity::OSQLParser    m_aParser;
     XubString   m_aText;
     Link    m_aCommitLink;
     sal_Int16   m_nControlClass;
@@ -472,7 +476,7 @@ class DbFilterField : public DbCellControl
     sal_Bool    m_bBound : 1;
 
 public:
-    DbFilterField(DbGridColumn& _rColumn);
+    DbFilterField(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,DbGridColumn& _rColumn);
     virtual ~DbFilterField();
 
     virtual void Init(Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor);