[Libreoffice-commits] core.git: configmgr/qa filter/source include/sfx2 include/svx include/unotools include/vcl sal/osl sc/inc sc/source sd/source sfx2/source svl/source sw/source ucb/source writerfilter/source
Jochen Nitschke
j.nitschke+logerrit at ok.de
Fri Mar 17 11:01:47 UTC 2017
configmgr/qa/unit/test.cxx | 1 -
filter/source/msfilter/eschesdo.hxx | 1 -
include/sfx2/app.hxx | 4 +---
include/sfx2/templatedlg.hxx | 1 -
include/svx/unomod.hxx | 1 -
include/unotools/defaultoptions.hxx | 1 -
include/vcl/textview.hxx | 6 +-----
sal/osl/w32/path_helper.hxx | 1 -
sc/inc/grouparealistener.hxx | 1 -
sc/inc/table.hxx | 1 -
sc/source/filter/inc/xcl97rec.hxx | 7 ++-----
sc/source/ui/inc/undotab.hxx | 2 --
sd/source/ui/dlg/sddlgfact.hxx | 1 -
sfx2/source/inc/appdata.hxx | 1 -
svl/source/notify/SfxBroadcaster.cxx | 1 -
sw/source/filter/ww8/ww8toolbar.hxx | 10 ++++------
sw/source/uibase/inc/swuicnttab.hxx | 21 +++++++--------------
ucb/source/ucp/webdav-neon/ContentProperties.hxx | 2 --
ucb/source/ucp/webdav/ContentProperties.hxx | 2 --
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 16 ++++++----------
20 files changed, 21 insertions(+), 60 deletions(-)
New commits:
commit c68ac77770a642b89cbc7a5ecbb4ccb41fd53f57
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date: Fri Mar 17 09:18:59 2017 +0100
cleanup double includes and declarations
Change-Id: I770e09f48b1a3e8299f59a8e475ba3c18d436d7b
Reviewed-on: https://gerrit.libreoffice.org/35312
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index d5de3e732a26..f9d7df883810 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/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>
diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx
index 16815a732a85..0a9fbc7144d3 100644
--- a/filter/source/msfilter/eschesdo.hxx
+++ b/filter/source/msfilter/eschesdo.hxx
@@ -29,7 +29,6 @@
enum ImplEESdrPageType { NORMAL = 0, MASTER = 1, NOTICE = 2, UNDEFINED = 3 };
class ImplEESdrWriter;
-class ImplEESdrWriter;
class SdrObject;
class SdrPage;
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 315e3aeaa767..5798c07d3de2 100644
--- a/include/sfx2/app.hxx
+++ b/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;
diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx
index 8e0473df1825..40d735d8231b 100644
--- a/include/sfx2/templatedlg.hxx
+++ b/include/sfx2/templatedlg.hxx
@@ -25,7 +25,6 @@
class Edit;
class PopupMenu;
class TemplateLocalView;
-class TemplateLocalView;
class TemplateSearchView;
class ThumbnailView;
class ThumbnailViewItem;
diff --git a/include/svx/unomod.hxx b/include/svx/unomod.hxx
index 7e727802e5dc..e139035396c3 100644
--- a/include/svx/unomod.hxx
+++ b/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();
diff --git a/include/unotools/defaultoptions.hxx b/include/unotools/defaultoptions.hxx
index a849906529cd..5aff22d4f3b3 100644
--- a/include/unotools/defaultoptions.hxx
+++ b/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:
diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx
index 435295d177fe..61f59be6a41c 100644
--- a/include/vcl/textview.hxx
+++ b/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;
}
diff --git a/sal/osl/w32/path_helper.hxx b/sal/osl/w32/path_helper.hxx
index 6ab07bf918f1..78a4b2dd4776 100644
--- a/sal/osl/w32/path_helper.hxx
+++ b/sal/osl/w32/path_helper.hxx
@@ -23,7 +23,6 @@
#include <sal/config.h>
#include <osl/diagnose.h>
-#include <osl/diagnose.h>
#include <osl/file.h>
#include <rtl/alloc.h>
#include <rtl/ustring.h>
diff --git a/sc/inc/grouparealistener.hxx b/sc/inc/grouparealistener.hxx
index 138375458165..5fc498b22489 100644
--- a/sc/inc/grouparealistener.hxx
+++ b/sc/inc/grouparealistener.hxx
@@ -14,7 +14,6 @@
#include <calcmacros.hxx>
#include <svl/listener.hxx>
-#include <vector>
#include <vector>
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 12517c6014e3..7addb6d6bf89 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -110,7 +110,6 @@ class ScFlatBoolRowSegments;
class ScFlatBoolColSegments;
struct ScSetStringParam;
struct ScColWidthParam;
-struct ScColWidthParam;
class ScRangeName;
class ScDBData;
class ScDocumentImport;
diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx
index 3d7bc09e5d3c..1782b4d80450 100644
--- a/sc/source/filter/inc/xcl97rec.hxx
+++ b/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:
diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx
index 662dd0358c1b..5585e2d3e9b8 100644
--- a/sc/source/ui/inc/undotab.hxx
+++ b/sc/source/ui/inc/undotab.hxx
@@ -26,8 +26,6 @@
#include "tabbgcolor.hxx"
#include <memory>
-
-#include <memory>
#include <vector>
class ScDocShell;
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index 5eb076b09b11..87c245b601c7 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/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 )
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index 29b6bfd1c9db..4adc6d6cfcb5 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/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;
diff --git a/svl/source/notify/SfxBroadcaster.cxx b/svl/source/notify/SfxBroadcaster.cxx
index 089628112b71..82a16d180211 100644
--- a/svl/source/notify/SfxBroadcaster.cxx
+++ b/svl/source/notify/SfxBroadcaster.cxx
@@ -20,7 +20,6 @@
#include <svl/SfxBroadcaster.hxx>
#include <svl/hint.hxx>
-#include <svl/hint.hxx>
#include <svl/lstner.hxx>
#include <tools/debug.hxx>
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;
diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.hxx b/ucb/source/ucp/webdav-neon/ContentProperties.hxx
index 3150f85ddff2..ffab2655bbbd 100644
--- a/ucb/source/ucp/webdav-neon/ContentProperties.hxx
+++ b/ucb/source/ucp/webdav-neon/ContentProperties.hxx
@@ -75,8 +75,6 @@ typedef std::unordered_map
>
PropertyValueMap;
-struct DAVResource;
-
class ContentProperties
{
public:
diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav/ContentProperties.hxx
index 5092a4f0be28..c76dcf5d2cd4 100644
--- a/ucb/source/ucp/webdav/ContentProperties.hxx
+++ b/ucb/source/ucp/webdav/ContentProperties.hxx
@@ -66,8 +66,6 @@ typedef std::unordered_map
>
PropertyValueMap;
-struct DAVResource;
-
class ContentProperties
{
public:
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 0f627c650521..eb688896b6f9 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/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
More information about the Libreoffice-commits
mailing list