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
author: Norbert Thiebaud <nthiebaud@gmail.com> 2011-03-09 16:20:50 -0600
committer: Norbert Thiebaud <nthiebaud@gmail.com> 2011-03-09 16:20:50 -0600
commit: cc5db648bcc3114fefcbf9741586f7cb6aa00b2f (patch)
tree: 518184d1a205c0173f30a54bbee0ffaa0f9bb433 /cui/source/inc
parent: 7fc838e84c345c13e1dbd32052e1d9c5985a7859 (diff)
parent: 8427b0f498b040a465cc20c4a323191d6b2aea5f (diff)
67 files changed, 1142 insertions, 1195 deletions
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 45cb973d3249..e9d39f679c0d 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -75,9 +75,9 @@ class SentenceEditWindow_Impl : public MultiLineEdit
     using MultiLineEdit::SetText;
 
 private:
-    std::set< USHORT >      m_aIgnoreErrorsAt;
-    USHORT          m_nErrorStart;
-    USHORT          m_nErrorEnd;
+    std::set< sal_uInt16 >      m_aIgnoreErrorsAt;
+    sal_uInt16          m_nErrorStart;
+    sal_uInt16          m_nErrorEnd;
     bool            m_bIsUndoEditMode;
 
     Link            m_aModifyLink;
@@ -94,12 +94,12 @@ public:
 
     void            SetModifyHdl(const Link& rLink) { m_aModifyLink = rLink;}
 
-    void            SetAttrib( const TextAttrib& rAttr, ULONG nPara, USHORT nStart, USHORT nEnd );
+    void            SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd );
     void            SetText( const String& rStr );
 
     bool            MarkNextError( bool bIgnoreCurrentError );
     void            ChangeMarkedWord(const String& rNewWord, LanguageType eLanguage);
-    void            MoveErrorMarkTo(USHORT nErrorStart, USHORT nErrorEnd, bool bGrammar);
+    void            MoveErrorMarkTo(sal_uInt16 nErrorStart, sal_uInt16 nErrorEnd, bool bGrammar);
     String          GetErrorText() const;
     void            RestoreCurrentError();
 
@@ -109,8 +109,8 @@ public:
     const SpellErrorDescription* GetAlternatives();
 
 
-    void            ResetModified()   { GetTextEngine()->SetModified(FALSE); m_bIsUndoEditMode = false;}
-    BOOL            IsModified() const              { return GetTextEngine()->IsModified(); }
+    void            ResetModified()   { GetTextEngine()->SetModified(sal_False); m_bIsUndoEditMode = false;}
+    sal_Bool            IsModified() const              { return GetTextEngine()->IsModified(); }
 
     bool            IsUndoEditMode() const { return m_bIsUndoEditMode;}
     void            SetUndoEditMode(bool bSet);
@@ -119,10 +119,10 @@ public:
 
     void            ResetUndo();
     void            Undo();
-    void            AddUndoAction( SfxUndoAction *pAction, BOOL bTryMerg=FALSE );
-    USHORT          GetUndoActionCount();
-    void            UndoActionStart( USHORT nId );
-    void            UndoActionEnd( USHORT nId );
+    void            AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg=sal_False );
+    sal_uInt16      GetUndoActionCount();
+    void            UndoActionStart( sal_uInt16 nId );
+    void            UndoActionEnd();
 
     void            MoveErrorEnd(long nOffset);
 
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
new file mode 100644
index 000000000000..abf154c81ac5
--- /dev/null
+++ b/cui/source/inc/about.hxx
@@ -0,0 +1,83 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+#ifndef _ABOUT_HXX
+#define _ABOUT_HXX
+
+// include ---------------------------------------------------------------
+
+#include <tools/resary.hxx>
+#include <vcl/button.hxx>
+#include <vcl/accel.hxx>
+#include <svtools/svmedit.hxx>
+#include <tools/list.hxx>
+#include <svtools/stdctrl.hxx>
+#include <sfx2/basedlgs.hxx>        // SfxModalDialog
+
+DECLARE_LIST( AccelList, Accelerator* )
+
+// class AboutDialog -----------------------------------------------------
+
+class AboutDialog : public SfxModalDialog
+{
+private:
+    OKButton        aOKButton;
+    Image           aAppLogo;
+
+    FixedInfo       aVersionText;
+    MultiLineEdit   aCopyrightText;
+    FixedInfo       aBuildData;
+
+    ResStringArray* pDeveloperAry;
+    String          aDevVersionStr;
+    String          aAccelStr;
+    String          aVersionData;
+    String          aCopyrightTextStr;
+
+    AccelList       aAccelList;
+
+    AutoTimer       aTimer;
+    long            nOff;
+    long            m_nDeltaWidth;
+    int             m_nPendingScrolls;
+
+    sal_Bool            bNormal;
+
+protected:
+    virtual sal_Bool    Close();
+    virtual void    Paint( const Rectangle& );
+
+public:
+    AboutDialog( Window* pParent, const ResId& nId );
+    ~AboutDialog();
+
+    DECL_LINK( TimerHdl, Timer * );
+    DECL_LINK( AccelSelectHdl, Accelerator * );
+};
+
+#endif // #ifndef _ABOUT_HXX
+
+
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 7d5ac47635d3..8935d1e726e6 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -87,7 +87,7 @@ public:
                                     m_pAccelConfigPage( pAccelConfigPage )
                                 {}
 
-    void                        ReplaceEntry( USHORT nPos, const String &rStr );
+    void                        ReplaceEntry( sal_uInt16 nPos, const String &rStr );
 };
 
 // class SfxAcceleratorConfigPage ----------------------------------------
@@ -104,7 +104,7 @@ struct TAccInfo
             , m_bIsConfigurable(sal_True )
             , m_sCommand       (         )
             , m_aKey           (aKey     )
-            // its important to set TRUE as default -
+            // its important to set sal_True as default -
             // because only fix entries will be disabled later ...
         {}
 
@@ -181,9 +181,7 @@ private:
 
     String                      GetLabel4Command(const String& sCommand);
     void                        InitAccCfg();
-    KeyCode                     MapPosToKeyCode( USHORT nPos ) const;
-    USHORT                      MapKeyCodeToPos( const KeyCode &rCode ) const;
-    String                      GetFunctionName( KeyFuncType eType ) const;
+    sal_uInt16                      MapKeyCodeToPos( const KeyCode &rCode ) const;
     css::uno::Reference< css::frame::XModel > SearchForAlreadyLoadedDoc(const String& sName);
     void                        StartFileDialog( WinBits nBits, const String& rTitle );
 
@@ -196,13 +194,10 @@ public:
                                 SfxAcceleratorConfigPage( Window *pParent, const SfxItemSet& rItemSet );
     virtual                     ~SfxAcceleratorConfigPage();
 
-    virtual BOOL                FillItemSet( SfxItemSet& );
+    virtual sal_Bool                FillItemSet( SfxItemSet& );
     virtual void                Reset( const SfxItemSet& );
 
-    void                        SelectMacro(const SfxMacroInfoItem*);
     void                        Apply(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr);
-    void                        CopySource2Target(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xSourceAccMgr,
-                                                  const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xTargetAccMgr);
     static SfxTabPage*          Create( Window* pParent, const SfxItemSet& rAttrSet );
 };
 
@@ -216,8 +211,8 @@ public:
     SfxAcceleratorConfigListBox( Window *pParent, ResId &rResId ) :
         ListBox( pParent, rResId ) {}
 
-    void ReplaceEntry( USHORT nPos, const String &rStr );
-    void ExpandEntry ( USHORT nPos, const String &rStr );
+    void ReplaceEntry( sal_uInt16 nPos, const String &rStr );
+    void ExpandEntry ( sal_uInt16 nPos, const String &rStr );
 };
 
 class SvxShortcutAssignDlg : public SfxSingleTabDialog
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index 6d005eba6774..3d39492b315b 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -32,7 +32,7 @@
 
 #include <svx/orienthelper.hxx>
 #include <vcl/field.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 #include <sfx2/tabdlg.hxx>
@@ -53,7 +53,7 @@ public:
     virtual             ~AlignmentTabPage();
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
     virtual BOOL        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 0338e23125ea..91e97c25eac9 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -54,7 +54,7 @@ public:
 
     OfaAutoCorrDlg(Window* pParent, const SfxItemSet *pSet );
 
-    void    EnableLanguage(BOOL bEnable)
+    void    EnableLanguage(sal_Bool bEnable)
             {   aLanguageFT.Enable(bEnable);
                 aLanguageLB.Enable(bEnable);}
 
@@ -86,14 +86,14 @@ class OfaACorrCheckListBox : public SvxSimpleTable
         OfaACorrCheckListBox(Window* pParent, const ResId& rResId ) :
             SvxSimpleTable( pParent, rResId ){}
 
-        inline void *GetUserData(ULONG nPos) { return GetEntry(nPos)->GetUserData(); }
-        inline void SetUserData(ULONG nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); }
-        inline ULONG GetSelectEntryPos() { return GetModel()->GetAbsPos(FirstSelected()); }
+        inline void *GetUserData(sal_uLong nPos) { return GetEntry(nPos)->GetUserData(); }
+        inline void SetUserData(sal_uLong nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); }
+        inline sal_uLong GetSelectEntryPos() { return GetModel()->GetAbsPos(FirstSelected()); }
 
-        BOOL            IsChecked(ULONG nPos, USHORT nCol = 0);
-        void            CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked);
-        SvButtonState   GetCheckButtonState( SvLBoxEntry*, USHORT nCol ) const;
-        void            SetCheckButtonState( SvLBoxEntry*, USHORT nCol, SvButtonState );
+        sal_Bool            IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0);
+        void            CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked);
+        SvButtonState   GetCheckButtonState( SvLBoxEntry*, sal_uInt16 nCol ) const;
+        void            SetCheckButtonState( SvLBoxEntry*, sal_uInt16 nCol, SvButtonState );
 };
 
 // class OfaAutocorrOptionsPage ------------------------------------------
@@ -124,7 +124,7 @@ public:
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
     virtual void        ActivatePage( const SfxItemSet& );
 
@@ -172,13 +172,13 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
 
     Font            aBulletFont;
     Font            aByInputBulletFont;
-    USHORT          nPercent;
+    sal_uInt16          nPercent;
 
     SvLBoxButtonData*   pCheckButtonData;
 
         DECL_LINK(SelectHdl, OfaACorrCheckListBox*);
         DECL_LINK(EditHdl, PushButton*);
-        SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol);
+        SvLBoxEntry* CreateEntry(String& rTxt, sal_uInt16 nCol);
 
 
         OfaSwAutoFmtOptionsPage( Window* pParent,
@@ -188,7 +188,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
     public:
         static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
-        virtual BOOL        FillItemSet( SfxItemSet& rSet );
+        virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
         virtual void        Reset( const SfxItemSet& rSet );
         virtual void        ActivatePage( const SfxItemSet& );
 };
@@ -198,16 +198,16 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
 class AutoCorrEdit : public Edit
 {
     Link    aActionLink;
-    BOOL    bSpaces;
+    sal_Bool    bSpaces;
 
     public:
                     AutoCorrEdit(Window* pParent, const ResId& rResId) :
-                        Edit(pParent, rResId), bSpaces(FALSE){}
+                        Edit(pParent, rResId), bSpaces(sal_False){}
 
     void            SetActionHdl( const Link& rLink )
                                 { aActionLink = rLink;}
 
-    void            SetSpaces(BOOL bSet)
+    void            SetSpaces(sal_Bool bSet)
                                 {bSpaces = bSet;}
 
     virtual void    KeyInput( const KeyEvent& rKEvent );
@@ -243,16 +243,16 @@ private:
         CharClass*              pCharClass;
         LanguageType            eLang;
 
-        BOOL            bHasSelectionText;
-        BOOL            bFirstSelect:1;
-        BOOL            bReplaceEditChanged:1;
-        BOOL            bSWriter:1;
+        sal_Bool            bHasSelectionText;
+        sal_Bool            bFirstSelect:1;
+        sal_Bool            bReplaceEditChanged:1;
+        sal_Bool            bSWriter:1;
 
         DECL_LINK(SelectHdl, SvTabListBox*);
         DECL_LINK(NewDelHdl, PushButton*);
         DECL_LINK(ModifyHdl, Edit*);
 
-        void            RefillReplaceBox(BOOL bFromReset, //Box mit neuer Sprache fuellen
+        void            RefillReplaceBox(sal_Bool bFromReset, //Box mit neuer Sprache fuellen
                                         LanguageType eOldLanguage,
                                         LanguageType eNewLanguage);
 
@@ -263,7 +263,7 @@ public:
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
     virtual void        ActivatePage( const SfxItemSet& );
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
@@ -305,7 +305,7 @@ private:
     DECL_LINK(SelectHdl, ListBox*);
     DECL_LINK(ModifyHdl, Edit*);
 
-    void            RefillReplaceBoxes(BOOL bFromReset, //Box filled with new language
+    void            RefillReplaceBoxes(sal_Bool bFromReset, //Box filled with new language
                                         LanguageType eOldLanguage,
                                         LanguageType eNewLanguage);
 public:
@@ -315,7 +315,7 @@ public:
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
     virtual void        ActivatePage( const SfxItemSet& );
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
@@ -380,7 +380,7 @@ private:
 
     String              ChangeStringExt_Impl( sal_UCS4 );
 
-    SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol);
+    SvLBoxEntry* CreateEntry(String& rTxt, sal_uInt16 nCol);
 
                         OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet );
 public:
@@ -389,7 +389,7 @@ public:
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
     virtual void        ActivatePage( const SfxItemSet& );
 };
@@ -427,7 +427,7 @@ class OfaAutoCompleteTabPage : public SfxTabPage
     AutoCompleteMultiListBox    aLBEntries;
     PushButton                  aPBEntries;
     SvStringsISortDtor*         pAutoCmpltList;
-    USHORT                      nAutoCmpltListCnt;
+    sal_uInt16                      nAutoCmpltListCnt;
 
     DECL_LINK( CheckHdl, CheckBox* );
 
@@ -439,7 +439,7 @@ public:
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
     virtual void        ActivatePage( const SfxItemSet& );
 
@@ -506,7 +506,7 @@ public:
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet);
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
     virtual void        ActivatePage( const SfxItemSet& );
 };
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 2f9cb86a55a5..d3cc4e589439 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -62,17 +62,17 @@ class SvxBackgroundTabPage : public SvxTabPage
     using TabPage::DeactivatePage;
 public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
     virtual void        FillUserData();
     virtual void        PointChanged( Window* pWindow, RECT_POINT eRP );
 
     void                ShowSelector(); // Shift-ListBox activation
     void                ShowTblControl(); // for the Writer (cells/rows/tables)
-    void                ShowParaControl(BOOL bCharOnly = FALSE); // for the Writer (paragraph/characters)
-    void                EnableTransparency(BOOL bColor, BOOL bGraphic);
+    void                ShowParaControl(sal_Bool bCharOnly = sal_False); // for the Writer (paragraph/characters)
+    void                EnableTransparency(sal_Bool bColor, sal_Bool bGraphic);
     virtual void        PageCreated (SfxAllItemSet aSet);
 protected:
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
@@ -81,7 +81,13 @@ private:
     SvxBackgroundTabPage( Window* pParent, const SfxItemSet& rCoreSet );
     ~SvxBackgroundTabPage();
 
-    // Background color ------------------------------------
+    FixedText               aSelectTxt;
+    ListBox                 aLbSelect;
+    const String            aStrBrowse;
+    const String            aStrUnlinked;
+     FixedText               aTblDesc;
+     ListBox                 aTblLBox;
+     ListBox                 aParaLBox;
     Control                 aBorderWin;
     ValueSet                aBackgroundColorSet;
     FixedLine               aBackgroundColorBox;
@@ -89,43 +95,33 @@ private:
     //color transparency
     FixedText               aColTransFT;
     MetricField             aColTransMF;
+    CheckBox                aBtnPreview;
     // Background Bitmap ----------------------------------
+     FixedLine               aGbFile;
     PushButton              aBtnBrowse;
     CheckBox                aBtnLink;
-    CheckBox                aBtnPreview;
-    FixedInfo               aFtFile;
-    FixedLine               aGbFile;
+      FixedLine               aGbPosition;
     RadioButton             aBtnPosition;
     RadioButton             aBtnArea;
     RadioButton             aBtnTile;
     SvxRectCtl              aWndPosition;
-    FixedLine               aGbPosition;
+    FixedInfo               aFtFile;
     //transparency of graphics
     FixedLine               aGraphTransFL;
     MetricField             aGraphTransMF;
 
     BackgroundPreviewImpl*  pPreviewWin2;
-    // Selector --------------------------------------------
-    FixedText               aSelectTxt;
-    ListBox                 aLbSelect;
-    const String            aStrBrowse;
-    const String            aStrUnlinked;
 
     // DDListBox for Writer -------------------------------
-
-    FixedText               aTblDesc;
-    ListBox                 aTblLBox;
-    ListBox                 aParaLBox;
-
     //------------------------------------------------------
     Color       aBgdColor;
-    USHORT      nHtmlMode;
-    BOOL        bAllowShowSelector  : 1;
-    BOOL        bIsGraphicValid     : 1;
-    BOOL        bLinkOnly           : 1;
-    BOOL        bResized            : 1;
-    BOOL        bColTransparency    : 1;
-    BOOL        bGraphTransparency  : 1;
+    sal_uInt16      nHtmlMode;
+    sal_Bool        bAllowShowSelector  : 1;
+    sal_Bool        bIsGraphicValid     : 1;
+    sal_Bool        bLinkOnly           : 1;
+    sal_Bool        bResized            : 1;
+    sal_Bool        bColTransparency    : 1;
+    sal_Bool        bGraphTransparency  : 1;
     Graphic     aBgdGraphic;
     String      aBgdGraphicPath;
     String      aBgdGraphicFilter;
@@ -142,13 +138,13 @@ private:
     void                FillColorValueSets_Impl();
     void                ShowColorUI_Impl();
     void                ShowBitmapUI_Impl();
-    BOOL                LoadLinkedGraphic_Impl();
+    sal_Bool                LoadLinkedGraphic_Impl();
     void                RaiseLoadError_Impl();
     void                SetGraphicPosition_Impl( SvxGraphicPosition ePos );
     SvxGraphicPosition  GetGraphicPosition_Impl();
     void                FillControls_Impl(const SvxBrushItem& rBgdAttr,
                                             const String& rUserData);
-    BOOL                FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, USHORT nSlot);
+    sal_Bool                FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, sal_uInt16 nSlot);
     void                ResetFromWallpaperItem( const SfxItemSet& rSet );
 
     DECL_LINK( LoadTimerHdl_Impl, Timer* );
diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx
index 0de4d99fa3a4..16274938ecaf 100644
--- a/cui/source/inc/bbdlg.hxx
+++ b/cui/source/inc/bbdlg.hxx
@@ -41,15 +41,15 @@ class SvxBorderBackgroundDlg: public SfxTabDialog
 public:
     SvxBorderBackgroundDlg( Window *pParent,
                             const SfxItemSet& rCoreSet,
-                            BOOL bEnableSelector = FALSE );
+                            sal_Bool bEnableSelector = sal_False );
 
     ~SvxBorderBackgroundDlg();
 
 protected:
-    virtual void    PageCreated( USHORT nPageId, SfxTabPage& rTabPage );
+    virtual void    PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage );
 
 private:
-    BOOL    bEnableBackgroundSelector; // for Border/Background
+    sal_Bool    bEnableBackgroundSelector; // for Border/Background
 };
 
 
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index aae0290453f2..19d97b6a8c32 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -53,9 +53,9 @@ class SvxBorderTabPage : public SfxTabPage
 public:
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& rCoreAttrs );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rCoreAttrs );
     virtual void        Reset( const SfxItemSet& );
 
     void                HideShadowControls();
@@ -123,7 +123,7 @@ private:
     bool                mbBLTREnabled;      /// true = Bottom-left to top-right border enabled.
     bool                mbUseMarginItem;
 
-    static BOOL         bSync;
+    static sal_Bool         bSync;
 
 #ifdef _SVX_BORDER_CXX
     // Handler
@@ -135,8 +135,8 @@ private:
     DECL_LINK( ModifyDistanceHdl_Impl, MetricField*);
     DECL_LINK( SyncHdl_Impl, CheckBox*);
 
-    USHORT              GetPresetImageId( USHORT nValueSetIdx ) const;
-    USHORT              GetPresetStringId( USHORT nValueSetIdx ) const;
+    sal_uInt16              GetPresetImageId( sal_uInt16 nValueSetIdx ) const;
+    sal_uInt16              GetPresetStringId( sal_uInt16 nValueSetIdx ) const;
 
     void                FillPresetVS();
     void                FillShadowVS();
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 827721bd1496..dfcbc59da534 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -75,9 +75,7 @@ public:
     SvxConfigDialog( Window*, const SfxItemSet* );
     ~SvxConfigDialog();
 
-    void                        ActivateTabPage( USHORT );
-
-    virtual void                PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void                PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
     virtual short               Ok();
 
     void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
@@ -123,7 +121,7 @@ public:
         const com::sun::star::uno::Reference
             < com::sun::star::uno::XInterface >& xManager );
 
-    void SetModified( bool bValue = TRUE ) { bModified = bValue; }
+    void SetModified( bool bValue = sal_True ) { bModified = bValue; }
     bool IsModified( ) { return bModified; }
 
     bool IsReadOnly( ) { return bReadOnly; }
@@ -222,7 +220,7 @@ public:
     // methods inherited from SaveInData
     SvxEntries*         GetEntries();
     void                SetEntries( SvxEntries* );
-    bool                HasURL( const rtl::OUString& URL ) { (void)URL; return FALSE; }
+    bool                HasURL( const rtl::OUString& URL ) { (void)URL; return sal_False; }
     bool                HasSettings() { return m_xMenuSettings.is(); }
     void                Reset();
     bool                Apply();
@@ -233,7 +231,7 @@ class SvxConfigEntry
 private:
 
     // common properties
-    USHORT                      nId;
+    sal_uInt16                      nId;
     ::rtl::OUString             aHelpText;
     ::rtl::OUString             aLabel;
     ::rtl::OUString             aCommand;
@@ -258,26 +256,20 @@ private:
 
 public:
 
-    SvxConfigEntry(
-        const ::com::sun::star::uno::Sequence<
-            ::com::sun::star::beans::PropertyValue >& rProperties,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::container::XNameAccess >& rCommandToLabelMap );
-
     SvxConfigEntry( const ::rtl::OUString& rDisplayName,
                     const ::rtl::OUString& rCommandURL,
-                    bool bPopup = FALSE,
-                    bool bParentData = FALSE );
+                    bool bPopup = sal_False,
+                    bool bParentData = sal_False );
 
     SvxConfigEntry()
         :
             nId( 0 ),
-            bPopUp( FALSE ),
-            bStrEdited( FALSE ),
-            bIsUserDefined( FALSE ),
-            bIsMain( FALSE ),
-            bIsParentData( FALSE ),
-            bIsVisible( TRUE ),
+            bPopUp( sal_False ),
+            bStrEdited( sal_False ),
+            bIsUserDefined( sal_False ),
+            bIsMain( sal_False ),
+            bIsParentData( sal_False ),
+            bIsVisible( sal_True ),
             nStyle( 0 ),
             pEntries( 0 )
     {}
@@ -288,7 +280,7 @@ public:
     void    SetCommand( const String& rCmd ) { aCommand = rCmd; }
 
     const ::rtl::OUString&      GetName() const { return aLabel; }
-    void    SetName( const String& rStr ) { aLabel = rStr; bStrEdited = TRUE; }
+    void    SetName( const String& rStr ) { aLabel = rStr; bStrEdited = sal_True; }
     bool    HasChangedName() const { return bStrEdited; }
 
     const ::rtl::OUString&      GetHelpText() ;
@@ -297,10 +289,10 @@ public:
     const ::rtl::OUString&      GetHelpURL() const { return aHelpURL; }
     void    SetHelpURL( const String& rStr ) { aHelpURL = rStr; }
 
-    void    SetPopup( bool bOn = TRUE ) { bPopUp = bOn; }
+    void    SetPopup( bool bOn = sal_True ) { bPopUp = bOn; }
     bool    IsPopup() const { return bPopUp; }
 
-    void    SetUserDefined( bool bOn = TRUE ) { bIsUserDefined = bOn; }
+    void    SetUserDefined( bool bOn = sal_True ) { bIsUserDefined = bOn; }
     bool    IsUserDefined() const { return bIsUserDefined; }
 
     bool    IsBinding() const { return !bPopUp; }
@@ -310,10 +302,10 @@ public:
     void    SetEntries( SvxEntries* entries ) { pEntries = entries; }
     bool    HasEntries() const { return pEntries != NULL; }
 
-    void    SetMain( bool bValue = TRUE ) { bIsMain = bValue; }
+    void    SetMain( bool bValue = sal_True ) { bIsMain = bValue; }
     bool    IsMain() { return bIsMain; }
 
-    void    SetParentData( bool bValue = TRUE ) { bIsParentData = bValue; }
+    void    SetParentData( bool bValue = sal_True ) { bIsParentData = bValue; }
     bool    IsParentData() { return bIsParentData; }
 
     bool    IsMovable();
@@ -337,11 +329,6 @@ public:
 
     sal_Int32   GetStyle() { return nStyle; }
     void        SetStyle( sal_Int32 style ) { nStyle = style; }
-
-    com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >
-        GetProperties(
-            const ::com::sun::star::uno::Reference<
-            ::com::sun::star::container::XNameAccess >& rCommandToLabelMap );
 };
 
 class SvxMenuEntriesListBox : public SvTreeListBox
@@ -358,13 +345,13 @@ public:
 
     virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt );
 
-    virtual BOOL        NotifyAcceptDrop( SvLBoxEntry* pEntry );
+    virtual sal_Bool        NotifyAcceptDrop( SvLBoxEntry* pEntry );
 
-    virtual BOOL        NotifyMoving( SvLBoxEntry*, SvLBoxEntry*,
-                                      SvLBoxEntry*&, ULONG& );
+    virtual sal_Bool        NotifyMoving( SvLBoxEntry*, SvLBoxEntry*,
+                                      SvLBoxEntry*&, sal_uLong& );
 
-    virtual BOOL        NotifyCopying( SvLBoxEntry*, SvLBoxEntry*,
-                                       SvLBoxEntry*&, ULONG&);
+    virtual sal_Bool        NotifyCopying( SvLBoxEntry*, SvLBoxEntry*,
+                                       SvLBoxEntry*&, sal_uLong&);
 
     virtual DragDropMode    NotifyStartDrag(
         TransferDataContainer&, SvLBoxEntry* );
@@ -457,13 +444,13 @@ protected:
 
     SvLBoxEntry*    InsertEntry(        SvxConfigEntry* pNewEntryData,
                                         SvLBoxEntry* pTarget = NULL,
-                                        bool bFront = FALSE );
+                                        bool bFront = sal_False );
 
     void            AddSubMenusToUI(    const String& rBaseTitle,
                                         SvxConfigEntry* pParentData );
 
     SvLBoxEntry*    InsertEntryIntoUI ( SvxConfigEntry* pNewEntryData,
-                                        ULONG nPos = LIST_APPEND );
+                                        sal_uLong nPos = LIST_APPEND );
 
     SvxEntries*     FindParentForChild( SvxEntries* pParentEntries,
                                         SvxConfigEntry* pChildData );
@@ -477,15 +464,15 @@ public:
     SaveInData*     GetSaveInData() { return pCurrentSaveInData; }
 
     SvLBoxEntry*    AddFunction( SvLBoxEntry* pTarget = NULL,
-                                 bool bFront = FALSE,
-                                 bool bAllowDuplicates = FALSE );
+                                 bool bFront = sal_False,
+                                 bool bAllowDuplicates = sal_False );
 
     virtual void    MoveEntry( bool bMoveUp );
 
     bool            MoveEntryData(  SvLBoxEntry* pSourceEntry,
                                     SvLBoxEntry* pTargetEntry );
 
-    BOOL            FillItemSet( SfxItemSet& );
+    sal_Bool            FillItemSet( SfxItemSet& );
     void            Reset( const SfxItemSet& );
 
     virtual bool    DeleteSelectedContent() = 0;
@@ -567,7 +554,7 @@ class SvxMainMenuOrganizerDialog : public ModalDialog
 public:
     SvxMainMenuOrganizerDialog (
         Window*, SvxEntries*,
-        SvxConfigEntry*, bool bCreateMenu = FALSE );
+        SvxConfigEntry*, bool bCreateMenu = sal_False );
 
     ~SvxMainMenuOrganizerDialog ();
 
@@ -608,11 +595,11 @@ public:
     Size            GetCheckBoxPixelSize() const
         { return m_aCheckBoxImageSizePixel; }
 
-    virtual BOOL    NotifyMoving(
-        SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, ULONG& );
+    virtual sal_Bool    NotifyMoving(
+        SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, sal_uLong& );
 
-    virtual BOOL    NotifyCopying(
-        SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, ULONG&);
+    virtual sal_Bool    NotifyCopying(
+        SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, sal_uLong&);
 
     void            KeyInput( const KeyEvent& rKeyEvent );
 };
@@ -641,8 +628,8 @@ public:
     ~SvxToolbarConfigPage();
 
     SvLBoxEntry*    AddFunction( SvLBoxEntry* pTarget = NULL,
-                                             bool bFront = FALSE,
-                                             bool bAllowDuplicates = TRUE );
+                                             bool bFront = sal_False,
+                                             bool bAllowDuplicates = sal_True );
 
     void            MoveEntry( bool bMoveUp );
 
@@ -693,7 +680,6 @@ public:
     void            RestoreToolbar( SvxConfigEntry* pToolbar );
     void            RemoveToolbar( SvxConfigEntry* pToolbar );
     void            ApplyToolbar( SvxConfigEntry* pToolbar );
-    void            ReloadToolbar( const rtl::OUString& rURL );
 
     rtl::OUString   GetSystemUIName( const rtl::OUString& rResourceURL );
 
@@ -743,7 +729,7 @@ public:
             aBtnOK.Enable( rLink.Call( this ) > 0 );
     }
 
-    void    SetEditHelpId(ULONG nHelpId) {aEdtName.SetHelpId(nHelpId);}
+    void    SetEditHelpId( const rtl::OString& aHelpId) {aEdtName.SetHelpId(aHelpId);}
 };
 
 class SvxIconSelectorDialog : public ModalDialog
@@ -816,7 +802,7 @@ public:
         const rtl::OUString& aMessage );
 
     rtl::OUString ReplaceIconName( const rtl::OUString& );
-    USHORT ShowDialog();
+    sal_uInt16 ShowDialog();
 };
 //added for issue83555
 class SvxIconChangeDialog : public ModalDialog
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index dbab5bf29df7..b8937689dee3 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -51,7 +51,6 @@ class SfxSlotPool;
 class SfxStringItem;
 class SfxFontItem;
 class SfxMacroInfoItem;
