[Libreoffice-commits] core.git: 7 commits - oox/source starmath/source svl/source sw/source writerfilter/source

Miklos Vajna vmiklos at collabora.co.uk
Sun Nov 2 07:07:31 PST 2014 

 oox/source/drawingml/customshapepresetdata.cxx       |   10 ----------
 oox/source/shape/WpsContext.cxx                      |    1 -
 starmath/source/rtfexport.cxx                        |    1 -
 starmath/source/wordexportbase.cxx                   |    2 --
 svl/source/items/grabbagitem.cxx                     |    4 ----
 sw/source/core/doc/textboxhelper.cxx                 |   11 ++---------
 sw/source/core/layout/softpagebreak.cxx              |    1 -
 sw/source/core/layout/ssfrm.cxx                      |   14 --------------
 sw/source/core/layout/swselectionlist.cxx            |    1 -
 sw/source/core/layout/tabfrm.cxx                     |   12 ------------
 sw/source/core/layout/trvlfrm.cxx                    |   12 ------------
 sw/source/core/layout/virtoutp.cxx                   |    5 -----
 sw/source/core/layout/wsfrm.cxx                      |   15 ---------------
 sw/source/filter/ww8/docxsdrexport.cxx               |   14 --------------
 sw/source/filter/ww8/docxtablestyleexport.cxx        |    6 ------
 sw/source/filter/ww8/rtfattributeoutput.cxx          |   16 ----------------
 sw/source/filter/ww8/rtfexport.cxx                   |   13 -------------
 sw/source/filter/ww8/rtfsdrexport.cxx                |    3 ---
 writerfilter/source/dmapper/SdtHelper.cxx            |    7 -------
 writerfilter/source/dmapper/TablePositionHandler.cxx |    3 ---
 writerfilter/source/filter/RtfFilter.cxx             |    5 -----
 writerfilter/source/rtftok/rtfcontrolwords.cxx       |    1 -
 writerfilter/source/rtftok/rtfdocumentimpl.cxx       |   16 ----------------
 writerfilter/source/rtftok/rtflookahead.cxx          |    3 ---
 writerfilter/source/rtftok/rtfsdrimport.cxx          |    9 ---------
 writerfilter/source/rtftok/rtftokenizer.cxx          |    3 ---
 26 files changed, 2 insertions(+), 186 deletions(-)

New commits:
commit 29f33d1a41f7206709677734d3d32cee0ba8a23a
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sun Nov 2 15:58:24 2014 +0100

    SwTextBoxHelper::findTextBoxes: cleanup
    
    Change-Id: Id926289a4b37b7a24f0e54f8f582a7658a713376

diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx
index bcabdd0..6a49724 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -134,9 +134,8 @@ std::set<const SwFrmFmt*> SwTextBoxHelper::findTextBoxes(const SwNode& rNode)
     const SwDoc* pDoc = rNode.GetDoc();
     const SwCntntNode* pCntntNode = 0;
     const SwCntntFrm* pCntntFrm = 0;
