summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-03-03 22:51:30 +0100
committerThomas Arnhold <thomas@arnhold.org>2013-03-04 13:58:40 +0100
commit26e37ca4c7a26d59f1a42de2a43705f61327389e (patch)
tree03facb9e7f2135df1a1765e5a1cd19a55fa3e0c8 /framework
parent57d169b6061549ce273582bd2ee96cce34f1c5a2 (diff)
doubled includes
Change-Id: I70ec796188e2388e1e4d699126f7ae817f5ff86e
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/services/contenthandlerfactory.hxx1
-rw-r--r--framework/inc/services/layoutmanager.hxx1
-rw-r--r--framework/inc/services/license.hxx1
-rw-r--r--framework/inc/services/logindialog.hxx3
-rw-r--r--framework/inc/services/pathsettings.hxx1
-rw-r--r--framework/inc/uiconfiguration/imagemanager.hxx1
-rw-r--r--framework/inc/uiconfiguration/moduleimagemanager.hxx1
-rw-r--r--framework/inc/uielement/buttontoolbarcontroller.hxx1
-rw-r--r--framework/inc/uielement/toolbarmanager.hxx3
-rw-r--r--framework/source/classes/menumanager.cxx1
-rw-r--r--framework/source/layoutmanager/toolbarlayoutmanager.hxx1
-rw-r--r--framework/source/loadenv/loadenv.cxx1
-rw-r--r--framework/source/services/license.cxx1
-rw-r--r--framework/source/uiconfiguration/imagemanagerimpl.hxx1
-rw-r--r--framework/source/uiconfiguration/moduleimagemanager.cxx1
-rw-r--r--framework/source/uielement/addonstoolbarmanager.cxx1
-rw-r--r--framework/source/uielement/langselectionmenucontroller.cxx1
-rw-r--r--framework/source/uielement/langselectionstatusbarcontroller.cxx4
-rw-r--r--framework/source/uielement/menubarmanager.cxx2
-rw-r--r--framework/source/uielement/toolbarmanager.cxx1
20 files changed, 0 insertions, 28 deletions
diff --git a/framework/inc/services/contenthandlerfactory.hxx b/framework/inc/services/contenthandlerfactory.hxx
index bb77320c838e..31f280a11182 100644
--- a/framework/inc/services/contenthandlerfactory.hxx
+++ b/framework/inc/services/contenthandlerfactory.hxx
@@ -38,7 +38,6 @@
#include <com/sun/star/container/ElementExistException.hpp>
#include <com/sun/star/container/NoSuchElementException.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/container/NoSuchElementException.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/util/XFlushable.hpp>
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index 07011c6ea71e..adef138c4b0b 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -33,7 +33,6 @@
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
-#include <stdtypes.h>
#include <properties.h>
#include <stdtypes.h>
#include <uielement/menubarmanager.hxx>
diff --git a/framework/inc/services/license.hxx b/framework/inc/services/license.hxx
index 8b1d49926b81..85f3d51ee635 100644
--- a/framework/inc/services/license.hxx
+++ b/framework/inc/services/license.hxx
@@ -33,7 +33,6 @@
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
-#include <stdtypes.h>
#include <properties.h>
#include <stdtypes.h>
#include <uielement/menubarmanager.hxx>
diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx
index b301a625e284..b9a620fae235 100644
--- a/framework/inc/services/logindialog.hxx
+++ b/framework/inc/services/logindialog.hxx
@@ -44,9 +44,6 @@
#include <vcl/fixed.hxx>
#include <vcl/edit.hxx>
#include <vcl/combobox.hxx>
-
-#include <vcl/button.hxx>
-
#include <vcl/button.hxx>
#include <vcl/morebtn.hxx>
diff --git a/framework/inc/services/pathsettings.hxx b/framework/inc/services/pathsettings.hxx
index 8fedd0c00b69..ea474fb2f7b4 100644
--- a/framework/inc/services/pathsettings.hxx
+++ b/framework/inc/services/pathsettings.hxx
@@ -27,7 +27,6 @@
#include <macros/xserviceinfo.hxx>
#include <stdtypes.h>
#include <properties.h>
-#include <stdtypes.h>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx
index dba73cb546f6..8993456ceecd 100644
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
@@ -47,7 +47,6 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/ui/ConfigurationEvent.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
-#include <com/sun/star/ui/XImageManager.hpp>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/interfacecontainer.hxx>
diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index 404adbfddb15..23d9c3f13e25 100644
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -47,7 +47,6 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/ui/ConfigurationEvent.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
-#include <com/sun/star/ui/XImageManager.hpp>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/interfacecontainer.hxx>
diff --git a/framework/inc/uielement/buttontoolbarcontroller.hxx b/framework/inc/uielement/buttontoolbarcontroller.hxx
index 7e7de4eebdb1..4ad55af1d3d4 100644
--- a/framework/inc/uielement/buttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/buttontoolbarcontroller.hxx
@@ -28,7 +28,6 @@
#include <com/sun/star/frame/XStatusListener.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/ControlCommand.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
#include <com/sun/star/frame/XToolbarController.hpp>
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 37c1709ea762..0592e0c78605 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -38,15 +38,12 @@
#include <com/sun/star/frame/XUIControllerRegistration.hpp>
#include <com/sun/star/ui/XImageManager.hpp>
#include <com/sun/star/ui/XUIConfigurationManager.hpp>
-#include <com/sun/star/frame/XStatusListener.hpp>
#include <com/sun/star/frame/XSubToolbarController.hpp>
#include <com/sun/star/frame/XToolbarController.hpp>
#include <com/sun/star/ui/ItemStyle.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
-#include <com/sun/star/frame/XToolbarController.hpp>
-
#include <rtl/ustring.hxx>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/interfacecontainer.hxx>
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index c53ac70c03ef..185bebe3eabd 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -52,7 +52,6 @@
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <osl/mutex.hxx>
-#include <vcl/svapp.hxx>
#include <osl/file.hxx>
#include <cppuhelper/implbase1.hxx>
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index f9cb485f54a7..c1ea381619b1 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -35,7 +35,6 @@
#include <macros/xserviceinfo.hxx>
#include <stdtypes.h>
#include <properties.h>
-#include <stdtypes.h>
#include <uiconfiguration/globalsettings.hxx>
#include <uiconfiguration/windowstateconfiguration.hxx>
#include <framework/addonsoptions.hxx>
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 3b0f4cbe9160..b0275f7c0c7e 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -77,7 +77,6 @@
#include <toolkit/unohlp.hxx>
#include <unotools/moduleoptions.hxx>
#include <svtools/sfxecode.hxx>
-#include <comphelper/processfactory.hxx>
#include <unotools/ucbhelper.hxx>
#include <comphelper/configurationhelper.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index 6d948742f2fb..7ab35026445a 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -47,7 +47,6 @@
#include <tools/date.hxx>
#include <tools/time.hxx>
#include <tools/datetime.hxx>
-#include <osl/file.hxx>
#include <osl/time.h>
namespace framework{
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index 50307c746809..be5d8b187b76 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -46,7 +46,6 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/ui/ConfigurationEvent.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
-#include <com/sun/star/ui/XImageManager.hpp>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/interfacecontainer.hxx>
diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx
index 8bda564dcac3..6d5fc8226bb9 100644
--- a/framework/source/uiconfiguration/moduleimagemanager.cxx
+++ b/framework/source/uiconfiguration/moduleimagemanager.cxx
@@ -48,7 +48,6 @@
#include <unotools/ucbstreamhelper.hxx>
#include <vcl/pngread.hxx>
#include <vcl/pngwrite.hxx>
-#include <rtl/logfile.hxx>
//_________________________________________________________________________________________________________________
// namespaces
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index 10955aa71161..7bb51100033f 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -36,7 +36,6 @@
#include <uielement/spinfieldtoolbarcontroller.hxx>
#include <uielement/edittoolbarcontroller.hxx>
#include <uielement/dropdownboxtoolbarcontroller.hxx>
-#include <uielement/toolbarmerger.hxx>
#include <com/sun/star/ui/ItemType.hpp>
#include <com/sun/star/frame/ModuleManager.hpp>
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index c6ad1bf77b40..e3e3669f05a3 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -42,7 +42,6 @@
#include <i18npool/mslangid.hxx>
#include <svl/languageoptions.hxx>
-#include <com/sun/star/awt/MenuItemStyle.hpp>
#include <svtools/langtab.hxx>
#include <classes/fwlresid.hxx>
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 83e60fd8e2b1..69fc8b6928be 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -35,7 +35,6 @@
#include <com/sun/star/awt/PopupMenuDirection.hpp>
#include <svtools/langtab.hxx>
#include "sal/types.h"
-#include <vcl/svapp.hxx>
#include <com/sun/star/awt/MenuItemStyle.hpp>
#include <com/sun/star/document/XDocumentLanguages.hpp>
#include <i18npool/mslangid.hxx>
@@ -43,8 +42,6 @@
#include <com/sun/star/frame/XModule.hpp>
#include <com/sun/star/frame/XModel.hpp>
-#include <classes/fwkresid.hxx>
-#include <classes/resource.hrc>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
@@ -52,7 +49,6 @@
#include <com/sun/star/util/XURLTransformer.hpp>
#include <comphelper/processfactory.hxx>
-#include <toolkit/unohlp.hxx>
#include <tools/gen.hxx>
#include <com/sun/star/awt/Command.hpp>
#include <svl/languageoptions.hxx>
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index bfb8f2843a82..5f158c824400 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -69,13 +69,11 @@
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <osl/mutex.hxx>
-#include <vcl/svapp.hxx>
#include <osl/file.hxx>
#include <cppuhelper/implbase1.hxx>
#include <svtools/acceleratorexecute.hxx>
#include <rtl/logfile.hxx>
#include "svtools/miscopt.hxx"
-#include <framework/addonmenu.hxx>
#include <uielement/menubarmerger.hxx>
// Be careful removing this "bad" construct. There are serious problems
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index db99cdbb98f2..4047c301b34c 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -70,7 +70,6 @@
#include <vcl/taskpanelist.hxx>
#include <rtl/logfile.hxx>
#include <svtools/menuoptions.hxx>
-#include <unotools/cmdoptions.hxx>
#include <boost/bind.hpp>
#include <svtools/acceleratorexecute.hxx>