Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

* commit 'ooo/DEV300_m101': (185 commits)
masterfix DEV300: #i10000# usage of L10N build_type
masterfix: #i10000# INT16 -> sal_Int16
fixed compile errors after resync to m100, part2
gridsort: post-rebase fixes
CWS gnumake3: found another tools integer type
removetooltypes01: Fix build problems after rebase to DEV300m99 in basctl, cui, reportdesign, sw
native359: #i114398# changing mac langpack icon
native359: #i115669# fixing package description for solaris packages
gnumake3: remove comphelper version; fix including extract.hxx
locales34: #i106785# add Haitian_Haiti [ht-HT] to language list and locale data; locale data contributed by <jcpoulard>
sb138: #i116659# timely termination of OnLogRotateThread
accfixes: removed include of obsolete header file
accfixes: removed obsolete file
removetooltypes01: #i112600# Fix build problems on non-pro
accfixes: moved some shared strings to svx part2
accfixes: moved some shared strings to svx
accfixes: added more accessibility information and fixed tab orders in multiple dialogs (cui module)
removetooltypes01: #i112600# Remove tools types for Mac specific parts
fixed tab order in BasicIDE, Library dialog tab page
added some accessible names in BasicIDE
...

Conflicts:
UnoControls/source/base/registercontrols.cxx
accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx
automation/inc/automation/communi.hxx
automation/inc/automation/simplecm.hxx
automation/source/communi/communi.cxx
automation/source/inc/rcontrol.hxx
automation/source/miniapp/servuid.hxx
automation/source/server/XMLParser.cxx
automation/source/server/cmdbasestream.cxx
automation/source/server/profiler.hxx
automation/source/server/recorder.cxx
automation/source/server/retstrm.hxx
automation/source/server/server.cxx
automation/source/server/sta_list.cxx
automation/source/server/statemnt.cxx
automation/source/server/statemnt.hxx
automation/source/simplecm/packethandler.cxx
automation/source/simplecm/simplecm.cxx
automation/source/simplecm/tcpio.cxx
automation/source/simplecm/tcpio.hxx
automation/source/testtool/comm_bas.hxx
automation/source/testtool/cretstrm.hxx
automation/source/testtool/httprequest.cxx
automation/source/testtool/httprequest.hxx
automation/source/testtool/objtest.cxx
automation/source/testtool/objtest.hxx
basctl/source/basicide/baside2.cxx
basctl/source/basicide/baside2.hxx
basctl/source/basicide/baside2b.cxx
basctl/source/basicide/baside3.cxx
basctl/source/basicide/basides1.cxx
basctl/source/basicide/basides2.cxx
basctl/source/basicide/basidesh.cxx
basctl/source/basicide/basidesh.src
basctl/source/basicide/basobj3.cxx
basctl/source/basicide/bastype2.cxx
basctl/source/basicide/bastype3.cxx
basctl/source/basicide/bastypes.cxx
basctl/source/basicide/brkdlg.cxx
basctl/source/basicide/iderdll.cxx
basctl/source/basicide/macrodlg.cxx
basctl/source/basicide/moduldl2.cxx
basctl/source/basicide/moduldlg.cxx
basctl/source/basicide/objdlg.cxx
basctl/source/basicide/scriptdocument.cxx
basctl/source/basicide/tbxctl.cxx
basctl/source/basicide/tbxctl.hxx
basctl/source/basicide/tbxctl.src
basctl/source/dlged/dlged.cxx
basctl/source/dlged/dlgedfunc.cxx
basctl/source/dlged/dlgedobj.cxx
basctl/source/inc/basidesh.hxx
basctl/source/inc/bastypes.hxx
basctl/source/inc/dlgedmod.hxx
basctl/source/inc/dlgedpage.hxx
crashrep/prj/build.lst
cui/inc/pch/precompiled_cui.hxx
cui/source/customize/acccfg.cxx
cui/source/customize/acccfg.hrc
cui/source/customize/acccfg.src
cui/source/customize/cfg.cxx
cui/source/customize/cfgutil.cxx
cui/source/customize/macropg.cxx
cui/source/customize/macropg.src
cui/source/customize/selector.cxx
cui/source/dialogs/SpellDialog.cxx
cui/source/dialogs/commonlingui.cxx
cui/source/dialogs/cuicharmap.cxx
cui/source/dialogs/cuifmsearch.cxx
cui/source/dialogs/cuigaldlg.cxx
cui/source/dialogs/cuigrfflt.cxx
cui/source/dialogs/hldocntp.cxx
cui/source/dialogs/hldoctp.cxx
cui/source/dialogs/hlinettp.cxx
cui/source/dialogs/hlmailtp.cxx
cui/source/dialogs/hlmarkwn.cxx
cui/source/dialogs/hlmarkwn.src
cui/source/dialogs/hltpbase.cxx
cui/source/dialogs/iconcdlg.cxx
cui/source/dialogs/passwdomdlg.cxx
cui/source/dialogs/pastedlg.cxx
cui/source/dialogs/scriptdlg.cxx
cui/source/dialogs/thesdlg.cxx
cui/source/dialogs/zoom.cxx
cui/source/factory/dlgfact.hxx
cui/source/inc/SpellDialog.hxx
cui/source/inc/autocdlg.hxx
cui/source/inc/backgrnd.hxx
cui/source/inc/bbdlg.hxx
cui/source/inc/cfg.hxx
cui/source/inc/cfgutil.hxx
cui/source/inc/cuigaldlg.hxx
cui/source/inc/cuigrfflt.hxx
cui/source/inc/cuitabarea.hxx
cui/source/inc/cuitabline.hxx
cui/source/inc/hldocntp.hxx
cui/source/inc/hltpbase.hxx
cui/source/inc/iconcdlg.hxx
cui/source/inc/numpages.hxx
cui/source/inc/page.hxx
cui/source/inc/postdlg.hxx
cui/source/inc/scriptdlg.hxx
cui/source/inc/transfrm.hxx
cui/source/inc/zoom.hxx
cui/source/options/cfgchart.cxx
cui/source/options/cuisrchdlg.cxx
cui/source/options/dbregister.cxx
cui/source/options/dbregister.src
cui/source/options/fontsubs.cxx
cui/source/options/internationaloptions.cxx
cui/source/options/optasian.cxx
cui/source/options/optchart.cxx
cui/source/options/optcolor.cxx
cui/source/options/optcolor.src
cui/source/options/optfltr.cxx
cui/source/options/optfltr.src
cui/source/options/optgdlg.cxx
cui/source/options/optgdlg.src
cui/source/options/optgenrl.cxx
cui/source/options/opthtml.cxx
cui/source/options/optimprove.cxx
cui/source/options/optinet2.cxx
cui/source/options/optinet2.hxx
cui/source/options/optjava.cxx
cui/source/options/optlingu.cxx
cui/source/options/optsave.cxx
cui/source/options/optsave.hxx
cui/source/options/treeopt.cxx
cui/source/options/webconninfo.cxx
cui/source/tabpages/autocdlg.cxx
cui/source/tabpages/backgrnd.cxx
cui/source/tabpages/border.cxx
cui/source/tabpages/chardlg.cxx
cui/source/tabpages/dstribut.cxx
cui/source/tabpages/grfpage.cxx
cui/source/tabpages/macroass.cxx
cui/source/tabpages/measure.cxx
cui/source/tabpages/numfmt.cxx
cui/source/tabpages/numpages.cxx
cui/source/tabpages/page.cxx
cui/source/tabpages/paragrph.cxx
cui/source/tabpages/swpossizetabpage.cxx
cui/source/tabpages/tabarea.src
cui/source/tabpages/textanim.cxx
cui/source/tabpages/textattr.cxx
cui/source/tabpages/tparea.cxx
cui/source/tabpages/tpbitmap.cxx
cui/source/tabpages/tpcolor.cxx
cui/source/tabpages/tpgradnt.cxx
cui/source/tabpages/tphatch.cxx
cui/source/tabpages/tpline.cxx
cui/source/tabpages/tplnedef.cxx
cui/source/tabpages/tplneend.cxx
cui/source/tabpages/tpshadow.cxx
cui/source/tabpages/transfrm.cxx
embedserv/source/embed/register.cxx
extensions/inc/pch/precompiled_extensions.hxx
extensions/inc/propctrlr.hrc
extensions/source/abpilot/abpservices.cxx
extensions/source/bibliography/bibload.cxx
extensions/source/bibliography/datman.cxx
extensions/source/bibliography/general.cxx
extensions/source/dbpilots/dbpservices.cxx
extensions/source/inc/componentmodule.cxx
extensions/source/nsplugin/source/so_env.cxx
extensions/source/ole/oleobjw.cxx
extensions/source/ole/oleobjw.hxx
extensions/source/oooimprovement/invite_job.cxx
extensions/source/oooimprovement/onlogrotate_job.cxx
extensions/source/plugin/base/service.cxx
extensions/source/plugin/inc/plugin/unx/mediator.hxx
extensions/source/plugin/inc/plugin/unx/plugcon.hxx
extensions/source/plugin/unx/mediator.cxx
extensions/source/plugin/unx/nppapi.cxx
extensions/source/plugin/unx/plugcon.cxx
extensions/source/preload/services.cxx
extensions/source/propctrlr/formmetadata.cxx
extensions/source/propctrlr/pcrservices.cxx
extensions/source/resource/resource.cxx
extensions/source/scanner/sane.hxx
extensions/source/scanner/sanedlg.cxx
extensions/source/scanner/scanunx.cxx
extensions/source/scanner/scanwin.cxx
extensions/source/scanner/twain.cxx
extensions/source/scanner/twain.hxx
extensions/source/update/check/updatecheckconfig.cxx
extensions/test/stm/datatest.cxx
extensions/test/stm/marktest.cxx
extensions/test/stm/pipetest.cxx
extensions/test/stm/testfactreg.cxx
extensions/workben/testpgp.cxx
forms/qa/complex/forms/CheckOGroupBoxModel.java
forms/qa/makefile.mk
forms/source/component/Button.cxx
forms/source/component/Button.hxx
forms/source/component/ListBox.cxx
forms/source/inc/forms_module_impl.hxx
forms/source/misc/services.cxx
forms/source/solar/control/navtoolbar.cxx
javainstaller2/prj/build.lst
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
lingucomponent/prj/build.lst
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sreg.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
package/source/manifest/ManifestExport.cxx
package/source/manifest/UnoRegister.cxx
package/source/xstor/owriteablestream.cxx
package/source/xstor/owriteablestream.hxx
package/source/xstor/xstorage.hxx
package/source/zippackage/ZipPackageFolder.cxx
package/source/zippackage/ZipPackageStream.cxx
setup_native/source/mac/ooo/DS_Store
setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
xmlsecurity/prj/build.lst
xmlsecurity/source/component/registerservices.cxx
xmlsecurity/source/dialogs/stbcontrl.cxx
xmlsecurity/source/framework/xsec_framework.cxx
xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
xmlsecurity/tools/demo/util.hxx
xmlsecurity/workben/signaturetest.cxx

