cleanup double includes and declarations

Change-Id: I770e09f48b1a3e8299f59a8e475ba3c18d436d7b
Reviewed-on: https://gerrit.libreoffice.org/35312
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>

2 files changed, 11 insertions, 20 deletions

diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx
index 2482b4636763..9aeaeebafdb6 100644
--- a/sw/source/filter/ww8/ww8toolbar.hxx
+++ b/sw/source/filter/ww8/ww8toolbar.hxx
@@ -13,6 +13,10 @@
 #include <filter/msfilter/mstoolbar.hxx>
 #include <memory>
 
+
+class SfxObjectShell;
+class SwCTBWrapper;
+
 class Xst : public TBBase
 {
     OUString sString;
@@ -26,8 +30,6 @@ public:
 #endif
 };
 
-class SwCTBWrapper;
-
 class SwTBC : public TBBase
 {
     TBCHeader tbch;
@@ -112,8 +114,6 @@ public:
     bool Read(SvStream &rS) override;
 };
 
-class SwCTBWrapper;
-
 class Customization : public TBBase
 {
     friend class SwCTBWrapper;
@@ -138,8 +138,6 @@ public:
     SwCTB*  GetCustomizationData() { return customizationDataCTB.get(); };
 };
 
-class SfxObjectShell;
-
 class SwCTBWrapper : public Tcg255SubStruct
 {
     // reserved1 is the ch field of Tcg255SubStruct
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx
index 99cf8565515f..9cae57f12c9c 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -40,8 +40,14 @@
 #include <cnttab.hxx>
 #include <vector>
 
+class IndexEntryResource;
+class IndexEntrySupplierWrapper;
+class SwTOXEdit;
+class SwTOXButton;
+class SwTOXEntryTabPage;
+class SwOneExampleFrame;
 class SwWrtShell;
-class SwTOXMgr;
+
 namespace com{namespace sun{namespace star{
     namespace text{
         class XTextSection;
@@ -55,10 +61,6 @@ struct SwIndexSections_Impl
     css::uno::Reference< css::text::XDocumentIndex >    xDocumentIndex;
 };
 
-class SwOneExampleFrame;
-
-struct SwIndexSections_Impl;
-
 class SwMultiTOXTabDialog : public SfxTabDialog
 {
     VclPtr<vcl::Window>     m_pExampleContainerWIN;
@@ -125,9 +127,6 @@ public:
     static bool IsNoNum(SwWrtShell& rSh, const OUString& rName);
 };
 
-class IndexEntryResource;
-class IndexEntrySupplierWrapper;
-
 class SwTOXSelectTabPage : public SfxTabPage
 {
     VclPtr<Edit>           m_pTitleED;
@@ -237,10 +236,6 @@ public:
     void                SetWrtShell(SwWrtShell& rSh);
 };
 
-class SwTOXEdit;
-class SwTOXButton;
-class SwTOXEntryTabPage;
-
 class SwTokenWindow : public VclHBox, public VclBuilderContainer
 {
     typedef std::vector<VclPtr<Control> >::iterator ctrl_iterator;
@@ -321,8 +316,6 @@ private:
     sal_uInt32 GetControlIndex(FormTokenType eType) const;
 };
 
-class SwTOXEntryTabPage;
-
 class SwIdxTreeListBox : public SvTreeListBox
 {
     VclPtr<SwTOXEntryTabPage> pParent;