#98361# F6-handling

9 files changed, 247 insertions, 163 deletions

diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index 509edbe64854..7a93996b660b 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: bibbeam.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: gt $ $Date: 2002-04-24 11:54:28 $
+ *  last change: $Author: gt $ $Date: 2002-04-25 09:27:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -109,6 +109,9 @@
 #ifndef _BIB_DATMAN_HXX
 #include "datman.hxx"
 #endif
+#ifndef BIBTOOLS_HXX
+#include "bibtools.hxx"
+#endif
 
 using namespace rtl;
 using namespace ::com::sun::star;
@@ -128,11 +131,31 @@ namespace bib
 
     using namespace ::com::sun::star::uno;
 
+    void HandleTaskPaneList( Window* pWindow, BOOL bAddToList )
+    {
+        Window*             pParent = pWindow->GetParent();
+
+        DBG_ASSERT( pParent, "-GetTaskPaneList(): everybody here should have a parent!" );
+
+        SystemWindow*       pSysWin = pParent->GetSystemWindow();
+        if( pSysWin )
+        {
+            TaskPaneList*   pTaskPaneList = pSysWin->GetTaskPaneList();
+            if( pTaskPaneList )
+            {
+                if( bAddToList )
+                    pTaskPaneList->AddWindow( pWindow );
+                else
+                    pTaskPaneList->RemoveWindow( pWindow );
+            }
+        }
+    }
+
     //=====================================================================
     //= BibGridwin
     //=====================================================================
     class BibGridwin
-                :public DockingWindow
+                :public Window //DockingWindow
     {
     private:
             Reference< awt::XWindow >           m_xGridWin;
@@ -159,15 +182,18 @@ namespace bib
     };
 
     //---------------------------------------------------------------------
-    BibGridwin::BibGridwin( Window* _pParent, WinBits _nStyle )
-        :DockingWindow( _pParent, _nStyle )
+    BibGridwin::BibGridwin( Window* _pParent, WinBits _nStyle ) : Window( _pParent, _nStyle )
     {
         m_xControlContainer = VCLUnoHelper::CreateControlContainer(this);
+
+        AddToTaskPaneList( this );
     }
 
     //---------------------------------------------------------------------
     BibGridwin::~BibGridwin()
     {
+        RemoveFromTaskPaneList( this );
+
         disposeGridWin();
     }
 
@@ -292,7 +318,6 @@ namespace bib
             BibGridwin* pDel = pGridWin;
             pGridWin = NULL;
             pDel->disposeGridWin();
-//          DELETEZ( pGridWin );
             delete pDel;
         }
 
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index fcae976542e1..4ec0da2e62af 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: bibcont.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: gt $ $Date: 2002-04-24 11:54:28 $
+ *  last change: $Author: gt $ $Date: 2002-04-25 09:27:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -99,15 +99,15 @@ using namespace ::rtl;
 #define PROPERTY_FRAME                      1
 
 
-BibWindowContainer::BibWindowContainer( Window* pParent,WinBits nStyle):
-        DockingWindow(pParent,nStyle),
-        pChild(NULL)
+BibWindowContainer::BibWindowContainer( Window* pParent, WinBits nStyle ) :
+        Window( pParent, nStyle ),
+        pChild( NULL )
 {
 }
 
