cleanup double includes and declarations

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

configmgr/qa/unit/test.cxx

@@ -57,7 +57,6 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/configuration.hxx>
 #include <comphelper/configurationlistener.hxx>
-#include <comphelper/configurationlistener.hxx>
 #include <unotest/bootstrapfixturebase.hxx>
 #include <officecfg/Office/Math.hxx>
 

filter/source/msfilter/eschesdo.hxx

@@ -28,7 +28,6 @@
 
 enum ImplEESdrPageType { NORMAL = 0, MASTER = 1, NOTICE = 2, UNDEFINED = 3 };
 
-class ImplEESdrWriter;
 class ImplEESdrWriter;
 class SdrObject;
 class SdrPage;

include/sfx2/app.hxx

@@ -57,6 +57,7 @@ class SfxMenuCtrlFactArr_Impl;
 class SfxNewFileDialog;
 class SfxObjectShell;
 class SfxObjectShellArr_Impl;
+class SfxObjectShellLock;
 class SfxProgress;
 class SfxSlotPool;
 class SfxStbCtrlFactArr_Impl;
@@ -69,7 +70,6 @@ class StarBASIC;
 class SfxWorkWindow;
 class SfxFilterMatcher;
 class SfxModule;
-class SfxModule;
 namespace vcl { class Window; }
 struct SfxChildWinFactory;
 struct SfxStbCtrlFactory;
@@ -112,8 +112,6 @@ public:
                              GetValue() const { return aLink; }
 };
 
-class SfxObjectShellLock;
-
 class SFX2_DLLPUBLIC SfxApplication: public SfxShell
 {
     std::unique_ptr<SfxAppData_Impl>            pImpl;

include/sfx2/templatedlg.hxx

@@ -25,7 +25,6 @@
 class Edit;
 class PopupMenu;
 class TemplateLocalView;
-class TemplateLocalView;
 class TemplateSearchView;
 class ThumbnailView;
 class ThumbnailViewItem;

include/svx/unomod.hxx

@@ -27,7 +27,6 @@
 
 class SdrHint;
 class SdrModel;
-class SdrModel;
 
 SVX_DLLPUBLIC css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule( SdrModel* pModel ) throw();
 

include/unotools/defaultoptions.hxx

@@ -26,7 +26,6 @@
 
 class SvtDefaultOptions_Impl;
 
-class SvtDefaultOptions_Impl;
 class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtDefaultOptions : public utl::detail::Options
 {
 private:

include/vcl/textview.hxx

@@ -42,11 +42,7 @@ struct TextDDInfo;
 namespace com { namespace sun { namespace star {
     namespace datatransfer { namespace clipboard {
         class XClipboard;
-    } }
-    namespace util {
-        struct SearchOptions;
-    }
-}}}
+}}}}}
 namespace i18nutil {
     struct SearchOptions;
 }

sal/osl/w32/path_helper.hxx

@@ -22,7 +22,6 @@
 
 #include <sal/config.h>
 
-#include <osl/diagnose.h>
 #include <osl/diagnose.h>
 #include <osl/file.h>
 #include <rtl/alloc.h>

sc/inc/grouparealistener.hxx

@@ -14,7 +14,6 @@
 #include <calcmacros.hxx>
 
 #include <svl/listener.hxx>
-#include <vector>
 
 #include <vector>
 

sc/inc/table.hxx

@@ -110,7 +110,6 @@ class ScFlatBoolRowSegments;
 class ScFlatBoolColSegments;
 struct ScSetStringParam;
 struct ScColWidthParam;
-struct ScColWidthParam;
 class ScRangeName;
 class ScDBData;
 class ScDocumentImport;

sc/source/filter/inc/xcl97rec.hxx

@@ -28,6 +28,8 @@
 class XclObj;
 class XclExpMsoDrawing;
 class SdrCaptionObj;
