Remove last PCH traces

Change-Id: I6b5d7422eecb90c612e76fd59a6316a4ea7a8698

17 files changed, 70 insertions, 85 deletions

diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx
index 80dd7d625af5..60c899fa014a 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -21,7 +21,8 @@
 #define _BASDOC_HXX
 
 #include <iderid.hxx>
-
+#include <sfx2/docfac.hxx>
+#include <sfx2/objsh.hxx>
 #include <svx/ifaceids.hxx>
 
 class SfxPrinter;
diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index 3be9e2b19394..600f6bbec67a 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -17,10 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#include <ide_pch.hxx>
-
-
 #include <basidesh.hrc>
 #include <basidesh.hxx>
 #include <basobj.hxx>
@@ -37,9 +33,10 @@
 #include "dlgresid.hrc"
 #include <editeng/unolingu.hxx>
 
+#include <sfx2/dinfdlg.hxx>
+#include <sfx2/dispatch.hxx>
 #include <svtools/langtab.hxx>
 
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index c0479fd9b99a..fa504e3f23b1 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -17,9 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#include <ide_pch.hxx>
-
 #include "baside2.hxx"
 #include "brkdlg.hxx"
 #include "iderdll.hxx"
@@ -28,14 +25,23 @@
 
 #include "baside2.hrc"
 
+#include <basic/basmgr.hxx>
 #include <basic/basrdll.hxx>
+#include <basic/sbmeth.hxx>
 #include <com/sun/star/script/ModuleType.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <comphelper/processfactory.hxx>
+#include <sfx2/dinfdlg.hxx>
+#include <sfx2/dispatch.hxx>
 #include <sfx2/docfile.hxx>
+#include <sfx2/printer.hxx>
+#include <sfx2/request.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/srchitem.hxx>
+#include <svl/whiter.hxx>
 #include <svtools/xtextedt.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index ec11125f6ebf..27637dfe9385 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -25,8 +25,6 @@
 #define _SDR_NODRAGMETHODS
 #define _SDR_NOXOUTDEV
 
-#include "ide_pch.hxx"
-
 #include "basidesh.hrc"
 #include "helpid.hrc"
 
@@ -43,6 +41,7 @@
 #include "localizationmgr.hxx"
 #include "propbrw.hxx"
 
+#include <basic/basmgr.hxx>
 #include <com/sun/star/resource/StringResourceWithLocation.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
 #include <com/sun/star/ucb/XSimpleFileAccess2.hpp>
@@ -51,6 +50,11 @@
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <comphelper/processfactory.hxx>
+#include <sfx2/dinfdlg.hxx>
+#include <sfx2/dispatch.hxx>
+#include <sfx2/request.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/whiter.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 939d18c646f7..321560cd89f6 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -17,9 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#include "ide_pch.hxx"
-
 #define _SOLAR__PRIVATE 1
 
 #define SI_NOCONTROL
@@ -41,10 +38,24 @@
 #include "managelang.hxx"
 #include "moduldlg.hxx"
 
+#include <basic/basmgr.hxx>
+#include <basic/sbmeth.hxx>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <com/sun/star/task/XStatusIndicatorFactory.hpp>
+#include <sfx2/childwin.hxx>
+#include <sfx2/docfac.hxx>
+#include <sfx2/dinfdlg.hxx>
+#include <sfx2/dispatch.hxx>
+#include <sfx2/minfitem.hxx>
+#include <sfx2/objface.hxx>
+#include <sfx2/printer.hxx>
+#include <sfx2/request.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/srchitem.hxx>
 #include <svl/visitem.hxx>
+#include <svl/whiter.hxx>
 #include <svtools/xtextedt.hxx>
 #include <vcl/msgbox.hxx>
 
diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index 2ffa4eb3a749..93351df3fdf6 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -17,13 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include "docsignature.hxx"
 
 #define SI_NOCONTROL
 #define SI_NOSBXCONTROLS
 
