diff options
author | August Sodora <augsod@gmail.com> | 2011-11-06 21:21:30 -0500 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-07 12:55:26 +0000 |
commit | e505b16440d7d9db2ed375c023d78b388ac61469 (patch) | |
tree | b02277544db5ece3a00d0437a6cb88600811d8a7 /basctl | |
parent | redundant if not-null checks on delete (diff) | |
download | core-e505b16440d7d9db2ed375c023d78b388ac61469.tar.gz core-e505b16440d7d9db2ed375c023d78b388ac61469.zip |
Remove superfluous includes and forward decls
Diffstat (limited to 'basctl')
-rw-r--r-- | basctl/source/basicide/basidesh.cxx | 1 | ||||
-rw-r--r-- | basctl/source/inc/accessibledialogcontrolshape.hxx | 7 | ||||
-rw-r--r-- | basctl/source/inc/accessibledialogwindow.hxx | 5 | ||||
-rw-r--r-- | basctl/source/inc/basidectrlr.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/basidesh.hxx | 14 | ||||
-rw-r--r-- | basctl/source/inc/basobj.hxx | 9 | ||||
-rw-r--r-- | basctl/source/inc/bastypes.hxx | 26 | ||||
-rw-r--r-- | basctl/source/inc/dlged.hxx | 10 | ||||
-rw-r--r-- | basctl/source/inc/dlgedclip.hxx | 5 | ||||
-rw-r--r-- | basctl/source/inc/dlgeddef.hxx | 3 | ||||
-rw-r--r-- | basctl/source/inc/dlgedfac.hxx | 1 | ||||
-rw-r--r-- | basctl/source/inc/dlgedfunc.hxx | 5 | ||||
-rw-r--r-- | basctl/source/inc/dlgedmod.hxx | 5 | ||||
-rw-r--r-- | basctl/source/inc/dlgedobj.hxx | 7 | ||||
-rw-r--r-- | basctl/source/inc/localizationmgr.hxx | 6 | ||||
-rw-r--r-- | basctl/source/inc/managelang.hxx | 7 | ||||
-rw-r--r-- | basctl/source/inc/propbrw.hxx | 6 |
17 files changed, 29 insertions, 90 deletions
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 0b969de9e64e..9e7379ffedf6 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -82,6 +82,7 @@ #include <com/sun/star/script/XLibraryContainer.hpp> #include <svx/xmlsecctrl.hxx> +#include <sfx2/viewfac.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star; diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx index f45e4eb31e44..efa53213b87c 100644 --- a/basctl/source/inc/accessibledialogcontrolshape.hxx +++ b/basctl/source/inc/accessibledialogcontrolshape.hxx @@ -29,14 +29,10 @@ #ifndef _BASCTL_ACCESSIBLEDIALOGCONTROLSHAPE_HXX_ #define _BASCTL_ACCESSIBLEDIALOGCONTROLSHAPE_HXX_ -#include <com/sun/star/accessibility/XAccessible.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <comphelper/accessiblecomponenthelper.hxx> #include <cppuhelper/implbase3.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> - -#include <vector> class Window; class DialogWindow; @@ -47,7 +43,6 @@ namespace utl { class AccessibleStateSetHelper; } - // ---------------------------------------------------- // class AccessibleDialogControlShape // ---------------------------------------------------- diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx index ed8594a5c071..c2376a90c1f3 100644 --- a/basctl/source/inc/accessibledialogwindow.hxx +++ b/basctl/source/inc/accessibledialogwindow.hxx @@ -29,15 +29,12 @@ #ifndef _BASCTL_ACCESSIBLEDIALOGWINDOW_HXX_ #define _BASCTL_ACCESSIBLEDIALOGWINDOW_HXX_ -#include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <comphelper/accessiblecomponenthelper.hxx> #include <cppuhelper/implbase3.hxx> -#include <tools/link.hxx> #include <svl/lstner.hxx> - -#include <vector> +#include <tools/link.hxx> class DialogWindow; class DlgEditor; diff --git a/basctl/source/inc/basidectrlr.hxx b/basctl/source/inc/basidectrlr.hxx index 8532b7691c74..22cc033ed913 100644 --- a/basctl/source/inc/basidectrlr.hxx +++ b/basctl/source/inc/basidectrlr.hxx @@ -34,10 +34,8 @@ #include <comphelper/proparrhlp.hxx> #include <sfx2/sfxbasecontroller.hxx> - class BasicIDEShell; - class BasicIDEController :public comphelper::OMutexAndBroadcastHelper ,public ::comphelper::OPropertyContainer ,public ::comphelper::OPropertyArrayUsageHelper< BasicIDEController > diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index b7b7c114926d..15fd8f2779e6 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -28,20 +28,16 @@ #ifndef _BASIDESH_HXX #define _BASIDESH_HXX +#include "doceventnotifier.hxx" #include "sbxitem.hxx" -#include "scriptdocument.hxx" -#include "doceventnotifier.hxx" -#include <sfx2/viewfac.hxx> -#include <sfx2/shell.hxx> -#include <vcl/scrbar.hxx> -#include <tools/table.hxx> +#include <com/sun/star/container/XContainerListener.hpp> #include <sfx2/viewsh.hxx> #include <svx/ifaceids.hxx> +#include <tools/table.hxx> +#include <vcl/scrbar.hxx> -#include <com/sun/star/io/XInputStreamProvider.hpp> - -#include <com/sun/star/container/XContainerListener.hpp> +class SfxViewFactory; //---------------------------------------------------------------------------- diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx index e168542c13e4..8f72305a67f4 100644 --- a/basctl/source/inc/basobj.hxx +++ b/basctl/source/inc/basobj.hxx @@ -29,23 +29,16 @@ #define _BASOBJ_HXX #include "scriptdocument.hxx" -#include <tools/string.hxx> -#include <svl/lstner.hxx> -#include <com/sun/star/io/XInputStreamProvider.hpp> -#include <com/sun/star/script/XLibraryContainer.hpp> -#include <com/sun/star/frame/XModel.hpp> +#include <svl/lstner.hxx> class SbMethod; class SbModule; -class SbxObject; class SbxVariable; class StarBASIC; -class BasicManager; class SfxUInt16Item; class SfxBindings; class Window; -struct BasicIDE_Impl; namespace BasicIDE { diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx index 0b7ede803752..85fd60a4b5e9 100644 --- a/basctl/source/inc/bastypes.hxx +++ b/basctl/source/inc/bastypes.hxx @@ -28,31 +28,17 @@ #ifndef _BASTYPES_HXX #define _BASTYPES_HXX -#include <svheader.hxx> - #include "scriptdocument.hxx" -class ModulWindow; -class SfxRequest; -class SvTreeListBox; -class SvLBoxEntry; -class ScrollBar; -class SbModule; -class BasicManager; -class SfxItemSet; -#include <vcl/dockwin.hxx> -#include <vcl/toolbox.hxx> -#include <basic/sbstar.hxx> - #include <iderid.hxx> - -#include <tools/table.hxx> - #include <svtools/tabbar.hxx> -#include <com/sun/star/script/XLibraryContainer.hpp> +#include <vcl/toolbox.hxx> #include <boost/unordered_map.hpp> -#include <vector> + +class SbModule; +class SfxItemSet; +class SfxRequest; #define LINE_SEP_CR 0x0D #define LINE_SEP 0x0A @@ -60,13 +46,11 @@ class SfxItemSet; // Implementation: baside2b.cxx sal_Int32 searchEOL( const ::rtl::OUString& rStr, sal_Int32 fromIndex ); - // Meaning of bToBeKilled: // While being in a reschedule-loop, I may not destroy the window. // It must first break from the reschedule-loop to self-destroy then. // Does unfortunately not work that way: Destroying Window with living Child! - struct BasicStatus { sal_Bool bIsRunning : 1; diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index 592940c8b827..fb06a9f6ccca 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -29,21 +29,19 @@ #ifndef _BASCTL_DLGED_HXX #define _BASCTL_DLGED_HXX -#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/awt/XControlContainer.hpp> +#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/datatransfer/DataFlavor.hpp> -#include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <tools/link.hxx> +#include <com/sun/star/util/XNumberFormatsSupplier.hpp> +#include <svl/brdcst.hxx> +#include <svl/hint.hxx> #include <tools/gen.hxx> #include <vcl/timer.hxx> -#include <svl/hint.hxx> -#include <svl/brdcst.hxx> #define DLGED_PAGE_WIDTH_MIN 1280 #define DLGED_PAGE_HEIGHT_MIN 1024 - //============================================================================ // DlgEdHint //============================================================================ diff --git a/basctl/source/inc/dlgedclip.hxx b/basctl/source/inc/dlgedclip.hxx index 605b6ee87e34..941e68e411ae 100644 --- a/basctl/source/inc/dlgedclip.hxx +++ b/basctl/source/inc/dlgedclip.hxx @@ -29,11 +29,8 @@ #ifndef _BASCTL_DLGEDCLIP_HXX #define _BASCTL_DLGEDCLIP_HXX -#include <cppuhelper/implbase2.hxx> -#include <com/sun/star/datatransfer/XTransferable.hpp> -#include <com/sun/star/datatransfer/DataFlavor.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp> - +#include <cppuhelper/implbase2.hxx> //============================================================================ // DlgEdTransferableImpl diff --git a/basctl/source/inc/dlgeddef.hxx b/basctl/source/inc/dlgeddef.hxx index 85486f8bd288..cceecb6a8f28 100644 --- a/basctl/source/inc/dlgeddef.hxx +++ b/basctl/source/inc/dlgeddef.hxx @@ -29,8 +29,7 @@ #ifndef _BASCTL_DLGEDDEF_HXX #define _BASCTL_DLGEDDEF_HXX -#include <tools/solar.h> - +#include <sal/types.h> const sal_uInt32 DlgInventor = sal_uInt32('D')*0x00000001+ sal_uInt32('L')*0x00000100+ diff --git a/basctl/source/inc/dlgedfac.hxx b/basctl/source/inc/dlgedfac.hxx index 0b3debc5dbc2..9908b3f5798d 100644 --- a/basctl/source/inc/dlgedfac.hxx +++ b/basctl/source/inc/dlgedfac.hxx @@ -32,7 +32,6 @@ #include <svx/svdobj.hxx> - //============================================================================ // DlgEdFactory //============================================================================ diff --git a/basctl/source/inc/dlgedfunc.hxx b/basctl/source/inc/dlgedfunc.hxx index 82cb32912fa8..b6b2eb39bfe8 100644 --- a/basctl/source/inc/dlgedfunc.hxx +++ b/basctl/source/inc/dlgedfunc.hxx @@ -29,12 +29,7 @@ #ifndef _BASCTL_DLGEDFUNC_HXX #define _BASCTL_DLGEDFUNC_HXX -#include <vcl/timer.hxx> - class DlgEditor; -class Timer; -class MouseEvent; -class Point; //============================================================================ // DlgEdFunc diff --git a/basctl/source/inc/dlgedmod.hxx b/basctl/source/inc/dlgedmod.hxx index f4abcaad49c3..9079059514a0 100644 --- a/basctl/source/inc/dlgedmod.hxx +++ b/basctl/source/inc/dlgedmod.hxx @@ -32,15 +32,10 @@ #include <svx/svdmodel.hxx> - //============================================================================ // DlgEdModel //============================================================================ -class DlgEdPage; -class Window; -class SfxObjectShell; - class DlgEdModel : public SdrModel { friend class DlgEdPage; diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx index cf4aa35e8cff..d68c9407bb15 100644 --- a/basctl/source/inc/dlgedobj.hxx +++ b/basctl/source/inc/dlgedobj.hxx @@ -29,13 +29,10 @@ #ifndef _BASCTL_DLGEDOBJ_HXX #define _BASCTL_DLGEDOBJ_HXX -#include <svx/svdouno.hxx> -#include <comphelper/processfactory.hxx> #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/container/XContainerListener.hpp> - -#include <vector> -#include <map> +#include <comphelper/processfactory.hxx> +#include <svx/svdouno.hxx> #include <boost/optional.hpp> diff --git a/basctl/source/inc/localizationmgr.hxx b/basctl/source/inc/localizationmgr.hxx index 7a61eeb132dc..382cab784c87 100644 --- a/basctl/source/inc/localizationmgr.hxx +++ b/basctl/source/inc/localizationmgr.hxx @@ -29,11 +29,11 @@ #ifndef _LOCALIZATIONMGR_HXX #define _LOCALIZATIONMGR_HXX -#include <com/sun/star/resource/XStringResourceManager.hpp> -#include <com/sun/star/container/XNameContainer.hpp> - #include "scriptdocument.hxx" +#include <com/sun/star/resource/XStringResourceManager.hpp> +#include <tools/string.hxx> + class BasicIDEShell; class DlgEditor; diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx index ef030b4bcdf1..d31188f45dfa 100644 --- a/basctl/source/inc/managelang.hxx +++ b/basctl/source/inc/managelang.hxx @@ -29,12 +29,11 @@ #ifndef _BASCTL_MANAGELANG_HXX #define _BASCTL_MANAGELANG_HXX -#include <vcl/dialog.hxx> -#include <vcl/fixed.hxx> -#include <vcl/lstbox.hxx> -#include <vcl/button.hxx> #include <svx/langbox.hxx> #include <svx/checklbx.hxx> +#include <vcl/button.hxx> +#include <vcl/dialog.hxx> +#include <vcl/fixed.hxx> class LocalizationMgr; diff --git a/basctl/source/inc/propbrw.hxx b/basctl/source/inc/propbrw.hxx index 66013faeb930..0a9c7fc23f25 100644 --- a/basctl/source/inc/propbrw.hxx +++ b/basctl/source/inc/propbrw.hxx @@ -29,15 +29,11 @@ #ifndef _BASCTL_PROPBRW_HXX #define _BASCTL_PROPBRW_HXX -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/awt/XControlContainer.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <comphelper/stl_types.hxx> #include <sfx2/basedlgs.hxx> -#include <svl/brdcst.hxx> -#include <svl/lstner.hxx> #include <sfx2/childwin.hxx> +#include <svl/lstner.hxx> #include <svx/svdmark.hxx> //============================================================================ |