CWS-TOOLING: integrate CWS mba32issues01

2009-05-05 18:23:27 +0200 mba  r271547 : apply diffs from m45->m47 for all files moved from dialog to cui
2009-05-05 18:22:02 +0200 mba  r271545 : apply diffs from m45->m47 for all files moved from dialog to cui
2009-05-05 18:16:42 +0200 mba  r271544 : apply diffs from m45->m47 for all files moved from dialog to cui
2009-04-29 19:35:58 +0200 mba  r271392 : #i73672#: unify commands for inserting special characters
2009-04-29 18:01:27 +0200 mba  r271391 : #i101337#: missing string resources
2009-04-29 18:01:10 +0200 mba  r271390 : #i101337#: missing string resources
2009-04-29 15:42:47 +0200 mba  r271380 : concurrency problem in multithreaded dmake due to missing dependency
2009-04-28 17:36:03 +0200 tbo  r271336 : #i99432#
2009-04-28 13:57:52 +0200 mba  r271322 : #i101302#: ctor might be called with pSet=0
2009-04-22 19:32:39 +0200 tbo  r271138 : #i99432#
2009-04-09 14:46:03 +0200 mba  r270709 : make sendreportw32.cxx compile with pch
2009-04-06 16:05:07 +0200 mba  r270568 : #i99432#: some tweaks for build order
2009-04-06 15:38:52 +0200 mba  r270558 : typo
2009-04-06 13:36:19 +0200 mba  r270542 : #i99432#: split of localization also
2009-04-06 13:19:06 +0200 mba  r270539 : #i99432#: split up srs files also
2009-04-03 17:57:59 +0200 mba  r270513 : #i99432#: split dialog folder into two
2009-04-03 17:56:46 +0200 mba  r270512 : #i99432#: split dialog folder into two
2009-04-01 22:15:00 +0200 mba  r270364 : warnings on Linux
2009-04-01 22:10:44 +0200 mba  r270363 : warnings on Linux
2009-04-01 21:43:54 +0200 mba  r270362 : warning fixed
2009-04-01 21:41:27 +0200 mba  r270361 : warning on Linux fixed
2009-04-01 21:35:44 +0200 mba  r270360 : warning fixed
2009-04-01 20:19:59 +0200 mba  r270358 : warning found on Linux fixed
2009-04-01 19:23:38 +0200 mba  r270354 : warning due to missing eof
2009-04-01 18:56:25 +0200 mba  r270352 : linking problem fixed that appeared only on mac
2009-04-01 18:41:30 +0200 mba  r270350 : warnings discovered on Linux fixed
2009-04-01 18:34:28 +0200 mba  r270349 : some fixes for warnings and include problems discoverd after resync and build on mac
2009-04-01 14:08:22 +0200 mba  r270328 : CWS-TOOLING: rebase CWS mba32issues01 to trunk@270033 (milestone: DEV300:m45)
2009-03-04 18:13:35 +0100 mba  r268858 : #i99432#: more dialogs moved to cui
2009-03-04 17:47:41 +0100 mba  r268854 : #i99432#: more dialogs moved to cui
2009-03-04 17:32:39 +0100 mba  r268851 : warning fixed
2009-03-04 12:59:26 +0100 mba  r268814 : #i99432#: more dialogs moved to cui
2009-03-04 11:49:03 +0100 mba  r268802 : #i99432#: CharmapDialog moved to cui
2009-03-04 10:46:00 +0100 mba  r268795 : #i99432#: CharmapDialog moved to cui
2009-03-04 10:43:50 +0100 mba  r268794 : #i99432#: CharmapDialog moved to cui
2009-03-04 10:00:29 +0100 mba  r268792 : #i99432#: CharmapDialog moved to cui
2009-03-04 10:00:03 +0100 mba  r268791 : #i99432#: CharmapDialog moved to cui
2009-03-04 09:59:43 +0100 mba  r268790 : #i99432#: CharmapDialog moved to cui
2009-03-04 09:58:51 +0100 mba  r268789 : #i99432#: CharmapDialog moved to cui
2009-03-04 09:58:16 +0100 mba  r268788 : #i99432#: CharmapDialog moved to cui
2009-03-03 16:33:14 +0100 mba  r268763 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:32:28 +0100 mba  r268762 : #i99432#: some tabpages moved to cui
2009-03-03 16:32:09 +0100 mba  r268761 : #i99432#: some tabpages moved to cui
2009-03-03 16:29:40 +0100 mba  r268760 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:29:08 +0100 mba  r268759 : #i99432#: MacroAssignment page moved to cui
2009-03-03 16:28:41 +0100 mba  r268758 : #i99432#: MacroAssignment page moved to cui
2009-03-03 16:28:18 +0100 mba  r268757 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:27:36 +0100 mba  r268756 : #i99465#: replace FN_SYMBOL by SID_CHARMAP
2009-03-03 16:27:02 +0100 mba  r268755 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:26:23 +0100 mba  r268754 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:25:30 +0100 mba  r268753 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:24:49 +0100 mba  r268752 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:24:35 +0100 mba  r268751 : #i99432#: MacroAssignment page moved to cui
2009-03-03 16:23:20 +0100 mba  r268750 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:23:04 +0100 mba  r268749 : #i99432#: MacroAssignment page moved to cui
2009-03-03 16:21:56 +0100 mba  r268748 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:18:39 +0100 mba  r268747 : #i99432#: MacroAssignment page moved to cui
2009-03-03 16:13:14 +0100 mba  r268745 : #i99465#: replace FN_SYMBOL by SID_CHARMAP
2009-03-03 16:02:54 +0100 mba  r268738 : #i99432#: moved MacroAssignment TabPage from sfx2
2009-03-03 14:57:58 +0100 mba  r268729 : #i99465#: transport return value via ItemSet
2009-03-03 00:08:10 +0100 mba  r268701 : #i99432#: move acccfg to cuilib
2009-03-03 00:07:32 +0100 mba  r268700 : #i99432#: move acccfg to cuilib
2009-03-03 00:02:01 +0100 mba  r268699 : #i99432#: move acccfg to cuilib
2009-03-03 00:01:38 +0100 mba  r268698 : #i99432#: move acccfg to cuilib
2009-03-03 00:01:11 +0100 mba  r268697 : #i99432#: move acccfg to cuilib
2009-03-03 00:00:40 +0100 mba  r268696 : #i99432#: move acccfg to cuilib
2009-03-03 00:00:06 +0100 mba  r268695 : #i99432#: replace SfxAbstractSingleTabDialog by SfxAbstractDialog
2009-03-02 23:59:22 +0100 mba  r268694 : #i99432#: move acccfg to cuilib
2009-03-02 23:57:19 +0100 mba  r268693 : #i99432#: move acccfg to svx
2009-03-02 23:56:14 +0100 mba  r268692 : #i99432#: replace SfxAbstractSingleTabDialog by SfxAbstractDialog
2009-03-02 23:49:37 +0100 mba  r268691 : #i99785#: consolidate dialogs library
2009-03-02 17:26:40 +0100 mba  r268683 : #i99785#: consolidate dialogs library
2009-03-02 17:24:28 +0100 mba  r268682 : i99465#: consolidate slot for InsertSymbol command
2009-03-02 17:22:29 +0100 mba  r268681 : #i99785#: consolidate dialogs library
2009-03-02 17:18:11 +0100 mba  r268680 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 17:08:30 +0100 mba  r268679 : #i99785#: consolidate dialogs library
2009-03-02 17:06:57 +0100 mba  r268678 : #i99785#: consolidate dialogs library
2009-03-02 17:06:30 +0100 mba  r268677 : #i99785#: consolidate dialogs library
2009-03-02 17:05:02 +0100 mba  r268676 : #i99785#: consolidate dialogs library
2009-03-02 17:04:35 +0100 mba  r268675 : #i99785#: consolidate dialogs library
2009-03-02 16:47:53 +0100 mba  r268673 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:45:17 +0100 mba  r268671 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:39:59 +0100 mba  r268670 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:38:59 +0100 mba  r268668 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:38:28 +0100 mba  r268667 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:36:06 +0100 mba  r268666 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:29:50 +0100 mba  r268663 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:24:00 +0100 mba  r268659 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:23:31 +0100 mba  r268658 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:22:41 +0100 mba  r268657 : i99432#: move accelconfig and macroassignment to cui
2009-02-25 16:57:26 +0100 mba  r268453 : obsolete
2009-02-17 10:50:51 +0100 mba  r267846 : obsolete
2009-02-12 16:33:54 +0100 mba  r267676 : #i96834#: warning fixed
2009-02-11 19:28:47 +0100 mba  r267626 : #i91978#: unused code
2009-02-11 18:37:47 +0100 mba  r267625 : metafile output, fixes for 3 layer office
2009-02-11 12:56:28 +0100 mba  r267593 : selective trees; incomplete build lists; metafile output