-#include <ide_pch.hxx>
 #include <basic/sbx.hxx>
 #include "basicrenderable.hxx"
 
@@ -39,6 +37,8 @@
 #include <svtools/textview.hxx>
 #include <svtools/xtextedt.hxx>
 #include <tools/diagnose_ex.h>
+#include <sfx2/childwin.hxx>
+#include <sfx2/dispatch.hxx>
 #include <sfx2/sfxdefs.hxx>
 #include <sfx2/signaturestate.hxx>
 #include <com/sun/star/container/XNameContainer.hpp>
diff --git a/basctl/source/basicide/basides3.cxx b/basctl/source/basicide/basides3.cxx
index 94ead6c41c1a..668cbc6541a0 100644
--- a/basctl/source/basicide/basides3.cxx
+++ b/basctl/source/basicide/basides3.cxx
@@ -22,8 +22,6 @@
 #define SI_NOSBXCONTROLS
 
 #include <basidesh.hrc>
-#include <ide_pch.hxx>
-
 
 #define _SOLAR__PRIVATE 1
 
@@ -37,6 +35,9 @@
 #include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <xmlscript/xmldlg_imexp.hxx>
+#include <sfx2/dispatch.hxx>
+#include <sfx2/docfac.hxx>
+#include <sfx2/request.hxx>
 #include <tools/diagnose_ex.h>
 
 using namespace comphelper;
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 9bdb424141cb..23a166724245 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -27,20 +27,27 @@
 #define SI_NOCONTROL
 #define SI_NOSBXCONTROLS
 
-// if without PCH's:
-#include <ide_pch.hxx>
-
 #define _SOLAR__PRIVATE 1
 #include <tools/diagnose_ex.h>
+#include <basic/basmgr.hxx>
 #include <basidesh.hrc>
 #include <baside2.hxx>
 #include <basdoc.hxx>
 #include <basicbox.hxx>
+#include <editeng/sizeitem.hxx>
 #include <objdlg.hxx>
 #include <tbxctl.hxx>
 #include <iderdll2.hxx>
 #include <basidectrlr.hxx>
 #include <localizationmgr.hxx>
+#include <sfx2/app.hxx>
+#include <sfx2/dinfdlg.hxx>
+#include <sfx2/dispatch.hxx>
+#include <sfx2/minfitem.hxx>
+#include <sfx2/objface.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/srchitem.hxx>
 
 #define BasicIDEShell
 #define SFX_TYPEMAP
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index f4b3a40b08af..471becda482e 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -17,9 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#include <ide_pch.hxx>
-
 #include "basobj.hxx"
 #include "iderdll.hxx"
 #include "iderdll2.hxx"
@@ -35,6 +32,7 @@
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/document/XScriptInvocationContext.hpp>
 
+#include <basic/sbmeth.hxx>
 #include <basic/sbx.hxx>
 #include <framework/documentundoguard.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index aec8aabd2c8c..088ff07d45fc 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -17,12 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#include <ide_pch.hxx>
-
 #include <vcl/msgbox.hxx>
 #include <vector>
 #include <algorithm>
+#include <basic/basmgr.hxx>
+#include <basic/sbmeth.hxx>
 #include <basic/sbx.hxx>
 #include <unotools/moduleoptions.hxx>
 
@@ -46,6 +45,9 @@
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <xmlscript/xmldlg_imexp.hxx>
+#include <sfx2/app.hxx>
+#include <sfx2/dispatch.hxx>
+#include <sfx2/request.hxx>
 #include <rtl/uri.hxx>
 #include <osl/process.h>
 #include <osl/file.hxx>
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index bdea98c99e0c..087651ed3ed6 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -22,8 +22,6 @@
 
 #include "vcl/bitmap.hxx"
 
-#include <ide_pch.hxx>
-
 #include "basidesh.hxx"
 #include "iderdll.hxx"
 #include "iderdll2.hxx"
