summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sfx2/inc/sfx2/app.hxx1
-rw-r--r--sfx2/inc/sfx2/evntconf.hxx2
-rw-r--r--sfx2/inc/sfx2/macrconf.hxx94
-rw-r--r--sfx2/source/appl/appbas.cxx1
-rw-r--r--sfx2/source/appl/appcfg.cxx8
-rw-r--r--sfx2/source/appl/appinit.cxx1
-rw-r--r--sfx2/source/appl/appquit.cxx3
-rw-r--r--sfx2/source/appl/appserv.cxx1
-rw-r--r--sfx2/source/config/evntconf.cxx1
-rw-r--r--sfx2/source/control/bindings.cxx1
-rwxr-xr-xsfx2/source/control/dispatch.cxx1
-rw-r--r--sfx2/source/control/macrconf.cxx342
-rw-r--r--sfx2/source/control/msgpool.cxx1
-rw-r--r--sfx2/source/control/shell.cxx1
-rw-r--r--sfx2/source/menu/mnuitem.cxx1
-rwxr-xr-xsfx2/source/menu/mnumgr.cxx1
-rw-r--r--sfx2/source/menu/virtmenu.cxx1
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx1
18 files changed, 12 insertions, 450 deletions
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 41345eac03e8..71105efdcd1d 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -218,7 +218,6 @@ public:
// members
SfxFilterMatcher& GetFilterMatcher();
- SfxMacroConfig* GetMacroConfig() const;
SfxProgress* GetProgress() const;
const String& GetLastSaveDirectory() const;
USHORT GetFreeIndex();
diff --git a/sfx2/inc/sfx2/evntconf.hxx b/sfx2/inc/sfx2/evntconf.hxx
index 17080ec2d51e..c2e296999bbe 100644
--- a/sfx2/inc/sfx2/evntconf.hxx
+++ b/sfx2/inc/sfx2/evntconf.hxx
@@ -45,8 +45,6 @@
#define ITEMID_MACRO SID_ATTR_MACROITEM
#include <svl/macitem.hxx>
-class SfxMacroInfo;
-class SfxMacroInfoArr_Impl;
class SfxEventConfigItem_Impl;
class SfxEventInfoArr_Impl;
class SfxObjectShell;
diff --git a/sfx2/inc/sfx2/macrconf.hxx b/sfx2/inc/sfx2/macrconf.hxx
index 84f5ffc612d3..abc0f0ad5d4d 100644
--- a/sfx2/inc/sfx2/macrconf.hxx
+++ b/sfx2/inc/sfx2/macrconf.hxx
@@ -31,107 +31,21 @@
#include "sfx2/dllapi.h"
#include "sal/types.h"
#include <tools/errcode.hxx>
-#define _SVSTDARR_USHORTS
-#include <svl/svstdarr.hxx> // SvUShorts
-#include <sfx2/evntconf.hxx>
-class SfxMacroInfo;
-class SfxSlot;
class SfxMacroInfoItem;
-class SfxObjectShell;
class BasicManager;
-struct SfxMacroConfig_Impl;
-class SbMethod;
class SbxValue;
class SbxObject;
class SbxArray;
-class SvStream;
-class SvxMacro;
-
-typedef SfxMacroInfo* SfxMacroInfoPtr;
-//#if 0 // _SOLAR__PRIVATE
-SV_DECL_PTRARR(SfxMacroInfoArr_Impl, SfxMacroInfoPtr, 5, 5)
-//#else
-//class SfxMacroInfoArr_Impl;
-//#endif
-
-class SFX2_DLLPUBLIC SfxMacroInfo
-{
-friend class SfxMacroConfig;
-friend class SfxEventConfiguration;
-
- String* pHelpText;
- sal_uInt16 nRefCnt;
- sal_Bool bAppBasic;
- String aLibName;
- String aModuleName;
- String aMethodName;
- sal_uInt16 nSlotId;
- SfxSlot* pSlot;
-
-public:
- SfxMacroInfo( const String& rURL );
- SfxMacroInfo( bool _bAppBasic = true );
- SfxMacroInfo( bool _bAppBasic, const String& rQualifiedName );
- SfxMacroInfo(SfxMacroInfo& rOther);
- SfxMacroInfo(bool _bAppBasic, const String& rLibName,
- const String& rModuleName, const String& rMethodName);
- ~SfxMacroInfo();
- sal_Bool operator==(const SfxMacroInfo& rOther) const;
- String GetMacroName() const;
- String GetQualifiedName() const;
- String GetFullQualifiedName() const;
- BasicManager* GetBasicManager() const;
- String GetBasicName() const;
- String GetHelpText() const;
- sal_Bool IsAppMacro() const
- { return bAppBasic; }
- const String& GetModuleName() const
- { return aModuleName; }
- const String& GetLibName() const
- { return aLibName; }
- const String& GetMethodName() const
- { return aMethodName; }
- sal_uInt16 GetSlotId() const
- { return nSlotId; }
- SfxSlot* GetSlot() const
- { return pSlot; }
-
- sal_Bool Compare( const SvxMacro& ) const;
- void SetHelpText( const String& rText );
- String GetURL() const;
-};
-
-//ASDBG obsolete >= 582
-//ASDBG class ::com::sun::star::uno::Reference< ::com::sun::star::script::XEngine > ;
-//ASDBG class ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ;
+class String;
class SFX2_DLLPUBLIC SfxMacroConfig
{
-friend class SfxEventConfiguration;
-
- SAL_DLLPRIVATE static SfxMacroConfig* pMacroConfig;
-
- SfxMacroConfig_Impl* pImp;
- SvUShorts aIdArray;
-
-public:
+private:
SfxMacroConfig();
~SfxMacroConfig();
-
- static SfxMacroConfig* GetOrCreate();
-
- static ErrCode Call( SbxObject*, const String&, BasicManager*,
- SbxArray *pArgs=NULL, SbxValue *pRet=NULL );
-//ASDBG obsolete >= 582
-//ASDBG static void CallStarScript( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XEngine > & rxEngine, const String & rCode,
-//ASDBG const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rSource, void *pArgs, void *pRet );
- SfxMacroInfo* GetMacroInfo(sal_uInt16 nId) const;
-
-//#if 0 // _SOLAR__PRIVATE
- SAL_DLLPRIVATE static void Release_Impl();
- DECL_DLLPRIVATE_LINK( EventHdl_Impl, SfxMacroInfo*);
-//#endif
+public:
+ static ErrCode Call( SbxObject*, const String&, BasicManager*, SbxArray *pArgs=NULL, SbxValue *pRet=NULL );
};
#endif
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index a37b93995edf..1c6ed552a657 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -73,7 +73,6 @@
#include "minfitem.hxx"
#include "app.hrc"
#include <sfx2/evntconf.hxx>
-#include <sfx2/macrconf.hxx>
#include <sfx2/request.hxx>
#include <sfx2/dinfdlg.hxx>
#include "appdata.hxx"
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 9b65639ef0dc..e6c43f413e44 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -88,7 +88,6 @@
#include <sfx2/evntconf.hxx>
#include "appdata.hxx"
#include "workwin.hxx"
-#include <sfx2/macrconf.hxx>
#include "helper.hxx" // SfxContentHelper::...
#include "app.hrc"
#include "sfxresid.hxx"
@@ -986,13 +985,6 @@ BOOL SfxApplication::SaveAll_Impl(BOOL bPrompt, BOOL bAutoSave)
}
//--------------------------------------------------------------------
-
-SfxMacroConfig* SfxApplication::GetMacroConfig() const
-{
- return SfxMacroConfig::GetOrCreate();
-}
-
-//--------------------------------------------------------------------
SfxEventConfiguration* SfxApplication::GetEventConfig() const
{
if (!pAppData_Impl->pEventConfig)
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 08023c5414a6..fbd30a9bf42d 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -77,7 +77,6 @@
#include <sfx2/docfac.hxx>
#include <sfx2/evntconf.hxx>
#include "intro.hxx"
-#include <sfx2/macrconf.hxx>
#include <sfx2/mnumgr.hxx>
#include <sfx2/msgpool.hxx>
#include <sfx2/progress.hxx>
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index 7399742d1e94..ba855a6013d4 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -44,6 +44,7 @@
#include "app.hrc"
#include <sfx2/app.hxx>
+#include <sfx2/evntconf.hxx>
#include <sfx2/unoctitm.hxx>
#include "appdata.hxx"
#include <sfx2/viewsh.hxx>
@@ -52,7 +53,6 @@
#include "arrdecl.hxx"
#include "sfxresid.hxx"
#include <sfx2/event.hxx>
-#include <sfx2/macrconf.hxx>
#include <sfx2/mnumgr.hxx>
#include <sfx2/templdlg.hxx>
#include <sfx2/msgpool.hxx>
@@ -150,7 +150,6 @@ void SfxApplication::Deinitialize()
DELETEX(pAppData_Impl->pSlotPool);
DELETEX(pAppData_Impl->pEventConfig);
- SfxMacroConfig::Release_Impl();
DELETEX(pAppData_Impl->pFactArr);
DELETEX(pAppData_Impl->pInitLinkList);
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 439396d2ffa7..5b2b9c3691ad 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -122,7 +122,6 @@
#include "arrdecl.hxx"
#include <sfx2/childwin.hxx>
#include "appdata.hxx"
-#include <sfx2/macrconf.hxx>
#include "minfitem.hxx"
#include <sfx2/event.hxx>
#include <sfx2/module.hxx>
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 9935c3a18c8b..f474bfb0838c 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -50,7 +50,6 @@
#include <sfx2/evntconf.hxx>
-#include <sfx2/macrconf.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index c5d47d8e96b2..cf04de2cb3a4 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -64,7 +64,6 @@
#include <sfx2/objface.hxx>
#include "sfxtypes.hxx"
#include "workwin.hxx"
-#include <sfx2/macrconf.hxx>
#include <sfx2/unoctitm.hxx>
#include <sfx2/sfx.hrc>
#include <sfx2/sfxuno.hxx>
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index dae0308d223e..0d55b4204de5 100755
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -69,7 +69,6 @@
#include "slotserv.hxx"
#include <sfx2/ipclient.hxx>
#include "sfxtypes.hxx"
-#include <sfx2/macrconf.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/childwin.hxx>
diff --git a/sfx2/source/control/macrconf.cxx b/sfx2/source/control/macrconf.cxx
index 45acbe857bf3..ca0f9213c10a 100644
--- a/sfx2/source/control/macrconf.cxx
+++ b/sfx2/source/control/macrconf.cxx
@@ -27,81 +27,16 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sfx2.hxx"
-#include <basic/sbstar.hxx>
-#include <basic/basmgr.hxx>
-#ifndef _SBX_HXX //autogen
-#include <basic/sbx.hxx>
-#endif
-#include <svl/intitem.hxx>
-#include <basic/sbmeth.hxx>
-#include <basic/sbmod.hxx>
-#ifndef _BASIC_SBUNO_HXX
-#include <basic/sbuno.hxx>
-#endif
-
-#include <osl/mutex.hxx>
-
-#include <com/sun/star/script/XEngine.hpp>
-#include <com/sun/star/document/MacroExecMode.hpp>
-#ifndef GCC
-#endif
+#include "sfx2/macrconf.hxx"
+#include "sfx2/app.hxx"
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
-#include <comphelper/processfactory.hxx>
-#endif
+#include <basic/sbmeth.hxx>
+#include <basic/sbmod.hxx>
+#include <basic/basmgr.hxx>
#include <unotools/intlwrapper.hxx>
-
-#include <sfx2/msgpool.hxx>
-#include <sfx2/macrconf.hxx>
-#include "sfxbasic.hxx"
-#include <sfx2/sfx.hrc>
-#include <sfx2/app.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/dispatch.hxx>
-#include "minfitem.hxx"
-#include "imgmgr.hxx"
-#include <sfx2/evntconf.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/genlink.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <appdata.hxx>
-#include "objshimp.hxx"
-#include <sfx2/request.hxx>
-
-static const sal_uInt16 nCompatVersion = 2;
-static const sal_uInt16 nVersion = 3;
-
-// Static member
-SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL;
-
-SfxMacroConfig* SfxMacroConfig::GetOrCreate()
-{
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if ( !pMacroConfig )
- pMacroConfig = new SfxMacroConfig;
- return pMacroConfig;
-}
-
-void SfxMacroConfig::Release_Impl()
-{
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- DELETEZ( pMacroConfig );
-}
-
-//==========================================================================
-
-struct SfxMacroConfig_Impl
-{
- SfxMacroInfoArr_Impl aArr;
- sal_uInt32 nEventId;
- sal_Bool bWaitingForCallback;
-
- SfxMacroConfig_Impl()
- : nEventId( 0 )
- , bWaitingForCallback( sal_False )
- {}
-};
+#include <comphelper/processfactory.hxx>
+#include <vcl/svapp.hxx>
//==========================================================================
@@ -154,269 +89,6 @@ SbMethod* SfxQueryMacro( BasicManager* pMgr , const String& rMacro )
//==========================================================================
-SfxMacroInfo::SfxMacroInfo( const String& rURL ) :
- pHelpText(0),
- nRefCnt(0),
- bAppBasic(TRUE),
- nSlotId(0),
- pSlot(0)
-{
- if ( rURL.CompareToAscii( "macro:", 6 ) == COMPARE_EQUAL )
- {
- String aTmp = rURL.Copy( 6 );
- if ( aTmp.GetTokenCount('/') > 3 )
- {
- // 'macro:///lib.mod.proc(args)' => Macro via App-BASIC-Mgr
- // 'macro://[docname|.]/lib.mod.proc(args)' => Macro via zugehoerigen Doc-BASIC-Mgr
- if ( aTmp.CompareToAscii("///", 3 ) != COMPARE_EQUAL )
- bAppBasic = FALSE;
- aTmp = rURL.GetToken( 3, '/' );
- if ( aTmp.GetTokenCount('.') == 3 )
- {
- aLibName = aTmp.GetToken( 0, '.' );
- aModuleName = aTmp.GetToken( 1, '.' );
- aMethodName = aTmp.GetToken( 2, '.' );
-
- // Remove arguments to be compatible
- aMethodName.SearchAndReplaceAscii( "()", String(), sal::static_int_cast< xub_StrLen >(std::max( aMethodName.Len()-2, 0 )));
- }
- }
-
- DBG_ASSERT( aLibName.Len() && aModuleName.Len() && aMethodName.Len(), "Wrong macro URL!" );
- }
- else
- aMethodName = rURL;
-}
-
-SfxMacroInfo::SfxMacroInfo( bool _bAppBasic ) :
- pHelpText(0),
- nRefCnt(0),
- bAppBasic(_bAppBasic),
- nSlotId(0),
- pSlot(0)
-{}
-
-//==========================================================================
-
-SfxMacroInfo::SfxMacroInfo(bool _bAppBasic, const String& rLibName,
- const String& rModuleName, const String& rMethodName) :
- pHelpText(0),
- nRefCnt(0),
- bAppBasic(_bAppBasic),
- aLibName(rLibName),
- aModuleName(rModuleName),
- aMethodName(rMethodName),
- nSlotId(0),
- pSlot(0)
-{
-}
-
-//==========================================================================
-
-SfxMacroInfo::SfxMacroInfo(bool _bAppBasic, const String& rQualifiedName )
-: pHelpText(0),
- nRefCnt(0),
- bAppBasic(_bAppBasic),
- nSlotId(0),
- pSlot(0)
-{
- sal_uInt16 nCount = rQualifiedName.GetTokenCount('.');
- aMethodName = rQualifiedName.GetToken( nCount-1, '.' );
- if ( nCount > 1 )
- aModuleName = rQualifiedName.GetToken( nCount-2, '.' );
- if ( nCount > 2 )
- aLibName = rQualifiedName.GetToken( 0, '.' );
-}
-
-//==========================================================================
-
-SfxMacroInfo::SfxMacroInfo(SfxMacroInfo& rOther) :
- pHelpText(0),
- nRefCnt(0),
- bAppBasic(rOther.bAppBasic),
- aLibName(rOther.aLibName),
- aModuleName(rOther.aModuleName),
- aMethodName(rOther.aMethodName),
- nSlotId(rOther.nSlotId),
- pSlot(0)
-{}
-
-//==========================================================================
-
-SfxMacroInfo::~SfxMacroInfo()
-{
- delete pSlot;
- delete pHelpText;
-}
-
-//==========================================================================
-
-sal_Bool SfxMacroInfo::operator==(const SfxMacroInfo& rOther) const
-{
- if ( GetQualifiedName() == rOther.GetQualifiedName() &&
- bAppBasic == rOther.bAppBasic )
- return sal_True;
- else
- return sal_False;
-}
-
-//==========================================================================
-
-String SfxMacroInfo::GetMacroName() const
-{
- String aMacroName = aMethodName;
- aMacroName += '(';
- aMacroName += aLibName;
- aMacroName += '.';
- aMacroName += aModuleName;
- aMacroName += ')';
- return aMacroName;
-}
-
-//==========================================================================
-
-String SfxMacroInfo::GetQualifiedName() const
-{
- String aMacroName;
- if( aMacroName.Len() || aLibName.Len() )
- {
- // Altes Format
- aMacroName = aLibName;
- aMacroName += '.';
- aMacroName += aModuleName;
- aMacroName += '.';
- }
-
- // Wg. ::com::sun::star::script::JavaScript kein Zerlegen des Strings mehr
- aMacroName += aMethodName;
- return aMacroName;
-}
-
-String SfxMacroInfo::GetFullQualifiedName() const
-{
- // Liefert nur Unsinn, wenn f"ur ein ::com::sun::star::script::JavaScript aufgerufen !
- String aRet;
- if ( bAppBasic )
- aRet = SFX_APP()->GetName();
- aRet += '.';
- aRet += GetQualifiedName();
- return aRet;
-}
-
-String SfxMacroInfo::GetURL() const
-{
- if ( !aLibName.Len() )
- return aMethodName;
-
- // 'macro:///lib.mod.proc(args)' => Macro via App-BASIC-Mgr
- // 'macro://[docname|.]/lib.mod.proc(args)' => Macro via zugehoerigen Doc-BASIC-Mgr
- // 'macro://obj.method(args)' => Object via App-BASIC-Mgr
- String aURL( String::CreateFromAscii("macro://") );
- if ( !bAppBasic )
- aURL += '.';
- aURL += '/';
- aURL += aLibName;
- aURL += '.';
- aURL += aModuleName;
- aURL += '.';
- aURL += aMethodName;
- aURL += String::CreateFromAscii("()");
-
- return aURL;
-}
-
-//==========================================================================
-
-BasicManager* SfxMacroInfo::GetBasicManager() const
-{
- if (bAppBasic)
- {
- return SFX_APP()->GetBasicManager();
- }
- else
- {
- SfxObjectShell *pCurrDocShell = SfxObjectShell::Current();
- return pCurrDocShell ? pCurrDocShell->GetBasicManager() :
- SFX_APP()->GetBasicManager();
- }
-}
-
-//==========================================================================
-
-String SfxMacroInfo::GetBasicName() const
-{
- if (bAppBasic)
- {
- return SFX_APP()->GetName();
- }
- else
- {
- SfxObjectShell *pCurrDocShell = SfxObjectShell::Current();
- if ( pCurrDocShell )
- return pCurrDocShell->GetTitle();
- else
- return SFX_APP()->GetName();
- }
-}
-
-String SfxMacroInfo::GetHelpText() const
-{
- if ( pHelpText )
- return *pHelpText;
- return String();
-}
-
-void SfxMacroInfo::SetHelpText( const String& rName )
-{
- if ( !pHelpText )
- pHelpText = new String;
- *pHelpText = rName;
-}
-
-sal_Bool SfxMacroInfo::Compare( const SvxMacro& rMacro ) const
-{
- String aName = rMacro.GetLibName();
- aName += '.';
- aName += rMacro.GetMacName();
- if ( GetFullQualifiedName() == aName )
- return sal_True;
- return sal_False;
-}
-
-//==========================================================================
-
-SfxMacroConfig::SfxMacroConfig()
-{
- pImp = new SfxMacroConfig_Impl;
-}
-
-//==========================================================================
-
-SfxMacroConfig::~SfxMacroConfig()
-{
- if ( pImp->nEventId )
- Application::RemoveUserEvent( pImp->nEventId );
- delete pImp;
-}
-//==========================================================================
-
-SfxMacroInfo* SfxMacroConfig::GetMacroInfo(sal_uInt16 nId) const
-{
- sal_uInt16 nCount = pImp->aArr.Count();
- for (sal_uInt16 i=0; i<nCount; i++)
- if ((pImp->aArr)[i]->nSlotId == nId)
- return (pImp->aArr)[i];
-
- return 0;
-}
-
-IMPL_LINK( SfxMacroConfig, EventHdl_Impl, SfxMacroInfo*, pInfo )
-{
- delete pInfo;
- pImp->nEventId = 0;
- return 0;
-}
-
ErrCode SfxMacroConfig::Call(
SbxObject* /*pVCtrl*/,
const String& rCode,
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index f1abd25a5413..f9cd25331329 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -40,7 +40,6 @@
#include <sfx2/app.hxx>
#include <sfx2/objface.hxx>
#include "sfxtypes.hxx"
-#include <sfx2/macrconf.hxx>
#include "sfxresid.hxx"
#include "arrdecl.hxx"
#include <sfx2/module.hxx>
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 2d0a63fe42df..55486c39f53a 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -55,7 +55,6 @@
#include <sfx2/request.hxx>
#include <sfx2/mnumgr.hxx>
#include "statcach.hxx"
-#include <sfx2/macrconf.hxx>
#include <sfx2/msgpool.hxx>
//====================================================================
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index df32aaf85f7f..6c62bc1fa88f 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -64,7 +64,6 @@
#include <sfx2/dispatch.hxx>
#include "idpool.hxx"
#include "sfxtypes.hxx"
-#include <sfx2/macrconf.hxx>
#include "virtmenu.hxx"
#include <sfx2/mnuitem.hxx>
#include <sfx2/tbxctrl.hxx>
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index b3e5717dd7b6..dfad7e1a7132 100755
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -77,7 +77,6 @@
#include <sfx2/bindings.hxx>
#include "mnucfga.hxx"
#include "sfxresid.hxx"
-#include <sfx2/macrconf.hxx>
#include <sfx2/msgpool.hxx>
#include <sfx2/sfx.hrc>
#include "menu.hrc"
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 080031d588ac..fd8da1c11e8a 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -59,7 +59,6 @@
#include <sfx2/sfx.hrc>
#include <sfx2/viewsh.hxx>
#include "sfxpicklist.hxx"
-#include <sfx2/macrconf.hxx>
#include "sfxresid.hxx"
#include "menu.hrc"
#include "imagemgr.hxx"
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index f5b38d5a8a18..dc4527665471 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -90,7 +90,6 @@
#include <sfx2/viewfrm.hxx>
#include "arrdecl.hxx"
#include "sfxtypes.hxx"
-#include <sfx2/macrconf.hxx>
#include <sfx2/genlink.hxx>
#include "sfxresid.hxx"
#include <sfx2/sfx.hrc>
generated by cgit (git 2.34.1) at 2024-08-17 21:00:41 +0000