6 files changed, 0 insertions, 946 deletions

diff --git a/sfx2/source/inc/acccfg.hxx b/sfx2/source/inc/acccfg.hxx
deleted file mode 100644
index 33ef6dbd31..0000000000
--- a/sfx2/source/inc/acccfg.hxx
+++ /dev/null
@@ -1,110 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: acccfg.hxx,v $
- * $Revision: 1.7 $
- *
- * 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 _ACCCFG_HXX
-#define _ACCCFG_HXX
-
-// #include *****************************************************************
-
-#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
-#include <vcl/button.hxx>
-#endif
-#include <vcl/dialog.hxx>
-#include <vcl/lstbox.hxx>
-#include <sfx2/minarray.hxx>
-
-// forward ******************************************************************
-
-class SfxAcceleratorManager;
-
-// class SfxAcceleratorConfigListBox *************************************************
-
-class SfxAcceleratorConfigListBox : public ListBox
-{
-    void KeyInput( const KeyEvent &rKEvt );
-
-public:
-
-    SfxAcceleratorConfigListBox( Window *pParent, ResId &rResId ) :
-        ListBox( pParent, rResId ) {}
-
-    void ReplaceEntry( USHORT nPos, const String &rStr );
-    void ExpandEntry ( USHORT nPos, const String &rStr );
-};
-
-// class USHORTArr **********************************************************
-
-#if !defined(_MNUCFG_HXX) && !defined(_TBXCFG_HXX)
-DECL_2BYTEARRAY(USHORTArr, USHORT, 10, 10)
-#endif
-
-// class SfxAcceleratorConfigDialog **************************************************
-
-class SfxAcceleratorConfigDialog : public ModalDialog
-{
-    OKButton           aOKButton;
-    CancelButton       aCancelButton;
-    PushButton         aChangeButton;
-    PushButton         aRemoveButton;
-    SfxAcceleratorConfigListBox aEntriesBox;
-    FixedText          aDescriptionTextText;
-    FixedText		   aDescriptionInfoText;
-    FixedLine          aKeyboardGroup;
-    FixedText          aGroupText;
-    ListBox            aGroupLBox;
-    FixedText          aFunctionText;
-    ListBox            aFunctionBox;
-    FixedText          aKeyText;
-    ListBox            aKeyBox;
-    FixedLine          aFunctionsGroup;
-
-    SfxAcceleratorManager *pMgr;
-
-    USHORTArr     aAccelArr;
-    USHORTArr     aFunctionArr;
-    USHORTArr     aKeyArr;
-
-    void OKHdl    ( Button  * );
-    void ChangeHdl( Button  * );
-    void RemoveHdl( Button  * );
-    void SelectHdl( ListBox *pListBox );
-
-    KeyCode PosToKeyCode   ( USHORT nPos )          const;
-    USHORT  KeyCodeToPos   ( const KeyCode &rCode ) const;
-    String  GetFunctionName( KeyFuncType eType )    const;
-
-public:
-
-    SfxAcceleratorConfigDialog( Window *pParent );
-};
-
-#endif
-
diff --git a/sfx2/source/inc/cfg.hxx b/sfx2/source/inc/cfg.hxx
deleted file mode 100644
index 6147f8a255..0000000000
--- a/sfx2/source/inc/cfg.hxx
+++ /dev/null
@@ -1,620 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: cfg.hxx,v $
- * $Revision: 1.41 $
- *
- * 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 _SFXCFG_HXX
-#define _SFXCFG_HXX
-
-#include <vector>
-#include <algorithm>
-#include <vcl/lstbox.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/group.hxx>
-#include <svtools/svtabbx.hxx>
-#include <svtools/svtreebx.hxx>
-
-//
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/frame/XModuleManager.hpp>
-#include <com/sun/star/ui/XUIConfigurationManager.hpp>
-#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XSingleComponentFactory.hpp>
-#include <com/sun/star/script/browse/XBrowseNode.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-
-#define _SVSTDARR_USHORTS
-#define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>		// SvUShorts
-#include <sfx2/minarray.hxx>
-#include <sfx2/tabdlg.hxx>
-
-class SfxMacroInfoArr_Impl;
-class SfxMacroInfoItem;
-class SfxMacroInfo;
-class BasicManager;
-
-#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 css ::com::sun::star
-
-struct SfxStyleInfo_Impl
-{
-    public:
-
-    ::rtl::OUString sFamily;
-    ::rtl::OUString sStyle;
-    ::rtl::OUString sCommand;
-    ::rtl::OUString sLabel;
-
-    SfxStyleInfo_Impl()
-    {}
-
-    SfxStyleInfo_Impl(const SfxStyleInfo_Impl& rCopy)
-    {
-        sFamily  = rCopy.sFamily;
-        sStyle   = rCopy.sStyle;
-        sCommand = rCopy.sCommand;
-        sLabel   = rCopy.sLabel;
-    }
-};
-
-struct SfxStylesInfo_Impl
-{
-    private:
-
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xDoc;
-
-    public:
-
-        SfxStylesInfo_Impl();
-        void setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel);
-
-        sal_Bool parseStyleCommand(SfxStyleInfo_Impl& aStyle);
-        void getLabel4Style(SfxStyleInfo_Impl& aStyle);
-
-        ::std::vector< SfxStyleInfo_Impl > getStyleFamilies();
-        ::std::vector< SfxStyleInfo_Impl > getStyles(const ::rtl::OUString& sFamily);
-
-        static ::rtl::OUString generateCommand(const ::rtl::OUString& sFamily, const ::rtl::OUString& sStyle);
-};
-
-struct SfxGroupInfo_Impl
-{
-    USHORT 		nKind;
-    USHORT 		nOrd;
-    void*		pObject;
-    BOOL		bWasOpened;
-    String      sCommand;
-    String      sLabel;
-
-                SfxGroupInfo_Impl( USHORT n, USHORT nr, void* pObj = 0 ) :
-                    nKind( n ), nOrd( nr ), pObject( pObj ), bWasOpened(FALSE) {}
-};
-
-typedef SfxGroupInfo_Impl* SfxGroupInfoPtr;
-SV_DECL_PTRARR_DEL(SfxGroupInfoArr_Impl, SfxGroupInfoPtr, 5, 5)
-
-class SfxConfigFunctionListBox_Impl : public SvTreeListBox
-{
-    friend class SfxConfigGroupListBox_Impl;
-    Timer                aTimer;
-    SvLBoxEntry*         pCurEntry;
-    SfxGroupInfoArr_Impl aArr;
-    SfxStylesInfo_Impl*  pStylesInfo;
-
-    DECL_LINK( TimerHdl, Timer* );
-    virtual void  MouseMove( const MouseEvent& rMEvt );
-
-public:
-                  SfxConfigFunctionListBox_Impl( Window*, const ResId& );
-                  ~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();
-    void          FunctionSelected();
-    void          SetStylesInfo(SfxStylesInfo_Impl* pStyles);
-};
-
-class SfxSlotPool;
-class SfxConfigGroupListBox_Impl : public SvTreeListBox
-{
-    SfxSlotPool*                    pSlotPool;
-    SfxConfigFunctionListBox_Impl*  pFunctionListBox;
-    SfxGroupInfoArr_Impl            aArr;
-    ULONG                           nMode;
-    String                          aScriptType;
-    BOOL                            bShowSF; // show Scripting Framework scripts
-    BOOL                            bShowBasic; // show Basic scripts
-
-    Image m_hdImage;
-    Image m_hdImage_hc;
-    Image m_libImage;
-    Image m_libImage_hc;
-    Image m_macImage;
-    Image m_macImage_hc;
-    Image m_docImage;
-    Image m_docImage_hc;
-
-    ::rtl::OUString m_sMyMacros;
-    ::rtl::OUString m_sProdMacros;
-
-    ::rtl::OUString m_sModuleLongName;
-    css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
-    css::uno::Reference< css::frame::XFrame > m_xFrame;
-    css::uno::Reference< css::container::XNameAccess > m_xGlobalCategoryInfo;
-    css::uno::Reference< css::container::XNameAccess > m_xModuleCategoryInfo;
-    css::uno::Reference< css::container::XNameAccess > m_xUICmdDescription;
-
-    Image GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, bool bIsRootNode, bool bHighContrast );
-
-    ::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 );
-    ::rtl::OUString parseLocationName( const ::rtl::OUString& location );
-
-    void InitModule();
-    void InitBasic();
-    void InitStyles();
-
-    ::rtl::OUString MapCommand2UIName(const ::rtl::OUString& sCommand);
-
-    SfxStylesInfo_Impl* pStylesInfo;
-
-protected:
-    virtual void        RequestingChilds( SvLBoxEntry *pEntry);
-    using SvListView::Expand;
-    virtual BOOL        Expand( SvLBoxEntry* pParent );
-
-public:
-    SfxConfigGroupListBox_Impl ( Window* pParent,
-                                 const ResId&, 
-                                 ULONG nConfigMode = 0 );
-    ~SfxConfigGroupListBox_Impl();
-    void                ClearAll();
-
-    void                Init(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR          ,
-                             const css::uno::Reference< css::frame::XFrame >&              xFrame         ,
-                             const ::rtl::OUString&                                        sModuleLongName);
-    void                SetFunctionListBox( SfxConfigFunctionListBox_Impl *pBox )
-                        { pFunctionListBox = pBox; }
-    void                Open( SvLBoxEntry*, BOOL );
-    void                GroupSelected();
-    void                SelectMacro( const SfxMacroInfoItem* );
-    void                SelectMacro( const String&, const String& );
-    String              GetGroup();
-    BasicManager*       GetBasicManager( const SvLBoxEntry& _rEntry );
-    void                SetScriptType( const String& rScriptType );
-    void                SetStylesInfo(SfxStylesInfo_Impl* pStyles);
-};
-/*
-class SfxMenuConfigEntry
-{
-private:
-    USHORT  					nId;
-    BOOL						bPopUp;
-    String  					aHelpText;
-    String  					aStr;
-    String						aCommand;
-    String                      aHelpURL;
-    BOOL						bConfigure;
-    BOOL                        bStrEdited;
-
-public:
-    SfxMenuConfigEntry( USHORT nInitId, const String& rInitStr,
-                        const String& rHelpText, BOOL bPopup = FALSE );
-    SfxMenuConfigEntry() : nId( 0 ), bPopUp( FALSE ), bConfigure( TRUE ), bStrEdited( FALSE ) {}
-    ~SfxMenuConfigEntry();
-
-    USHORT 						GetId() const { return nId; }
-    void 						SetId( USHORT nNew );
-    void						SetCommand( const String& rCmd ) { aCommand = rCmd; }
-    const String&				GetName() const { return aStr; }
-    void						SetName( const String& rStr ) { aStr = rStr; bStrEdited = TRUE; }
-    const String&				GetHelpText() const { return aHelpText; }
-    void						SetHelpText( const String& rStr ) { aHelpText = rStr; }
-    const String&               GetHelpURL() const { return aHelpURL; }
-    void                        SetHelpURL( const String& rStr ) { aHelpURL = rStr; }
-    void 						SetPopup( BOOL bOn = TRUE ) { bPopUp = bOn; }
-    void						SetConfigurable( BOOL bOn = TRUE ) { bConfigure = bOn; }
-    BOOL 						IsBinding() const { return nId != 0 && !bPopUp; }
-    BOOL 						IsSeparator() const { return nId == 0; }
-    BOOL 						IsPopup() const { return bPopUp; }
-    BOOL						IsConfigurable() const { return bConfigure; }
-    BOOL                        HasChangedName() const { return bStrEdited; }
-    const String&				GetCommand() const { return aCommand; }
-};
-
-// class SfxMenuConfigEntryArr *************************************************
-
-SV_DECL_PTRARR_DEL(SfxMenuConfigEntryArr, SfxMenuConfigEntry *, 16, 16)
-
-class SfxMenuConfigPage;
-class SfxMenuCfgTabListBox_Impl : public SvTabListBox
-{
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xComponentContext;
-    com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > m_aSeparatorSeq;
-    SfxMenuConfigPage*			pPage;
-    SfxMenuConfigEntryArr 		aMenuArr;
-    Timer						aTimer;
-    SfxMenuConfigEntry*			pCurEntry;
-    rtl::OUString               m_aDescriptorCommandURL;
-    rtl::OUString               m_aDescriptorType;
-    rtl::OUString               m_aDescriptorLabel;
-    rtl::OUString               m_aDescriptorHelpURL;
-    rtl::OUString               m_aDescriptorContainer;
-
-    DECL_LINK(					TimerHdl, Timer* );
-
-    com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& GetSeparator();
-    com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > ConvertSfxMenuConfigEntry( SfxMenuConfigEntry* pEntry );
-
-public :
-                                SfxMenuCfgTabListBox_Impl( Window *pParent, const ResId& rResId );
-                                ~SfxMenuCfgTabListBox_Impl();
-
-    virtual long				PreNotify( NotifyEvent& );
-    virtual void				ModelIsRemoving( SvListEntry* pEntry );
-    void						EntryInserted( SvListEntry* pEntry );
-    virtual void				ModelHasCleared();
-    virtual void				EditingRequest( SvLBoxEntry* pEntry,
-                                                SvLBoxItem* pItem, const Point& rMousePos );
-    virtual BOOL				EditedEntry( SvLBoxEntry* pEntry, const String& rNewText );
-    virtual void 				MouseMove( const MouseEvent& rMEvt );
-    virtual sal_Int8			AcceptDrop( const AcceptDropEvent& rEvt );
-    virtual BOOL    			NotifyMoving(SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, ULONG& );
-    void						Apply( com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rNewMenuBar, com::sun::star::uno::Reference< com::sun::star::lang::XSingleComponentFactory >& rFactory, SvLBoxEntry *pParent = NULL );
-};
-
-// class SfxMenuConfigPage -----------------------------------------------
-
-class SfxMenuConfigPage : public SfxTabPage
-{
-private:
-    SfxMenuCfgTabListBox_Impl       aEntriesBox;
-    const SfxMacroInfoItem*			m_pMacroInfoItem;
-    FixedLine                       aMenuGroup;
-    PushButton   					aNewButton;
-    PushButton   					aNewPopupButton;
-    PushButton   					aChangeButton;
-    PushButton   					aRemoveButton;
-    ImageButton 					aUpButton;
-    ImageButton 					aDownButton;
-    FixedText    					aGroupText;
-    SfxConfigGroupListBox_Impl      aGroupLBox;
-    FixedText    					aFunctionText;
-    SfxConfigFunctionListBox_Impl	aFunctionBox;
-    FixedLine                       aFunctionsGroup;
-    PushButton						aLoadButton;
-    PushButton						aSaveButton;
-    PushButton	 					aResetButton;
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xDocCfgMgr;
-    ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xModuleCfgMgr;
-    ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
-    ::com::sun::star::uno::Reference< com::sun::star::frame::XFrame > m_xFrame;
-    ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > m_xMenuBarSettings;
-    ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_xCommandToLabelMap;
-    String                          m_aMenuResourceURL;
-    sal_Bool                        m_bDocConfig;
-    sal_Bool                        m_bDocReadOnly;
-
-//	SfxMenuManager*				pMgr;
-
-    BOOL						m_bModified;
-    BOOL						m_bDefault;
-
-    DECL_LINK( 					MoveHdl, Button * );
-    DECL_LINK( 					NewHdl, Button * );
-    DECL_LINK( 					NewPopupHdl, Button * );
-    DECL_LINK( 					ChangeHdl, Button * );
-    DECL_LINK( 					RemoveHdl, Button * );
-    DECL_LINK( 					SelectHdl, Control* );
-
-    void   						CheckEntry( Control* );
-    USHORT 						GetCurId();
-    String 						MakeEntry( const SfxMenuConfigEntry &rEntry ) const;
-    String 						Trim( const String &rStr ) const;
-
-    sal_Bool                    GetMenuItemData( const ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rItemContainer,
-                                                 sal_Int32 nIndex,
-                                                 rtl::OUString& rCommandURL,
-                                                 rtl::OUString& rHelpURL,
-                                                 rtl::OUString& rLabel,
-                                                 sal_uInt16& rType,
-                                                 ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xPopupMenu );
-
-    void                        FillEntriesBox( const ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xMenuBarSettings, SfxMenuCfgTabListBox_Impl& aEntriesBox, SvLBoxEntry *pParentEntry );
-    void 						Init();
-    void 						ResetConfig();
-
-    BOOL						TryMove_Impl( Button*, SvLBoxEntry** pEntry=NULL, ULONG* pPos=NULL );
-
-    DECL_LINK( 					Default, PushButton * );
-    DECL_LINK( 					Save, Button * );
-    DECL_LINK( 					Load, Button * );
-
-public:
-                                SfxMenuConfigPage( Window *pParent, const SfxItemSet& rItemSet );
-    virtual 					~SfxMenuConfigPage();
-
-    virtual BOOL				FillItemSet( SfxItemSet& );
-    virtual void				Reset( const SfxItemSet& );
-    void                        Apply( BOOL );
-    void						SetModified( BOOL bSet ) { m_bModified = bSet; }
-    void						SetDefault( BOOL bSet )	{ m_bDefault = bSet; }
-
-    void						SelectMacro(const SfxMacroInfoItem*);
-
-    ::com::sun::star::uno::Reference < com::sun::star::container::XNameAccess >
-        GetCommandToLabelMap() { return m_xCommandToLabelMap; }
-};
-
-
-class SfxAcceleratorManager;
-*/
-// class SfxAcceleratorConfigListBox *************************************************
-
-class SfxAcceleratorConfigPage;
-class SfxAccCfgTabListBox_Impl : public SvTabListBox
-{
-    SfxAcceleratorConfigPage*	m_pAccelConfigPage;
-
-    void 						KeyInput( const KeyEvent &rKEvt );
-
-protected:
-    virtual void				InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind );
-
-public:
-                                SfxAccCfgTabListBox_Impl(
-                                        SfxAcceleratorConfigPage* pAccelConfigPage,
-                                        Window *pParent,
-                                        const ResId &rResId ) :
-                                     SvTabListBox( pParent, rResId ),
-                                    m_pAccelConfigPage( pAccelConfigPage )
-                                {}
-
-    void 						ReplaceEntry( USHORT nPos, const String &rStr );
-};
-
-// class SfxAcceleratorConfigPage ----------------------------------------
-
-struct TAccInfo
-{
-    public:
-
-        TAccInfo(      sal_Int32 nKeyPos ,
-                       sal_Int32 nListPos,
-                 const KeyCode&  aKey    )
-            : m_nKeyPos        (nKeyPos  )
-            , m_nListPos       (nListPos )
-            , m_bIsConfigurable(sal_True )
-            , m_sCommand       (         )
-            , m_aKey           (aKey     )
-            // its important to set TRUE as default -
-            // because only fix entries will be disabled later ...
-        {}
-
-        sal_Bool isConfigured() const
-        {
-            return (m_nKeyPos>-1 && m_nListPos>-1 && m_sCommand.getLength());
-        }
-
-        sal_Int32 m_nKeyPos;
-        sal_Int32 m_nListPos;
-        sal_Bool m_bIsConfigurable;
-        ::rtl::OUString m_sCommand;
-        KeyCode m_aKey;
-};
-
-namespace sfx2
-{
-    class FileDialogHelper;
-}
-
-class SfxAcceleratorConfigPage : public SfxTabPage
-{
-    friend class SfxAccCfgTabListBox_Impl;
-private:
-    const SfxMacroInfoItem*			m_pMacroInfoItem;
-    sfx2::FileDialogHelper*         m_pFileDlg;
-
-    SfxAccCfgTabListBox_Impl		aEntriesBox;
-    FixedLine                       aKeyboardGroup;
-     RadioButton						aOfficeButton;
-    RadioButton						aModuleButton;
-    PushButton         				aChangeButton;
-    PushButton         				aRemoveButton;
-    FixedText          				aGroupText;
-    SfxConfigGroupListBox_Impl      aGroupLBox;
-    FixedText          				aFunctionText;
-    SfxConfigFunctionListBox_Impl	aFunctionBox;
-    FixedText          				aKeyText;
-    SvTreeListBox     				aKeyBox;
-    FixedLine                       aFunctionsGroup;
-    PushButton						aLoadButton;
-    PushButton						aSaveButton;
-    PushButton		   				aResetButton;
-    SfxStylesInfo_Impl              m_aStylesInfo;
-    sal_Bool                        m_bStylesInfoInitialized;
-
-    css::uno::Reference< css::lang::XMultiServiceFactory >     m_xSMGR;
-    css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xGlobal;
-    css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xModule;
-    css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xAct;
-    css::uno::Reference< css::container::XNameAccess > m_xUICmdDescription;
-    css::uno::Reference< css::frame::XFrame > m_xFrame;
-
-    ::rtl::OUString m_sModuleLongName;
-    ::rtl::OUString m_sModuleShortName;
-    ::rtl::OUString m_sModuleUIName;
-
-    DECL_LINK( 					ChangeHdl, Button * );
-    DECL_LINK( 					RemoveHdl, Button * );
-    DECL_LINK( 					SelectHdl, Control * );
-    DECL_LINK( 					Save, Button * );
-    DECL_LINK( 					Load, Button * );
-    DECL_LINK( 					Default, PushButton * );
-    DECL_LINK(					RadioHdl, RadioButton* );
-
-    DECL_LINK(                  LoadHdl, sfx2::FileDialogHelper* );
-    DECL_LINK(                  SaveHdl, sfx2::FileDialogHelper* );
-
-    String                      GetLabel4Command(const String& sCommand);
-    void                        InitAccCfg();
-    KeyCode 					MapPosToKeyCode( USHORT nPos ) const;
-    USHORT  					MapKeyCodeToPos( const KeyCode &rCode ) const;
-    String  					GetFunctionName( KeyFuncType eType ) const;
-    css::uno::Reference< css::frame::XModel > SearchForAlreadyLoadedDoc(const String& sName);
-    void                        StartFileDialog( WinBits nBits, const String& rTitle );
-
-    void 						Init(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr);
-    void 						ResetConfig();
-
-    void						CreateCustomItems( SvLBoxEntry* pEntry, const String& aCol1, const String& aCol2 );
-
-public:
-                                SfxAcceleratorConfigPage( Window *pParent, const SfxItemSet& rItemSet );
-    virtual 					~SfxAcceleratorConfigPage();
-
-    virtual 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);
-};
-/*
-class SfxConfigDialog : public SfxTabDialog
-{
-    const SfxMacroInfoItem*		pMacroInfo;
-    SfxViewFrame*				pViewFrame;
-    USHORT						nObjectBar;
-
-public:
-                                SfxConfigDialog( Window*, const SfxItemSet*, SfxViewFrame* pFrame );
-                                ~SfxConfigDialog();
-
-    void 						ActivateToolBoxConfig( USHORT nId );
-    void 						ActivateMacroConfig( const SfxMacroInfoItem* );
-    void                        ActivateTabPage( USHORT );
-
-    virtual void				PageCreated( USHORT nId, SfxTabPage &rPage );
-    virtual short				Ok();
-
-    static String				FileDialog_Impl( Window *pParent, WinBits nBits, const String& rTitle );
-    static SfxConfigManager*	MakeCfgMgr_Impl( const String& rName, BOOL bWriting, BOOL& bCreated );
-};
-
-class SfxStatusBarManager;
-class SfxStbInfoArr_Impl;
-
-class SfxStatusBarConfigListBox : public SvTreeListBox
-{
-friend class SfxStatusBarConfigPage;
-    SvLBoxButtonData*			pButton;
-    BOOL                		bModified;
-    BOOL						bDefault;
-    SvLBoxEntry*				pCurEntry;
-    Timer						aTimer;
-
-    DECL_LINK(					TimerHdl, Timer* );
-
-public:
-
-                                SfxStatusBarConfigListBox( Window* pParent,
-                                        const ResId& );
-                                ~SfxStatusBarConfigListBox();
-
-    virtual BOOL    			NotifyAcceptDrop( SvLBoxEntry* pEntry );
-    virtual BOOL    			NotifyMoving(SvLBoxEntry*,
-                                    SvLBoxEntry*,SvLBoxEntry*&,ULONG&);
-    virtual void				CheckButtonHdl();
-    virtual void 				MouseMove( const MouseEvent& rMEvt );
-    virtual void				KeyInput( const KeyEvent& rKeyEvent );
-};
-
-// class SfxStatusBarConfigPage ------------------------------------------
-
-class SfxStatusBarConfigPage : public SfxTabPage
-{
-private:
-    SfxStatusBarConfigListBox	aEntriesBox;
-    FixedLine                   aStatusBarGroup;
-    PushButton					aLoadButton;
-    PushButton					aSaveButton;
-    PushButton					aResetButton;
-
-    SvUShorts					aListOfIds;
-    SfxStatusBarManager*		pMgr;
-    SfxStbInfoArr_Impl* 		pArr;
-    BOOL                        bMgrCreated;
-
-    DECL_LINK( 					SelectHdl, SvTreeListBox * );
-    DECL_LINK( 					Save, Button * );
-    DECL_LINK( 					Load, Button * );
-    DECL_LINK( 					Default, PushButton * );
-
-    void 						Init();
-    void 						ResetConfig();
-
-public:
-                                SfxStatusBarConfigPage( Window *pParent, const SfxItemSet& rItemSet );
-    virtual 					~SfxStatusBarConfigPage();
-
-    virtual BOOL				FillItemSet( SfxItemSet& );
-    virtual void				Reset( const SfxItemSet& );
-    void                        Apply( SfxStatusBarManager*, BOOL );
-};
-*/
-
-#undef css
-#undef css
-
-#endif
-
diff --git a/sfx2/source/inc/eventdlg.hxx b/sfx2/source/inc/eventdlg.hxx
deleted file mode 100644
index 5b43e3878b..0000000000
--- a/sfx2/source/inc/eventdlg.hxx
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: eventdlg.hxx,v $
- * $Revision: 1.7 $
- *
- * 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 _EVENTDLG_HXX
-#define _EVENTDLG_HXX
-
-#include <vcl/menubtn.hxx>
-
-#include <sfx2/evntconf.hxx>
-#include <sfx2/macropg.hxx>
-
-class Menu;
-class SfxMacroInfoItem;
-class SvxMacroItem;
-
-class SfxEventConfigPage : public _SfxMacroTabPage
-{
-    RadioButton		aStarOfficeRB;
-    RadioButton		aDocumentRB;
-
-    SvxMacroItem*	pAppItem;
-    SvxMacroItem*	pDocItem;
-    BOOL			bAppConfig;
-
-    DECL_LINK(		SelectHdl_Impl, RadioButton* );
-
-public:
-                    SfxEventConfigPage( Window *pParent, const SfxItemSet& rSet );
-                    ~SfxEventConfigPage();
-
-    void            Init();
-    void            SelectMacro( const SfxMacroInfoItem* );
-    void            SelectMacro( const SvxMacro* );
-    void			Apply();
-
-    virtual BOOL	FillItemSet( SfxItemSet& );
-    virtual void	Reset( const SfxItemSet& );
-};
-
-
-#endif
-
diff --git a/sfx2/source/inc/headertablistbox.hxx b/sfx2/source/inc/headertablistbox.hxx
deleted file mode 100644
index 4fff765a4a..0000000000
--- a/sfx2/source/inc/headertablistbox.hxx
+++ /dev/null
@@ -1,71 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: headertablistbox.hxx,v $
- * $Revision: 1.4 $
- *
- * 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 _HEADERTABLISTBOX_HXX
-#define _HEADERTABLISTBOX_HXX
-
-#include <svtools/headbar.hxx>
-#include <svtools/svtabbx.hxx>
-
-
-class _HeaderTabListBox : public Control
-{
-private:
-    SvHeaderTabListBox			maListBox;
-    HeaderBar					maHeaderBar;
-protected:
-    DECL_LINK( HeaderEndDrag_Impl, HeaderBar* );
-    virtual long				Notify( NotifyEvent& rNEvt );
-public:
-                                _HeaderTabListBox( Window* pParent, const ResId& rId );
-    virtual						~_HeaderTabListBox();
-
-    inline SvHeaderTabListBox&	GetListBox( void );
-    inline HeaderBar&			GetHeaderBar( void );
-
-    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						Enable( bool bEnable = true, bool bChild = true );	// same meaning as Windows::Enable()
-};
-
-inline SvHeaderTabListBox& _HeaderTabListBox::GetListBox( void )
-{
-    return maListBox;
-}
-
-inline HeaderBar& _HeaderTabListBox::GetHeaderBar( void )
-{
-    return maHeaderBar;
-}
-
-
-#endif
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index 5965ec622a..8e7643975d 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -49,9 +49,6 @@
 #define HID_DOCINFODESC       						(HID_SFX_START +   8)
 #define HID_DOCINFODOC       						(HID_SFX_START +   9)
 #define HID_DOCINFOUSER       						(HID_SFX_START +  10)