11 files changed, 156 insertions, 149 deletions

diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index 505998d32bcb..556254185802 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -70,7 +70,7 @@ protected:
     virtual void        DoInit();
     virtual void        DoScroll( ScrollBar* pCurScrollBar );
     virtual void        DataChanged( const DataChangedEvent& rDCEvt );
-    void                InitSettings(BOOL bFont,BOOL bForeground,BOOL bBackground);
+    void                InitSettings(sal_Bool bFont,sal_Bool bForeground,sal_Bool bBackground);
 
 public:
                         TYPEINFO();
@@ -86,22 +86,23 @@ public:
     DlgEdModel*         GetModel() const;
     DlgEdPage*          GetPage() const;
     DlgEdView*          GetView() const;
-    BOOL                RenameDialog( const String& rNewName );
+    sal_Bool                RenameDialog( const String& rNewName );
     void                DisableBrowser();
     void                UpdateBrowser();
-    BOOL                SaveDialog();
-    BOOL                ImportDialog();
+    sal_Bool                SaveDialog();
+    sal_Bool                ImportDialog();
 
     virtual String      GetTitle();
     virtual BasicEntryDescriptor CreateEntryDescriptor();
-    virtual void        SetReadOnly( BOOL bReadOnly );
-    virtual BOOL        IsReadOnly();
+    virtual void        SetReadOnly( sal_Bool bReadOnly );
+    virtual sal_Bool        IsReadOnly();
 
     virtual void        StoreData();