-    if (pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() &&
-        (pCntntNode = rNode.GetCntntNode()) &&
-        (pCntntFrm = pCntntNode->getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout())))
+    bool bHaveViewShell = pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
+    if (bHaveViewShell && (pCntntNode = rNode.GetCntntNode()) && (pCntntFrm = pCntntNode->getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout())))
     {
         // We can use the layout information to iterate over only the frames which are anchored to us.
         std::set<const SwFrmFmt*> aRet;
commit 6756ee4743b4c750aa54a1b0f17f1fc945340089
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sun Nov 2 15:32:46 2014 +0100

    unused includes in RTF filter and related files
    
    Change-Id: Id13e10f2ceed3985c78ccc542e6677eccc0cb1c7

diff --git a/oox/source/drawingml/customshapepresetdata.cxx b/oox/source/drawingml/customshapepresetdata.cxx
index 78d0af1..0eadef1 100644
--- a/oox/source/drawingml/customshapepresetdata.cxx
+++ b/oox/source/drawingml/customshapepresetdata.cxx
@@ -13,18 +13,8 @@
 #include <comphelper/sequenceasvector.hxx>
 
 #include "drawingml/customshapeproperties.hxx"
-#include "oox/helper/helper.hxx"
-#include "oox/helper/propertymap.hxx"
-#include "oox/helper/propertyset.hxx"
 #include "oox/token/tokenmap.hxx"
 #include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/graphic/XGraphicTransformer.hpp>
-#include <com/sun/star/drawing/XShape.hpp>
-#include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
-#include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp>
 
 using namespace ::com::sun::star;
 
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index 9e3218e..a22d6b8 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -13,7 +13,6 @@
 #include <drawingml/shapestylecontext.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
-#include <oox/drawingml/drawingmltypes.hxx>
 
 #include <boost/optional.hpp>
 
diff --git a/starmath/source/rtfexport.cxx b/starmath/source/rtfexport.cxx
index d700732..0167c19 100644
--- a/starmath/source/rtfexport.cxx
+++ b/starmath/source/rtfexport.cxx
@@ -10,7 +10,6 @@
 
 #include "rtfexport.hxx"
 
-#include <rtl/ustring.hxx>
 #include <svtools/rtfkeywd.hxx>
 #include <filter/msfilter/rtfutil.hxx>
 
diff --git a/starmath/source/wordexportbase.cxx b/starmath/source/wordexportbase.cxx
index 885ca72..21b3301 100644
--- a/starmath/source/wordexportbase.cxx
+++ b/starmath/source/wordexportbase.cxx
@@ -10,8 +10,6 @@
 
 #include "wordexportbase.hxx"
 
-#include <rtl/ustring.hxx>
-
 SmWordExportBase::SmWordExportBase(const SmNode* pIn)
     : m_pTree(pIn)
 {
diff --git a/svl/source/items/grabbagitem.cxx b/svl/source/items/grabbagitem.cxx
index aa2b3e3..dd1bf24 100644
--- a/svl/source/items/grabbagitem.cxx
+++ b/svl/source/items/grabbagitem.cxx
@@ -8,11 +8,7 @@
  */
 
 #include <svl/grabbagitem.hxx>
-#include <svl/poolitem.hxx>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
 #include <comphelper/sequence.hxx>
-
 #include <com/sun/star/beans/PropertyValue.hpp>
 
 TYPEINIT1_AUTOFACTORY(SfxGrabBagItem, SfxPoolItem);
diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx
index 122b3b3..bcabdd0 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -8,7 +8,6 @@
  */
 
 #include <textboxhelper.hxx>
-#include <frmfmt.hxx>
 #include <fmtcntnt.hxx>
 #include <fmtanchr.hxx>
 #include <fmtcnct.hxx>
@@ -18,13 +17,10 @@
 #include <IDocumentLayoutAccess.hxx>
 #include <ndtxt.hxx>
 #include <docsh.hxx>
-#include <docary.hxx>
 #include <unocoll.hxx>
 #include <unoframe.hxx>
 #include <unodraw.hxx>
-#include <unotextbodyhf.hxx>
 #include <unotextrange.hxx>
-#include <unomid.h>
 #include <cmdid.h>
 #include <unoprnms.hxx>
 #include <dflyobj.hxx>
@@ -36,7 +32,6 @@
 #include <editeng/unoprnms.hxx>
 #include <editeng/charrotateitem.hxx>
 #include <svx/svdoashp.hxx>
-#include <svx/unopage.hxx>
 #include <svx/svdpage.hxx>
 #include <svl/itemiter.hxx>
 #include <comphelper/sequenceashashmap.hxx>
@@ -46,7 +41,6 @@
 #include <com/sun/star/text/SizeType.hpp>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <com/sun/star/text/WrapTextMode.hpp>
-#include <com/sun/star/text/XTextContent.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 
 using namespace com::sun::star;
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index b97e702..f691432 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -7,9 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/PointSequenceSequence.hpp>
-#include <com/sun/star/xml/dom/XDocument.hpp>
 #include <com/sun/star/xml/sax/XSAXSerializable.hpp>
 #include <com/sun/star/xml/sax/Writer.hpp>
 #include <editeng/lrspitem.hxx>
@@ -18,38 +16,26 @@
 #include <editeng/shaditem.hxx>
 #include <editeng/unoprnms.hxx>
 #include <editeng/charrotateitem.hxx>
-#include <svx/svdobj.hxx>
-#include <svx/svdmodel.hxx>
 #include <svx/svdogrp.hxx>
 #include <oox/token/tokens.hxx>
-#include <oox/export/drawingml.hxx>
-#include <oox/drawingml/drawingmltypes.hxx>
 #include <oox/export/utils.hxx>
 #include <oox/export/vmlexport.hxx>
 #include <oox/token/properties.hxx>
-
-#include <frmatr.hxx>
 #include <frmfmt.hxx>
 #include <textboxhelper.hxx>
 #include <fmtanchr.hxx>
-#include <fmtornt.hxx>
 #include <fmtsrnd.hxx>
 #include <fmtcntnt.hxx>
 #include <ndtxt.hxx>
 #include <txatbase.hxx>
 #include <fmtautofmt.hxx>
 #include <fmtfsize.hxx>
-
 #include <drawdoc.hxx>
 #include <docxsdrexport.hxx>
-#include <docxexport.hxx>
 #include <docxattributeoutput.hxx>
 #include <docxexportfilter.hxx>
-#include <writerhelper.hxx>
 #include <comphelper/seqstream.hxx>
 #include <comphelper/sequenceasvector.hxx>
-
-
 #include <IDocumentDrawModelAccess.hxx>
 
 using namespace com::sun::star;
diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx b/sw/source/filter/ww8/docxtablestyleexport.cxx
index 6c038cd..566c9a3 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.cxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.cxx
@@ -11,14 +11,8 @@
 #include "docxhelper.hxx"
 #include <doc.hxx>
 #include <docsh.hxx>
-
 #include <oox/token/tokens.hxx>
 #include <comphelper/sequenceashashmap.hxx>
-#include <rtl/strbuf.hxx>
-
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/uno/Sequence.h>
-
 #include <boost/optional.hpp>
 
 using namespace com::sun::star;
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 2d3a882..dfd6c88 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -17,19 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sal/config.h>
-
 #include <cstring>
-
 #include "rtfattributeoutput.hxx"
 #include "rtfsdrexport.hxx"
 #include "writerwordglue.hxx"
 #include "ww8par.hxx"
 #include "fmtcntnt.hxx"
 #include "fchrfmt.hxx"
-
-#include <rtl/ustring.hxx>
-#include <rtl/tencinfo.h>
 #include <svtools/rtfkeywd.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/tstpitem.hxx>
@@ -66,15 +60,11 @@
 #include <editeng/charhiddenitem.hxx>
 #include <editeng/shaditem.hxx>
 #include <editeng/opaqitem.hxx>
-#include <svx/svdmodel.hxx>
 #include <svx/fmglob.hxx>
 #include <svx/svdouno.hxx>
-#include <filter/msfilter/msoleexp.hxx>
 #include <filter/msfilter/rtfutil.hxx>
-#include <svtools/miscopt.hxx>
 #include <sfx2/sfxbasemodel.hxx>
 #include <svx/xflgrit.hxx>
-
 #include <drawdoc.hxx>
 #include <docufld.hxx>
 #include <fmtclds.hxx>
@@ -83,13 +73,11 @@
 #include <fmtrowsplt.hxx>
 #include <fmtline.hxx>
 #include <fmtanchr.hxx>
-#include <frmatr.hxx>
 #include <htmltbl.hxx>
 #include <ndgrf.hxx>
 #include <ndtxt.hxx>
 #include <pagedesc.hxx>
 #include <swmodule.hxx>
-#include <swtable.hxx>
 #include <txtftn.hxx>
 #include <txtinet.hxx>
 #include <grfatr.hxx>
@@ -97,15 +85,11 @@
 #include <lineinfo.hxx>
 #include <rtf.hxx>
 #include <IDocumentDrawModelAccess.hxx>
-
 #include <vcl/cvtgrf.hxx>
 #include <oox/mathml/export.hxx>
-
 #include <com/sun/star/i18n/ScriptType.hpp>
 
-
 using ::editeng::SvxBorderLine;
-
 using namespace nsSwDocInfoSubType;
 using namespace nsFieldFlags;
 using namespace sw::util;
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index e0bebb9..42ab1e0 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -17,14 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <config_version.h>
 #include "rtfexportfilter.hxx"
 #include "rtfsdrexport.hxx"
 #include "rtfattributeoutput.hxx"
-
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
-
 #include <docsh.hxx>
 #include <viewsh.hxx>
 #include <viewopt.hxx>
@@ -32,8 +29,6 @@
 #include <fmtpdsc.hxx>
 #include <section.hxx>
 #include <pagedesc.hxx>
-#include <swtable.hxx>
-#include <frmatr.hxx>
 #include <ftninfo.hxx>
 #include <fmthdft.hxx>
 #include <editeng/colritem.hxx>
@@ -44,23 +39,15 @@
 #include <editeng/ulspitem.hxx>
 #include <editeng/paperinf.hxx>
 #include <editeng/protitem.hxx>
-
-#include <docary.hxx>
 #include <numrule.hxx>
 #include <lineinfo.hxx>
 #include <swmodule.hxx>
 #include <IDocumentLayoutAccess.hxx>
-
 #include "ww8par.hxx"
-
 #include <comphelper/string.hxx>
-#include <rtl/ustring.hxx>
 #include <svtools/rtfkeywd.hxx>
 #include <filter/msfilter/rtfutil.hxx>
-#include <unotools/configmgr.hxx>
 #include <unotools/docinfohelper.hxx>
-#include <vcl/svapp.hxx>
-
 #if OSL_DEBUG_LEVEL > 1
 #include <iostream>
 #endif
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx
index e4b86f2..ecf12ee 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -19,8 +19,6 @@
 
 #include "rtfsdrexport.hxx"
 #include "rtfattributeoutput.hxx"
-#include "rtfexportfilter.hxx"
-
 #include <svtools/rtfkeywd.hxx>
 #include <filter/msfilter/rtfutil.hxx>
 #include <editeng/editobj.hxx>
@@ -29,7 +27,6 @@
 #include <vcl/cvtgrf.hxx>
 #include <textboxhelper.hxx>
 #include <dcontact.hxx>
-
 #include <algorithm>
 
 using namespace sw::util;
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx
index 93ff198..a97734e 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -7,19 +7,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
-
-#include <comphelper/sequenceashashmap.hxx>
 #include <editeng/unoprnms.hxx>
-#include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/datetime.hxx>
-
 #include <DomainMapper_Impl.hxx>
-#include <StyleSheetTable.hxx>
 #include <SdtHelper.hxx>
 
 namespace writerfilter
diff --git a/writerfilter/source/dmapper/TablePositionHandler.cxx b/writerfilter/source/dmapper/TablePositionHandler.cxx
index f45656c..2c7e921 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.cxx
+++ b/writerfilter/source/dmapper/TablePositionHandler.cxx
@@ -7,15 +7,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 #include <TablePositionHandler.hxx>
-#include <DomainMapperTableHandler.hxx>
-#include <PropertyMap.hxx>
 #include <ConversionHelper.hxx>
 #include <ooxml/resourceids.hxx>
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
 #include "dmapperLoggers.hxx"
-
 #include <comphelper/sequenceashashmap.hxx>
 
 namespace writerfilter
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index 2161de4..baf7049 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -17,21 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <rtl/ustring.hxx>
 #include <cppuhelper/implementationentry.hxx>
-#include <osl/module.hxx>
 #include <RtfFilter.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <dmapper/DomainMapper.hxx>
 #include <rtftok/RTFDocument.hxx>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/io/WrongFormatException.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
 #include <unotools/localfilehelper.hxx>
-#include <tools/stream.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/streamwrap.hxx>
 
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.cxx b/writerfilter/source/rtftok/rtfcontrolwords.cxx
index 578c548..4f69ece 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.cxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.cxx
@@ -10,7 +10,6 @@
 #include <rtflistener.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
-#include <sal/macros.h>
 #include <string.h>
 
 namespace writerfilter
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 94601f9..53460e5 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -8,49 +8,33 @@
  */
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
 #include <com/sun/star/graphic/GraphicProvider.hpp>
-#include <com/sun/star/io/UnexpectedEOFException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/text/XTextFrame.hpp>
-#include <com/sun/star/text/SizeType.hpp>
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
 #include <com/sun/star/text/WrapTextMode.hpp>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
-#include <rtl/tencinfo.h>
 #include <svl/lngmisc.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/streamwrap.hxx>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
-#include <rtl/ustring.hxx>
-#include <svtools/grfmgr.hxx>
-#include <vcl/graph.hxx>
-#include <vcl/outdev.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/wmf.hxx>
 #include <vcl/settings.hxx>
 #include <filter/msfilter/util.hxx>
-#include <filter/msfilter/escherex.hxx>
 #include <comphelper/string.hxx>
 #include <tools/globname.hxx>
 #include <tools/datetimeutils.hxx>
-#include <tools/mapunit.hxx>
 #include <comphelper/classids.hxx>
 #include <comphelper/embeddedobjectcontainer.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <sfx2/sfxbasemodel.hxx>
-
 #include <oox/mathml/import.hxx>
 #include <ooxml/resourceids.hxx>
-#include <oox/token/tokens.hxx>
 #include <oox/token/namespaces.hxx>
 #include <dmapper/GraphicHelpers.hxx>
-
 #include <rtfsdrimport.hxx>
-#include <rtftokenizer.hxx>
 #include <rtflookahead.hxx>
 #include <rtfcharsets.hxx>
 #include <rtfreferenceproperties.hxx>
diff --git a/writerfilter/source/rtftok/rtflookahead.cxx b/writerfilter/source/rtftok/rtflookahead.cxx
index 91f8d6e..8e608d2 100644
--- a/writerfilter/source/rtftok/rtflookahead.cxx
+++ b/writerfilter/source/rtftok/rtflookahead.cxx
@@ -8,10 +8,7 @@
  */
 
 #include <boost/shared_ptr.hpp>
-
-#include <com/sun/star/task/XStatusIndicator.hpp>
 #include <tools/stream.hxx>
-
 #include <rtflookahead.hxx>
 
 using namespace com::sun::star;
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index f2081b4..bd981f3 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -12,9 +12,7 @@
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
-#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp>
-#include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>
 #include <com/sun/star/text/HoriOrientation.hpp>
@@ -24,24 +22,17 @@
 #include <com/sun/star/text/WrapTextMode.hpp>
 #include <com/sun/star/text/WritingMode.hpp>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
-
 #include <ooxml/resourceids.hxx>
-#include <filter/msfilter/escherex.hxx>
 #include <filter/msfilter/util.hxx>
 #include <svx/svdtrans.hxx>
-#include <tools/mapunit.hxx>
-#include <comphelper/sequenceasvector.hxx>
-
 #include <dmapper/DomainMapper.hxx>
 #include "../dmapper/GraphicHelpers.hxx"
 #include <rtfsdrimport.hxx>
 #include <rtfreferenceproperties.hxx>
-
 #include <oox/vml/vmlformatting.hxx>
 #include <oox/helper/modelobjecthelper.hxx>
 #include <oox/drawingml/shapepropertymap.hxx>
 #include <oox/helper/propertyset.hxx>
-
 #include <boost/logic/tribool.hpp>
 
 using namespace com::sun::star;
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx
index a2eae60..3e3ff78 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -7,13 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <tools/stream.hxx>
-#include <tools/resmgr.hxx>
 #include <svx/dialogs.hrc>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <rtl/strbuf.hxx>
-
 #include <rtftokenizer.hxx>
 #include <rtfskipdestination.hxx>
 #include <com/sun/star/io/BufferSizeExceededException.hpp>
commit 3ceaa46425743483b767abdfae9b19f753759876
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sun Nov 2 14:26:00 2014 +0100

    sw: remaining unused includes in layout
    
    Change-Id: I6fb1b22567c366deb591569339e6857eb5191e1f

diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index a6dbddf..f29607e 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -17,38 +17,28 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <hintids.hxx>
 #include <hints.hxx>
 #include <comphelper/flagguard.hxx>
-#include <tools/bigint.hxx>
 #include <tools/line.hxx>
 #include <editeng/opaqitem.hxx>
 #include <editeng/protitem.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/outdev.hxx>
 #include <fmtpdsc.hxx>
 #include <fmtsrnd.hxx>
 #include <pagedesc.hxx>
 #include <pagefrm.hxx>
 #include <rootfrm.hxx>
-#include <cntfrm.hxx>
 #include <ftnfrm.hxx>
 #include <flyfrm.hxx>
 #include <tabfrm.hxx>
 #include <rowfrm.hxx>
 #include <cellfrm.hxx>
 #include <txtfrm.hxx>
-#include <viewsh.hxx>
 #include <viewopt.hxx>
-#include <doc.hxx>
 #include <DocumentSettingManager.hxx>
 #include <viscrs.hxx>
-#include <frmfmt.hxx>
-#include <swtable.hxx>
 #include <dflyobj.hxx>
 #include <crstate.hxx>
-#include <frmtool.hxx>
-#include <ndtxt.hxx>
 #include <dcontact.hxx>
 #include <sortedobjs.hxx>
 #include <txatbase.hxx>
@@ -58,8 +48,6 @@
 #include <cfloat>
 #include <swselectionlist.hxx>
 
-#include <basegfx/numeric/ftools.hxx>
-
 namespace {
     bool lcl_GetCrsrOfst_Objects( const SwPageFrm* pPageFrm, bool bSearchBackground,
            SwPosition *pPos, Point& rPoint, SwCrsrMoveState* pCMS  )
diff --git a/sw/source/core/layout/virtoutp.cxx b/sw/source/core/layout/virtoutp.cxx
index 6a036894..8e68a81 100644
--- a/sw/source/core/layout/virtoutp.cxx
+++ b/sw/source/core/layout/virtoutp.cxx
@@ -17,14 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/window.hxx>
-
-#include "hintids.hxx"
-#include "viewsh.hxx"
 #include "virtoutp.hxx"
 #include "viewopt.hxx"
 #include "rootfrm.hxx"
-#include "setmapvirtdev.hxx"
 
 #if OSL_DEBUG_LEVEL > 1
 
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index fed406a..5f6941d 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -17,35 +17,23 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <hintids.hxx>
 #include <hints.hxx>
-#include <vcl/outdev.hxx>
 #include <svl/itemiter.hxx>
 #include <editeng/brushitem.hxx>
-#include <editeng/keepitem.hxx>
-#include <editeng/formatbreakitem.hxx>
 #include <fmtornt.hxx>
 #include <pagefrm.hxx>
 #include <section.hxx>
 #include <rootfrm.hxx>
-#include <cntfrm.hxx>
-#include <dcontact.hxx>
 #include <anchoreddrawobject.hxx>
 #include <fmtanchr.hxx>
-#include <viewsh.hxx>
 #include <viewimp.hxx>
 #include "viewopt.hxx"
-#include <doc.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <IDocumentFieldsAccess.hxx>
 #include <fesh.hxx>
 #include <docsh.hxx>
-#include <flyfrm.hxx>
-#include <frmtool.hxx>
 #include <ftninfo.hxx>
-#include <dflyobj.hxx>
 #include <fmtclbl.hxx>
-#include <fmtfordr.hxx>
 #include <fmtfsize.hxx>
 #include <fmtpdsc.hxx>
 #include <txtftn.hxx>
@@ -53,18 +41,15 @@
 #include <fmtsrnd.hxx>
 #include <ftnfrm.hxx>
 #include <tabfrm.hxx>
-#include <htmltbl.hxx>
 #include <flyfrms.hxx>
 #include <sectfrm.hxx>
 #include <fmtclds.hxx>
 #include <txtfrm.hxx>
-#include <ndtxt.hxx>
 #include <bodyfrm.hxx>
 #include <cellfrm.hxx>
 #include <dbg_lay.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <sortedobjs.hxx>
-#include <svx/xdef.hxx>
 
 using namespace ::com::sun::star;
 
commit 93608b3f162a634897c40209cb1cb8cf705deca0
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sun Nov 2 13:50:15 2014 +0100

    sw: unused includes in tabfrm
    
    Change-Id: Ifcc7941e5ff7f870ebf25c26dda0f8cfe0592d24

diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index a4455f2..628ba09 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -19,18 +19,10 @@
 
 #include "pagefrm.hxx"
 #include "rootfrm.hxx"
-#include "cntfrm.hxx"
-#include "viewsh.hxx"
-#include "doc.hxx"
 #include <IDocumentFieldsAccess.hxx>
-#include "docsh.hxx"
 #include "viewimp.hxx"
 #include "swtable.hxx"
 #include "dflyobj.hxx"
-#include "flyfrm.hxx"
-#include "frmtool.hxx"
-#include "frmfmt.hxx"
-#include "dcontact.hxx"
 #include <anchoreddrawobject.hxx>
 #include <fmtanchr.hxx>
 #include "viewopt.hxx"
@@ -38,13 +30,10 @@
 #include "dbg_lay.hxx"
 #include <ftnidx.hxx>
 #include <svl/itemiter.hxx>
-#include <docary.hxx>
 #include <editeng/keepitem.hxx>
 #include <editeng/ulspitem.hxx>
-#include <editeng/lrspitem.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/boxitem.hxx>
-#include <vcl/outdev.hxx>
 #include <fmtlsplt.hxx>
 #include <fmtrowsplt.hxx>
 #include <fmtsrnd.hxx>
@@ -52,7 +41,6 @@
 #include <fmtpdsc.hxx>
 #include <fmtfsize.hxx>
 #include <swtblfmt.hxx>
-#include <ndtxt.hxx>
 #include "tabfrm.hxx"
 #include "rowfrm.hxx"
 #include "cellfrm.hxx"
commit 23e73a4fe94976b4cf05f15f86548d8e9ae04dbc
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sun Nov 2 13:38:02 2014 +0100

    sw: unused include in swselectionlist
    
    Change-Id: Ifba74fa8b9dea36d3c369bff9c8ec598bdd2f5e2

diff --git a/sw/source/core/layout/swselectionlist.cxx b/sw/source/core/layout/swselectionlist.cxx
index dac1cd4..a3613f2 100644
--- a/sw/source/core/layout/swselectionlist.cxx
+++ b/sw/source/core/layout/swselectionlist.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <swselectionlist.hxx>
-#include <layfrm.hxx>
 #include <flyfrm.hxx>
 #include <ftnfrm.hxx>
 
commit 0938916e43616f2f36f43392e7c404f270b0a25a
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sun Nov 2 13:36:35 2014 +0100

    sw: unused includes in ssfrm
    
    Change-Id: I219dec450103c47867793001c749d6b0038b7844

diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 5d0b269..9fe489f 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -17,34 +17,20 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <ftnfrm.hxx>
 #include <pagefrm.hxx>
 #include <rootfrm.hxx>
-#include <cntfrm.hxx>
-#include <doc.hxx>
-#include <node.hxx>
-#include <dview.hxx>
 #include <dcontact.hxx>
-#include <dflyobj.hxx>
 #include <flyfrm.hxx>
 #include <txtfrm.hxx>
 #include <cellfrm.hxx>
 #include <swtable.hxx>
 #include <fmtfsize.hxx>
-#include <ftnidx.hxx>
-#include <txtftn.hxx>
-#include <ndtxt.hxx>
-#include <ndindex.hxx>
-#include <frmtool.hxx>
-#include <pagedesc.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/shaditem.hxx>
 #include <fmtclds.hxx>
-#include <viewsh.hxx>
 #include <viewimp.hxx>
 #include <sortedobjs.hxx>
 #include <hints.hxx>
-#include <switerator.hxx>
 
     // No inline cause we need the function pointers
 long SwFrm::GetTopMargin() const
commit 3831336cce3fbd87e9c0ceebb2890c69a4e25f24
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sun Nov 2 12:50:27 2014 +0100

    sw: unused include in softpagebreak
    
    Change-Id: I0213b167034770ea89617dec42c175a8721d8bb7

diff --git a/sw/source/core/layout/softpagebreak.cxx b/sw/source/core/layout/softpagebreak.cxx
index 55b36e5..85fb783 100644
--- a/sw/source/core/layout/softpagebreak.cxx
+++ b/sw/source/core/layout/softpagebreak.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ndtxt.hxx"
 #include "txtfrm.hxx"
 #include "pagefrm.hxx"
 #include "swtable.hxx"

More information about the Libreoffice-commits mailing list