@@ -42,6 +40,8 @@
 #include <com/sun/star/frame/XModuleManager.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/componentcontext.hxx>
+#include <sfx2/dispatch.hxx>
+
 #include <map>
 #include <com/sun/star/script/ModuleType.hpp>
 #include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index 5b1ad420a8ea..9b1881632067 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <ide_pch.hxx>
-
 #define _SI_NOSBXCONTROLS
 
+#include <basic/basmgr.hxx>
+#include <basic/sbmod.hxx>
 #include <basic/sbx.hxx>
 #include <bastype2.hxx>
 #include <basobj.hxx>
@@ -31,6 +31,7 @@
 #include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <deque>
+#include <sfx2/docfac.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
diff --git a/basctl/source/basicide/ide_pch.hxx b/basctl/source/basicide/ide_pch.hxx
deleted file mode 100644
index b3bb40b36a4d..000000000000
--- a/basctl/source/basicide/ide_pch.hxx
+++ /dev/null
@@ -1,41 +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 .
- */
-
-#include <svl/aeitem.hxx>
-#include <svl/whiter.hxx>
-#include <svl/intitem.hxx>
-#include <svl/srchitem.hxx>
-
-#define _BASIC_TEXTPORTIONS
-#include <basic/sbmeth.hxx>
-#include <basic/sbmod.hxx>
-#include <basic/basmgr.hxx>
-
-#include <sfx2/app.hxx>
-#include <sfx2/objface.hxx>
-#include <sfx2/printer.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/childwin.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/minfitem.hxx>
-#include <sfx2/dinfdlg.hxx>
-#include <sfx2/docfac.hxx>
-#include <editeng/sizeitem.hxx>
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index be53883b06a8..9018f3add5db 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -17,19 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include <comphelper/scoped_disposing_ptr.hxx>
 #include <comphelper/processfactory.hxx>
 
-#include <ide_pch.hxx>
-
-
 #include <svheader.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/genlink.hxx>
 
-
 #include <svl/solar.hrc>
 #include <iderdll.hxx>
 #include <iderdll2.hxx>
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index 411bf9b7007f..1f10cd56fcf6 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -17,17 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <ide_pch.hxx>
-
 #include <basidesh.hxx>
 #include <baside3.hxx>
 #include <basobj.hxx>
 #include <iderdll.hxx>
 #include "dlged.hxx"
-
 #include <localizationmgr.hxx>
 #include <com/sun/star/resource/XStringResourceSupplier.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
+#include <sfx2/dispatch.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index c1886a89dcd5..761be97b03c0 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -17,11 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include <memory>
 #include <vcl/msgbox.hxx>
-#include <ide_pch.hxx>
-
 
 #include <macrodlg.hxx>
 #include <macrodlg.hrc>
@@ -36,11 +33,17 @@
 #include <iderid.hxx>
 
 #include <moduldlg.hxx>
+#include <basic/basmgr.hxx>
+#include <basic/sbmeth.hxx>
+#include <basic/sbmod.hxx>
 #include <basic/sbx.hxx>
 
 #include <bastypes.hxx>
 #include <sbxitem.hxx>
+#include <sfx2/app.hxx>
+#include <sfx2/dispatch.hxx>
 #include <sfx2/minfitem.hxx>
+#include <sfx2/request.hxx>
 
 #include <com/sun/star/script/XLibraryContainer2.hpp>
 #include <com/sun/star/document/MacroExecMode.hpp>
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index b94d92e9325d..bf7d036b25e2 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#include <ide_pch.hxx>
 #include <vcl/msgbox.hxx>
 #include <sot/storinfo.hxx>
 
@@ -36,6 +34,10 @@
 #include <basdoc.hxx>
 #include <ucbhelper/content.hxx>
 #include "rtl/uri.hxx"
+#include <sfx2/app.hxx>
+#include <sfx2/dinfdlg.hxx>
+#include <sfx2/dispatch.hxx>
+#include <sfx2/request.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>