-    virtual BOOL        IsModified();
-    virtual BOOL        IsPasteAllowed();
+    virtual sal_Bool        IsModified();
+    virtual sal_Bool        IsPasteAllowed();
 
-    virtual SfxUndoManager* GetUndoManager();
+    virtual ::svl::IUndoManager*
+                        GetUndoManager();
     // return number of pages to be printed
     virtual sal_Int32 countPages( Printer* pPrinter );
     // print page
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index 9fb76f628f7b..20f2f1543a4c 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -45,7 +45,7 @@
 
 //----------------------------------------------------------------------------
 
-const ULONG BASICIDE_UI_FEATURE_SHOW_BROWSER = 0x00000001;
+const sal_uLong BASICIDE_UI_FEATURE_SHOW_BROWSER = 0x00000001;
 
 //----------------------------------------------------------------------------
 
@@ -79,13 +79,13 @@ class BasicIDEShell :public SfxViewShell
 {
 friend class JavaDebuggingListenerImpl;
 friend class LocalizationMgr;
-friend BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocument& rDocument, const String& aLibName );
+friend sal_Bool implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocument& rDocument, const String& aLibName );
 friend bool BasicIDE::RemoveDialog( const ScriptDocument& rDocument, const String& rLibName, const String& rDlgName );
 
     ObjectCatalog*      pObjectCatalog;
 
     IDEWindowTable      aIDEWindowTable;
-    USHORT              nCurKey;
+    sal_uInt16              nCurKey;
     IDEBaseWindow*      pCurWin;
     ScriptDocument      m_aCurDocument;
     String              m_aCurLibName;
@@ -95,10 +95,10 @@ friend bool BasicIDE::RemoveDialog( const ScriptDocument& rDocument, const Strin
     ScrollBar           aVScrollBar;
     ScrollBarBox        aScrollBarBox;
     BasicIDETabBar*     pTabBar;
-    BOOL                bTabBarSplitted;
-    BOOL                bCreatingWindow;
+    sal_Bool                bTabBarSplitted;
+    sal_Bool                bCreatingWindow;
     ModulWindowLayout*  pModulLayout;
-    BOOL                m_bAppBasicModified;
+    sal_Bool                m_bAppBasicModified;
     ::basctl::DocumentEventNotifier
                         m_aNotifier;
 friend class ContainerListenerImpl;
@@ -109,13 +109,13 @@ friend class ContainerListenerImpl;
     void                InitTabBar();
     void                InitScrollBars();
     void                CheckWindows();
-    void                RemoveWindows( const ScriptDocument& rDocument, const String& rLibName, BOOL bDestroy );
+    void                RemoveWindows( const ScriptDocument& rDocument, const String& rLibName, sal_Bool bDestroy );
     void                UpdateWindows();
-    void                ShowObjectDialog( BOOL bShow, BOOL bCreateOrDestroy );
+    void                ShowObjectDialog( sal_Bool bShow, sal_Bool bCreateOrDestroy );
     void                InvalidateBasicIDESlots();
-    void                StoreAllWindowData( BOOL bPersistent = TRUE );
+    void                StoreAllWindowData( sal_Bool bPersistent = sal_True );
     void                SetMDITitle();
-    void                EnableScrollbars( BOOL bEnable );
+    void                EnableScrollbars( sal_Bool bEnable );
     void                SetCurLib( const ScriptDocument& rDocument, String aLibName, bool bUpdateWindows = true , bool bCheck = true );
     void                SetCurLibForLocalization( const ScriptDocument& rDocument, String aLibName );
 
@@ -131,25 +131,25 @@ protected:
     virtual void        AdjustPosSizePixel( const Point &rPos, const Size &rSize );
     virtual void        OuterResizePixel( const Point &rPos, const Size &rSize );
     virtual Size        GetOptimalSizePixel() const;
-    USHORT              InsertWindowInTable( IDEBaseWindow* pNewWin );
-    virtual USHORT      PrepareClose( BOOL bUI, BOOL bForBrowsing );
+    sal_uInt16              InsertWindowInTable( IDEBaseWindow* pNewWin );
+    virtual sal_uInt16      PrepareClose( sal_Bool bUI, sal_Bool bForBrowsing );
 
-    void                SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar = FALSE, BOOL bRememberAsCurrent = TRUE );
+    void                SetCurWindow( IDEBaseWindow* pNewWin, sal_Bool bUpdateTabBar = sal_False, sal_Bool bRememberAsCurrent = sal_True );
     void                ManageToolbars();
-    void                RemoveWindow( IDEBaseWindow* pWindow, BOOL bDestroy, BOOL bAllowChangeCurWindow = TRUE );
+    void                RemoveWindow( IDEBaseWindow* pWindow, sal_Bool bDestroy, sal_Bool bAllowChangeCurWindow = sal_True );
     void                ArrangeTabBar();
 
     ModulWindow*        CreateBasWin( const ScriptDocument& rDocument, const String& rLibName, const String& rModName );
     DialogWindow*       CreateDlgWin( const ScriptDocument& rDocument, const String& rLibName, const String& rDlgName );
 
