[Libreoffice-commits] core.git: comphelper/source cui/source fpicker/source include/uno oox/source reportdesign/source sc/source sd/qa sw/qa sw/source vcl/inc vcl/win
Takeshi Abe
tabe at fixedpoint.jp
Tue Jun 23 03:40:25 PDT 2015
comphelper/source/misc/compareversionstrings.cxx | 1 -
cui/source/options/optinet2.cxx | 2 --
fpicker/source/aqua/SalAquaFolderPicker.mm | 1 -
include/uno/mapping.hxx | 1 -
oox/source/helper/propertymap.cxx | 1 -
reportdesign/source/ui/dlg/CondFormat.src | 1 -
sc/source/core/tool/interpr4.cxx | 1 -
sc/source/ui/unoobj/condformatuno.cxx | 1 -
sd/qa/unit/export-tests.cxx | 2 --
sd/qa/unit/import-tests.cxx | 1 -
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 1 -
sw/source/core/docnode/node2lay.cxx | 1 -
sw/source/core/unocore/unocoll.cxx | 1 -
sw/source/ui/chrdlg/numpara.cxx | 1 -
vcl/inc/salframe.hxx | 1 -
vcl/win/source/gdi/gdiimpl.cxx | 2 --
16 files changed, 19 deletions(-)
New commits:
commit 0655f98565c78c055ed10631fd57aa73604946b6
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Jun 23 15:25:01 2015 +0900
Drop duplicate #includes
Change-Id: I4db77ea1de42676d9d2df70db3f2e1665a3fd983
Reviewed-on: https://gerrit.libreoffice.org/16419
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/comphelper/source/misc/compareversionstrings.cxx b/comphelper/source/misc/compareversionstrings.cxx
index cc8cb44..a5ca928 100644
--- a/comphelper/source/misc/compareversionstrings.cxx
+++ b/comphelper/source/misc/compareversionstrings.cxx
@@ -8,7 +8,6 @@
*/
#include <ctype.h>
-#include <ctype.h>
#include <string.h>
#include <comphelper/string.hxx>
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index a3c72ff..5e4836e 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -98,8 +98,6 @@ using namespace ::sfx2;
// static ----------------------------------------------------------------
-#include <sal/config.h>
-
VCL_BUILDER_FACTORY_ARGS(SvxNoSpaceEdit, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK)
void SvxNoSpaceEdit::KeyInput( const KeyEvent& rKEvent )
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm
index a597913..b6a2cb5 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.mm
+++ b/fpicker/source/aqua/SalAquaFolderPicker.mm
@@ -22,7 +22,6 @@
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
-#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
#include <cppuhelper/interfacecontainer.h>
#include <cppuhelper/supportsservice.hxx>
#include <osl/diagnose.h>
diff --git a/include/uno/mapping.hxx b/include/uno/mapping.hxx
index 51a12d3..d62fba0 100644
--- a/include/uno/mapping.hxx
+++ b/include/uno/mapping.hxx
@@ -28,7 +28,6 @@
#include <com/sun/star/uno/Reference.hxx>
#include <cppu/unotype.hxx>
#include <uno/environment.hxx>
-#include <uno/lbnames.h>
typedef struct _typelib_TypeDescription typelib_TypeDescription;
typedef struct _typelib_InterfaceTypeDescription typelib_InterfaceTypeDescription;
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index 9db0e09..6c7fb0b 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -70,7 +70,6 @@ using ::com::sun::star::container::XIndexReplace;
#include <com/sun/star/style/LineSpacing.hpp>
#include <com/sun/star/style/LineSpacingMode.hpp>
#include <com/sun/star/text/WritingMode.hpp>
-#include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
#define USS(x) OUStringToOString( x, RTL_TEXTENCODING_UTF8 ).getStr()
using namespace ::com::sun::star;
using namespace ::com::sun::star::drawing;
diff --git a/reportdesign/source/ui/dlg/CondFormat.src b/reportdesign/source/ui/dlg/CondFormat.src
index b45a7f81..529ffee 100644
--- a/reportdesign/source/ui/dlg/CondFormat.src
+++ b/reportdesign/source/ui/dlg/CondFormat.src
@@ -21,7 +21,6 @@
#include "helpids.hrc"
#include <svx/globlmn.hrc>
#include "rptui_slotid.hrc"
-#include "rptui_slotid.hrc"
String STR_NUMBERED_CONDITION
{
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 9aee92f..793b752 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -74,7 +74,6 @@
#include <basic/basmgr.hxx>
#include <vbahelper/vbaaccesshelper.hxx>
#include <memory>
-#include <memory>
using namespace com::sun::star;
using namespace formula;
diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx
index 74899e6..3b0a2f4 100644
--- a/sc/source/ui/unoobj/condformatuno.cxx
+++ b/sc/source/ui/unoobj/condformatuno.cxx
@@ -25,7 +25,6 @@
#include <com/sun/star/sheet/DataBarAxis.hpp>
#include <com/sun/star/sheet/IconSetType.hpp>
-#include <com/sun/star/sheet/DataBarAxis.hpp>
#include <com/sun/star/sheet/ConditionFormatOperator.hpp>
#include <com/sun/star/sheet/DataBarEntryType.hpp>
#include <com/sun/star/sheet/ColorScaleEntryType.hpp>
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 4149a30..d8cd85f 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -65,8 +65,6 @@
#include <com/sun/star/table/XMergeableCell.hpp>
#include <svx/svdotable.hxx>
-#include <com/sun/star/table/XTable.hpp>
-#include <com/sun/star/table/XMergeableCell.hpp>
#include <config_features.h>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 2174654..42144ec 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -26,7 +26,6 @@
#include <rsc/rscsfx.hxx>
#include <sfx2/sfxsids.hrc>
-#include <svl/stritem.hxx>
#include <svx/svdotext.hxx>
#include <svx/svdoashp.hxx>
#include <svx/svdograf.hxx>
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 5995027..256245f 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -64,7 +64,6 @@
#include <com/sun/star/text/XDocumentIndex.hpp>
#include <com/sun/star/style/CaseMap.hpp>
#include <com/sun/star/style/PageStyleLayout.hpp>
-#include <com/sun/star/style/ParagraphAdjust.hpp>
#include <com/sun/star/util/DateTime.hpp>
#include <vcl/bmpacc.hxx>
#include <vcl/svapp.hxx>
diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx
index 09edd1d..85b050a 100644
--- a/sw/source/core/docnode/node2lay.cxx
+++ b/sw/source/core/docnode/node2lay.cxx
@@ -18,7 +18,6 @@
*/
#include <calbck.hxx>
-#include <calbck.hxx>
#include <node.hxx>
#include <ndindex.hxx>
#include <swtable.hxx>
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 1860673..f0769da 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -82,7 +82,6 @@
#include <vbahelper/vbaaccesshelper.hxx>
#include <basic/basmgr.hxx>
#include <comphelper/processfactory.hxx>
-#include <comphelper/sequence.hxx>
#include <cppuhelper/implbase.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index ff8f908..096f06e 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -32,7 +32,6 @@
#include <numpara.hxx>
#include <app.hrc>
-#include <svl/stritem.hxx>
#include <sfx2/app.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/sfxhelp.hxx>
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index d576b60..65213dc 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -36,7 +36,6 @@
#include <vcl/window.hxx>
#include <vcl/vclptr.hxx>
-#include <vcl/window.hxx>
// complete vcl::Window for SalFrame::CallCallback under -fsanitize=function
class AllSettings;
diff --git a/vcl/win/source/gdi/gdiimpl.cxx b/vcl/win/source/gdi/gdiimpl.cxx
index bd5f340..a0a61d2 100644
--- a/vcl/win/source/gdi/gdiimpl.cxx
+++ b/vcl/win/source/gdi/gdiimpl.cxx
@@ -65,8 +65,6 @@
#pragma warning(pop)
#endif
-#include <basegfx/polygon/b2dpolygon.hxx>
-
#define SAL_POLYPOLYCOUNT_STACKBUF 8
#define SAL_POLYPOLYPOINTS_STACKBUF 64
More information about the Libreoffice-commits
mailing list