diff options
author | Petr Mladek <pmladek@suse.cz> | 2010-10-05 15:55:12 +0200 |
---|---|---|
committer | Petr Mladek <pmladek@suse.cz> | 2010-10-05 18:11:20 +0200 |
commit | cf1ae3562efb375a62bf7807bf310556c7dbca70 (patch) | |
tree | 0a212e780a5a959d7a073d89f8b03a41cc00979e /basic | |
parent | 5dbc8a81c4329a985a69b306996d96141b35da4b (diff) |
more removed include guards using fixguard.py
Diffstat (limited to 'basic')
-rw-r--r-- | basic/inc/basic/sbstar.hxx | 2 | ||||
-rw-r--r-- | basic/inc/basic/sbstdobj.hxx | 2 | ||||
-rw-r--r-- | basic/inc/basic/sbx.hxx | 2 | ||||
-rw-r--r-- | basic/inc/basic/sbxdef.hxx | 2 | ||||
-rw-r--r-- | basic/source/app/app.hxx | 6 | ||||
-rw-r--r-- | basic/source/app/appbased.hxx | 4 | ||||
-rw-r--r-- | basic/source/app/appedit.hxx | 2 | ||||
-rw-r--r-- | basic/source/app/dialogs.hxx | 12 | ||||
-rw-r--r-- | basic/source/app/processw.hxx | 2 | ||||
-rw-r--r-- | basic/source/inc/dlgcont.hxx | 2 | ||||
-rw-r--r-- | basic/source/inc/image.hxx | 2 | ||||
-rw-r--r-- | basic/source/inc/iosys.hxx | 2 | ||||
-rw-r--r-- | basic/source/inc/object.hxx | 2 | ||||
-rw-r--r-- | basic/source/inc/propacc.hxx | 10 | ||||
-rw-r--r-- | basic/source/inc/runtime.hxx | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | basic/source/inc/sbtrace.hxx | 0 | ||||
-rw-r--r-- | basic/source/inc/sbunoobj.hxx | 2 | ||||
-rw-r--r-- | basic/source/inc/scanner.hxx | 2 | ||||
-rw-r--r-- | basic/source/inc/token.hxx | 2 | ||||
-rw-r--r-- | basic/source/runtime/ddectrl.hxx | 2 |
20 files changed, 0 insertions, 62 deletions
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx index 299b1e19eb..1e1e0e2121 100644 --- a/basic/inc/basic/sbstar.hxx +++ b/basic/inc/basic/sbstar.hxx @@ -30,9 +30,7 @@ #include <basic/sbx.hxx> #include <basic/sbxobj.hxx> -#ifndef _RTL_USTRING_HXX #include <rtl/ustring.hxx> -#endif #include <osl/mutex.hxx> #include <basic/sbdef.hxx> diff --git a/basic/inc/basic/sbstdobj.hxx b/basic/inc/basic/sbstdobj.hxx index b3a3c99fa7..109bcda944 100644 --- a/basic/inc/basic/sbstdobj.hxx +++ b/basic/inc/basic/sbstdobj.hxx @@ -29,9 +29,7 @@ #define _SBSTDOBJ1_HXX #include <basic/sbxobj.hxx> -#ifndef _GRAPH_HXX //autogen #include <vcl/graph.hxx> -#endif #include <basic/sbxfac.hxx> class StarBASIC; class SbStdFactory; diff --git a/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx index 4dc2fbd36a..32d8a03d52 100644 --- a/basic/inc/basic/sbx.hxx +++ b/basic/inc/basic/sbx.hxx @@ -35,9 +35,7 @@ #include <basic/sbxdef.hxx> #include <basic/sbxform.hxx> -#ifndef __SBX_SBXOBJECT_HXX #include <basic/sbxobj.hxx> -#endif #include <basic/sbxprop.hxx> #include <basic/sbxmeth.hxx> diff --git a/basic/inc/basic/sbxdef.hxx b/basic/inc/basic/sbxdef.hxx index 6cb9a42b65..0d56641b03 100644 --- a/basic/inc/basic/sbxdef.hxx +++ b/basic/inc/basic/sbxdef.hxx @@ -31,9 +31,7 @@ #ifndef __RSC -#ifndef _SOLAR_H #include <tools/solar.h> -#endif #include "tools/errcode.hxx" #ifndef _SBX_CLASS_TYPE diff --git a/basic/source/app/app.hxx b/basic/source/app/app.hxx index 32b3a051da..1daeb4e776 100644 --- a/basic/source/app/app.hxx +++ b/basic/source/app/app.hxx @@ -29,15 +29,9 @@ #define _BASICAPP_HXX #include <vcl/svapp.hxx> -#ifndef _HELP_HXX //autogen #include <vcl/help.hxx> -#endif -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif -#ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> -#endif #include <vcl/timer.hxx> #include <svl/brdcst.hxx> #include <svl/lstner.hxx> diff --git a/basic/source/app/appbased.hxx b/basic/source/app/appbased.hxx index eb9bf71aa1..ce33105ed9 100644 --- a/basic/source/app/appbased.hxx +++ b/basic/source/app/appbased.hxx @@ -29,12 +29,8 @@ #define _APPBASED_HXX #include <basic/sbmod.hxx> -#ifndef _SB_APPEDIT_HXX #include "appedit.hxx" -#endif -#ifndef _SB_TEXTEDIT_HXX #include "textedit.hxx" -#endif class BasicFrame; class BreakpointWindow; diff --git a/basic/source/app/appedit.hxx b/basic/source/app/appedit.hxx index 92187ff599..f7e74bbb44 100644 --- a/basic/source/app/appedit.hxx +++ b/basic/source/app/appedit.hxx @@ -28,9 +28,7 @@ #ifndef _APPEDIT_HXX #define _APPEDIT_HXX -#ifndef _SCRBAR_HXX //autogen #include <vcl/scrbar.hxx> -#endif #include "appwin.hxx" #include "textedit.hxx" diff --git a/basic/source/app/dialogs.hxx b/basic/source/app/dialogs.hxx index 9b681bc87e..2fde62cf8f 100644 --- a/basic/source/app/dialogs.hxx +++ b/basic/source/app/dialogs.hxx @@ -28,26 +28,16 @@ #ifndef _DIALOGS_HXX #define _DIALOGS_HXX -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/tabdlg.hxx> #include <vcl/tabctrl.hxx> #include <vcl/tabpage.hxx> #include <tools/config.hxx> -#ifndef _TOOLS_LIST_HXX #include <tools/list.hxx> -#endif #include <vcl/lstbox.hxx> #include <vcl/floatwin.hxx> #include <vcl/toolbox.hxx> @@ -56,9 +46,7 @@ class SbxVariable; -#ifndef _BASIC_TTRESHLP_HXX #include <basic/ttstrhlp.hxx> -#endif class AboutDialog : public ModalDialog { FixedText a1,a4,aVersionString; diff --git a/basic/source/app/processw.hxx b/basic/source/app/processw.hxx index 648716fa84..3150641c9e 100644 --- a/basic/source/app/processw.hxx +++ b/basic/source/app/processw.hxx @@ -29,9 +29,7 @@ #define _PROCESSW_HXX #include <basic/sbxfac.hxx> -#ifndef __SBX_SBXVARIABLE_HXX //autogen #include <basic/sbxvar.hxx> -#endif #include <basic/sbxobj.hxx> #include <basic/process.hxx> diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx index 7d22f4d64c..614fccf30c 100644 --- a/basic/source/inc/dlgcont.hxx +++ b/basic/source/inc/dlgcont.hxx @@ -30,9 +30,7 @@ #include "namecont.hxx" -#ifndef _COM_SUN_STAR_AWT_XSTRINGRESOURCESUPPLIER_HPP_ #include <com/sun/star/resource/XStringResourceSupplier.hpp> -#endif #include "com/sun/star/resource/XStringResourcePersistence.hpp" #include <cppuhelper/implbase1.hxx> diff --git a/basic/source/inc/image.hxx b/basic/source/inc/image.hxx index 35715b4d38..cb0fddf379 100644 --- a/basic/source/inc/image.hxx +++ b/basic/source/inc/image.hxx @@ -29,9 +29,7 @@ #define _SBIMAGE_HXX #include "sbintern.hxx" -#ifndef _RTL_USTRING_HXX #include <rtl/ustring.hxx> -#endif #include <filefmt.hxx> // Diese Klasse liest das vom Compiler erzeugte Image ein und verwaltet diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx index 50f7b01dcf..133df89151 100644 --- a/basic/source/inc/iosys.hxx +++ b/basic/source/inc/iosys.hxx @@ -29,9 +29,7 @@ #define _SBIOSYS_HXX #include <tools/stream.hxx> -#ifndef _SBERRORS_HXX #include <basic/sberrors.hxx> -#endif class SvStream; diff --git a/basic/source/inc/object.hxx b/basic/source/inc/object.hxx index 3de6ff8ee8..5b375e576d 100644 --- a/basic/source/inc/object.hxx +++ b/basic/source/inc/object.hxx @@ -29,9 +29,7 @@ #define _SAMPLE_OBJECT_HXX #include <basic/sbxfac.hxx> -#ifndef __SBX_SBXVARIABLE_HXX //autogen #include <basic/sbxvar.hxx> -#endif #include <basic/sbxobj.hxx> // 1) Properties: diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx index 4fc67883aa..6af44815be 100644 --- a/basic/source/inc/propacc.hxx +++ b/basic/source/inc/propacc.hxx @@ -28,21 +28,11 @@ #define _SFX_PROPBAG_HXX #include <svl/svarray.hxx> -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HXX_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HXX_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSETINFO_HXX_ #include <com/sun/star/beans/XPropertySetInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYACCESS_HXX_ #include <com/sun/star/beans/XPropertyAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYCONTAINER_HXX_ #include <com/sun/star/beans/XPropertyContainer.hpp> -#endif #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx> diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx index 96de7e5ce6..9327dc54ee 100644 --- a/basic/source/inc/runtime.hxx +++ b/basic/source/inc/runtime.hxx @@ -28,9 +28,7 @@ #ifndef _SBRUNTIME_HXX #define _SBRUNTIME_HXX -#ifndef _SBX_HXX #include <basic/sbx.hxx> -#endif #include "sb.hxx" diff --git a/basic/source/inc/sbtrace.hxx b/basic/source/inc/sbtrace.hxx index 6d24325c94..6d24325c94 100755..100644 --- a/basic/source/inc/sbtrace.hxx +++ b/basic/source/inc/sbtrace.hxx diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index f2277e99d0..a1274b9f50 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -31,9 +31,7 @@ #include <basic/sbxmeth.hxx> #include <basic/sbxprop.hxx> #include <basic/sbxfac.hxx> -#ifndef __SBX_SBX_HXX //autogen #include <basic/sbx.hxx> -#endif #include <com/sun/star/beans/XMaterialHolder.hpp> #include <com/sun/star/beans/XExactName.hpp> #include <com/sun/star/beans/XIntrospectionAccess.hpp> diff --git a/basic/source/inc/scanner.hxx b/basic/source/inc/scanner.hxx index 099f9836fb..d97ab1e6cc 100644 --- a/basic/source/inc/scanner.hxx +++ b/basic/source/inc/scanner.hxx @@ -29,9 +29,7 @@ #define _SCANNER_HXX #include <tools/string.hxx> -#ifndef _SBERRORS_HXX #include <basic/sberrors.hxx> -#endif // Der Scanner ist stand-alone, d.h. er kann von ueberallher verwendet // werden. Eine BASIC-Instanz ist fuer Fehlermeldungen notwendig. Ohne diff --git a/basic/source/inc/token.hxx b/basic/source/inc/token.hxx index 7c3ff75332..4bac670594 100644 --- a/basic/source/inc/token.hxx +++ b/basic/source/inc/token.hxx @@ -29,9 +29,7 @@ #define _TOKEN_HXX #include "scanner.hxx" -#ifndef _SBDEF_HXX #include <basic/sbdef.hxx> -#endif #if defined( SHARED ) #define SbiTokenSHAREDTMPUNDEF diff --git a/basic/source/runtime/ddectrl.hxx b/basic/source/runtime/ddectrl.hxx index 66f73d4330..49d17f461e 100644 --- a/basic/source/runtime/ddectrl.hxx +++ b/basic/source/runtime/ddectrl.hxx @@ -29,9 +29,7 @@ #define _DDECTRL_HXX #include <tools/link.hxx> -#ifndef _SBERRORS_HXX #include <basic/sberrors.hxx> -#endif #include <tools/string.hxx> class DdeConnection; |