+class SdrTextObj;
+class XclTxo;
 
 class XclExpObjList : public ExcEmptyRec, protected XclExpRoot
 {
@@ -83,9 +85,6 @@ private:
 
 // --- class XclObj --------------------------------------------------
 
-class XclTxo;
-class SdrTextObj;
-
 class XclObj : public XclExpRecord
 {
 protected:
@@ -194,8 +193,6 @@ public:
 
 // --- class XclTxo --------------------------------------------------
 
-class SdrTextObj;
-
 class XclTxo : public ExcRecord
 {
 public:

sc/source/ui/inc/undotab.hxx

@@ -25,8 +25,6 @@
 #include <tools/color.hxx>
 #include "tabbgcolor.hxx"
 
-#include <memory>
-
 #include <memory>
 #include <vector>
 

sd/source/ui/dlg/sddlgfact.hxx

@@ -91,7 +91,6 @@ class SdAbstractTabDialog_Impl : public SfxAbstractTabDialog
     virtual OUString    GetText() const override;
 };
 
-class SfxTabDialog;
 class AbstractBulletDialog_Impl : public SfxAbstractTabDialog
 {
     DECL_ABSTDLG_BASE( AbstractBulletDialog_Impl,SfxTabDialog )

sfx2/source/inc/appdata.hxx

@@ -49,7 +49,6 @@ class SfxFrameArr_Impl;
 class SvtSaveOptions;
 class SvtHelpOptions;
 class ResMgr;
-class ResMgr;
 class SfxViewFrame;
 class SfxSlotPool;
 class SfxDispatcher;

svl/source/notify/SfxBroadcaster.cxx

@@ -19,7 +19,6 @@
 
 #include <svl/SfxBroadcaster.hxx>
 
-#include <svl/hint.hxx>
 #include <svl/hint.hxx>
 #include <svl/lstner.hxx>
 #include <tools/debug.hxx>

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

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;

ucb/source/ucp/webdav-neon/ContentProperties.hxx

@@ -75,8 +75,6 @@ typedef std::unordered_map
 >
 PropertyValueMap;
 
-struct DAVResource;
-
 class ContentProperties
 {
 public:

ucb/source/ucp/webdav/ContentProperties.hxx

@@ -66,8 +66,6 @@ typedef std::unordered_map
 >
 PropertyValueMap;
 
-struct DAVResource;
-
 class ContentProperties
 {
 public:

writerfilter/source/rtftok/rtfdocumentimpl.hxx

@@ -34,6 +34,12 @@ namespace writerfilter
 {
 namespace rtftok
 {
+class RTFParserState;
+class RTFDocumentImpl;
+class RTFTokenizer;
+class RTFSdrImport;
+struct TableRowBuffer;
+
 enum class RTFBorderState
 {
     NONE,
@@ -88,8 +94,6 @@ enum class RTFFieldStatus
     RESULT
 };
 
-struct TableRowBuffer;
-
 /// A buffer storing dmapper calls.
 typedef std::tuple<RTFBufferTypes, RTFValue::Pointer_t,
         std::shared_ptr<TableRowBuffer> > Buf_t;
@@ -183,9 +187,6 @@ public:
     RTFBmpStyle eStyle;
 };
 
-class RTFParserState;
-class RTFDocumentImpl;
-
 /// Stores the properties of a frame
 class RTFFrame
 {
@@ -209,8 +210,6 @@ public:
     bool inFrame();
 };
 
-class RTFDocumentImpl;
-
 /// State of the parser, which gets saved / restored when changing groups.
 class RTFParserState
 {
@@ -372,9 +371,6 @@ bool findPropertyName(const std::vector<css::beans::PropertyValue>& rProperties,
 RTFSprms& getLastAttributes(RTFSprms& rSprms, Id nId);
 OString DTTM22OString(long nDTTM);
 
-class RTFTokenizer;
-class RTFSdrImport;
-
 /// Implementation of the RTFDocument interface.
 class RTFDocumentImpl
     : public RTFDocument, public RTFListener