-    ModulWindow*        FindBasWin( const ScriptDocument& rDocument, const String& rLibName, const String& rModName, BOOL bCreateIfNotExist, BOOL bFindSuspended = FALSE );
+    ModulWindow*        FindBasWin( const ScriptDocument& rDocument, const String& rLibName, const String& rModName, sal_Bool bCreateIfNotExist, sal_Bool bFindSuspended = sal_False );
     ModulWindow*        ShowActiveModuleWindow( StarBASIC* pBasic );
 
     virtual void        SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                                 const SfxHint& rHint, const TypeId& rHintType );
 
-    virtual void        Activate(BOOL bMDI);
-    virtual void        Deactivate(BOOL bMDI);
+    virtual void        Activate(sal_Bool bMDI);
+    virtual void        Deactivate(sal_Bool bMDI);
 
     virtual void        Move();
     virtual void        ShowCursor( bool bOn = true );
@@ -192,15 +192,16 @@ public:
 
     SdrView*            GetCurDlgView() const;
 
-    SfxUndoManager*     GetUndoManager();
+    ::svl::IUndoManager*
+                        GetUndoManager();
 
     virtual com::sun::star::uno::Reference< com::sun::star::view::XRenderable > GetRenderable();
 
-    // virtual USHORT           Print( SfxProgress &rProgress, BOOL bIsAPI, PrintDialog *pPrintDialog = 0 );
-    virtual SfxPrinter*     GetPrinter( BOOL bCreate );
-    virtual USHORT          SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
-    virtual String          GetSelectionText( BOOL bCompleteWords );
-    virtual BOOL            HasSelection( BOOL bText ) const;
+    // virtual sal_uInt16           Print( SfxProgress &rProgress, sal_Bool bIsAPI, PrintDialog *pPrintDialog = 0 );
+    virtual SfxPrinter*     GetPrinter( sal_Bool bCreate );
+    virtual sal_uInt16          SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
+    virtual String          GetSelectionText( sal_Bool bCompleteWords );
+    virtual sal_Bool            HasSelection( sal_Bool bText ) const;
 
     void                GetState( SfxItemSet& );
     void                ExecuteGlobal( SfxRequest& rReq );
@@ -215,13 +216,13 @@ public:
 
     ModulWindowLayout*  GetLayoutWindow() const { return pModulLayout; }
 
-    IDEBaseWindow*      FindWindow( const ScriptDocument& rDocument, const String& rLibName = String(), const String& rName = String(), USHORT nType = BASICIDE_TYPE_UNKNOWN, BOOL bFindSuspended = FALSE );
-    DialogWindow*       FindDlgWin( const ScriptDocument& rDocument, const String& rLibName, const String& rDlgName, BOOL bCreateIfNotExist, BOOL bFindSuspended = FALSE );
+    IDEBaseWindow*      FindWindow( const ScriptDocument& rDocument, const String& rLibName = String(), const String& rName = String(), sal_uInt16 nType = BASICIDE_TYPE_UNKNOWN, sal_Bool bFindSuspended = sal_False );
+    DialogWindow*       FindDlgWin( const ScriptDocument& rDocument, const String& rLibName, const String& rDlgName, sal_Bool bCreateIfNotExist, sal_Bool bFindSuspended = sal_False );
     IDEBaseWindow*      FindApplicationWindow();
-    BOOL                NextPage( BOOL bPrev = FALSE );
+    sal_Bool                NextPage( sal_Bool bPrev = sal_False );
 
