Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts:
	automation/source/communi/communi.cxx
	automation/source/server/recorder.cxx
	automation/source/server/server.cxx
	basctl/source/basicide/basobj2.cxx

21 files changed, 125 insertions, 162 deletions

diff --git a/extensions/source/bibliography/bib.component b/extensions/source/bibliography/bib.component
new file mode 100644
index 000000000..98627854d
--- /dev/null
+++ b/extensions/source/bibliography/bib.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.extensions.Bibliography">
+    <service name="com.sun.star.frame.Bibliography"/>
+    <service name="com.sun.star.frame.FrameLoader"/>
+  </implementation>
+</component>
diff --git a/extensions/source/bibliography/bib.hrc b/extensions/source/bibliography/bib.hrc
index 09b98992c..01715258d 100644
--- a/extensions/source/bibliography/bib.hrc
+++ b/extensions/source/bibliography/bib.hrc
@@ -28,7 +28,7 @@
 #define BIB_HRC
 
 #include "bibliography.hrc"
-
+#include <svl/solar.hrc>
 #ifndef RID_BIB_START
 #define RID_BIB_START					RID_EXTENSIONS_START
 #endif
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index 849eec394..4ff1ee5b1 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -65,7 +65,7 @@ namespace bib
 
     using namespace ::com::sun::star::uno;
 