-#define HID_CONFIG_MENU       						(HID_SFX_START +  11)
-#define HID_CONFIG_ACCEL       						(HID_SFX_START +  12)
-#define HID_CONFIG_STATBAR     						(HID_SFX_START +  13)
 #define HID_BOOKMARKPROPS                           (HID_SFX_START +  14)
 #define HID_BOOKGROUPPROPS                          (HID_SFX_START +  15)
 #define HID_BOOKFILEPROPS                           (HID_SFX_START +  16)
@@ -98,7 +95,6 @@
 #define HID_TEMPLATE_FMT          					(HID_SFX_START +  61)
 #define HID_TEMPLATE_FILTER        					(HID_SFX_START +  62)
 #define HID_FTPSERVER_PAGE                          (HID_SFX_START +  63)
-#define HID_MACRO_LB_EVENT							(HID_SFX_START +  64)
 #define HID_DLG_SFX_EXP_SEARCH                      (HID_SFX_START +  65)
 #define HID_TP_SFX_EXP_SEARCH_CRITERIA              (HID_SFX_START +  66)
 #define HID_TP_SFX_EXP_SEARCH_PLACE                 (HID_SFX_START +  67)
@@ -106,12 +102,6 @@
 #define HID_TEMPLDLG_NEWBYEXAMPLE             		(HID_SFX_START +  69)
 #define HID_TEMPLDLG_UPDATEBYEXAMPLE          		(HID_SFX_START +  70)
 #define HID_TEMPLDLG_WATERCAN              		    (HID_SFX_START +  71)