-    BOOL                IsAppBasicModified() const { return m_bAppBasicModified; }
-    void                SetAppBasicModified( BOOL bModified = TRUE ) { m_bAppBasicModified = bModified; }
+    sal_Bool                IsAppBasicModified() const { return m_bAppBasicModified; }
+    void                SetAppBasicModified( sal_Bool bModified = sal_True ) { m_bAppBasicModified = bModified; }
 
     // For Dialog Drag&Drop in Dialog Organizer
     static void CopyDialogResources(
diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index c5c6f44587b9..08126ad33bdf 100644
--- a/basctl/source/inc/basobj.hxx
+++ b/basctl/source/inc/basobj.hxx
@@ -50,7 +50,7 @@ struct BasicIDE_Impl;
 
 namespace BasicIDE
 {
-    void            Organize( INT16 tabId );
+    void            Organize( sal_Int16 tabId );
 
 
     // Hilfsmethoden fuer den allg. Gebrauch:
@@ -60,10 +60,10 @@ namespace BasicIDE
     StarBASIC*  FindBasic( const SbxVariable* pVar );
     void            StopBasic();
     long         HandleBasicError( StarBASIC* pBasic );
-    void            BasicStopped( BOOL* pbAppWindowDisabled = 0, BOOL* pbDispatcherLocked = 0, USHORT* pnWaitCount = 0,
+    void            BasicStopped( sal_Bool* pbAppWindowDisabled = 0, sal_Bool* pbDispatcherLocked = 0, sal_uInt16* pnWaitCount = 0,
                             SfxUInt16Item** ppSWActionCount = 0, SfxUInt16Item** ppSWLockViewCount = 0 );
 
-    BOOL            IsValidSbxName( const String& rName );
+    sal_Bool            IsValidSbxName( const String& rName );
 
     BasicManager*       FindBasicManager( StarBASIC* pLib );
 
@@ -94,13 +94,13 @@ namespace BasicIDE
     // new methods for macros
 
     ::rtl::OUString     ChooseMacro( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxLimitToDocument,
-        BOOL bChooseOnly, const ::rtl::OUString& rMacroDesc );
+        sal_Bool bChooseOnly, const ::rtl::OUString& rMacroDesc );
 
     ::com::sun::star::uno::Sequence< ::rtl::OUString > GetMethodNames(
         const ScriptDocument& rDocument, const String& rLibName, const String& rModName )
         throw( ::com::sun::star::container::NoSuchElementException );
 
-    BOOL                    HasMethod(
+    sal_Bool                    HasMethod(
         const ScriptDocument& rDocument, const String& rLibName, const String& rModName, const String& rMethName );
 
     // new methods for dialogs
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 2630d0163a82..3d57ce7da634 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -70,14 +70,14 @@ sal_Int32 searchEOL( const ::rtl::OUString& rStr, sal_Int32 fromIndex );
 
 struct BasicStatus
 {
-    BOOL    bIsRunning      : 1;
-    BOOL    bError          : 1;
-    BOOL    bIsInReschedule : 1;
-    USHORT  nBasicFlags;
+    sal_Bool    bIsRunning      : 1;
+    sal_Bool    bError          : 1;
+    sal_Bool    bIsInReschedule : 1;
+    sal_uInt16  nBasicFlags;
 
     BasicStatus()   {
-            bIsRunning = FALSE; bError = FALSE;
-            nBasicFlags = 0; bIsInReschedule = FALSE; }
+            bIsRunning = sal_False; bError = sal_False;
+            nBasicFlags = 0; bIsInReschedule = sal_False; }
 };
 
 struct BreakPoint
@@ -96,10 +96,10 @@ class BasicDockingWindow : public DockingWindow
     Rectangle       aFloatingPosAndSize;
 
 protected:
-    virtual BOOL    Docking( const Point& rPos, Rectangle& rRect );
-    virtual void    EndDocking( const Rectangle& rRect, BOOL bFloatMode );
+    virtual sal_Bool    Docking( const Point& rPos, Rectangle& rRect );
+    virtual void    EndDocking( const Rectangle& rRect, sal_Bool bFloatMode );
     virtual void    ToggleFloatingMode();
-    virtual BOOL    PrepareToggleFloatingMode();
+    virtual sal_Bool    PrepareToggleFloatingMode();
     virtual void    StartDocking();
 
 public:
@@ -141,7 +141,7 @@ public:
 class TabBarSortHelper
 {
 public:
-    USHORT          nPageId;
+    sal_uInt16          nPageId;
     String          aPageText;
 
     bool operator<(const TabBarSortHelper& rComp) const { return (aPageText.CompareIgnoreCaseToAscii( rComp.aPageText ) == COMPARE_LESS); }
@@ -169,9 +169,13 @@ public:
 #define BASWIN_INRESCHEDULE     0x08
 
 class Printer;
-class SfxUndoManager;
 class BasicEntryDescriptor;
 
+namespace svl
+{
+    class IUndoManager;
+}
+
 class IDEBaseWindow : public Window
 {
 private:
@@ -179,7 +183,7 @@ private:
     ScrollBar*      pShellVScrollBar;
 
     DECL_LINK( ScrollHdl, ScrollBar * );
-    BYTE            nStatus;
+    sal_uInt8           nStatus;
 
     ScriptDocument      m_aDocument;
     String              m_aLibName;
@@ -207,7 +211,7 @@ public:
 
     virtual void    StoreData();
     virtual void    UpdateData();
-    virtual BOOL    CanClose();
+    virtual sal_Bool    CanClose();
 
     // return number of pages to be printed
     virtual sal_Int32 countPages( Printer* pPrinter ) = 0;
@@ -218,30 +222,31 @@ public:
     String          CreateQualifiedName();
     virtual BasicEntryDescriptor CreateEntryDescriptor() = 0;
 
-    virtual BOOL    IsModified();
-    virtual BOOL    IsPasteAllowed();
+    virtual sal_Bool    IsModified();
+    virtual sal_Bool    IsPasteAllowed();
 
-    virtual BOOL    AllowUndo();
+    virtual sal_Bool    AllowUndo();
 
-    virtual void    SetReadOnly( BOOL bReadOnly );
-    virtual BOOL    IsReadOnly();
+    virtual void    SetReadOnly( sal_Bool bReadOnly );
+    virtual sal_Bool    IsReadOnly();
 
-    BYTE            GetStatus()             { return nStatus; }
-    void            SetStatus( BYTE n )     { nStatus = n; }
-    void            AddStatus( BYTE n )     { nStatus = nStatus | n; }
-    void            ClearStatus( BYTE n )   { nStatus = nStatus & ~n; }
+    sal_uInt8           GetStatus()             { return nStatus; }
+    void            SetStatus( sal_uInt8 n )        { nStatus = n; }
+    void            AddStatus( sal_uInt8 n )        { nStatus = nStatus | n; }
+    void            ClearStatus( sal_uInt8 n )  { nStatus = nStatus & ~n; }
 
     virtual Window* GetLayoutWindow();
 
-    virtual SfxUndoManager* GetUndoManager();
+    virtual ::svl::IUndoManager*
+                    GetUndoManager();
 
-    virtual USHORT  GetSearchOptions();
+    virtual sal_uInt16  GetSearchOptions();
 
     virtual void    BasicStarted();
     virtual void    BasicStopped();
 
-    BOOL            IsSuspended() const
-                        { return ( nStatus & BASWIN_SUSPENDED ) ? TRUE : FALSE; }
+    sal_Bool            IsSuspended() const
+                        { return ( nStatus & BASWIN_SUSPENDED ) ? sal_True : sal_False; }
 
     const ScriptDocument&
                     GetDocument() const { return m_aDocument; }
@@ -279,10 +284,10 @@ private:
     ScriptDocument      m_aDocument;
     String              m_aLibName;
     String              m_aCurrentName;
-    USHORT              m_nCurrentType;
+    sal_uInt16              m_nCurrentType;
 
 public:
-    LibInfoItem( const ScriptDocument& rDocument, const String& rLibName, const String& rCurrentName, USHORT nCurrentType );
+    LibInfoItem( const ScriptDocument& rDocument, const String& rLibName, const String& rCurrentName, sal_uInt16 nCurrentType );
     ~LibInfoItem();
 
     LibInfoItem( const LibInfoItem& rItem );
@@ -292,7 +297,7 @@ public:
                     GetDocument() const { return m_aDocument; }
     const String&   GetLibName() const { return m_aLibName; }
     const String&   GetCurrentName() const { return m_aCurrentName; }
-    USHORT          GetCurrentType() const { return m_nCurrentType; }
+    sal_uInt16          GetCurrentType() const { return m_nCurrentType; }
 };
 
 class LibInfos
@@ -322,16 +327,16 @@ public:
     LibInfoItem*    GetInfo( const LibInfoKey& rKey );
 };
 
-void            CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, BOOL bEraseTrailingEmptyLines = FALSE );
+void            CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, sal_Bool bEraseTrailingEmptyLines = sal_False );
 String          CreateMgrAndLibStr( const String& rMgrName, const String& rLibName );
