diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-04-16 23:16:31 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-04-18 10:06:40 +0200 |
| commit | 5503c8904a735f2b47adc29a1fc6500961c01be6 (patch) | |
| tree | a7a4a2407762cf70138bbe08048d2f76ab71d851 | |
| parent | 408fcdf20c4ce505c1905d63d2fa6a14a12fc7f5 (diff) | |
tdf#42949 Fix IWYU warnings in sw/qa/*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: Ia0c79c2455a3b40384332c8c35215671e257a07f
Reviewed-on: https://gerrit.libreoffice.org/70847
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
55 files changed, 93 insertions, 495 deletions
diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml index ce7961e08ca0..7405d42fa7e0 100644 --- a/sw/IwyuFilter_sw.yaml +++ b/sw/IwyuFilter_sw.yaml @@ -262,3 +262,58 @@ blacklist: sw/source/core/inc/frame.hxx: # Needed for direct member access - com/sun/star/style/TabStop.hpp + sw/qa/extras/odfexport/odfexport.cxx: + # Needed for getProperty template + - com/sun/star/graphic/XGraphic.hpp + sw/qa/extras/odfimport/odfimport.cxx: + # Needed for direct member access + - com/sun/star/text/XTextSection.hpp + sw/qa/extras/ooxmlexport/ooxmlexport.cxx: + # Needed for direct member access + - com/sun/star/graphic/XGraphic.hpp + - com/sun/star/text/TableColumnSeparator.hpp + sw/qa/extras/ooxmlexport/ooxmlexport2.cxx: + # Needed for direct member access + - com/sun/star/awt/XBitmap.hpp + sw/qa/extras/ooxmlexport/ooxmlexport3.cxx: + # Needed for direct member access + - com/sun/star/xml/dom/XDocument.hpp + sw/qa/extras/ooxmlexport/ooxmlexport4.cxx: + # Needed for direct member access + - com/sun/star/awt/XBitmap.hpp + sw/qa/extras/ooxmlexport/ooxmlexport8.cxx: + # Needed for direct member access + - com/sun/star/graphic/XGraphic.hpp + sw/qa/extras/ooxmlexport/ooxmlexport9.cxx: + # Needed for direct member access + - com/sun/star/graphic/XGraphic.hpp + sw/qa/extras/ooxmlexport/ooxmlexport10.cxx: + # Needed for direct member access + - com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp + - com/sun/star/graphic/XGraphic.hpp + - com/sun/star/text/TableColumnSeparator.hpp + - com/sun/star/text/XTextColumns.hpp + sw/qa/extras/ooxmlimport/ooxmlimport2.cxx: + # Needed for direct member access + - com/sun/star/document/XEmbeddedObjectSupplier2.hpp + - com/sun/star/embed/Aspects.hpp + sw/qa/extras/rtfimport/rtfimport.cxx: + # Needed for direct member access + - com/sun/star/graphic/XGraphic.hpp + - com/sun/star/text/XDocumentIndexMark.hpp + sw/qa/extras/uiwriter/uiwriter.cxx: + # Needed for for-loop range + - PostItMgr.hxx + # Needed for TypedWhichId macro + - editeng/rsiditem.hxx + sw/qa/extras/unowriter/unowriter.cxx: + # Needed for direct member access + - com/sun/star/awt/XDevice.hpp + # Needed for for-loop range + - com/sun/star/graphic/XGraphic.hpp + sw/qa/extras/ww8export/ww8export.cxx: + # Needed for direct member access + - com/sun/star/graphic/XGraphic.hpp + sw/qa/extras/ww8import/ww8import.cxx: + # Needed for for-loop range + - com/sun/star/graphic/XGraphic.hpp diff --git a/sw/qa/api/SwXDocumentIndex.cxx b/sw/qa/api/SwXDocumentIndex.cxx index b04ba82875cb..e08eb9c00685 100644 --- a/sw/qa/api/SwXDocumentIndex.cxx +++ b/sw/qa/api/SwXDocumentIndex.cxx @@ -17,7 +17,6 @@ #include <unotest/macros_test.hxx> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/DispatchHelper.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/sw/qa/api/SwXDocumentSettings.cxx b/sw/qa/api/SwXDocumentSettings.cxx index 7a2bce7b35e7..dd28bb543553 100644 --- a/sw/qa/api/SwXDocumentSettings.cxx +++ b/sw/qa/api/SwXDocumentSettings.cxx @@ -15,7 +15,6 @@ #include <unotest/macros_test.hxx> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/DispatchHelper.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/sw/qa/core/Test-BigPtrArray.cxx b/sw/qa/core/Test-BigPtrArray.cxx index bc033a399d40..ea70a74aaccb 100644 --- a/sw/qa/core/Test-BigPtrArray.cxx +++ b/sw/qa/core/Test-BigPtrArray.cxx @@ -17,20 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sal/types.h> -#include <rtl/strbuf.hxx> #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include <cppunit/plugin/TestPlugIn.h> //#define TIMELOG for measuring performance -#include <string.h> -#include <stdlib.h> - #include <bparr.hxx> -#include <ndarr.hxx> using namespace std; diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx index 002b8c45c518..bf265b15388f 100644 --- a/sw/qa/core/filters-test.cxx +++ b/sw/qa/core/filters-test.cxx @@ -15,20 +15,14 @@ #include <sfx2/app.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/docfile.hxx> -#include <sfx2/sfxmodelfactory.hxx> #include <sfx2/sfxsids.hrc> #include <sfx2/fcontnr.hxx> #include <svl/stritem.hxx> #include <unotools/tempfile.hxx> -#include <init.hxx> #include <iodetect.hxx> -#include <swtypes.hxx> -#include <doc.hxx> #include <docsh.hxx> -#include <shellres.hxx> -#include <docufld.hxx> typedef tools::SvRef<SwDocShell> SwDocShellRef; diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx index db544178b194..69b4adea4de0 100644 --- a/sw/qa/core/macros-test.cxx +++ b/sw/qa/core/macros-test.cxx @@ -10,43 +10,27 @@ #include <sal/config.h> #include <unotest/macros_test.hxx> #include <test/bootstrapfixture.hxx> -#include <rtl/strbuf.hxx> -#include <osl/file.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/util/SearchOptions2.hpp> #include <com/sun/star/util/SearchAlgorithms2.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XStorable.hpp> -#include <com/sun/star/document/MacroExecMode.hpp> #include <com/sun/star/document/XEmbeddedScripts.hpp> #include <com/sun/star/script/XLibraryContainer.hpp> #include <com/sun/star/script/XLibraryContainerPassword.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/drawing/XShape.hpp> -#include <com/sun/star/drawing/XShapeGrouper.hpp> -#include <com/sun/star/drawing/XControlShape.hpp> #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> -#include <com/sun/star/form/XForm.hpp> -#include <com/sun/star/form/XFormsSupplier.hpp> -#include <com/sun/star/awt/XControlModel.hpp> -#include <com/sun/star/container/XIndexContainer.hpp> #include <i18nutil/searchopt.hxx> -#include <sfx2/app.hxx> -#include <sfx2/docfilt.hxx> -#include <sfx2/docfile.hxx> -#include <sfx2/sfxmodelfactory.hxx> -#include <svl/intitem.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertysequence.hxx> #include <comphelper/scopeguard.hxx> -#include <basic/sbxdef.hxx> #include <unotools/tempfile.hxx> #include <unocrsr.hxx> diff --git a/sw/qa/core/test_ToxLinkProcessor.cxx b/sw/qa/core/test_ToxLinkProcessor.cxx index c4998751a640..01e349a5fea5 100644 --- a/sw/qa/core/test_ToxLinkProcessor.cxx +++ b/sw/qa/core/test_ToxLinkProcessor.cxx @@ -7,8 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <stdexcept> - #include <sal/types.h> #include <rtl/ustring.hxx> @@ -17,12 +15,9 @@ #include <cppunit/TestAssert.h> #include <cppunit/extensions/HelperMacros.h> -#include <cppunit/plugin/TestPlugIn.h> #include <test/bootstrapfixture.hxx> #include <swdll.hxx> -#include <swtypes.hxx> -#include <SwStyleNameMapper.hxx> using namespace sw; diff --git a/sw/qa/core/test_ToxTextGenerator.cxx b/sw/qa/core/test_ToxTextGenerator.cxx index ffe76233282e..e46e40ab4776 100644 --- a/sw/qa/core/test_ToxTextGenerator.cxx +++ b/sw/qa/core/test_ToxTextGenerator.cxx @@ -9,7 +9,6 @@ #include <rtl/ustring.hxx> #include <chpfld.hxx> -#include <ndtxt.hxx> #include <tox.hxx> #include <txmsrt.hxx> #include <ToxTextGenerator.hxx> @@ -20,7 +19,6 @@ #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include <cppunit/plugin/TestPlugIn.h> #include <swdll.hxx> diff --git a/sw/qa/core/test_ToxWhitespaceStripper.cxx b/sw/qa/core/test_ToxWhitespaceStripper.cxx index dc3b23b828aa..430cc78b7686 100644 --- a/sw/qa/core/test_ToxWhitespaceStripper.cxx +++ b/sw/qa/core/test_ToxWhitespaceStripper.cxx @@ -7,8 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <stdexcept> - #include <sal/types.h> #include <rtl/ustring.hxx> diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index c5d179d36e87..0540212e2140 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -8,14 +8,10 @@ */ #include <sal/config.h> -#include <sal/log.hxx> #include <test/bootstrapfixture.hxx> #include <com/sun/star/i18n/WordType.hpp> -#include <rtl/strbuf.hxx> -#include <osl/file.hxx> - #include <comphelper/processfactory.hxx> #include <comphelper/random.hxx> #include <i18nutil/transliteration.hxx> @@ -26,10 +22,8 @@ #include <editeng/langitem.hxx> #include <editeng/charhiddenitem.hxx> -#include <sfx2/app.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/docfile.hxx> -#include <sfx2/sfxmodelfactory.hxx> #include <xmloff/odffields.hxx> @@ -44,11 +38,8 @@ #include <docstat.hxx> #include <docufld.hxx> #include <fmtanchr.hxx> -#include <init.hxx> #include <ndtxt.hxx> -#include <shellio.hxx> #include <shellres.hxx> -#include <swcrsr.hxx> #include <swscanner.hxx> #include <swmodule.hxx> #include <swdll.hxx> @@ -61,7 +52,6 @@ #include <redline.hxx> #include <docary.hxx> #include <modeltoviewhelper.hxx> -#include <scriptinfo.hxx> #include <IMark.hxx> #include <ring.hxx> #include <calbck.hxx> diff --git a/sw/qa/extras/accessibility/accessible_relation_set.cxx b/sw/qa/extras/accessibility/accessible_relation_set.cxx index 68eb27c17ec1..4808c6a9b20e 100644 --- a/sw/qa/extras/accessibility/accessible_relation_set.cxx +++ b/sw/qa/extras/accessibility/accessible_relation_set.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/text/XTextCursor.hpp> #include <com/sun/star/text/ControlCharacter.hpp> -#include <com/sun/star/text/XTextViewCursorSupplier.hpp> using namespace com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sw/qa/extras/docbookexport/docbookexport.cxx b/sw/qa/extras/docbookexport/docbookexport.cxx index 6fa3f66e5a9d..98edee213018 100644 --- a/sw/qa/extras/docbookexport/docbookexport.cxx +++ b/sw/qa/extras/docbookexport/docbookexport.cxx @@ -9,12 +9,6 @@ #include <swmodeltestbase.hxx> -#include <swmodule.hxx> -#include <swdll.hxx> -#include <usrpref.hxx> - -#include <test/xmltesttools.hxx> - class DocbookExportTest : public SwModelTestBase { public: diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx index fd55bc0dc747..e487a07346c2 100644 --- a/sw/qa/extras/globalfilter/globalfilter.cxx +++ b/sw/qa/extras/globalfilter/globalfilter.cxx @@ -21,14 +21,12 @@ #include <IDocumentContentOperations.hxx> #include <doc.hxx> #include <ndgrf.hxx> -#include <drawdoc.hxx> #include <ndindex.hxx> #include <pam.hxx> #include <unotools/fltrcfg.hxx> #include <xmloff/odffields.hxx> #include <IDocumentMarkAccess.hxx> #include <IMark.hxx> -#include <bookmrk.hxx> class Test : public SwModelTestBase { diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx index 1f016f52409a..842289f1dd44 100644 --- a/sw/qa/extras/htmlexport/htmlexport.cxx +++ b/sw/qa/extras/htmlexport/htmlexport.cxx @@ -10,13 +10,10 @@ #include <memory> #include <swmodeltestbase.hxx> -#include <com/sun/star/awt/Gradient.hpp> -#include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/document/XEmbeddedObjectSupplier2.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/io/XActiveDataStreamer.hpp> #include <com/sun/star/io/XSeekable.hpp> -#include <rtl/byteseq.hxx> #include <swmodule.hxx> #include <swdll.hxx> diff --git a/sw/qa/extras/htmlexport/xhtmlexport.cxx b/sw/qa/extras/htmlexport/xhtmlexport.cxx index af97e6a821fc..d9384e318728 100644 --- a/sw/qa/extras/htmlexport/xhtmlexport.cxx +++ b/sw/qa/extras/htmlexport/xhtmlexport.cxx @@ -10,18 +10,6 @@ #include <memory> #include <swmodeltestbase.hxx> -#include <com/sun/star/awt/Gradient.hpp> -#include <com/sun/star/drawing/FillStyle.hpp> -#include <com/sun/star/document/XEmbeddedObjectSupplier2.hpp> -#include <com/sun/star/embed/ElementModes.hpp> -#include <com/sun/star/io/XActiveDataStreamer.hpp> -#include <com/sun/star/io/XSeekable.hpp> -#include <rtl/byteseq.hxx> - -#include <swmodule.hxx> -#include <swdll.hxx> -#include <usrpref.hxx> - #include <test/htmltesttools.hxx> class XHtmlExportTest : public SwModelTestBase, public HtmlTestTools diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx b/sw/qa/extras/htmlimport/htmlimport.cxx index db046ad6c556..7669cf86431a 100644 --- a/sw/qa/extras/htmlimport/htmlimport.cxx +++ b/sw/qa/extras/htmlimport/htmlimport.cxx @@ -13,13 +13,7 @@ #include <com/sun/star/graphic/GraphicType.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/BitmapMode.hpp> -#include <com/sun/star/document/XEmbeddedObjectSupplier2.hpp> -#include <com/sun/star/embed/ElementModes.hpp> -#include <com/sun/star/io/XActiveDataStreamer.hpp> -#include <com/sun/star/io/XSeekable.hpp> #include <tools/datetime.hxx> -#include <unotools/datetime.hxx> -#include <vcl/GraphicNativeTransform.hxx> #include <sfx2/linkmgr.hxx> #include <docsh.hxx> diff --git a/sw/qa/extras/inc/bordertest.hxx b/sw/qa/extras/inc/bordertest.hxx index 160ddbd5db67..b1376ee36530 100644 --- a/sw/qa/extras/inc/bordertest.hxx +++ b/sw/qa/extras/inc/bordertest.hxx @@ -9,10 +9,17 @@ #ifndef INCLUDED_SW_QA_EXTRAS_INC_BORDERTEST_HXX #define INCLUDED_SW_QA_EXTRAS_INC_BORDERTEST_HXX -#include <com/sun/star/table/XCell.hpp> +#include <cppunit/TestAssert.h> #include <com/sun/star/table/BorderLine.hpp> #include <com/sun/star/text/XTextTable.hpp> +#include <com/sun/star/text/XTextDocument.hpp> +#include <com/sun/star/container/XEnumerationAccess.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> +#include <map> + +namespace com::sun::star::table { class XCell; } typedef std::map<OUString, css::table::BorderLine> BorderLineMap; typedef std::pair<OUString, css::table::BorderLine> StringBorderPair; diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx index b9b6632cea12..2a34875c91fa 100644 --- a/sw/qa/extras/inc/swmodeltestbase.hxx +++ b/sw/qa/extras/inc/swmodeltestbase.hxx @@ -27,10 +27,6 @@ #include <com/sun/star/text/XTextViewCursorSupplier.hpp> #include <com/sun/star/table/XCell.hpp> #include <com/sun/star/table/BorderLine2.hpp> -#include <com/sun/star/task/XJob.hpp> -#include <com/sun/star/sdb/CommandType.hpp> -#include <com/sun/star/sdb/DatabaseContext.hpp> -#include <com/sun/star/sdb/XDocumentDataSource.hpp> #include <com/sun/star/xml/AttributeData.hpp> #include <test/bootstrapfixture.hxx> @@ -39,17 +35,12 @@ #include <unotest/macros_test.hxx> #include <unotools/streamwrap.hxx> #include <unotools/ucbstreamhelper.hxx> -#include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> -#include <rtl/byteseq.hxx> #include <sfx2/app.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> #include <unotools/tempfile.hxx> -#include <unotools/localfilehelper.hxx> #include <unotools/mediadescriptor.hxx> -#include <dbmgr.hxx> -#include <unoprnms.hxx> #include <unotxdoc.hxx> #include <docsh.hxx> diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx index dae7008f4f12..d4ef29e9e106 100644 --- a/sw/qa/extras/mailmerge/mailmerge.cxx +++ b/sw/qa/extras/mailmerge/mailmerge.cxx @@ -14,27 +14,21 @@ #include <swmodeltestbase.hxx> -#include <com/sun/star/awt/FontWeight.hpp> -#include <com/sun/star/style/PageStyleLayout.hpp> -#include <com/sun/star/table/XCell.hpp> -#include <com/sun/star/table/BorderLine.hpp> -#include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/text/MailMergeType.hpp> -#include <com/sun/star/sdb/XDocumentDataSource.hpp> +#include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/sdbcx/XRowLocate.hpp> +#include <com/sun/star/task/XJob.hpp> #include <tools/urlobj.hxx> +#include <unotools/localfilehelper.hxx> #include <wrtsh.hxx> #include <ndtxt.hxx> -#include <swdtflvr.hxx> -#include <view.hxx> -#include <edtwin.hxx> -#include <olmenu.hxx> -#include <cmdid.h> #include <pagefrm.hxx> +#include <unoprnms.hxx> +#include <dbmgr.hxx> /** * Maps database URIs to the registered database names for quick lookups diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx index e08e29403d9d..8348438437a1 100644 --- a/sw/qa/extras/odfexport/odfexport.cxx +++ b/sw/qa/extras/odfexport/odfexport.cxx @@ -11,8 +11,6 @@ #include <swmodeltestbase.hxx> #include <config_features.h> -#include <initializer_list> - #if !defined(MACOSX) #include <com/sun/star/awt/FontSlant.hpp> #include <com/sun/star/awt/Gradient.hpp> @@ -26,7 +24,6 @@ #include <com/sun/star/text/RelOrientation.hpp> #include <com/sun/star/text/XDocumentIndex.hpp> #include <com/sun/star/drawing/TextVerticalAdjust.hpp> -#include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <officecfg/Office/Common.hxx> #include <com/sun/star/document/XEmbeddedObjectSupplier.hpp> @@ -39,6 +36,7 @@ #include <unotools/streamwrap.hxx> #include <svl/PasswordHelper.hxx> #include <docufld.hxx> // for SwHiddenTextField::ParseIfFieldDefinition() method call +#include <unoprnms.hxx> class Test : public SwModelTestBase { diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx index b9e4f604a960..0679815ba500 100644 --- a/sw/qa/extras/odfimport/odfimport.cxx +++ b/sw/qa/extras/odfimport/odfimport.cxx @@ -15,10 +15,7 @@ #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/style/PageStyleLayout.hpp> #include <com/sun/star/style/FootnoteLineStyle.hpp> -#include <com/sun/star/table/XCell.hpp> -#include <com/sun/star/table/XCellRange.hpp> #include <com/sun/star/table/BorderLine.hpp> -#include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/text/XTextSection.hpp> #include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/text/PageNumberType.hpp> @@ -31,7 +28,6 @@ #include <view.hxx> #include <edtwin.hxx> #include <olmenu.hxx> -#include <cmdid.h> typedef std::map<OUString, css::uno::Sequence< css::table::BorderLine> > AllBordersMap; typedef std::pair<OUString, css::uno::Sequence< css::table::BorderLine> > StringSequencePair; diff --git a/sw/qa/extras/ooxmlexport/ooxmlencryption.cxx b/sw/qa/extras/ooxmlexport/ooxmlencryption.cxx index 7ec52f34d0e9..c0d6d2ba95b3 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlencryption.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlencryption.cxx @@ -8,7 +8,6 @@ */ #include <swmodeltestbase.hxx> -#include <string> class Test : public SwModelTestBase { diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 8c548ec15480..23eb22cb8d03 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -20,8 +20,7 @@ #include <com/sun/star/text/WritingMode2.hpp> #include <com/sun/star/text/TableColumnSeparator.hpp> #include <oox/drawingml/drawingmltypes.hxx> -#include <config_features.h> -#include <string> + class Test : public SwModelTestBase { public: diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx index dbe64afdc1dd..ebf9577cb499 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx @@ -8,20 +8,18 @@ */ #include <memory> -#include <sstream> #include <swmodeltestbase.hxx> #include <com/sun/star/awt/XBitmap.hpp> +#include <com/sun/star/awt/FontSlant.hpp> #include <com/sun/star/awt/FontUnderline.hpp> #include <com/sun/star/awt/FontWeight.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/document/XEmbeddedObjectSupplier2.hpp> -#include <com/sun/star/drawing/XControlShape.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> #include <com/sun/star/drawing/TextVerticalAdjust.hpp> +#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/RelOrientation.hpp> #include <com/sun/star/text/TableColumnSeparator.hpp> @@ -34,25 +32,17 @@ #include <com/sun/star/text/XPageCursor.hpp> #include <com/sun/star/text/XTextColumns.hpp> #include <com/sun/star/text/XTextFrame.hpp> -#include <com/sun/star/text/XTextField.hpp> #include <com/sun/star/text/XTextFramesSupplier.hpp> #include <com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp> #include <com/sun/star/text/XTextViewCursorSupplier.hpp> -#include <com/sun/star/style/BreakType.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> -#include <com/sun/star/table/ShadowFormat.hpp> -#include <com/sun/star/view/XFormLayerAccess.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/table/BorderLine2.hpp> -#include <com/sun/star/table/TableBorder2.hpp> #include <com/sun/star/text/SizeType.hpp> -#include <com/sun/star/xml/dom/XDocument.hpp> #include <com/sun/star/text/XDocumentIndex.hpp> #include <com/sun/star/style/CaseMap.hpp> #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/document/XImporter.hpp> -#include <vcl/bitmapaccess.hxx> -#include <unotest/assertion_traits.hxx> #include <unotools/fltrcfg.hxx> #include <comphelper/sequenceashashmap.hxx> #include <swtypes.hxx> @@ -62,9 +52,6 @@ #include <unotools/streamwrap.hxx> #include <comphelper/propertysequence.hxx> #include <svx/svdpage.hxx> -#include <editeng/unoprnms.hxx> - -#include <bordertest.hxx> class Test : public SwModelTestBase { diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx index f3dea6a8650e..59795ecaf9e1 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx @@ -9,29 +9,17 @@ #include <swmodeltestbase.hxx> -#include <com/sun/star/awt/Size.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/style/BreakType.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/table/BorderLine.hpp> #include <com/sun/star/text/WritingMode2.hpp> #include <com/sun/star/text/XDependentTextField.hpp> -#include <com/sun/star/text/XFootnote.hpp> -#include <com/sun/star/text/XPageCursor.hpp> -#include <com/sun/star/text/XTextColumns.hpp> -#include <com/sun/star/text/XTextFrame.hpp> -#include <com/sun/star/text/XTextFramesSupplier.hpp> -#include <com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp> -#include <com/sun/star/text/XTextViewCursorSupplier.hpp> -#include <com/sun/star/graphic/XGraphic.hpp> +#include <com/sun/star/text/XFootnotesSupplier.hpp> #include <com/sun/star/text/RubyAdjust.hpp> #include <com/sun/star/text/RubyPosition.hpp> #include <com/sun/star/text/XDocumentIndex.hpp> - - -#include <sfx2/docfile.hxx> -#include <sfx2/docfilt.hxx> -#include <svx/xfillit0.hxx> +#include <com/sun/star/drawing/FillStyle.hpp> class Test : public SwModelTestBase { diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx index 3008ab8186a1..731fcd11cb67 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx @@ -7,62 +7,15 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <memory> #include <sstream> #include <swmodeltestbase.hxx> -#include <com/sun/star/awt/XBitmap.hpp> -#include <com/sun/star/awt/FontUnderline.hpp> -#include <com/sun/star/awt/FontWeight.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/document/XEmbeddedObjectSupplier2.hpp> -#include <com/sun/star/drawing/XControlShape.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> -#include <com/sun/star/drawing/TextVerticalAdjust.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/style/XStyleFamiliesSupplier.hpp> -#include <com/sun/star/text/HoriOrientation.hpp> -#include <com/sun/star/text/RelOrientation.hpp> -#include <com/sun/star/text/TableColumnSeparator.hpp> -#include <com/sun/star/text/TextContentAnchorType.hpp> -#include <com/sun/star/text/VertOrientation.hpp> -#include <com/sun/star/text/WrapTextMode.hpp> -#include <com/sun/star/text/WritingMode2.hpp> #include <com/sun/star/text/XBookmarksSupplier.hpp> #include <com/sun/star/text/XFormField.hpp> -#include <com/sun/star/text/XFootnote.hpp> -#include <com/sun/star/text/XPageCursor.hpp> -#include <com/sun/star/text/XTextColumns.hpp> -#include <com/sun/star/text/XTextFrame.hpp> -#include <com/sun/star/text/XTextField.hpp> -#include <com/sun/star/text/XTextFramesSupplier.hpp> #include <com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp> -#include <com/sun/star/text/XTextViewCursorSupplier.hpp> -#include <com/sun/star/style/BreakType.hpp> -#include <com/sun/star/style/ParagraphAdjust.hpp> -#include <com/sun/star/table/ShadowFormat.hpp> -#include <com/sun/star/view/XFormLayerAccess.hpp> -#include <com/sun/star/view/XSelectionSupplier.hpp> -#include <com/sun/star/table/BorderLine2.hpp> -#include <com/sun/star/table/TableBorder2.hpp> -#include <com/sun/star/text/SizeType.hpp> -#include <com/sun/star/xml/dom/XDocument.hpp> -#include <com/sun/star/text/XDocumentIndex.hpp> -#include <com/sun/star/style/CaseMap.hpp> -#include <com/sun/star/document/XFilter.hpp> -#include <com/sun/star/document/XImporter.hpp> -#include <vcl/bitmapaccess.hxx> -#include <unotest/assertion_traits.hxx> -#include <unotools/fltrcfg.hxx> -#include <swtypes.hxx> -#include <drawdoc.hxx> -#include <oox/drawingml/drawingmltypes.hxx> -#include <unotools/streamwrap.hxx> -#include <svx/svdpage.hxx> -#include <editeng/unoprnms.hxx> - -#include <bordertest.hxx> class Test : public SwModelTestBase { diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx index fc747e30b3dc..86b7e69c331d 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx @@ -9,19 +9,12 @@ #include <swmodeltestbase.hxx> -#include <com/sun/star/awt/Size.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/text/WritingMode2.hpp> -#include <com/sun/star/text/XTextFrame.hpp> -#include <com/sun/star/text/XTextFramesSupplier.hpp> #include <com/sun/star/drawing/XControlShape.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> #include <IDocumentSettingAccess.hxx> -#include <sfx2/docfile.hxx> -#include <sfx2/docfilt.hxx> -#include <svx/xfillit0.hxx> - #include <editsh.hxx> class Test : public SwModelTestBase diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx index a00179292cc5..6090a0591bf4 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx @@ -10,41 +10,24 @@ #include <swmodeltestbase.hxx> #include <com/sun/star/awt/XBitmap.hpp> -#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/drawing/FillStyle.hpp> -#include <com/sun/star/drawing/LineJoint.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/awt/Gradient.hpp> #include <com/sun/star/style/TabStop.hpp> #include <com/sun/star/view/XViewSettingsSupplier.hpp> #include <com/sun/star/text/RelOrientation.hpp> -#include <com/sun/star/text/XTextFrame.hpp> #include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/text/XTextFramesSupplier.hpp> -#include <com/sun/star/text/XTextViewCursorSupplier.hpp> -#include <com/sun/star/text/XTextSection.hpp> -#include <com/sun/star/style/CaseMap.hpp> +// #include <com/sun/star/text/XTextViewCursorSupplier.hpp> // keep for test1Table1Page #include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/style/LineSpacing.hpp> #include <com/sun/star/style/LineSpacingMode.hpp> -#include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/table/ShadowFormat.hpp> -#include <com/sun/star/text/XPageCursor.hpp> -#include <com/sun/star/awt/FontWeight.hpp> -#include <com/sun/star/awt/FontUnderline.hpp> -#include <com/sun/star/awt/FontSlant.hpp> +//#include <com/sun/star/text/XPageCursor.hpp> // keep for test1Table1Page +//#include <com/sun/star/awt/FontWeight.hpp> // keep for testTableStylerPrSz #include <com/sun/star/text/WritingMode2.hpp> #include <com/sun/star/text/WrapTextMode.hpp> -#include <com/sun/star/xml/dom/XDocument.hpp> -#include <com/sun/star/style/BreakType.hpp> -#include <unotools/tempfile.hxx> -#include <com/sun/star/text/XDocumentIndex.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> -#include <com/sun/star/drawing/TextVerticalAdjust.hpp> -#include <com/sun/star/drawing/Hatch.hpp> #include <oox/drawingml/drawingmltypes.hxx> #include <string> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx index 8d3c4cbd57fd..5a2176aa8253 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx @@ -9,47 +9,21 @@ #include <swmodeltestbase.hxx> -#include <com/sun/star/awt/XBitmap.hpp> -#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/drawing/FillStyle.hpp> -#include <com/sun/star/drawing/LineJoint.hpp> -#include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/awt/Gradient.hpp> -#include <com/sun/star/style/TabStop.hpp> -#include <com/sun/star/view/XViewSettingsSupplier.hpp> -#include <com/sun/star/text/RelOrientation.hpp> -#include <com/sun/star/text/XTextFrame.hpp> #include <com/sun/star/text/XTextTable.hpp> -#include <com/sun/star/text/XTextFramesSupplier.hpp> #include <com/sun/star/text/XTextViewCursorSupplier.hpp> -#include <com/sun/star/text/XTextSection.hpp> #include <com/sun/star/style/CaseMap.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> -#include <com/sun/star/style/LineSpacing.hpp> -#include <com/sun/star/style/LineSpacingMode.hpp> -#include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/table/ShadowFormat.hpp> #include <com/sun/star/text/GraphicCrop.hpp> #include <com/sun/star/text/XPageCursor.hpp> -#include <com/sun/star/awt/FontWeight.hpp> -#include <com/sun/star/awt/FontUnderline.hpp> -#include <com/sun/star/awt/FontSlant.hpp> #include <com/sun/star/text/WritingMode2.hpp> -#include <com/sun/star/text/WrapTextMode.hpp> #include <com/sun/star/xml/dom/XDocument.hpp> #include <com/sun/star/style/BreakType.hpp> -#include <unotools/tempfile.hxx> -#include <com/sun/star/text/XDocumentIndex.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> -#include <com/sun/star/drawing/TextVerticalAdjust.hpp> -#include <com/sun/star/drawing/Hatch.hpp> #include <ftninfo.hxx> -#include <string> - #if !defined(_WIN32) class Test : public SwModelTestBase diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx index 329ba7dd6b51..85ecb0cae056 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx @@ -12,43 +12,16 @@ #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/drawing/FillStyle.hpp> -#include <com/sun/star/drawing/LineJoint.hpp> -#include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/XControlShape.hpp> -#include <com/sun/star/awt/Gradient.hpp> -#include <com/sun/star/style/TabStop.hpp> -#include <com/sun/star/view/XViewSettingsSupplier.hpp> #include <com/sun/star/text/RelOrientation.hpp> -#include <com/sun/star/text/XTextFrame.hpp> #include <com/sun/star/text/XTextTable.hpp> -#include <com/sun/star/text/XTextFramesSupplier.hpp> #include <com/sun/star/text/XTextViewCursorSupplier.hpp> -#include <com/sun/star/text/XTextSection.hpp> #include <com/sun/star/text/XTextColumns.hpp> -#include <com/sun/star/style/CaseMap.hpp> -#include <com/sun/star/style/ParagraphAdjust.hpp> -#include <com/sun/star/style/LineSpacing.hpp> -#include <com/sun/star/style/LineSpacingMode.hpp> -#include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/table/BorderLine2.hpp> -#include <com/sun/star/table/ShadowFormat.hpp> #include <com/sun/star/text/XPageCursor.hpp> -#include <com/sun/star/awt/FontWeight.hpp> -#include <com/sun/star/awt/FontUnderline.hpp> -#include <com/sun/star/awt/FontSlant.hpp> -#include <com/sun/star/text/WritingMode2.hpp> -#include <com/sun/star/text/WrapTextMode.hpp> -#include <com/sun/star/xml/dom/XDocument.hpp> -#include <com/sun/star/style/BreakType.hpp> +#include <com/sun/star/util/Date.hpp> #include <unotools/tempfile.hxx> -#include <com/sun/star/text/XDocumentIndex.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> -#include <com/sun/star/drawing/TextVerticalAdjust.hpp> -#include <com/sun/star/drawing/Hatch.hpp> #include <config_features.h> -#include <string> class Test : public SwModelTestBase { diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx index 0f051740b21f..8e96d05506cd 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx @@ -9,50 +9,16 @@ #include <swmodeltestbase.hxx> -#include <com/sun/star/awt/XBitmap.hpp> -#include <com/sun/star/graphic/XGraphic.hpp> -#include <com/sun/star/drawing/FillStyle.hpp> -#include <com/sun/star/drawing/LineJoint.hpp> -#include <com/sun/star/drawing/LineStyle.hpp> -#include <com/sun/star/awt/Gradient.hpp> -#include <com/sun/star/style/TabStop.hpp> -#include <com/sun/star/view/XViewSettingsSupplier.hpp> -#include <com/sun/star/text/RelOrientation.hpp> #include <com/sun/star/text/XFootnote.hpp> -#include <com/sun/star/text/XTextFrame.hpp> #include <com/sun/star/text/XTextTable.hpp> -#include <com/sun/star/text/XTextFramesSupplier.hpp> -#include <com/sun/star/text/XTextViewCursorSupplier.hpp> -#include <com/sun/star/text/XTextSection.hpp> -#include <com/sun/star/style/CaseMap.hpp> -#include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/style/LineSpacing.hpp> #include <com/sun/star/style/LineSpacingMode.hpp> -#include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/table/BorderLine2.hpp> -#include <com/sun/star/table/ShadowFormat.hpp> -#include <com/sun/star/text/XPageCursor.hpp> -#include <com/sun/star/awt/FontWeight.hpp> -#include <com/sun/star/awt/FontUnderline.hpp> -#include <com/sun/star/awt/FontSlant.hpp> -#include <com/sun/star/text/WritingMode2.hpp> -#include <com/sun/star/text/WrapTextMode.hpp> -#include <com/sun/star/xml/dom/XDocument.hpp> -#include <com/sun/star/style/BreakType.hpp> -#include <unotools/tempfile.hxx> -#include <com/sun/star/text/XDocumentIndex.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> -#include <com/sun/star/drawing/TextVerticalAdjust.hpp> -#include <com/sun/star/drawing/Hatch.hpp> #include <com/sun/star/rdf/URI.hpp> #include <com/sun/star/rdf/Statement.hpp> -#include <string> -#include <config_features.h> -#include <unocrsr.hxx> -#include <ndtxt.hxx> +#include <ndindex.hxx> +#include <pam.hxx> class Test : public SwModelTestBase { diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx index 73cb2653bf47..3a546a80d6c4 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx @@ -18,7 +18,6 @@ #include <com/sun/star/drawing/Hatch.hpp> #include <com/sun/star/drawing/LineJoint.hpp> #include <com/sun/star/drawing/LineStyle.hpp> -#include <com/sun/star/drawing/PointSequenceSequence.hpp> #include <com/sun/star/drawing/TextVerticalAdjust.hpp> #include <com/sun/star/style/LineSpacing.hpp> #include <com/sun/star/style/LineSpacingMode.hpp> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx index 734ada046e6a..90ae3b0ca1e9 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx @@ -10,17 +10,9 @@ #include <swmodeltestbase.hxx> -#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> -#include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/Hatch.hpp> -#include <com/sun/star/drawing/LineJoint.hpp> -#include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/PointSequenceSequence.hpp> #include <com/sun/star/drawing/TextVerticalAdjust.hpp> -#include <com/sun/star/style/LineSpacing.hpp> -#include <com/sun/star/style/LineSpacingMode.hpp> #include <pagedesc.hxx> #include <comphelper/sequenceashashmap.hxx> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx index 9ab8a3f11731..f798ad98000e 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx @@ -20,52 +20,30 @@ #include <IDocumentSettingAccess.hxx> #include <com/sun/star/awt/XBitmap.hpp> -#include <com/sun/star/awt/FontUnderline.hpp> -#include <com/sun/star/awt/FontWeight.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/document/XEmbeddedObjectSupplier2.hpp> #include <com/sun/star/drawing/XControlShape.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> #include <com/sun/star/drawing/TextVerticalAdjust.hpp> +#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> -#include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/RelOrientation.hpp> #include <com/sun/star/text/TableColumnSeparator.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/text/VertOrientation.hpp> #include <com/sun/star/text/WrapTextMode.hpp> #include <com/sun/star/text/WritingMode2.hpp> -#include <com/sun/star/text/XBookmarksSupplier.hpp> -#include <com/sun/star/text/XFootnote.hpp> #include <com/sun/star/text/XPageCursor.hpp> -#include <com/sun/star/text/XTextColumns.hpp> -#include <com/sun/star/text/XTextFrame.hpp> #include <com/sun/star/text/XTextFramesSupplier.hpp> -#include <com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp> #include <com/sun/star/text/XTextViewCursorSupplier.hpp> #include <com/sun/star/style/BreakType.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/table/ShadowFormat.hpp> #include <com/sun/star/view/XFormLayerAccess.hpp> -#include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/table/TableBorder2.hpp> -#include <com/sun/star/text/SizeType.hpp> -#include <com/sun/star/xml/dom/XDocument.hpp> -#include <com/sun/star/text/XDocumentIndex.hpp> -#include <com/sun/star/style/CaseMap.hpp> -#include <com/sun/star/document/XFilter.hpp> -#include <com/sun/star/document/XImporter.hpp> -#include <vcl/bitmapaccess.hxx> -#include <unotest/assertion_traits.hxx> #include <unotools/fltrcfg.hxx> #include <comphelper/sequenceashashmap.hxx> -#include <swtypes.hxx> -#include <drawdoc.hxx> #include <oox/drawingml/drawingmltypes.hxx> -#include <unotools/streamwrap.hxx> -#include <svx/svdpage.hxx> #include <bordertest.hxx> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx index 8696259fe959..bf6de85706b5 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx @@ -11,13 +11,10 @@ #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> #include <com/sun/star/text/XFootnote.hpp> #include <com/sun/star/text/XPageCursor.hpp> #include <com/sun/star/text/XTextColumns.hpp> -#include <com/sun/star/text/XTextFrame.hpp> #include <com/sun/star/text/XTextFramesSupplier.hpp> -#include <com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp> #include <com/sun/star/text/XTextViewCursorSupplier.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/style/BreakType.hpp> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport_template.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport_template.cxx index b25e588c5406..d901af1ed886 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport_template.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport_template.cxx @@ -8,7 +8,6 @@ */ #include <swmodeltestbase.hxx> -#include <string> class Test : public SwModelTestBase { diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx index dc5a880a72f8..b5b6b6040216 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx @@ -9,46 +9,6 @@ #include <swmodeltestbase.hxx> -#include <com/sun/star/awt/XBitmap.hpp> -#include <com/sun/star/graphic/XGraphic.hpp> -#include <com/sun/star/drawing/FillStyle.hpp> -#include <com/sun/star/drawing/LineJoint.hpp> -#include <com/sun/star/drawing/LineStyle.hpp> -#include <com/sun/star/awt/Gradient.hpp> -#include <com/sun/star/style/TabStop.hpp> -#include <com/sun/star/view/XViewSettingsSupplier.hpp> -#include <com/sun/star/text/RelOrientation.hpp> -#include <com/sun/star/text/XTextFrame.hpp> -#include <com/sun/star/text/XTextTable.hpp> -#include <com/sun/star/text/XTextFramesSupplier.hpp> -#include <com/sun/star/text/XTextViewCursorSupplier.hpp> -#include <com/sun/star/text/XTextSection.hpp> -#include <com/sun/star/style/CaseMap.hpp> -#include <com/sun/star/style/ParagraphAdjust.hpp> -#include <com/sun/star/style/LineSpacing.hpp> -#include <com/sun/star/style/LineSpacingMode.hpp> -#include <com/sun/star/view/XSelectionSupplier.hpp> -#include <com/sun/star/table/BorderLine2.hpp> -#include <com/sun/star/table/ShadowFormat.hpp> -#include <com/sun/star/text/GraphicCrop.hpp> -#include <com/sun/star/text/XPageCursor.hpp> -#include <com/sun/star/awt/FontWeight.hpp> -#include <com/sun/star/awt/FontUnderline.hpp> -#include <com/sun/star/awt/FontSlant.hpp> -#include <com/sun/star/text/WritingMode2.hpp> -#include <com/sun/star/text/WrapTextMode.hpp> -#include <com/sun/star/xml/dom/XDocument.hpp> -#include <com/sun/star/style/BreakType.hpp> -#include <unotools/tempfile.hxx> -#include <com/sun/star/text/XDocumentIndex.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> -#include <com/sun/star/drawing/TextVerticalAdjust.hpp> -#include <com/sun/star/drawing/Hatch.hpp> - -#include <string> - class Test : public SwModelTestBase { public: diff --git a/sw/qa/extras/ooxmlexport/ooxmllinks.cxx b/sw/qa/extras/ooxmlexport/ooxmllinks.cxx index d6b6d39652f3..146497c23957 100644 --- a/sw/qa/extras/ooxmlexport/ooxmllinks.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmllinks.cxx @@ -10,8 +10,6 @@ #include <swmodeltestbase.hxx> #include <unotools/tempfile.hxx> #include <tools/urlobj.hxx> -#include <sfx2/docfile.hxx> -#include <sfx2/docfilt.hxx> #include <unotools/saveopt.hxx> // This file contains tests to check relative/absolute hyperlinks handling diff --git a/sw/qa/extras/ooxmlexport/ooxmlw14export.cxx b/sw/qa/extras/ooxmlexport/ooxmlw14export.cxx index 4633fdaf6300..d6f13dfc55a7 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlw14export.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlw14export.cxx @@ -9,8 +9,6 @@ #include <swmodeltestbase.hxx> -#include <string> - class Test : public SwModelTestBase { public: diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index eca2260e8f96..53deec97aae0 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -20,14 +20,12 @@ #include <swmodeltestbase.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> -#include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/document/XEmbeddedObjectSupplier2.hpp> #include <com/sun/star/drawing/PointSequenceSequence.hpp> #include <com/sun/star/drawing/GraphicExportFilter.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp> #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp> -#include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/style/BreakType.hpp> #include <com/sun/star/style/DropCapFormat.hpp> @@ -41,18 +39,12 @@ #include <com/sun/star/text/WrapTextMode.hpp> #include <com/sun/star/text/XDependentTextField.hpp> #include <com/sun/star/text/XFormField.hpp> -#include <com/sun/star/text/XPageCursor.hpp> -#include <com/sun/star/text/XTextColumns.hpp> #include <com/sun/star/text/XTextFieldsSupplier.hpp> #include <com/sun/star/text/XTextFrame.hpp> #include <com/sun/star/text/XTextFramesSupplier.hpp> -#include <com/sun/star/text/XTextViewCursorSupplier.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/text/SizeType.hpp> #include <com/sun/star/util/DateTime.hpp> -#include <com/sun/star/document/XFilter.hpp> -#include <com/sun/star/document/XImporter.hpp> -#include <vcl/bitmapaccess.hxx> #include <unotools/fltrcfg.hxx> #include <comphelper/sequenceashashmap.hxx> #include <com/sun/star/text/GraphicCrop.hpp> diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx index 2a2efc42da0b..3df3f1adf8db 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx @@ -7,8 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <memory> - #ifdef MACOSX #define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0 #include <premac.h> @@ -18,7 +16,6 @@ #include <swmodeltestbase.hxx> #include <wrtsh.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/document/XEmbeddedObjectSupplier2.hpp> #include <com/sun/star/embed/Aspects.hpp> diff --git a/sw/qa/extras/rtfexport/rtfexport2.cxx b/sw/qa/extras/rtfexport/rtfexport2.cxx index e363be008429..282af9bafa97 100644 --- a/sw/qa/extras/rtfexport/rtfexport2.cxx +++ b/sw/qa/extras/rtfexport/rtfexport2.cxx @@ -10,7 +10,6 @@ #include <memory> #include <swmodeltestbase.hxx> -#include <com/sun/star/awt/FontWeight.hpp> #include <com/sun/star/graphic/GraphicType.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -18,33 +17,25 @@ #include <com/sun/star/style/LineSpacing.hpp> #include <com/sun/star/style/LineSpacingMode.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> -#include <com/sun/star/style/TabStop.hpp> #include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/table/BorderLineStyle.hpp> -#include <com/sun/star/text/RelOrientation.hpp> #include <com/sun/star/text/TableColumnSeparator.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/text/XFootnotesSupplier.hpp> -#include <com/sun/star/text/XPageCursor.hpp> #include <com/sun/star/text/XTextGraphicObjectsSupplier.hpp> #include <com/sun/star/text/XTextFieldsSupplier.hpp> #include <com/sun/star/text/XTextFramesSupplier.hpp> #include <com/sun/star/text/XTextRangeCompare.hpp> #include <com/sun/star/text/XTextTablesSupplier.hpp> #include <com/sun/star/text/XTextTable.hpp> -#include <com/sun/star/text/XTextViewCursorSupplier.hpp> #include <com/sun/star/text/WrapTextMode.hpp> #include <com/sun/star/text/HoriOrientation.hpp> -#include <com/sun/star/text/WritingMode2.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> -#include <com/sun/star/graphic/XGraphic.hpp> #include <rtl/ustring.hxx> #include <vcl/outdev.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -#include <unotools/ucbstreamhelper.hxx> -#include <comphelper/sequenceashashmap.hxx> #include <i18nlangtag/languagetag.hxx> #include <bordertest.hxx> diff --git a/sw/qa/extras/rtfexport/rtfexport3.cxx b/sw/qa/extras/rtfexport/rtfexport3.cxx index 85336a3ec453..5b7e66f28867 100644 --- a/sw/qa/extras/rtfexport/rtfexport3.cxx +++ b/sw/qa/extras/rtfexport/rtfexport3.cxx @@ -9,14 +9,8 @@ #include <swmodeltestbase.hxx> -#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> -#include <com/sun/star/style/PageStyleLayout.hpp> -#include <com/sun/star/text/WritingMode2.hpp> #include <com/sun/star/text/XFootnote.hpp> #include <com/sun/star/text/XFootnotesSupplier.hpp> -#include <com/sun/star/text/XPageCursor.hpp> -#include <com/sun/star/text/XTextViewCursorSupplier.hpp> -#include <com/sun/star/text/XTextColumns.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> class Test : public SwModelTestBase diff --git a/sw/qa/extras/rtfexport/rtfexport4.cxx b/sw/qa/extras/rtfexport/rtfexport4.cxx index 5f327782df6b..f26f558267b2 100644 --- a/sw/qa/extras/rtfexport/rtfexport4.cxx +++ b/sw/qa/extras/rtfexport/rtfexport4.cxx @@ -9,28 +9,7 @@ #include <swmodeltestbase.hxx> -#include <com/sun/star/awt/Gradient.hpp> -#include <com/sun/star/awt/XBitmap.hpp> -#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> -#include <com/sun/star/drawing/FillStyle.hpp> -#include <com/sun/star/drawing/PointSequenceSequence.hpp> -#include <com/sun/star/style/PageStyleLayout.hpp> -#include <com/sun/star/table/BorderLine2.hpp> -#include <com/sun/star/table/ShadowFormat.hpp> -#include <com/sun/star/text/FontEmphasis.hpp> -#include <com/sun/star/text/RelOrientation.hpp> -#include <com/sun/star/text/TableColumnSeparator.hpp> -#include <com/sun/star/text/TextContentAnchorType.hpp> -#include <com/sun/star/text/XFootnotesSupplier.hpp> -#include <com/sun/star/text/XPageCursor.hpp> -#include <com/sun/star/text/XTextViewCursorSupplier.hpp> #include <com/sun/star/text/WritingMode2.hpp> -#include <com/sun/star/view/XViewSettingsSupplier.hpp> -#include <com/sun/star/text/RubyAdjust.hpp> -#include <com/sun/star/text/RubyPosition.hpp> -#include <com/sun/star/text/XTextColumns.hpp> -#include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> /** diff --git a/sw/qa/extras/rtfexport/rtfexport5.cxx b/sw/qa/extras/rtfexport/rtfexport5.cxx index 8e73fa5e2747..7f11ece22fa8 100644 --- a/sw/qa/extras/rtfexport/rtfexport5.cxx +++ b/sw/qa/extras/rtfexport/rtfexport5.cxx @@ -12,9 +12,6 @@ #include <com/sun/star/awt/FontWeight.hpp> #include <com/sun/star/graphic/GraphicType.hpp> -#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/style/CaseMap.hpp> #include <com/sun/star/style/LineSpacing.hpp> #include <com/sun/star/style/LineSpacingMode.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> @@ -26,29 +23,19 @@ #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/text/XFootnotesSupplier.hpp> #include <com/sun/star/text/XPageCursor.hpp> -#include <com/sun/star/text/XTextGraphicObjectsSupplier.hpp> #include <com/sun/star/text/XTextFieldsSupplier.hpp> -#include <com/sun/star/text/XTextFramesSupplier.hpp> -#include <com/sun/star/text/XTextRangeCompare.hpp> #include <com/sun/star/text/XTextTablesSupplier.hpp> #include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/text/XTextViewCursorSupplier.hpp> -#include <com/sun/star/text/WrapTextMode.hpp> -#include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/WritingMode2.hpp> -#include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <rtl/ustring.hxx> -#include <vcl/outdev.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -#include <unotools/ucbstreamhelper.hxx> #include <comphelper/sequenceashashmap.hxx> #include <i18nlangtag/languagetag.hxx> -#include <bordertest.hxx> - class Test : public SwModelTestBase { public: diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 8e126203238f..92ef3de21d9d 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -46,20 +46,6 @@ #include <comphelper/sequenceashashmap.hxx> #include <comphelper/configuration.hxx> -namespace com -{ -namespace sun -{ -namespace star -{ -namespace graphic -{ -class XGraphic; -} -} -} -} - class Test : public SwModelTestBase { public: diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index 07ec78c3e542..1b4148893bfe 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -20,7 +20,6 @@ #include <comphelper/lok.hxx> #include <svx/svdpage.hxx> #include <svx/svdview.hxx> -#include <vcl/svapp.hxx> #include <vcl/virdev.hxx> #include <editeng/editview.hxx> #include <editeng/outliner.hxx> diff --git a/sw/qa/extras/txtexport/txtexport.cxx b/sw/qa/extras/txtexport/txtexport.cxx index d7759ba12ee0..36fa884044c1 100644 --- a/sw/qa/extras/txtexport/txtexport.cxx +++ b/sw/qa/extras/txtexport/txtexport.cxx @@ -9,12 +9,8 @@ #include <swmodeltestbase.hxx> -#include <swmodule.hxx> -#include <swdll.hxx> - #include <shellio.hxx> #include <unotextrange.hxx> -#include <usrpref.hxx> #include <iodetect.hxx> class TxtImportTest : public SwModelTestBase diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index c63fc4064685..7dc0ef592a1d 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -42,7 +42,6 @@ #include <IDocumentMarkAccess.hxx> #include <IDocumentSettingAccess.hxx> #include <pagedesc.hxx> -#include <postithelper.hxx> #include <PostItMgr.hxx> #include <AnnotationWin.hxx> #include <com/sun/star/text/XDefaultNumberingProvider.hpp> @@ -51,6 +50,7 @@ #include <svx/svdpage.hxx> #include <svx/svdview.hxx> #include <svl/itemiter.hxx> +#include <unotools/localfilehelper.hxx> #include <editeng/eeitem.hxx> #include <editeng/scripttypeitem.hxx> @@ -62,7 +62,6 @@ #include <reffld.hxx> #include <dbfld.hxx> #include <txatbase.hxx> -#include <ftnidx.hxx> #include <txtftn.hxx> #include <IDocumentDrawModelAccess.hxx> #include <IDocumentFieldsAccess.hxx> @@ -81,10 +80,11 @@ #include <com/sun/star/util/SearchAlgorithms2.hpp> #include <com/sun/star/util/SearchFlags.hpp> #include <com/sun/star/util/SearchAlgorithms.hpp> +#include <com/sun/star/sdb/DatabaseContext.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> +#include <com/sun/star/sdbc/XDataSource.hpp> #include <com/sun/star/text/XParagraphCursor.hpp> #include <com/sun/star/util/XPropertyReplace.hpp> -#include <com/sun/star/awt/FontStrikeout.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/text/XTextField.hpp> #include <com/sun/star/text/TextMarkupType.hpp> @@ -115,11 +115,11 @@ #include <sfx2/watermarkitem.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/docfile.hxx> -#include <svtools/htmlout.hxx> #include <test/htmltesttools.hxx> #include <fmthdft.hxx> #include <iodetect.hxx> #include <wrthtml.hxx> +#include <dbmgr.hxx> namespace { diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx b/sw/qa/extras/uiwriter/uiwriter2.cxx index 97f7978c20b1..4c58cd743722 100644 --- a/sw/qa/extras/uiwriter/uiwriter2.cxx +++ b/sw/qa/extras/uiwriter/uiwriter2.cxx @@ -8,31 +8,24 @@ */ #include <swmodeltestbase.hxx> -#include <com/sun/star/awt/FontSlant.hpp> #include <com/sun/star/frame/DispatchHelper.hpp> #include <com/sun/star/style/LineSpacing.hpp> #include <comphelper/propertysequence.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <i18nlangtag/languagetag.hxx> -#include <svx/svdpage.hxx> -#include <svx/svdview.hxx> #include <vcl/scheduler.hxx> -#include <dcontact.hxx> -#include <drawdoc.hxx> +#include <vcl/settings.hxx> #include <ndtxt.hxx> #include <swdtflvr.hxx> #include <wrtsh.hxx> -#include <redline.hxx> -#include <flyfrms.hxx> +#include <IDocumentRedlineAccess.hxx> +#include <flyfrm.hxx> +#include <fmtanchr.hxx> #include <UndoManager.hxx> -#include <edtwin.hxx> -#include <view.hxx> #include <sortedobjs.hxx> #include <anchoredobject.hxx> -#include <swtypes.hxx> #include <itabenum.hxx> #include <fmtfsize.hxx> -#include <fmtornt.hxx> #include <xmloff/odffields.hxx> #include <txtfrm.hxx> diff --git a/sw/qa/extras/ww8export/ww8export2.cxx b/sw/qa/extras/ww8export/ww8export2.cxx index 5419aa42b959..1900d0569a03 100644 --- a/sw/qa/extras/ww8export/ww8export2.cxx +++ b/sw/qa/extras/ww8export/ww8export2.cxx @@ -9,14 +9,12 @@ #include <swmodeltestbase.hxx> -#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/WritingMode2.hpp> #include <com/sun/star/text/XDependentTextField.hpp> -#include <com/sun/star/text/XTextFramesSupplier.hpp> #include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/text/XTextTablesSupplier.hpp> #include <com/sun/star/text/XFootnote.hpp> @@ -26,11 +24,9 @@ #include <com/sun/star/text/TextContentAnchorType.hpp> #include <ftninfo.hxx> -#include <pagedesc.hxx> #include <svx/svdpage.hxx> #include <drawdoc.hxx> #include <IDocumentDrawModelAccess.hxx> -#include <editeng/unoprnms.hxx> class Test : public SwModelTestBase { diff --git a/sw/qa/extras/ww8export/ww8export3.cxx b/sw/qa/extras/ww8export/ww8export3.cxx index b016bb5f3e04..239ce2bcbf2e 100644 --- a/sw/qa/extras/ww8export/ww8export3.cxx +++ b/sw/qa/extras/ww8export/ww8export3.cxx @@ -12,15 +12,12 @@ #include <IDocumentSettingAccess.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XIndexAccess.hpp> +#include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/text/XFormField.hpp> -#include <com/sun/star/text/XTextFramesSupplier.hpp> #include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/text/XTextTablesSupplier.hpp> #include <com/sun/star/text/WritingMode2.hpp> -#include <drawdoc.hxx> -#include <svx/xfillit0.hxx> - class Test : public SwModelTestBase { public: diff --git a/sw/qa/extras/ww8import/ww8import.cxx b/sw/qa/extras/ww8import/ww8import.cxx index 93c3d88ca8ae..abdc2a335227 100644 --- a/sw/qa/extras/ww8import/ww8import.cxx +++ b/sw/qa/extras/ww8import/ww8import.cxx @@ -12,7 +12,6 @@ #include <com/sun/star/text/XTextColumns.hpp> #include <com/sun/star/text/XTextTablesSupplier.hpp> #include <com/sun/star/graphic/XGraphic.hpp> -#include <ndtxt.hxx> #include <viscrs.hxx> #include <wrtsh.hxx> #include <editeng/boxitem.hxx> diff --git a/sw/qa/unit/sw-dialogs-test.cxx b/sw/qa/unit/sw-dialogs-test.cxx index b269739b7232..70584b601803 100644 --- a/sw/qa/unit/sw-dialogs-test.cxx +++ b/sw/qa/unit/sw-dialogs-test.cxx @@ -10,14 +10,11 @@ #include <sal/config.h> #include <test/screenshot_test.hxx> #include <rtl/bootstrap.hxx> -#include <rtl/strbuf.hxx> -#include <osl/file.hxx> #include <osl/module.hxx> #include <tools/svlibrary.h> -#include <sfx2/app.hxx> #include <vcl/abstdlg.hxx> -#include <swabstdlg.hxx> +class SwAbstractDialogFactory; using namespace ::com::sun::star; diff --git a/sw/qa/unit/sw-dialogs-test_2.cxx b/sw/qa/unit/sw-dialogs-test_2.cxx index 5b4c5fad625d..a925a8e9c615 100644 --- a/sw/qa/unit/sw-dialogs-test_2.cxx +++ b/sw/qa/unit/sw-dialogs-test_2.cxx @@ -10,16 +10,14 @@ #include <sal/config.h> #include <test/screenshot_test.hxx> #include <rtl/bootstrap.hxx> -#include <rtl/strbuf.hxx> -#include <osl/file.hxx> #include <osl/module.hxx> #include <tools/svlibrary.h> -#include <sfx2/app.hxx> #include <vcl/abstdlg.hxx> -#include <swabstdlg.hxx> #include <swdll.hxx> +class SwAbstractDialogFactory; + using namespace ::com::sun::star; extern "C" { using Fn = SwAbstractDialogFactory * (*)(); } |