-class SfxMacroInfo;
 struct SfxStyleInfo_Impl;
 struct SfxStylesInfo_Impl;
 
@@ -96,29 +95,27 @@ struct SfxStylesInfo_Impl
         static ::rtl::OUString generateCommand(const ::rtl::OUString& sFamily, const ::rtl::OUString& sStyle);
 };
 
-#define SFX_CFGGROUP_FUNCTION 1
-#define SFX_CFGGROUP_BASICMGR 2
-#define SFX_CFGGROUP_DOCBASICMGR 3
-#define SFX_CFGGROUP_BASICLIB 4
-#define SFX_CFGGROUP_BASICMOD 5
-#define SFX_CFGFUNCTION_MACRO 6
-#define SFX_CFGFUNCTION_SLOT  7
-#define SFX_CFGGROUP_SCRIPTCONTAINER  8
-#define SFX_CFGFUNCTION_SCRIPT 9
-#define SFX_CFGGROUP_STYLES  10
-#define SFX_CFGGROUP_SPECIALCHARACTERS  11
+#define SFX_CFGGROUP_FUNCTION           1
+#define SFX_CFGFUNCTION_SLOT            2
+#define SFX_CFGGROUP_SCRIPTCONTAINER    3
+#define SFX_CFGFUNCTION_SCRIPT          4
+#define SFX_CFGGROUP_STYLES             5
 
 struct SfxGroupInfo_Impl
 {
-    USHORT      nKind;
-    USHORT      nOrd;
+    sal_uInt16  nKind;
+    sal_uInt16  nUniqueID;
     void*       pObject;
-    BOOL        bWasOpened;
+    sal_Bool        bWasOpened;
     String      sCommand;
     String      sLabel;
 
-                SfxGroupInfo_Impl( USHORT n, USHORT nr, void* pObj = 0 ) :
-                    nKind( n ), nOrd( nr ), pObject( pObj ), bWasOpened(FALSE) {}
+                SfxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr, void* pObj = 0 ) :
+                    nKind( n ), nUniqueID( nr ), pObject( pObj ), bWasOpened(sal_False) {}
+};
+
+struct CuiMacroInfo
+{
 };
 
 typedef SfxGroupInfo_Impl* SfxGroupInfoPtr;
@@ -140,15 +137,11 @@ public:
                   ~SfxConfigFunctionListBox_Impl();
 
     void          ClearAll();
-    SvLBoxEntry*  GetEntry_Impl( USHORT nId );
-    SvLBoxEntry*  GetEntry_Impl( const String& );
-    USHORT        GetId( SvLBoxEntry *pEntry );
     using Window::GetHelpText;
     String        GetHelpText( SvLBoxEntry *pEntry );
-    USHORT        GetCurId() { return GetId( FirstSelected() ); }
     String        GetCurCommand();
     String        GetCurLabel();
-    SfxMacroInfo* GetMacroInfo();
+    String        GetSelectedScriptURI();
     void          FunctionSelected();
     void          SetStylesInfo(SfxStylesInfo_Impl* pStyles);
 };
@@ -159,9 +152,7 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox
     SvxConfigGroupBoxResource_Impl* pImp;
     SfxConfigFunctionListBox_Impl*  pFunctionListBox;
     SfxGroupInfoArr_Impl            aArr;
-    ULONG                           nMode;
-    BOOL                            bShowSF; // show Scripting Framework scripts
-    BOOL                            bShowBasic; // show Basic scripts
+    sal_uLong                       nMode;
 
     ::rtl::OUString m_sModuleLongName;
     css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
@@ -181,7 +172,6 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox
         ::rtl::OUString& docName
     );
 
-    ::rtl::OUString parseLocationName( const ::rtl::OUString& location );
 
     void InitModule();
     void InitBasic();
@@ -194,12 +184,12 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox
 protected:
     virtual void        RequestingChilds( SvLBoxEntry *pEntry);
     using SvListView::Expand;
-    virtual BOOL        Expand( SvLBoxEntry* pParent );
+    virtual sal_Bool        Expand( SvLBoxEntry* pParent );
 
 public:
     SfxConfigGroupListBox_Impl ( Window* pParent,
                                  const ResId&,
-                                 ULONG nConfigMode = 0 );
+                                 sal_uLong nConfigMode = 0 );
     ~SfxConfigGroupListBox_Impl();
     void                ClearAll();
 
@@ -208,14 +198,11 @@ public:
                              const ::rtl::OUString&                                        sModuleLongName);
     void                SetFunctionListBox( SfxConfigFunctionListBox_Impl *pBox )
                         { pFunctionListBox = pBox; }
-    void                Open( SvLBoxEntry*, BOOL );
+    void                Open( SvLBoxEntry*, sal_Bool );
     void                GroupSelected();
     void                SelectMacro( const SfxMacroInfoItem* );
-    void                AddAndSelect( const SfxStringItem*, const SfxStringItem* );
     void                SelectMacro( const String&, const String& );
     String              GetGroup();
-    BasicManager*       GetBasicManager( const SvLBoxEntry& _rEntry );
-    void                SetScriptType( const String& rScriptType );
     void                SetStylesInfo(SfxStylesInfo_Impl* pStyles);
 };
 
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index dda5a8de47e4..5f88aa64fd3b 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -44,13 +44,13 @@ class FontList;
 
 // -----------------------------------------------------------------------
 
-#define DISABLE_CASEMAP             ((USHORT)0x0001)
-#define DISABLE_WORDLINE            ((USHORT)0x0002)
-#define DISABLE_BLINK               ((USHORT)0x0004)
-#define DISABLE_UNDERLINE_COLOR     ((USHORT)0x0008)
+#define DISABLE_CASEMAP             ((sal_uInt16)0x0001)
+#define DISABLE_WORDLINE            ((sal_uInt16)0x0002)
+#define DISABLE_BLINK               ((sal_uInt16)0x0004)
+#define DISABLE_UNDERLINE_COLOR     ((sal_uInt16)0x0008)
 
-#define DISABLE_LANGUAGE            ((USHORT)0x0010)
-#define DISABLE_HIDE_LANGUAGE       ((USHORT)0x0020)
+#define DISABLE_LANGUAGE            ((sal_uInt16)0x0010)
+#define DISABLE_HIDE_LANGUAGE       ((sal_uInt16)0x0020)
 
 // class SvxCharBasePage -------------------------------------------------
 
@@ -60,18 +60,18 @@ protected:
     SvxFontPrevWindow   m_aPreviewWin;
     FixedInfo           m_aFontTypeFT;
 
-    BOOL                m_bPreviewBackgroundToCharacter;
+    sal_Bool                m_bPreviewBackgroundToCharacter;
 
                         SvxCharBasePage( Window* pParent, const ResId& rResIdTabPage, const SfxItemSet&,
-                                            USHORT nResIdPrewievWin, USHORT nResIdFontTypeFT );
+                                            sal_uInt16 nResIdPrewievWin, sal_uInt16 nResIdFontTypeFT );
     virtual             ~SvxCharBasePage();
 
-    void                SetPrevFontSize( const SfxItemSet& rSet, USHORT nSlot, SvxFont& rFont );
-    void                SetPrevFont( const SfxItemSet& rSet, USHORT nSlot, SvxFont& rFont );
-    void                SetPrevFontStyle( const SfxItemSet& rSet, USHORT nSlotPosture, USHORT nSlotWeight, SvxFont& rFont ); // posture/weight
+    void                SetPrevFontSize( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont );
+    void                SetPrevFont( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont );
+    void                SetPrevFontStyle( const SfxItemSet& rSet, sal_uInt16 nSlotPosture, sal_uInt16 nSlotWeight, SvxFont& rFont ); // posture/weight
     void                SetPrevFontWidthScale( const SfxItemSet& rSet );
 
-    void                SetPrevFontEscapement( BYTE nProp, BYTE nEscProp, short nEsc );
+    void                SetPrevFontEscapement( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc );
 
     inline SvxFont&     GetPreviewFont();
     inline SvxFont&     GetPreviewCJKFont();
@@ -153,9 +153,8 @@ private:
     };
 
     void                Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp );
-    BOOL                FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp );
+    sal_Bool                FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp );
     void                ResetColor_Impl( const SfxItemSet& rSet );
-    BOOL                FillItemSetColor_Impl( SfxItemSet& rSet );
 
     DECL_LINK(          UpdateHdl_Impl, Timer* );
     DECL_LINK(          FontModifyHdl_Impl, void* );
@@ -172,10 +171,10 @@ public:
                         ~SvxCharNamePage();
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
     virtual void        Reset( const SfxItemSet& rSet );
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
 
     void                SetFontList( const SvxFontListItem& rItem );
     void                EnableRelativeMode();
@@ -183,7 +182,7 @@ public:
     //                  the writer uses SID_ATTR_BRUSH as font background
     void                SetPreviewBackgroundToCharacter();
 
-    void                DisableControls( USHORT nDisable );
+    void                DisableControls( sal_uInt16 nDisable );
     virtual void        PageCreated (SfxAllItemSet aSet);
 };
 
@@ -234,7 +233,7 @@ private:
     FixedText           m_aPositionFT;
     ListBox             m_aPositionLB;
 
-    USHORT              m_nHtmlMode;
+    sal_uInt16              m_nHtmlMode;
 
     String              m_aTransparentColorName;
 
@@ -244,7 +243,7 @@ private:
     void                UpdatePreview_Impl();
     void                SetCaseMap_Impl( SvxCaseMap eCaseMap );
     void                ResetColor_Impl( const SfxItemSet& rSet );
-    BOOL                FillItemSetColor_Impl( SfxItemSet& rSet );
+    sal_Bool                FillItemSetColor_Impl( SfxItemSet& rSet );
 
     DECL_LINK(          SelectHdl_Impl, ListBox* );
     DECL_LINK(          CbClickHdl_Impl, CheckBox* );
@@ -259,12 +258,12 @@ public:
 
 public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
     virtual void        Reset( const SfxItemSet& rSet );
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
 
-    void                DisableControls( USHORT nDisable );
+    void                DisableControls( sal_uInt16 nDisable );
     void                EnableFlash();
     //                  the writer uses SID_ATTR_BRUSH as font background
     void                SetPreviewBackgroundToCharacter();
@@ -304,17 +303,17 @@ private:
     short               m_nSuperEsc;
     short               m_nSubEsc;
 
-    UINT16              m_nScaleWidthItemSetVal;
-    UINT16              m_nScaleWidthInitialVal;
+    sal_uInt16              m_nScaleWidthItemSetVal;
+    sal_uInt16              m_nScaleWidthInitialVal;
 
-    BYTE                m_nSuperProp;
-    BYTE                m_nSubProp;
+    sal_uInt8                m_nSuperProp;
+    sal_uInt8                m_nSubProp;
 
                         SvxCharPositionPage( Window* pParent, const SfxItemSet& rSet );
 
     void                Initialize();
-    void                UpdatePreview_Impl( BYTE nProp, BYTE nEscProp, short nEsc );
-    void                SetEscapement_Impl( USHORT nEsc );
+    void                UpdatePreview_Impl( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc );
+    void                SetEscapement_Impl( sal_uInt16 nEsc );
 
     DECL_LINK(          PositionHdl_Impl, RadioButton* );
     DECL_LINK(          RotationHdl_Impl, RadioButton* );
@@ -336,10 +335,10 @@ public:
 
 public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
     virtual void        Reset( const SfxItemSet& rSet );
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        FillUserData();
     //                  the writer uses SID_ATTR_BRUSH as font background
     void                SetPreviewBackgroundToCharacter();
@@ -360,15 +359,15 @@ private:
     FixedText           m_aEndBracketFT;
     ListBox             m_aEndBracketLB;
 
-    USHORT              m_nStartBracketPosition;
-    USHORT              m_nEndBracketPosition;
+    sal_uInt16              m_nStartBracketPosition;
+    sal_uInt16              m_nEndBracketPosition;
 
                         SvxCharTwoLinesPage( Window* pParent, const SfxItemSet& rSet );
 
     void                UpdatePreview_Impl();
     void                Initialize();
     void                SelectCharacter( ListBox* pBox );
-    void                SetBracket( sal_Unicode cBracket, BOOL bStart );
+    void                SetBracket( sal_Unicode cBracket, sal_Bool bStart );
 
     DECL_LINK(          TwoLinesHdl_Impl, CheckBox* );
     DECL_LINK(          CharacterMapHdl_Impl, ListBox* );
@@ -382,10 +381,10 @@ public:
 
 public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
     virtual void        Reset( const SfxItemSet& rSet );
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     //                  the writer uses SID_ATTR_BRUSH as font background
     void                SetPreviewBackgroundToCharacter();
     virtual void        PageCreated (SfxAllItemSet aSet);
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index eed7886fc6f1..00898a57c1f6 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -89,9 +89,9 @@ public:
     ~SvxConnectionPage();
 
     static SfxTabPage*  Create( Window*, const SfxItemSet& );
-    static  USHORT*     GetRanges();
+    static  sal_uInt16*     GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& );
+    virtual sal_Bool        FillItemSet( SfxItemSet& );
     virtual void        Reset( const SfxItemSet & );
 
     void         Construct();
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index 9480141e1bb5..040c299b7c6a 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -61,7 +61,7 @@ class SvxShowText : public Control
 public:
                     SvxShowText( Window* pParent,
                                  const ResId& rResId,
-                                 BOOL bCenter = FALSE );
+                                 sal_Bool bCenter = sal_False );
                     ~SvxShowText();
 
     void            SetFont( const Font& rFont );
@@ -72,14 +72,14 @@ protected:
 
 private:
     long            mnY;
-    BOOL            mbCenter;
+    sal_Bool            mbCenter;
 
 };
 
 class SvxCharMapData
 {
 public:
-                    SvxCharMapData( class SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pResContext );
+                    SvxCharMapData( class SfxModalDialog* pDialog, sal_Bool bOne_, ResMgr* pResContext );
 
     void            SetCharFont( const Font& rFont );
 
@@ -101,7 +101,7 @@ friend class SvxCharacterMap;
     SvxShowText     aShowChar;
     FixedText       aCharCodeText;
     Font            aFont;
-    BOOL            bOne;
+    sal_Bool            bOne;
     const SubsetMap* pSubsetMap;
 
     DECL_LINK( OKHdl, OKButton* );
@@ -121,7 +121,7 @@ private:
     SvxCharMapData* mpCharMapData;
 
 public:
-                    SvxCharacterMap( Window* pParent, BOOL bOne=TRUE, const SfxItemSet* pSet=0 );
+                    SvxCharacterMap( Window* pParent, sal_Bool bOne=sal_True, const SfxItemSet* pSet=0 );
                     ~SvxCharacterMap();
 
     void            DisableFontSelection();
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 536c94f1b454..79a9b58f9350 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -84,7 +84,7 @@ private:
 
     void                        ImplSearch( const INetURLObject& rStartURL,
                                             const ::std::vector< String >& rFormats,
-                                            BOOL bRecursive );
+                                            sal_Bool bRecursive );
 
     virtual void SAL_CALL       run();
     virtual void SAL_CALL       onTerminated();
@@ -245,7 +245,7 @@ public:
                     GalleryIdDialog( Window* pParent, GalleryTheme* pThm );
                     ~GalleryIdDialog() {}
 
-    ULONG           GetId() const { return aLbResName.GetSelectEntryPos(); }
+    sal_uLong           GetId() const { return aLbResName.GetSelectEntryPos(); }
 };
 
 // --------------------------
@@ -256,7 +256,7 @@ class GalleryThemeProperties : public SfxTabDialog
 {
     ExchangeData*   pData;
 
-    virtual void    PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void    PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
 
 public:
 
@@ -287,7 +287,7 @@ private:
     ExchangeData*       pData;
 
     virtual void        Reset( const SfxItemSet& ) {}
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
 
 
 public:
@@ -311,13 +311,13 @@ class TPGalleryThemeProperties : public SfxTabPage
     friend class TakeProgress;
     friend class TakeThread;
 
+    FixedText           aFtFileType;
+    ComboBox            aCbbFileType;
+    MultiListBox        aLbxFound;
     PushButton          aBtnSearch;
     PushButton          aBtnTake;
     PushButton          aBtnTakeAll;
     CheckBox            aCbxPreview;
-    ComboBox            aCbbFileType;
-    MultiListBox        aLbxFound;
-    FixedText           aFtFileType;
     GalleryPreview      aWndPreview;
 
     ExchangeData*       pData;
@@ -327,19 +327,19 @@ class TPGalleryThemeProperties : public SfxTabPage
     String              aLastFilterName;
     String              aPreviewString;
     INetURLObject       aURL;
-    USHORT              nCurFilterPos;
-    USHORT              nFirstExtFilterPos;
-    BOOL                bEntriesFound;
-    BOOL                bInputAllowed;
-    BOOL                bTakeAll;
-    BOOL                bSearchRecursive;
+    sal_uInt16              nCurFilterPos;
+    sal_uInt16              nFirstExtFilterPos;
+    sal_Bool                bEntriesFound;
+    sal_Bool                bInputAllowed;
+    sal_Bool                bTakeAll;
+    sal_Bool                bSearchRecursive;
 
     ::com::sun::star::uno::Reference< ::svt::DialogClosedListener >                  xDialogListener;
     ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer >             xMediaPlayer;
     ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker > xFolderPicker;
 
     virtual void        Reset( const SfxItemSet& /*rSet*/ ) {}
-    virtual BOOL        FillItemSet( SfxItemSet& /*rSet*/ ) { return TRUE; }
+    virtual sal_Bool        FillItemSet( SfxItemSet& /*rSet*/ ) { return sal_True; }
     ::rtl::OUString     addExtension( const ::rtl::OUString&, const ::rtl::OUString& );
     void                FillFilterList();
 
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index 9fa35dd4dc87..0c6061068261 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -73,16 +73,16 @@ private:
     double          mfScaleX;
     double          mfScaleY;
     Size            maSizePixel;
-    PreviewWindow   maPreview;
-    FixedLine       maFlParameter;
-    OKButton        maBtnOK;
-    CancelButton    maBtnCancel;
-    HelpButton      maBtnHelp;
 
                     DECL_LINK( ImplPreviewTimeoutHdl, Timer* pTimer );
                     DECL_LINK( ImplModifyHdl, void* p );
 
 protected:
+    PreviewWindow   maPreview;
+    OKButton        maBtnOK;
+    CancelButton    maBtnCancel;
+    HelpButton      maBtnHelp;
+    FixedLine       maFlParameter;
 
     const Link&     GetModifyHdl() const { return maModifyHdl; }
     const Size&     GetGraphicSizePixel() const { return maSizePixel; }
@@ -112,13 +112,13 @@ private:
 public:
 
                     GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic,
-                                         USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges );
+                                         sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges );
                     ~GraphicFilterMosaic();
 
     virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
     long            GetTileWidth() const { return static_cast<long>(maMtrWidth.GetValue()); }
     long            GetTileHeight() const { return static_cast<long>(maMtrHeight.GetValue()); }
-    BOOL            IsEnhanceEdges() const { return maCbxEdges.IsChecked(); }
+    sal_Bool            IsEnhanceEdges() const { return maCbxEdges.IsChecked(); }
 };
 
 // -------------------------
@@ -136,12 +136,12 @@ private:
 public:
 
                     GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic,
-                                           BYTE nGreyThreshold, BOOL bInvert );
+                                           sal_uInt8 nGreyThreshold, sal_Bool bInvert );
                     ~GraphicFilterSolarize();
 
     virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
-    BYTE            GetGreyThreshold() const { return( (BYTE) FRound( maMtrThreshold.GetValue() * 2.55 ) ); }
-    BOOL            IsInvert() const { return maCbxInvert.IsChecked(); }
+    sal_uInt8           GetGreyThreshold() const { return( (sal_uInt8) FRound( maMtrThreshold.GetValue() * 2.55 ) ); }
+    sal_Bool            IsInvert() const { return maCbxInvert.IsChecked(); }
 };
 
 // ----------------------
@@ -158,12 +158,12 @@ private:
 public:
 
                     GraphicFilterSepia( Window* pParent, const Graphic& rGraphic,
-                                        USHORT nSepiaPercent );
+                                        sal_uInt16 nSepiaPercent );
                     ~GraphicFilterSepia();
 
     virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
-    USHORT          GetSepiaPercent() const
-    { return sal::static_int_cast< USHORT >(maMtrSepia.GetValue()); }
+    sal_uInt16          GetSepiaPercent() const
+    { return sal::static_int_cast< sal_uInt16 >(maMtrSepia.GetValue()); }
 };
 
 // -----------------------
@@ -180,11 +180,11 @@ private:
 public:
 
                     GraphicFilterPoster( Window* pParent, const Graphic& rGraphic,
-                                         USHORT nPosterColorCount );
+                                         sal_uInt16 nPosterColorCount );
                     ~GraphicFilterPoster();
 
     virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
-    USHORT          GetPosterColorCount() const { return( (USHORT) maNumPoster.GetValue() ); }
+    sal_uInt16          GetPosterColorCount() const { return( (sal_uInt16) maNumPoster.GetValue() ); }
 };
 
 // -----------------------
diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index 3c2d1ebc10cf..86d930620e3e 100644
--- a/cui/source/inc/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -55,9 +55,9 @@ private :
     SfxStatusForwarder aRdOnlyForwarder;
 
 public :
-    SvxHlinkCtrl( USHORT nId, SfxBindings & rBindings, SvxHpLinkDlg* pDlg);
+    SvxHlinkCtrl( sal_uInt16 nId, SfxBindings & rBindings, SvxHpLinkDlg* pDlg);
 
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                 const SfxPoolItem* pState );
 };
 
@@ -92,19 +92,19 @@ private:
     DECL_LINK (ClickCloseHdl_Impl, void * );
 
 protected:
-    virtual BOOL            Close();
+    virtual sal_Bool            Close();
     virtual void            Move();
 
 public:
     SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings );
     ~SvxHpLinkDlg ();
 
-    virtual void            PageCreated( USHORT nId, IconChoicePage& rPage );
+    virtual void            PageCreated( sal_uInt16 nId, IconChoicePage& rPage );
 
-    USHORT                  SetPage( SvxHyperlinkItem* pItem );
+    sal_uInt16                  SetPage( SvxHyperlinkItem* pItem );
     void                    EnableInetBrowse( sal_Bool bEnable = sal_True );
     void                    SetReadOnlyMode( sal_Bool bReadOnly = sal_False );
-    inline BOOL     IsHTMLDoc() const { return mbIsHTMLDoc; }
+    inline sal_Bool     IsHTMLDoc() const { return mbIsHTMLDoc; }
 
     inline SfxBindings*     GetBindings() const { return mpBindings; };
     inline SfxDispatcher*   GetDispatcher() const { return mpBindings->GetDispatcher(); }
diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index e96e639c05ef..40466a3e6b0e 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -119,7 +119,7 @@ public:
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 };
 
diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx
index 6f6718f55378..f1bf39764c55 100644
--- a/cui/source/inc/cuisrchdlg.hxx
+++ b/cui/source/inc/cuisrchdlg.hxx
@@ -51,7 +51,7 @@ class SvxJSearchOptionsPage;
 
 class SvxJSearchOptionsDialog : public SfxSingleTabDialog
 {
-    INT32                   nInitialTlFlags;
+    sal_Int32                   nInitialTlFlags;
     SvxJSearchOptionsPage  *pPage;
 
     // disallow copy-constructor and assignment-operator for now
@@ -61,14 +61,13 @@ class SvxJSearchOptionsDialog : public SfxSingleTabDialog
 public:
     SvxJSearchOptionsDialog( Window *pParent,
                             const SfxItemSet& rOptionsSet,
-                            INT32 nInitialFlags  );
+                            sal_Int32 nInitialFlags  );
     virtual ~SvxJSearchOptionsDialog();
 
     // Window
     virtual void    Activate();
 
-    INT32           GetTransliterationFlags() const;
-    void            SetTransliterationFlags( INT32 nSettings );
+    sal_Int32           GetTransliterationFlags() const;
 };
 
 #endif
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 25af5b0283b4..eee2bc172dfa 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -59,13 +59,13 @@ private:
     ChangeType          mnGradientListState;
     ChangeType          mnHatchingListState;
 
-    USHORT              mnPageType;
-    USHORT              mnDlgType;
-    USHORT              mnPos;
-    BOOL                mbAreaTP;
-    BOOL                mbDeleteColorTable;
+    sal_uInt16              mnPageType;
+    sal_uInt16              mnDlgType;
+    sal_uInt16              mnPos;
+    sal_Bool                mbAreaTP;
+    sal_Bool                mbDeleteColorTable;
 
-    virtual void        PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void        PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
 
 protected:
     virtual short       Ok();
@@ -102,7 +102,7 @@ public:
     XBitmapList*         GetNewBitmapList() const { return mpNewBitmapList; }
     const XBitmapList*   GetBitmapList() const { return mpBitmapList; }
 