-ULONG           CalcLineCount( SvStream& rStream );
-
-BOOL            QueryReplaceMacro( const String& rName, Window* pParent = 0 );
-BOOL            QueryDelMacro( const String& rName, Window* pParent = 0 );
-BOOL            QueryDelDialog( const String& rName, Window* pParent = 0 );
-BOOL            QueryDelModule( const String& rName, Window* pParent = 0 );
-BOOL            QueryDelLib( const String& rName, BOOL bRef = FALSE, Window* pParent = 0 );
-BOOL            QueryPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xLibContainer, const String& rLibName, String& rPassword, BOOL bRepeat = FALSE, BOOL bNewTitle = FALSE );
+sal_uLong           CalcLineCount( SvStream& rStream );
+
+sal_Bool            QueryReplaceMacro( const String& rName, Window* pParent = 0 );
+sal_Bool            QueryDelMacro( const String& rName, Window* pParent = 0 );
+sal_Bool            QueryDelDialog( const String& rName, Window* pParent = 0 );
+sal_Bool            QueryDelModule( const String& rName, Window* pParent = 0 );
+sal_Bool            QueryDelLib( const String& rName, sal_Bool bRef = sal_False, Window* pParent = 0 );
+sal_Bool            QueryPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xLibContainer, const String& rLibName, String& rPassword, sal_Bool bRepeat = sal_False, sal_Bool bNewTitle = sal_False );
 
 class ModuleInfoHelper
 {
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx
index 67cff8dc7232..592940c8b827 100644
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@ -119,15 +119,15 @@ protected:
     Window*             pWindow;
     DlgEdFunc*          pFunc;
     DlgEdMode           eMode;
-    USHORT              eActObj;
-    BOOL                bFirstDraw;
+    sal_uInt16              eActObj;
+    sal_Bool                bFirstDraw;
     Size                aGridSize;
-    BOOL                bGridVisible;
-    BOOL                bGridSnap;
-    BOOL                bCreateOK;
+    sal_Bool                bGridVisible;
+    sal_Bool                bGridSnap;
+    sal_Bool                bCreateOK;
     Timer               aPaintTimer;
     Rectangle           aPaintRect;
-    BOOL                bDialogModelChanged;
+    sal_Bool                bDialogModelChanged;
     Timer               aMarkTimer;
     long                mnPaintGuard;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xDocument;
@@ -171,33 +171,33 @@ public:
 
     void            ShowDialog();
 
-    BOOL            UnmarkDialog();
-    BOOL            RemarkDialog();
+    sal_Bool            UnmarkDialog();
+    sal_Bool            RemarkDialog();
 
-    void            SetDialogModelChanged( BOOL bChanged = TRUE ) { bDialogModelChanged = bChanged; }
-    BOOL            IsDialogModelChanged() const { return bDialogModelChanged; }
+    void            SetDialogModelChanged( sal_Bool bChanged = sal_True ) { bDialogModelChanged = bChanged; }
+    sal_Bool            IsDialogModelChanged() const { return bDialogModelChanged; }
 
-    BOOL            IsModified() const;
+    sal_Bool            IsModified() const;
     void            ClearModifyFlag();
 
     void            MouseButtonDown( const MouseEvent& rMEvt );
     void            MouseButtonUp( const MouseEvent& rMEvt );
     void            MouseMove( const MouseEvent& rMEvt );
     void            Paint( const Rectangle& rRect );
-    BOOL            KeyInput( const KeyEvent& rKEvt );
+    sal_Bool            KeyInput( const KeyEvent& rKEvt );
 
     void            SetMode( DlgEdMode eMode );
-    void            SetInsertObj( USHORT eObj );
-    USHORT          GetInsertObj() const;
+    void            SetInsertObj( sal_uInt16 eObj );
+    sal_uInt16          GetInsertObj() const;
     void            CreateDefaultObject();
     DlgEdMode       GetMode() const { return eMode; }
-    BOOL            IsCreateOK() const { return bCreateOK; }
+    sal_Bool            IsCreateOK() const { return bCreateOK; }
 
     void            Cut();
     void            Copy();
     void            Paste();
     void            Delete();
-    BOOL            IsPasteAllowed();
+    sal_Bool            IsPasteAllowed();
 
     void            ShowProperties();
     void            UpdatePropertyBrowserDelayed();
diff --git a/basctl/source/inc/dlgeddef.hxx b/basctl/source/inc/dlgeddef.hxx
index ae7926b9fb20..85486f8bd288 100644
--- a/basctl/source/inc/dlgeddef.hxx
+++ b/basctl/source/inc/dlgeddef.hxx
@@ -32,36 +32,36 @@
 #include <tools/solar.h>
 
 
-const UINT32 DlgInventor = UINT32('D')*0x00000001+
-                           UINT32('L')*0x00000100+
-                           UINT32('G')*0x00010000+
-                           UINT32('1')*0x01000000;
+const sal_uInt32 DlgInventor = sal_uInt32('D')*0x00000001+
+                           sal_uInt32('L')*0x00000100+
+                           sal_uInt32('G')*0x00010000+
+                           sal_uInt32('1')*0x01000000;
 
 
-#define OBJ_DLG_CONTROL         ((UINT16) 1)
-#define OBJ_DLG_DIALOG          ((UINT16) 2)
-#define OBJ_DLG_PUSHBUTTON      ((UINT16) 3)
-#define OBJ_DLG_RADIOBUTTON     ((UINT16) 4)
-#define OBJ_DLG_CHECKBOX        ((UINT16) 5)
-#define OBJ_DLG_LISTBOX         ((UINT16) 6)
-#define OBJ_DLG_COMBOBOX        ((UINT16) 7)
-#define OBJ_DLG_GROUPBOX        ((UINT16) 8)
-#define OBJ_DLG_EDIT            ((UINT16) 9)
-#define OBJ_DLG_FIXEDTEXT       ((UINT16)10)
-#define OBJ_DLG_IMAGECONTROL    ((UINT16)11)
-#define OBJ_DLG_PROGRESSBAR     ((UINT16)12)
-#define OBJ_DLG_HSCROLLBAR      ((UINT16)13)
-#define OBJ_DLG_VSCROLLBAR      ((UINT16)14)
-#define OBJ_DLG_HFIXEDLINE      ((UINT16)15)
-#define OBJ_DLG_VFIXEDLINE      ((UINT16)16)
-#define OBJ_DLG_DATEFIELD       ((UINT16)17)
-#define OBJ_DLG_TIMEFIELD       ((UINT16)18)
-#define OBJ_DLG_NUMERICFIELD    ((UINT16)19)
-#define OBJ_DLG_CURRENCYFIELD   ((UINT16)20)
-#define OBJ_DLG_FORMATTEDFIELD  ((UINT16)21)
-#define OBJ_DLG_PATTERNFIELD    ((UINT16)22)
-#define OBJ_DLG_FILECONTROL     ((UINT16)23)
-#define OBJ_DLG_TREECONTROL     ((UINT16)24)
+#define OBJ_DLG_CONTROL         ((sal_uInt16) 1)
+#define OBJ_DLG_DIALOG          ((sal_uInt16) 2)
+#define OBJ_DLG_PUSHBUTTON      ((sal_uInt16) 3)
+#define OBJ_DLG_RADIOBUTTON     ((sal_uInt16) 4)
+#define OBJ_DLG_CHECKBOX        ((sal_uInt16) 5)
+#define OBJ_DLG_LISTBOX         ((sal_uInt16) 6)
+#define OBJ_DLG_COMBOBOX        ((sal_uInt16) 7)
+#define OBJ_DLG_GROUPBOX        ((sal_uInt16) 8)
+#define OBJ_DLG_EDIT            ((sal_uInt16) 9)
+#define OBJ_DLG_FIXEDTEXT       ((sal_uInt16)10)
+#define OBJ_DLG_IMAGECONTROL    ((sal_uInt16)11)
+#define OBJ_DLG_PROGRESSBAR     ((sal_uInt16)12)
+#define OBJ_DLG_HSCROLLBAR      ((sal_uInt16)13)
+#define OBJ_DLG_VSCROLLBAR      ((sal_uInt16)14)
+#define OBJ_DLG_HFIXEDLINE      ((sal_uInt16)15)
+#define OBJ_DLG_VFIXEDLINE      ((sal_uInt16)16)
+#define OBJ_DLG_DATEFIELD       ((sal_uInt16)17)
+#define OBJ_DLG_TIMEFIELD       ((sal_uInt16)18)
+#define OBJ_DLG_NUMERICFIELD    ((sal_uInt16)19)
+#define OBJ_DLG_CURRENCYFIELD   ((sal_uInt16)20)
+#define OBJ_DLG_FORMATTEDFIELD  ((sal_uInt16)21)
+#define OBJ_DLG_PATTERNFIELD    ((sal_uInt16)22)
+#define OBJ_DLG_FILECONTROL     ((sal_uInt16)23)
+#define OBJ_DLG_TREECONTROL     ((sal_uInt16)24)
 
 // control properties
 #define DLGED_PROP_BACKGROUNDCOLOR      ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BackgroundColor" ) )
diff --git a/basctl/source/inc/dlgedfunc.hxx b/basctl/source/inc/dlgedfunc.hxx
index 740485c801c8..82cb32912fa8 100644
--- a/basctl/source/inc/dlgedfunc.hxx
+++ b/basctl/source/inc/dlgedfunc.hxx
@@ -53,10 +53,10 @@ public:
     DlgEdFunc( DlgEditor* pParent );
     virtual ~DlgEdFunc();
 
-    virtual BOOL MouseButtonDown( const MouseEvent& rMEvt );
-    virtual BOOL MouseButtonUp( const MouseEvent& rMEvt );
-    virtual BOOL MouseMove( const MouseEvent& rMEvt );
-    virtual BOOL KeyInput( const KeyEvent& rKEvt );
+    virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt );
+    virtual sal_Bool MouseButtonUp( const MouseEvent& rMEvt );
+    virtual sal_Bool MouseMove( const MouseEvent& rMEvt );
+    virtual sal_Bool KeyInput( const KeyEvent& rKEvt );
 };
 
 //============================================================================