-    void HandleTaskPaneList( Window* pWindow, BOOL bAddToList )
+    void HandleTaskPaneList( Window* pWindow, sal_Bool bAddToList )
     {
         Window*				pParent = pWindow->GetParent();
 
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index 640d1ea77..5cfdbcf2f 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -269,7 +269,7 @@ void	BibConfig::Commit()
     OUString sCommandType(C2U("CommandType"));
     for(sal_Int32 i = 0; i < pMappingsArr->Count(); i++)
     {
-        const Mapping* pMapping = pMappingsArr->GetObject((USHORT)i);
+        const Mapping* pMapping = pMappingsArr->GetObject((sal_uInt16)i);
         OUString sPrefix(C2U(cDataSourceHistory));
         sPrefix += C2U("/_");
         sPrefix += OUString::valueOf(i);
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index 2c3e0f4d1..846a2edf3 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -234,8 +234,8 @@ long BibBookContainer::PreNotify( NotifyEvent& rNEvt )
     {
         const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
         const KeyCode aKeyCode = pKEvt->GetKeyCode();
-        USHORT nKey = aKeyCode.GetCode();
-        const USHORT nModifier = aKeyCode.GetModifier();
+        sal_uInt16 nKey = aKeyCode.GetCode();
+        const sal_uInt16 nModifier = aKeyCode.GetModifier();
 
         if( KEY_MOD2 == nModifier )
         {
@@ -243,8 +243,8 @@ long BibBookContainer::PreNotify( NotifyEvent& rNEvt )
             {
                 if(pTopWin && pBottomWin)
                 {
-                    USHORT nFirstWinId = KEY_UP == nKey ? TOP_WINDOW : BOTTOM_WINDOW;
-                    USHORT nSecondWinId = KEY_UP == nKey ? BOTTOM_WINDOW : TOP_WINDOW;
+                    sal_uInt16 nFirstWinId = KEY_UP == nKey ? TOP_WINDOW : BOTTOM_WINDOW;
+                    sal_uInt16 nSecondWinId = KEY_UP == nKey ? BOTTOM_WINDOW : TOP_WINDOW;
                     long nHeight = GetItemSize( nFirstWinId );
                     nHeight -= WIN_STEP_SIZE;
                     if(nHeight < WIN_MIN_HEIGHT)
diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx
index 54659be8e..cd86a9190 100644
--- a/extensions/source/bibliography/bibcont.hxx
+++ b/extensions/source/bibliography/bibcont.hxx
@@ -58,7 +58,7 @@ class BibWindowContainer : public BibWindow		//Window
 
         virtual void			GetFocus();
 
-        virtual BOOL			HandleShortCutKey( const KeyEvent& rKeyEvent );	// returns true, if key was handled
+        virtual sal_Bool			HandleShortCutKey( const KeyEvent& rKeyEvent );	// returns true, if key was handled
 
         using Window::GetChild;
 };
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index a64d63467..431e6db0f 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -222,35 +222,6 @@ extern "C"
         *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
     }
 
-    sal_Bool SAL_CALL component_writeInfo( void * //pServiceManager
-                                        , registry::XRegistryKey * pRegistryKey )
-    {
-        try
-        {
-            rtl::OUString sKey(RTL_CONSTASCII_USTRINGPARAM("/"));
-            sKey += BibliographyLoader::getImplementationName_Static();
-            //creates the impl key:  /com.sun.star.extensions.Bibliography
-            Reference< registry::XRegistryKey > xImplKey = pRegistryKey->createKey(sKey);
-
-
-            Reference< registry::XRegistryKey > xNewKey = xImplKey->createKey(	C2U("/UNO/SERVICES") );
-            Sequence< rtl::OUString > aServices = BibliographyLoader::getSupportedServiceNames_Static();
-            for( INT32 i = 0; i < aServices.getLength(); i++ )
-                xNewKey->createKey( aServices.getConstArray()[i]);
-            xNewKey = xImplKey->createKey(	C2U("/UNO/Loader"));
-
-            Reference< registry::XRegistryKey >  xPatternKey = xImplKey->createKey( C2U("/Loader/Pattern" ));
-            xPatternKey->setAsciiValue( C2U( ".component:Bibliography/*" ) );
-
-            return sal_True;
-        }
-        catch (Exception &)
-        {
-            return sal_False;
-        }
-    }
-
-
     void * SAL_CALL component_getFactory(
         const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * /*pRegistryKey*/ )
     {
diff --git a/extensions/source/bibliography/bibresid.hxx b/extensions/source/bibliography/bibresid.hxx
index 724dec0c3..ea8576779 100644
--- a/extensions/source/bibliography/bibresid.hxx
+++ b/extensions/source/bibliography/bibresid.hxx
@@ -36,7 +36,7 @@
 class BibResId : public ResId
 {
  public:
-    BibResId( USHORT nId );
+    BibResId( sal_uInt16 nId );
 };
 
 
diff --git a/extensions/source/bibliography/bibshortcuthandler.hxx b/extensions/source/bibliography/bibshortcuthandler.hxx
index 88fe8b18a..fb33b2623 100644
--- a/extensions/source/bibliography/bibshortcuthandler.hxx
+++ b/extensions/source/bibliography/bibshortcuthandler.hxx
@@ -47,7 +47,7 @@ protected:
 
 public:
     virtual					~BibShortCutHandler();
-    virtual BOOL			HandleShortCutKey( const KeyEvent& rKeyEvent );	// returns true, if key was handled
+    virtual sal_Bool			HandleShortCutKey( const KeyEvent& rKeyEvent );	// returns true, if key was handled
 
     inline Window*			GetWindow( void );
 };
diff --git a/extensions/source/bibliography/bibtools.hxx b/extensions/source/bibliography/bibtools.hxx
index d62a5bce7..dff45ec1b 100644
--- a/extensions/source/bibliography/bibtools.hxx
+++ b/extensions/source/bibliography/bibtools.hxx
@@ -34,17 +34,17 @@ namespace bib
 {
     // source in bibbeam.cxx
 
-    void HandleTaskPaneList( Window* pWindow, BOOL bAddToList );
+    void HandleTaskPaneList( Window* pWindow, sal_Bool bAddToList );
         // pWindow: just an system window or something wich is child of a system window
 
     inline void AddToTaskPaneList( Window* pWindowToBeHandled )
     {
-        HandleTaskPaneList( pWindowToBeHandled, TRUE );
+        HandleTaskPaneList( pWindowToBeHandled, sal_True );
     }
 
     inline void RemoveFromTaskPaneList( Window* pWindowToBeHandled )
     {
-        HandleTaskPaneList( pWindowToBeHandled, FALSE );
+        HandleTaskPaneList( pWindowToBeHandled, sal_False );
     }
 }
 
diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx
index 317afaf54..22455a009 100644
--- a/extensions/source/bibliography/bibview.cxx
+++ b/extensions/source/bibliography/bibview.cxx
@@ -207,9 +207,9 @@ namespace bib
             m_pGeneralPage->GrabFocus();
     }
 
-    BOOL BibView::HandleShortCutKey( const KeyEvent& rKeyEvent )
+    sal_Bool BibView::HandleShortCutKey( const KeyEvent& rKeyEvent )
     {
-        return m_pGeneralPage? m_pGeneralPage->HandleShortCutKey( rKeyEvent ) : FALSE;
+        return m_pGeneralPage? m_pGeneralPage->HandleShortCutKey( rKeyEvent ) : sal_False;
     }
 
 //.........................................................................
diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx
index 0f86069a5..6ddb43f09 100644
--- a/extensions/source/bibliography/bibview.hxx
+++ b/extensions/source/bibliography/bibview.hxx
@@ -75,7 +75,7 @@ namespace bib
 
         virtual void		GetFocus();
 
-        virtual BOOL		HandleShortCutKey( const KeyEvent& rKeyEvent );	// returns true, if key was handled
+        virtual sal_Bool		HandleShortCutKey( const KeyEvent& rKeyEvent );	// returns true, if key was handled
     };
 
 //.........................................................................
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 07871257a..c0e5ac574 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -307,7 +307,7 @@ public:
     MappingDialog_Impl(Window* pParent, BibDataManager* pDatMan);
     ~MappingDialog_Impl();
 
-    void	SetModified() {bModified = TRUE;}
+    void	SetModified() {bModified = sal_True;}
 
 };
 
@@ -610,7 +610,7 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan )
         aSelectionHB.Show();
 
         aSelectionLB.SetTabs( &nTabs[0], MAP_PIXEL );