-    void                 DontDeleteColorTable() { mbDeleteColorTable = FALSE; }
+    void                 DontDeleteColorTable() { mbDeleteColorTable = sal_False; }
 };
 
 /*************************************************************************
@@ -119,8 +119,8 @@ class SvxTransparenceTabPage : public SvxTabPage
     const SfxItemSet&   rOutAttrs;
     RECT_POINT          eRP;
 
-    UINT16             nPageType;
-    UINT16             nDlgType;
+    sal_uInt16          nPageType;
+    sal_uInt16          nDlgType;
 
     // main selection
     FixedLine           aFlProp;
@@ -150,7 +150,7 @@ class SvxTransparenceTabPage : public SvxTabPage
     // preview
     SvxXRectPreview     aCtlBitmapPreview;
     SvxXRectPreview     aCtlXRectPreview;
-    BOOL                bBitmap;
+    sal_Bool                bBitmap;
 
     XOutdevItemPool*    pXPool;
     XFillAttrSetItem    aXFillAttr;
@@ -165,28 +165,28 @@ class SvxTransparenceTabPage : public SvxTabPage
     DECL_LINK(ModifiedTrgrHdl_Impl, void*);
 #endif
 
-    void ActivateLinear(BOOL bActivate);
-    void ActivateGradient(BOOL bActivate);
+    void ActivateLinear(sal_Bool bActivate);
+    void ActivateGradient(sal_Bool bActivate);
     void SetControlState_Impl(XGradientStyle eXGS);
 
-    BOOL InitPreview ( const SfxItemSet& rSet );
-    void InvalidatePreview (BOOL bEnable = TRUE );
+    sal_Bool InitPreview ( const SfxItemSet& rSet );
+    void InvalidatePreview (sal_Bool bEnable = sal_True );
 
 public:
     SvxTransparenceTabPage(Window* pParent, const SfxItemSet& rInAttrs);
     void Construct();
 
     static SfxTabPage* Create(Window*, const SfxItemSet&);
-    static UINT16* GetRanges();
+    static sal_uInt16* GetRanges();
 
-    virtual BOOL FillItemSet(SfxItemSet&);
+    virtual sal_Bool FillItemSet(SfxItemSet&);
     virtual void Reset(const SfxItemSet&);
     virtual void ActivatePage(const SfxItemSet& rSet);
     virtual int  DeactivatePage(SfxItemSet* pSet);
     virtual void PointChanged(Window* pWindow, RECT_POINT eRP);
 
-    void SetPageType(UINT16 nInType) { nPageType = nInType; }
-    void SetDlgType(UINT16 nInType) { nDlgType = nInType; }
+    void SetPageType(sal_uInt16 nInType) { nPageType = nInType; }
+    void SetDlgType(sal_uInt16 nInType) { nDlgType = nInType; }
     virtual void PageCreated (SfxAllItemSet aSet);
 };
 
@@ -253,11 +253,11 @@ private:
     ChangeType*         pnGradientListState;
     ChangeType*         pnHatchingListState;
 
-    UINT16 nPageType;
-    UINT16 nDlgType;
-    UINT16 nPos;
+    sal_uInt16 nPageType;
+    sal_uInt16 nDlgType;
+    sal_uInt16 nPos;
 
-    BOOL*               pbAreaTP;
+    sal_Bool*               pbAreaTP;
 
     XOutdevItemPool*    pXPool;
     XFillAttrSetItem    aXFillAttr;
@@ -290,9 +290,9 @@ public:
     void    Construct();
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    static  USHORT*     GetRanges();
+    static  sal_uInt16*     GetRanges();
 
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
     virtual void ActivatePage( const SfxItemSet& rSet );
     virtual int  DeactivatePage( SfxItemSet* pSet );
@@ -305,10 +305,10 @@ public:
                 { pHatchingList = pHtchLst; }
     void    SetBitmapList( XBitmapList* pBmpLst) { pBitmapList = pBmpLst; }
 
-    void    SetPageType( UINT16 nInType ) { nPageType = nInType; }
-    void    SetDlgType( UINT16 nInType ) { nDlgType = nInType; }
-    void    SetPos( UINT16 nInPos ) { nPos = nInPos; }
-    void    SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
+    void    SetPageType( sal_uInt16 nInType ) { nPageType = nInType; }
+    void    SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
+    void    SetPos( sal_uInt16 nInPos ) { nPos = nInPos; }
+    void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
     virtual void PageCreated (SfxAllItemSet aSet);
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
     void    SetGrdChgd( ChangeType* pIn ) { pnGradientListState = pIn; }
@@ -345,12 +345,12 @@ private:
 
     XColorTable*        pColorTab;
     ChangeType*         pnColorTableState;
-    UINT16              nPageType;
-    UINT16              nDlgType;
-    USHORT*             pPos;
-    BOOL*               pbAreaTP;
+    sal_uInt16              nPageType;
+    sal_uInt16              nDlgType;
+    sal_uInt16*             pPos;
+    sal_Bool*               pbAreaTP;
 
-    BOOL                bDisable;
+    sal_Bool                bDisable;
 
     XOutdevItemPool*    pXPool;
     XFillAttrSetItem    aXFillAttr;
@@ -367,21 +367,21 @@ public:
 
     void    Construct();
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    static  USHORT*     GetRanges();
+    static  sal_uInt16*     GetRanges();
 
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
     virtual void ActivatePage( const SfxItemSet& rSet );
     virtual int  DeactivatePage( SfxItemSet* pSet );
     virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
 
     void    SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
-    void    SetPageType( UINT16 nInType ) { nPageType = nInType; }
-    void    SetDlgType( UINT16 nInType ) { nDlgType = nInType; }
-    void    SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
+    void    SetPageType( sal_uInt16 nInType ) { nPageType = nInType; }
+    void    SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
+    void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
     virtual void PageCreated (SfxAllItemSet aSet);
-    void    DisablePage( BOOL bIn ) { bDisable = bIn; }
+    void    DisablePage( sal_Bool bIn ) { bDisable = bIn; }
 };
 
 /*************************************************************************
@@ -428,10 +428,10 @@ private:
 
     ChangeType*         pnGradientListState;
     ChangeType*         pnColorTableState;
-    USHORT*             pPageType;
-    USHORT*             pDlgType;
-    USHORT*             pPos;
-    BOOL*               pbAreaTP;
+    sal_uInt16*             pPageType;
+    sal_uInt16*             pDlgType;
+    sal_uInt16*             pPos;
+    sal_Bool*               pbAreaTP;
 
     XOutdevItemPool*    pXPool;
     XFillStyleItem      aXFStyleItem;
@@ -458,7 +458,7 @@ public:
     void    Construct();
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
 
     virtual void ActivatePage( const SfxItemSet& rSet );
@@ -468,10 +468,10 @@ public:
     void    SetGradientList( XGradientList* pGrdLst)
                 { pGradientList = pGrdLst; }
 
-    void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-    void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetPos( USHORT* pInPos ) { pPos = pInPos; }
-    void    SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
+    void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+    void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
+    void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
 
     void    SetGrdChgd( ChangeType* pIn ) { pnGradientListState = pIn; }
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
@@ -515,10 +515,10 @@ private:
 
     ChangeType*         pnHatchingListState;
     ChangeType*         pnColorTableState;
-    USHORT*             pPageType;
-    USHORT*             pDlgType;
-    USHORT*             pPos;
-    BOOL*               pbAreaTP;
+    sal_uInt16*             pPageType;
+    sal_uInt16*             pDlgType;
+    sal_uInt16*             pPos;
+    sal_Bool*               pbAreaTP;
 
     XOutdevItemPool*    pXPool;
     XFillStyleItem      aXFStyleItem;
@@ -546,7 +546,7 @@ public:
     void    Construct();
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
 
     virtual void ActivatePage( const SfxItemSet& rSet );
@@ -558,10 +558,10 @@ public:
     void    SetHatchingList( XHatchList* pHtchLst)
                 { pHatchingList = pHtchLst; }
 
-    void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-    void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetPos( USHORT* pInPos ) { pPos = pInPos; }
-    void    SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
+    void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+    void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
+    void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
 
     void    SetHtchChgd( ChangeType* pIn ) { pnHatchingListState = pIn; }
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
@@ -607,12 +607,12 @@ private:
 
     ChangeType*         pnBitmapListState;
     ChangeType*         pnColorTableState;
-    USHORT*             pPageType;
-    USHORT*             pDlgType;
-    USHORT*             pPos;
-    BOOL*               pbAreaTP;
+    sal_uInt16*             pPageType;
+    sal_uInt16*             pDlgType;
+    sal_uInt16*             pPos;
+    sal_Bool*               pbAreaTP;
 
-    BOOL                bBmpChanged;
+    sal_Bool                bBmpChanged;
 
     XOutdevItemPool*    pXPool;
     XFillStyleItem      aXFStyleItem;
@@ -640,7 +640,7 @@ public:
     void    Construct();
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
 
     virtual void ActivatePage( const SfxItemSet& rSet );
@@ -651,10 +651,10 @@ public:
     void    SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
     void    SetBitmapList( XBitmapList* pBmpLst) { pBitmapList = pBmpLst; }
 
-    void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-    void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetPos( USHORT* pInPos ) { pPos = pInPos; }
-    void    SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
+    void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+    void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
+    void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
 
     void    SetBmpChgd( ChangeType* pIn ) { pnBitmapListState = pIn; }
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
@@ -717,11 +717,11 @@ private:
     XColorTable*        pColorTab;
 
     ChangeType*         pnColorTableState;
-    USHORT*             pPageType;
-    USHORT*             pDlgType;
-    USHORT*             pPos;
-    BOOL*               pbAreaTP;
-    BOOL                bDeleteColorTable;
+    sal_uInt16*             pPageType;
+    sal_uInt16*             pDlgType;
+    sal_uInt16*             pPos;
+    sal_Bool*               pbAreaTP;
+    sal_Bool                bDeleteColorTable;
 
     XOutdevItemPool*    pXPool;
     XFillStyleItem      aXFStyleItem;
@@ -735,10 +735,10 @@ private:
 
 #ifdef _SVX_TPCOLOR_CXX
     void    ConvertColorValues (Color& rColor, ColorModel eModell);
-    void    RgbToCmyk_Impl( Color& rColor, USHORT& rK );
-    void    CmykToRgb_Impl( Color& rColor, const USHORT nKey );
-    USHORT  ColorToPercent_Impl( USHORT nColor );
-    USHORT  PercentToColor_Impl( USHORT nPercent );
+    void    RgbToCmyk_Impl( Color& rColor, sal_uInt16& rK );
+    void    CmykToRgb_Impl( Color& rColor, const sal_uInt16 nKey );
+    sal_uInt16  ColorToPercent_Impl( sal_uInt16 nColor );
+    sal_uInt16  PercentToColor_Impl( sal_uInt16 nPercent );
 
     void    FillValueSet_Impl( ValueSet& rVs );
     //-----------------------------------------------------------------------------------------------------
@@ -747,11 +747,11 @@ private:
     DECL_LINK( ClickDeleteHdl_Impl, void * );   // Button 'loeschen'
     DECL_LINK( ClickWorkOnHdl_Impl, void * );   // Button 'Bearbeiten'
 
-    DECL_LINK( SelectColorLBHdl_Impl, void * ); // Farbe aus Listbox ausw�hlen
-    DECL_LINK( SelectValSetHdl_Impl, void * );  // Farbe aus Farbpalette (links) ausw�hlen
+    DECL_LINK( SelectColorLBHdl_Impl, void * ); // Farbe aus Listbox ausw�hlen
+    DECL_LINK( SelectValSetHdl_Impl, void * );  // Farbe aus Farbpalette (links) ausw�hlen
     DECL_LINK( SelectColorModelHdl_Impl, void * );  // Auswahl Listbox 'Farbmodell'
     long ChangeColorHdl_Impl( void* p );
-    DECL_LINK( ModifiedHdl_Impl, void * );      // Inhalt der Farbwerte-Felder wurde ver�ndert
+    DECL_LINK( ModifiedHdl_Impl, void * );      // Inhalt der Farbwerte-Felder wurde ver�ndert
     DECL_LINK( ClickLoadHdl_Impl, void * );     // Button 'Farbtabelle laden'
     DECL_LINK( ClickSaveHdl_Impl, void * );     // Button 'Farbtabelle sichern'
 
@@ -764,7 +764,7 @@ public:
     void    Construct();
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
 
     virtual void ActivatePage( const SfxItemSet& rSet );
@@ -772,14 +772,14 @@ public:
 
     void    SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
 
-    void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-    void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetPos( USHORT* pInPos ) { pPos = pInPos; }
-    void    SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
+    void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+    void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
+    void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
 
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
 
-    void    SetDeleteColorTable( BOOL bIn ) { bDeleteColorTable = bIn; }
+    void    SetDeleteColorTable( sal_Bool bIn ) { bDeleteColorTable = bIn; }
 
     virtual void FillUserData();
 };
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 0f7fca4b6cba..fbdcf44a0862 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -50,21 +50,21 @@ private:
     XDashList*          pNewDashList;
     XLineEndList*       pLineEndList;
     XLineEndList*       pNewLineEndList;
-    BOOL                bObjSelected;
+    sal_Bool                bObjSelected;
 
     ChangeType          nLineEndListState;
     ChangeType          nDashListState;
     ChangeType          mnColorTableState;
 
-    USHORT              nPageType;
-    USHORT              nDlgType;
-    USHORT              nPosDashLb;
-    USHORT              nPosLineEndLb;
-    USHORT              mnPos;
-    BOOL                mbAreaTP;
-    BOOL                mbDeleteColorTable;
+    sal_uInt16              nPageType;
+    sal_uInt16              nDlgType;
+    sal_uInt16              nPosDashLb;
+    sal_uInt16              nPosLineEndLb;
+    sal_uInt16              mnPos;
+    sal_Bool                mbAreaTP;
+    sal_Bool                mbDeleteColorTable;
 
-    virtual void        PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void        PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
 
 protected:
     virtual short       Ok();
@@ -76,7 +76,7 @@ protected:
 public:
     SvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr,
                       SdrModel* pModel, const SdrObject* pObj = NULL,
-                      BOOL bHasObj = TRUE );
+                      sal_Bool bHasObj = sal_True );
     ~SvxLineTabDialog();
 
     void             SetNewDashList( XDashList* pInLst)
@@ -105,6 +105,7 @@ class SvxLineTabPage : public SvxTabPage
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
 private:
+    FixedLine           aFlLine;
     FixedText           aFtLineStyle;
     LineLB              aLbLineStyle;
     FixedText           aFtColor;
@@ -113,19 +114,18 @@ private:
     MetricField         aMtrLineWidth;
     FixedText           aFtTransparent;
     MetricField         aMtrTransparent;
-    FixedLine           aFlLine;
-    FixedText           aFtLineEndsStyle;
+    FixedLine           aFlLineEnds;
     LineEndLB           aLbStartStyle;
-    FixedText           aFtLineEndsWidth;
     MetricField         aMtrStartWidth;
     TriStateBox         aTsbCenterStart;
+    FixedText           aFtLineEndsStyle;
     LineEndLB           aLbEndStyle;
+    FixedText           aFtLineEndsWidth;
     MetricField         aMtrEndWidth;
     TriStateBox         aTsbCenterEnd;
     CheckBox            aCbxSynchronize;
-    FixedLine           aFlLineEnds;
-    SvxXLinePreview     aCtlPreview;
     FixedLine           aFLSeparator;
+    SvxXLinePreview     aCtlPreview;
 
     // #116827#
     FixedLine           maFLEdgeStyle;
@@ -149,15 +149,15 @@ private:
     List                aGrfNames;
     List                aGrfBrushItems;
     String              sNumCharFmtName;
-    BOOL                bLastWidthModified;
+    sal_Bool                bLastWidthModified;
     Size                aSymbolLastSize;
     Graphic             aSymbolGraphic;
     Size                aSymbolSize;
-    BOOL                bSymbols;
+    sal_Bool                bSymbols;
 
     const SfxItemSet&   rOutAttrs;
     RECT_POINT          eRP;
-    BOOL                bObjSelected;
+    sal_Bool                bObjSelected;
 
     XOutdevItemPool*    pXPool;
     XLineStyleItem      aXLStyle;
@@ -174,17 +174,17 @@ private:
     ChangeType*         pnLineEndListState;
     ChangeType*         pnDashListState;
     ChangeType*         pnColorTableState;
-    UINT16             nPageType;
-    UINT16             nDlgType;
-    USHORT*             pPosDashLb;
-    USHORT*             pPosLineEndLb;
+    sal_uInt16             nPageType;
+    sal_uInt16             nDlgType;
+    sal_uInt16*             pPosDashLb;
+    sal_uInt16*             pPosLineEndLb;
 
     SfxMapUnit          ePoolUnit;
 
     // #63083#
-    INT32               nActLineWidth;
+    sal_Int32               nActLineWidth;
 
-    //Handler f�r Gallery-Popup-Menue-Button + Size
+    //Handler f�r Gallery-Popup-Menue-Button + Size
     DECL_LINK( GraphicHdl_Impl, MenuButton * );
     DECL_LINK( MenuCreateHdl_Impl, MenuButton * );
     DECL_STATIC_LINK( SvxLineTabPage, GraphicArrivedHdl_Impl, SvxBrushItem* );
@@ -201,13 +201,13 @@ private:
     // #116827#
     DECL_LINK( ChangeEdgeStyleHdl_Impl, void * );
 
-    BOOL FillXLSet_Impl();
+    sal_Bool FillXLSet_Impl();
 #endif
 
     void FillListboxes();
 public:
 
-    void ShowSymbolControls(BOOL bOn);
+    void ShowSymbolControls(sal_Bool bOn);
 
     SvxLineTabPage( Window* pParent, const SfxItemSet& rInAttrs );
     virtual ~SvxLineTabPage();
@@ -215,9 +215,9 @@ public:
     void    Construct();
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    static  USHORT*    GetRanges();
+    static  sal_uInt16*    GetRanges();
 
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet& );
 
     virtual void ActivatePage( const SfxItemSet& rSet );
@@ -230,12 +230,12 @@ public:
     void    SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
     void    SetDashList( XDashList* pDshLst ) { pDashList = pDshLst; }
     void    SetLineEndList( XLineEndList* pLneEndLst) { pLineEndList = pLneEndLst; }
-    void    SetObjSelected( BOOL bHasObj ) { bObjSelected = bHasObj; }
+    void    SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; }
 
-    void    SetPageType( UINT16 nInType ) { nPageType = nInType; }
-    void    SetDlgType( UINT16 nInType ) { nDlgType = nInType; }
-    void    SetPosDashLb( USHORT* pInPos ) { pPosDashLb = pInPos; }
-    void    SetPosLineEndLb( USHORT* pInPos ) { pPosLineEndLb = pInPos; }
+    void    SetPageType( sal_uInt16 nInType ) { nPageType = nInType; }
+    void    SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
+    void    SetPosDashLb( sal_uInt16* pInPos ) { pPosDashLb = pInPos; }
+    void    SetPosLineEndLb( sal_uInt16* pInPos ) { pPosLineEndLb = pInPos; }
 
     void    SetLineEndChgd( ChangeType* pIn ) { pnLineEndListState = pIn; }
     void    SetDashChgd( ChangeType* pIn ) { pnDashListState = pIn; }
@@ -280,7 +280,7 @@ private:
 
     const SfxItemSet&   rOutAttrs;
     XDash               aDash;
-    BOOL                bObjSelected;
+    sal_Bool                bObjSelected;
 
     XOutdevItemPool*    pXPool;
     XLineStyleItem      aXLStyle;
@@ -293,9 +293,9 @@ private:
     XDashList*          pDashList;
 
     ChangeType*         pnDashListState;
-    USHORT*             pPageType;
-    USHORT*             pDlgType;
-    USHORT*             pPosDashLb;
+    sal_uInt16*             pPageType;
+    sal_uInt16*             pDlgType;
+    sal_uInt16*             pPosDashLb;
 
     SfxMapUnit          ePoolUnit;
     FieldUnit           eFUnit;
@@ -325,18 +325,18 @@ public:
     void    Construct();
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
 
     virtual void ActivatePage( const SfxItemSet& rSet );
     virtual int  DeactivatePage( SfxItemSet* pSet );
 
     void    SetDashList( XDashList* pDshLst ) { pDashList = pDshLst; }
-    void    SetObjSelected( BOOL bHasObj ) { bObjSelected = bHasObj; }
+    void    SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; }
 
-    void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-    void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetPosDashLb( USHORT* pInPos ) { pPosDashLb = pInPos; }
+    void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+    void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetPosDashLb( sal_uInt16* pInPos ) { pPosDashLb = pInPos; }
 
     void    SetDashChgd( ChangeType* pIn ) { pnDashListState = pIn; }
 
@@ -370,7 +370,7 @@ private:
 
     const SfxItemSet&   rOutAttrs;
     const SdrObject*    pPolyObj;
-    BOOL                bObjSelected;
+    sal_Bool                bObjSelected;
 
     XOutdevItemPool*    pXPool;
     XLineStyleItem      aXLStyle;
@@ -382,9 +382,9 @@ private:
     XLineEndList*       pLineEndList;
 
     ChangeType*         pnLineEndListState;
-    USHORT*             pPageType;
-    USHORT*             pDlgType;
-    USHORT*             pPosLineEndLb;
+    sal_uInt16*             pPageType;
+    sal_uInt16*             pDlgType;
+    sal_uInt16*             pPosLineEndLb;
 
 #ifdef _SVX_TPLNEEND_CXX
     DECL_LINK( ClickAddHdl_Impl, void * );
@@ -405,7 +405,7 @@ public:
     void    Construct();
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
 
     virtual void ActivatePage( const SfxItemSet& rSet );
@@ -413,11 +413,11 @@ public:
 
     void    SetLineEndList( XLineEndList* pInList ) { pLineEndList = pInList; }
     void    SetPolyObj( const SdrObject* pObj ) { pPolyObj = pObj; }
-    void    SetObjSelected( BOOL bHasObj ) { bObjSelected = bHasObj; }
+    void    SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; }
 
-    void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-    void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetPosLineEndLb( USHORT* pInPos ) { pPosLineEndLb = pInPos; }
+    void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+    void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetPosLineEndLb( sal_uInt16* pInPos ) { pPosLineEndLb = pInPos; }
 
     void    SetLineEndChgd( ChangeType* pIn ) { pnLineEndListState = pIn; }
 
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 2ae0bd775304..65ebd9422e5f 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -63,8 +63,8 @@ namespace svx
         HeaderBar*          pHeaderBar;
         ::svx::OptHeaderTabListBox* pPathBox;
         SvLBoxEntry*        m_pCurEntry;
-        ULONG               m_nOldCount;
-        BOOL                m_bModified;
+        sal_uLong               m_nOldCount;
+        sal_Bool                m_bModified;
 
 #ifdef SVX_DBREGISTER_HXX
         DECL_LINK( NewHdl, void * );
@@ -96,13 +96,6 @@ namespace svx
         */
         void openLinkDialog(const String& _sOldName,const String& _sOldLocation,SvLBoxEntry* _pEntry = NULL);
 
-        /** opens a file pciker to select a database file
-            @param  _sLocation
-                If set, the file picker use it as default directory
-            @return
-                the location of the database file
-        */
-        String getFileLocation(const String& _sLocation);
 #endif
 
     public:
@@ -110,9 +103,9 @@ namespace svx
         virtual ~DbRegistrationOptionsPage();
 
         static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-        static USHORT*      GetRanges();
+        static sal_uInt16*      GetRanges();
 
-        virtual BOOL        FillItemSet( SfxItemSet& rSet );
+        virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
         virtual void        Reset( const SfxItemSet& rSet );
         virtual void        FillUserData();
     };
diff --git a/cui/source/inc/defdlgname.hxx b/cui/source/inc/defdlgname.hxx
index 39913eaba94a..c3e2f198995e 100644
--- a/cui/source/inc/defdlgname.hxx
+++ b/cui/source/inc/defdlgname.hxx
@@ -30,8 +30,8 @@
 
 // define ----------------------------------------------------------------
 
-#define MESS_BTN_1  ((USHORT)0)
-#define MESS_BTN_2  ((USHORT)1)
+#define MESS_BTN_1  ((sal_uInt16)0)
+#define MESS_BTN_2  ((sal_uInt16)1)
 
 // const -----------------------------------------------------------------
 
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index 01cb4fc078dc..75b5d0d8a70d 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -83,7 +83,7 @@ public:
             aBtnOK.Enable( rLink.Call( this ) > 0 );
     }
 
-    void    SetEditHelpId(ULONG nHelpId) {aEdtName.SetHelpId(nHelpId);}
+    void    SetEditHelpId( const rtl::OString& aHelpId) {aEdtName.SetHelpId(aHelpId);}
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////////
@@ -187,7 +187,7 @@ public:
     SvxMessDialog( Window* pWindow, const String& rText, const String& rDesc, Image* pImg = NULL );
     ~SvxMessDialog();
 
-    void    SetButtonText( USHORT nBtnId, const String& rNewTxt );
+    void    SetButtonText( sal_uInt16 nBtnId, const String& rNewTxt );
 };
 
 
diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx
index c26a3c82257d..08514f807bb2 100644
--- a/cui/source/inc/dstribut.hxx
+++ b/cui/source/inc/dstribut.hxx
@@ -71,8 +71,8 @@ public:
 
     static SfxTabPage* Create(Window*, const SfxItemSet&,
         SvxDistributeHorizontal eHor, SvxDistributeVertical eVer);
-    static UINT16* GetRanges();
-    virtual BOOL FillItemSet(SfxItemSet&);
+    static sal_uInt16* GetRanges();
+    virtual sal_Bool FillItemSet(SfxItemSet&);
     virtual void Reset(const SfxItemSet&);
     virtual void PointChanged(Window* pWindow, RECT_POINT eRP);
 
diff --git a/cui/source/inc/gallery.hrc b/cui/source/inc/gallery.hrc
index c9d6729be447..d813fa7c7f56 100644
--- a/cui/source/inc/gallery.hrc
+++ b/cui/source/inc/gallery.hrc
@@ -44,7 +44,6 @@
 #define RID_SVXSTR_GALLERY_NOFILES              (RID_CUI_GALLERY_START + 12)
 #define RID_SVXSTR_GALLERY_SEARCH               (RID_CUI_GALLERY_START + 30)
 #define RID_SVXSTR_GALLERYPROPS_OBJECT          (RID_CUI_GALLERY_START + 39)
-#define RID_SVXSTR_GALLERYPROPS_GALTHEME        (RID_CUI_GALLERY_START + 40)
 #define RID_SVXSTR_GALLERY_READONLY             (RID_CUI_GALLERY_START + 43)
 #define RID_SVXSTR_GALLERY_ALLFILES             (RID_CUI_GALLERY_START + 44)
 #define RID_SVXSTR_GALLERY_ID_EXISTS            (RID_CUI_GALLERY_START + 81)
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index 769937bcc75f..9d53f2cc29db 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -101,9 +101,9 @@ class SvxGrfCropPage : public SfxTabPage
     const MetricField*  pLastCropField;
     long            nOldWidth;
     long            nOldHeight;
-    BOOL            bReset;
-    BOOL            bInitialized;
-    BOOL            bSetOrigSize;
+    sal_Bool            bReset;
+    sal_Bool            bInitialized;
+    sal_Bool            bSetOrigSize;
 
 
     SvxGrfCropPage( Window *pParent, const SfxItemSet &rSet );
@@ -119,14 +119,14 @@ class SvxGrfCropPage : public SfxTabPage
 
     void            CalcZoom();
     void            CalcMinMaxBorder();
-    void            GraphicHasChanged(BOOL bFound);
+    void            GraphicHasChanged(sal_Bool bFound);
     virtual void    ActivatePage(const SfxItemSet& rSet);
 
     Size            GetGrfOrigSize( const Graphic& ) const;
 public:
     static SfxTabPage *Create( Window *pParent, const SfxItemSet &rSet );
 
-    virtual BOOL FillItemSet( SfxItemSet &rSet );
+    virtual sal_Bool FillItemSet( SfxItemSet &rSet );
     virtual void Reset( const SfxItemSet &rSet );
     virtual int DeactivatePage( SfxItemSet *pSet );
 };
diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx
index 1771cbc192e3..94543a8c553a 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -76,11 +76,11 @@ namespace svx
 
         void Clear();
         void InsertEntry( const XubString& rStr );
-        void SelectEntryPos( USHORT nPos );
+        void SelectEntryPos( sal_uInt16 nPos );
 
-        USHORT GetEntryCount() const;
+        sal_uInt16 GetEntryCount() const;
 
-        XubString GetEntry( USHORT nPos ) const;
+        XubString GetEntry( sal_uInt16 nPos ) const;
         XubString GetSelectEntry() const;
 
         virtual void StateChanged( StateChangedType nStateChange );
@@ -153,7 +153,6 @@ namespace svx
         void    SetIgnoreAllHdl( const Link& _rHdl );
         void    SetChangeHdl( const Link& _rHdl );
         void    SetChangeAllHdl( const Link& _rHdl );
-        void    SetOptionsHdl( const Link& _rHdl );
 
         void    SetClickByCharacterHdl( const Link& _rHdl );
         void    SetConversionFormatChangedHdl( const Link& _rHdl );
@@ -175,8 +174,6 @@ namespace svx
         editeng::HangulHanjaConversion::ConversionFormat    GetConversionFormat( ) const;
 
         void            SetByCharacter( sal_Bool _bByCharacter );
-        sal_Bool        GetByCharacter( ) const;
-
         void            SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection );
 
         // should text which does not match the primary conversion direction be ignored?
diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx
index 426bd39e69b4..2eba0a088073 100644..100755
--- a/cui/source/inc/headertablistbox.hxx
+++ b/cui/source/inc/headertablistbox.hxx
@@ -51,7 +51,7 @@ public:
     void                        ConnectElements( void );
                                     // should be called after all manipulations on elements are done
                                     // calcs real sizes depending on sizes of this
-    void                        Show( BOOL bVisible = TRUE, USHORT nFlags = 0 );    // same meaning as Windows::Show()
+    void                        Show( sal_Bool bVisible = sal_True, sal_uInt16 nFlags = 0 );    // same meaning as Windows::Show()
     void                        Enable( bool bEnable = true, bool bChild = true );  // same meaning as Windows::Enable()
 };
 
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 6607c5aee4db..dff73253b086 100755..100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -28,373 +28,363 @@
 #define _CUI_HELPID_HRC
 // include ---------------------------------------------------------------
 
-#include <svl/solar.hrc>
+#include <svx/svxcommands.h>
+#include <sfx2/sfxcommands.h>
 
 // Help-Ids --------------------------------------------------------------
 
