Sort the header includes and get it to build.

Change-Id: Iaef855c4829f5b6fc6a0016fd2697c761ed1ea9a

2 files changed, 70 insertions, 77 deletions

diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 096d57814917..5f39baaa8bcd 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -20,70 +20,97 @@
 #ifdef _MSC_VER
 #pragma warning( disable : 4290 )
 #endif
-#include <com/sun/star/document/UpdateDocMode.hpp>
 
-#include "sal/config.h"
+#include "sfx2/appuno.hxx"
 
-#include <sfx2/appuno.hxx>
+#include "SfxDocumentMetaData.hxx"
 #include "appbaslib.hxx"
-
+#include "doctemplates.hxx"
+#include "eventsupplier.hxx"
+#include "fltoptint.hxx"
+#include "frmload.hxx"
+#include "iframe.hxx"
+#include "objshimp.hxx"
+#include "plugin.hxx"
+#include "sfx2/app.hxx"
+#include "sfx2/brokenpackageint.hxx"
+#include "sfx2/dispatch.hxx"
 #include "sfx2/dllapi.h"
+#include "sfx2/docfile.hxx"
+#include "sfx2/fcontnr.hxx"
+#include "sfx2/frame.hxx"
+#include "sfx2/module.hxx"
+#include "sfx2/msg.hxx"
+#include "sfx2/msgpool.hxx"
+#include "sfx2/objsh.hxx"
+#include "sfx2/request.hxx"
+#include "sfx2/sfxbasecontroller.hxx"
+#include "sfx2/sfxsids.hrc"
+#include "sfx2/sfxuno.hxx"
+#include "sfx2/unoctitm.hxx"
+#include "sfxslots.hxx"
+#include "sfxtypes.hxx"
+#include "shutdownicon.hxx"
+#include "xpackcreator.hxx"
 
+#include "sal/config.h"
+#include <basic/basmgr.hxx>
+#include <basic/sberrors.hxx>
+#include <basic/sbmeth.hxx>
+#include <basic/sbuno.hxx>
 #include <basic/sbx.hxx>
+#include <basic/sbxcore.hxx>
+#include <basic/sbxmeth.hxx>
+#include <basic/sbxobj.hxx>
+#include <comphelper/interaction.hxx>
+#include <comphelper/processfactory.hxx>
+#include <comphelper/sequence.hxx>
+#include <framework/documentundoguard.hxx>
+#include <osl/mutex.hxx>
+#include <ownsubfilterservice.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 #include <svl/itempool.hxx>
+#include <svl/lckbitem.hxx>
+#include <svl/ownlist.hxx>
 #include <svl/rectitem.hxx>
+#include <svl/slstitm.hxx>
+#include <svl/stritem.hxx>
+#include <tools/config.hxx>
 #include <tools/debug.hxx>
-
 #include <tools/urlobj.hxx>
-#include <tools/config.hxx>
-#include <basic/sbxmeth.hxx>
-#include <basic/sbmeth.hxx>
-#include <basic/sbxobj.hxx>
-#include <basic/sberrors.hxx>
-#include <basic/basmgr.hxx>
-#include <basic/sbuno.hxx>
 
-#include <basic/sbxcore.hxx>
-#include <svl/ownlist.hxx>
-#include <svl/lckbitem.hxx>
-#include <svl/stritem.hxx>
-#include <svl/slstitm.hxx>
-#include <svl/intitem.hxx>
-#include <svl/eitem.hxx>
-#include <com/sun/star/task/XStatusIndicatorFactory.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/awt/PosSize.hpp>
+#include <com/sun/star/awt/XButton.hpp>
+#include <com/sun/star/awt/XTopWindow.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/frame/XFrameActionListener.hpp>
-#include <com/sun/star/frame/XComponentLoader.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/FrameActionEvent.hpp>
-#include <com/sun/star/frame/FrameAction.hpp>
+#include <com/sun/star/container/ContainerEvent.hpp>
 #include <com/sun/star/container/XContainer.hpp>