-#define HID_CONFIGFUNCTION_LISTBOX         		    (HID_SFX_START +  72)
-#define HID_CONFIGGROUP_LISTBOX            		    (HID_SFX_START +  73)
-#define HID_STATUSBARCONFIG_LISTBOX        		    (HID_SFX_START +  74)
-#define HID_ACCELCONFIG_LISTBOX	        		    (HID_SFX_START +  75)
-#define HID_MENUCONFIG_LISTBOX        			    (HID_SFX_START +  76)
-#define HID_TOOLBOXCONFIG_LISTBOX        		    (HID_SFX_START +  77)
 #define HID_DESKTOP									(HID_SFX_START +  78)
 #define HID_EXPLORERTOOLSTOOLBOX        		    (HID_SFX_START +  79)
 #define HID_EXPLOREROBJECTTOOLBOX        		    (HID_SFX_START +  80)
@@ -121,8 +111,6 @@
 #define HID_ENVTOOLBOX   		     		    	(HID_SFX_START +  84)
 #define HID_FRAMESETEDIT_TOOLBOX  	 	     		(HID_SFX_START +  85)
 #define HID_NAVIGATOR_WINDOW						(HID_SFX_START +  86)
-#define HID_MACRO_GROUP								(HID_SFX_START +  87)
-#define HID_MACRO_MACROS							(HID_SFX_START +  88)
 #define HID_TABDLG_RESET_BTN						(HID_SFX_START +  89)
 #define HID_TABDLG_STANDARD_BTN						(HID_SFX_START +  90)
 #define HID_HELPAGENT_TIP_BOX   					(HID_SFX_START +  91)
