need of MultiServiceFactory

7 files changed, 137 insertions, 109 deletions

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);