-#include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/container/XNameReplace.hpp>
 #include <com/sun/star/container/XContainerListener.hpp>
-#include <com/sun/star/container/XSet.hpp>
-#include <com/sun/star/container/ContainerEvent.hpp>
+#include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/container/XIndexReplace.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/awt/XTopWindow.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/awt/PosSize.hpp>
-#include <com/sun/star/registry/RegistryValueType.hpp>
-#include <comphelper/processfactory.hxx>
-#include <com/sun/star/awt/XButton.hpp>
+#include <com/sun/star/container/XNameReplace.hpp>
+#include <com/sun/star/container/XSet.hpp>
+#include <com/sun/star/document/MacroExecMode.hpp>
+#include <com/sun/star/document/UpdateDocMode.hpp>
 #include <com/sun/star/frame/DispatchResultEvent.hpp>
 #include <com/sun/star/frame/DispatchResultState.hpp>
+#include <com/sun/star/frame/FrameAction.hpp>
+#include <com/sun/star/frame/FrameActionEvent.hpp>
+#include <com/sun/star/frame/XComponentLoader.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/frame/XFrameActionListener.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/document/MacroExecMode.hpp>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/registry/RegistryValueType.hpp>
+#include <com/sun/star/task/XInteractionHandler.hpp>
+#include <com/sun/star/task/XStatusIndicatorFactory.hpp>
 #include <com/sun/star/ucb/XContent.hpp>
 
-#include <osl/mutex.hxx>
-#include <comphelper/sequence.hxx>
-#include <framework/documentundoguard.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <comphelper/interaction.hxx>
+#define PROTOCOLHANDLER_SERVICENAME     "com.sun.star.frame.ProtocolHandler"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::ucb;
@@ -93,38 +120,6 @@ using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::io;
 
-#include "sfxtypes.hxx"
-#include <sfx2/sfxuno.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/sfxsids.hrc>
-#include <sfx2/msg.hxx>
-#include <sfx2/msgpool.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/module.hxx>
-#include <sfx2/fcontnr.hxx>
-#include "frmload.hxx"
-#include <sfx2/frame.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/unoctitm.hxx>
-#include <sfx2/dispatch.hxx>
-#include "doctemplates.hxx"
-#include "shutdownicon.hxx"
-#include "objshimp.hxx"
-#include "fltoptint.hxx"
-#include <sfx2/docfile.hxx>
-#include <sfx2/sfxbasecontroller.hxx>
-#include <sfx2/brokenpackageint.hxx>
-#include "eventsupplier.hxx"
-#include "xpackcreator.hxx"
-#include "plugin.hxx"
-#include "iframe.hxx"
-#include <ownsubfilterservice.hxx>
-#include "SfxDocumentMetaData.hxx"
-
-#define PROTOCOLHANDLER_SERVICENAME     "com.sun.star.frame.ProtocolHandler"
-
-#include <sfxslots.hxx>
-
 // needs to be converted to a better data structure
 SfxFormalArgument aFormalArgs[] = {
     SFX_ARGUMENT(SID_DEFAULTFILENAME,"SuggestedSaveAsName",SfxStringItem),
diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx
index 84209181266b..56d477427f34 100644
--- a/sfx2/source/inc/eventsupplier.hxx
+++ b/sfx2/source/inc/eventsupplier.hxx
@@ -63,8 +63,6 @@ class SfxEvents_Impl : public ::cppu::WeakImplHelper2< css::container::XNameRepl
     ::osl::Mutex                    maMutex;
     SfxObjectShell                 *mpObjShell;
 
-    sal_Bool                    Warn_Impl( const String& );
-
 public:
                                 SfxEvents_Impl( SfxObjectShell* pShell,
                                                 css::uno::Reference< css::document::XEventBroadcaster > xBroadcaster );