No need for implbase1.hxx to include XComponentContext.hpp

...which it did unlike all the other implbaseN.hxx.  Required lots of downstream clean-up,
of course.

Change-Id: Ib720e7a0a43410dcd7e6338b84a3973dfbb20866

35 files changed, 103 insertions, 1 deletions

diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
index 2ae330f3d4c7..4c3452aa4164 100644
--- a/UnoControls/inc/basecontrol.hxx
+++ b/UnoControls/inc/basecontrol.hxx
@@ -88,6 +88,10 @@
 
 #include "multiplexer.hxx"
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
 //____________________________________________________________________________________________________________
 //  "namespaces"
 //____________________________________________________________________________________________________________
diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx
index dad73a85cc75..091d9f6c23cc 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/awt/Gradient.hpp>
 #include <com/sun/star/awt/XGraphics.hpp>
 #include <com/sun/star/awt/PosSize.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/typeprovider.hxx>
 #include <tools/debug.hxx>
 #include <tools/solar.h>
diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx
index 2e8d8193f252..d84600e388f5 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -21,6 +21,7 @@
 
 #include <com/sun/star/awt/InvalidateStyle.hpp>
 #include <com/sun/star/awt/WindowAttribute.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/typeprovider.hxx>
 
 #include "progressbar.hxx"
diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
index 9670cb4ed320..97024aea34b6 100644
--- a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
+++ b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
@@ -27,6 +27,10 @@
 
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
 namespace dbaccess
 {
 
diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx
index f1942130be10..345434485ae4 100644
--- a/dbaccess/source/ui/inc/dbexchange.hxx
+++ b/dbaccess/source/ui/inc/dbexchange.hxx
@@ -31,6 +31,10 @@
 
 #include <rtl/ref.hxx>
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
 namespace dbaui
 {
 
diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx
index f924e9fe5be2..ca408972a09a 100644
--- a/dbaccess/source/ui/uno/ColumnControl.hxx
+++ b/dbaccess/source/ui/uno/ColumnControl.hxx
@@ -22,6 +22,10 @@
 #include <toolkit/controls/unocontrol.hxx>
 #include "apitools.hxx"
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
 namespace dbaui
 {
     class OColumnControl :  public UnoControl
diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx
index 41254bebe77a..6b00b6dd73e9 100644
--- a/dbaccess/source/ui/uno/dbinteraction.hxx
+++ b/dbaccess/source/ui/uno/dbinteraction.hxx
@@ -32,6 +32,10 @@
 #include <com/sun/star/sdb/ParametersRequest.hpp>
 #include <com/sun/star/sdb/DocumentSaveRequest.hpp>
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
 namespace dbtools
 {
     class SQLExceptionInfo;
diff --git a/desktop/source/offacc/acceptor.hxx b/desktop/source/offacc/acceptor.hxx
index 8556c9c28afa..70ba7b286a72 100644
--- a/desktop/source/offacc/acceptor.hxx
+++ b/desktop/source/offacc/acceptor.hxx
@@ -39,6 +39,10 @@
 #include <osl/conditn.hxx>
 #include <osl/thread.hxx>
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
 namespace desktop {
 
 class  Acceptor
diff --git a/extensions/source/resource/ResourceIndexAccess.hxx b/extensions/source/resource/ResourceIndexAccess.hxx
index 40fdf03aa55e..6760c5856d6d 100644
--- a/extensions/source/resource/ResourceIndexAccess.hxx
+++ b/extensions/source/resource/ResourceIndexAccess.hxx
@@ -18,6 +18,9 @@
 #include <com/sun/star/uno/XInterface.hpp>
 #include <cppuhelper/implbase1.hxx>
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
 class ResMgr;
 
 namespace extensions { namespace resource
diff --git a/filter/source/config/cache/lateinitlistener.hxx b/filter/source/config/cache/lateinitlistener.hxx
index 3d6bea78c244..5c4c55e7b086 100644
--- a/filter/source/config/cache/lateinitlistener.hxx
+++ b/filter/source/config/cache/lateinitlistener.hxx
@@ -27,6 +27,9 @@
 #include <com/sun/star/document/XEventBroadcaster.hpp>
 #include <cppuhelper/implbase1.hxx>
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
 
 namespace filter{
     namespace config{
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index 42b4a94a3f0c..f8690520d24f 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -19,6 +19,7 @@
 
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <tools/resid.hxx>
 #include <vcl/msgbox.hxx>
 #include <osl/file.hxx>
diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx
index b8548d462403..79a089a62781 100644
--- a/forms/source/inc/InterfaceContainer.hxx
+++ b/forms/source/inc/InterfaceContainer.hxx
@@ -46,6 +46,10 @@
 #include <cppuhelper/component.hxx>
 #include <cppuhelper/implbase8.hxx>
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
 using namespace comphelper;
 
 //.........................................................................
diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index d7d22eea72af..5a3339552efd 100644
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.hxx
@@ -34,6 +34,10 @@
 #include <cppuhelper/implbase1.hxx>
 #include <threadhelp/threadhelpbase.hxx>
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
 namespace framework
 {
 
diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx
index 425d869ffd79..5aec5b650419 100644
--- a/framework/source/inc/dispatch/windowcommanddispatch.hxx
+++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx
@@ -30,6 +30,10 @@
 #include <cppuhelper/implbase1.hxx>
 #include <tools/link.hxx>
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
 namespace framework{
 
 /** @short  internal helper to bind e.g. MAC-Menu events to our internal dispatch API.
diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx
index 53e7e37999b6..859a2396a1a0 100644
--- a/i18npool/inc/cclass_unicode.hxx
+++ b/i18npool/inc/cclass_unicode.hxx
@@ -28,6 +28,10 @@
 #define TRANSLITERATION_casemapping
 #include <transliteration_body.hxx>
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
 namespace com { namespace sun { namespace star { namespace i18n {
 
 typedef sal_uInt32 UPT_FLAG_TYPE;
diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx
index 040eac6b1e5f..4521d4c376e9 100644
--- a/include/comphelper/proxyaggregation.hxx
+++ b/include/comphelper/proxyaggregation.hxx
@@ -30,6 +30,10 @@
 #include <cppuhelper/compbase_ex.hxx>
 #include <comphelper/comphelperdllapi.h>
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
 /* class hierarchy herein:
 
          +-------------------+          helper class for aggregating the proxy to another object
diff --git a/include/cppuhelper/implbase1.hxx b/include/cppuhelper/implbase1.hxx
index 4ff99af32c86..8561a423d3d7 100644
--- a/include/cppuhelper/implbase1.hxx
+++ b/include/cppuhelper/implbase1.hxx
@@ -21,7 +21,6 @@
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
 
 namespace cppu
 {
diff --git a/include/framework/preventduplicateinteraction.hxx b/include/framework/preventduplicateinteraction.hxx
index e466cf20996c..a411b9184711 100644
--- a/include/framework/preventduplicateinteraction.hxx
+++ b/include/framework/preventduplicateinteraction.hxx
@@ -29,6 +29,10 @@
 
 #include <cppuhelper/implbase1.hxx>
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
 namespace framework{
 
 /**
diff --git a/include/oox/drawingml/chart/converterbase.hxx b/include/oox/drawingml/chart/converterbase.hxx
index 4bf233be1e59..f16950f85564 100644
--- a/include/oox/drawingml/chart/converterbase.hxx
+++ b/include/oox/drawingml/chart/converterbase.hxx
@@ -29,6 +29,7 @@ namespace com { namespace sun { namespace star {
     namespace chart2 { class XChartDocument; }
     namespace chart2 { class XTitle; }
     namespace drawing { class XShape; }
+    namespace uno { class XComponentContext; }
 } } }
 
 namespace oox { namespace core {
diff --git a/include/svtools/openfiledroptargetlistener.hxx b/include/svtools/openfiledroptargetlistener.hxx
index 38fa060204d6..aabe21f6cdb6 100644
--- a/include/svtools/openfiledroptargetlistener.hxx
+++ b/include/svtools/openfiledroptargetlistener.hxx
@@ -29,6 +29,10 @@
 
 #include <sot/exchange.hxx>
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
 /** DropTargetListener that takes care of opening a file when it is dropped in the frame.
 */
 class SVT_DLLPUBLIC OpenFileDropTargetListener : public ::cppu::WeakImplHelper1< ::com::sun::star::datatransfer::dnd::XDropTargetListener >
diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx
index 23493566a32d..e6b7bfe21bda 100644
--- a/include/toolkit/controls/geometrycontrolmodel.hxx
+++ b/include/toolkit/controls/geometrycontrolmodel.hxx
@@ -40,6 +40,9 @@ namespace com { namespace sun { namespace star {
     namespace script {
         class XNameContainer;
     }
+    namespace uno {
+        class XComponentContext;
+    }
 }}}
 
 //........................................................................
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index ce6d3fd14168..8d8ffc9b71ff 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <comphelper/docpasswordhelper.hxx>
 #include <unotools/mediadescriptor.hxx>
diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx
index 0d1c72933a35..0e9013997d6e 100644
--- a/oox/source/crypto/DocumentDecryption.cxx
+++ b/oox/source/crypto/DocumentDecryption.cxx
@@ -15,6 +15,7 @@
 #include <cppuhelper/implbase1.hxx>
 
 #include <com/sun/star/io/XSeekable.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/xml/sax/XFastParser.hpp>
 #include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
 #include <com/sun/star/xml/sax/FastToken.hpp>
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index 285ac2a064bc..f97423086d00 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include "oox/ppt/pptimport.hxx"
 #include "oox/drawingml/chart/chartconverter.hxx"
 #include "oox/dump/pptxdumper.hxx"
diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx
index ea483c1137f3..c96d794a1fde 100644
--- a/oox/source/ppt/timenode.cxx
+++ b/oox/source/ppt/timenode.cxx
@@ -37,6 +37,7 @@
 #include <com/sun/star/animations/Event.hpp>
 #include <com/sun/star/animations/EventTrigger.hpp>
 #include <com/sun/star/presentation/EffectNodeType.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include "oox/helper/helper.hxx"
 #include "oox/core/xmlfilterbase.hxx"
diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx
index 22fcb3f83d06..e1c31588b951 100644
--- a/package/source/xstor/owriteablestream.hxx
+++ b/package/source/xstor/owriteablestream.hxx
@@ -51,6 +51,10 @@
 #include "ocompinstream.hxx"
 #include "mutexholder.hxx"
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
 struct PreCreationStruct
 {
     SotMutexHolderRef m_rMutexRef;
diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx
index 039dd22f150d..27f92e3efba0 100644
--- a/package/source/xstor/xstorage.hxx
+++ b/package/source/xstor/xstorage.hxx
@@ -50,6 +50,10 @@
 
 #include "mutexholder.hxx"
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
 #define RELINFO_NO_INIT             1
 #define RELINFO_READ                2
 #define RELINFO_CHANGED             3
diff --git a/package/source/zipapi/XUnbufferedStream.hxx b/package/source/zipapi/XUnbufferedStream.hxx
index 1b830e928e97..68cf3ba707ac 100644
--- a/package/source/zipapi/XUnbufferedStream.hxx
+++ b/package/source/zipapi/XUnbufferedStream.hxx
@@ -32,6 +32,10 @@
 #include <CRC32.hxx>
 #include <mutexholder.hxx>
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
 #define UNBUFF_STREAM_DATA          0
 #define UNBUFF_STREAM_RAW           1
 #define UNBUFF_STREAM_WRAPPEDRAW    2
diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx
index 64ff07e1f742..f99b5d358752 100644
--- a/sd/source/ui/presenter/PresenterTextView.hxx
+++ b/sd/source/ui/presenter/PresenterTextView.hxx
@@ -28,6 +28,10 @@
 #include <boost/noncopyable.hpp>
 #include <boost/scoped_ptr.hpp>
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
 namespace sd { namespace presenter {
 
 namespace {
diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx
index 5ae5e0121b14..d0ca110f429d 100644
--- a/sdext/source/presenter/PresenterTimer.cxx
+++ b/sdext/source/presenter/PresenterTimer.cxx
@@ -18,6 +18,8 @@
  */
 
 #include "PresenterTimer.hxx"
+#include <com/sun/star/lang/XMultiComponentFactory.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <osl/doublecheckedlocking.h>
 #include <osl/thread.hxx>
 #include <boost/bind.hpp>
diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx
index 2f06157b49f6..904ffbcfc05e 100644
--- a/sdext/source/presenter/PresenterTimer.hxx
+++ b/sdext/source/presenter/PresenterTimer.hxx
@@ -31,6 +31,10 @@
 #include <boost/function.hpp>
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
 namespace sdext { namespace presenter {
 
 /** The timer allows tasks to be scheduled for execution at a specified time
diff --git a/sfx2/source/appl/imestatuswindow.hxx b/sfx2/source/appl/imestatuswindow.hxx
index c84a7b6e81b5..70b21897735f 100644
--- a/sfx2/source/appl/imestatuswindow.hxx
+++ b/sfx2/source/appl/imestatuswindow.hxx
@@ -28,6 +28,7 @@
 namespace com { namespace sun { namespace star {
     namespace beans { class XPropertySet; }
     namespace lang { class XMultiServiceFactory; }
+    namespace uno { class XComponentContext; }
 } } }
 
 namespace sfx2 { namespace appl {
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.hxx b/toolkit/source/controls/grid/sortablegriddatamodel.hxx
index cbe2ca381738..c88bbad7a740 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.hxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.hxx
@@ -32,6 +32,10 @@
 #include <cppuhelper/compbase3.hxx>
 #include <cppuhelper/implbase1.hxx>
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
 //......................................................................................................................
 namespace toolkit
 {
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 5b38153e22c9..06efbf76c1cb 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -57,6 +57,7 @@
 #include <com/sun/star/text/WritingMode.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/text/XFootnote.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <comphelper/types.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <filter/msfilter/util.hxx>
diff --git a/xmlsecurity/source/framework/encryptionengine.hxx b/xmlsecurity/source/framework/encryptionengine.hxx
index 6407e136f320..d7d9a2b40c4b 100644
--- a/xmlsecurity/source/framework/encryptionengine.hxx
+++ b/xmlsecurity/source/framework/encryptionengine.hxx
@@ -32,6 +32,10 @@
 
 #include "securityengine.hxx"
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
 class EncryptionEngine : public cppu::ImplInheritanceHelper1
 <
     SecurityEngine,