@@ -69,9 +69,9 @@ public:
     DlgEdFuncInsert( DlgEditor* pParent );
     ~DlgEdFuncInsert();
 
-    virtual BOOL MouseButtonDown( const MouseEvent& rMEvt );
-    virtual BOOL MouseButtonUp( const MouseEvent& rMEvt );
-    virtual BOOL MouseMove( const MouseEvent& rMEvt );
+    virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt );
+    virtual sal_Bool MouseButtonUp( const MouseEvent& rMEvt );
+    virtual sal_Bool MouseMove( const MouseEvent& rMEvt );
 };
 
 //============================================================================
@@ -81,15 +81,15 @@ public:
 class DlgEdFuncSelect : public DlgEdFunc
 {
 protected:
-    BOOL    bMarkAction;
+    sal_Bool    bMarkAction;
 
 public:
     DlgEdFuncSelect( DlgEditor* pParent );
     ~DlgEdFuncSelect();
 
-    virtual BOOL MouseButtonDown( const MouseEvent& rMEvt );
-    virtual BOOL MouseButtonUp( const MouseEvent& rMEvt );
-    virtual BOOL MouseMove( const MouseEvent& rMEvt );
+    virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt );
+    virtual sal_Bool MouseButtonUp( const MouseEvent& rMEvt );
+    virtual sal_Bool MouseMove( const MouseEvent& rMEvt );
 };
 
 
