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

1 files changed, 39 insertions, 52 deletions

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