-#define HID_OPTIONS_COLOR                           (HID_CUI_START +   1)
-#define HID_OPTIONS_SAVE                            (HID_CUI_START +   2)
-#define HID_OPTIONS_PATH                            (HID_CUI_START +   3)
-#define HID_OPTIONS_GENERAL                         (HID_CUI_START +   4)
-#define HID_OPTIONS_LINGU                           (HID_CUI_START +   5)
-#define HID_OPTIONS_SPELL                           (HID_CUI_START +   6)
-#define HID_OPTIONS_DICT_NEW                        (HID_CUI_START +   7)
-#define HID_OPTIONS_DICT_EDIT                       (HID_CUI_START +   8)
-#define HID_OPTIONS_INET                            (HID_CUI_START +   9)
-#define HID_OPTIONS_CHART_DEFCOLORS                 (HID_CUI_START +  10)
-#define HID_OPTIONS_CTL                             (HID_CUI_START +  11)
-#define HID_OPTIONS_PROXY                           (HID_CUI_START +  12)
-#define HID_OPTIONS_SEARCH                          (HID_CUI_START +  13)
-#define HID_OPTIONS_MAIL                            (HID_CUI_START +  14)
-#define HID_OPTIONS_ASIAN_LAYOUT                    (HID_CUI_START +  15)
-#define HID_CLB_EDIT_MODULES_DICS                   (HID_CUI_START +  16)
-#define HID_CLB_EDIT_MODULES_MODULES                (HID_CUI_START +  17)
-#define HID_CLB_LINGU_MODULES                       (HID_CUI_START +  18)
-#define HID_CLB_LINGU_OPTIONS                       (HID_CUI_START +  19)
-#define HID_EDIT_MODULES                            (HID_CUI_START +  20)
-#define HID_LNGDLG_NUM_PREBREAK                     (HID_CUI_START +  21)
-#define HID_OPTIONS_COLORCONFIG                     (HID_CUI_START +  22)
-#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME         (HID_CUI_START +  23)
-#define HID_OPTIONS_ACCESSIBILITYCONFIG             (HID_CUI_START +  24)
-#define HID_OPTIONS_COLORCONFIG_COLORLIST_WIN       (HID_CUI_START +  25)
-#define HID_OPTIONS_COLORCONFIG_NAME_SCHEME         (HID_CUI_START +  26)
-#define HID_OPTIONS_PATHS_SELECTFOLDER              (HID_CUI_START +  27)
-#define HID_OPTIONS_JAVA                            (HID_CUI_START +  28)
-#define HID_OPTIONS_JAVA_LIST                       (HID_CUI_START +  29)
-#define HID_OPTIONS_JAVA_PARAMETER                  (HID_CUI_START +  30)
-#define HID_OPTIONS_JAVA_CLASSPATH                  (HID_CUI_START +  31)
-#define HID_SVXPAGE_JSEARCH_OPTIONS                 (HID_CUI_START +  32)
-#define HID_SVXDLG_FILTER_WARNING                   (HID_CUI_START +  33)
-#define HID_SVX_OPTIONS_ONLINEUPDATE                (HID_CUI_START +  34)
-#define HID_DLG_SECURITY_OPTIONS                    (HID_CUI_START +  35)
-#define HID_OFADLG_OPTIONS_TREE                     (HID_CUI_START +  36)
-#define HID_OFA_CONNPOOL_DRIVERLIST                 (HID_CUI_START +  37)
-#define UID_OFA_CONNPOOL_DRIVERLIST_BACK            (HID_CUI_START +  38)
-#define HID_OFA_FONT_SUBST_CLB                      (HID_CUI_START +  39)
-#define HID_OFA_TP_MISC                             (HID_CUI_START +  40)
-#define HID_OFA_TP_VIEW                             (HID_CUI_START +  41)
-#define HID_OFA_TP_LANGUAGES                        (HID_CUI_START +  42)
-#define HID_OFA_TP_MEMORY                           (HID_CUI_START +  43)
-#define HID_DBPATH_CTL_PATH                         (HID_CUI_START +  44)
-#define HID_DBPATH_HEADERBAR                        (HID_CUI_START +  45)
-#define HID_OFAPAGE_SMARTTAG_OPTIONS                (HID_CUI_START +  46)
-#define HID_OFAPAGE_MSFLTR2_CLB                     (HID_CUI_START +  47)
-#define HID_OPTPATH_CTL_PATH                        (HID_CUI_START +  48)
-#define HID_OFADLG_TREELISTBOX                      (HID_CUI_START +  49)
-#define HID_DLG_WEBCONNECTION_INFO                  (HID_CUI_START +  50)
-#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST          (HID_CUI_START +  51)
-#define HID_OPTPATH_HEADERBAR                       (HID_CUI_START +  52)
-#define HID_WARN_NAME_DUPLICATE                     (HID_CUI_START +  53)
-#define HID_COLORPAGE_LISTBOX_START                 (HID_CUI_START +  54)
-#define HID_COLORPAGE_DOCCOLOR_LB                   (HID_CUI_START +  54)
-#define HID_COLORPAGE_DOCBOUNDARIES_LB              (HID_CUI_START +  55)
-#define HID_COLORPAGE_APPBACKGROUND_LB              (HID_CUI_START +  56)
-#define HID_COLORPAGE_OBJECTBOUNDARIES_LB           (HID_CUI_START +  57)
-#define HID_COLORPAGE_TABLEBOUNDARIES_LB            (HID_CUI_START +  58)
-#define HID_COLORPAGE_FONTCOLOR_LB                  (HID_CUI_START +  59)
-#define HID_COLORPAGE_LINKS_LB                      (HID_CUI_START +  60)
-#define HID_COLORPAGE_LINKSVISITED_LB               (HID_CUI_START +  61)
-#define HID_COLORPAGE_ANCHOR_LB                     (HID_CUI_START +  62)
-#define HID_COLORPAGE_SPELL_LB                      (HID_CUI_START +  63)
-#define HID_COLORPAGE_WRITERTEXTGRID_LB             (HID_CUI_START +  64)
-#define HID_COLORPAGE_WRITERFIELDSHADINGS_LB        (HID_CUI_START +  65)
-#define HID_COLORPAGE_WRITERIDXSHADINGS_LB          (HID_CUI_START +  66)
-#define HID_COLORPAGE_WRITERDIRECTCURSOR_LB         (HID_CUI_START +  67)
-#define HID_COLORPAGE_WRITERNOTESINDICATOR_LB       (HID_CUI_START +  68)
-#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB      (HID_CUI_START +  69)
-#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB    (HID_CUI_START +  70)
-#define HID_COLORPAGE_WRITERPAGEBREAKS_LB           (HID_CUI_START +  71)
-#define HID_COLORPAGE_HTMLSGML_LB                   (HID_CUI_START +  72)
-#define HID_COLORPAGE_HTMLCOMMENT_LB                (HID_CUI_START +  73)
-#define HID_COLORPAGE_HTMLKEYWORD_LB                (HID_CUI_START +  74)
-#define HID_COLORPAGE_HTMLUNKNOWN_LB                (HID_CUI_START +  75)
-#define HID_COLORPAGE_CALCGRID_LB                   (HID_CUI_START +  76)
-#define HID_COLORPAGE_CALCPAGEBREAK_LB              (HID_CUI_START +  77)
-#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB        (HID_CUI_START +  78)
-#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB     (HID_CUI_START +  79)
-#define HID_COLORPAGE_CALCDETECTIVE_LB              (HID_CUI_START +  80)
-#define HID_COLORPAGE_CALCDETECTIVEERROR_LB         (HID_CUI_START +  81)
-#define HID_COLORPAGE_CALCREFERENCE_LB              (HID_CUI_START +  82)
-#define HID_COLORPAGE_CALCNOTESBACKGROUND_LB        (HID_CUI_START +  83)
-#define HID_COLORPAGE_DRAWGRID_LB                   (HID_CUI_START +  84)
-#define HID_COLORPAGE_DRAWDRAWING_LB                (HID_CUI_START +  85)
-#define HID_COLORPAGE_DRAWFILL_LB                   (HID_CUI_START +  86)
-#define HID_COLORPAGE_BASICIDENTIFIER_LB            (HID_CUI_START +  87)
-#define HID_COLORPAGE_BASICCOMMENT_LB               (HID_CUI_START +  88)
-#define HID_COLORPAGE_BASICNUMBER_LB                (HID_CUI_START +  89)
-#define HID_COLORPAGE_BASICSTRING_LB                (HID_CUI_START +  90)
-#define HID_COLORPAGE_BASICOPERATOR_LB              (HID_CUI_START +  91)
-#define HID_COLORPAGE_BASICKEYWORD_LB               (HID_CUI_START +  92)
-#define HID_COLORPAGE_BASICERROR_LB                 (HID_CUI_START +  93)
-#define HID_COLORPAGE_CHECKBOX_START                (HID_CUI_START +  94)
-#define HID_COLORPAGE_DOCCOLOR_CB                   (HID_CUI_START +  94)
-#define HID_COLORPAGE_DOCBOUNDARIES_CB              (HID_CUI_START +  95)
-#define HID_COLORPAGE_APPBACKGROUND_CB              (HID_CUI_START +  96)
-#define HID_COLORPAGE_OBJECTBOUNDARIES_CB           (HID_CUI_START +  97)
-#define HID_COLORPAGE_TABLEBOUNDARIES_CB            (HID_CUI_START +  98)
-#define HID_COLORPAGE_FONTCOLOR_CB                  (HID_CUI_START +  99)
-#define HID_COLORPAGE_LINKS_CB                      (HID_CUI_START + 100)
-#define HID_COLORPAGE_LINKSVISITED_CB               (HID_CUI_START + 101)
-#define HID_COLORPAGE_ANCHOR_CB                     (HID_CUI_START + 102)
-#define HID_COLORPAGE_SPELL_CB                      (HID_CUI_START + 103)
-#define HID_COLORPAGE_WRITERTEXTGRID_CB             (HID_CUI_START + 104)
-#define HID_COLORPAGE_WRITERFIELDSHADINGS_CB        (HID_CUI_START + 105)
-#define HID_COLORPAGE_WRITERIDXSHADINGS_CB          (HID_CUI_START + 106)
-#define HID_COLORPAGE_WRITERDIRECTCURSOR_CB         (HID_CUI_START + 107)
-#define HID_COLORPAGE_WRITERNOTESINDICATOR_CB       (HID_CUI_START + 108)
-#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB      (HID_CUI_START + 109)
-#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB    (HID_CUI_START + 110)
-#define HID_COLORPAGE_WRITERPAGEBREAKS_CB           (HID_CUI_START + 111)
-#define HID_COLORPAGE_HTMLSGML_CB                   (HID_CUI_START + 112)
-#define HID_COLORPAGE_HTMLCOMMENT_CB                (HID_CUI_START + 113)
-#define HID_COLORPAGE_HTMLKEYWORD_CB                (HID_CUI_START + 114)
-#define HID_COLORPAGE_HTMLUNKNOWN_CB                (HID_CUI_START + 115)
-#define HID_COLORPAGE_CALCGRID_CB                   (HID_CUI_START + 116)
-#define HID_COLORPAGE_CALCPAGEBREAK_CB              (HID_CUI_START + 117)
-#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB        (HID_CUI_START + 118)
-#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB     (HID_CUI_START + 119)
-#define HID_COLORPAGE_CALCDETECTIVE_CB              (HID_CUI_START + 120)
-#define HID_COLORPAGE_CALCDETECTIVEERROR_CB         (HID_CUI_START + 121)
-#define HID_COLORPAGE_CALCREFERENCE_CB              (HID_CUI_START + 122)
-#define HID_COLORPAGE_CALCNOTESBACKGROUND_CB        (HID_CUI_START + 123)
-#define HID_COLORPAGE_DRAWGRID_CB                   (HID_CUI_START + 124)
-#define HID_COLORPAGE_DRAWDRAWING_CB                (HID_CUI_START + 125)
-#define HID_COLORPAGE_DRAWFILL_CB                   (HID_CUI_START + 126)
-#define HID_COLORPAGE_BASICIDENTIFIER_CB            (HID_CUI_START + 127)
-#define HID_COLORPAGE_BASICCOMMENT_CB               (HID_CUI_START + 128)
-#define HID_COLORPAGE_BASICNUMBER_CB                (HID_CUI_START + 129)
-#define HID_COLORPAGE_BASICSTRING_CB                (HID_CUI_START + 130)
-#define HID_COLORPAGE_BASICOPERATOR_CB              (HID_CUI_START + 131)
-#define HID_COLORPAGE_BASICKEYWORD_CB               (HID_CUI_START + 132)
-#define HID_COLORPAGE_BASICERROR_CB                 (HID_CUI_START + 133)
-#define HID_NUMBERINGOPT_SEL_GRF_FROM_FILE          (HID_CUI_START + 134)
-#define HID_SVX_MACRO_LB_EVENT                      (HID_CUI_START + 135)
-#define HID_SVX_CONFIG_EVENT                        (HID_CUI_START + 136)
-#define HID_CONFIG_EVENT_OFFICE_BASED               (HID_CUI_START + 137)
-#define HID_CONFIG_EVENT_DOCUMENT_BASED             (HID_CUI_START + 138)
-#define HID_SELECTOR_DIALOG                         (HID_CUI_START + 139)
-#define HID_SELECTOR_CATEGORIES                     (HID_CUI_START + 140)
-#define HID_SVX_CONFIG_TOOLBAR                      (HID_CUI_START + 141)
-#define HID_SVX_CONFIG_TOOLBAR_CONTENTS             (HID_CUI_START + 142)
-#define HID_SELECTOR_COMMANDS                       (HID_CUI_START + 143)
-#define HID_GALLERY_EDIT_MSNAME                     (HID_CUI_START + 144)
-#define HID_SVX_CONFIG_MENU                         (HID_CUI_START + 145)
-#define HID_SVX_CONFIG_MENU_CONTENTS                (HID_CUI_START + 146)
-#define HID_GALLERY_NEWTHEME_FINDFILES              (HID_CUI_START + 147)
-#define HID_GALLERY_NEWTHEME_ADDFILES               (HID_CUI_START + 148)
-#define HID_HANGULDLG_BUTTON_OPTIONS                (HID_CUI_START + 149)
-#define HID_HANGULDLG_BUTTON_CLOSE                  (HID_CUI_START + 150)
-#define HID_HANGULDLG_BUTTON_IGNORE                 (HID_CUI_START + 151)
-#define HID_HANGULDLG_BUTTON_IGNOREALL              (HID_CUI_START + 152)
-#define HID_HANGULDLG_BUTTON_CHANGE                 (HID_CUI_START + 153)
-#define HID_HANGULDLG_BUTTON_CHANGEALL              (HID_CUI_START + 154)
-#define HID_OFA_FONT_SUBSTITUTION                   (HID_CUI_START + 155)
-#define HID_HANGULDLG_EDIT_NEWWORD                  (HID_CUI_START + 156)
-#define HID_OFA_SUBST_APPLY                         (HID_CUI_START + 157)
-#define HID_OFA_SUBST_DELETE                        (HID_CUI_START + 158)
-#define HID_SPLDLG_BUTTON_CLOSE                     (HID_CUI_START + 159)
-#define HID_SPLDLG_BUTTON_IGNORE                    (HID_CUI_START + 160)
-#define HID_SPLDLG_BUTTON_IGNOREALL                 (HID_CUI_START + 161)
-#define HID_SPLDLG_BUTTON_CHANGE                    (HID_CUI_START + 162)
-#define HID_SPLDLG_BUTTON_CHANGEALL                 (HID_CUI_START + 163)
-#define HID_SPLDLG_BUTTON_EXPLAIN                   (HID_CUI_START + 164)
-#define HID_CHARMAP_CTL_SHOWSET                     (HID_CUI_START + 165)
-#define HID_CHARMAP_CTL_SHOWTEXT                    (HID_CUI_START + 166)
-#define HID_CHARMAP_CTL_SHOWCHAR                    (HID_CUI_START + 167)
-#define HID_DLG_NAME                                (HID_CUI_START + 168)
-#define HID_DLG_MESSBOX                             (HID_CUI_START + 169)
-#define HID_HANGULDLG_SUGGESTIONS                   (HID_CUI_START + 170)
-#define HID_HANGULDLG_SUGGESTIONS_GRID              (HID_CUI_START + 171)
-#define HID_HANGULDLG_SUGGESTIONS_LIST              (HID_CUI_START + 172)
-#define HID_DLG_OBJECT_NAME                         (HID_CUI_START + 173)
-#define HID_DLG_OBJECT_TITLE_DESC                   (HID_CUI_START + 174)
-#define HID_SVX_CONFIG_MENU_ORGANIZER               (HID_CUI_START + 175)
-#define HID_SVX_CONFIG_ICON_SELECTOR                (HID_CUI_START + 176)
-#define HID_SVX_CONFIG_NAME_SUBMENU                 (HID_CUI_START + 177)
-#define HID_SVX_CONFIG_RENAME_MENU                  (HID_CUI_START + 178)
-#define HID_SVX_CONFIG_RENAME_MENU_ITEM             (HID_CUI_START + 179)
-#define HID_SVX_CONFIG_RENAME_TOOLBAR               (HID_CUI_START + 180)
-#define HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM          (HID_CUI_START + 181)
-#define HID_SVX_NEW_TOOLBAR                         (HID_CUI_START + 182)
-#define HID_SVX_MODIFY_TOOLBAR                      (HID_CUI_START + 183)
-#define HID_SVX_NEW_TOOLBAR_ITEM                    (HID_CUI_START + 184)
-#define HID_SVX_CONFIG_MENU_LISTBOX                 (HID_CUI_START + 185)
-#define HID_SVX_MODIFY_TOOLBAR_ITEM                 (HID_CUI_START + 186)
-#define HID_SVX_SAVE_IN                             (HID_CUI_START + 187)
-#define HID_OPTIONS_MULTIPATH_LIST                  (HID_CUI_START + 188)
-#define HID_FM_DLG_SEARCH                           (HID_CUI_START + 189)
-#define HID_SEARCH_TEXT                             (HID_CUI_START + 190)
-#define HID_SEARCH_ALLFIELDS                        (HID_CUI_START + 191)
-#define HID_GALLERY_PROPERTIES_GENERAL              (HID_CUI_START + 192)
-#define HID_SEARCH_FIELDSELECTION                   (HID_CUI_START + 193)
-#define HID_SEARCH_POSITION                         (HID_CUI_START + 194)
-#define HID_SEARCH_FORMATTER                        (HID_CUI_START + 195)
-#define HID_SEARCH_CASE                             (HID_CUI_START + 196)
-#define HID_SEARCH_BACKWARD                         (HID_CUI_START + 197)
-#define HID_SEARCH_STARTOVER                        (HID_CUI_START + 198)
-#define HID_SEARCH_WILDCARD                         (HID_CUI_START + 199)
-#define HID_SEARCH_REGULAR                          (HID_CUI_START + 200)
-#define HID_SEARCH_APPROX                           (HID_CUI_START + 201)
-#define HID_SEARCH_APPROXSETTINGS                   (HID_CUI_START + 202)
-#define HID_SEARCH_BTN_SEARCH                       (HID_CUI_START + 203)
-#define HID_SEARCH_BTN_CLOSE                        (HID_CUI_START + 204)
-#define HID_GALLERY_BROWSER                         (HID_CUI_START + 205)
-#define HID_GALLERY_SEARCH                          (HID_CUI_START + 206)
-#define HID_GALLERY_APPLY                           (HID_CUI_START + 207)
-#define HID_SPLDLG_BUTTON_IGNORERULE                (HID_CUI_START + 208)
-#define HID_CONFIG_ACCEL                            (HID_CUI_START + 209)
-#define HID_ACCELCONFIG_LISTBOX                     (HID_CUI_START + 210)
-#define HID_CONFIGGROUP_ACC_LISTBOX                 (HID_CUI_START + 211)
-#define HID_CONFIGFUNCTION_ACC_LISTBOX              (HID_CUI_START + 212)
-#define HID_MACRO_LB_EVENT                          (HID_CUI_START + 213)
-#define HID_MACRO_GROUP                             (HID_CUI_START + 214)
-#define HID_MACRO_MACROS                            (HID_CUI_START + 215)
-#define HID_DIALOG_HANGULHANJA                      (HID_CUI_START + 216)
-#define HID_HANGULHANJA_OPT_DLG                     (HID_CUI_START + 217)
-#define HID_HANGULHANJA_NEWDICT_DLG                 (HID_CUI_START + 218)
-#define HID_HANGULHANJA_EDIT_DLG                    (HID_CUI_START + 219)
-#define HID_HANGULHANJA_OPT_DICTS_LB                (HID_CUI_START + 220)
-#define HID_MULTIPATH                               (HID_CUI_START + 221)
-#define HID_SCRIPTORG_DIALOG                        (HID_CUI_START + 222)
-#define HID_SCRIPTSBOX                              (HID_CUI_START + 223)
-#define HID_SPELLCHECK                              (HID_CUI_START + 224)
-#define HID_TPSIZE_CTRL                             (HID_CUI_START + 225)
-#define HID_TPROTATION_CTRL1                        (HID_CUI_START + 226)
-#define HID_TPROTATION_CTRL2                        (HID_CUI_START + 227)
-#define HID_TRANS_ANGLE                             (HID_CUI_START + 228)
-#define HID_TPPOSITION_CTRL                         (HID_CUI_START + 229)
-#define HID_NUMBERFORMAT_LB_FORMAT                  (HID_CUI_START + 230)
-#define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW         (HID_CUI_START + 231)
-#define HID_TRANS_SLANT                             (HID_CUI_START + 232)
-#define HID_TPHATCH_CTRL                            (HID_CUI_START + 233)
-#define HID_SEARCHATTR_CTL_ATTR                     (HID_CUI_START + 234)
-#define HID_NUMBERFORMAT_TBI_INFO                   (HID_CUI_START + 235)
-#define HID_SEARCHATTR                              (HID_CUI_START + 236)
-#define HID_ALIGNMENT_CTR_DIAL                      (HID_CUI_START + 237)
-#define HID_ALIGNMENT_CTR_BORDER_LOCK               (HID_CUI_START + 238)
-#define HID_SEARCHSIMILARITY                        (HID_CUI_START + 239)
-#define UID_SEARCH_RECORDSTATUS                     (HID_CUI_START + 240)
-#define HID_OFAPAGE_AUTOCORR_CLB                    (HID_CUI_START + 241)
-#define HID_AUTOCORR_LANGUAGE                       (HID_CUI_START + 242)
-#define HID_OFAPAGE_AUTOFORMAT_CLB                  (HID_CUI_START + 243)
-#define HID_TPCOLOR_RGB_1                           (HID_CUI_START + 244)
-#define HID_TPCOLOR_RGB_2                           (HID_CUI_START + 245)
-#define HID_TPCOLOR_RGB_3                           (HID_CUI_START + 246)
-#define HID_TPCOLOR_CMYK_1                          (HID_CUI_START + 247)
-#define HID_TPCOLOR_CMYK_2                          (HID_CUI_START + 248)
-#define HID_TPCOLOR_CMYK_3                          (HID_CUI_START + 249)
-#define HID_ALIGNMENT                               (HID_CUI_START + 250)
-#define HID_OFAPAGE_AUTOCORR_OPTIONS                (HID_CUI_START + 251)
-#define HID_OFAPAGE_AUTOFMT_OPTIONS                 (HID_CUI_START + 252)
-#define HID_OFAPAGE_AUTOCORR_REPLACE                (HID_CUI_START + 253)
-#define HID_OFACTL_AUTOCORR_REPLACE                 (HID_CUI_START + 254)
-#define HID_OFAPAGE_AUTOCORR_EXCEPT                 (HID_CUI_START + 255)
-#define HID_OFAPAGE_AUTOCORR_QUOTE                  (HID_CUI_START + 256)
-#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS            (HID_CUI_START + 257)
-#define HID_BACKGROUND                              (HID_CUI_START + 258)
-#define HID_BACKGROUND_CTL_BGDCOLORSET              (HID_CUI_START + 259)
-#define HID_BACKGROUND_CTL_POSITION                 (HID_CUI_START + 260)
-#define HID_BORDER                                  (HID_CUI_START + 261)
-#define HID_BORDER_CTL_PRESETS                      (HID_CUI_START + 262)
-#define HID_BORDER_CTL_SHADOWS                      (HID_CUI_START + 263)
-#define HID_PAGE_CONNECTION                         (HID_CUI_START + 264)
-#define HID_PAGE_CONNECTION_CTL_PREVIEW             (HID_CUI_START + 265)
-#define HID_PAGE_DISTRIBUTE                         (HID_CUI_START + 266)
-#define HID_SVXPAGE_GRFCROP                         (HID_CUI_START + 267)
-#define HID_CAPTION                                 (HID_CUI_START + 268)
-#define HID_CAPTION_CTL_TYPE                        (HID_CUI_START + 269)
-#define HID_PAGE_MEASURE                            (HID_CUI_START + 270)
-#define HID_MEASURE_CTL_POSITION                    (HID_CUI_START + 271)
-#define HID_NUMBERFORMAT                            (HID_CUI_START + 272)
-#define HID_NUMBERFORMAT_TBI_ADD                    (HID_CUI_START + 273)
-#define HID_NUMBERFORMAT_TBI_REMOVE                 (HID_CUI_START + 274)
-#define HID_FORMAT_PAGE                             (HID_CUI_START + 275)
-#define HID_REDLINING_DLG                           (HID_CUI_START + 276)
-#define HID_REDLINING_EDIT                          (HID_CUI_START + 277)
-#define HID_REDLINING_PREV                          (HID_CUI_START + 278)
-#define HID_REDLINING_NEXT                          (HID_CUI_START + 279)
-#define HID_FORMAT_PARAGRAPH_STD                    (HID_CUI_START + 280)
-#define HID_VALUESET_SINGLENUM                      (HID_CUI_START + 281)
-#define HID_VALUESET_BULLET                         (HID_CUI_START + 282)
-#define HID_VALUESET_NUM                            (HID_CUI_START + 283)
-#define HID_VALUESET_NUMBMP                         (HID_CUI_START + 284)
-#define HID_SVXPAGE_PICK_NUM                        (HID_CUI_START + 285)
-#define HID_SVXPAGE_PICK_SINGLE_NUM                 (HID_CUI_START + 286)
-#define HID_SVXPAGE_PICK_BMP                        (HID_CUI_START + 287)
-#define HID_SVXPAGE_PICK_BULLET                     (HID_CUI_START + 288)
-#define HID_SVXPAGE_NUM_OPTIONS                     (HID_CUI_START + 289)
-#define HID_SVXPAGE_NUM_POSITION                    (HID_CUI_START + 290)
-#define HID_MEASURE_CTL_PREVIEW                     (HID_CUI_START + 291)
-#define HID_FORMAT_PARAGRAPH_EXT                    (HID_CUI_START + 292)
-#define HID_FORMAT_PARAGRAPH_ALIGN                  (HID_CUI_START + 293)
-#define HID_SVXPAGE_PARA_ASIAN                      (HID_CUI_START + 294)
-#define HID_SVXPAGE_SWPOSSIZE                       (HID_CUI_START + 295)
-#define HID_AREA_TRANSPARENCE                       (HID_CUI_START + 296)
-#define HID_AREA_AREA                               (HID_CUI_START + 297)
-#define HID_AREA_SHADOW                             (HID_CUI_START + 298)
-#define HID_AREA_HATCH                              (HID_CUI_START + 299)
-#define HID_AREA_BITMAP                             (HID_CUI_START + 300)
-#define HID_TPSHADOW_CTRL                           (HID_CUI_START + 301)
-#define HID_AREA_GRADIENT                           (HID_CUI_START + 302)
-#define HID_LINE_ENDDEF                             (HID_CUI_START + 303)
-#define HID_LINE_LINE                               (HID_CUI_START + 304)
-#define HID_LINE_DEF                                (HID_CUI_START + 305)
-#define HID_SPELLDLG_SETWORD                        (HID_CUI_START + 306)
-#define HID_TABULATOR                               (HID_CUI_START + 307)
-#define HID_PAGE_TEXTATTR                           (HID_CUI_START + 308)
-#define HID_TEXTATTR_CTL_POSITION                   (HID_CUI_START + 309)
-#define HID_TRANS_POSITION_SIZE                     (HID_CUI_START + 310)
-#define HID_HYPHENATE                               (HID_CUI_START + 311)
-#define HID_SVXPAGE_CHAR_NAME                       (HID_CUI_START + 312)
-#define HID_SVXPAGE_CHAR_EFFECTS                    (HID_CUI_START + 313)
-#define HID_SVXPAGE_CHAR_POSITION                   (HID_CUI_START + 314)
-#define HID_HYPERLINK_INTERNET                      (HID_CUI_START + 315)
-#define HID_HYPERLINK_MAIL                          (HID_CUI_START + 316)
-#define HID_HYPERLINK_DOCUMENT                      (HID_CUI_START + 317)
-#define HID_HYPERLINK_NEWDOCUMENT                   (HID_CUI_START + 318)
-#define HID_HYPERLINK_MARKWND                       (HID_CUI_START + 319)
-#define HID_ICCDIALOG_RESET_BTN                     (HID_CUI_START + 320)
-#define HID_ICCDIALOG_CHOICECTRL                    (HID_CUI_START + 321)
-#define HID_HYPERDLG_INET_PATH                      (HID_CUI_START + 322)
-#define HID_HYPERDLG_MAIL_PATH                      (HID_CUI_START + 323)
-#define HID_HYPERDLG_DOC_PATH                       (HID_CUI_START + 324)
-#define HID_ICCDIALOG_OK_BTN                        (HID_CUI_START + 325)
-#define HID_ICCDIALOG_CANCEL_BTN                    (HID_CUI_START + 326)
-#define HID_HYPERLINK_MARKWND_APPLY                 (HID_CUI_START + 327)
-#define HID_HYPERLINK_MARKWND_CLOSE                 (HID_CUI_START + 328)
-#define HID_HYPERLINK_MARKWND_TREE                  (HID_CUI_START + 329)
-#define HID_SVXPAGE_CHAR_TWOLINES                   (HID_CUI_START + 330)
-#define HID_GRFFILTER_EMBOSS_LIGHT                  (HID_CUI_START + 331)
-#define HID_PASTE_DLG                               (HID_CUI_START + 333)
-#define HID_LINKDLG_TABLB                           (HID_CUI_START + 334)
-#define HID_MACRO_HEADERTABLISTBOX                  (HID_CUI_START + 335)
-#define HID_GALLERY_ENTER_TITLE                     (HID_CUI_START + 336)
-#define HID_GALLERY_TITLE_EDIT                      (HID_CUI_START + 337)
-#define HID_THES_LANGUAGE                           (HID_CUI_START + 338)
-#define HID_OFAPAGE_QUOTE_SW_CLB                    (HID_CUI_START + 339)
-#define HID_OFAPAGE_QUOTE_CLB                       (HID_CUI_START + 340)
-#define HID_CT_THES_ALTERNATIVES                    (HID_CUI_START + 341)
+#define HID_OPTIONS_COLOR "CUI_HID_OPTIONS_COLOR"
+#define HID_OPTIONS_SAVE "CUI_HID_OPTIONS_SAVE"
+#define HID_OPTIONS_PATH "CUI_HID_OPTIONS_PATH"
+#define HID_OPTIONS_GENERAL "CUI_HID_OPTIONS_GENERAL"
+#define HID_OPTIONS_LINGU "CUI_HID_OPTIONS_LINGU"
+#define HID_OPTIONS_SPELL "CUI_HID_OPTIONS_SPELL"
+#define HID_OPTIONS_DICT_NEW "CUI_HID_OPTIONS_DICT_NEW"
+#define HID_OPTIONS_DICT_EDIT "CUI_HID_OPTIONS_DICT_EDIT"
+#define HID_OPTIONS_INET "CUI_HID_OPTIONS_INET"
+#define HID_OPTIONS_CHART_DEFCOLORS "CUI_HID_OPTIONS_CHART_DEFCOLORS"
+#define HID_OPTIONS_CTL "CUI_HID_OPTIONS_CTL"
+#define HID_OPTIONS_PROXY "CUI_HID_OPTIONS_PROXY"
+#define HID_OPTIONS_SEARCH "CUI_HID_OPTIONS_SEARCH"
+#define HID_OPTIONS_MAIL "CUI_HID_OPTIONS_MAIL"
+#define HID_OPTIONS_ASIAN_LAYOUT "CUI_HID_OPTIONS_ASIAN_LAYOUT"
+#define HID_CLB_EDIT_MODULES_DICS "CUI_HID_CLB_EDIT_MODULES_DICS"
+#define HID_CLB_EDIT_MODULES_MODULES "CUI_HID_CLB_EDIT_MODULES_MODULES"
+#define HID_CLB_LINGU_MODULES "CUI_HID_CLB_LINGU_MODULES"
+#define HID_CLB_LINGU_OPTIONS "CUI_HID_CLB_LINGU_OPTIONS"
+#define HID_EDIT_MODULES "CUI_HID_EDIT_MODULES"
+#define HID_LNGDLG_NUM_PREBREAK "CUI_HID_LNGDLG_NUM_PREBREAK"
+#define HID_OPTIONS_COLORCONFIG "CUI_HID_OPTIONS_COLORCONFIG"
+#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME"
+#define HID_OPTIONS_ACCESSIBILITYCONFIG "CUI_HID_OPTIONS_ACCESSIBILITYCONFIG"
+#define HID_OPTIONS_COLORCONFIG_COLORLIST_WIN "CUI_HID_OPTIONS_COLORCONFIG_COLORLIST_WIN"
+#define HID_OPTIONS_COLORCONFIG_NAME_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_NAME_SCHEME"
+#define HID_OPTIONS_PATHS_SELECTFOLDER "CUI_HID_OPTIONS_PATHS_SELECTFOLDER"
+#define HID_OPTIONS_JAVA "CUI_HID_OPTIONS_JAVA"
+#define HID_OPTIONS_JAVA_LIST "CUI_HID_OPTIONS_JAVA_LIST"
+#define HID_OPTIONS_JAVA_PARAMETER "CUI_HID_OPTIONS_JAVA_PARAMETER"
+#define HID_OPTIONS_JAVA_CLASSPATH "CUI_HID_OPTIONS_JAVA_CLASSPATH"
+#define HID_SVXPAGE_JSEARCH_OPTIONS "CUI_HID_SVXPAGE_JSEARCH_OPTIONS"
+#define HID_SVXDLG_FILTER_WARNING "CUI_HID_SVXDLG_FILTER_WARNING"
+#define HID_SVX_OPTIONS_ONLINEUPDATE "CUI_HID_SVX_OPTIONS_ONLINEUPDATE"
+#define HID_DLG_SECURITY_OPTIONS "CUI_HID_DLG_SECURITY_OPTIONS"
+#define HID_OFADLG_OPTIONS_TREE "CUI_HID_OFADLG_OPTIONS_TREE"
+#define HID_OFA_CONNPOOL_DRIVERLIST "CUI_HID_OFA_CONNPOOL_DRIVERLIST"
+#define UID_OFA_CONNPOOL_DRIVERLIST_BACK "CUI_UID_OFA_CONNPOOL_DRIVERLIST_BACK"
+#define HID_OFA_FONT_SUBST_CLB "CUI_HID_OFA_FONT_SUBST_CLB"
+#define HID_OFA_TP_MISC "CUI_HID_OFA_TP_MISC"
+#define HID_OFA_TP_VIEW "CUI_HID_OFA_TP_VIEW"
+#define HID_OFA_TP_LANGUAGES "CUI_HID_OFA_TP_LANGUAGES"
+#define HID_OFA_TP_MEMORY "CUI_HID_OFA_TP_MEMORY"
+#define HID_DBPATH_CTL_PATH "CUI_HID_DBPATH_CTL_PATH"
+#define HID_DBPATH_HEADERBAR "CUI_HID_DBPATH_HEADERBAR"
+#define HID_OFAPAGE_SMARTTAG_OPTIONS "CUI_HID_OFAPAGE_SMARTTAG_OPTIONS"
+#define HID_OFAPAGE_MSFLTR2_CLB "CUI_HID_OFAPAGE_MSFLTR2_CLB"
+#define HID_OPTPATH_CTL_PATH "CUI_HID_OPTPATH_CTL_PATH"
+#define HID_OFADLG_TREELISTBOX "CUI_HID_OFADLG_TREELISTBOX"
+#define HID_DLG_WEBCONNECTION_INFO "CUI_HID_DLG_WEBCONNECTION_INFO"
+#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST "CUI_HID_OPTIONS_DICT_EDIT_ENTRIES_LIST"
+#define HID_OPTPATH_HEADERBAR "CUI_HID_OPTPATH_HEADERBAR"
+#define HID_WARN_NAME_DUPLICATE "CUI_HID_WARN_NAME_DUPLICATE"
+#define HID_COLORPAGE_LISTBOX_START "CUI_HID_COLORPAGE_LISTBOX_START"
+#define HID_COLORPAGE_DOCCOLOR_LB "CUI_HID_COLORPAGE_DOCCOLOR_LB"
+#define HID_COLORPAGE_DOCBOUNDARIES_LB "CUI_HID_COLORPAGE_DOCBOUNDARIES_LB"
+#define HID_COLORPAGE_APPBACKGROUND_LB "CUI_HID_COLORPAGE_APPBACKGROUND_LB"
+#define HID_COLORPAGE_OBJECTBOUNDARIES_LB "CUI_HID_COLORPAGE_OBJECTBOUNDARIES_LB"
+#define HID_COLORPAGE_TABLEBOUNDARIES_LB "CUI_HID_COLORPAGE_TABLEBOUNDARIES_LB"
+#define HID_COLORPAGE_FONTCOLOR_LB "CUI_HID_COLORPAGE_FONTCOLOR_LB"
+#define HID_COLORPAGE_LINKS_LB "CUI_HID_COLORPAGE_LINKS_LB"
+#define HID_COLORPAGE_LINKSVISITED_LB "CUI_HID_COLORPAGE_LINKSVISITED_LB"
+#define HID_COLORPAGE_ANCHOR_LB "CUI_HID_COLORPAGE_ANCHOR_LB"
+#define HID_COLORPAGE_SPELL_LB "CUI_HID_COLORPAGE_SPELL_LB"
+#define HID_COLORPAGE_WRITERTEXTGRID_LB "CUI_HID_COLORPAGE_WRITERTEXTGRID_LB"
+#define HID_COLORPAGE_WRITERFIELDSHADINGS_LB "CUI_HID_COLORPAGE_WRITERFIELDSHADINGS_LB"
+#define HID_COLORPAGE_WRITERIDXSHADINGS_LB "CUI_HID_COLORPAGE_WRITERIDXSHADINGS_LB"
+#define HID_COLORPAGE_WRITERDIRECTCURSOR_LB "CUI_HID_COLORPAGE_WRITERDIRECTCURSOR_LB"
+#define HID_COLORPAGE_WRITERNOTESINDICATOR_LB "CUI_HID_COLORPAGE_WRITERNOTESINDICATOR_LB"
+#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB "CUI_HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB"
+#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB "CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB"
+#define HID_COLORPAGE_WRITERPAGEBREAKS_LB "CUI_HID_COLORPAGE_WRITERPAGEBREAKS_LB"
+#define HID_COLORPAGE_HTMLSGML_LB "CUI_HID_COLORPAGE_HTMLSGML_LB"
+#define HID_COLORPAGE_HTMLCOMMENT_LB "CUI_HID_COLORPAGE_HTMLCOMMENT_LB"
+#define HID_COLORPAGE_HTMLKEYWORD_LB "CUI_HID_COLORPAGE_HTMLKEYWORD_LB"
+#define HID_COLORPAGE_HTMLUNKNOWN_LB "CUI_HID_COLORPAGE_HTMLUNKNOWN_LB"
+#define HID_COLORPAGE_CALCGRID_LB "CUI_HID_COLORPAGE_CALCGRID_LB"
+#define HID_COLORPAGE_CALCPAGEBREAK_LB "CUI_HID_COLORPAGE_CALCPAGEBREAK_LB"
+#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB "CUI_HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB"
+#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB "CUI_HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB"
+#define HID_COLORPAGE_CALCDETECTIVE_LB "CUI_HID_COLORPAGE_CALCDETECTIVE_LB"
+#define HID_COLORPAGE_CALCDETECTIVEERROR_LB "CUI_HID_COLORPAGE_CALCDETECTIVEERROR_LB"
+#define HID_COLORPAGE_CALCREFERENCE_LB "CUI_HID_COLORPAGE_CALCREFERENCE_LB"
+#define HID_COLORPAGE_CALCNOTESBACKGROUND_LB "CUI_HID_COLORPAGE_CALCNOTESBACKGROUND_LB"
+#define HID_COLORPAGE_DRAWGRID_LB "CUI_HID_COLORPAGE_DRAWGRID_LB"
+#define HID_COLORPAGE_DRAWDRAWING_LB "CUI_HID_COLORPAGE_DRAWDRAWING_LB"
+#define HID_COLORPAGE_DRAWFILL_LB "CUI_HID_COLORPAGE_DRAWFILL_LB"
+#define HID_COLORPAGE_BASICIDENTIFIER_LB "CUI_HID_COLORPAGE_BASICIDENTIFIER_LB"
+#define HID_COLORPAGE_BASICCOMMENT_LB "CUI_HID_COLORPAGE_BASICCOMMENT_LB"
+#define HID_COLORPAGE_BASICNUMBER_LB "CUI_HID_COLORPAGE_BASICNUMBER_LB"
+#define HID_COLORPAGE_BASICSTRING_LB "CUI_HID_COLORPAGE_BASICSTRING_LB"
+#define HID_COLORPAGE_BASICOPERATOR_LB "CUI_HID_COLORPAGE_BASICOPERATOR_LB"
+#define HID_COLORPAGE_BASICKEYWORD_LB "CUI_HID_COLORPAGE_BASICKEYWORD_LB"
+#define HID_COLORPAGE_BASICERROR_LB "CUI_HID_COLORPAGE_BASICERROR_LB"
+#define HID_COLORPAGE_CHECKBOX_START "CUI_HID_COLORPAGE_CHECKBOX_START"
+#define HID_COLORPAGE_DOCCOLOR_CB "CUI_HID_COLORPAGE_DOCCOLOR_CB"
+#define HID_COLORPAGE_DOCBOUNDARIES_CB "CUI_HID_COLORPAGE_DOCBOUNDARIES_CB"
+#define HID_COLORPAGE_APPBACKGROUND_CB "CUI_HID_COLORPAGE_APPBACKGROUND_CB"
+#define HID_COLORPAGE_OBJECTBOUNDARIES_CB "CUI_HID_COLORPAGE_OBJECTBOUNDARIES_CB"
+#define HID_COLORPAGE_TABLEBOUNDARIES_CB "CUI_HID_COLORPAGE_TABLEBOUNDARIES_CB"
+#define HID_COLORPAGE_FONTCOLOR_CB "CUI_HID_COLORPAGE_FONTCOLOR_CB"
+#define HID_COLORPAGE_LINKS_CB "CUI_HID_COLORPAGE_LINKS_CB"
+#define HID_COLORPAGE_LINKSVISITED_CB "CUI_HID_COLORPAGE_LINKSVISITED_CB"
+#define HID_COLORPAGE_ANCHOR_CB "CUI_HID_COLORPAGE_ANCHOR_CB"
+#define HID_COLORPAGE_SPELL_CB "CUI_HID_COLORPAGE_SPELL_CB"
+#define HID_COLORPAGE_WRITERTEXTGRID_CB "CUI_HID_COLORPAGE_WRITERTEXTGRID_CB"
+#define HID_COLORPAGE_WRITERFIELDSHADINGS_CB "CUI_HID_COLORPAGE_WRITERFIELDSHADINGS_CB"
+#define HID_COLORPAGE_WRITERIDXSHADINGS_CB "CUI_HID_COLORPAGE_WRITERIDXSHADINGS_CB"
+#define HID_COLORPAGE_WRITERDIRECTCURSOR_CB "CUI_HID_COLORPAGE_WRITERDIRECTCURSOR_CB"
+#define HID_COLORPAGE_WRITERNOTESINDICATOR_CB "CUI_HID_COLORPAGE_WRITERNOTESINDICATOR_CB"
+#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB "CUI_HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB"
+#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB "CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB"
+#define HID_COLORPAGE_WRITERPAGEBREAKS_CB "CUI_HID_COLORPAGE_WRITERPAGEBREAKS_CB"
+#define HID_COLORPAGE_HTMLSGML_CB "CUI_HID_COLORPAGE_HTMLSGML_CB"
+#define HID_COLORPAGE_HTMLCOMMENT_CB "CUI_HID_COLORPAGE_HTMLCOMMENT_CB"
+#define HID_COLORPAGE_HTMLKEYWORD_CB "CUI_HID_COLORPAGE_HTMLKEYWORD_CB"
+#define HID_COLORPAGE_HTMLUNKNOWN_CB "CUI_HID_COLORPAGE_HTMLUNKNOWN_CB"
+#define HID_COLORPAGE_CALCGRID_CB "CUI_HID_COLORPAGE_CALCGRID_CB"
+#define HID_COLORPAGE_CALCPAGEBREAK_CB "CUI_HID_COLORPAGE_CALCPAGEBREAK_CB"
+#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB "CUI_HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB"
+#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB "CUI_HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB"
+#define HID_COLORPAGE_CALCDETECTIVE_CB "CUI_HID_COLORPAGE_CALCDETECTIVE_CB"
+#define HID_COLORPAGE_CALCDETECTIVEERROR_CB "CUI_HID_COLORPAGE_CALCDETECTIVEERROR_CB"
+#define HID_COLORPAGE_CALCREFERENCE_CB "CUI_HID_COLORPAGE_CALCREFERENCE_CB"
+#define HID_COLORPAGE_CALCNOTESBACKGROUND_CB "CUI_HID_COLORPAGE_CALCNOTESBACKGROUND_CB"
+#define HID_COLORPAGE_DRAWGRID_CB "CUI_HID_COLORPAGE_DRAWGRID_CB"
+#define HID_COLORPAGE_DRAWDRAWING_CB "CUI_HID_COLORPAGE_DRAWDRAWING_CB"
+#define HID_COLORPAGE_DRAWFILL_CB "CUI_HID_COLORPAGE_DRAWFILL_CB"
+#define HID_COLORPAGE_BASICIDENTIFIER_CB "CUI_HID_COLORPAGE_BASICIDENTIFIER_CB"
+#define HID_COLORPAGE_BASICCOMMENT_CB "CUI_HID_COLORPAGE_BASICCOMMENT_CB"
+#define HID_COLORPAGE_BASICNUMBER_CB "CUI_HID_COLORPAGE_BASICNUMBER_CB"
+#define HID_COLORPAGE_BASICSTRING_CB "CUI_HID_COLORPAGE_BASICSTRING_CB"
+#define HID_COLORPAGE_BASICOPERATOR_CB "CUI_HID_COLORPAGE_BASICOPERATOR_CB"
+#define HID_COLORPAGE_BASICKEYWORD_CB "CUI_HID_COLORPAGE_BASICKEYWORD_CB"
+#define HID_COLORPAGE_BASICERROR_CB "CUI_HID_COLORPAGE_BASICERROR_CB"
+#define HID_NUMBERINGOPT_SEL_GRF_FROM_FILE "CUI_HID_NUMBERINGOPT_SEL_GRF_FROM_FILE"
+#define HID_SVX_MACRO_LB_EVENT "CUI_HID_SVX_MACRO_LB_EVENT"
+#define HID_SVX_CONFIG_EVENT "CUI_HID_SVX_CONFIG_EVENT"
+#define HID_CONFIG_EVENT_OFFICE_BASED "CUI_HID_CONFIG_EVENT_OFFICE_BASED"
+#define HID_CONFIG_EVENT_DOCUMENT_BASED "CUI_HID_CONFIG_EVENT_DOCUMENT_BASED"
+#define HID_SELECTOR_DIALOG "CUI_HID_SELECTOR_DIALOG"
+#define HID_SELECTOR_CATEGORIES "CUI_HID_SELECTOR_CATEGORIES"
+#define HID_SVX_CONFIG_TOOLBAR "CUI_HID_SVX_CONFIG_TOOLBAR"
+#define HID_SVX_CONFIG_TOOLBAR_CONTENTS "CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS"
+#define HID_SELECTOR_COMMANDS "CUI_HID_SELECTOR_COMMANDS"
+#define HID_GALLERY_EDIT_MSNAME "CUI_HID_GALLERY_EDIT_MSNAME"
+#define HID_SVX_CONFIG_MENU "CUI_HID_SVX_CONFIG_MENU"
+#define HID_SVX_CONFIG_MENU_CONTENTS "CUI_HID_SVX_CONFIG_MENU_CONTENTS"
+#define HID_GALLERY_NEWTHEME_FINDFILES "CUI_HID_GALLERY_NEWTHEME_FINDFILES"
+#define HID_GALLERY_NEWTHEME_ADDFILES "CUI_HID_GALLERY_NEWTHEME_ADDFILES"
+#define HID_HANGULDLG_BUTTON_OPTIONS "CUI_HID_HANGULDLG_BUTTON_OPTIONS"
+#define HID_HANGULDLG_BUTTON_CLOSE "CUI_HID_HANGULDLG_BUTTON_CLOSE"
+#define HID_HANGULDLG_BUTTON_IGNORE "CUI_HID_HANGULDLG_BUTTON_IGNORE"
+#define HID_HANGULDLG_BUTTON_IGNOREALL "CUI_HID_HANGULDLG_BUTTON_IGNOREALL"
+#define HID_HANGULDLG_BUTTON_CHANGE "CUI_HID_HANGULDLG_BUTTON_CHANGE"
+#define HID_HANGULDLG_BUTTON_CHANGEALL "CUI_HID_HANGULDLG_BUTTON_CHANGEALL"
+#define HID_OFA_FONT_SUBSTITUTION "CUI_HID_OFA_FONT_SUBSTITUTION"
+#define HID_HANGULDLG_EDIT_NEWWORD "CUI_HID_HANGULDLG_EDIT_NEWWORD"
+#define HID_OFA_SUBST_APPLY "CUI_HID_OFA_SUBST_APPLY"
+#define HID_OFA_SUBST_DELETE "CUI_HID_OFA_SUBST_DELETE"
+#define HID_SPLDLG_BUTTON_CLOSE "CUI_HID_SPLDLG_BUTTON_CLOSE"
+#define HID_SPLDLG_BUTTON_IGNORE "CUI_HID_SPLDLG_BUTTON_IGNORE"
+#define HID_SPLDLG_BUTTON_IGNOREALL "CUI_HID_SPLDLG_BUTTON_IGNOREALL"
+#define HID_SPLDLG_BUTTON_CHANGE "CUI_HID_SPLDLG_BUTTON_CHANGE"
+#define HID_SPLDLG_BUTTON_CHANGEALL "CUI_HID_SPLDLG_BUTTON_CHANGEALL"
+#define HID_SPLDLG_BUTTON_EXPLAIN "CUI_HID_SPLDLG_BUTTON_EXPLAIN"
+#define HID_CHARMAP_CTL_SHOWSET "CUI_HID_CHARMAP_CTL_SHOWSET"
+#define HID_CHARMAP_CTL_SHOWTEXT "CUI_HID_CHARMAP_CTL_SHOWTEXT"
+#define HID_CHARMAP_CTL_SHOWCHAR "CUI_HID_CHARMAP_CTL_SHOWCHAR"
+#define HID_DLG_NAME "CUI_HID_DLG_NAME"
+#define HID_DLG_MESSBOX "CUI_HID_DLG_MESSBOX"
+#define HID_HANGULDLG_SUGGESTIONS "CUI_HID_HANGULDLG_SUGGESTIONS"
+#define HID_HANGULDLG_SUGGESTIONS_GRID "CUI_HID_HANGULDLG_SUGGESTIONS_GRID"
+#define HID_HANGULDLG_SUGGESTIONS_LIST "CUI_HID_HANGULDLG_SUGGESTIONS_LIST"
+#define HID_DLG_OBJECT_NAME "CUI_HID_DLG_OBJECT_NAME"
+#define HID_DLG_OBJECT_TITLE_DESC "CUI_HID_DLG_OBJECT_TITLE_DESC"
+#define HID_SVX_CONFIG_MENU_ORGANIZER "CUI_HID_SVX_CONFIG_MENU_ORGANIZER"
+#define HID_SVX_CONFIG_ICON_SELECTOR "CUI_HID_SVX_CONFIG_ICON_SELECTOR"
+#define HID_SVX_CONFIG_NAME_SUBMENU "CUI_HID_SVX_CONFIG_NAME_SUBMENU"
+#define HID_SVX_CONFIG_RENAME_MENU "CUI_HID_SVX_CONFIG_RENAME_MENU"
+#define HID_SVX_CONFIG_RENAME_MENU_ITEM "CUI_HID_SVX_CONFIG_RENAME_MENU_ITEM"
+#define HID_SVX_CONFIG_RENAME_TOOLBAR "CUI_HID_SVX_CONFIG_RENAME_TOOLBAR"
+#define HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM "CUI_HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM"
+#define HID_SVX_NEW_TOOLBAR "CUI_HID_SVX_NEW_TOOLBAR"
+#define HID_SVX_MODIFY_TOOLBAR "CUI_HID_SVX_MODIFY_TOOLBAR"
+#define HID_SVX_NEW_TOOLBAR_ITEM "CUI_HID_SVX_NEW_TOOLBAR_ITEM"
+#define HID_SVX_CONFIG_MENU_LISTBOX "CUI_HID_SVX_CONFIG_MENU_LISTBOX"
+#define HID_SVX_MODIFY_TOOLBAR_ITEM "CUI_HID_SVX_MODIFY_TOOLBAR_ITEM"
+#define HID_SVX_SAVE_IN "CUI_HID_SVX_SAVE_IN"
+#define HID_OPTIONS_MULTIPATH_LIST "CUI_HID_OPTIONS_MULTIPATH_LIST"
+#define HID_FM_DLG_SEARCH "CUI_HID_FM_DLG_SEARCH"
+#define HID_SEARCH_TEXT "CUI_HID_SEARCH_TEXT"
+#define HID_SEARCH_ALLFIELDS "CUI_HID_SEARCH_ALLFIELDS"
+#define HID_GALLERY_PROPERTIES_GENERAL "CUI_HID_GALLERY_PROPERTIES_GENERAL"
+#define HID_SEARCH_FIELDSELECTION "CUI_HID_SEARCH_FIELDSELECTION"
+#define HID_SEARCH_POSITION "CUI_HID_SEARCH_POSITION"
+#define HID_SEARCH_FORMATTER "CUI_HID_SEARCH_FORMATTER"
+#define HID_SEARCH_CASE "CUI_HID_SEARCH_CASE"
+#define HID_SEARCH_BACKWARD "CUI_HID_SEARCH_BACKWARD"
+#define HID_SEARCH_STARTOVER "CUI_HID_SEARCH_STARTOVER"
+#define HID_SEARCH_WILDCARD "CUI_HID_SEARCH_WILDCARD"
+#define HID_SEARCH_REGULAR "CUI_HID_SEARCH_REGULAR"
+#define HID_SEARCH_APPROX "CUI_HID_SEARCH_APPROX"
+#define HID_SEARCH_APPROXSETTINGS "CUI_HID_SEARCH_APPROXSETTINGS"
+#define HID_SEARCH_BTN_SEARCH "CUI_HID_SEARCH_BTN_SEARCH"
+#define HID_SEARCH_BTN_CLOSE "CUI_HID_SEARCH_BTN_CLOSE"
+#define HID_GALLERY_BROWSER "CUI_HID_GALLERY_BROWSER"
+#define HID_GALLERY_SEARCH "CUI_HID_GALLERY_SEARCH"
+#define HID_GALLERY_APPLY "CUI_HID_GALLERY_APPLY"
+#define HID_SPLDLG_BUTTON_IGNORERULE "CUI_HID_SPLDLG_BUTTON_IGNORERULE"
+#define HID_CONFIG_ACCEL "CUI_HID_CONFIG_ACCEL"
+#define HID_ACCELCONFIG_LISTBOX "CUI_HID_ACCELCONFIG_LISTBOX"
+#define HID_CONFIGGROUP_ACC_LISTBOX "CUI_HID_CONFIGGROUP_ACC_LISTBOX"
+#define HID_CONFIGFUNCTION_ACC_LISTBOX "CUI_HID_CONFIGFUNCTION_ACC_LISTBOX"
+#define HID_MACRO_LB_EVENT "CUI_HID_MACRO_LB_EVENT"
+#define HID_MACRO_GROUP "CUI_HID_MACRO_GROUP"
+#define HID_MACRO_MACROS "CUI_HID_MACRO_MACROS"
+#define HID_DIALOG_HANGULHANJA "CUI_HID_DIALOG_HANGULHANJA"
+#define HID_HANGULHANJA_OPT_DLG "CUI_HID_HANGULHANJA_OPT_DLG"
+#define HID_HANGULHANJA_NEWDICT_DLG "CUI_HID_HANGULHANJA_NEWDICT_DLG"
+#define HID_HANGULHANJA_EDIT_DLG "CUI_HID_HANGULHANJA_EDIT_DLG"
+#define HID_HANGULHANJA_OPT_DICTS_LB "CUI_HID_HANGULHANJA_OPT_DICTS_LB"
+#define HID_MULTIPATH "CUI_HID_MULTIPATH"
+#define HID_SCRIPTORG_DIALOG "CUI_HID_SCRIPTORG_DIALOG"
+#define HID_SCRIPTSBOX "CUI_HID_SCRIPTSBOX"
+#define HID_SPELLCHECK "CUI_HID_SPELLCHECK"
+#define HID_TPSIZE_CTRL "CUI_HID_TPSIZE_CTRL"
+#define HID_TPROTATION_CTRL1 "CUI_HID_TPROTATION_CTRL1"
+#define HID_TPROTATION_CTRL2 "CUI_HID_TPROTATION_CTRL2"
+#define HID_TRANS_ANGLE "CUI_HID_TRANS_ANGLE"
+#define HID_TPPOSITION_CTRL "CUI_HID_TPPOSITION_CTRL"
+#define HID_NUMBERFORMAT_LB_FORMAT "CUI_HID_NUMBERFORMAT_LB_FORMAT"
+#define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW "CUI_HID_NUMBERFORMAT_WND_NUMBER_PREVIEW"
+#define HID_TRANS_SLANT "CUI_HID_TRANS_SLANT"
+#define HID_TPHATCH_CTRL "CUI_HID_TPHATCH_CTRL"
+#define HID_SEARCHATTR_CTL_ATTR "CUI_HID_SEARCHATTR_CTL_ATTR"
+#define HID_NUMBERFORMAT_TBI_INFO "CUI_HID_NUMBERFORMAT_TBI_INFO"
+#define HID_SEARCHATTR "CUI_HID_SEARCHATTR"
+#define HID_ALIGNMENT_CTR_DIAL "CUI_HID_ALIGNMENT_CTR_DIAL"
+#define HID_ALIGNMENT_CTR_BORDER_LOCK "CUI_HID_ALIGNMENT_CTR_BORDER_LOCK"
+#define HID_SEARCHSIMILARITY "CUI_HID_SEARCHSIMILARITY"
+#define UID_SEARCH_RECORDSTATUS "CUI_UID_SEARCH_RECORDSTATUS"
+#define HID_OFAPAGE_AUTOCORR_CLB "CUI_HID_OFAPAGE_AUTOCORR_CLB"
+#define HID_AUTOCORR_LANGUAGE "CUI_HID_AUTOCORR_LANGUAGE"
+#define HID_OFAPAGE_AUTOFORMAT_CLB "CUI_HID_OFAPAGE_AUTOFORMAT_CLB"
+#define HID_TPCOLOR_RGB_1 "CUI_HID_TPCOLOR_RGB_1"
+#define HID_TPCOLOR_RGB_2 "CUI_HID_TPCOLOR_RGB_2"
+#define HID_TPCOLOR_RGB_3 "CUI_HID_TPCOLOR_RGB_3"
+#define HID_TPCOLOR_CMYK_1 "CUI_HID_TPCOLOR_CMYK_1"
+#define HID_TPCOLOR_CMYK_2 "CUI_HID_TPCOLOR_CMYK_2"
+#define HID_TPCOLOR_CMYK_3 "CUI_HID_TPCOLOR_CMYK_3"
+#define HID_ALIGNMENT "CUI_HID_ALIGNMENT"
+#define HID_OFAPAGE_AUTOCORR_OPTIONS "CUI_HID_OFAPAGE_AUTOCORR_OPTIONS"
+#define HID_OFAPAGE_AUTOFMT_OPTIONS "CUI_HID_OFAPAGE_AUTOFMT_OPTIONS"
+#define HID_OFAPAGE_AUTOCORR_REPLACE "CUI_HID_OFAPAGE_AUTOCORR_REPLACE"
+#define HID_OFACTL_AUTOCORR_REPLACE "CUI_HID_OFACTL_AUTOCORR_REPLACE"
+#define HID_OFAPAGE_AUTOCORR_EXCEPT "CUI_HID_OFAPAGE_AUTOCORR_EXCEPT"
+#define HID_OFAPAGE_AUTOCORR_QUOTE "CUI_HID_OFAPAGE_AUTOCORR_QUOTE"
+#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS "CUI_HID_OFAPAGE_AUTOCOMPLETE_OPTIONS"
+#define HID_BACKGROUND "CUI_HID_BACKGROUND"
+#define HID_BACKGROUND_CTL_BGDCOLORSET "CUI_HID_BACKGROUND_CTL_BGDCOLORSET"
+#define HID_BACKGROUND_CTL_POSITION "CUI_HID_BACKGROUND_CTL_POSITION"
+#define HID_BORDER "CUI_HID_BORDER"
+#define HID_BORDER_CTL_PRESETS "CUI_HID_BORDER_CTL_PRESETS"
+#define HID_BORDER_CTL_SHADOWS "CUI_HID_BORDER_CTL_SHADOWS"
+#define HID_PAGE_CONNECTION "CUI_HID_PAGE_CONNECTION"
+#define HID_PAGE_CONNECTION_CTL_PREVIEW "CUI_HID_PAGE_CONNECTION_CTL_PREVIEW"
+#define HID_PAGE_DISTRIBUTE "CUI_HID_PAGE_DISTRIBUTE"
+#define HID_SVXPAGE_GRFCROP "CUI_HID_SVXPAGE_GRFCROP"
+#define HID_CAPTION "CUI_HID_CAPTION"
+#define HID_CAPTION_CTL_TYPE "CUI_HID_CAPTION_CTL_TYPE"
+#define HID_PAGE_MEASURE "CUI_HID_PAGE_MEASURE"
+#define HID_MEASURE_CTL_POSITION "CUI_HID_MEASURE_CTL_POSITION"
+#define HID_NUMBERFORMAT "CUI_HID_NUMBERFORMAT"
+#define HID_NUMBERFORMAT_TBI_ADD "CUI_HID_NUMBERFORMAT_TBI_ADD"
+#define HID_NUMBERFORMAT_TBI_REMOVE "CUI_HID_NUMBERFORMAT_TBI_REMOVE"
+#define HID_FORMAT_PAGE "CUI_HID_FORMAT_PAGE"
+#define HID_REDLINING_DLG "CUI_HID_REDLINING_DLG"
+#define HID_REDLINING_EDIT "CUI_HID_REDLINING_EDIT"
+#define HID_REDLINING_PREV "CUI_HID_REDLINING_PREV"
+#define HID_REDLINING_NEXT "CUI_HID_REDLINING_NEXT"
+#define HID_FORMAT_PARAGRAPH_STD "CUI_HID_FORMAT_PARAGRAPH_STD"
+#define HID_VALUESET_SINGLENUM "CUI_HID_VALUESET_SINGLENUM"
+#define HID_VALUESET_BULLET "CUI_HID_VALUESET_BULLET"
+#define HID_VALUESET_NUM "CUI_HID_VALUESET_NUM"
+#define HID_VALUESET_NUMBMP "CUI_HID_VALUESET_NUMBMP"
+#define HID_SVXPAGE_PICK_NUM "CUI_HID_SVXPAGE_PICK_NUM"
+#define HID_SVXPAGE_PICK_SINGLE_NUM "CUI_HID_SVXPAGE_PICK_SINGLE_NUM"
+#define HID_SVXPAGE_PICK_BMP "CUI_HID_SVXPAGE_PICK_BMP"
+#define HID_SVXPAGE_PICK_BULLET "CUI_HID_SVXPAGE_PICK_BULLET"
+#define HID_SVXPAGE_NUM_OPTIONS "CUI_HID_SVXPAGE_NUM_OPTIONS"
+#define HID_SVXPAGE_NUM_POSITION "CUI_HID_SVXPAGE_NUM_POSITION"
+#define HID_MEASURE_CTL_PREVIEW "CUI_HID_MEASURE_CTL_PREVIEW"
+#define HID_FORMAT_PARAGRAPH_EXT "CUI_HID_FORMAT_PARAGRAPH_EXT"
+#define HID_FORMAT_PARAGRAPH_ALIGN "CUI_HID_FORMAT_PARAGRAPH_ALIGN"
+#define HID_SVXPAGE_PARA_ASIAN "CUI_HID_SVXPAGE_PARA_ASIAN"
+#define HID_SVXPAGE_SWPOSSIZE "CUI_HID_SVXPAGE_SWPOSSIZE"
+#define HID_AREA_TRANSPARENCE "CUI_HID_AREA_TRANSPARENCE"
+#define HID_AREA_AREA "CUI_HID_AREA_AREA"
+#define HID_AREA_SHADOW "CUI_HID_AREA_SHADOW"
+#define HID_AREA_HATCH "CUI_HID_AREA_HATCH"
+#define HID_AREA_BITMAP "CUI_HID_AREA_BITMAP"
+#define HID_TPSHADOW_CTRL "CUI_HID_TPSHADOW_CTRL"
+#define HID_AREA_GRADIENT "CUI_HID_AREA_GRADIENT"
+#define HID_LINE_ENDDEF "CUI_HID_LINE_ENDDEF"
+#define HID_LINE_LINE "CUI_HID_LINE_LINE"
+#define HID_LINE_DEF "CUI_HID_LINE_DEF"
+#define HID_SPELLDLG_SETWORD "CUI_HID_SPELLDLG_SETWORD"
+#define HID_TABULATOR "CUI_HID_TABULATOR"
+#define HID_PAGE_TEXTATTR "CUI_HID_PAGE_TEXTATTR"
+#define HID_TEXTATTR_CTL_POSITION "CUI_HID_TEXTATTR_CTL_POSITION"
+#define HID_TRANS_POSITION_SIZE "CUI_HID_TRANS_POSITION_SIZE"
+#define HID_HYPHENATE "CUI_HID_HYPHENATE"
+#define HID_SVXPAGE_CHAR_NAME "CUI_HID_SVXPAGE_CHAR_NAME"
+#define HID_SVXPAGE_CHAR_EFFECTS "CUI_HID_SVXPAGE_CHAR_EFFECTS"
+#define HID_SVXPAGE_CHAR_POSITION "CUI_HID_SVXPAGE_CHAR_POSITION"
+#define HID_HYPERLINK_INTERNET "CUI_HID_HYPERLINK_INTERNET"
+#define HID_HYPERLINK_MAIL "CUI_HID_HYPERLINK_MAIL"
+#define HID_HYPERLINK_DOCUMENT "CUI_HID_HYPERLINK_DOCUMENT"
+#define HID_HYPERLINK_NEWDOCUMENT "CUI_HID_HYPERLINK_NEWDOCUMENT"
+#define HID_HYPERLINK_MARKWND "CUI_HID_HYPERLINK_MARKWND"
+#define HID_ICCDIALOG_RESET_BTN "CUI_HID_ICCDIALOG_RESET_BTN"
+#define HID_ICCDIALOG_CHOICECTRL "CUI_HID_ICCDIALOG_CHOICECTRL"
+#define HID_HYPERDLG_INET_PATH "CUI_HID_HYPERDLG_INET_PATH"
+#define HID_HYPERDLG_MAIL_PATH "CUI_HID_HYPERDLG_MAIL_PATH"
+#define HID_HYPERDLG_DOC_PATH "CUI_HID_HYPERDLG_DOC_PATH"
+#define HID_ICCDIALOG_OK_BTN "CUI_HID_ICCDIALOG_OK_BTN"
+#define HID_ICCDIALOG_CANCEL_BTN "CUI_HID_ICCDIALOG_CANCEL_BTN"
+#define HID_HYPERLINK_MARKWND_APPLY "CUI_HID_HYPERLINK_MARKWND_APPLY"
+#define HID_HYPERLINK_MARKWND_CLOSE "CUI_HID_HYPERLINK_MARKWND_CLOSE"
+#define HID_HYPERLINK_MARKWND_TREE "CUI_HID_HYPERLINK_MARKWND_TREE"
+#define HID_SVXPAGE_CHAR_TWOLINES "CUI_HID_SVXPAGE_CHAR_TWOLINES"
+#define HID_GRFFILTER_EMBOSS_LIGHT "CUI_HID_GRFFILTER_EMBOSS_LIGHT"
+#define HID_PASTE_DLG "CUI_HID_PASTE_DLG"
+#define HID_LINKDLG_TABLB "CUI_HID_LINKDLG_TABLB"
+#define HID_MACRO_HEADERTABLISTBOX "CUI_HID_MACRO_HEADERTABLISTBOX"
+#define HID_GALLERY_ENTER_TITLE "CUI_HID_GALLERY_ENTER_TITLE"
+#define HID_GALLERY_TITLE_EDIT "CUI_HID_GALLERY_TITLE_EDIT"
+#define HID_THES_LANGUAGE "CUI_HID_THES_LANGUAGE"
+#define HID_OFAPAGE_QUOTE_SW_CLB "CUI_HID_OFAPAGE_QUOTE_SW_CLB"
+#define HID_OFAPAGE_QUOTE_CLB "CUI_HID_OFAPAGE_QUOTE_CLB"
+#define HID_POSTIT_DIALOG "CUI_HID_POSTIT_DIALOG"
+#define HID_CT_THES_ALTERNATIVES                    "CUI_HID_CT_THES_ALTERNATIVES"
 