diff --git a/basctl/source/inc/dlgedpage.hxx b/basctl/source/inc/dlgedpage.hxx
index ed8682c3339b..ccece06aa8cf 100644
--- a/basctl/source/inc/dlgedpage.hxx
+++ b/basctl/source/inc/dlgedpage.hxx
@@ -56,7 +56,7 @@ public:
     void            SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; }
     DlgEdForm*      GetDlgEdForm() const { return pDlgEdForm; }
 
-    virtual SdrObject* SetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum);
+    virtual SdrObject* SetObjectOrdNum(sal_uLong nOldObjNum, sal_uLong nNewObjNum);
 };
 
 #endif //_BASCTL_DLGEDPAGE_HXX
diff --git a/basctl/source/inc/dlgedview.hxx b/basctl/source/inc/dlgedview.hxx
index 08da25932227..fb28ae18ae43 100644
--- a/basctl/source/inc/dlgedview.hxx
+++ b/basctl/source/inc/dlgedview.hxx
@@ -55,7 +55,7 @@ public:
 protected:
     // overloaded to handle HitTest for some objects special
     using SdrView::CheckSingleSdrObjectHit;
-    virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObject* pObj, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay) const;
+    virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uLong nOptions, const SetOfByte* pMVisLay) const;
 };
 
 #endif //_BASCTL_DLGEDVIEW_HXX
diff --git a/basctl/source/inc/iderid.hxx b/basctl/source/inc/iderid.hxx
index f8560ad45d00..c9a72affaa00 100644
--- a/basctl/source/inc/iderid.hxx
+++ b/basctl/source/inc/iderid.hxx
@@ -34,7 +34,7 @@
 class IDEResId: public ResId
 {
 public:
-    IDEResId( USHORT nId );
+    IDEResId( sal_uInt16 nId );
 };
 
 
diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx
index a3b0c907caf8..d1efe519c677 100644
--- a/basctl/source/inc/sbxitem.hxx
+++ b/basctl/source/inc/sbxitem.hxx
@@ -31,12 +31,12 @@
 #include "scriptdocument.hxx"
 #include <svl/poolitem.hxx>
 
-const USHORT BASICIDE_TYPE_UNKNOWN  =   0;
-const USHORT BASICIDE_TYPE_SHELL    =   1;
-const USHORT BASICIDE_TYPE_LIBRARY  =   2;
-const USHORT BASICIDE_TYPE_MODULE   =   3;
-const USHORT BASICIDE_TYPE_DIALOG   =   4;
-const USHORT BASICIDE_TYPE_METHOD   =   5;
+const sal_uInt16 BASICIDE_TYPE_UNKNOWN  =   0;
+const sal_uInt16 BASICIDE_TYPE_SHELL    =   1;
+const sal_uInt16 BASICIDE_TYPE_LIBRARY  =   2;
+const sal_uInt16 BASICIDE_TYPE_MODULE   =   3;
+const sal_uInt16 BASICIDE_TYPE_DIALOG   =   4;
+const sal_uInt16 BASICIDE_TYPE_METHOD   =   5;
 
 
 class SbxItem : public SfxPoolItem
@@ -45,12 +45,12 @@ class SbxItem : public SfxPoolItem
     String                  m_aLibName;
     String                  m_aName;
     String                  m_aMethodName;
-    USHORT                  m_nType;
+    sal_uInt16                  m_nType;
 
 public:
     TYPEINFO();
-    SbxItem( USHORT nWhich, const ScriptDocument& rDocument, const String& aLibName, const String& aName, USHORT nType );
-    SbxItem( USHORT nWhich, const ScriptDocument& rDocument, const String& aLibName, const String& aName, const String& aMethodName, USHORT nType );
+    SbxItem( sal_uInt16 nWhich, const ScriptDocument& rDocument, const String& aLibName, const String& aName, sal_uInt16 nType );
+    SbxItem( sal_uInt16 nWhich, const ScriptDocument& rDocument, const String& aLibName, const String& aName, const String& aMethodName, sal_uInt16 nType );
     SbxItem( const SbxItem& );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
@@ -69,8 +69,8 @@ public:
     const String&           GetMethodName() const { return m_aMethodName; }
     void                    SetMethodName( const String& aMethodName ) { m_aMethodName = aMethodName; }
 
-    USHORT                  GetType() const { return m_nType; }
-    void                    SetType( USHORT nType ) { m_nType = nType; }
+    sal_uInt16                  GetType() const { return m_nType; }
+    void                    SetType( sal_uInt16 nType ) { m_nType = nType; }
 };