@@ -271,8 +259,6 @@
 #define HID_FILEDLG_NEW_FAVORITE					(HID_SFX_START + 235)
 #define HID_FILEDLG_EDIT_FAVORITES_LISTBOX			(HID_SFX_START + 236)
 #define HID_FILEDLG_EDIT_FAVORITES_HEADERBAR		(HID_SFX_START + 237)
-#define HID_CONFIGFUNCTION_ACC_LISTBOX     		    (HID_SFX_START + 238)
-#define HID_CONFIGGROUP_ACC_LISTBOX        		    (HID_SFX_START + 239)
 #define HID_CNT_CB_FORCE_BODY_EXPORT				(HID_SFX_START + 240)
 #define HID_CNT_PAGE_REPSTATE_CONTROL				(HID_SFX_START + 241)
 #define HID_TASKSTATUSBAR							(HID_SFX_START + 242)
@@ -347,8 +333,6 @@
 #define	HID_CONFIG_SAVE								(HID_SFX_START + 310)
 
 #define HID_SEARCHDIALOG							(HID_SFX_START + 311)
-#define HID_MACRO_HEADERTABLISTBOX                  (HID_SFX_START + 312)
-#define HID_MACROCHECKDIALOG                        (HID_SFX_START + 313)
 
 #define HID_XMLSEC_WARNING_BROKENSIGNATURE          (HID_SFX_START + 314)
 #define HID_XMLSEC_QUERY_LOSINGSIGNATURE            (HID_SFX_START + 315)