-BibWindowContainer::BibWindowContainer( Window* pParent,Window* pWin, WinBits nStyle):
-        DockingWindow(pParent,nStyle),
-        pChild(pWin)
+BibWindowContainer::BibWindowContainer( Window* pParent,Window* pWin, WinBits nStyle ) :
+        Window( pParent, nStyle ),
+        pChild( pWin )
 {
     if(pChild!=NULL)
     {
@@ -165,21 +165,26 @@ BibBookContainer::BibBookContainer(Window* pParent,BibDataManager* pDtMn, WinBit
 
 BibBookContainer::~BibBookContainer()
 {
-    if ( xTopFrameRef.is() )
+    if( xTopFrameRef.is() )
         xTopFrameRef->dispose();
-    if ( xBottomFrameRef.is() )
+    if( xBottomFrameRef.is() )
         xBottomFrameRef->dispose();
 
     if( pTopWin )
     {
-        DockingWindow* pDel = pTopWin;
+        Window* pDel = pTopWin;
         pTopWin = NULL;         // prevents GetFocus for child while deleting!
         delete pDel;
     }
 
-    if(pBottomWin)
-        delete pBottomWin;
-    CloseBibModul(pBibMod);
+    if( pBottomWin )
+    {
+        Window* pDel = pBottomWin;
+        pBottomWin = NULL;      // prevents GetFocus for child while deleting!
+        delete pDel;
+    }
+
+    CloseBibModul( pBibMod );
 }
 
 void BibBookContainer::Split()
@@ -215,58 +220,41 @@ void BibBookContainer::SetBottomComponentInterface( awt::XWindowPeer* pIFace )
     pBottomWin->SetComponentInterface(pIFace);
 }
 
-/*VCLXWindow*   BibBookContainer::GetTopWindowPeer()
-{
-    return pTopWin->GetWindowPeer();
-}
-*//*void BibBookContainer::SetTopWindowPeer( VCLXWindow* pPeer )
-{
-    pTopWin->SetWindowPeer(pPeer );
-}
-*/
-/*VCLXWindow* BibBookContainer::GetBottomWindowPeer()
-{
-    return pBottomWin->GetWindowPeer();
-}
-*//*void BibBookContainer::SetBottomWindowPeer( VCLXWindow* pPeer )
-{
-    pBottomWin->SetWindowPeer(pPeer );
-}
-*/
-
 void BibBookContainer::CreateTopWin()
 {
-    if ( xTopFrameRef.is() ) xTopFrameRef->dispose();
+    if( xTopFrameRef.is() )
+        xTopFrameRef->dispose();
 
-    if(pTopWin)
+    if( pTopWin )
     {
-        RemoveItem(TOP_WINDOW);
+        RemoveItem( TOP_WINDOW );
         delete pTopWin;
     }
 
-    pTopWin= new DockingWindow(this,0);
+    pTopWin = new Window( this, 0 );
 
     BibConfig* pConfig = BibModul::GetConfig();
     long nSize = pConfig->getBeamerSize();
-    InsertItem(TOP_WINDOW, pTopWin, nSize, 0, 0, SWIB_PERCENTSIZE );
+    InsertItem( TOP_WINDOW, pTopWin, nSize, 0, 0, SWIB_PERCENTSIZE );
 
 }
 
 void BibBookContainer::CreateBottomWin()
 {
 
-    if ( xBottomFrameRef.is() ) xBottomFrameRef->dispose();
+    if( xBottomFrameRef.is() )
+        xBottomFrameRef->dispose();
 
-    if(pBottomWin)
+    if( pBottomWin )
     {
-        RemoveItem(BOTTOM_WINDOW);
+        RemoveItem( BOTTOM_WINDOW );
         delete pBottomWin;
     }
 
-    pBottomWin= new DockingWindow(this,0);
+    pBottomWin = new Window( this, 0 );
     BibConfig* pConfig = BibModul::GetConfig();
     long nSize = pConfig->getViewSize();
-    InsertItem(BOTTOM_WINDOW, pBottomWin, nSize, 1, 0, SWIB_PERCENTSIZE );
+    InsertItem( BOTTOM_WINDOW, pBottomWin, nSize, 1, 0, SWIB_PERCENTSIZE );
 
 }
 
@@ -391,6 +379,6 @@ void BibBookContainer::createBottomFrame(Window* pWin)
 
 void BibBookContainer::GetFocus()
 {
-    if( pTopWin )
-        pTopWin->GrabFocus();
+    if( pBottomWin )
+        pBottomWin->GrabFocus();
 }
diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx
index 8e3d05112ac0..d0400cac7cc8 100644
--- a/extensions/source/bibliography/bibcont.hxx
+++ b/extensions/source/bibliography/bibcont.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: bibcont.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: gt $ $Date: 2002-04-24 11:54:28 $
+ *  last change: $Author: gt $ $Date: 2002-04-25 09:27:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,7 +80,7 @@
 
 class BibDataManager;
 
-class BibWindowContainer: public DockingWindow
+class BibWindowContainer: public Window
 {
     private:
         Window*                 pChild;
@@ -103,15 +103,15 @@ class BibBookContainer: public SplitWindow
 {
     private:
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >                 xTopFrameRef;
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >                 xBottomFrameRef;
+        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >             xTopFrameRef;
+        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >             xBottomFrameRef;
 
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >              xTopPeerRef;
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >              xBottomPeerRef;
         sal_Bool                    bFirstTime;
 
-        DockingWindow*          pTopWin;
-        DockingWindow*          pBottomWin;
+        Window*                 pTopWin;
+        Window*                 pBottomWin;
         BibDataManager*         pDatMan;
         HdlBibModul             pBibMod;
         Timer                   aTimer;
@@ -135,9 +135,8 @@ class BibBookContainer: public SplitWindow
         BibBookContainer(Window* pParent,BibDataManager*, WinBits nStyle = WB_3DLOOK );
         ~BibBookContainer();
 
-        DockingWindow*          GetTopWin() {return pTopWin;}
-        DockingWindow*          GetBottomWin() {return pBottomWin;}
-
+        Window*                 GetTopWin() {return pTopWin;}
+        Window*                 GetBottomWin() {return pBottomWin;}
 
         void                    createTopFrame(const rtl::OUString & rURL );
 
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index eb61f1698877..06205d6844b1 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: bibload.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: fs $ $Date: 2001-10-22 07:31:41 $
+ *  last change: $Author: gt $ $Date: 2002-04-25 09:27:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -464,7 +464,6 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const rtl:
     {
         Reference< awt::XWindow >  aWindow = rFrame->getContainerWindow();
         VCLXWindow* pParentComponent = VCLXWindow::GetImplementation(aWindow);
-        pParentComponent->setVisible(sal_True);
 
         Window* pParent = VCLUnoHelper::GetWindow( aWindow );
 
@@ -490,6 +489,9 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const rtl:
         pBeamer->SetXController(xCtrRef);
         //!
 
+        // not earlier because SetFocus() is triggered in setVisible()
+        pParentComponent->setVisible(sal_True);
+
         m_xDatMan->load();
 
         if ( rListener.is() )
diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx
index d4f2f65bc699..e5e72a5ccb1f 100644
--- a/extensions/source/bibliography/bibview.cxx
+++ b/extensions/source/bibliography/bibview.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: bibview.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: fs $ $Date: 2001-10-23 11:19:09 $
+ *  last change: $Author: gt $ $Date: 2002-04-25 09:27:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -133,7 +133,10 @@ namespace bib
     // -----------------------------------------------------------------------
     BibView::~BibView()
     {
-        m_pGeneralPage->CommitActiveControl();
+        BibGeneralPage* pGeneralPage = m_pGeneralPage;
+        m_pGeneralPage = NULL;
+
+        pGeneralPage->CommitActiveControl();
         Reference< XForm > xForm = m_pDatMan->getForm();
         Reference< XPropertySet > xProps( xForm, UNO_QUERY );
         Reference< sdbc::XResultSetUpdate > xResUpd( xProps, UNO_QUERY );
@@ -158,8 +161,8 @@ namespace bib
         if ( isFormConnected() )
             disconnectForm();
 
-        m_pGeneralPage->RemoveListeners();
-        m_xGeneralPage = 0;
+        pGeneralPage->RemoveListeners();
+        m_xGeneralPage = NULL;
     }
 
     /* -----------------16.11.99 13:13-------------------
@@ -179,8 +182,13 @@ namespace bib
         }
 
         m_xGeneralPage = m_pGeneralPage = new BibGeneralPage( this, m_pDatMan );
+
         Resize();
 
+        if( HasFocus() )
+            // "delayed" GetFocus() because GetFocus() is initially called before GeneralPage is created
+            m_pGeneralPage->GrabFocus();
+
         String sErrorString( m_pGeneralPage->GetErrorString() );
         if ( sErrorString.Len() )
         {
@@ -240,6 +248,12 @@ namespace bib
         return xReturn;
     }
 
+    void BibView::GetFocus()
+    {
+        if( m_pGeneralPage )
+            m_pGeneralPage->GrabFocus();
+    }
+
 //.........................................................................
 }   // namespace bib
 //.........................................................................
diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx
index 6cd9c42745c5..dc7d4148d574 100644
--- a/extensions/source/bibliography/bibview.hxx
+++ b/extensions/source/bibliography/bibview.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: bibview.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: fs $ $Date: 2001-10-22 07:31:41 $
+ *  last change: $Author: gt $ $Date: 2002-04-25 09:27:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -91,9 +91,7 @@ namespace bib
 //.........................................................................
 
     // -----------------------------------------------------------------------
-    class BibView
-            :public Window
-            ,public FormControlContainer
+    class BibView : public Window, public FormControlContainer
     {
     private:
         BibDataManager*                                                             m_pDatMan;
@@ -106,21 +104,23 @@ namespace bib
 
     protected:
         // Window overridables
-            virtual void            Resize();
+            virtual void    Resize();
 
         // FormControlContainer
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >
-                    getControlContainer();
+                            getControlContainer();
 
         // XLoadListener equivalents
-            virtual void _loaded( const ::com::sun::star::lang::EventObject& _rEvent );
-            virtual void _reloaded( const ::com::sun::star::lang::EventObject& _rEvent );
+        virtual void        _loaded( const ::com::sun::star::lang::EventObject& _rEvent );
+        virtual void        _reloaded( const ::com::sun::star::lang::EventObject& _rEvent );
 
     public:
-            BibView( Window* _pParent, BibDataManager* _pDatMan, WinBits nStyle = WB_3DLOOK );
-            ~BibView();
+                            BibView( Window* _pParent, BibDataManager* _pDatMan, WinBits nStyle = WB_3DLOOK );
+                            ~BibView();
 
-            void    UpdatePages();
+        void                UpdatePages();
+
+        virtual void        GetFocus();
     };
 
 //.........................................................................
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index a63658efa7e0..bbe4a432f7c5 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: general.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: fs $ $Date: 2001-10-23 12:34:35 $
+ *  last change: $Author: gt $ $Date: 2002-04-25 09:27:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -114,6 +114,9 @@
 #ifndef BIBMOD_HXX
 #include "bibmod.hxx"
 #endif
+#ifndef BIBTOOLS_HXX
+#include "bibtools.hxx"
+#endif
 #ifndef __EXTENSIONS_INC_EXTENSIO_HRC__
 #include "extensio.hrc"
 #endif
@@ -854,6 +857,22 @@ void BibGeneralPage::disposing(const lang::EventObject& Source) throw( uno::Runt
 {
 }
 
+void BibGeneralPage::GetFocus()
+{
+    Reference< awt::XWindow >*  pxControl = aControls;
+
+    for( int i = FIELD_COUNT ; i ; --i, ++pxControl )
+    {
+        if( pxControl->is() )
+        {
+            ( *pxControl )->setFocus();
+            return;
+        }
+    }
+
+    // fallback
+    aControlParentWin.GrabFocus();
+}
 
 
 
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index 7bd8782a97f9..99f30ad26788 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: general.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: fs $ $Date: 2001-10-22 07:31:42 $
+ *  last change: $Author: gt $ $Date: 2002-04-25 09:27:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -116,115 +116,146 @@ class BibDataManager;
 #define TYPE_COUNT 22
 #define FIELD_COUNT 31
 
-typedef cppu::WeakAggImplHelper1
-<
-    ::com::sun::star::awt::XFocusListener
-> BibGeneralPageBaseClass;
+typedef cppu::WeakAggImplHelper1 < ::com::sun::star::awt::XFocusListener > BibGeneralPageBaseClass;
 
-class BibGeneralPage:
-                public BibGeneralPageBaseClass,
-                public TabPage
+class BibGeneralPage: public BibGeneralPageBaseClass, public TabPage
 {
-    Window          aControlParentWin;
-    FixedText       aIdentifierFT;
-    FixedText       aAuthTypeFT;
+    Window              aControlParentWin;
+    FixedText           aIdentifierFT;
+    FixedText           aAuthTypeFT;
 
-    FixedText       aAuthorFT;
-    FixedText       aMonthFT;
-    FixedText       aYearFT;
+    FixedText           aAuthorFT;
+    FixedText           aMonthFT;
+    FixedText           aYearFT;
 
-    FixedText       aPublisherFT;
-    FixedText       aISBNFT;
+    FixedText           aPublisherFT;
+    FixedText           aISBNFT;
 
-    FixedText       aAddressFT;
-    FixedText       aAnnoteFT;
-    FixedText       aBooktitleFT;
-    FixedText       aChapterFT;
-    FixedText       aEditionFT;
-    FixedText       aEditorFT;
-    FixedText       aHowpublishedFT;
-    FixedText       aInstitutionFT;
-    FixedText       aJournalFT;
-    FixedText       aNoteFT;
-    FixedText       aNumberFT;
-    FixedText       aOrganizationsFT;
-    FixedText       aPagesFT;
-    FixedText       aSchoolFT;
-    FixedText       aSeriesFT;
-    FixedText       aTitleFT;
-    FixedText       aReportTypeFT;
-    FixedText       aVolumeFT;
-    FixedText       aURLFT;
-    FixedText       aCustom1FT;
-    FixedText       aCustom2FT;
-    FixedText       aCustom3FT;
-    FixedText       aCustom4FT;
-    FixedText       aCustom5FT;
+    FixedText           aAddressFT;
+    FixedText           aAnnoteFT;
+    FixedText           aBooktitleFT;
+    FixedText           aChapterFT;
+    FixedText           aEditionFT;
+    FixedText           aEditorFT;
+    FixedText           aHowpublishedFT;
+    FixedText           aInstitutionFT;
+    FixedText           aJournalFT;
+    FixedText           aNoteFT;
+    FixedText           aNumberFT;
+    FixedText           aOrganizationsFT;
+    FixedText           aPagesFT;
+    FixedText           aSchoolFT;
+    FixedText           aSeriesFT;
+    FixedText           aTitleFT;
+    FixedText           aReportTypeFT;
+    FixedText           aVolumeFT;
+    FixedText           aURLFT;
+    FixedText           aCustom1FT;
+    FixedText           aCustom2FT;
+    FixedText           aCustom3FT;
+    FixedText           aCustom4FT;
+    FixedText           aCustom5FT;
 
-    ScrollBar       aHoriScroll;
-    ScrollBar       aVertScroll;
+    ScrollBar           aHoriScroll;
+    ScrollBar           aVertScroll;
 
-    FixedText*      aFixedTexts[FIELD_COUNT];
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>       aControls[FIELD_COUNT];
+    FixedText*          aFixedTexts[ FIELD_COUNT ];
 
-    Size            aStdSize;
-    Point           aBasePos;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >
+                        aControls[ FIELD_COUNT ];
 
-    String          aBibTypeArr[TYPE_COUNT];
-    String          sErrorPrefix;
-    String          sTableErrorString;
+    Size                aStdSize;
+    Point               aBasePos;
 
-    String          sTypeColumnName;
+    String              aBibTypeArr[ TYPE_COUNT ];
+    String              sErrorPrefix;
+    String              sTableErrorString;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >    xCtrlContnr;
-    ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController >         xFormCtrl;
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >  xMgr;
+    String              sTypeColumnName;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::form::XBoundComponent >         xCurrentBoundComponent;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >
+                        xCtrlContnr;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::form::XBoundComponent >         xLBModel;
+    ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController >
+                        xFormCtrl;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSetListener >         xPosListener;
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
+                        xMgr;
 
+    ::com::sun::star::uno::Reference< ::com::sun::star::form::XBoundComponent >
+                        xCurrentBoundComponent;
 
-    BibDataManager*         pDatMan;
+    ::com::sun::star::uno::Reference< ::com::sun::star::form::XBoundComponent >
+                        xLBModel;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >        AddXControl(const String& rName, Point aPos, Size aSize, sal_uInt16 nHelpId);
+    ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSetListener >
+                        xPosListener;
 
-    void                    AddControlWithError(const rtl::OUString& rColumnName,
-                                    const Point& rPos,  const Size& rSize, String& rErrorString,
-                                    String aColumnUIName, sal_uInt16 nHelpId);
 
-    void                    AdjustScrollbars();
-    DECL_LINK(ScrollHdl, ScrollBar*);
+    BibDataManager*     pDatMan;
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >
+                                AddXControl( const String& rName, Point aPos, Size aSize, sal_uInt16 nHelpId );
+
+    void                        AddControlWithError( const rtl::OUString& rColumnName,
+                                        const Point& rPos,  const Size& rSize, String& rErrorString,
+                                        String aColumnUIName, sal_uInt16 nHelpId );
+
+    void                        AdjustScrollbars();
+
+    DECL_LINK( ScrollHdl, ScrollBar* );
 
 protected:
-    virtual void        Resize();
+    virtual void                Resize();
 
 public:
-        BibGeneralPage(Window* pParent, BibDataManager* pDatMan);
-        virtual ~BibGeneralPage();
+                                BibGeneralPage(Window* pParent, BibDataManager* pDatMan);
+        virtual                 ~BibGeneralPage();
 
-        const String& GetErrorString() const {return sTableErrorString;}
+        inline const String&    GetErrorString() const;
 
-        const ::com::sun::star::uno::Reference< ::com::sun::star::form::XBoundComponent >&
-                                GetTypeListBoxModel() const { return xLBModel; }
-        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >&
-                                GetControlContainer() const { return xCtrlContnr; }
+        inline const ::com::sun::star::uno::Reference< ::com::sun::star::form::XBoundComponent >&
+                                GetTypeListBoxModel() const;
+        inline const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >&
+                                GetControlContainer() const;
 
-        BibDataManager*         GetDataManager() {return pDatMan;}
+        inline BibDataManager*  GetDataManager();
 
         void                    CommitActiveControl();
 
-        virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL   disposing( const ::com::sun::star::lang::EventObject& Source ) throw( com::sun::star::uno::RuntimeException );
 
-        void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& e) throw( com::sun::star::uno::RuntimeException );
-        void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& e) throw( com::sun::star::uno::RuntimeException );
+        void SAL_CALL           focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw( com::sun::star::uno::RuntimeException );
+        void SAL_CALL           focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw( com::sun::star::uno::RuntimeException );
 
-        void RemoveListeners();
+        void                    RemoveListeners();
+
+        virtual void            GetFocus();
 };
 
 
+inline const String& BibGeneralPage::GetErrorString() const
+{
+    return sTableErrorString;
+}
+
+inline const ::com::sun::star::uno::Reference< ::com::sun::star::form::XBoundComponent >&
+    BibGeneralPage::GetTypeListBoxModel() const
+{
+    return xLBModel;
+}
+
+inline const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >&
+    BibGeneralPage::GetControlContainer() const
+{
+    return xCtrlContnr;
+}
+
+inline BibDataManager* BibGeneralPage::GetDataManager()
+{
+    return pDatMan;
+}
+
 #endif
 
 
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 00461e41ded7..485653e5e4f1 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: toolbar.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: fs $ $Date: 2001-10-22 07:31:42 $
+ *  last change: $Author: gt $ $Date: 2002-04-25 09:27:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -88,6 +88,10 @@
 #include "toolbar.hrc"
 #include "bibresid.hxx"
 
+#ifndef BIBTOOLS_HXX
+#include "bibtools.hxx"
+#endif
+
 using namespace ::rtl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -292,12 +296,14 @@ BibToolBar::BibToolBar(Window* pParent, WinBits nStyle):
     SetItemWindow(TBC_FT_QUERY ,&aFtQuery);
     SetItemWindow(TBC_ED_QUERY ,&aEdQuery);
 
-
+    ::bib::AddToTaskPaneList( this );
 }
 
 BibToolBar::~BibToolBar()
 {
+    ::bib::RemoveFromTaskPaneList( this );
 }
+
 void BibToolBar::InitListener()
 {
     sal_uInt16  nCount=GetItemCount();