-        aSelectionLB.SetWindowBits(WB_CLIPCHILDREN|WB_SORT);
+        aSelectionLB.SetStyle(aSelectionLB.GetStyle()|WB_CLIPCHILDREN|WB_SORT);
         aSelectionLB.GetModel()->SetSortMode(SortAscending);
 
         ::rtl::OUString sActiveSource = pDatMan->getActiveDataSource();
@@ -1363,9 +1363,9 @@ Reference< awt::XControlModel >	BibDataManager::createGridModel(const ::rtl::OUS
         Reference< XPropertySetInfo > xPropInfo = xPropSet->getPropertySetInfo();
         if (xPropInfo->hasPropertyByName(uProp))
         {
-            ::rtl::OUString sId(RTL_CONSTASCII_USTRINGPARAM( "HID:" ));
-            sId += ::rtl::OUString::valueOf( (sal_Int32) HID_BIB_DB_GRIDCTRL );
-            xPropSet->setPropertyValue( uProp, makeAny( ::rtl::OUString( sId ) ) );
+            ::rtl::OUString sId(RTL_CONSTASCII_USTRINGPARAM( INET_HID_SCHEME ));
+            sId += ::rtl::OUString::createFromAscii( HID_BIB_DB_GRIDCTRL );
+            xPropSet->setPropertyValue( uProp, makeAny( sId ) );
         }
     }
     catch(Exception& e )