diff --git a/sfx2/source/inc/macropg_impl.hxx b/sfx2/source/inc/macropg_impl.hxx
deleted file mode 100644
index 764ce1246b..0000000000
--- a/sfx2/source/inc/macropg_impl.hxx
+++ /dev/null
@@ -1,61 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: macropg_impl.hxx,v $
- * $Revision: 1.4 $
- *
- * 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 _MACROPG_IMPL_HXX
-#define _MACROPG_IMPL_HXX
-
-class _SfxMacroTabPage_Impl
-{
-public:
-    _SfxMacroTabPage_Impl( void );
-    ~_SfxMacroTabPage_Impl();
-
-    String							maStaticMacroLBLabel;
-    PushButton*						pAssignPB;
-    PushButton*						pDeletePB;
-    String*							pStrEvent;
-    String*							pAssignedMacro;
-    ListBox*						pScriptTypeLB;
-    _HeaderTabListBox*				pEventLB;
-    SfxConfigGroupListBox_Impl*		pGroupLB;
-    FixedText*						pFT_MacroLBLabel;
-    SfxConfigFunctionListBox_Impl*	pMacroLB;
-
-    FixedText*						pMacroFT;
-    String*							pMacroStr;
-    FNGetRangeHdl					fnGetRange;
-    FNGetMacrosOfRangeHdl			fnGetMacroOfRange;
-
-    BOOL							bReadOnly;
-    Timer                           maFillGroupTimer;
-};
-
-#endif
-