editeng/source/misc/unolingu.cxx | 3
forms/source/xforms/datatypes.cxx | 44 +++++++++++++-
forms/source/xforms/datatypes_impl.hxx | 68 ----------------------
hwpfilter/source/hwpreader.cxx | 3
i18npool/source/localedata/localedata.cxx | 5 -
lotuswordpro/source/filter/lwpdoc.cxx | 2
lotuswordpro/source/filter/lwpfont.cxx | 3
lotuswordpro/source/filter/lwplayout.cxx | 3
lotuswordpro/source/filter/lwplaypiece.cxx | 5 -
onlineupdate/source/update/updater/updater.cxx | 15 ++--
sal/osl/unx/nlsupport.cxx | 5 +
sal/rtl/alloc_cache.cxx | 6 +
sc/source/ui/Accessibility/AccessibleCellBase.cxx | 6 -
sd/source/ui/unoidl/unomodel.cxx | 3
sfx2/source/doc/sfxbasemodel.cxx | 3
svx/source/engine3d/view3d.cxx | 3
svx/source/unodraw/unoshap2.cxx | 23 +++----
sw/source/core/frmedt/fefly1.cxx | 4 -
sw/source/core/txtnode/ndtxt.cxx | 3
sw/source/core/unocore/unorefmk.cxx | 33 +++++-----
vcl/unx/kde4/KDEXLib.cxx | 3
21 files changed, 102 insertions(+), 141 deletions(-)
New commits:
commit 42486dde49d9a9494c1f4889bbccde1f5aecd91e
Author: Noel Grandin <n...@peralex.com>
Date: Wed Jun 29 14:46:39 2016 +0200
move #includes to top of file
instead of being randomly embedded somewhere deep inside the CXX code.
Found with:
git grep -nP '^#include' -- *.cxx | sort -g -k 2 -t :
Change-Id: I9ee432d3b665ecb6ec600bd51cc4b735a1b1127a
Reviewed-on: https://gerrit.libreoffice.org/26764
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 6337edf..def44d4 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
+#include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
#include <com/sun/star/linguistic2/DictionaryList.hpp>
#include <com/sun/star/linguistic2/XAvailableLocales.hpp>
#include <com/sun/star/linguistic2/LinguServiceManager.hpp>
@@ -758,8 +759,6 @@ uno::Reference< XDictionary > SvxGetChangeAllList()
return LinguMgr::GetChangeAllList();
}
-#include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
-
SvxAlternativeSpelling SvxGetAltSpelling(
const css::uno::Reference< css::linguistic2::XHyphenatedWord > &
rHyphWord )
{
diff --git a/forms/source/xforms/datatypes.cxx
b/forms/source/xforms/datatypes.cxx
index ce99368..90e307a 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -937,10 +937,48 @@ namespace xforms
}
-#define DATATYPES_INCLUDED_BY_MASTER_HEADER
-#include "datatypes_impl.hxx"
-#undef DATATYPES_INCLUDED_BY_MASTER_HEADER
+template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS >
+ODerivedDataType< CONCRETE_DATA_TYPE_IMPL, SUPERCLASS >::ODerivedDataType(
const OUString& _rName, sal_Int16 _nTypeClass )
+ :SUPERCLASS( _rName, _nTypeClass )
+ ,m_bPropertiesRegistered( false )
+{
+}
+
+
+template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS >
+::cppu::IPropertyArrayHelper* ODerivedDataType< CONCRETE_DATA_TYPE_IMPL,
SUPERCLASS >::createArrayHelper( ) const
+{
+ css::uno::Sequence< css::beans::Property > aProps;
+ ODerivedDataType< CONCRETE_DATA_TYPE_IMPL, SUPERCLASS
>::describeProperties( aProps );
+ return new ::cppu::OPropertyArrayHelper( aProps );
+}
+
+
+template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS >
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ODerivedDataType<
CONCRETE_DATA_TYPE_IMPL, SUPERCLASS >::getPropertySetInfo() throw(
css::uno::RuntimeException )
+{
+ return ::cppu::OPropertySetHelper::createPropertySetInfo(
getInfoHelper() );
+}
+
+template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS >
+::cppu::IPropertyArrayHelper& SAL_CALL ODerivedDataType<
CONCRETE_DATA_TYPE_IMPL, SUPERCLASS >::getInfoHelper()
+{
+ if ( !m_bPropertiesRegistered )
+ {
+ this->registerProperties();
+ m_bPropertiesRegistered = true;
+ }
+
+ return *ODerivedDataType< CONCRETE_DATA_TYPE_IMPL, SUPERCLASS
>::getArrayHelper();
+}
+
+
+template< typename VALUE_TYPE >
+OValueLimitedType< VALUE_TYPE >::OValueLimitedType( const OUString& _rName,
sal_Int16 _nTypeClass )
+ :OValueLimitedType_Base( _rName, _nTypeClass )
+{
+}
} // namespace xforms
diff --git a/forms/source/xforms/datatypes_impl.hxx
b/forms/source/xforms/datatypes_impl.hxx
deleted file mode 100644
index cfc44df..0000000
--- a/forms/source/xforms/datatypes_impl.hxx
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef DATATYPES_INCLUDED_BY_MASTER_HEADER
- #error "not to be included directly!"
-#endif
-
-
-template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS >
-ODerivedDataType< CONCRETE_DATA_TYPE_IMPL, SUPERCLASS >::ODerivedDataType(
const OUString& _rName, sal_Int16 _nTypeClass )
- :SUPERCLASS( _rName, _nTypeClass )
- ,m_bPropertiesRegistered( false )
-{
-}
-
-
-template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS >
-::cppu::IPropertyArrayHelper* ODerivedDataType< CONCRETE_DATA_TYPE_IMPL,
SUPERCLASS >::createArrayHelper( ) const
-{
- css::uno::Sequence< css::beans::Property > aProps;
- ODerivedDataType< CONCRETE_DATA_TYPE_IMPL, SUPERCLASS
>::describeProperties( aProps );
- return new ::cppu::OPropertyArrayHelper( aProps );
-}
-
-
-template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS >
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ODerivedDataType<
CONCRETE_DATA_TYPE_IMPL, SUPERCLASS >::getPropertySetInfo() throw(
css::uno::RuntimeException )
-{
- return ::cppu::OPropertySetHelper::createPropertySetInfo(
getInfoHelper() );
-}
-
-
-template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS >
-::cppu::IPropertyArrayHelper& SAL_CALL ODerivedDataType<
CONCRETE_DATA_TYPE_IMPL, SUPERCLASS >::getInfoHelper()
-{
- if ( !m_bPropertiesRegistered )
- {
- this->registerProperties();
- m_bPropertiesRegistered = true;
- }
-
- return *ODerivedDataType< CONCRETE_DATA_TYPE_IMPL, SUPERCLASS
>::getArrayHelper();
-}
-
-
-template< typename VALUE_TYPE >
-OValueLimitedType< VALUE_TYPE >::OValueLimitedType( const OUString& _rName,
sal_Int16 _nTypeClass )
- :OValueLimitedType_Base( _rName, _nTypeClass )
-{
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 793c1db..9ab0179 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -30,6 +30,7 @@
#include "fontmap.hxx"
#include "formula.h"
#include "cspline.h"
+#include "datecode.h"
#include <iostream>
#include <locale.h>
@@ -3282,8 +3283,6 @@ void HwpReader::makeBookmark(Bookmark * hbox)
}
-#include "datecode.h"
-
void HwpReader::makeDateFormat(DateCode * hbox)
{
padd("style:name", sXML_CDATA,
diff --git a/i18npool/source/localedata/localedata.cxx
b/i18npool/source/localedata/localedata.cxx
index 5d42f01..5c7d4f8 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <localedata.hxx>
#include <i18nlangtag/mslangid.hxx>
@@ -1299,9 +1301,6 @@ LocaleDataImpl::getContinuousNumberingLevels( const
lang::Locale& rLocale ) thro
// OutlineNumbering helper class
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <cppuhelper/implbase.hxx>
-
namespace com{ namespace sun{ namespace star{ namespace lang {
struct Locale;
}}}}
diff --git a/lotuswordpro/source/filter/lwpdoc.cxx
b/lotuswordpro/source/filter/lwpdoc.cxx
index 540f978..f238f8b9 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -65,6 +65,7 @@
#include "lwpsilverbullet.hxx"
#include "lwplayout.hxx"
#include "lwppagelayout.hxx"
+#include "lwpverdocument.hxx"
#include "xfilter/xfstylemanager.hxx"
#include <osl/thread.h>
@@ -385,7 +386,6 @@ void LwpDocument::RegisterFootnoteStyles()
/**
* @descr Register default para styles
*/
-#include "lwpverdocument.hxx"
void LwpDocument::RegisterDefaultParaStyles()
{
if(!IsChildDoc())
diff --git a/lotuswordpro/source/filter/lwpfont.cxx
b/lotuswordpro/source/filter/lwpfont.cxx
index 437a962..6d2bf8c 100644
--- a/lotuswordpro/source/filter/lwpfont.cxx
+++ b/lotuswordpro/source/filter/lwpfont.cxx
@@ -57,6 +57,7 @@
#include "lwpfont.hxx"
#include "xfilter/xfstylemanager.hxx"
#include "xfilter/xffontfactory.hxx"
+#include "xfilter/xftextstyle.hxx"
void LwpFontAttrEntry::Read(LwpObjectStream *pStrm)
{
@@ -445,8 +446,6 @@ void LwpFontManager::Read(LwpObjectStream *pStrm)
}
-#include "xfilter/xftextstyle.hxx"
-
/*
VO_PARASTYLE call this method to add its style to XFStyleManager based on the
fontID
1. Construct the text style based on the fontID
diff --git a/lotuswordpro/source/filter/lwplayout.cxx
b/lotuswordpro/source/filter/lwplayout.cxx
index 3845024..4a3f84f 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -61,6 +61,7 @@
#include "lwplayout.hxx"
#include "lwpusewhen.hxx"
#include "lwptools.hxx"
+#include "lwplaypiece.hxx"
#include "xfilter/xfcolumns.hxx"
#include "lwpstory.hxx"
#include "lwpparastyle.hxx"
@@ -636,8 +637,6 @@ rtl::Reference<LwpObject> LwpMiddleLayout::GetBasedOnStyle()
return xRet;
}
-#include "lwplaypiece.hxx"
-
/**
* @descr: Get the geometry of current layout
*
diff --git a/lotuswordpro/source/filter/lwplaypiece.cxx
b/lotuswordpro/source/filter/lwplaypiece.cxx
index 0265cc0..3fe5750 100644
--- a/lotuswordpro/source/filter/lwplaypiece.cxx
+++ b/lotuswordpro/source/filter/lwplaypiece.cxx
@@ -59,8 +59,10 @@
************************************************************************/
#include "lwplaypiece.hxx"
-
+#include "lwpstyledef.hxx"
#include "lwpfilehdr.hxx"
+
+
LwpRotor::LwpRotor()
: m_nRotation(0)
{}
@@ -345,7 +347,6 @@ LwpJoinStuff::LwpJoinStuff()
LwpJoinStuff::~LwpJoinStuff()
{}
-#include "lwpstyledef.hxx"
void LwpJoinStuff:: Read(LwpObjectStream *pStrm)
{
m_nWidth = pStrm->QuickReadInt32();
diff --git a/onlineupdate/source/update/updater/updater.cxx
b/onlineupdate/source/update/updater/updater.cxx
index 145e080..136f060 100644
--- a/onlineupdate/source/update/updater/updater.cxx
+++ b/onlineupdate/source/update/updater/updater.cxx
@@ -57,6 +57,14 @@
#include <onlineupdate/mozilla/Compiler.h>
#include <onlineupdate/mozilla/Types.h>
+#ifdef _WIN32
+#include "nsWindowsRestart.cxx"
+#include "nsWindowsHelpers.h"
+#include "uachelper.h"
+#include "pathhash.h"
+#endif
+
+
// Amount of the progress bar to use in each of the 3 update stages,
// should total 100.0.
#define PROGRESS_PREPARE_SIZE 20.0f
@@ -1793,13 +1801,6 @@ PatchIfFile::Finish(int status)
//-----------------------------------------------------------------------------
-#ifdef _WIN32
-#include "nsWindowsRestart.cxx"
-#include "nsWindowsHelpers.h"
-#include "uachelper.h"
-#include "pathhash.h"
-#endif
-
static void
LaunchCallbackApp(const NS_tchar *workingDir,
int argc,
diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index b7e86c1..3df4f9c 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -38,6 +38,10 @@
#endif /* !MACOSX && !IOS */
#endif /* LINUX || SOLARIS || NETBSD || MACOSX || IOS */
+#if defined(MACOSX) || defined(IOS)
+#include "system.hxx"
+#endif
+
#include <string.h>
namespace {
@@ -838,7 +842,6 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale
* pLocale )
}
#if defined(MACOSX) || defined(IOS)
-#include "system.hxx"
/*****************************************************************************
return the current process locale
diff --git a/sal/rtl/alloc_cache.cxx b/sal/rtl/alloc_cache.cxx
index b557504..8540d91 100644
--- a/sal/rtl/alloc_cache.cxx
+++ b/sal/rtl/alloc_cache.cxx
@@ -29,6 +29,10 @@
#include <string.h>
#include <stdio.h>
+#if defined(SAL_UNX)
+#include <sys/time.h>
+#endif
+
/* ================================================================= *
*
* cache internals.
@@ -1297,8 +1301,6 @@ rtl_secureZeroMemory (void *Ptr, sal_Size Bytes)
SAL_THROW_EXTERN_C()
*p++ = 0;
}
-#include <sys/time.h>
-
static void *
rtl_cache_wsupdate_all (void * arg);
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index 826cac3..890908a 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -38,6 +38,8 @@
#include <com/sun/star/sheet/XSheetAnnotation.hpp>
#include <com/sun/star/sheet/XSheetAnnotationAnchor.hpp>
#include <com/sun/star/text/XSimpleText.hpp>
+#include <com/sun/star/table/BorderLine.hpp>
+#include <com/sun/star/table/ShadowFormat.hpp>
#include <editeng/brushitem.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/servicehelper.hxx>
@@ -358,8 +360,6 @@ OUString SAL_CALL ScAccessibleCellBase::GetNote()
return sNote;
}
-#include <com/sun/star/table/ShadowFormat.hpp>
-
OUString SAL_CALL ScAccessibleCellBase::getShadowAttrs()
throw (css::uno::RuntimeException,
std::exception)
{
@@ -441,8 +441,6 @@ OUString SAL_CALL ScAccessibleCellBase::getShadowAttrs()
return sShadowAttrs;
}
-#include <com/sun/star/table/BorderLine.hpp>
-
OUString SAL_CALL ScAccessibleCellBase::getBorderAttrs()
throw (css::uno::RuntimeException,
std::exception)
{
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index af123a9..6902bba 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -32,6 +32,7 @@
#include <comphelper/sequence.hxx>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
+#include <comphelper/processfactory.hxx>
#include <editeng/unofield.hxx>
#include <notifydocumentevent.hxx>
@@ -605,8 +606,6 @@ sal_Bool SAL_CALL SdXImpressDocument::hasControllersLocked(
)
return mpDoc && mpDoc->isLocked();
}
-#include <comphelper/processfactory.hxx>
-
uno::Reference < container::XIndexAccess > SAL_CALL
SdXImpressDocument::getViewData() throw( uno::RuntimeException, std::exception )
{
::SolarMutexGuard aGuard;
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index bda9a21..5608e7b 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -114,7 +114,7 @@
#include <stringhint.hxx>
#include <sfx2/msgpool.hxx>
#include <sfx2/DocumentMetadataAccess.hxx>
-
+#include "printhelper.hxx"
#include <sfx2/sfxresid.hxx>
@@ -3851,7 +3851,6 @@ void SAL_CALL SfxBaseModel::removeStorageChangeListener(
cppu::UnoType<document::XStorageChangeListener>::get(), xListener );
}
-#include "printhelper.hxx"
bool SfxBaseModel::impl_getPrintHelper()
{
if ( m_pData->m_xPrintable.is() )
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 8b4ca80..b362c81 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -28,6 +28,7 @@
#include <svx/svdpagv.hxx>
#include <svx/svxids.hrc>
#include <editeng/colritem.hxx>
+#include <editeng/eeitem.hxx>
#include <svx/xtable.hxx>
#include <svx/svdview.hxx>
#include <svx/dialogs.hrc>
@@ -647,8 +648,6 @@ void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj,
bool& rAny3D,
}
}
-#include <editeng/eeitem.hxx>
-
void E3dView::ImpChangeSomeAttributesFor3DConversion(SdrObject* pObj)
{
if(dynamic_cast<const SdrTextObj*>( pObj) != nullptr)
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index aa2a737..9ba87e7 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -34,6 +34,8 @@
#include <osl/mutex.hxx>
#include <vcl/fltcall.hxx>
#include <vcl/graphicfilter.hxx>
+#include <vcl/wmf.hxx>
+#include <vcl/cvtgrf.hxx>
#include <svx/svdpool.hxx>
@@ -49,14 +51,20 @@
#include <svx/svdoashp.hxx>
#include "svx/svdviter.hxx"
#include <svx/svdview.hxx>
+#include <svx/svdopath.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/tools/unotools.hxx>
-
#include <comphelper/servicehelper.hxx>
-#include <vcl/wmf.hxx>
+#include <com/sun/star/awt/XBitmap.hpp>
+#include <svx/svdograf.hxx>
+#include <sfx2/docfile.hxx>
+#include <sfx2/app.hxx>
+#include <sfx2/fcontnr.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+
#include <memory>
@@ -1004,7 +1012,6 @@ uno::Sequence< OUString > SAL_CALL
SvxShapeCircle::getSupportedServiceNames() th
{
return SvxShapeText::getSupportedServiceNames();
}
-#include <svx/svdopath.hxx>
SvxShapePolyPolygon::SvxShapePolyPolygon( SdrObject* pObj ,
drawing::PolygonKind eNew )
@@ -1386,16 +1393,6 @@ uno::Sequence< OUString > SAL_CALL
SvxShapePolyPolygonBezier::getSupportedServic
return SvxShapeText::getSupportedServiceNames();
}
-#include <com/sun/star/awt/XBitmap.hpp>
-#include <vcl/cvtgrf.hxx>
-#include <svx/svdograf.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/fcontnr.hxx>
-
-#include <toolkit/helper/vclunohelper.hxx>
-
-
SvxGraphicObject::SvxGraphicObject( SdrObject* pObj, OUString const & referer
) throw()
: SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_GRAPHICOBJECT),
getSvxMapProvider().GetPropertySet(SVXMAP_GRAPHICOBJECT,
SdrObject::GetGlobalDrawObjectItemPool()) ), referer_(referer)
{
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 17c69b8..782400a 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -72,6 +72,8 @@
#include <ndole.hxx>
#include <editeng/opaqitem.hxx>
#include <fefly.hxx>
+#include <fmtcnct.hxx>
+
using namespace ::com::sun::star;
@@ -1812,8 +1814,6 @@ static sal_uInt16 SwFormatGetPageNum(const
SwFlyFrameFormat * pFormat)
return aResult;
}
-#include <fmtcnct.hxx>
-
void SwFEShell::GetConnectableFrameFormats(SwFrameFormat & rFormat,
const OUString & rReference,
bool bSuccessors,
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index b8660b8..5706694 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -86,6 +86,7 @@
#include <calbck.hxx>
#include <attrhint.hxx>
#include <memory>
+#include <unoparagraph.hxx>
//UUUU
#include <svx/sdr/attribute/sdrallfillattributeshelper.hxx>
@@ -4924,8 +4925,6 @@ void SwTextNode::SwClientNotify( const SwModify& rModify,
const SfxHint& rHint )
ChkCondColl();
}
-#include <unoparagraph.hxx>
-
uno::Reference< rdf::XMetadatable >
SwTextNode::MakeUnoObject()
{
diff --git a/sw/source/core/unocore/unorefmk.cxx
b/sw/source/core/unocore/unorefmk.cxx
index 445cdf4..1b1d797 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -39,6 +39,22 @@
#include <txtrfmrk.hxx>
#include <hints.hxx>
#include <comphelper/servicehelper.hxx>
+#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
+#include <com/sun/star/rdf/Statement.hpp>
+#include <com/sun/star/rdf/URI.hpp>
+#include <com/sun/star/rdf/URIs.hpp>
+#include <com/sun/star/rdf/XLiteral.hpp>
+#include <com/sun/star/rdf/XRepositorySupplier.hpp>
+#include <comphelper/processfactory.hxx>
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <unometa.hxx>
+#include <unotext.hxx>
+#include <unoport.hxx>
+#include <txtatr.hxx>
+#include <fmtmeta.hxx>
+#include <docsh.hxx>
+#include <cppuhelper/weak.hxx>
+
using namespace ::com::sun::star;
@@ -508,15 +524,6 @@ throw (beans::UnknownPropertyException,
lang::WrappedTargetException,
OSL_FAIL("SwXReferenceMark::removeVetoableChangeListener(): not
implemented");
}
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <unometa.hxx>
-#include <unotext.hxx>
-#include <unoport.hxx>
-#include <txtatr.hxx>
-#include <fmtmeta.hxx>
-#include <docsh.hxx>
-#include <cppuhelper/weak.hxx>
-
class SwXMetaText : public cppu::OWeakObject, public SwXText
{
private:
@@ -1500,14 +1507,6 @@ throw (beans::UnknownPropertyException,
lang::WrappedTargetException,
OSL_FAIL("SwXMetaField::removeVetoableChangeListener(): not implemented");
}
-#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
-#include <com/sun/star/rdf/Statement.hpp>
-#include <com/sun/star/rdf/URI.hpp>
-#include <com/sun/star/rdf/URIs.hpp>
-#include <com/sun/star/rdf/XLiteral.hpp>
-#include <com/sun/star/rdf/XRepositorySupplier.hpp>
-#include <comphelper/processfactory.hxx>
-
static uno::Reference<rdf::XURI> const&
lcl_getURI(const bool bPrefix)
{
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index c3c2f56..1d8f64a 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -32,6 +32,7 @@
#include <QtCore/QAbstractEventDispatcher>
#include <QtGui/QClipboard>
#include <QtCore/QThread>
+#include <QtGui/QFrame>
#include "unx/i18n_im.hxx"
#include "unx/i18n_xkb.hxx"
@@ -426,8 +427,6 @@ uno::Reference< ui::dialogs::XFilePicker2 >
KDEXLib::createFilePicker(
#endif
}
-#include <QtGui/QFrame>
-
int KDEXLib::getFrameWidth()
{
if( m_frameWidth >= 0 )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
