From 2ce779cd0cc750a0e2f6a10ae7f2cb0e6fbcdab5 Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Sat, 10 May 2014 18:15:21 +0200
Subject: [PATCH] fix-includes.pl: framework

Change-Id: I405196a2df0be0eb77961540b457933777b90a50
---
 framework/inc/acceleratorconst.h                    |  2 +-
 framework/inc/fwidllapi.h                           |  2 +-
 framework/inc/fwkdllapi.h                           |  4 ++--
 framework/inc/pch/precompiled_fwk.hxx               | 13 ++-----------
 framework/inc/properties.h                          |  2 +-
 framework/inc/queries.h                             |  2 +-
 framework/inc/stdtypes.h                            |  2 +-
 framework/source/classes/menumanager.cxx            |  2 +-
 framework/source/dispatch/closedispatcher.cxx       |  4 ++--
 framework/source/dispatch/startmoduledispatcher.cxx |  2 +-
 framework/source/fwe/classes/addonmenu.cxx          |  4 ++--
 framework/source/fwe/classes/addonsoptions.cxx      |  4 ++--
 framework/source/fwe/classes/bmkmenu.cxx            |  2 +-
 framework/source/fwe/classes/framelistanalyzer.cxx  |  2 +-
 framework/source/fwe/helper/documentundoguard.cxx   |  2 +-
 framework/source/fwe/helper/undomanagerhelper.cxx   |  2 +-
 .../fwe/interaction/preventduplicateinteraction.cxx |  2 +-
 framework/source/layoutmanager/layoutmanager.cxx    |  4 ++--
 .../source/layoutmanager/toolbarlayoutmanager.cxx   |  4 ++--
 framework/source/loadenv/loadenv.cxx                |  2 +-
 framework/source/services/uriabbreviation.cxx       |  8 ++++----
 .../source/uiconfiguration/imagemanagerimpl.cxx     |  2 +-
 .../source/uielement/buttontoolbarcontroller.cxx    |  6 +++---
 .../uielement/imagebuttontoolbarcontroller.cxx      |  4 ++--
 .../uielement/langselectionstatusbarcontroller.cxx  |  2 +-
 framework/source/uielement/menubarmanager.cxx       |  4 ++--
 .../uifactory/windowcontentfactorymanager.cxx       |  2 +-
 27 files changed, 41 insertions(+), 50 deletions(-)

diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h
index c3ce35c34382..0888b2e4f8fb 100644
--- a/framework/inc/acceleratorconst.h
+++ b/framework/inc/acceleratorconst.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FRAMEWORK_INC_ACCELERATORCONST_H
 #define INCLUDED_FRAMEWORK_INC_ACCELERATORCONST_H
 