-#define HID_DLG_PASSWORD_TO_OPEN_MODIFY                             (HID_CUI_START + 342)
-#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN            (HID_CUI_START + 343)
-#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN    (HID_CUI_START + 344)
-#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE                        (HID_CUI_START + 345)
-#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY               (HID_CUI_START + 346)
-#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY          (HID_CUI_START + 347)
-#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY  (HID_CUI_START + 348)
-#define HID_HYPERLINK_DIALOG                                        (HID_CUI_START + 349)
-
-// please adjust ACT_SVX_HID_END2 below if you add entries here!
-
-// -----------------------------------------------------------------------
-// Overrun check ---------------------------------------------------------
-// -----------------------------------------------------------------------
-
-#define ACT_CUI_HID_END     (HID_CUI_START + 349)
-
-#if ACT_CUI_HID_END > HID_CUI_END
-#error Resource-Ueberlauf in #line, #file
-#endif
+#define HID_DLG_PASSWORD_TO_OPEN_MODIFY                             "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY"
+#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN            "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN"
+#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN    "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN"
+#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE                        "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE"
+#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY               "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY"
+#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY          "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY"
+#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY  "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY"
+#define HID_HYPERLINK_DIALOG                                        "CUI_HID_HYPERLINK_DIALOG"
 
 #endif
 
diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx
index a44363aeb105..c32d432d8a9b 100644
--- a/cui/source/inc/hldocntp.hxx
+++ b/cui/source/inc/hldocntp.hxx
@@ -53,8 +53,7 @@ private:
 
     DECL_LINK (ClickNewHdl_Impl          , void * );
 
-    Image GetImage( USHORT nId );
-    void ReadURLFile( const String& rFile, String& rTitle, String& rURL, sal_Int32& rIconId, BOOL* pShowAsFolder);
+    Image GetImage( sal_uInt16 nId );
 
 protected:
     void FillDlgFields     ( String& aStrURL );
@@ -68,7 +67,7 @@ public:
 
     static  IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet );
 
-    virtual BOOL        AskApply ();
+    virtual sal_Bool        AskApply ();
     virtual void        DoApply ();
 
     virtual void        SetInitFocus();
diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx
index ff3fd1698714..1c7a7a155da8 100644
--- a/cui/source/inc/hldoctp.hxx
+++ b/cui/source/inc/hldoctp.hxx
@@ -53,7 +53,7 @@ private:
 
     String              maStrURL;
 
-    BOOL                mbMarkWndOpen;
+    sal_Bool                mbMarkWndOpen;
 
     DECL_LINK (ClickFileopenHdl_Impl  , void * );
     DECL_LINK (ClickTargetHdl_Impl    , void * );
@@ -75,8 +75,8 @@ protected:
     void GetCurentItemData ( String& aStrURL, String& aStrName,
                              String& aStrIntName, String& aStrFrame,
                              SvxLinkInsertMode& eMode );
-    virtual BOOL   ShouldOpenMarkWnd () {return mbMarkWndOpen;}
-    virtual void   SetMarkWndShouldOpen (BOOL bOpen) {mbMarkWndOpen=bOpen;}
+    virtual sal_Bool   ShouldOpenMarkWnd () {return mbMarkWndOpen;}
+    virtual void   SetMarkWndShouldOpen (sal_Bool bOpen) {mbMarkWndOpen=bOpen;}
     String GetCurrentURL    ();
 
 public:
diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx
index ae784cd339ad..b803f01aaf1c 100644
--- a/cui/source/inc/hlinettp.hxx
+++ b/cui/source/inc/hlinettp.hxx
@@ -47,18 +47,18 @@ private:
     RadioButton         maRbtLinktypTelnet;
     FixedText           maFtTarget;
     SvxHyperURLBox      maCbbTarget;
+    ImageButton         maBtBrowse;
     FixedText           maFtLogin;
     Edit                maEdLogin;
+    ImageButton         maBtTarget;
     FixedText           maFtPassword;
     Edit                maEdPassword;
     CheckBox            maCbAnonymous;
-    ImageButton         maBtBrowse;
-    ImageButton         maBtTarget;
 
     String              maStrOldUser;
     String              maStrOldPassword;
 
-    BOOL                mbMarkWndOpen;
+    sal_Bool                mbMarkWndOpen;
 
     String              maStrStdDocURL;
 
@@ -89,8 +89,8 @@ protected:
     virtual void GetCurentItemData ( String& aStrURL, String& aStrName,
                                      String& aStrIntName, String& aStrFrame,
                                      SvxLinkInsertMode& eMode );
-    virtual BOOL ShouldOpenMarkWnd () {return ( mbMarkWndOpen && maRbtLinktypInternet.IsChecked() );}
-    virtual void SetMarkWndShouldOpen (BOOL bOpen) {mbMarkWndOpen=bOpen;}
+    virtual sal_Bool ShouldOpenMarkWnd () {return ( mbMarkWndOpen && maRbtLinktypInternet.IsChecked() );}
+    virtual void SetMarkWndShouldOpen (sal_Bool bOpen) {mbMarkWndOpen=bOpen;}
 
 public:
     SvxHyperlinkInternetTp ( Window *pParent, const SfxItemSet& rItemSet);
@@ -99,7 +99,7 @@ public:
     static  IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet );
 
     virtual void        SetMarkStr ( String& aStrMark );
-    virtual void        SetOnlineMode( BOOL bEnable );
+    virtual void        SetOnlineMode( sal_Bool bEnable );
 
     virtual void        SetInitFocus();
 };
diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index e5691351a999..54fafdf2477d 100644
--- a/cui/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
@@ -71,17 +71,17 @@ private:
     PushButton      maBtClose;
     SvxHlmarkTreeLBox maLbTree;
 
-    BOOL            mbUserMoved;
-    BOOL            mbFirst;
+    sal_Bool            mbUserMoved;
+    sal_Bool            mbFirst;
 
     SvxHyperlinkTabPageBase* mpParent;
 
     String          maStrLastURL;
 
-    USHORT          mnError;
+    sal_uInt16          mnError;
 
 protected:
-    BOOL RefreshFromDoc( ::rtl::OUString aURL );
+    sal_Bool RefreshFromDoc( ::rtl::OUString aURL );
 
     SvLBoxEntry* FindEntry ( String aStrName );
     void ClearTree();
@@ -96,13 +96,13 @@ public:
     SvxHlinkDlgMarkWnd (SvxHyperlinkTabPageBase *pParent);
     ~SvxHlinkDlgMarkWnd();
 
-    BOOL MoveTo ( Point aNewPos );
+    sal_Bool MoveTo ( Point aNewPos );
     void RefreshTree ( String aStrURL );
     void SelectEntry ( String aStrMark );
 
-    BOOL ConnectToDialog( BOOL bDoit = TRUE );
+    sal_Bool ConnectToDialog( sal_Bool bDoit = sal_True );
 
-    USHORT SetError( USHORT nError);
+    sal_uInt16 SetError( sal_uInt16 nError);
 };
 
 
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index 3d6a84a144a7..0a3dbb237239 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -81,7 +81,7 @@ public:
 class SvxHyperURLBox : public SvtURLBox, public DropTargetHelper
 {
 private:
-    BOOL   mbAccessAddress;
+    sal_Bool   mbAccessAddress;
 
 protected:
     virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt );
@@ -93,7 +93,7 @@ protected:
     virtual long        PreNotify( NotifyEvent& rNEvt );
 
 public:
-    SvxHyperURLBox( Window* pParent, INetProtocol eSmart = INET_PROT_FILE, BOOL bAddresses = FALSE );
+    SvxHyperURLBox( Window* pParent, INetProtocol eSmart = INET_PROT_FILE, sal_Bool bAddresses = sal_False );
 
 };
 
@@ -125,7 +125,7 @@ private:
 protected:
     Window*             mpDialog;
 
-    BOOL                mbStdControlsInit;
+    sal_Bool                mbStdControlsInit;
 
     String              maStrInitURL;
 
@@ -149,7 +149,7 @@ protected:
 
     String              aEmptyStr;
 
-    BOOL            FileExists( const INetURLObject& rURL );
+    sal_Bool            FileExists( const INetURLObject& rURL );
     static String   GetSchemeFromURL( String aStrURL );
 
     inline void     DisableClose( sal_Bool _bDisable ) { mbIsCloseDisabled = _bDisable; }
@@ -168,27 +168,27 @@ public:
         mxDocumentFrame = rxDocumentFrame;
     }
 
-    virtual BOOL AskApply ();
+    virtual sal_Bool AskApply ();
     virtual void DoApply ();
-    virtual void SetOnlineMode( BOOL bEnable );
+    virtual void SetOnlineMode( sal_Bool bEnable );
     virtual void SetInitFocus();
     virtual void SetMarkStr ( String& aStrMark );
     virtual void Reset( const SfxItemSet& );
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void ActivatePage( const SfxItemSet& rItemSet );
     virtual int  DeactivatePage( SfxItemSet* pSet = 0 );
 
-    BOOL IsMarkWndVisible ()      { return ((Window*)mpMarkWnd)->IsVisible(); }
+    sal_Bool IsMarkWndVisible ()      { return ((Window*)mpMarkWnd)->IsVisible(); }
     Size GetSizeExtraWnd ()       { return ( mpMarkWnd->GetSizePixel() ); }
-    BOOL MoveToExtraWnd ( Point aNewPos, BOOL bDisConnectDlg = FALSE );
+    sal_Bool MoveToExtraWnd ( Point aNewPos, sal_Bool bDisConnectDlg = sal_False );
 
     virtual void        ActivatePage();
     virtual void        DeactivatePage();
     virtual sal_Bool    QueryClose();
 
 protected:
-    virtual BOOL ShouldOpenMarkWnd();
-    virtual void SetMarkWndShouldOpen(BOOL bOpen);
+    virtual sal_Bool ShouldOpenMarkWnd();
+    virtual void SetMarkWndShouldOpen(sal_Bool bOpen);
 
     void ShowMarkWnd ();
     void HideMarkWnd ()           { ( ( Window* ) mpMarkWnd )->Hide(); }
@@ -196,10 +196,10 @@ protected:
 
     SfxDispatcher* GetDispatcher() const;
 
-    USHORT             GetMacroEvents();
+    sal_uInt16             GetMacroEvents();
     SvxMacroTableDtor* GetMacroTable();
 
-    BOOL IsHTMLDoc() const;
+    sal_Bool IsHTMLDoc() const;
 };
 
 #endif // _SVX_TABBASE_HYPERLINK_HXX
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index a65754f20ff5..d0ed14387a0b 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -51,7 +51,7 @@ class IconChoicePage;
 
 // Create-Function
 typedef IconChoicePage* (*CreatePage)(Window *pParent, const SfxItemSet &rAttrSet);
-typedef USHORT*         (*GetPageRanges)(); // liefert internationale Which-Wert
+typedef sal_uInt16*         (*GetPageRanges)(); // liefert internationale Which-Wert
 
 // position of iconchoicectrl
 enum EIconChoicePos { PosLeft, PosRight, PosTop, PosBottom };
@@ -64,21 +64,21 @@ enum EIconChoicePos { PosLeft, PosRight, PosTop, PosBottom };
 
 struct IconChoicePageData
 {
-    USHORT nId;                  // Die ID
+    sal_uInt16 nId;                  // Die ID
     CreatePage fnCreatePage;     // Pointer auf die Factory
     GetPageRanges fnGetRanges;// Pointer auf die Ranges-Funktion
     IconChoicePage* pPage;       // die TabPage selber
-    BOOL bOnDemand;              // Flag: ItemSet onDemand
-    BOOL bRefresh;               // Flag: Seite mu\s neu initialisiert werden
+    sal_Bool bOnDemand;              // Flag: ItemSet onDemand
+    sal_Bool bRefresh;               // Flag: Seite mu\s neu initialisiert werden
 
     // Konstruktor
-    IconChoicePageData( USHORT Id, CreatePage fnPage, GetPageRanges fnRanges, BOOL bDemand )
+    IconChoicePageData( sal_uInt16 Id, CreatePage fnPage, GetPageRanges fnRanges, sal_Bool bDemand )
         : nId           ( Id ),
           fnCreatePage  ( fnPage ),
           fnGetRanges   ( fnRanges ),
           pPage         ( NULL ),
           bOnDemand     ( bDemand ),
-          bRefresh      ( FALSE )
+          bRefresh      ( sal_False )
     {}
 };
 
@@ -96,9 +96,9 @@ class IconChoicePage : public TabPage
 private :
     const SfxItemSet*   pSet;
     String              aUserString;
-    BOOL                bHasExchangeSupport;
+    sal_Bool                bHasExchangeSupport;
     IconChoiceDialog*   pDialog;
-    BOOL                bStandard;
+    sal_Bool                bStandard;
 
     void                SetDialog( IconChoiceDialog* pNew ) { pDialog = pNew; }
     IconChoiceDialog*   GetDialog() const { return pDialog; }
@@ -110,21 +110,19 @@ private :
 protected :
     IconChoicePage( Window *pParent, const ResId &, const SfxItemSet &rAttrSet );
 
-    USHORT              GetSlot( USHORT nWhich ) const  { return pSet->GetPool()->GetSlotId( nWhich ); }
-    USHORT              GetWhich( USHORT nSlot ) const  { return pSet->GetPool()->GetWhich( nSlot ); }
-    const SfxPoolItem*  GetOldItem( const SfxItemSet& rSet, USHORT nSlot );
-    const SfxPoolItem*  GetExchangeItem( const SfxItemSet& rSet, USHORT nSlot );
+    sal_uInt16              GetSlot( sal_uInt16 nWhich ) const  { return pSet->GetPool()->GetSlotId( nWhich ); }
+    sal_uInt16              GetWhich( sal_uInt16 nSlot ) const  { return pSet->GetPool()->GetWhich( nSlot ); }
 
 public :
     virtual             ~IconChoicePage();
 
     const SfxItemSet&   GetItemSet() const { return *pSet; }
 
-    virtual BOOL        FillItemSet( SfxItemSet& ) = 0;
+    virtual sal_Bool        FillItemSet( SfxItemSet& ) = 0;
     virtual void        Reset( const SfxItemSet& ) = 0;
 
-    BOOL                HasExchangeSupport() const              { return bHasExchangeSupport; }
-    void                SetExchangeSupport( BOOL bNew = TRUE )  { bHasExchangeSupport = bNew; }
+    sal_Bool                HasExchangeSupport() const              { return bHasExchangeSupport; }
+    void                SetExchangeSupport( sal_Bool bNew = sal_True )  { bHasExchangeSupport = bNew; }
 
     enum {
         KEEP_PAGE = 0x0000,     // Fehlerbehandlung; Seite nicht wechseln
@@ -141,11 +139,9 @@ public :
     void                SetUserData(const String& rString)  { aUserString = rString; }
     String              GetUserData() { return aUserString; }
     virtual void        FillUserData();
-    virtual BOOL        IsReadOnly() const;
+    virtual sal_Bool        IsReadOnly() const;
     virtual sal_Bool    QueryClose();
 
-    static const SfxPoolItem* GetItem( const SfxItemSet& rSet, USHORT nSlot );
-
     void                StateChanged( StateChangedType nType );
     void                DataChanged( const DataChangedEvent& rDCEvt );
 };
@@ -166,7 +162,7 @@ private :
 
     SvtIconChoiceCtrl       maIconCtrl;     // DAS IconChoice-Control
 
-    USHORT                  mnCurrentPageId;    // Id der aktuell sichtbaren Page
+    sal_uInt16                  mnCurrentPageId;    // Id der aktuell sichtbaren Page
 
     // Buttons
     OKButton                aOKBtn;
@@ -177,51 +173,50 @@ private :
     const SfxItemSet*       pSet;
     SfxItemSet*             pOutSet;
     SfxItemSet*             pExampleSet;
-    USHORT*                 pRanges;
+    sal_uInt16*                 pRanges;
 
     sal_uInt32              nResId;
 
-    BOOL                    bHideResetBtn;
-    BOOL                    bModal;
-    BOOL                    bInOK;
-    BOOL                    bModified;
-    BOOL                    bItemsReset;
+    sal_Bool                    bHideResetBtn;
+    sal_Bool                    bModal;
+    sal_Bool                    bInOK;
+    sal_Bool                    bModified;
+    sal_Bool                    bItemsReset;
 
     DECL_LINK ( ChosePageHdl_Impl, void * );
     DECL_LINK ( OkHdl,             Button * );
     DECL_LINK ( ResetHdl,          Button * );
     DECL_LINK ( CancelHdl,         Button * );
 
-    IconChoicePageData*     GetPageData ( USHORT nId );
+    IconChoicePageData*     GetPageData ( sal_uInt16 nId );
     void                    Start_Impl();
-    BOOL                    OK_Impl();
+    sal_Bool                    OK_Impl();
 
-    void                    SetPosSizeCtrls ( BOOL bInit = FALSE );
-    void                    SetPosSizePages ( USHORT nId );
+    void                    SetPosSizeCtrls ( sal_Bool bInit = sal_False );
+    void                    SetPosSizePages ( sal_uInt16 nId );
 
-    void                    FocusOnIcon ( USHORT nId );
+    void                    FocusOnIcon ( sal_uInt16 nId );
 
 protected :
     void                    ShowPageImpl ( IconChoicePageData* pData );
     void                    HidePageImpl ( IconChoicePageData* pData );
 
-    virtual void            PageCreated( USHORT nId, IconChoicePage& rPage );
-    virtual SfxItemSet*     CreateInputItemSet( USHORT nId );
+    virtual void            PageCreated( sal_uInt16 nId, IconChoicePage& rPage );
+    virtual SfxItemSet*     CreateInputItemSet( sal_uInt16 nId );
     inline SfxItemSet*      GetInputSetImpl() { return (SfxItemSet*)pSet; }
-    inline IconChoicePage*  GetTabPage( USHORT nPageId )
+    inline IconChoicePage*  GetTabPage( sal_uInt16 nPageId )
                                 { return ( GetPageData (nPageId)->pPage?GetPageData (nPageId)->pPage:NULL); }
     const SfxItemSet*       GetRefreshedSet();
 
     void                    ActivatePageImpl ();
-    BOOL                    DeActivatePageImpl ();
+    sal_Bool                    DeActivatePageImpl ();
     void                    ResetPageImpl ();
 
     short                   Ok();
-    BOOL                    IsInOK() const;
 
 public :
 
-    // im Ctor k�nnte auch die Position des IconChoiceCtrl's gesetzt werden.
+    // im Ctor k�nnte auch die Position des IconChoiceCtrl's gesetzt werden.
 
     IconChoiceDialog ( Window* pParent, const ResId &rResId,
                        const EIconChoicePos ePos = PosLeft, const SfxItemSet * pItemSet = 0 );
@@ -238,22 +233,19 @@ public :
     //
 
     SvxIconChoiceCtrlEntry* AddTabPage(
-        USHORT nId, const String& rIconText, const Image& rChoiceIcon,
+        sal_uInt16 nId, const String& rIconText, const Image& rChoiceIcon, const Image& rChoiceIconHC,
         CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/,
-        BOOL bItemsOnDemand = FALSE, ULONG nPos = LIST_APPEND );
-
-    void                RemoveTabPage( USHORT nId );
+        sal_Bool bItemsOnDemand = sal_False, sal_uLong nPos = LIST_APPEND );
 
-    void                SetCurPageId( USHORT nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); }
-    USHORT              GetCurPageId() const       { return mnCurrentPageId; }
-    void                ShowPage( USHORT nId );
+    void                SetCurPageId( sal_uInt16 nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); }
+    sal_uInt16              GetCurPageId() const       { return mnCurrentPageId; }
+    void                ShowPage( sal_uInt16 nId );
+    void                RemoveTabPage( sal_uInt16 nId );
 
                         // liefert ggf. per Map konvertierte lokale Slots
-    const USHORT*       GetInputRanges( const SfxItemPool& );
+    const sal_uInt16*       GetInputRanges( const SfxItemPool& );
     void                SetInputSet( const SfxItemSet* pInSet );
     const SfxItemSet*   GetOutputItemSet() const { return pOutSet; }
-    const SfxItemSet*   GetOutputItemSet( USHORT nId );
-    int                 FillOutputItemSet();
 
     const OKButton&     GetOKButton() const { return aOKBtn; }
     OKButton&           GetOKButton() { return aOKBtn; }
@@ -262,18 +254,13 @@ public :
     const HelpButton&   GetHelpButton() const { return aHelpBtn; }
     HelpButton&         GetHelpButton() { return aHelpBtn; }
 
-    void                RemoveResetButton();
-
     short               Execute();
-    void                Start( BOOL bShow = TRUE );
+    void                Start( sal_Bool bShow = sal_True );
     sal_Bool            QueryClose();
 
     const SfxItemSet*   GetExampleSet() const { return pExampleSet; }
 
-    void                SetCtrlColor ( const Color& rColor );
     EIconChoicePos      SetCtrlPos   ( const EIconChoicePos& rPos );
-
-    void                CreateIconTextAutoMnemonics( void );
 };
 
 #endif //_ICCDLG_HXX
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index e9e36d57e27e..8cbc141b8b88 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -56,18 +56,18 @@ public:
     com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject()
                         { return m_xObj; }
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( ::rtl::OUString* pGraphicMediaType );
-    virtual BOOL IsCreateNew() const;
+    virtual sal_Bool IsCreateNew() const;
 };
 
 class SvInsertOleDlg : public InsertObjectDialog_Impl
 {
     RadioButton aRbNewObject;
     RadioButton aRbObjectFromfile;
+    FixedLine aGbObject;
     ListBox aLbObjecttype;
     Edit aEdFilepath;
     PushButton aBtnFilepath;
     CheckBox aCbFilelink;
-    FixedLine aGbObject;
     OKButton aOKButton1;
     CancelButton aCancelButton1;
     HelpButton aHelpButton1;
@@ -85,12 +85,10 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl
     ListBox&            GetObjectTypes()
                         { return aLbObjecttype; }
     String              GetFilePath() const { return aEdFilepath.GetText(); }
-    BOOL                IsLinked() const    { return aCbFilelink.IsChecked(); }
-    BOOL                IsCreateNew() const { return aRbNewObject.IsChecked(); }
+    sal_Bool                IsLinked() const    { return aCbFilelink.IsChecked(); }
+    sal_Bool                IsCreateNew() const { return aRbNewObject.IsChecked(); }
 
 public:
-    static void         FillObjectServerList( SvObjectServerList* );
-
                         SvInsertOleDlg( Window* pParent,
                             const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage,
                             const SvObjectServerList* pServers = NULL );
@@ -105,11 +103,11 @@ public:
 class SvInsertPlugInDialog : public InsertObjectDialog_Impl
 {
 private:
+    FixedLine aGbFileurl;
     Edit aEdFileurl;
     PushButton aBtnFileurl;
-    FixedLine aGbFileurl;
-    MultiLineEdit aEdPluginsOptions;
     FixedLine aGbPluginsOptions;
+    MultiLineEdit aEdPluginsOptions;
     OKButton aOKButton1;
     CancelButton aCancelButton1;
     HelpButton aHelpButton1;
@@ -176,24 +174,25 @@ private:
     Edit                    aEDURL;
     PushButton              aBTOpen;
 
+    FixedLine               aFLScrolling;
     RadioButton             aRBScrollingOn;
     RadioButton             aRBScrollingOff;
     RadioButton             aRBScrollingAuto;
-    FixedLine               aFLScrolling;
+
 
     FixedLine               aFLSepLeft;
+    FixedLine               aFLFrameBorder;
     RadioButton             aRBFrameBorderOn;
     RadioButton             aRBFrameBorderOff;
-    FixedLine               aFLFrameBorder;
 
     FixedLine               aFLSepRight;
+    FixedLine               aFLMargin;
     FixedText               aFTMarginWidth;
     NumericField            aNMMarginWidth;
     CheckBox                aCBMarginWidthDefault;
     FixedText               aFTMarginHeight;
     NumericField            aNMMarginHeight;
     CheckBox                aCBMarginHeightDefault;
-    FixedLine               aFLMargin;
 
     OKButton aOKButton1;
     CancelButton aCancelButton1;
diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx
index d85b8a7680a5..33e8efabeb70 100644
--- a/cui/source/inc/insrc.hxx
+++ b/cui/source/inc/insrc.hxx
@@ -57,7 +57,7 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog
     bool            bColumn;
 
 public:
-    SvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId );
+    SvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId );
 
     virtual short Execute(void);
 
diff --git a/cui/source/inc/internationaloptions.hxx b/cui/source/inc/internationaloptions.hxx
index a4372d52ddbe..cd3205935dae 100644
--- a/cui/source/inc/internationaloptions.hxx
+++ b/cui/source/inc/internationaloptions.hxx
@@ -43,7 +43,7 @@ namespace offapp
     protected:
                             InternationalOptionsPage( Window* _pParent, const SfxItemSet& _rAttrSet );
 
-        virtual BOOL        FillItemSet( SfxItemSet& _rSet );
+        virtual sal_Bool        FillItemSet( SfxItemSet& _rSet );
         virtual void        Reset( const SfxItemSet& _rSet );
 
     public:
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index e35a83144c82..14fbc1e82160 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -66,23 +66,23 @@ private:
     String          aStrVertList;
 
     short           nCaptionType;
-    BOOL            bFixedAngle;
-    INT32           nFixedAngle;
-    INT32           nGap;
+    sal_Bool            bFixedAngle;
+    sal_Int32           nFixedAngle;
+    sal_Int32           nGap;
     short           nEscDir;
-    BOOL            bEscRel;
-    INT32           nEscAbs;
-    INT32           nEscRel;
-    INT32           nLineLen;
-    BOOL            bFitLineLen;
+    sal_Bool            bEscRel;
+    sal_Int32           nEscAbs;
+    sal_Int32           nEscRel;
+    sal_Int32           nLineLen;
+    sal_Bool            bFitLineLen;
 
-    USHORT          nAnsatzRelPos;
-    USHORT          nAnsatzTypePos;
-    USHORT          nWinkelTypePos;
+    sal_uInt16          nAnsatzRelPos;
+    sal_uInt16          nAnsatzTypePos;
+    sal_uInt16          nWinkelTypePos;
 
 #ifdef _SVX_LABDLG_CXX
-    void            SetupAnsatz_Impl( USHORT nType );
-    void            SetupType_Impl( USHORT nType );
+    void            SetupAnsatz_Impl( sal_uInt16 nType );
+    void            SetupType_Impl( sal_uInt16 nType );
     DECL_LINK( AnsatzSelectHdl_Impl, ListBox * );
     DECL_LINK( AnsatzRelSelectHdl_Impl, ListBox * );
     DECL_LINK( LineOptHdl_Impl, Button * );
@@ -97,9 +97,9 @@ public:
     virtual ~SvxCaptionTabPage();
 
     static SfxTabPage*  Create( Window*, const SfxItemSet& );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& );
+    virtual sal_Bool        FillItemSet( SfxItemSet& );
     virtual void        Reset( const SfxItemSet & );
     void                Construct();
     void                SetView( const SdrView* pSdrView )
@@ -115,16 +115,16 @@ class SvxCaptionTabDialog : public SfxTabDialog
 {
 private:
     const SdrView*      pView;
-    USHORT              nAnchorCtrls;
+    sal_uInt16              nAnchorCtrls;
 
     Link                aValidateLink;
 
-    virtual void        PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void        PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
 
 public:
 
             SvxCaptionTabDialog(Window* pParent, const SdrView* pView,
-                                    USHORT nAnchorTypes = 0 );
+                                    sal_uInt16 nAnchorTypes = 0 );
 
             ~SvxCaptionTabDialog();
 
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index 64d248c65b02..e7d1d555c188 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -54,21 +54,22 @@ class SvBaseLinksDlg : public ModalDialog
     FixedText aFtLinks;
     FixedText aFtType;
     FixedText aFtStatus;
-    CancelButton aCancelButton1;
-    HelpButton aHelpButton1;
-    PushButton aPbUpdateNow;
-    PushButton aPbOpenSource;
-    PushButton aPbChangeSource;
-    PushButton aPbBreakLink;
+    SvTabListBox aTbLinks;
     FixedText aFtFiles2;
+    FixedText aFtFullFileName;
     FixedText aFtSource2;
+    FixedText aFtFullSourceName;
     FixedText aFtType2;
