From d1ba5419cf9f75fe437b835e49d3b75459dd48c2 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Mon, 6 Aug 2012 16:26:32 +0200 Subject: Remove non-existing forward declarations Those classes don't exist. So remove friend class operators too. Change-Id: I8e3b32db933dea7cbab86015f0c926df967511f6 --- sfx2/inc/sfx2/app.hxx | 2 -- sfx2/inc/sfx2/bindings.hxx | 2 -- sfx2/inc/sfx2/fcontnr.hxx | 1 - sfx2/inc/sfx2/frame.hxx | 2 -- sfx2/inc/sfx2/frmhtml.hxx | 4 ---- sfx2/inc/sfx2/frmhtmlw.hxx | 1 - sfx2/inc/sfx2/objface.hxx | 1 - sfx2/inc/sfx2/objsh.hxx | 2 -- sfx2/inc/sfx2/progress.hxx | 2 -- sfx2/inc/sfx2/request.hxx | 1 - sfx2/inc/sfx2/shell.hxx | 1 - sfx2/inc/sfx2/tabdlg.hxx | 1 - sfx2/inc/sfx2/tbxctrl.hxx | 4 ---- sfx2/inc/sfx2/viewfrm.hxx | 1 - sfx2/inc/sfx2/viewsh.hxx | 2 -- sfx2/source/inc/workwin.hxx | 1 - 16 files changed, 28 deletions(-) (limited to 'sfx2') diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx index 8f049387b9f2..37111a8c129e 100644 --- a/sfx2/inc/sfx2/app.hxx +++ b/sfx2/inc/sfx2/app.hxx @@ -59,13 +59,11 @@ class SfxDispatcher; class SfxEventConfiguration; class SfxEventHint; class SfxItemSet; -class SfxMacroConfig; class SfxMedium; class SfxMenuCtrlFactArr_Impl; class SfxNewFileDialog; class SfxObjectShell; class SfxObjectShellArr_Impl; -class SfxOptions; class SfxProgress; class SfxResourceManager; class SfxSlotPool; diff --git a/sfx2/inc/sfx2/bindings.hxx b/sfx2/inc/sfx2/bindings.hxx index ae3795f6042f..c32a6b2ea0d7 100644 --- a/sfx2/inc/sfx2/bindings.hxx +++ b/sfx2/inc/sfx2/bindings.hxx @@ -41,9 +41,7 @@ // forwards, typedefs, declarations //________________________________________________________________________________________________________________ -class SfxConfigManager; class SystemWindow; -class SfxArg; class SfxSlot; class SfxSlotServer; class SfxControllerItem; diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/sfx2/inc/sfx2/fcontnr.hxx index bbccde13cfde..37a5777a2780 100644 --- a/sfx2/inc/sfx2/fcontnr.hxx +++ b/sfx2/inc/sfx2/fcontnr.hxx @@ -37,7 +37,6 @@ class Window; class SfxFilter; -class SfxObjectFacArr_Impl; class SfxObjectFactory; class SfxMedium; class SfxFilterContainer_Impl; diff --git a/sfx2/inc/sfx2/frame.hxx b/sfx2/inc/sfx2/frame.hxx index cead8659a931..c2af0063d795 100644 --- a/sfx2/inc/sfx2/frame.hxx +++ b/sfx2/inc/sfx2/frame.hxx @@ -72,7 +72,6 @@ class SfxViewFrame; class SfxFrameDescriptor; class SfxFrameSetDescriptor; class SfxMedium; -class SfxFrameHistory_Impl; class SfxDispatcher; class SfxMedium; class Rectangle; @@ -229,7 +228,6 @@ public: //-------------------------------------------------------------------- -class SfxFrameItem_Impl; class SFX2_DLLPUBLIC SfxFrameItem: public SfxPoolItem { SfxFrame* pFrame; diff --git a/sfx2/inc/sfx2/frmhtml.hxx b/sfx2/inc/sfx2/frmhtml.hxx index 7801bbb81ea4..d1eb1c4054c0 100644 --- a/sfx2/inc/sfx2/frmhtml.hxx +++ b/sfx2/inc/sfx2/frmhtml.hxx @@ -27,15 +27,11 @@ #include class SfxFrameHTMLParser; -class _SfxFrameHTMLContexts; -class SfxFrameSetObjectShell; class SfxMedium; namespace svtools { class AsynchronLink; } class SFX2_DLLPUBLIC SfxFrameHTMLParser : public SfxHTMLParser { - friend class _SfxFrameHTMLContext; - protected: SfxFrameHTMLParser( SvStream& rStream, sal_Bool bIsNewDoc=sal_True, SfxMedium *pMediumPtr=0 ): SfxHTMLParser( rStream, bIsNewDoc, pMediumPtr ) {}; diff --git a/sfx2/inc/sfx2/frmhtmlw.hxx b/sfx2/inc/sfx2/frmhtmlw.hxx index e0fe6645f0dd..ba4f7f984a57 100644 --- a/sfx2/inc/sfx2/frmhtmlw.hxx +++ b/sfx2/inc/sfx2/frmhtmlw.hxx @@ -31,7 +31,6 @@ #include #include -class SfxFrameSetObjectShell; class SfxFrame; namespace com { namespace sun { namespace star { diff --git a/sfx2/inc/sfx2/objface.hxx b/sfx2/inc/sfx2/objface.hxx index fb8168b9e132..e968c7d8db23 100644 --- a/sfx2/inc/sfx2/objface.hxx +++ b/sfx2/inc/sfx2/objface.hxx @@ -32,7 +32,6 @@ struct SfxFormalArgument; struct SfxTypeLibImpl; struct SfxInterface_Impl; -class SfxConfigManager; class SfxConfigItem; class SfxIFConfig_Impl; class SfxObjectUIArr_Impl ; diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx index 29710c659349..7426d7a254b1 100644 --- a/sfx2/inc/sfx2/objsh.hxx +++ b/sfx2/inc/sfx2/objsh.hxx @@ -64,13 +64,11 @@ class INote; class SfxStyleSheetPool; class SfxFrame; class SbMethod; -class SfxConfigManager; class StarBASIC; class Printer; class SvKeyValueIterator; class SfxBaseModel; class SfxModule; -class SvPseudoObject; class SvData; class SfxProgress; class GDIMetaFile; diff --git a/sfx2/inc/sfx2/progress.hxx b/sfx2/inc/sfx2/progress.hxx index 600d15bbb74c..124e2293e01f 100644 --- a/sfx2/inc/sfx2/progress.hxx +++ b/sfx2/inc/sfx2/progress.hxx @@ -27,8 +27,6 @@ class String; class SfxObjectShell; -class SfxStatusBarManager; -class INetHint; struct SfxProgress_Impl; struct PlugInLoadStatus; struct SvProgressArg; diff --git a/sfx2/inc/sfx2/request.hxx b/sfx2/inc/sfx2/request.hxx index 94da4f212d52..590fd7bffeaf 100644 --- a/sfx2/inc/sfx2/request.hxx +++ b/sfx2/inc/sfx2/request.hxx @@ -35,7 +35,6 @@ class SfxItemSet; class SfxItemPool; class SfxShell; class SfxSlot; -class SfxArguments; class String; class SfxViewFrame; struct SfxRequest_Impl; diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx index 186f3cab2627..8deee3145c3a 100644 --- a/sfx2/inc/sfx2/shell.hxx +++ b/sfx2/inc/sfx2/shell.hxx @@ -51,7 +51,6 @@ class SfxShell; struct SfxShell_Impl; struct SfxTypeLibImpl; class SfxShellObject; -class SfxShellSubObject; class SfxDispatcher; class SfxViewFrame; class SfxSlot; diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx index 0644a51a9c82..9d86b92b5f22 100644 --- a/sfx2/inc/sfx2/tabdlg.hxx +++ b/sfx2/inc/sfx2/tabdlg.hxx @@ -39,7 +39,6 @@ class SfxBindings; typedef SfxTabPage* (*CreateTabPage)(Window *pParent, const SfxItemSet &rAttrSet); typedef sal_uInt16* (*GetTabPageRanges)(); // provides international Which-value struct TabPageImpl; -class SfxUs_Impl; struct TabDlg_Impl; diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx index 312e0b082d88..e8a11c434f67 100644 --- a/sfx2/inc/sfx2/tbxctrl.hxx +++ b/sfx2/inc/sfx2/tbxctrl.hxx @@ -39,7 +39,6 @@ //------------------------------------------------------------------ -class SfxUnoToolBoxControl; class SfxToolBoxControl; class SfxBindings; class SfxModule; @@ -102,7 +101,6 @@ class SfxFrameStatusListener : public svt::FrameStatusListener class SFX2_DLLPUBLIC SfxPopupWindow: public FloatingWindow, public SfxStatusListenerInterface { -friend class SfxToolBox_Impl; sal_Bool m_bFloating; sal_uIntPtr m_nEventId; sal_Bool m_bCascading; @@ -184,8 +182,6 @@ class SFX2_DLLPUBLIC SfxToolBoxControl: { friend class SfxToolbox; -friend class SfxToolBox_Impl; -friend class SfxToolboxCustomizer; friend class SfxPopupWindow; friend struct SfxTbxCtrlFactory; diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx index b49f5d9fb040..ce8622e0d6a8 100644 --- a/sfx2/inc/sfx2/viewfrm.hxx +++ b/sfx2/inc/sfx2/viewfrm.hxx @@ -41,7 +41,6 @@ class SfxBindings; class SfxProgress; class SvData; class SfxViewShell; -class SvPseudoObject; class SystemWindow; class Fraction; class Point; diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx index a27fe2fa8d11..ff42068596ff 100644 --- a/sfx2/inc/sfx2/viewsh.hxx +++ b/sfx2/inc/sfx2/viewsh.hxx @@ -51,7 +51,6 @@ class SfxModule; class SfxViewFrame; class SfxItemPool; class SfxTabPage; -class SfxPrintMonitor; class SfxFrameSetDescriptor; class Printer; class SfxPrinter; @@ -130,7 +129,6 @@ class SFX2_DLLPUBLIC SfxViewShell: public SfxShell, public SfxListener { #ifdef _SFXVIEWSH_HXX friend class SfxViewFrame; -friend class SfxPlugInFrame; friend class SfxBaseController; friend class SfxPrinterController; #endif diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index 4f17bacae614..4bb52fa0c8bd 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -216,7 +216,6 @@ class LayoutManagerListener : public ::com::sun::star::frame::XLayoutManagerList class SfxWorkWindow { - friend class UIElementWrapper; friend class LayoutManagerListener; protected: -- cgit