-#include <general.h>
+#include "general.h"
 
 namespace framework{
 
diff --git a/framework/inc/fwidllapi.h b/framework/inc/fwidllapi.h
index ac8e0e719575..290f18721ec0 100644
--- a/framework/inc/fwidllapi.h
+++ b/framework/inc/fwidllapi.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FRAMEWORK_INC_FWIDLLAPI_H
 #define INCLUDED_FRAMEWORK_INC_FWIDLLAPI_H
 
-#include "sal/types.h"
+#include <sal/types.h>
 
 #if defined(FWI_DLLIMPLEMENTATION)
 #define FWI_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
diff --git a/framework/inc/fwkdllapi.h b/framework/inc/fwkdllapi.h
index 2a12d592ddea..e4d502708b1e 100644
--- a/framework/inc/fwkdllapi.h
+++ b/framework/inc/fwkdllapi.h
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_FRAMEWORK_INC_FWKDLLAPI_H
 #define INCLUDED_FRAMEWORK_INC_FWKDLLAPI_H
 
-#include "sal/types.h"
+#include <sal/types.h>
 
-#include <fwidllapi.h>
+#include "fwidllapi.h"
 
 #endif // INCLUDED_FRAMEWORK_INC_FWKDLLAPI_H
 
diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx
index 8fcb909f5c01..18482f8be982 100644
--- a/framework/inc/pch/precompiled_fwk.hxx
+++ b/framework/inc/pch/precompiled_fwk.hxx
@@ -14,17 +14,7 @@
  also fixes all possible problems, so it's usually better to use it).
 */
 
-#include "com/sun/star/beans/XFastPropertySet.hpp"
-#include "com/sun/star/beans/XPropertySet.hpp"
-#include "com/sun/star/frame/XModuleManager2.hpp"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/util/XMacroExpander.hpp"
-#include "com/sun/star/util/theMacroExpander.hpp"
 #include "officecfg/Office/Common.hxx"
-#include "rtl/bootstrap.hxx"
-#include "sal/types.h"
-#include "svtools/miscopt.hxx"
-#include "vcl/syswin.hxx"
 #include <algorithm>
 #include <boost/bind.hpp>
 #include <boost/noncopyable.hpp>
@@ -70,6 +60,7 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/UnknownPropertyException.hpp>
+#include <com/sun/star/beans/XFastPropertySet.hpp>
 #include <com/sun/star/beans/XMaterialHolder.hpp>
 #include <com/sun/star/beans/XMultiHierarchicalPropertySet.hpp>
 #include <com/sun/star/beans/XProperty.hpp>
@@ -265,6 +256,7 @@
 #include <com/sun/star/util/XStringSubstitution.hpp>
 #include <com/sun/star/util/XStringWidth.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
+#include <com/sun/star/util/theMacroExpander.hpp>
 #include <com/sun/star/util/thePathSettings.hpp>
 #include <com/sun/star/xml/sax/InputSource.hpp>
 #include <com/sun/star/xml/sax/Parser.hpp>
@@ -411,5 +403,4 @@
 #include <vcl/wrkwin.hxx>
 #include <vector>
 #include <wchar.h>
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/properties.h b/framework/inc/properties.h
index b2651b1dbeb7..1b0972fb4b88 100644
--- a/framework/inc/properties.h
+++ b/framework/inc/properties.h
@@ -21,7 +21,7 @@
 #define INCLUDED_FRAMEWORK_INC_PROPERTIES_H
 
 #include <macros/generic.hxx>
-#include <general.h>
+#include "general.h"
 
 namespace framework{
 
diff --git a/framework/inc/queries.h b/framework/inc/queries.h
index 52ffe1fe1e31..b43d65cc30b4 100644
--- a/framework/inc/queries.h
+++ b/framework/inc/queries.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FRAMEWORK_INC_QUERIES_H
 #define INCLUDED_FRAMEWORK_INC_QUERIES_H
 
-#include <general.h>
+#include "general.h"
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <rtl/ustring.hxx>
diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h
index 3d23bdda4101..d814a57eb875 100644
--- a/framework/inc/stdtypes.h
+++ b/framework/inc/stdtypes.h
@@ -24,7 +24,7 @@
 #include <queue>
 #include <boost/unordered_map.hpp>
 
-#include <general.h>
+#include "general.h"
 
 #include <com/sun/star/awt/KeyEvent.hpp>
 
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 6c513f543b48..c850481b96c9 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -22,7 +22,7 @@
 #include <framework/bmkmenu.hxx>
 #include <framework/addonmenu.hxx>
 #include <framework/imageproducer.hxx>
-#include "framework/addonsoptions.hxx"
+#include <framework/addonsoptions.hxx>
 #include <classes/fwkresid.hxx>
 #include <services.h>
 #include "classes/resource.hrc"
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index f511d002949a..305e5ed087d4 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -30,12 +30,12 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/awt/XTopWindow.hpp>
 #include <com/sun/star/document/XActionLockable.hpp>
-#include "com/sun/star/beans/XFastPropertySet.hpp"
+#include <com/sun/star/beans/XFastPropertySet.hpp>
 #include <toolkit/helper/vclunohelper.hxx>
 
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
-#include "vcl/syswin.hxx"
+#include <vcl/syswin.hxx>
 #include <osl/mutex.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx
index 7e6eebc58c5f..ae876426dc91 100644
--- a/framework/source/dispatch/startmoduledispatcher.cxx
+++ b/framework/source/dispatch/startmoduledispatcher.cxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/frame/CommandGroup.hpp>
 #include <com/sun/star/frame/StartModule.hpp>
 #include <com/sun/star/awt/XTopWindow.hpp>
-#include "com/sun/star/beans/XFastPropertySet.hpp"
+#include <com/sun/star/beans/XFastPropertySet.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
 
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx
index 4eed572f2ad2..cccc53c760f7 100644
--- a/framework/source/fwe/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "framework/addonmenu.hxx"
-#include "framework/addonsoptions.hxx"
+#include <framework/addonmenu.hxx>
+#include <framework/addonsoptions.hxx>
 #include <general.h>
 #include <framework/imageproducer.hxx>
 #include <framework/menuconfiguration.hxx>
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index fef1ad7dd079..d09707eca31c 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -24,8 +24,8 @@
 #include <tools/stream.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include "com/sun/star/util/theMacroExpander.hpp"
-#include "com/sun/star/uno/XComponentContext.hpp"
+#include <com/sun/star/util/theMacroExpander.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/uri.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/framework/source/fwe/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx
index b8fcc8d49c17..0973ca12cf38 100644
--- a/framework/source/fwe/classes/bmkmenu.cxx
+++ b/framework/source/fwe/classes/bmkmenu.cxx
@@ -19,7 +19,7 @@
 
 #include <limits.h>
 
-#include "framework/bmkmenu.hxx"
+#include <framework/bmkmenu.hxx>
 #include <general.h>
 #include <framework/imageproducer.hxx>
 #include <framework/menuconfiguration.hxx>
diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx
index 8ff83174e1bf..8af75759f96c 100644
--- a/framework/source/fwe/classes/framelistanalyzer.cxx
+++ b/framework/source/fwe/classes/framelistanalyzer.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "framework/framelistanalyzer.hxx"
+#include <framework/framelistanalyzer.hxx>
 
 #include <targets.h>
 #include <properties.h>
diff --git a/framework/source/fwe/helper/documentundoguard.cxx b/framework/source/fwe/helper/documentundoguard.cxx
index 26d435a2c2bc..35ed6b431b1b 100644
--- a/framework/source/fwe/helper/documentundoguard.cxx
+++ b/framework/source/fwe/helper/documentundoguard.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "framework/documentundoguard.hxx"
+#include <framework/documentundoguard.hxx>
 
 #include <com/sun/star/document/XUndoManagerSupplier.hpp>
 
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx
index 565ddfa6bac2..3f06ee7bb41b 100644
--- a/framework/source/fwe/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "framework/undomanagerhelper.hxx"
+#include <framework/undomanagerhelper.hxx>
 
 #include <com/sun/star/lang/XComponent.hpp>
 
diff --git a/framework/source/fwe/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
index 67883a656190..1eb828e82cef 100644
--- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx
+++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "framework/preventduplicateinteraction.hxx"
+#include <framework/preventduplicateinteraction.hxx>
 
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/task/XInteractionAbort.hpp>
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index d4a6deb75552..89e9109a8808 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <services/layoutmanager.hxx>
-#include <helpers.hxx>
+#include "helpers.hxx"
 
 #include <framework/sfxhelperfunctions.hxx>
 #include <uielement/menubarwrapper.hxx>
@@ -29,7 +29,7 @@
 #include <uielement/progressbarwrapper.hxx>
 #include <uiconfiguration/globalsettings.hxx>
 #include <uiconfiguration/windowstateproperties.hxx>
-#include <toolbarlayoutmanager.hxx>
+#include "toolbarlayoutmanager.hxx"
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index eb0103324595..a9ce19e6234a 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <toolbarlayoutmanager.hxx>
+#include "toolbarlayoutmanager.hxx"
 #include <uiconfiguration/windowstateproperties.hxx>
 #include <uielement/addonstoolbarwrapper.hxx>
-#include <helpers.hxx>
+#include "helpers.hxx"
 #include <services.h>
 #include <services/layoutmanager.hxx>
 #include <classes/resource.hrc>
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index ed4bb45bfcea..3184d7b14dec 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -79,7 +79,7 @@
 #include <unotools/ucbhelper.hxx>
 #include <comphelper/configurationhelper.hxx>
 #include <rtl/ustrbuf.hxx>
-#include "rtl/bootstrap.hxx"
+#include <rtl/bootstrap.hxx>
 #include <vcl/svapp.hxx>
 
 #include <config_orcus.h>
diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx
index 82a39a4f8055..1ef9391ac134 100644
--- a/framework/source/services/uriabbreviation.cxx
+++ b/framework/source/services/uriabbreviation.cxx
@@ -20,11 +20,11 @@
 #include "services/uriabbreviation.hxx"
 #include "services.h"
 
-#include "sal/config.h"
-#include "cppuhelper/factory.hxx"
-#include "cppuhelper/implementationentry.hxx"
+#include <sal/config.h>
+#include <cppuhelper/factory.hxx>
+#include <cppuhelper/implementationentry.hxx>
 
-#include "tools/urlobj.hxx"
+#include <tools/urlobj.hxx>
 
 // framework namespace
 namespace framework
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 9fe506ba1b6a..2beaa001cf51 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <imagemanagerimpl.hxx>
+#include "imagemanagerimpl.hxx"
 #include <xml/imagesconfiguration.hxx>
 #include <uiconfiguration/graphicnameaccess.hxx>
 #include <services.h>
diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx
index 77b4d3a28b6b..2dd1e74ec4ad 100644
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.cxx
@@ -25,9 +25,9 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include "com/sun/star/util/XMacroExpander.hpp"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/beans/XPropertySet.hpp"
+#include <com/sun/star/util/XMacroExpander.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <rtl/uri.hxx>
 #include <osl/mutex.hxx>
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index 7c385f270215..d41f8b870f42 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -25,8 +25,8 @@
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/XControlNotificationListener.hpp>
-#include "com/sun/star/util/theMacroExpander.hpp"
-#include "com/sun/star/uno/XComponentContext.hpp"
+#include <com/sun/star/util/theMacroExpander.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <rtl/uri.hxx>
 #include <osl/mutex.hxx>
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 78733cfae174..d1cfd9001a8b 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/awt/PopupMenuDirection.hpp>
 #include <svtools/langtab.hxx>
 #include <svtools/statusbarcontroller.hxx>
-#include "sal/types.h"
+#include <sal/types.h>
 #include <com/sun/star/awt/MenuItemStyle.hpp>
 #include <com/sun/star/document/XDocumentLanguages.hpp>
 #include <i18nlangtag/mslangid.hxx>
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 769851519517..73f50df8f166 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -22,7 +22,7 @@
 #include <framework/bmkmenu.hxx>
 #include <framework/addonmenu.hxx>
 #include <framework/imageproducer.hxx>
-#include "framework/addonsoptions.hxx"
+#include <framework/addonsoptions.hxx>
 #include <classes/fwkresid.hxx>
 #include <classes/menumanager.hxx>
 #include <helper/mischelper.hxx>
@@ -72,7 +72,7 @@
 #include <osl/file.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <svtools/acceleratorexecute.hxx>
-#include "svtools/miscopt.hxx"
+#include <svtools/miscopt.hxx>
 #include <uielement/menubarmerger.hxx>
 
 // Be careful removing this "bad" construct. There are serious problems
diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx
index 5e12b9370dd7..778cea8ac087 100644
--- a/framework/source/uifactory/windowcontentfactorymanager.cxx
+++ b/framework/source/uifactory/windowcontentfactorymanager.cxx
@@ -24,7 +24,7 @@
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>
-#include "com/sun/star/frame/XModuleManager2.hpp"
+#include <com/sun/star/frame/XModuleManager2.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>