+    FixedText aFtFullTypeName;
     FixedText aFtUpdate;
     RadioButton aRbAutomatic;
     RadioButton aRbManual;
-    FixedText aFtFullFileName;
-    FixedText aFtFullSourceName;
-    FixedText aFtFullTypeName;
+    CancelButton aCancelButton1;
+    HelpButton aHelpButton1;
+    PushButton aPbUpdateNow;
+    PushButton aPbOpenSource;
+    PushButton aPbChangeSource;
+    PushButton aPbBreakLink;
     String aStrAutolink;
     String aStrManuallink;
     String aStrBrokenlink;
@@ -78,8 +79,7 @@ class SvBaseLinksDlg : public ModalDialog
     String aStrCloselinkmsgMulti;
     String aStrWaitinglink;
     sfx2::LinkManager*  pLinkMgr;
-    BOOL            bHtmlMode;
-    SvTabListBox aTbLinks;
+    sal_Bool            bHtmlMode;
     Timer aUpdateTimer;
 
 #if _SOLAR__PRIVATE
@@ -93,10 +93,10 @@ class SvBaseLinksDlg : public ModalDialog
     DECL_LINK( BreakLinkClickHdl, PushButton * );
     DECL_LINK( UpdateWaitingHdl, Timer * );
     DECL_LINK( EndEditHdl, sfx2::SvBaseLink* );
-    sfx2::SvBaseLink* GetSelEntry( USHORT* pPos );
+    sfx2::SvBaseLink* GetSelEntry( sal_uInt16* pPos );
     String ImplGetStateStr( const sfx2::SvBaseLink& );
-    void SetType( sfx2::SvBaseLink& rLink, USHORT nPos, USHORT nType );
-    void InsertEntry( const sfx2::SvBaseLink& rLink, USHORT nPos = LISTBOX_APPEND, sal_Bool bSelect = sal_False);
+    void SetType( sfx2::SvBaseLink& rLink, sal_uInt16 nPos, sal_uInt16 nType );
+    void InsertEntry( const sfx2::SvBaseLink& rLink, sal_uInt16 nPos = LISTBOX_APPEND, sal_Bool bSelect = sal_False);
 #endif
 
     void StartUpdateTimer()         { aUpdateTimer.Start(); }
@@ -123,7 +123,7 @@ class SvBaseLinksDlg : public ModalDialog
     void SetManager( sfx2::LinkManager* );
 
 public:
-    SvBaseLinksDlg( Window * pParent, sfx2::LinkManager*, BOOL bHtml = FALSE );
+    SvBaseLinksDlg( Window * pParent, sfx2::LinkManager*, sal_Bool bHtml = sal_False );
     ~SvBaseLinksDlg();
     void SetActLink( sfx2::SvBaseLink * pLink );
 };
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index 7b8330f31db6..51e61932cad1 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -42,9 +42,6 @@ class SvTabListBox;
 class Edit;
 class String;
 
-typedef SvStringsDtor* (*FNGetRangeHdl)( _SfxMacroTabPage*, const String& rLanguage );
-typedef SvStringsDtor* (*FNGetMacrosOfRangeHdl)( _SfxMacroTabPage*, const String& rLanguage, const String& rRange );
-
 class SfxConfigGroupListBox_Impl;
 class SfxConfigFunctionListBox_Impl;
 class _HeaderTabListBox;
@@ -60,8 +57,6 @@ class _SfxMacroTabPage : public SfxTabPage
     DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, DoubleClickHdl_Impl, Control* );
     DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton * );
 
-    DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, ChangeScriptHdl_Impl, RadioButton * );
-    DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, GetFocus_Impl, Edit* );
     DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, TimeOut_Impl, Timer* );
 
 protected:
@@ -72,34 +67,26 @@ protected:
     void                        InitAndSetHandler();
     void                        FillEvents();
     void                        FillMacroList();
-    void                        EnableButtons( const String& rLanguage );
+    void                        EnableButtons();
 
 public:
 
     virtual                     ~_SfxMacroTabPage();
 
-    void                        AddEvent( const String & rEventName, USHORT nEventId );
+    void                        AddEvent( const String & rEventName, sal_uInt16 nEventId );
 
     const SvxMacroTableDtor&    GetMacroTbl() const;
     void                        SetMacroTbl( const SvxMacroTableDtor& rTbl );
     void                        ClearMacroTbl();
 
-    virtual void                ScriptChanged( const String& rLanguage );
+    virtual void                ScriptChanged();
     virtual void                PageCreated (SfxAllItemSet aSet);
 
-    // zum setzen / abfragen der Links
-    void                        SetGetRangeLink( FNGetRangeHdl pFn );
-    FNGetRangeHdl               GetGetRangeLink() const;
-    void                        SetGetMacrosOfRangeLink( FNGetMacrosOfRangeHdl pFn );
-    FNGetMacrosOfRangeHdl       GetGetMacrosOfRangeLink() const;
-
     // --------- Erben aus der Basis -------------
-    virtual BOOL                FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool                FillItemSet( SfxItemSet& rSet );
     virtual void                Reset( const SfxItemSet& rSet );
 
-    void                        SetReadOnly( BOOL bSet );
-    BOOL                        IsReadOnly() const;
-    void                        SelectEvent( const String& rEventName, USHORT nEventId );
+    sal_Bool                        IsReadOnly() const;
 };
 
 inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTbl() const
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index 3f475dfe818c..98d128310286 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -47,9 +47,9 @@ typedef ::boost::unordered_map< ::rtl::OUString, ::std::pair< ::rtl::OUString, :
 struct EventDisplayName
 {
     const sal_Char* pAsciiEventName;
-    USHORT          nEventResourceID;
+    sal_uInt16          nEventResourceID;
     EventDisplayName() : pAsciiEventName( NULL ), nEventResourceID(0) { }
-    EventDisplayName( const sal_Char* _pAsciiName, const USHORT _nResId )
+    EventDisplayName( const sal_Char* _pAsciiName, const sal_uInt16 _nResId )
         : pAsciiEventName( _pAsciiName )
         , nEventResourceID( _nResId )
     {
@@ -89,7 +89,7 @@ protected:
 
                                 _SvxMacroTabPage( Window* pParent, const ResId& rId, const SfxItemSet& rItemSet );
 
-    void                        EnableButtons( const String& rLanguage );
+    void                        EnableButtons();
     ::com::sun::star::uno::Any  GetPropsByName( const ::rtl::OUString& eventName, EventsHash& eventsHash );
     ::std::pair< ::rtl::OUString, ::rtl::OUString > GetPairFromAny( ::com::sun::star::uno::Any aAny );
 
@@ -99,14 +99,14 @@ public:
     void                        InitResources();
 
     void                        InitAndSetHandler( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xAppEvents, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xDocEvents, ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > xModifiable );
-    virtual BOOL                FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool                FillItemSet( SfxItemSet& rSet );
 
     using SfxTabPage::Reset;
     virtual void                Reset();
 
     void                        DisplayAppEvents( bool appEvents);
-    void                        SetReadOnly( BOOL bSet );
-    BOOL                        IsReadOnly() const;
+    void                        SetReadOnly( sal_Bool bSet );
+    sal_Bool                        IsReadOnly() const;
 };
 
 class SvxMacroTabPage : public _SvxMacroTabPage
@@ -124,12 +124,12 @@ public:
 
 // class SvxMacroAssignDlg --------------------------------------------------
 
-typedef USHORT* (*GetTabPageRanges)(); // liefert internationale Which-Werte
+typedef sal_uInt16* (*GetTabPageRanges)(); // liefert internationale Which-Werte
 
 class SvxMacroAssignSingleTabDialog : public SfxModalDialog
 {
 public:
-    SvxMacroAssignSingleTabDialog( Window* pParent, const SfxItemSet& rOptionsSet, USHORT nUniqueId );
+    SvxMacroAssignSingleTabDialog( Window* pParent, const SfxItemSet& rOptionsSet, sal_uInt16 nUniqueId );
 
     virtual             ~SvxMacroAssignSingleTabDialog();
 
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index 268b4d9dd301..1d7a561301b7 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -81,7 +81,7 @@ private:
     const SdrView*      pView;
     SfxMapUnit          eUnit;
 
-    BOOL                bPositionModified;
+    sal_Bool                bPositionModified;
 
 #ifdef _SVX_MEASURE_CXX
     void                FillUnitLB();
@@ -96,9 +96,9 @@ public:
     ~SvxMeasurePage();
 
     static SfxTabPage*  Create( Window*, const SfxItemSet& );
-    static  USHORT*     GetRanges();
+    static  sal_uInt16*     GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& );
+    virtual sal_Bool        FillItemSet( SfxItemSet& );
     virtual void        Reset( const SfxItemSet & );
 
     virtual void        PointChanged( Window* pWindow, RECT_POINT eRP );
diff --git a/cui/source/inc/multifil.hxx b/cui/source/inc/multifil.hxx
index 83f35568516c..21ae9e53946e 100644
--- a/cui/source/inc/multifil.hxx
+++ b/cui/source/inc/multifil.hxx
@@ -48,7 +48,7 @@ private:
     DECL_LINK( DelHdl_Impl, PushButton * );
 
 public:
-    SvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed = FALSE );
+    SvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False );
     ~SvxMultiFileDialog();
 
     String  GetFiles() const { return SvxMultiPathDialog::GetPath(); }
diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx
index 6a79ccbcecd7..ac4afbfceaf6 100644
--- a/cui/source/inc/multipat.hxx
+++ b/cui/source/inc/multipat.hxx
@@ -74,7 +74,7 @@ protected:
     DECL_LINK( CheckHdl_Impl, svx::SvxRadioButtonListBox * );
 
 public:
-    SvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed = FALSE );
+    SvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False );
     ~SvxMultiPathDialog();
 
     String          GetPath() const;
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index fe49487d39d0..2e9d51d8d45f 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -55,7 +55,7 @@ private:
     String          aPrevStr;
     Color           aPrevCol;
 
-    void            InitSettings( BOOL bForeground, BOOL bBackground );
+    void            InitSettings( sal_Bool bForeground, sal_Bool bBackground );
 
 protected:
     virtual void    Paint( const Rectangle& rRect );
@@ -87,9 +87,9 @@ public:
 
     static SfxTabPage*      Create( Window* pParent,
                                     const SfxItemSet& rAttrSet );
-    static USHORT*          GetRanges();
+    static sal_uInt16*          GetRanges();
 
-    virtual BOOL            FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool            FillItemSet( SfxItemSet& rSet );
     virtual void            Reset( const SfxItemSet& rSet );
     virtual int             DeactivatePage  ( SfxItemSet* pSet = NULL );
 
@@ -98,7 +98,7 @@ public:
                                 { SetInfoItem( rItem ); }
 
     void                    SetOkHdl( const Link& rOkHandler );
-    void                    HideLanguage(BOOL nFlag=TRUE);
+    void                    HideLanguage(sal_Bool nFlag=sal_True);
     virtual long            PreNotify( NotifyEvent& rNEvt );
     virtual void            PageCreated (SfxAllItemSet aSet);
 private:
@@ -112,14 +112,14 @@ private:
     FixedText               aFtLanguage;
     SvxLanguageBox          aLbLanguage;
     CheckBox                aCbSourceFormat;
-
+    SvxNumberPreviewImpl    aWndPreview;
+    FixedLine               aFlOptions;
     FixedText               aFtDecimals;
     NumericField            aEdDecimals;
+    CheckBox                aBtnNegRed;
     FixedText               aFtLeadZeroes;
     NumericField            aEdLeadZeroes;
-    CheckBox                aBtnNegRed;
     CheckBox                aBtnThousand;
-    FixedLine               aFlOptions;
 
     FixedText               aFtEdFormat;
     Edit                    aEdFormat;
@@ -131,15 +131,14 @@ private:
     Edit                    aEdComment;
     Timer                   aResetWinTimer;
 
-    SvxNumberPreviewImpl    aWndPreview;
 
     SvxNumberInfoItem*      pNumItem;
     SvxNumberFormatShell*   pNumFmtShell;
-    ULONG                   nInitFormat;
+    sal_uLong                   nInitFormat;
     Link                    fnOkHdl;
 
-    BOOL                    bNumItemFlag; //Fuer Handling mit DocShell
-    BOOL                    bOneAreaFlag;
+    sal_Bool                    bNumItemFlag; //Fuer Handling mit DocShell
+    sal_Bool                    bOneAreaFlag;
     short                   nFixedCategory;
 
     long                    nCatHeight;
@@ -156,16 +155,16 @@ private:
     void    Init_Impl();
     void    FillCurrencyBox();
     void    FillFormatListBox_Impl( SvxDelStrgs& rEntries );
-    void    UpdateOptions_Impl( BOOL bCheckCatChange );
-    void    UpdateFormatListBox_Impl( USHORT bCat, BOOL bUpdateEdit );
+    void    UpdateOptions_Impl( sal_Bool bCheckCatChange );
+    void    UpdateFormatListBox_Impl( sal_uInt16 bCat, sal_Bool bUpdateEdit );
     void    DeleteEntryList_Impl( SvxDelStrgs& rEntries );
     void    Obstructing();
     void    EnableBySourceFormat_Impl();
-    void    SetCategory( USHORT nPos );
+    void    SetCategory( sal_uInt16 nPos );
     String  GetExpColorString( Color*& rpPreviewColor, const String& aFormatStr, short nTmpCatPos );
     void    MakePreviewText( const String& rFormat );
-    void    ChangePreviewText( USHORT nPos );
-    void    AddAutomaticLanguage_Impl(LanguageType eAutoLang, BOOL bSelect);
+    void    ChangePreviewText( sal_uInt16 nPos );
+    void    AddAutomaticLanguage_Impl(LanguageType eAutoLang, sal_Bool bSelect);
     // Handler
     DECL_LINK( LostFocusHdl_Impl, Edit* pEd );
     DECL_LINK( DoubleClickHdl_Impl, SvxFontListBox* pLb );
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index c06924ec90ad..9604f22d7dde 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -81,12 +81,12 @@ class SvxSingleNumPickTabPage : public SfxTabPage
     SvxNumSettingsArr_Impl  aNumSettingsArr;
     SvxNumRule*             pActNum;
     SvxNumRule*             pSaveNum;
-    USHORT                  nActNumLvl;
-    BOOL                    bModified   : 1;
-    BOOL                    bPreset     : 1;
+    sal_uInt16                  nActNumLvl;
+    sal_Bool                    bModified   : 1;
+    sal_Bool                    bPreset     : 1;
 
     String              sNumCharFmtName;
-    USHORT              nNumItemId;
+    sal_uInt16              nNumItemId;
 
     protected:
         DECL_LINK( NumSelectHdl_Impl, ValueSet*);
@@ -102,7 +102,7 @@ class SvxSingleNumPickTabPage : public SfxTabPage
 
     virtual void        ActivatePage(const SfxItemSet& rSet);
     virtual int         DeactivatePage(SfxItemSet *pSet);
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     void                SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;}
@@ -120,10 +120,10 @@ class SvxBulletPickTabPage : public SfxTabPage
     SvxNumValueSet*     pExamplesVS;
     SvxNumRule*         pActNum;
     SvxNumRule*         pSaveNum;
-    USHORT              nActNumLvl;
-    BOOL                bModified   : 1;
-    BOOL                bPreset     : 1;
-    USHORT              nNumItemId;
+    sal_uInt16              nActNumLvl;
+    sal_Bool                bModified   : 1;
+    sal_Bool                bPreset     : 1;
+    sal_uInt16              nNumItemId;
 
     String              sBulletCharFmtName;
     protected:
@@ -139,7 +139,7 @@ class SvxBulletPickTabPage : public SfxTabPage
 
     virtual void        ActivatePage(const SfxItemSet& rSet);
     virtual int         DeactivatePage(SfxItemSet *pSet);
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     void                SetCharFmtName(const String& rName){sBulletCharFmtName = rName;}
@@ -165,10 +165,10 @@ class SvxNumPickTabPage : public SfxTabPage
 
     SvxNumRule*         pActNum;
     SvxNumRule*         pSaveNum;
-    USHORT              nActNumLvl;
-    USHORT              nNumItemId;
-    BOOL                bModified   : 1;
-    BOOL                bPreset     : 1;
+    sal_uInt16              nActNumLvl;
+    sal_uInt16              nNumItemId;
+    sal_Bool                bModified   : 1;
+    sal_Bool                bPreset     : 1;
 
 
     protected:
@@ -185,7 +185,7 @@ class SvxNumPickTabPage : public SfxTabPage
 
     virtual void        ActivatePage(const SfxItemSet& rSet);
     virtual int         DeactivatePage(SfxItemSet *pSet);
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     void                SetCharFmtNames(const String& rCharName, const String& rBulName)
@@ -211,11 +211,11 @@ class SvxBitmapPickTabPage : public SfxTabPage
 
     SvxNumRule*         pActNum;
     SvxNumRule*         pSaveNum;
-    USHORT              nActNumLvl;
-    USHORT              nNumItemId;
+    sal_uInt16              nActNumLvl;
+    sal_uInt16              nNumItemId;
     SfxMapUnit          eCoreUnit;
-    BOOL                bModified   : 1;
-    BOOL                bPreset     : 1;
+    sal_Bool                bModified   : 1;
+    sal_Bool                bPreset     : 1;
 
     protected:
         DECL_LINK( NumSelectHdl_Impl, ValueSet*);
@@ -232,7 +232,7 @@ class SvxBitmapPickTabPage : public SfxTabPage
 
     virtual void        ActivatePage(const SfxItemSet& rSet);
     virtual int         DeactivatePage(SfxItemSet *pSet);
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     void                SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;}
@@ -292,25 +292,25 @@ class SvxNumOptionsTabPage : public SfxTabPage
 
     Size                aInitSize[SVX_MAX_NUM];
 
-    BOOL                bLastWidthModified  : 1;
-    BOOL                bModified           : 1;
-    BOOL                bPreset             : 1;
-    BOOL                bAutomaticCharStyles: 1;
-    BOOL                bHTMLMode           : 1;
-    BOOL                bMenuButtonInitialized : 1;
+    sal_Bool                bLastWidthModified  : 1;
+    sal_Bool                bModified           : 1;
+    sal_Bool                bPreset             : 1;
+    sal_Bool                bAutomaticCharStyles: 1;
+    sal_Bool                bHTMLMode           : 1;
+    sal_Bool                bMenuButtonInitialized : 1;
 
     List                aGrfNames;
     Font                aActBulletFont;
     String              sBullet;
     String              sStartWith;
 
-    BYTE                nBullet;
-    USHORT              nActNumLvl;
-    USHORT              nNumItemId;
+    sal_uInt8               nBullet;
+    sal_uInt16              nActNumLvl;
+    sal_uInt16              nNumItemId;
     SfxMapUnit          eCoreUnit;
 
     void                InitControls();
-    void                SwitchNumberType( BYTE nType, BOOL bBmp = FALSE );
+    void                SwitchNumberType( sal_uInt8 nType, sal_Bool bBmp = sal_False );
     void                CheckForStartValue_Impl(sal_uInt16 nNumberingType);
 
         DECL_LINK( NumberTypeSelectHdl_Impl, ListBox * );
@@ -341,7 +341,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
 
     virtual void        ActivatePage(const SfxItemSet& rSet);
     virtual int         DeactivatePage(SfxItemSet *pSet);
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     void                SetCharFmts(const String& rNumName, const String& rBulletName )
@@ -352,7 +352,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
     void                SetMetric(FieldUnit eSet);
 
     ListBox&            GetCharFmtListBox() {return aCharFmtLB;}
-    void                SetModified(BOOL bRepaint = TRUE);
+    void                SetModified(sal_Bool bRepaint = sal_True);
     virtual void        PageCreated(SfxAllItemSet aSet);
 };
 
@@ -401,13 +401,13 @@ class SvxNumPositionTabPage : public SfxTabPage
     SvxNumRule*         pActNum;
     SvxNumRule*         pSaveNum;
 
-    USHORT              nActNumLvl;
-    USHORT              nNumItemId;
+    sal_uInt16              nActNumLvl;
+    sal_uInt16              nNumItemId;
     SfxMapUnit          eCoreUnit;
 
-    BOOL                bModified           : 1;
-    BOOL                bPreset             : 1;
-    BOOL                bInInintControl     : 1;  //Modify-Fehler umgehen, soll ab 391 behoben sein
+    sal_Bool                bModified           : 1;
+    sal_Bool                bPreset             : 1;
+    sal_Bool                bInInintControl     : 1;  //Modify-Fehler umgehen, soll ab 391 behoben sein
     bool                bLabelAlignmentPosAndSpaceModeActive;
 
     void                InitControls();
@@ -433,14 +433,14 @@ public:
 
     virtual void        ActivatePage(const SfxItemSet& rSet);
     virtual int         DeactivatePage(SfxItemSet *pSet);
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
 
     void                SetMetric(FieldUnit eSet);
-    void                SetModified(BOOL bRepaint = TRUE);
+    void                SetModified(sal_Bool bRepaint = sal_True);
     virtual void        PageCreated(SfxAllItemSet aSet);
 };
 
diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx
index ac558573f048..c526d23420a1 100644
--- a/cui/source/inc/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
@@ -71,8 +71,8 @@ public:
     virtual ~SvxAsianLayoutPage();
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
-    static UINT16*      GetRanges();
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    static sal_uInt16*      GetRanges();
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 };
 
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index ca1d0f395344..07d6308b534b 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -62,12 +62,12 @@ namespace linguistic2{
 class SvxNewDictionaryDialog : public ModalDialog
 {
 private:
+    FixedLine            aNewDictBox;
     FixedText           aNameText;
     Edit                aNameEdit;
     FixedText           aLanguageText;
     SvxLanguageBox      aLanguageLB;
     CheckBox            aExceptBtn;
-    FixedLine            aNewDictBox;
     OKButton            aOKBtn;
     CancelButton        aCancelBtn;
     HelpButton          aHelpBtn;
@@ -131,8 +131,8 @@ private:
     PushButton              aDeletePB;
     FixedLine                aEditDictsBox;
 
-    CancelButton            aCloseBtn;
     HelpButton              aHelpBtn;
+    CancelButton            aCloseBtn;
     String                  sModify;
     String                  sNew;
     DecorationView          aDecoView;
@@ -147,7 +147,7 @@ private:
     long                nWidth;
     sal_Bool            bFirstSelect;
     sal_Bool            bDoNothing;
-    BOOL                bDicIsReadonly;
+    sal_Bool                bDicIsReadonly;
 
 #ifdef _SVX_OPTDICT_CXX
     DECL_LINK( SelectBookHdl_Impl, ListBox * );
@@ -164,7 +164,7 @@ private:
                             ::com::sun::star::linguistic2::XDictionary >  &xDic );
 
     void            RemoveDictEntry(SvLBoxEntry* pEntry);
-    USHORT          GetLBInsertPos(const String &rDicWord);
+    sal_uInt16          GetLBInsertPos(const String &rDicWord);
 
 #endif
 
diff --git a/cui/source/inc/optimprove.hxx b/cui/source/inc/optimprove.hxx
index 532a9fcc68d7..0666c78df0bd 100644
--- a/cui/source/inc/optimprove.hxx
+++ b/cui/source/inc/optimprove.hxx
@@ -37,14 +37,6 @@
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/tabdlg.hxx>
 
-// class SvxEmptyPage ----------------------------------------------------
-
-class SvxEmptyPage : public TabPage
-{
-public:
-    SvxEmptyPage( Window* pParent );
-};
-
 // class SvxImprovementPage ----------------------------------------------
 
 class SvxImprovementPage : public TabPage
@@ -68,7 +60,7 @@ public:
     SvxImprovementPage( Window* pParent );
     ~SvxImprovementPage();
 
-    inline bool     IsYesChecked() const { return m_aYesRB.IsChecked() != FALSE; }
+    inline bool     IsYesChecked() const { return m_aYesRB.IsChecked() != sal_False; }
 
     inline String   GetPageText() const { return GetText(); }
     inline String   GetInvitationText() const { return m_aInvitationFT.GetText(); }
@@ -106,7 +98,6 @@ public:
     virtual             ~SvxImprovementOptionsPage();
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-    static sal_uInt16*  GetRanges();
 
     virtual sal_Bool    FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
@@ -124,17 +115,6 @@ public:
     SvxImprovementDialog( Window* pParent, const String& rInfoURL );
 };
 
-class SvxInfoWindow : public Window
-{
-private:
-    FixedText   m_aInfoText;
-
-public:
-    SvxInfoWindow( Window* pParent, const ResId& rResId );
-
-    void        SetInfoText( const String& rText );
-};
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 303ca2558ae3..3a13365397d0 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -87,7 +87,7 @@ class SvxEditModulesDlg : public ModalDialog
 
     SvLBoxButtonData*   pCheckButtonData;
 
-    SvLBoxEntry*    CreateEntry(String& rTxt, USHORT nCol);
+    SvLBoxEntry*    CreateEntry(String& rTxt, sal_uInt16 nCol);
 
 #ifdef _SVX_OPTLINGU_CXX
     DECL_LINK( SelectHdl_Impl, SvxCheckListBox * );
@@ -150,10 +150,10 @@ private:
     SvxLinguData_Impl*  pLinguData;
 
     SvxLinguTabPage( Window* pParent, const SfxItemSet& rCoreSet );
-    SvLBoxEntry*    CreateEntry(String& rTxt, USHORT nCol);
+    SvLBoxEntry*    CreateEntry(String& rTxt, sal_uInt16 nCol);
 
-    void    AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, USHORT nIdx );
-    ULONG   GetDicUserData( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, USHORT nIdx );
+    void    AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx );
+    sal_uLong   GetDicUserData( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx );
 
 #ifdef _SVX_OPTLINGU_CXX
     DECL_LINK( SelectHdl_Impl, SvxCheckListBox * );
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index ab72fe4a4773..2f9a428b9d37 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -89,9 +89,9 @@ private:
 
     DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* );
 
-    void        GetPathList( USHORT _nPathHandle, String& _rInternalPath,
+    void        GetPathList( sal_uInt16 _nPathHandle, String& _rInternalPath,
                              String& _rUserPath, String& _rWritablePath, sal_Bool& _rReadOnly );
-    void        SetPathList( USHORT _nPathHandle,
+    void        SetPathList( sal_uInt16 _nPathHandle,
                              const String& _rUserPath, const String& _rWritablePath );
 #endif
 
@@ -100,9 +100,9 @@ public:
     ~SvxPathTabPage();
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
     virtual void        FillUserData();
 };
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index e7f4506c4796..289dac171671 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -77,7 +77,7 @@
 */
 
 struct  SvxPage_Impl;
-typedef USHORT MarginPosition;
+typedef sal_uInt16 MarginPosition;
 
 class SvxPageDescPage : public SfxTabPage
 {
@@ -117,6 +117,7 @@ class SvxPageDescPage : public SfxTabPage
     FixedText           aBottomMarginLbl;
     MetricField         aBottomMarginEdit;
 
+    FixedLine           aBottomSeparatorFl;
     // layout settings
     FixedLine           aLayoutFL;
     FixedText           aPageText;
@@ -124,7 +125,6 @@ class SvxPageDescPage : public SfxTabPage
     FixedText           aNumberFormatText;
     ListBox             aNumberFormatBox;
 
-    FixedLine           aBottomSeparatorFl;
 
     //Extras Calc
     FixedText           aTblAlignFT;
@@ -157,7 +157,7 @@ class SvxPageDescPage : public SfxTabPage
     long                nLastBottomMargin;
 
     Size                aMaxSize;
-    BOOL                bLandscape;
+    sal_Bool                bLandscape;
     bool                bBorderModified;
     SvxModeType         eMode;
     Paper               ePaperStart;
@@ -210,9 +210,9 @@ protected:
 
 public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& rOutSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rOutSet );
     virtual void        Reset( const SfxItemSet& rSet );
     virtual void        FillUserData();
 
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 7182d2b0d91a..6332e2e41b7e 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -66,6 +66,7 @@ class SvxStdParagraphTabPage: public SfxTabPage
 private:
     SvxStdParagraphTabPage( Window* pParent, const SfxItemSet& rSet );
 
+    FixedLine               aIndentFrm;
     // Einzug
     FixedText               aLeftLabel;
     SvxRelativeField        aLeftIndent;
@@ -77,39 +78,38 @@ private:
     SvxRelativeField        aFLineIndent;
     CheckBox                aAutoCB;
 
-    FixedLine               aIndentFrm;
+    FixedLine               aDistFrm;
 
     // Abstaende
     FixedText               aTopLabel;
     SvxRelativeField        aTopDist;
     FixedText               aBottomLabel;
     SvxRelativeField        aBottomDist;
-    FixedLine               aDistFrm;
 
     // Zeilenabstand
+    FixedLine               aLineDistFrm;
     ListBox                 aLineDist;
     FixedText               aLineDistAtLabel;
     MetricField             aLineDistAtPercentBox;
     MetricField             aLineDistAtMetricBox;
-    FixedLine               aLineDistFrm;
     String                  sAbsDist;
     SvxParaPrevWindow       aExampleWin;
 
     //Registerhaltigkeit - nur Writer
-    CheckBox                aRegisterCB;
     FixedLine               aRegisterFL;
+    CheckBox                aRegisterCB;
 
     Edit*                   pActLineDistFld;
     long                    nAbst;
     long                    nWidth;
     long                    nMinFixDist;
-    BOOL                    bRelativeMode;
-    BOOL                    bNegativeIndents;
+    sal_Bool                    bRelativeMode;
+    sal_Bool                    bNegativeIndents;
 
 #ifdef _SVX_PARAGRPH_CXX
     void                    SetLineSpacing_Impl( const SvxLineSpacingItem& rAttr );
     void                    Init_Impl();
-    void                    UpdateExample_Impl( BOOL bAll = FALSE );
+    void                    UpdateExample_Impl( sal_Bool bAll = sal_False );
 
     DECL_LINK( LineDistHdl_Impl, ListBox* );
     DECL_LINK( ModifyHdl_Impl, SvxRelativeField* );
@@ -123,14 +123,13 @@ public:
     DECL_LINK( ELRLoseFocusHdl, Edit* );
 
     static SfxTabPage*      Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*          GetRanges();
+    static sal_uInt16*          GetRanges();
 
-    virtual BOOL            FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool            FillItemSet( SfxItemSet& rSet );
     virtual void            Reset( const SfxItemSet& rSet );
 
 
-    void                    SetPageWidth( USHORT nPageWidth );
-    void                    SetMaxDistance( USHORT nMaxDist );
+    void                    SetPageWidth( sal_uInt16 nPageWidth );
     void                    EnableRelativeMode();
     void                    EnableRegisterMode();
     void                    EnableAutoFirstLine();
@@ -174,7 +173,7 @@ class SvxParaAlignTabPage : public SfxTabPage
     DECL_LINK(              LastLineHdl_Impl, ListBox* );
     DECL_LINK(              TextDirectionHdl_Impl, ListBox* );
 
-    void                    UpdateExample_Impl( BOOL bAll = FALSE );
+    void                    UpdateExample_Impl( sal_Bool bAll = sal_False );
 #endif
 
                             SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet );
@@ -185,9 +184,9 @@ protected:
 
 public:
     static SfxTabPage*      Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*          GetRanges();
+    static sal_uInt16*          GetRanges();
 
-    virtual BOOL            FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool            FillItemSet( SfxItemSet& rSet );
     virtual void            Reset( const SfxItemSet& rSet );
 
     void                    EnableJustifyExt();
@@ -219,9 +218,9 @@ public:
 
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     void                DisablePageBreak();
@@ -233,6 +232,7 @@ private:
                         SvxExtParagraphTabPage( Window* pParent, const SfxItemSet& rSet );
 
     // Silbentrennung
+    FixedLine           aExtFL;
     TriStateBox         aHyphenBox;
     FixedText           aBeforeText;
     NumericField        aExtHyphenBeforeBox;
@@ -240,7 +240,6 @@ private:
     NumericField        aExtHyphenAfterBox;
     FixedText           aMaxHyphenLabel;
     NumericField        aMaxHyphenEdit;
-    FixedLine           aExtFL;
 
     // Seitenumbruch
     FixedLine           aBreaksFL;
@@ -269,9 +268,9 @@ private:
     NumericField        aWidowRowNo;
     FixedText           aWidowRowLabel;
 
-    BOOL                bPageBreak;
-    BOOL                bHtmlMode;
-    USHORT              nStdPos;
+    sal_Bool                bPageBreak;
+    sal_Bool                bHtmlMode;
+    sal_uInt16              nStdPos;
 
 #ifdef _SVX_PARAGRPH_CXX
     DECL_LINK( PageBreakHdl_Impl, TriStateBox* );
@@ -307,9 +306,9 @@ public:
 
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
 };
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index 924edae728a5..1e27ce912e80 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -53,10 +53,10 @@ class SvPasteObjectDialog : public ModalDialog
     FixedText aFtObjectSource;
     RadioButton aRbPaste;
     RadioButton aRbPasteLink;
-    ListBox aLbInsertList;
     CheckBox aCbDisplayAsIcon;
     PushButton aPbChangeIcon;
     FixedLine aFlChoice;
+    ListBox aLbInsertList;
     OKButton aOKButton1;
     CancelButton aCancelButton1;
     HelpButton aHelpButton1;
@@ -64,8 +64,8 @@ class SvPasteObjectDialog : public ModalDialog
     Table           aSupplementTable;
     SvGlobalName    aObjClassName;
     String          aObjName;
-    USHORT          nAspect;
-    BOOL            bLink;
+    sal_uInt16          nAspect;
+    sal_Bool            bLink;
 
     ListBox&        ObjectLB()      { return aLbInsertList; }
     FixedText&      ObjectSource()  { return aFtObjectSource; }
@@ -77,8 +77,8 @@ class SvPasteObjectDialog : public ModalDialog
     DECL_LINK( SelectHdl, ListBox * );
     DECL_LINK( DoubleClickHdl, ListBox * );
     void            SetDefault();
-    USHORT      GetAspect() const { return nAspect; }
-    BOOL        ShouldLink() const { return bLink; }
+    sal_uInt16      GetAspect() const { return nAspect; }
+    sal_Bool        ShouldLink() const { return bLink; }
 
 public:
                 SvPasteObjectDialog( Window* pParent );
@@ -86,7 +86,7 @@ public:
 
     void        Insert( SotFormatStringId nFormat, const String & rFormatName );
     void        SetObjName( const SvGlobalName & rClass, const String & rObjName );
-    ULONG       GetFormat( const TransferableDataHelper& aHelper,
+    sal_uLong       GetFormat( const TransferableDataHelper& aHelper,
                         const DataFlavorExVector* pFormats=0,
                         const TransferableObjectDescriptor* pDesc=0 );
 };
diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index 4648fd3a0a0c..651b5328e460 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -31,7 +31,7 @@
 // include ---------------------------------------------------------------
 
 #include <vcl/group.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/edit.hxx>
 #include <svtools/stdctrl.hxx>
 #include <sfx2/basedlgs.hxx>
@@ -56,10 +56,10 @@ class SvxPostItDialog : public SfxModalDialog
 {
 public:
     SvxPostItDialog( Window* pParent, const SfxItemSet& rCoreSet,
-                     BOOL bPrevNext = FALSE, BOOL bRedline = FALSE );
+                     sal_Bool bPrevNext = sal_False, sal_Bool bRedline = sal_False );
     ~SvxPostItDialog();
 
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
     const SfxItemSet*   GetOutputItemSet() const { return pOutSet; }
 
     Link                GetPrevHdl() const { return aPrevHdlLink; }
@@ -69,20 +69,20 @@ public:
     void                SetNextHdl( const Link& rLink )
                             { aNextHdlLink = rLink; }
 
-    void                EnableTravel(BOOL bNext, BOOL bPrev);
+    void                EnableTravel(sal_Bool bNext, sal_Bool bPrev);
     inline String       GetNote() { return aEditED.GetText(); }
     inline void         SetNote(const String& rTxt) { aEditED.SetText(rTxt); }
 
     void                ShowLastAuthor(const String& rAuthor, const String& rDate);
-    inline void         DontChangeAuthor()  { aAuthorBtn.Enable(FALSE); }
+    inline void         DontChangeAuthor()  { aAuthorBtn.Enable(sal_False); }
     inline void         HideAuthor()        { aAuthorBtn.Hide(); }
-    inline void         SetReadonlyPostIt(BOOL bDisable)
+    inline void         SetReadonlyPostIt(sal_Bool bDisable)
                             {
                                 aOKBtn.Enable( !bDisable );
                                 aEditED.SetReadOnly( bDisable );
                                 aAuthorBtn.Enable( !bDisable );
                             }
-    inline BOOL         IsOkEnabled() const { return aOKBtn.IsEnabled(); }
+    inline sal_Bool         IsOkEnabled() const { return aOKBtn.IsEnabled(); }
 
 private:
     FixedLine           aPostItFL;
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 10c3408481e2..a4350685cba9 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -70,7 +70,7 @@ class SFTreeListBox : public SvTreeListBox
 {
    friend class SvxScriptOrgDialog;
 private:
-    USHORT          nMode;
+    sal_uInt16          nMode;
     Image m_hdImage;
     Image m_libImage;
     Image m_macImage;
@@ -88,13 +88,7 @@ protected:
     void                    ExpandTree( SvLBoxEntry* pRootEntry );
     virtual void            RequestingChilds( SvLBoxEntry* pParent );
     virtual void            ExpandedHdl();
-    SvLBoxEntry*            FindEntry( SvLBoxEntry* pParent, const String& rText, BYTE nType );
     virtual long            ExpandingHdl();
-    static BOOL             dialogSort1( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1,
-            com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node2 );
-    static BOOL             dialogSort2( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1,
-            com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node2 );
-
 public:
     void                    Init( const ::rtl::OUString& language );
     void  RequestSubEntries(  SvLBoxEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node,
@@ -102,18 +96,16 @@ public:
                     SFTreeListBox( Window* pParent, const ResId& rRes );
                     ~SFTreeListBox();
 
-    void            UpdateEntries();
-
     void            ExpandAllTrees();
 
 
 
-    SvLBoxEntry * insertEntry(String const & rText, USHORT nBitmap,
+    SvLBoxEntry * insertEntry(String const & rText, sal_uInt16 nBitmap,
                               SvLBoxEntry * pParent,
                               bool bChildrenOnDemand,
                               std::auto_ptr< SFEntry > aUserData,
                               ::rtl::OUString factoryURL );
-    SvLBoxEntry * insertEntry(String const & rText, USHORT nBitmap,
+    SvLBoxEntry * insertEntry(String const & rText, sal_uInt16 nBitmap,
                               SvLBoxEntry * pParent,
                               bool bChildrenOnDemand,
                               std::auto_ptr< SFEntry > aUserData );
@@ -130,7 +122,7 @@ private:
     CancelButton    aCancelButton;
 
 public:
-    InputDialog( Window * pParent, USHORT nMode );
+    InputDialog( Window * pParent, sal_uInt16 nMode );
                 ~InputDialog();
 
     String      GetObjectName() const { return aEdit.GetText(); }
@@ -140,21 +132,21 @@ public:
 class SFEntry
 {
 private:
-    BYTE            nType;
+    sal_uInt8           nType;
     bool            loaded;
         ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > nodes;
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > model;
     SFEntry(){}
 public:
-                    SFEntry( BYTE nT )              { nType = nT; loaded=false; }
-                    SFEntry( BYTE nT,
+                    SFEntry( sal_uInt8 nT )             { nType = nT; loaded=false; }
+                    SFEntry( sal_uInt8 nT,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& entryNodes ,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& entryModel) { nType = nT; nodes = entryNodes; loaded=false; model = entryModel; }
                     SFEntry( const SFEntry& r ) { nType = r.nType; nodes = r.nodes; loaded = r.loaded; }
     virtual         ~SFEntry() {}
     ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > GetNode() { return nodes ;}
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModel() { return model ;};
-    BYTE            GetType() const                     { return nType; }
+    sal_uInt8           GetType() const                     { return nType; }
     bool            isLoaded() const                    { return loaded; }
     void            setLoaded()                         { loaded=true; }
 };
@@ -190,10 +182,9 @@ protected:
     DECL_LINK( MacroDoubleClickHdl, SvTreeListBox * );
     DECL_LINK( ScriptSelectHdl, SvTreeListBox * );
     DECL_LINK( ButtonHdl, Button * );
-    BOOL                getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, ::rtl::OUString& propName );
+    sal_Bool                getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, ::rtl::OUString& propName );
     void                CheckButtons(  ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node );
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface  > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName );
 
     void        createEntry( SvLBoxEntry* pEntry );
     void        renameEntry( SvLBoxEntry* pEntry );
@@ -201,7 +192,6 @@ protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >
                 getBrowseNode( SvLBoxEntry* pEntry );
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getModel( SvLBoxEntry* pEntry );
-    void        EnableButton( Button& rButton, BOOL bEnable );
     String      getListOfChildren( ::com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node, int depth );
     void        StoreCurrentSelection();
     void        RestorePreviousSelection();
diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx
index 645a45da7d61..d830d92d2744 100644
--- a/cui/source/inc/sdrcelldlg.hxx
+++ b/cui/source/inc/sdrcelldlg.hxx
@@ -55,7 +55,7 @@ public:
     SvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel );
     ~SvxFormatCellsDialog();
 
-    virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
 
 };
 
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index 7ca6dbeb3054..2959b0e7bfb6 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -51,41 +51,41 @@
 
 struct SvxGroupInfo_Impl
 {
-    USHORT          nKind;
-    USHORT          nOrd;
+    sal_uInt16          nKind;
+    sal_uInt16          nOrd;
     ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >
                     xBrowseNode;
     ::rtl::OUString sURL;
     ::rtl::OUString sHelpText;
-    BOOL            bWasOpened;
+    sal_Bool            bWasOpened;
 
-    SvxGroupInfo_Impl( USHORT n, USHORT nr )
+    SvxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr )
         :nKind( n )
         ,nOrd( nr )
         ,xBrowseNode()
         ,sURL()
         ,sHelpText()
-        ,bWasOpened(FALSE)
+        ,bWasOpened(sal_False)
     {
     }
 
-    SvxGroupInfo_Impl( USHORT n, USHORT nr, const ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& _rxNode )
+    SvxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr, const ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& _rxNode )
         :nKind( n )
         ,nOrd( nr )
         ,xBrowseNode( _rxNode )
         ,sURL()
         ,sHelpText()
-        ,bWasOpened(FALSE)
+        ,bWasOpened(sal_False)
     {
     }
 
-    SvxGroupInfo_Impl( USHORT n, USHORT nr, const ::rtl::OUString& _rURL, const ::rtl::OUString& _rHelpText )
+    SvxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr, const ::rtl::OUString& _rURL, const ::rtl::OUString& _rHelpText )
         :nKind( n )
         ,nOrd( nr )
         ,xBrowseNode()
         ,sURL( _rURL )
         ,sHelpText( _rHelpText )
-        ,bWasOpened(FALSE)
+        ,bWasOpened(sal_False)
     {
     }
 };
@@ -116,13 +116,8 @@ public:
                                     SvxConfigFunctionListBox_Impl( Window*, const ResId& );
                                     ~SvxConfigFunctionListBox_Impl();
     void                            ClearAll();
-    SvLBoxEntry*                    GetEntry_Impl( USHORT nId );
-    SvLBoxEntry*                    GetEntry_Impl( const String& );
-    USHORT                          GetId( SvLBoxEntry *pEntry );
     String                          GetHelpText( SvLBoxEntry *pEntry );
     using Window::GetHelpText;
-    USHORT                          GetCurId()
-                                    { return GetId( FirstSelected() ); }
     SvLBoxEntry*                    GetLastSelectedEntry();
     void                            FunctionSelected();
 
@@ -175,7 +170,7 @@ private:
 
 protected:
     virtual void    RequestingChilds( SvLBoxEntry *pEntry);
-    virtual BOOL    Expand( SvLBoxEntry* pParent );
+    virtual sal_Bool    Expand( SvLBoxEntry* pParent );
     using SvListView::Expand;
 
 public:
@@ -189,7 +184,7 @@ public:
             ~SvxConfigGroupListBox_Impl();
 
     void    Init();
-    void    Open( SvLBoxEntry*, BOOL );
+    void    Open( SvLBoxEntry*, sal_Bool );
     void    ClearAll();
     void    GroupSelected();
 
@@ -213,7 +208,7 @@ class SvxScriptSelectorDialog : public ModelessDialog
     FixedLine                       aDescription;
     FixedText                       aDescriptionText;
 
-    BOOL                            m_bShowSlots;
+    sal_Bool                            m_bShowSlots;
     Link                            m_aAddHdl;
 
     DECL_LINK( ClickHdl, Button * );
@@ -227,7 +222,7 @@ public:
 
     SvxScriptSelectorDialog (
         Window* pParent = NULL,
-        BOOL bShowSlots = FALSE,
+        sal_Bool bShowSlots = sal_False,
         const ::com::sun::star::uno::Reference
             < ::com::sun::star::frame::XFrame >& xFrame = 0
     );
@@ -240,7 +235,6 @@ public:
     void        SetImageProvider( ImageProvider* provider )
         { aCategories.SetImageProvider( provider ); }
 
-    USHORT      GetSelectedId();
     String      GetScriptURL() const;
     String      GetSelectedDisplayName();
     String      GetSelectedHelpText();
diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx
index e451ddba36cc..497a0c3afed9 100644
--- a/cui/source/inc/splitcelldlg.hxx
+++ b/cui/source/inc/splitcelldlg.hxx
@@ -30,7 +30,7 @@
 
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/button.hxx>
 
 #include <svx/stddlg.hxx>
@@ -38,13 +38,13 @@
 
 class SvxSplitTableDlg : public SvxAbstractSplittTableDialog, public SvxStandardDialog
 {
+    FixedLine           maCountFL;
     FixedText           maCountLbl;
     NumericField        maCountEdit;
-    FixedLine           maCountFL;
+    FixedLine           maDirFL;
     ImageRadioButton    maHorzBox;
     ImageRadioButton    maVertBox;
     CheckBox            maPropCB;
-    FixedLine           maDirFL;
     OKButton            maOKBtn;
     CancelButton        maCancelBtn;
     HelpButton          maHelpBtn;
diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx
index bbb01fe9dbf2..72457dd9869f 100644
--- a/cui/source/inc/srchxtra.hxx
+++ b/cui/source/inc/srchxtra.hxx
@@ -46,7 +46,7 @@ public:
     ~SvxSearchFormatDialog();
 
 protected:
-    virtual void    PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void    PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
 
 private:
     FontList*       pFontList;
@@ -58,7 +58,7 @@ class SvxSearchAttributeDialog : public ModalDialog
 {
 public:
     SvxSearchAttributeDialog( Window* pParent, SearchAttrItemList& rLst,
-                              const USHORT* pWhRanges );
+                              const sal_uInt16* pWhRanges );
 
 private:
     FixedText           aAttrFL;
@@ -93,15 +93,15 @@ private:
 
 public:
     SvxSearchSimilarityDialog(  Window* pParent,
-                                BOOL bRelax,
-                                USHORT nOther,
-                                USHORT nShorter,
-                                USHORT nLonger );
-
-    USHORT  GetOther()      { return (USHORT)aOtherFld.GetValue(); }
-    USHORT  GetShorter()    { return (USHORT)aShorterFld.GetValue(); }
-    USHORT  GetLonger()     { return (USHORT)aLongerFld.GetValue(); }
-    BOOL    IsRelaxed()     { return aRelaxBox.IsChecked(); }
+                                sal_Bool bRelax,
+                                sal_uInt16 nOther,
+                                sal_uInt16 nShorter,
+                                sal_uInt16 nLonger );
+
+    sal_uInt16  GetOther()      { return (sal_uInt16)aOtherFld.GetValue(); }
+    sal_uInt16  GetShorter()    { return (sal_uInt16)aShorterFld.GetValue(); }
+    sal_uInt16  GetLonger()     { return (sal_uInt16)aLongerFld.GetValue(); }
+    sal_Bool    IsRelaxed()     { return aRelaxBox.IsChecked(); }
 };
 
 
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index b6175bb0bf28..7fff39c09611 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -65,12 +65,12 @@ public:
     ~SvxTabulatorTabPage();
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
-    void                DisableControls( const USHORT nFlag );
+    void                DisableControls( const sal_uInt16 nFlag );
 
 protected:
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
@@ -79,10 +79,11 @@ private:
     SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rSet );
 
     // Tabulatoren und Positionen
-    MetricBox       aTabBox;
     FixedLine       aTabLabel;
+    MetricBox       aTabBox;
     FixedLine       aTabLabelVert;
 
+    FixedLine       aTabTypeLabel;
     // TabType
     RadioButton     aLeftTab;
     RadioButton     aRightTab;
@@ -96,8 +97,8 @@ private:
 
     FixedText       aDezCharLabel;
     Edit            aDezChar;
-    FixedLine       aTabTypeLabel;
 
+    FixedLine       aFillLabel;
     // Fuellzeichen
     RadioButton     aNoFillChar;
     RadioButton     aFillPoints;
@@ -105,8 +106,6 @@ private:
     RadioButton     aFillSolidLine;
     RadioButton     aFillSpecial;
     Edit            aFillChar;
-    FixedLine       aFillLabel;
-
     // Buttons
     PushButton      aNewBtn;
     PushButton      aDelAllBtn;
@@ -117,10 +116,10 @@ private:
     SvxTabStopItem  aNewTabs;
     long            nDefDist;
     FieldUnit       eDefUnit;
-    BOOL            bCheck;
+    sal_Bool            bCheck;
 
 #ifdef _SVX_TABSTPGE_CXX
-    void            InitTabPos_Impl( USHORT nPos = 0 );
+    void            InitTabPos_Impl( sal_uInt16 nPos = 0 );
     void            SetFillAndTabType_Impl();
 
     // Handler
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index b713c232aee5..92bb1b32d749 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -86,7 +86,7 @@ private:
     DECL_LINK( ClickDirectionHdl_Impl, ImageButton * );
 
     void                SelectDirection( SdrTextAniDirection nValue );
-    USHORT              GetSelectedDirection();
+    sal_uInt16              GetSelectedDirection();
 #endif
 
 public:
@@ -95,9 +95,9 @@ public:
     ~SvxTextAnimationPage();
 
     static SfxTabPage*  Create( Window*, const SfxItemSet& );
-    static  USHORT*     GetRanges();
+    static  sal_uInt16*     GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& );
+    virtual sal_Bool        FillItemSet( SfxItemSet& );
     virtual void        Reset( const SfxItemSet & );
 
     void         Construct();
@@ -114,7 +114,7 @@ private:
     const SfxItemSet&   rOutAttrs;
     const SdrView*      pView;
 
-    virtual void        PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void        PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
 
 public:
 
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index 258477dc5a5e..acecce5c3ed5 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -76,12 +76,12 @@ private:
     const SfxItemSet&   rOutAttrs;
     const SdrView*      pView;
 
-    BOOL                bAutoGrowSizeEnabled;
-    BOOL                bContourEnabled;
-    BOOL                bAutoGrowWidthEnabled;
-    BOOL                bAutoGrowHeightEnabled;
-    BOOL                bWordWrapTextEnabled;
-    BOOL                bFitToSizeEnabled;
+    sal_Bool                bAutoGrowSizeEnabled;
+    sal_Bool                bContourEnabled;
+    sal_Bool                bAutoGrowWidthEnabled;
+    sal_Bool                bAutoGrowHeightEnabled;
+    sal_Bool                bWordWrapTextEnabled;
+    sal_Bool                bFitToSizeEnabled;
 
 
 #ifdef _SVX_TEXTATTR_CXX
@@ -89,8 +89,8 @@ private:
     DECL_LINK( ClickHdl_Impl, void * );
 #endif
 
-    /** Return whether the text direction is from left to right (</TRUE>) or
-        top to bottom (</FALSE>).
+    /** Return whether the text direction is from left to right (</sal_True>) or
+        top to bottom (</sal_False>).
     */
     bool IsTextDirectionLeftToRight (void) const;
 
@@ -99,9 +99,9 @@ public:
     ~SvxTextAttrPage();
 
     static SfxTabPage*  Create( Window*, const SfxItemSet& );
-    static  USHORT*     GetRanges();
+    static  sal_uInt16*     GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& );
+    virtual sal_Bool        FillItemSet( SfxItemSet& );
     virtual void        Reset( const SfxItemSet & );
 
     virtual void        PointChanged( Window* pWindow, RECT_POINT eRP );
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index acb77178de36..4563e013703a 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -48,27 +48,27 @@ class SdrView;
 
 /** put this into the nAnchorTypes parameter of the SvxTransformTabDialog c'tor
     to disable the size controls */
-const USHORT SVX_OBJ_NORESIZE = 0x0100;
+const sal_uInt16 SVX_OBJ_NORESIZE = 0x0100;
 
 /** put this into the nAnchorTypes parameter of the SvxTransformTabDialog c'tor
     to disable the protect controls */
-const USHORT SVX_OBJ_NOPROTECT = 0x0200;
+const sal_uInt16 SVX_OBJ_NOPROTECT = 0x0200;
 
 class SvxTransformTabDialog : public SfxTabDialog
 {
 private:
     const SdrView*      pView;
 
-    USHORT              nAnchorCtrls;
+    sal_uInt16              nAnchorCtrls;
     Link                aValidateLink;
 
-    virtual void        PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void        PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
 
 public:
 
             SvxTransformTabDialog( Window* pParent, const SfxItemSet* pAttr,
                             const SdrView* pView,
-                            USHORT nAnchorTypes = 0);
+                            sal_uInt16 nAnchorTypes = 0);
             ~SvxTransformTabDialog();
 
             //link for the Writer to validate positions
@@ -168,9 +168,9 @@ public:
     SvxPositionSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs  );
 
     static SfxTabPage* Create( Window*, const SfxItemSet& );
-    static USHORT*     GetRanges();
+    static sal_uInt16*     GetRanges();
 
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
 
     virtual void ActivatePage( const SfxItemSet& rSet );
@@ -232,9 +232,9 @@ public:
          SvxAngleTabPage( Window* pParent, const SfxItemSet& rInAttrs  );
 
     static SfxTabPage* Create( Window*, const SfxItemSet& );
-    static USHORT*     GetRanges();
+    static sal_uInt16*     GetRanges();
 
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
 
     virtual void ActivatePage( const SfxItemSet& rSet );
@@ -279,9 +279,9 @@ public:
          SvxSlantTabPage( Window* pParent, const SfxItemSet& rInAttrs  );
 
     static SfxTabPage* Create( Window*, const SfxItemSet& );
-    static USHORT*     GetRanges();
+    static sal_uInt16*     GetRanges();
 
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
 
     virtual void ActivatePage( const SfxItemSet& rSet );
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index bcd2904449ad..fcf2e8b34944 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -39,7 +39,7 @@
 
 // static ----------------------------------------------------------------
 
-BOOL            EnableSSO();
+sal_Bool            EnableSSO();
 CreateTabPage   GetSSOCreator( void );
 
 // class OfaOptionsTreeListBox -------------------------------------------
@@ -53,14 +53,14 @@ class OfaOptionsTreeListBox : public SvTreeListBox
     using  SvListView::Collapse;
 
 private:
-    BOOL            bInCollapse;
+    sal_Bool            bInCollapse;
 
 public:
     OfaOptionsTreeListBox(Window* pParent, const ResId& rResId) :
-        SvTreeListBox( pParent, rResId ), bInCollapse(FALSE) {}
+        SvTreeListBox( pParent, rResId ), bInCollapse(sal_False) {}
 
-    virtual BOOL    Collapse( SvLBoxEntry* pParent );
-    BOOL            IsInCollapse()const {return bInCollapse;}
+    virtual sal_Bool    Collapse( SvLBoxEntry* pParent );
+    sal_Bool            IsInCollapse()const {return bInCollapse;}
 };
 
 // struct OrderedEntry ---------------------------------------------------
@@ -154,7 +154,7 @@ typedef ::std::vector< OptionsNode* > VectorOfNodes;
 
 struct LastPageSaver
 {
-    USHORT          m_nLastPageId;
+    sal_uInt16          m_nLastPageId;
     rtl::OUString   m_sLastPageURL_Tools;
     rtl::OUString   m_sLastPageURL_ExtMgr;
 
@@ -201,14 +201,14 @@ private:
     // for the ColorTabPage
     SfxItemSet*     pColorPageItemSet;
     XColorTable*    pColorTab;
-    USHORT          nChangeType;
-    USHORT          nUnknownType;
-    USHORT          nUnknownPos;
-    BOOL            bIsAreaTP;
-
-    BOOL            bForgetSelection;
-    BOOL            bExternBrowserActive;
-    BOOL            bImageResized;
+    sal_uInt16          nChangeType;
+    sal_uInt16          nUnknownType;
+    sal_uInt16          nUnknownPos;
+    sal_Bool            bIsAreaTP;
+
+    sal_Bool            bForgetSelection;
+    sal_Bool            bExternBrowserActive;
+    sal_Bool            bImageResized;
     bool            bInSelectHdl_Impl;
     bool            bIsFromExtensionManager;
 
@@ -222,8 +222,8 @@ private:
 
     static LastPageSaver*   pLastPageSaver;
 
-    SfxItemSet*     CreateItemSet( USHORT nId );
-    void            ApplyItemSet( USHORT nId, const SfxItemSet& rSet );
+    SfxItemSet*     CreateItemSet( sal_uInt16 nId );
+    void            ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet );
     void            InitTreeAndHandler();
     void            Initialize( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& _xFrame );
     void            ResizeTreeLB( void );   // resizes dialog so that treelistbox has no horizontal scroll bar
@@ -262,16 +262,16 @@ public:
     OfaTreeOptionsDialog( Window* pParent, const rtl::OUString& rExtensionId );
     ~OfaTreeOptionsDialog();
 
-    OptionsPageInfo*    AddTabPage( USHORT nId, const String& rPageName, USHORT nGroup );
-    USHORT              AddGroup(   const String& rGroupName,  SfxShell* pCreateShell,
-                                    SfxModule* pCreateModule, USHORT nDialogId );
+    OptionsPageInfo*    AddTabPage( sal_uInt16 nId, const String& rPageName, sal_uInt16 nGroup );
+    sal_uInt16              AddGroup(   const String& rGroupName,  SfxShell* pCreateShell,
+                                    SfxModule* pCreateModule, sal_uInt16 nDialogId );
 
     void                ActivateLastSelection();
-    void                ActivatePage( USHORT nResId );
+    void                ActivatePage( sal_uInt16 nResId );
     void                ActivatePage( const String& rPageURL );
     void                ApplyItemSets();
 
-    USHORT              GetColorChanged() const { return nChangeType; }
+    sal_uInt16              GetColorChanged() const { return nChangeType; }
     XColorTable*        GetColorTable() { return pColorTab; }
 
     // helper functions to call the language settings TabPage from the SpellDialog
@@ -335,12 +335,6 @@ private:
 
 public:
     ExtensionsTabPage(
-        Window* pParent, const ResId&,
-        const rtl::OUString& rPageURL, const rtl::OUString& rEvtHdl,
-        const com::sun::star::uno::Reference<
-            com::sun::star::awt::XContainerWindowProvider >& rProvider );
-
-    ExtensionsTabPage(
         Window* pParent, WinBits nStyle,
         const rtl::OUString& rPageURL, const rtl::OUString& rEvtHdl,
         const com::sun::star::uno::Reference<
@@ -353,7 +347,6 @@ public:
 
     void            ResetPage();
     void            SavePage();
-    void            HideWindow();
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx
index 87fbb8a2f74d..c25f888f78b1 100644
--- a/cui/source/inc/zoom.hxx
+++ b/cui/source/inc/zoom.hxx
@@ -63,7 +63,7 @@ private:
 
     const SfxItemSet&   rSet;
     SfxItemSet*         pOutSet;
-    BOOL                bModified;
+    sal_Bool                bModified;
 
 #ifdef _SVX_ZOOM_CXX
     DECL_LINK( UserHdl, RadioButton* );
@@ -78,16 +78,13 @@ public:
     SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet );
     ~SvxZoomDialog();
 
-    static USHORT*      GetRanges();
     const SfxItemSet*   GetOutputItemSet() const { return pOutSet; }
 
-    USHORT              GetFactor() const;
-    void                SetFactor( USHORT nNewFactor, USHORT nBtnId = 0 );
+    sal_uInt16              GetFactor() const;
+    void                SetFactor( sal_uInt16 nNewFactor, sal_uInt16 nBtnId = 0 );
 
-    void                SetButtonText( USHORT nBtnId, const String& aNewTxt );
-    void                HideButton( USHORT nBtnId );
-    void                SetLimits( USHORT nMin, USHORT nMax );
-    void                SetSpinSize( USHORT nNewSpin );
+    void                HideButton( sal_uInt16 nBtnId );
+    void                SetLimits( sal_uInt16 nMin, sal_uInt16 nMax );
 };
 
 #include <layout/layout-post.hxx>
author	Norbert Thiebaud <nthiebaud@gmail.com>	2011-03-09 16:20:50 -0600
committer	Norbert Thiebaud <nthiebaud@gmail.com>	2011-03-09 16:20:50 -0600
commit	cc5db648bcc3114fefcbf9741586f7cb6aa00b2f (patch)
tree	518184d1a205c0173f30a54bbee0ffaa0f9bb433 /cui/source/inc
parent	7fc838e84c345c13e1dbd32052e1d9c5985a7859 (diff)
parent	8427b0f498b040a465cc20c4a323191d6b2aea5f (diff)