diff --git a/extensions/source/bibliography/datman.src b/extensions/source/bibliography/datman.src
index 6b8c4b00e..639e6640d 100644
--- a/extensions/source/bibliography/datman.src
+++ b/extensions/source/bibliography/datman.src
@@ -62,6 +62,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox     LB_IDENTIFIER
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_IDENTIFIER";
         Pos = MAP_APPFONT ( 65 , 13 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -73,6 +74,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_AUTHORITYTYPE
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_AUTHORITYTYPE";
         Pos = MAP_APPFONT ( 171 , 13 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -84,6 +86,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_YEAR
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_YEAR";
         Pos = MAP_APPFONT ( 282 , 13 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -95,6 +98,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_AUTHOR
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_AUTHOR";
         Pos = MAP_APPFONT ( 65 , 28 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -106,6 +110,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_TITLE
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_TITLE";
         Pos = MAP_APPFONT ( 171 , 28 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -117,6 +122,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_PUBLISHER
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_PUBLISHER";
         Pos = MAP_APPFONT ( 65 , 43 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -128,6 +134,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_ADDRESS
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_ADDRESS";
         Pos = MAP_APPFONT ( 171, 43 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -139,6 +146,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_ISBN
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_ISBN";
         Pos = MAP_APPFONT ( 282 , 43 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -150,6 +158,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_CHAPTER
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_CHAPTER";
         Pos = MAP_APPFONT ( 65 , 58 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -161,6 +170,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_PAGES
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_PAGES";
         Pos = MAP_APPFONT ( 171, 58) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -172,6 +182,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_EDITOR
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_EDITOR";
         Pos = MAP_APPFONT ( 65 , 73 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -183,6 +194,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_EDITION
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_EDITION";
         Pos = MAP_APPFONT ( 171 , 73 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -194,6 +206,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_BOOKTITLE
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_BOOKTITLE";
         Pos = MAP_APPFONT ( 65, 88 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -205,6 +218,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_VOLUME
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_VOLUME";
         Pos = MAP_APPFONT ( 171 , 88 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -216,6 +230,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_HOWPUBLISHED
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_HOWPUBLISHED";
         Pos = MAP_APPFONT ( 282, 88 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -227,6 +242,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_ORGANIZATIONS
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_ORGANIZATIONS";
         Pos = MAP_APPFONT ( 65 , 103 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -238,6 +254,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_INSTITUTION
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_INSTITUTION";
         Pos = MAP_APPFONT ( 171 , 103) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -249,6 +266,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_SCHOOL
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_SCHOOL";
         Pos = MAP_APPFONT ( 282 , 103 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -260,6 +278,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_REPORTTYPE
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_REPORTTYPE";
         Pos = MAP_APPFONT ( 65 , 118 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -271,6 +290,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_MONTH
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_MONTH";
         Pos = MAP_APPFONT ( 171 , 118) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -282,6 +302,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_JOURNAL
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_JOURNAL";
         Pos = MAP_APPFONT ( 65 , 133) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -293,6 +314,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_NUMBER
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_NUMBER";
         Pos = MAP_APPFONT ( 171 , 133 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -304,6 +326,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_SERIES
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_SERIES";
         Pos = MAP_APPFONT ( 282 , 133 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -315,6 +338,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_ANNOTE
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_ANNOTE";
         Pos = MAP_APPFONT ( 65 , 148 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -326,6 +350,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_NOTE
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_NOTE";
         Pos = MAP_APPFONT ( 171 , 148 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -337,6 +362,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_URL
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_URL";
         Pos = MAP_APPFONT ( 282, 148 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -348,6 +374,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_CUSTOM1
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM1";
         Pos = MAP_APPFONT ( 65 , 163 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -359,6 +386,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_CUSTOM2
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM2";
         Pos = MAP_APPFONT ( 171 , 163 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -370,6 +398,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_CUSTOM3
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM3";
         Pos = MAP_APPFONT ( 282 , 163 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -381,6 +410,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_CUSTOM4
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM4";
         Pos = MAP_APPFONT ( 65 , 177 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -392,6 +422,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_CUSTOM5
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM5";
         Pos = MAP_APPFONT ( 171 , 177 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 4008c497a..7c5c435c2 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -418,8 +418,8 @@ sal_Bool BibFrameController_Impl::SaveModified(const Reference< form::runtime::X
 
 Window* lcl_GetFocusChild( Window* pParent )
 {        
-    USHORT nChildren = pParent->GetChildCount();
-    for( USHORT nChild = 0; nChild < nChildren; ++nChild)
+    sal_uInt16 nChildren = pParent->GetChildCount();
+    for( sal_uInt16 nChild = 0; nChild < nChildren; ++nChild)
     {
         Window* pChild = pParent->GetChild( nChild );
         if(pChild->HasFocus())
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 6edb64c8b..37c14247d 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -57,6 +57,7 @@
 #include <algorithm>
 #include <functional>
 #include <vector>
+#include <tools/urlobj.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -266,8 +267,8 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan):
 
     aBasePos = aIdentifierFT.GetPosPixel();
 
-    INT16* pMap = nFT2CtrlMap;
-    for( USHORT i = 0 ; i < FIELD_COUNT ; ++i, ++pMap )
+    sal_Int16* pMap = nFT2CtrlMap;
+    for( sal_uInt16 i = 0 ; i < FIELD_COUNT ; ++i, ++pMap )
     {
         aControls[ i ] = 0;
         *pMap = -1;
@@ -423,7 +424,7 @@ BibGeneralPage::~BibGeneralPage()
 
 void BibGeneralPage::RemoveListeners()
 {
-    for(USHORT i = 0; i < FIELD_COUNT; i++)
+    for(sal_uInt16 i = 0; i < FIELD_COUNT; i++)
     {
         if(aControls[i].is())
         {
@@ -448,12 +449,12 @@ void BibGeneralPage::CommitActiveControl()
 }
 //-----------------------------------------------------------------------------
 void BibGeneralPage::AddControlWithError( const OUString& rColumnName, const ::Point& rPos, const ::Size& rSize,
-                                String& rErrorString, String aColumnUIName, sal_uInt16 nHelpId, sal_uInt16 nIndexInFTArray )
+                                String& rErrorString, String aColumnUIName, const rtl::OString& sHelpId, sal_uInt16 nIndexInFTArray )
 {
     // adds also the XControl and creates a map entry in nFT2CtrlMap[] for mapping between control and FT
 
-    INT16									nIndex = -1;
-    uno::Reference< awt::XControlModel >	xTmp = AddXControl(rColumnName, rPos, rSize, nHelpId, nIndex );
+    sal_Int16									nIndex = -1;
+    uno::Reference< awt::XControlModel >	xTmp = AddXControl(rColumnName, rPos, rSize, sHelpId, nIndex );
     if( xTmp.is() )
     {
         DBG_ASSERT( nIndexInFTArray < FIELD_COUNT, "*BibGeneralPage::AddControlWithError(): wrong array index!" );
@@ -472,7 +473,7 @@ void BibGeneralPage::AddControlWithError( const OUString& rColumnName, const ::P
 //-----------------------------------------------------------------------------
 uno::Reference< awt::XControlModel >  BibGeneralPage::AddXControl(
         const String& rName,
-        ::Point rPos, ::Size rSize, sal_uInt16 nHelpId, INT16& rIndex )
+        ::Point rPos, ::Size rSize, const rtl::OString& sHelpId, sal_Int16& rIndex )
 {
     uno::Reference< awt::XControlModel >  xCtrModel;
     try
@@ -494,11 +495,10 @@ uno::Reference< awt::XControlModel >  BibGeneralPage::AddXControl(
                 rtl::OUString uProp(C2U("HelpURL"));
                 if(xPropInfo->hasPropertyByName(uProp))
                 {
-                    String sId(C2S("HID:"));
-                    sId += String::CreateFromInt32(nHelpId);
-                    rtl::OUString uId(sId) ;
-                    uno::Any aVal; aVal <<= uId;
-                    xPropSet->setPropertyValue(uProp, aVal);
+                    ::rtl::OUString sId = ::rtl::OUString::createFromAscii( INET_HID_SCHEME );
+                    DBG_ASSERT( INetURLObject( rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" );
+                    sId += ::rtl::OUString( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 );
+                    xPropSet->setPropertyValue( uProp, makeAny( sId ) );
                 }
 
                 if(bTypeListBox)
@@ -530,7 +530,7 @@ uno::Reference< awt::XControlModel >  BibGeneralPage::AddXControl(
 
                     xPropSet->setPropertyValue(C2U("StringItemList"), aAny);
 
-                    BOOL bTrue = sal_True;
+                    sal_Bool bTrue = sal_True;
                     aAny.setValue( &bTrue, ::getBooleanCppuType() );
                     xPropSet->setPropertyValue( C2U("Dropdown"), aAny );
 
@@ -549,11 +549,11 @@ uno::Reference< awt::XControlModel >  BibGeneralPage::AddXControl(
                     uno::Reference< awt::XWindow >	xCtrWin(xControl, UNO_QUERY );
                     xCtrWin->addFocusListener( this );
                     rIndex = -1;	// -> implies, that not found
-                    for(USHORT i = 0; i < FIELD_COUNT; i++)
+                    for(sal_uInt16 i = 0; i < FIELD_COUNT; i++)
                         if(!aControls[i].is())
                         {
                             aControls[i] = xCtrWin;
-                            rIndex = INT16( i );
+                            rIndex = sal_Int16( i );
                             break;
                         }
                     xCtrWin->setVisible( sal_True );
@@ -579,8 +579,8 @@ void BibGeneralPage::AdjustScrollbars()
     long nVertScrollWidth = aVertScroll.GetSizePixel().Width();
     long nHoriScrollHeight = aHoriScroll.GetSizePixel().Height();
     ::Size aOutSize(GetOutputSizePixel());
-    BOOL bHoriVisible = aOutSize.Width() <= aStdSize.Width();
-    BOOL bVertVisible = (aOutSize.Height()-(bHoriVisible ? nHoriScrollHeight : 0)) <= (aStdSize.Height());
+    sal_Bool bHoriVisible = aOutSize.Width() <= aStdSize.Width();
+    sal_Bool bVertVisible = (aOutSize.Height()-(bHoriVisible ? nHoriScrollHeight : 0)) <= (aStdSize.Height());
     aHoriScroll.Show(bHoriVisible);
     aVertScroll.Show(bVertVisible);
 
@@ -716,7 +716,7 @@ void BibGeneralPage::InitFixedTexts( void )
 
 IMPL_LINK(BibGeneralPage, ScrollHdl, ScrollBar*, pScroll)
 {
-    BOOL bVertical = &aVertScroll == pScroll;
+    sal_Bool bVertical = &aVertScroll == pScroll;
     long nOffset = 0;
     long nCurrentOffset = 0;
     if(bVertical)
@@ -725,7 +725,7 @@ IMPL_LINK(BibGeneralPage, ScrollHdl, ScrollBar*, pScroll)
         nCurrentOffset = aFixedTexts[0]->GetPosPixel().X() - aBasePos.X();
     nOffset = pScroll->IsVisible() ? pScroll->GetThumbPos() + nCurrentOffset : nCurrentOffset;;
 
-    for(USHORT i = 0; i < FIELD_COUNT; i++)
+    for(sal_uInt16 i = 0; i < FIELD_COUNT; i++)
     {
         ::Point aPos = aFixedTexts[i]->GetPosPixel();
         if(bVertical)
@@ -810,13 +810,13 @@ void BibGeneralPage::GetFocus()
     aControlParentWin.GrabFocus();
 }
 
-BOOL BibGeneralPage::HandleShortCutKey( const KeyEvent& rKeyEvent )
+sal_Bool BibGeneralPage::HandleShortCutKey( const KeyEvent& rKeyEvent )
 {
     DBG_ASSERT( KEY_MOD2 == rKeyEvent.GetKeyCode().GetModifier(), "+BibGeneralPage::HandleShortCutKey(): this is not for me!" );
 
     const vcl::I18nHelper&		rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper();
     const xub_Unicode			c = rKeyEvent.GetCharCode();
-    BOOL						bHandled = FALSE;
+    sal_Bool						bHandled = sal_False;
 
     sal_Int16					i;
 
@@ -831,7 +831,7 @@ BOOL BibGeneralPage::HandleShortCutKey( const KeyEvent& rKeyEvent )
     {
         if( rI18nHelper.MatchMnemonic( aFixedTexts[ i ]->GetText(), c ) )
         {
-            bHandled = TRUE;
+            bHandled = sal_True;
             sal_Int16			nCtrlIndex = nFT2CtrlMap[ i ];
 
             if( nCtrlIndex >= 0 )
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index 5f2211cbd..86ff5a0cb 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -136,12 +136,12 @@ class BibGeneralPage: public BibGeneralPageBaseClass, public BibTabPage
     BibDataManager*		pDatMan;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >
-                                AddXControl( const String& rName, Point aPos, Size aSize, sal_uInt16 nHelpId,
+                                AddXControl( const String& rName, Point aPos, Size aSize, const rtl::OString& sHelpId,
                                             sal_Int16& rIndex );
 
     void						AddControlWithError( const rtl::OUString& rColumnName, const Point& rPos,
                                             const Size& rSize, String& rErrorString, String aColumnUIName,
-                                            sal_uInt16 nHelpId, sal_uInt16 nIndexInFTArray );
+                                            const rtl::OString& sHelpId, sal_uInt16 nIndexInFTArray );
 
     void						AdjustScrollbars();
 
@@ -175,7 +175,7 @@ public:
 
     virtual void				GetFocus();
 
-    virtual BOOL				HandleShortCutKey( const KeyEvent& rKeyEvent );	// returns true, if key was handled
+    virtual sal_Bool				HandleShortCutKey( const KeyEvent& rKeyEvent );	// returns true, if key was handled
 };
 
 
diff --git a/extensions/source/bibliography/makefile.mk b/extensions/source/bibliography/makefile.mk
index f25dce110..b681c6c90 100644
--- a/extensions/source/bibliography/makefile.mk
+++ b/extensions/source/bibliography/makefile.mk
@@ -54,7 +54,6 @@ SRS1NAME=$(TARGET)
 SRC1FILES=			bib.src	 \
                     datman.src \
                     sections.src \
-                    menu.src	 \
                     toolbar.src
 
 RESLIB1NAME=bib
@@ -89,3 +88,11 @@ DEF1NAME=		$(SHL1TARGET)
 
 .INCLUDE :	target.mk
 
+
+ALLTAR : $(MISC)/bib.component
+
+$(MISC)/bib.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        bib.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt bib.component
diff --git a/extensions/source/bibliography/menu.src b/extensions/source/bibliography/menu.src
index 6b8adc355..45ebcda37 100644
--- a/extensions/source/bibliography/menu.src
+++ b/extensions/source/bibliography/menu.src
@@ -27,14 +27,8 @@
 
 #include <svl/solar.hrc>
 #include <svx/svxids.hrc>
-#ifndef _GLOBLMN_HRC
 #include <svx/globlmn.hrc>
-#endif
-#ifndef _GLOBALACC_SRC
-#include <svx/globlac.hrc>
-#endif
 #include "bibliography.hrc"
-
 #include "bib.hrc"
 
 /*
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 8899f9878..47dd6c5ae 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -377,7 +377,7 @@ void BibToolBar::Click()
     {
         if(pDatMan)
             pDatMan->CreateMappingDialog(GetParent());
-        CheckItem( nId, FALSE );
+        CheckItem( nId, sal_False );
     }
     else if(nId == TBC_BT_CHANGESOURCE)
     {
@@ -387,7 +387,7 @@ void BibToolBar::Click()
             if(sNew.getLength())
                 pDatMan->setActiveDataSource(sNew);
         }
-        CheckItem( nId, FALSE );
+        CheckItem( nId, sal_False );
     }
 }
 
diff --git a/extensions/source/bibliography/toolbar.src b/extensions/source/bibliography/toolbar.src
index 95681c7d5..c712bc1c3 100644
--- a/extensions/source/bibliography/toolbar.src
+++ b/extensions/source/bibliography/toolbar.src
@@ -27,6 +27,7 @@
 #include <svx/svxids.hrc>
 #include "bibliography.hrc"
 #include "toolbar.hrc"
+#include "svx/svxcommands.h"
 
 #define MASKCOLOR	MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
 
@@ -46,7 +47,6 @@ ToolBox RID_BIB_TOOLBAR
         ToolBoxItem
         {
             Identifier = TBC_FT_SOURCE;
-            //HelpID = SID_SBA_BRW_INSERT ;
             Text [ en-US ] = "Table";
         };
         ToolBoxItem
@@ -63,7 +63,6 @@ ToolBox RID_BIB_TOOLBAR
         ToolBoxItem
         {
             Identifier = TBC_FT_QUERY;
-            //HelpID = SID_SBA_BRW_INSERT ;
             Text [ en-US ] = "Search Key";
         };
         ToolBoxItem
@@ -90,7 +89,6 @@ ToolBox RID_BIB_TOOLBAR
         ToolBoxItem
         {
             Identifier = TBC_BT_FILTERCRIT ;
-            HelpID = SID_FM_FILTERCRIT ;
 //            ItemBitmap = Bitmap { File = "sc10715.bmp" ; };
 //            Text [ de ] = "Standard Filter" ;
             Command = ".uno:Bib/standardFilter" ;
@@ -100,7 +98,6 @@ ToolBox RID_BIB_TOOLBAR
         ToolBoxItem
         {
             Identifier = TBC_BT_REMOVEFILTER ;
-            HelpID = SID_FM_REMOVE_FILTER_SORT ;
 //            ItemBitmap = Bitmap { File = "sc10711.bmp" ; };
             Command = ".uno:Bib/removeFilter" ;
             Text [ en-US ] = "Remove Filter";
@@ -122,78 +119,6 @@ ToolBox RID_BIB_TOOLBAR
             Checkable=TRUE;
             Text [ en-US ] = "Data Source";
         };
-/*
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-
-        ToolBoxItem
-        {
-            Identifier = TBC_BT_NEWCARD ;
-            //HelpID = SID_FM_REMOVE_FILTER_SORT ;
-            Command = ".uno:Bib/newEntry" ;
-            ItemBitmap = Bitmap { File = "newcard.bmp" ; };
-            Text [ en-US ] = "New Address";
-        };
-
-        ToolBoxItem
-        {
-            Identifier = TBC_BT_EDITCARD ;
-            //HelpID = SID_FM_REMOVE_FILTER_SORT ;
-            Command = ".uno:Bib/changeEntry" ;
-            ItemBitmap = Bitmap { File = "modcard.bmp" ; };
-            Text [ en-US ] = "Edit Address";
-        };
-
-        ToolBoxItem
-        {
-            Identifier = TBC_BT_REMOVECARD ;
-            //HelpID = SID_FM_REMOVE_FILTER_SORT ;
-            Command = ".uno:Bib/removeEntry" ;
-            ItemBitmap = Bitmap { File = "remcard.bmp" ; };
-            Text [ en-US ] = "Remove Address";
-        };
-
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-
-        ToolBoxItem
-        {
-            Identifier = TBC_BT_INSERT ;
-            HelpID = SID_SBA_BRW_INSERT ;
-            ItemBitmap = Bitmap { File = "sc12202.bmp" ; };
-            Text [ en-US ] = "Data into Text";
-        };
-        ToolBoxItem
-        {
-            Identifier = TBC_BT_UPDATE ;
-            HelpID = SID_SBA_BRW_UPDATE ;
-            ItemBitmap = Bitmap { File = "sc12201.bmp" ; };
-            Text = "Daten in Felder" ;
-        };
-
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-
-        ToolBoxItem
-        {
-            Identifier = TBC_BT_MAIL ;
-            //HelpID = HID_ADDRPI_AUTOMAIL ;
-            ItemBitmap = Bitmap { File = "sc06305.bmp" ; };
-            Text [ en-US ] = "AutoMail";
-        };
-        ToolBoxItem
-        {
-            Identifier = TBC_BT_URL ;
-            //HelpID = HID_ADDRPI_AUTOBROWSE ;
-            ItemBitmap = Bitmap { File = "sc06304.bmp" ; };
-            Text [ en-US ] = "AutoBrowse";
-        };*/
     };
     Scroll = TRUE ;
 };