[ooo-build-commit] .: 7 commits - avmedia/inc avmedia/source basic/inc basic/source connectivity/inc connectivity/source desktop/inc desktop/source desktop/unx editeng/inc editeng/source embeddedobj/source formula/source fpicker/source fpicker/test framework/inc framework/source framework/test idl/source linguistic/source linguistic/workben scripting/source sfx2/inc sfx2/source shell/inc shell/qa shell/source svx/inc svx/source svx/workben sysui/source ucb/source ucb/workben uui/source vbahelper/inc vbahelper/source xmlhelp/source xmloff/inc xmloff/source xmlscript/inc xmlscript/source
Petr Mladek
pmladek at kemper.freedesktop.org
Tue Oct 5 10:13:07 PDT 2010
avmedia/inc/avmedia/mediaitem.hxx | 2
avmedia/source/framework/soundhandler.cxx | 4
avmedia/source/gstreamer/gstcommon.hxx | 18 ---
avmedia/source/gstreamer/gstframegrabber.hxx | 2
avmedia/source/gstreamer/gstmanager.hxx | 2
avmedia/source/gstreamer/gstplayer.hxx | 2
avmedia/source/gstreamer/gstwindow.hxx | 2
avmedia/source/quicktime/framegrabber.hxx | 2
avmedia/source/quicktime/manager.hxx | 2
avmedia/source/quicktime/player.hxx | 2
avmedia/source/quicktime/window.hxx | 2
avmedia/source/viewer/mediawindow_impl.cxx | 6 -
avmedia/source/viewer/mediawindowbase_impl.cxx | 2
avmedia/source/win/framegrabber.hxx | 2
avmedia/source/win/manager.hxx | 2
avmedia/source/win/player.hxx | 2
avmedia/source/win/window.hxx | 2
avmedia/source/xine/manager.hxx | 2
avmedia/source/xine/player.hxx | 2
avmedia/source/xine/window.hxx | 2
basic/inc/basic/sbstar.hxx | 2
basic/inc/basic/sbstdobj.hxx | 2
basic/inc/basic/sbx.hxx | 2
basic/inc/basic/sbxdef.hxx | 2
basic/source/app/app.cxx | 8 -
basic/source/app/app.hxx | 6 -
basic/source/app/appbased.cxx | 4
basic/source/app/appbased.hxx | 4
basic/source/app/appedit.cxx | 2
basic/source/app/appedit.hxx | 2
basic/source/app/apperror.cxx | 2
basic/source/app/appwin.cxx | 2
basic/source/app/brkpnts.cxx | 2
basic/source/app/dialogs.cxx | 14 --
basic/source/app/dialogs.hxx | 12 --
basic/source/app/msgedit.cxx | 6 -
basic/source/app/mybasic.cxx | 6 -
basic/source/app/printer.cxx | 10 --
basic/source/app/process.cxx | 2
basic/source/app/processw.cxx | 4
basic/source/app/processw.hxx | 2
basic/source/app/textedit.cxx | 2
basic/source/basmgr/basicmanagerrepository.cxx | 2
basic/source/classes/sbunoobj.cxx | 2
basic/source/inc/dlgcont.hxx | 2
basic/source/inc/image.hxx | 2
basic/source/inc/iosys.hxx | 2
basic/source/inc/object.hxx | 2
basic/source/inc/propacc.hxx | 10 --
basic/source/inc/runtime.hxx | 2
basic/source/inc/sbunoobj.hxx | 2
basic/source/inc/scanner.hxx | 2
basic/source/inc/token.hxx | 2
basic/source/runtime/ddectrl.cxx | 2
basic/source/runtime/ddectrl.hxx | 2
basic/source/runtime/inputbox.cxx | 2
basic/source/runtime/iosys.cxx | 2
basic/source/runtime/methods.cxx | 4
basic/source/runtime/methods1.cxx | 2
basic/source/sample/object.cxx | 4
basic/source/sbx/sbxexec.cxx | 2
basic/source/sbx/sbxscan.cxx | 2
basic/source/sbx/sbxstr.cxx | 2
basic/source/uno/namecont.cxx | 4
basic/source/uno/scriptcont.cxx | 2
connectivity/source/commontools/ConnectionWrapper.cxx | 2
connectivity/source/cpool/ZConnectionPool.cxx | 4
connectivity/source/cpool/ZPooledConnection.cxx | 2
connectivity/source/drivers/adabas/BConnection.cxx | 2
connectivity/source/drivers/adabas/BDatabaseMetaData.cxx | 2
connectivity/source/drivers/adabas/BGroup.cxx | 2
connectivity/source/drivers/adabas/BIndex.cxx | 2
connectivity/source/drivers/adabas/BIndexColumns.cxx | 2
connectivity/source/drivers/adabas/BResultSetMetaData.cxx | 2
connectivity/source/drivers/ado/ACatalog.cxx | 2
connectivity/source/drivers/ado/AGroup.cxx | 4
connectivity/source/drivers/ado/AKeyColumn.cxx | 2
connectivity/source/drivers/ado/AKeyColumns.cxx | 2
connectivity/source/drivers/ado/AKeys.cxx | 2
connectivity/source/drivers/ado/AUser.cxx | 2
connectivity/source/drivers/calc/CConnection.cxx | 4
connectivity/source/drivers/calc/CTables.cxx | 2
connectivity/source/drivers/dbase/DConnection.cxx | 4
connectivity/source/drivers/dbase/DDatabaseMetaData.cxx | 2
connectivity/source/drivers/evoab/LConfigAccess.cxx | 2
connectivity/source/drivers/evoab/LDatabaseMetaData.cxx | 4
connectivity/source/drivers/evoab/LDebug.cxx | 2
connectivity/source/drivers/evoab/LFolderList.cxx | 2
connectivity/source/drivers/evoab/LTable.cxx | 2
connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx | 2
connectivity/source/drivers/evoab2/NTable.cxx | 2
connectivity/source/drivers/evoab2/NTables.cxx | 2
connectivity/source/drivers/file/FTables.cxx | 2
connectivity/source/drivers/flat/ECatalog.cxx | 2
connectivity/source/drivers/flat/EConnection.cxx | 4
connectivity/source/drivers/flat/EPreparedStatement.cxx | 2
connectivity/source/drivers/hsqldb/HTerminateListener.hxx | 2
connectivity/source/drivers/jdbc/Object.cxx | 2
connectivity/source/drivers/kab/KStatement.hxx | 2
connectivity/source/drivers/kab/kcondition.hxx | 2
connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx | 2
connectivity/source/drivers/macab/MacabStatement.hxx | 2
connectivity/source/drivers/macab/macabcondition.hxx | 2
connectivity/source/drivers/mozab/MCatalog.cxx | 2
connectivity/source/drivers/mozab/MConfigAccess.cxx | 4
connectivity/source/drivers/mozab/MPreparedStatement.hxx | 2
connectivity/source/drivers/mozab/MStatement.hxx | 2
connectivity/source/drivers/mozab/MTable.hxx | 2
connectivity/source/drivers/mozab/MTables.cxx | 2
connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx | 2
connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx | 2
connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx | 2
connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx | 2
connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx | 2
connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx | 4
connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx | 4
connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx | 6 -
connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx | 2
connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx | 2
connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx | 2
connectivity/source/inc/RowFunctionParser.hxx | 2
connectivity/source/inc/adabas/BStatement.hxx | 4
connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx | 2
connectivity/source/inc/file/FResultSet.hxx | 16 ---
connectivity/source/inc/file/FTable.hxx | 2
connectivity/source/inc/hsqldb/HStorageMap.hxx | 2
connectivity/source/inc/java/tools.hxx | 2
connectivity/source/parse/PColumn.cxx | 2
desktop/inc/app.hxx | 2
desktop/source/app/app.cxx | 6 -
desktop/source/app/cmdlinehelp.hxx | 2
desktop/source/app/officeipcthread.hxx | 2
desktop/source/app/userinstall.cxx | 4
desktop/source/deployment/gui/dp_gui_dependencydialog.hxx | 2
desktop/source/deployment/gui/dp_gui_updatedialog.hxx | 2
desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx | 2
desktop/source/deployment/inc/dp_platform.hxx | 2
desktop/source/offacc/acceptor.cxx | 2
editeng/inc/editeng/AccessibleImageBullet.hxx | 2
editeng/inc/editeng/editeng.hxx | 2
editeng/inc/editeng/editview.hxx | 2
editeng/inc/editeng/forbiddencharacterstable.hxx | 2
editeng/inc/editeng/measfld.hxx | 2
editeng/inc/editeng/unoedsrc.hxx | 2
editeng/source/editeng/editdoc.hxx | 2
editeng/source/misc/SvXMLAutoCorrectImport.cxx | 2
editeng/source/misc/SvXMLAutoCorrectImport.hxx | 2
editeng/source/outliner/outleeng.hxx | 2
editeng/source/uno/unofdesc.cxx | 2
embeddedobj/source/commonembedding/persistence.cxx | 2
embeddedobj/source/general/docholder.cxx | 4
embeddedobj/source/inc/docholder.hxx | 2
embeddedobj/source/msole/ownview.cxx | 2
formula/source/core/inc/core_resource.hxx | 2
formula/source/ui/resource/ModuleHelper.cxx | 2
fpicker/source/aqua/FilterHelper.hxx | 4
fpicker/source/aqua/SalAquaFilePicker.cxx | 4
fpicker/source/aqua/SalAquaFilePicker.hxx | 4
fpicker/source/aqua/SalAquaFolderPicker.cxx | 2
fpicker/source/aqua/SalAquaFolderPicker.hxx | 8 -
fpicker/source/aqua/SalAquaPicker.cxx | 4
fpicker/source/aqua/SalAquaPicker.hxx | 6 -
fpicker/source/aqua/resourceprovider.cxx | 4
fpicker/source/generic/fpicker.cxx | 4
fpicker/source/office/OfficeControlAccess.cxx | 2
fpicker/source/office/OfficeFilePicker.cxx | 2
fpicker/source/office/OfficeFilePicker.hxx | 2
fpicker/source/office/fps_office.cxx | 2
fpicker/source/office/iodlg.cxx | 10 --
fpicker/source/office/iodlg.hxx | 4
fpicker/source/unx/gnome/SalGtkFilePicker.cxx | 2
fpicker/source/unx/gnome/SalGtkFilePicker.hxx | 4
fpicker/source/unx/gnome/SalGtkFolderPicker.cxx | 2
fpicker/source/unx/gnome/SalGtkFolderPicker.hxx | 6 -
fpicker/source/unx/gnome/eventnotification.hxx | 2
fpicker/source/unx/gnome/resourceprovider.hxx | 4
fpicker/source/win32/filepicker/FileOpenDlg.hxx | 2
fpicker/source/win32/filepicker/FilePicker.cxx | 2
fpicker/source/win32/filepicker/WinFileOpenImpl.cxx | 2
fpicker/source/win32/filepicker/WinFileOpenImpl.hxx | 2
fpicker/source/win32/filepicker/dibpreview.cxx | 4
fpicker/source/win32/filepicker/eventnotification.hxx | 2
fpicker/source/win32/filepicker/previewadapter.cxx | 2
fpicker/source/win32/filepicker/previewbase.cxx | 2
fpicker/source/win32/filepicker/workbench/Test_fps.cxx | 2
fpicker/source/win32/folderpicker/FolderPicker.cxx | 2
fpicker/source/win32/folderpicker/FolderPicker.hxx | 4
fpicker/source/win32/folderpicker/Fopentry.cxx | 4
fpicker/source/win32/folderpicker/WinFOPImpl.cxx | 4
fpicker/source/win32/folderpicker/workbench/Test_fops.cxx | 6 -
fpicker/source/win32/misc/resourceprovider.cxx | 2
fpicker/source/win32/misc/resourceprovider.hxx | 2
fpicker/test/svdem.cxx | 2
framework/inc/classes/actiontriggerpropertyset.hxx | 2
framework/inc/classes/droptargetlistener.hxx | 4
framework/inc/classes/filtercache.hxx | 2
framework/inc/classes/framecontainer.hxx | 2
framework/inc/dispatch/basedispatcher.hxx | 2
framework/inc/dispatch/dispatchprovider.hxx | 2
framework/inc/dispatch/oxt_handler.hxx | 36 -------
framework/inc/dispatch/popupmenudispatcher.hxx | 4
framework/inc/helper/ocomponentenumeration.hxx | 2
framework/inc/helper/otasksenumeration.hxx | 2
framework/inc/helper/statusindicatorfactory.hxx | 2
framework/inc/helper/titlebarupdate.hxx | 30 ------
framework/inc/helper/wakeupthread.hxx | 4
framework/inc/services/backingcomp.hxx | 4
framework/inc/services/contenthandlerfactory.hxx | 2
framework/inc/services/frame.hxx | 2
framework/inc/services/logindialog.hxx | 6 -
framework/inc/services/pluginframe.hxx | 2
framework/inc/services/urltransformer.hxx | 2
framework/inc/tabwin/tabwindow.hxx | 4
framework/inc/uiconfiguration/graphicnameaccess.hxx | 2
framework/inc/uiconfiguration/uiconfigurationmanager.hxx | 2
framework/inc/uielement/addonstoolbarmanager.hxx | 2
framework/inc/uielement/menubarwrapper.hxx | 2
framework/inc/uielement/newmenucontroller.hxx | 2
framework/inc/xml/acceleratorconfigurationreader.hxx | 4
framework/inc/xml/acceleratorconfigurationwriter.hxx | 2
framework/inc/xml/eventsdocumenthandler.hxx | 4
framework/inc/xml/imagesdocumenthandler.hxx | 2
framework/inc/xml/menudocumenthandler.hxx | 2
framework/inc/xml/statusbardocumenthandler.hxx | 4
framework/inc/xml/toolboxconfiguration.hxx | 2
framework/source/accelerators/acceleratorcache.cxx | 6 -
framework/source/accelerators/acceleratorconfiguration.cxx | 18 ---
framework/source/accelerators/acceleratorexecute.cxx | 14 --
framework/source/accelerators/acceleratorexecute.hxx | 12 --
framework/source/accelerators/documentacceleratorconfiguration.cxx | 22 ----
framework/source/accelerators/moduleacceleratorconfiguration.cxx | 12 --
framework/source/accelerators/presethandler.cxx | 16 ---
framework/source/accelerators/storageholder.cxx | 16 ---
framework/source/application/framework.cxx | 8 -
framework/source/application/login.cxx | 2
framework/source/classes/bmkmenu.cxx | 2
framework/source/classes/framecontainer.cxx | 6 -
framework/source/classes/menumanager.cxx | 2
framework/source/constant/containerquery.cxx | 2
framework/source/constant/contenthandler.cxx | 2
framework/source/constant/frameloader.cxx | 2
framework/source/dispatch/interceptionhelper.cxx | 2
framework/source/dispatch/oxt_handler.cxx | 18 ---
framework/source/helper/ocomponentaccess.cxx | 2
framework/source/helper/ocomponentenumeration.cxx | 2
framework/source/helper/oframes.cxx | 2
framework/source/helper/persistentwindowstate.cxx | 4
framework/source/helper/statusindicatorfactory.cxx | 4
framework/source/helper/tagwindowasmodified.cxx | 4
framework/source/helper/titlebarupdate.cxx | 48 ----------
framework/source/helper/vclstatusindicator.cxx | 2
framework/source/inc/accelerators/acceleratorcache.hxx | 2
framework/source/inc/accelerators/globalacceleratorconfiguration.hxx | 6 -
framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx | 4
framework/source/inc/accelerators/presethandler.hxx | 4
framework/source/inc/accelerators/storageholder.hxx | 4
framework/source/inc/loadenv/loadenv.hxx | 4
framework/source/inc/pattern/configuration.hxx | 2
framework/source/inc/pattern/window.hxx | 2
framework/source/interaction/quietinteraction.cxx | 2
framework/source/jobs/jobexecutor.cxx | 2
framework/source/layoutmanager/layoutmanager.cxx | 4
framework/source/loadenv/loadenv.cxx | 10 --
framework/source/loadenv/targethelper.cxx | 2
framework/source/register/registerlogindialog.cxx | 2
framework/source/services/backingcomp.cxx | 6 -
framework/source/services/desktop.cxx | 6 -
framework/source/services/frame.cxx | 6 -
framework/source/services/menudocumenthandler.cxx | 4
framework/source/services/sessionlistener.cxx | 2
framework/source/services/substitutepathvars.cxx | 2
framework/source/services/taskcreatorsrv.cxx | 2
framework/source/tabwin/tabwindow.cxx | 2
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 2
framework/source/uiconfiguration/uicategorydescription.cxx | 4
framework/source/uiconfiguration/uiconfigurationmanager.cxx | 2
framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx | 2
framework/source/uielement/addonstoolbarmanager.cxx | 18 ---
framework/source/uielement/addonstoolbarwrapper.cxx | 4
framework/source/uielement/buttontoolbarcontroller.cxx | 4
framework/source/uielement/comboboxtoolbarcontroller.cxx | 6 -
framework/source/uielement/complextoolbarcontroller.cxx | 6 -
framework/source/uielement/dropdownboxtoolbarcontroller.cxx | 6 -
framework/source/uielement/edittoolbarcontroller.cxx | 6 -
framework/source/uielement/fontmenucontroller.cxx | 4
framework/source/uielement/fontsizemenucontroller.cxx | 8 -
framework/source/uielement/footermenucontroller.cxx | 4
framework/source/uielement/generictoolbarcontroller.cxx | 6 -
framework/source/uielement/headermenucontroller.cxx | 4
framework/source/uielement/imagebuttontoolbarcontroller.cxx | 4
framework/source/uielement/langselectionmenucontroller.cxx | 6 -
framework/source/uielement/langselectionstatusbarcontroller.cxx | 4
framework/source/uielement/logoimagestatusbarcontroller.cxx | 2
framework/source/uielement/logotextstatusbarcontroller.cxx | 2
framework/source/uielement/menubarmanager.cxx | 4
framework/source/uielement/newmenucontroller.cxx | 2
framework/source/uielement/objectmenucontroller.cxx | 4
framework/source/uielement/progressbarwrapper.cxx | 2
framework/source/uielement/recentfilesmenucontroller.cxx | 4
framework/source/uielement/rootitemcontainer.cxx | 4
framework/source/uielement/simpletextstatusbarcontroller.cxx | 2
framework/source/uielement/spinfieldtoolbarcontroller.cxx | 6 -
framework/source/uielement/statusbarmanager.cxx | 2
framework/source/uielement/statusbarwrapper.cxx | 2
framework/source/uielement/togglebuttontoolbarcontroller.cxx | 4
framework/source/uielement/toolbarmanager.cxx | 10 --
framework/source/uielement/toolbarsmenucontroller.cxx | 6 -
framework/source/uielement/toolbarwrapper.cxx | 4
framework/source/uielement/uicommanddescription.cxx | 2
framework/source/uifactory/addonstoolboxfactory.cxx | 2
framework/source/uifactory/menubarfactory.cxx | 4
framework/source/uifactory/statusbarfactory.cxx | 2
framework/source/uifactory/toolboxfactory.cxx | 2
framework/source/xml/acceleratorconfigurationreader.cxx | 2
framework/source/xml/eventsconfiguration.cxx | 4
framework/source/xml/eventsdocumenthandler.cxx | 2
framework/source/xml/imagesconfiguration.cxx | 4
framework/source/xml/imagesdocumenthandler.cxx | 2
framework/source/xml/menuconfiguration.cxx | 4
framework/source/xml/statusbarconfiguration.cxx | 2
framework/source/xml/statusbardocumenthandler.cxx | 2
framework/source/xml/toolboxconfiguration.cxx | 2
framework/test/threadtest.cxx | 6 -
framework/test/threadtest/threadtest.cxx | 4
framework/test/typecfg/cfgview.cxx | 2
idl/source/cmptools/char.cxx | 2
idl/source/prj/idldll.cxx | 2
linguistic/source/convdiclist.cxx | 2
linguistic/source/convdicxml.cxx | 2
linguistic/source/hhconvdic.cxx | 2
linguistic/workben/sspellimp.cxx | 2
scripting/source/basprov/basprov.cxx | 2
scripting/source/dlgprov/dlgevtatt.hxx | 2
scripting/source/runtimemgr/ScriptRuntimeManager.cxx | 2
scripting/source/stringresource/stringresource.cxx | 2
scripting/source/stringresource/stringresource.hxx | 4
sfx2/inc/basmgr.hxx | 2
sfx2/inc/dinfedt.hxx | 2
sfx2/inc/docvor.hxx | 2
sfx2/inc/imgmgr.hxx | 2
sfx2/inc/inettbc.hxx | 2
sfx2/inc/sfx2/basedlgs.hxx | 4
sfx2/inc/sfx2/controlwrapper.hxx | 2
sfx2/inc/sfx2/doctdlg.hxx | 2
sfx2/inc/sfx2/filedlghelper.hxx | 2
sfx2/inc/sfx2/linksrc.hxx | 2
sfx2/inc/sfx2/lnkbase.hxx | 4
sfx2/inc/sfx2/mgetempl.hxx | 2
sfx2/inc/sfx2/mnumgr.hxx | 2
sfx2/inc/sfx2/new.hxx | 8 -
sfx2/inc/sfx2/newstyle.hxx | 2
sfx2/inc/sfx2/objface.hxx | 2
sfx2/inc/sfx2/passwd.hxx | 2
sfx2/inc/sfx2/printer.hxx | 2
sfx2/inc/sfx2/printopt.hxx | 4
sfx2/inc/sfx2/sfxuno.hxx | 2
sfx2/inc/sfx2/styfitem.hxx | 6 -
sfx2/inc/sfx2/tbxctrl.hxx | 6 -
sfx2/inc/sfxresid.hxx | 2
sfx2/inc/srchdlg.hxx | 6 -
sfx2/inc/viewfac.hxx | 2
sfx2/source/appl/app.cxx | 6 -
sfx2/source/appl/appcfg.cxx | 4
sfx2/source/appl/appdata.cxx | 2
sfx2/source/appl/appinit.cxx | 6 -
sfx2/source/appl/appmisc.cxx | 4
sfx2/source/appl/appquit.cxx | 2
sfx2/source/appl/appserv.cxx | 4
sfx2/source/appl/appuno.cxx | 2
sfx2/source/appl/childwin.cxx | 4
sfx2/source/appl/helpinterceptor.hxx | 2
sfx2/source/appl/newhelp.cxx | 2
sfx2/source/appl/shutdownicon.cxx | 2
sfx2/source/appl/shutdownicon.hxx | 4
sfx2/source/appl/shutdowniconunx.cxx | 2
sfx2/source/appl/workwin.cxx | 2
sfx2/source/bastyp/fltfnc.cxx | 8 -
sfx2/source/bastyp/frmhtmlw.cxx | 2
sfx2/source/bastyp/progress.cxx | 2
sfx2/source/config/evntconf.cxx | 2
sfx2/source/control/dispatch.cxx | 4
sfx2/source/control/macrconf.cxx | 6 -
sfx2/source/control/request.cxx | 2
sfx2/source/dialog/about.cxx | 4
sfx2/source/dialog/mailmodel.cxx | 6 -
sfx2/source/dialog/mailmodelapi.cxx | 2
sfx2/source/dialog/mgetempl.cxx | 4
sfx2/source/dialog/partwnd.cxx | 2
sfx2/source/dialog/splitwin.cxx | 2
sfx2/source/dialog/styledlg.cxx | 2
sfx2/source/dialog/templdlg.cxx | 2
sfx2/source/dialog/versdlg.cxx | 2
sfx2/source/doc/QuerySaveDocument.cxx | 2
sfx2/source/doc/docfile.cxx | 4
sfx2/source/doc/doctdlg.cxx | 2
sfx2/source/doc/doctempl.cxx | 2
sfx2/source/doc/doctemplates.cxx | 2
sfx2/source/doc/doctemplateslocal.cxx | 12 --
sfx2/source/doc/doctemplateslocal.hxx | 2
sfx2/source/doc/docvor.cxx | 4
sfx2/source/doc/new.cxx | 4
sfx2/source/doc/objmisc.cxx | 10 --
sfx2/source/doc/objstor.cxx | 2
sfx2/source/doc/objxtor.cxx | 10 --
sfx2/source/inc/alienwarn.hxx | 2
sfx2/source/inc/mnucfga.hxx | 2
sfx2/source/inc/nfltdlg.hxx | 2
sfx2/source/inc/objmnctl.hxx | 2
sfx2/source/inc/ownsubfilterservice.hxx | 2
sfx2/source/inc/sfxtypes.hxx | 10 --
sfx2/source/inc/splitwin.hxx | 2
sfx2/source/inc/statcach.hxx | 4
sfx2/source/inc/templdgi.hxx | 6 -
sfx2/source/inc/versdlg.hxx | 4
sfx2/source/inc/workwin.hxx | 2
sfx2/source/inet/inettbc.cxx | 8 -
sfx2/source/menu/mnuitem.cxx | 4
sfx2/source/menu/mnumgr.cxx | 2
sfx2/source/menu/objmnctl.cxx | 4
sfx2/source/menu/virtmenu.cxx | 4
sfx2/source/notify/eventsupplier.cxx | 4
sfx2/source/statbar/stbitem.cxx | 2
sfx2/source/toolbox/imgmgr.cxx | 2
sfx2/source/toolbox/tbxitem.cxx | 2
sfx2/source/view/frame.cxx | 8 -
sfx2/source/view/orgmgr.cxx | 4
sfx2/source/view/viewfrm.cxx | 6 -
sfx2/source/view/viewsh.cxx | 2
shell/inc/internal/basereader.hxx | 2
shell/source/all/ooofilereader/basereader.cxx | 2
shell/source/all/xml_parser.cxx | 2
shell/source/backends/localebe/localebecdef.cxx | 2
shell/source/backends/macbe/macbecdef.cxx | 2
shell/source/backends/wininetbe/wininetbecdef.cxx | 2
shell/source/cmdmail/cmdmailmsg.hxx | 2
shell/source/cmdmail/cmdmailsuppl.hxx | 4
shell/source/unix/exec/shellexec.cxx | 2
shell/source/unix/exec/shellexec.hxx | 2
shell/source/win32/SysShExec.cxx | 2
shell/source/win32/SysShExec.hxx | 2
shell/source/win32/shlxthandler/propsheets/propsheets.cxx | 2
shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx | 2
shell/source/win32/simplemail/smplmailclient.hxx | 2
shell/source/win32/simplemail/smplmailmsg.hxx | 2
shell/source/win32/simplemail/smplmailsuppl.hxx | 4
shell/source/win32/workbench/TestSysShExec.cxx | 2
svx/inc/connctrl.hxx | 2
svx/inc/fontlb.hxx | 2
svx/inc/imapdlg.hxx | 10 --
svx/inc/lightdlg.hxx | 2
svx/inc/measctrl.hxx | 2
svx/inc/passwd.hxx | 6 -
svx/inc/relfld.hxx | 2
svx/inc/rubydialog.hxx | 4
svx/inc/sdrpaintwindow.hxx | 2
svx/inc/sjctrl.hxx | 2
svx/inc/svx/AccessibleOLEShape.hxx | 4
svx/inc/svx/SvxShapeTypes.hxx | 2
svx/inc/svx/checklbx.hxx | 2
svx/inc/svx/ctredlin.hxx | 4
svx/inc/svx/float3d.hxx | 6 -
svx/inc/svx/fmsearch.hxx | 8 -
svx/inc/svx/fmshell.hxx | 2
svx/inc/svx/fntctrl.hxx | 2
svx/inc/svx/fontwork.hxx | 4
svx/inc/svx/frmdirlbox.hxx | 2
svx/inc/svx/grfflt.hxx | 2
svx/inc/svx/gridctrl.hxx | 2
svx/inc/svx/hdft.hxx | 6 -
svx/inc/svx/msdffdef.hxx | 2
svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx | 2
svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx | 2
svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx | 2
svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx | 2
svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx | 2
svx/inc/svx/sdshitm.hxx | 2
svx/inc/svx/simptabl.hxx | 6 -
svx/inc/svx/strarray.hxx | 2
svx/inc/svx/svdattr.hxx | 12 --
svx/inc/svx/svdattrx.hxx | 8 -
svx/inc/svx/svdetc.hxx | 2
svx/inc/svx/svdhdl.hxx | 4
svx/inc/svx/svdhlpln.hxx | 2
svx/inc/svx/svdouno.hxx | 2
svx/inc/svx/svdtrans.hxx | 2
svx/inc/svx/svdundo.hxx | 2
svx/inc/svx/svdxcgv.hxx | 2
svx/inc/svx/sxcaitm.hxx | 2
svx/inc/svx/sxmbritm.hxx | 2
svx/inc/svx/sxreaitm.hxx | 2
svx/inc/svx/sxreoitm.hxx | 2
svx/inc/svx/sxsiitm.hxx | 2
svx/inc/svx/tabarea.hxx | 4
svx/inc/svx/tabline.hxx | 4
svx/inc/svx/unopage.hxx | 2
svx/inc/svx/viewlayoutitem.hxx | 2
svx/inc/svx/xbitmap.hxx | 2
svx/inc/svx/xfillit.hxx | 2
svx/inc/svx/xlndsit.hxx | 2
svx/inc/svx/xsetit.hxx | 2
svx/inc/svx/xtable.hxx | 4
svx/inc/svx/zoomitem.hxx | 2
svx/inc/svx/zoomslideritem.hxx | 2
svx/inc/txencbox.hxx | 2
svx/inc/txenctab.hxx | 2
svx/inc/uiks.hxx | 2
svx/source/accessibility/AccessibleFrameSelector.cxx | 10 --
svx/source/accessibility/AccessibleShape.cxx | 6 -
svx/source/accessibility/ChildrenManager.cxx | 2
svx/source/accessibility/ChildrenManagerImpl.cxx | 2
svx/source/accessibility/DescriptionGenerator.cxx | 2
svx/source/accessibility/GraphCtlAccessibleContext.cxx | 4
svx/source/customshapes/EnhancedCustomShape2d.cxx | 6 -
svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 2
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 4
svx/source/customshapes/tbxcustomshapes.cxx | 2
svx/source/dialog/_contdlg.cxx | 2
svx/source/dialog/contimp.hxx | 2
svx/source/dialog/databaseregistrationui.cxx | 2
svx/source/dialog/dlgctrl.cxx | 2
svx/source/dialog/docrecovery.cxx | 2
svx/source/dialog/fntctrl.cxx | 2
svx/source/dialog/frmsel.cxx | 4
svx/source/dialog/graphctl.cxx | 2
svx/source/dialog/grfflt.cxx | 2
svx/source/dialog/imapdlg.cxx | 6 -
svx/source/dialog/orienthelper.cxx | 2
svx/source/dialog/passwd.cxx | 2
svx/source/dialog/prtqry.cxx | 2
svx/source/dialog/rubydialog.cxx | 2
svx/source/dialog/simptabl.cxx | 2
svx/source/dialog/stddlg.cxx | 2
svx/source/dialog/svxbmpnumvalueset.cxx | 4
svx/source/dialog/svxruler.cxx | 2
svx/source/fmcomp/dbaexchange.cxx | 4
svx/source/fmcomp/dbaobjectex.cxx | 4
svx/source/fmcomp/gridctrl.cxx | 8 -
svx/source/form/fmcontrolbordermanager.cxx | 4
svx/source/form/fmdocumentclassification.cxx | 2
svx/source/form/fmexch.cxx | 2
svx/source/form/fmexpl.cxx | 12 --
svx/source/form/fmobjfac.cxx | 14 --
svx/source/form/fmpage.cxx | 12 --
svx/source/form/fmshell.cxx | 10 --
svx/source/form/fmsrcimp.cxx | 6 -
svx/source/form/fmtextcontroldialogs.cxx | 2
svx/source/form/formtoolbars.cxx | 2
svx/source/form/tabwin.cxx | 8 -
svx/source/form/tbxform.cxx | 6 -
svx/source/form/typemap.cxx | 4
svx/source/form/xfm_addcondition.cxx | 2
svx/source/inc/GraphCtlAccessibleContext.hxx | 4
svx/source/inc/charmapacc.hxx | 2
svx/source/inc/docrecovery.hxx | 4
svx/source/inc/fmcontrollayout.hxx | 2
svx/source/inc/fmgroup.hxx | 4
svx/source/inc/fmshimp.hxx | 2
svx/source/inc/tbxform.hxx | 2
svx/source/items/SmartTagItem.cxx | 2
svx/source/items/chrtitem.cxx | 2
svx/source/items/hlnkitem.cxx | 10 --
svx/source/items/zoomitem.cxx | 2
svx/source/mnuctrls/SmartTagCtl.cxx | 4
svx/source/stbctrls/insctrl.cxx | 2
svx/source/stbctrls/pszctrl.cxx | 2
svx/source/stbctrls/selctrl.cxx | 2
svx/source/stbctrls/xmlsecctrl.cxx | 13 --
svx/source/stbctrls/zoomctrl.cxx | 4
svx/source/stbctrls/zoomsliderctrl.cxx | 4
svx/source/tbxctrls/grafctrl.cxx | 4
svx/source/tbxctrls/lboxctrl.cxx | 2
svx/source/tbxctrls/linectrl.cxx | 2
svx/source/tbxctrls/tbxalign.cxx | 2
svx/source/toolbars/extrusionbar.cxx | 4
svx/source/toolbars/fontworkbar.cxx | 2
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 4
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx | 2
svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx | 2
svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx | 2
svx/source/unodraw/UnoNamespaceMap.cxx | 2
svx/source/unodraw/gluepts.cxx | 2
svx/source/unodraw/unopool.cxx | 2
svx/source/unodraw/unoshap2.cxx | 2
svx/source/unodraw/unoshap4.cxx | 2
svx/source/unogallery/unogalitem.cxx | 4
svx/source/unogallery/unogalitem.hxx | 2
svx/source/unogallery/unogaltheme.cxx | 2
svx/source/unogallery/unogalthemeprovider.cxx | 2
svx/source/xml/xmleohlp.cxx | 4
svx/source/xml/xmlgrhlp.cxx | 2
svx/source/xml/xmlxtimp.cxx | 2
svx/source/xoutdev/xexch.cxx | 4
svx/source/xoutdev/xtablend.cxx | 2
svx/workben/msview/msview.cxx | 2
sysui/source/win32/misc/AutoBuffer.hxx | 2
sysui/source/win32/misc/WinImplHelper.hxx | 2
sysui/source/win32/misc/resourceprovider.hxx | 2
ucb/source/ucp/file/bc.cxx | 4
ucb/source/ucp/file/bc.hxx | 4
ucb/source/ucp/file/filglob.cxx | 2
ucb/source/ucp/file/filinpstr.cxx | 2
ucb/source/ucp/file/filrset.cxx | 2
ucb/source/ucp/file/filrset.hxx | 2
ucb/source/ucp/file/prov.cxx | 2
ucb/source/ucp/ftp/ftpdynresultset.cxx | 2
ucb/source/ucp/ftp/ftpinpstr.cxx | 2
ucb/source/ucp/ftp/ftpresultsetbase.cxx | 2
ucb/source/ucp/ftp/test_activedatasink.cxx | 2
ucb/source/ucp/hierarchy/hierarchydata.cxx | 2
ucb/source/ucp/webdav/LinkSequence.cxx | 2
ucb/source/ucp/webdav/webdavdatasupplier.cxx | 2
ucb/source/ucp/webdav/webdavresultset.cxx | 2
ucb/workben/cachemap/cachemaptest.cxx | 2
ucb/workben/ucb/srcharg.cxx | 2
uui/source/cookiedg.cxx | 4
uui/source/cookiedg.hxx | 2
uui/source/fltdlg.cxx | 6 -
uui/source/fltdlg.hxx | 4
uui/source/logindlg.cxx | 4
uui/source/logindlg.hxx | 2
uui/source/masterpasscrtdlg.cxx | 4
uui/source/masterpasscrtdlg.hxx | 4
uui/source/masterpassworddlg.cxx | 4
uui/source/masterpassworddlg.hxx | 4
uui/source/passcrtdlg.cxx | 4
uui/source/passworddlg.cxx | 4
uui/source/sslwarndlg.cxx | 6 -
uui/source/sslwarndlg.hxx | 2
uui/source/unknownauthdlg.cxx | 6 -
uui/source/unknownauthdlg.hxx | 2
xmlhelp/source/cxxhelp/inc/db/EntryProcessor.hxx | 2
xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx | 2
xmlhelp/source/cxxhelp/provider/content.cxx | 4
xmlhelp/source/cxxhelp/provider/databases.cxx | 2
xmlhelp/source/cxxhelp/provider/provider.cxx | 4
xmlhelp/source/cxxhelp/provider/resultsetbase.cxx | 2
xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 2
xmlhelp/source/treeview/tvread.cxx | 2
xmloff/inc/XMLBackgroundImageExport.hxx | 2
xmloff/inc/XMLStringBufferImportContext.hxx | 2
xmloff/inc/XMLTextHeaderFooterContext.hxx | 2
xmloff/inc/unoatrcn.hxx | 2
xmloff/inc/xmloff/XMLFontStylesContext.hxx | 2
xmloff/inc/xmloff/XMLTextMasterPageContext.hxx | 2
xmloff/inc/xmloff/prstylei.hxx | 2
xmloff/inc/xmloff/xmlement.hxx | 2
xmloff/inc/xmloff/xmlexp.hxx | 4
xmloff/inc/xmloff/xmlimppr.hxx | 2
xmloff/source/chart/SchXMLSeries2Context.cxx | 2
xmloff/source/core/PropertySetMerger.cxx | 2
xmloff/source/core/nmspmap.cxx | 2
xmloff/source/core/xmlehelp.cxx | 2
xmloff/source/draw/XMLGraphicsDefaultStyle.cxx | 2
xmloff/source/draw/XMLImageMapContext.cxx | 4
xmloff/source/draw/XMLImageMapExport.cxx | 2
xmloff/source/draw/XMLShapePropertySetContext.cxx | 2
xmloff/source/draw/sdpropls.cxx | 2
xmloff/source/draw/sdxmlexp.cxx | 2
xmloff/source/draw/sdxmlimp.cxx | 4
xmloff/source/draw/shapeexport2.cxx | 2
xmloff/source/draw/shapeexport3.cxx | 2
xmloff/source/draw/shapeexport4.cxx | 4
xmloff/source/draw/shapeimport.cxx | 2
xmloff/source/forms/formsimp.cxx | 2
xmloff/source/meta/MetaExportComponent.cxx | 2
xmloff/source/script/XMLEventExport.cxx | 6 -
xmloff/source/script/XMLEventImportHelper.cxx | 2
xmloff/source/script/XMLEventsImportContext.cxx | 4
xmloff/source/script/XMLScriptExportHandler.cxx | 2
xmloff/source/script/XMLStarBasicExportHandler.cxx | 2
xmloff/source/style/MultiPropertySetHelper.cxx | 2
xmloff/source/style/PageHeaderFooterContext.cxx | 2
xmloff/source/style/PageMasterExportPropMapper.cxx | 2
xmloff/source/style/PageMasterImportContext.cxx | 6 -
xmloff/source/style/PageMasterImportPropMapper.cxx | 4
xmloff/source/style/PageMasterPropHdlFactory.cxx | 4
xmloff/source/style/PageMasterPropMapper.cxx | 4
xmloff/source/style/PageMasterStyleMap.cxx | 2
xmloff/source/style/PagePropertySetContext.cxx | 2
xmloff/source/style/SinglePropertySetInfoCache.cxx | 2
xmloff/source/style/XMLFootnoteSeparatorExport.cxx | 2
xmloff/source/style/XMLFootnoteSeparatorImport.cxx | 2
xmloff/source/style/XMLPageExport.cxx | 4
xmloff/source/style/XMLRectangleMembersHandler.cxx | 2
xmloff/source/style/impastp4.cxx | 2
xmloff/source/style/prstylei.cxx | 2
xmloff/source/style/styleexp.cxx | 4
xmloff/source/style/xmlaustp.cxx | 2
xmloff/source/style/xmlstyle.cxx | 8 -
xmloff/source/text/XMLAnchorTypePropHdl.hxx | 2
xmloff/source/text/XMLAutoTextEventExport.cxx | 2
xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx | 2
xmloff/source/text/XMLIndexTableSourceContext.cxx | 2
xmloff/source/text/XMLSectionFootnoteConfigExport.cxx | 2
xmloff/source/text/XMLTextFrameContext.hxx | 2
xmloff/source/text/XMLTextFrameHyperlinkContext.hxx | 4
xmloff/source/text/XMLTextHeaderFooterContext.cxx | 2
xmloff/source/text/XMLTextMasterStylesContext.cxx | 4
xmloff/source/text/XMLTextPropertySetContext.cxx | 4
xmloff/source/text/XMLTextShapeImportHelper.cxx | 4
xmloff/source/text/XMLTextShapeStyleContext.cxx | 6 -
xmloff/source/text/txtexppr.cxx | 8 -
xmloff/source/text/txtexppr.hxx | 2
xmloff/source/text/txtftne.cxx | 2
xmloff/source/text/txtprhdl.cxx | 4
xmloff/source/text/txtprmap.cxx | 4
xmloff/source/text/txtsecte.cxx | 4
xmloff/source/text/txtstyle.cxx | 10 --
xmloff/source/transform/ChartOASISTContext.cxx | 2
xmloff/source/transform/ChartOOoTContext.cxx | 4
xmloff/source/transform/ControlOASISTContext.cxx | 2
xmloff/source/transform/ControlOOoTContext.cxx | 2
xmloff/source/transform/CreateElemTContext.cxx | 2
xmloff/source/transform/DeepTContext.cxx | 4
xmloff/source/transform/DlgOASISTContext.cxx | 2
xmloff/source/transform/DocumentTContext.cxx | 4
xmloff/source/transform/EventOASISTContext.cxx | 2
xmloff/source/transform/EventOOoTContext.cxx | 4
xmloff/source/transform/FlatTContext.cxx | 2
xmloff/source/transform/FormPropOASISTContext.cxx | 2
xmloff/source/transform/FormPropOOoTContext.cxx | 4
xmloff/source/transform/FrameOASISTContext.cxx | 2
xmloff/source/transform/FrameOOoTContext.cxx | 2
xmloff/source/transform/IgnoreTContext.cxx | 2
xmloff/source/transform/MergeElemTContext.cxx | 2
xmloff/source/transform/MetaTContext.cxx | 2
xmloff/source/transform/MetaTContext.hxx | 2
xmloff/source/transform/NotesTContext.cxx | 4
xmloff/source/transform/OOo2Oasis.cxx | 2
xmloff/source/transform/OOo2Oasis.hxx | 2
xmloff/source/transform/Oasis2OOo.cxx | 4
xmloff/source/transform/Oasis2OOo.hxx | 2
xmloff/source/transform/PersAttrListTContext.cxx | 2
xmloff/source/transform/PersMixedContentTContext.cxx | 2
xmloff/source/transform/ProcAddAttrTContext.cxx | 2
xmloff/source/transform/ProcAttrTContext.cxx | 2
xmloff/source/transform/RenameElemTContext.cxx | 2
xmloff/source/transform/StyleOASISTContext.cxx | 2
xmloff/source/transform/StyleOOoTContext.cxx | 4
xmloff/source/transform/TransformerBase.cxx | 4
xmloff/source/transform/TransformerBase.hxx | 2
xmloff/source/transform/TransformerContext.cxx | 4
xmloff/source/transform/TransformerTokenMap.cxx | 2
xmloff/source/transform/TransformerTokenMap.hxx | 2
xmlscript/inc/xmlscript/xmldlg_imexp.hxx | 8 -
xmlscript/source/misc/unoservices.cxx | 2
xmlscript/source/xmlflat_imexp/xmlbas_import.hxx | 2
747 files changed, 8 insertions(+), 2547 deletions(-)
New commits:
commit 38edb9bd9228fec9653317dacfe639b72049c986
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Oct 5 16:16:23 2010 +0200
fixed framework includes after removing the guards
diff --git a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
index 02858de..bb47a99 100644
--- a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
@@ -34,7 +34,7 @@
#include <accelerators/acceleratorconfiguration.hxx>
#include <accelerators/presethandler.hxx>
-#include <macros/interface.hxx>
+#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
diff --git a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
index 2a2d306..3194dc8 100644
--- a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
@@ -34,7 +34,7 @@
#include <accelerators/acceleratorconfiguration.hxx>
#include <accelerators/presethandler.hxx>
-#include <macros/interface.hxx>
+#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
commit 16e4df3ac7d034a0fcf6bfc67adfe2c4bd35d142
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Oct 5 16:12:14 2010 +0200
fixed fpicker includes after removing the guards
diff --git a/fpicker/source/unx/gnome/resourceprovider.hxx b/fpicker/source/unx/gnome/resourceprovider.hxx
index a00c205..b71b376 100644
--- a/fpicker/source/unx/gnome/resourceprovider.hxx
+++ b/fpicker/source/unx/gnome/resourceprovider.hxx
@@ -35,7 +35,7 @@
#include <sal/types.h>
-#include <rtl/ustring>
+#include <rtl/ustring.hxx>
#define FOLDERPICKER_TITLE 500
#define FOLDER_PICKER_DEF_DESCRIPTION 501
commit 5969a13642344c18fbd676a302b0685dca8fac60
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Oct 5 15:58:02 2010 +0200
fixed connectivity includes after removing the guards
diff --git a/connectivity/source/inc/adabas/BStatement.hxx b/connectivity/source/inc/adabas/BStatement.hxx
index f2cc66f..9e8f0e4 100644
--- a/connectivity/source/inc/adabas/BStatement.hxx
+++ b/connectivity/source/inc/adabas/BStatement.hxx
@@ -29,7 +29,7 @@
#include "odbc/OStatement.hxx"
#include "adabas/BConnection.hxx"
-#include "connectivity/commontools.hxx"
+#include "connectivity/CommonTools.hxx"
#include <vos/ref.hxx>
namespace connectivity
commit cf1ae3562efb375a62bf7807bf310556c7dbca70
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Oct 5 15:55:12 2010 +0200
more removed include guards using fixguard.py
diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx
index ee1ffb8..c1c108f 100644
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -29,9 +29,7 @@
#define _AVMEDIA_MEDIAITEM_HXX
#include <tools/rtti.hxx>
-#ifndef _POOLITEM_HXX
#include <svl/poolitem.hxx>
-#endif
#include <com/sun/star/media/ZoomLevel.hpp>
#define AVMEDIA_SETMASK_NONE ((sal_uInt32)(0x00000000))
diff --git a/avmedia/source/gstreamer/gstcommon.hxx b/avmedia/source/gstreamer/gstcommon.hxx
index d3e1f24..b64acf2 100644
--- a/avmedia/source/gstreamer/gstcommon.hxx
+++ b/avmedia/source/gstreamer/gstcommon.hxx
@@ -30,33 +30,15 @@
#include <gst/gst.h>
-#ifndef _OSL_MUTEX_HXX_
#include <osl/mutex.hxx>
-#endif
-#ifndef _DEBUG_HXX
#include <tools/debug.hxx>
-#endif
-#ifndef _STREAM_HXX
#include <tools/stream.hxx>
-#endif
-#ifndef _STRING_HXX
#include <tools/string.hxx>
-#endif
-#ifndef _URLOBJ_HXX
#include <tools/urlobj.hxx>
-#endif
-#ifndef _CPPUHELPER_IMPLBASE1_HXX_
#include <cppuhelper/implbase1.hxx>
-#endif
-#ifndef _CPPUHELPER_IMPLBASE2_HXX_
#include <cppuhelper/implbase2.hxx>
-#endif
-#ifndef _CPPUHELPER_WEAK_HXX_
#include <cppuhelper/weak.hxx>
-#endif
-#ifndef _CPPUHELPER_FACTORY_HXX_
#include <cppuhelper/factory.hxx>
-#endif
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/RuntimeException.hpp>
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx
index 11f6b6f..b940e11 100644
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
@@ -30,9 +30,7 @@
#include "gstcommon.hxx"
-#ifndef _COM_SUN_STAR_MEDIA_XFRAMEGRABBER_HDL_
#include "com/sun/star/media/XFrameGrabber.hdl"
-#endif
namespace avmedia { namespace gstreamer {
diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx
index eebf4ed..3ba0315 100644
--- a/avmedia/source/gstreamer/gstmanager.hxx
+++ b/avmedia/source/gstreamer/gstmanager.hxx
@@ -30,9 +30,7 @@
#include "gstcommon.hxx"
-#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_
#include "com/sun/star/media/XManager.hdl"
-#endif
// -----------
// - Manager -
diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx
index 778c877..69b55ab 100644
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -31,9 +31,7 @@
#include <osl/conditn.h>
#include "gstcommon.hxx"
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HDL_
#include "com/sun/star/media/XPlayer.hdl"
-#endif
typedef struct _GstXOverlay GstXOverlay;
diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx
index 4a7b84e..a17ee1f 100644
--- a/avmedia/source/gstreamer/gstwindow.hxx
+++ b/avmedia/source/gstreamer/gstwindow.hxx
@@ -31,9 +31,7 @@
#include "gstcommon.hxx"
#include <cppuhelper/interfacecontainer.h>
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_
#include "com/sun/star/media/XPlayerWindow.hdl"
-#endif
namespace avmedia { namespace gstreamer {
diff --git a/avmedia/source/quicktime/framegrabber.hxx b/avmedia/source/quicktime/framegrabber.hxx
index 6ddee84..8092350 100644
--- a/avmedia/source/quicktime/framegrabber.hxx
+++ b/avmedia/source/quicktime/framegrabber.hxx
@@ -30,9 +30,7 @@
#include "quicktimecommon.hxx"
-#ifndef _COM_SUN_STAR_MEDIA_XFRAMEGRABBER_HDL_
#include "com/sun/star/media/XFrameGrabber.hdl"
-#endif
namespace avmedia { namespace quicktime {
diff --git a/avmedia/source/quicktime/manager.hxx b/avmedia/source/quicktime/manager.hxx
index cbb7ab2..871073a 100644
--- a/avmedia/source/quicktime/manager.hxx
+++ b/avmedia/source/quicktime/manager.hxx
@@ -30,9 +30,7 @@
#include "quicktimecommon.hxx"
-#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_
#include "com/sun/star/media/XManager.hdl"
-#endif
// -----------
// - Manager -
diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
index a4d04b3..9d53058 100644
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
@@ -31,9 +31,7 @@
#include <osl/conditn.h>
#include "quicktimecommon.hxx"
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HDL_
#include "com/sun/star/media/XPlayer.hdl"
-#endif
namespace avmedia { namespace quicktime {
diff --git a/avmedia/source/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx
index 9592125..7a18481 100644
--- a/avmedia/source/quicktime/window.hxx
+++ b/avmedia/source/quicktime/window.hxx
@@ -31,9 +31,7 @@
#include "quicktimecommon.hxx"
#include <cppuhelper/interfacecontainer.h>
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_
#include "com/sun/star/media/XPlayerWindow.hdl"
-#endif
namespace avmedia { namespace quicktime {
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 913cd50..b6e485d 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -40,12 +40,8 @@
#include <vcl/sysdata.hxx>
#endif
-#ifndef _COM_SUN_STAR_AWT_SYSTEMPOINTER_HDL_
#include <com/sun/star/awt/SystemPointer.hdl>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HDL_
#include <com/sun/star/lang/XComponent.hdl>
-#endif
#define AVMEDIA_TOOLBOXITEM_PREV 0x0001
#define AVMEDIA_TOOLBOXITEM_PLAY 0x0002
diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx
index fdfa0b5..85c83d1 100644
--- a/avmedia/source/viewer/mediawindowbase_impl.cxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.cxx
@@ -33,9 +33,7 @@
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/media/XManager.hpp>
-#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HDL_
#include <com/sun/star/lang/XComponent.hdl>
-#endif
#define MEDIA_TIMER_TIMEOUT 100
diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx
index b9e7e63..f42f8a6 100644
--- a/avmedia/source/win/framegrabber.hxx
+++ b/avmedia/source/win/framegrabber.hxx
@@ -30,9 +30,7 @@
#include "wincommon.hxx"
-#ifndef _COM_SUN_STAR_MEDIA_XFRAMEGRABBER_HDL_
#include "com/sun/star/media/XFrameGrabber.hdl"
-#endif
struct IMediaDet;
diff --git a/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx
index 110b3d2..38c280b 100644
--- a/avmedia/source/win/manager.hxx
+++ b/avmedia/source/win/manager.hxx
@@ -30,9 +30,7 @@
#include "wincommon.hxx"
-#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_
#include "com/sun/star/media/XManager.hdl"
-#endif
// -----------
// - Manager -
diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
index 793da23..440f584 100644
--- a/avmedia/source/win/player.hxx
+++ b/avmedia/source/win/player.hxx
@@ -30,9 +30,7 @@
#include "wincommon.hxx"
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HDL_
#include "com/sun/star/media/XPlayer.hdl"
-#endif
struct IGraphBuilder;
struct IBaseFilter;
diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx
index 7582899..c4349f8 100644
--- a/avmedia/source/win/window.hxx
+++ b/avmedia/source/win/window.hxx
@@ -31,9 +31,7 @@
#include "wincommon.hxx"
#include <cppuhelper/interfacecontainer.h>
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_
#include "com/sun/star/media/XPlayerWindow.hdl"
-#endif
struct IVideoWindow;
diff --git a/avmedia/source/xine/manager.hxx b/avmedia/source/xine/manager.hxx
index 9969aef..e40a187 100644
--- a/avmedia/source/xine/manager.hxx
+++ b/avmedia/source/xine/manager.hxx
@@ -30,9 +30,7 @@
#include "xinecommon.hxx"
-#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_
#include "com/sun/star/media/XManager.hdl"
-#endif
// -----------
// - Manager -
diff --git a/avmedia/source/xine/player.hxx b/avmedia/source/xine/player.hxx
index 45678d7..3fc3725 100644
--- a/avmedia/source/xine/player.hxx
+++ b/avmedia/source/xine/player.hxx
@@ -30,9 +30,7 @@
#include "xinecommon.hxx"
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HDL_
#include "com/sun/star/media/XPlayer.hdl"
-#endif
namespace avmedia { namespace xine {
diff --git a/avmedia/source/xine/window.hxx b/avmedia/source/xine/window.hxx
index 75d6b69..95c6f33 100644
--- a/avmedia/source/xine/window.hxx
+++ b/avmedia/source/xine/window.hxx
@@ -31,9 +31,7 @@
#include "xinecommon.hxx"
#include <cppuhelper/interfacecontainer.h>
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_
#include "com/sun/star/media/XPlayerWindow.hdl"
-#endif
namespace avmedia { namespace xine {
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index 299b1e1..1e1e0e2 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 b3a3c99..109bcda 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 4dc2fbd..32d8a03 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 6cb9a42..0d56641 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 32b3a05..1daeb4e 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 eb9bf71..ce33105 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 92187ff..f7e74bb 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 9b681bc..2fde62c 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 648716f..3150641 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 7d22f4d..614fccf 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 35715b4..cb0fddf 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 50f7b01..133df89 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 3de6ff8..5b375e5 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 4fc6788..6af4481 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 96de7e5..9327dc5 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
old mode 100755
new mode 100644
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index f2277e9..a1274b9 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 099f983..d97ab1e 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 7c3ff75..4bac670 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 66f73d4..49d17f4 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;
diff --git a/connectivity/inc/connectivity/DriversConfig.hxx b/connectivity/inc/connectivity/DriversConfig.hxx
old mode 100755
new mode 100644
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
index e991084..c1e17f8 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
@@ -28,9 +28,7 @@
#ifndef _CONNECTIVITY_EVOAB_DATABASEMETADATA_HXX_
#define _CONNECTIVITY_EVOAB_DATABASEMETADATA_HXX_
-#ifndef _CONNECTIVITY_EVOAB_DEBUG_HXX_
#include "NDebug.hxx"
-#endif
#include "NConnection.hxx"
#include "TDatabaseMetaDataBase.hxx"
#include "FDatabaseMetaDataResultSet.hxx"
diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
index 7f31387..bff7b08 100644
--- a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
+++ b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
@@ -28,9 +28,7 @@
#define CONNECTIVITY_HSQLDB_TERMINATELISTENER_HXX
#include <cppuhelper/compbase1.hxx>
-#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
#include <com/sun/star/frame/XTerminateListener.hpp>
-#endif
//........................................................................
namespace connectivity
diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx
index 512ca07..184fee0 100644
--- a/connectivity/source/drivers/kab/KStatement.hxx
+++ b/connectivity/source/drivers/kab/KStatement.hxx
@@ -31,9 +31,7 @@
#include "KConnection.hxx"
#include <list>
#include "connectivity/sqliterator.hxx"
-#ifndef _CONNECTIVITY_PARSE_SQLPARSE_HXX_
#include "connectivity/sqlparse.hxx"
-#endif
#include <com/sun/star/sdbc/XStatement.hpp>
#include <com/sun/star/util/XCancellable.hpp>
#include <cppuhelper/compbase4.hxx>
diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx
index ee6a5b1..3829fa1 100644
--- a/connectivity/source/drivers/kab/kcondition.hxx
+++ b/connectivity/source/drivers/kab/kcondition.hxx
@@ -28,9 +28,7 @@
#ifndef _CONNECTIVITY_KAB_CONDITION_HXX_
#define _CONNECTIVITY_KAB_CONDITION_HXX_
-#ifndef _COMPHELPER_TYPES_H_
#include <comphelper/types.hxx>
-#endif
#include <shell/kde_headers.h>
#include <connectivity/dbexception.hxx>
diff --git a/connectivity/source/drivers/macab/MacabAddressBook.hxx b/connectivity/source/drivers/macab/MacabAddressBook.hxx
old mode 100755
new mode 100644
diff --git a/connectivity/source/drivers/macab/MacabCatalog.hxx b/connectivity/source/drivers/macab/MacabCatalog.hxx
old mode 100755
new mode 100644
diff --git a/connectivity/source/drivers/macab/MacabColumns.hxx b/connectivity/source/drivers/macab/MacabColumns.hxx
old mode 100755
new mode 100644
diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx
old mode 100755
new mode 100644
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
old mode 100755
new mode 100644
diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx
old mode 100755
new mode 100644
diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
old mode 100755
new mode 100644
diff --git a/connectivity/source/drivers/macab/MacabRecord.hxx b/connectivity/source/drivers/macab/MacabRecord.hxx
old mode 100755
new mode 100644
diff --git a/connectivity/source/drivers/macab/MacabRecords.hxx b/connectivity/source/drivers/macab/MacabRecords.hxx
old mode 100755
new mode 100644
diff --git a/connectivity/source/drivers/macab/MacabResultSet.hxx b/connectivity/source/drivers/macab/MacabResultSet.hxx
old mode 100755
new mode 100644
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
old mode 100755
new mode 100644
diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx
old mode 100755
new mode 100644
index 42d941f..72b7ee0
--- a/connectivity/source/drivers/macab/MacabStatement.hxx
+++ b/connectivity/source/drivers/macab/MacabStatement.hxx
@@ -32,9 +32,7 @@
#include "MacabHeader.hxx"
#include <list>
#include "connectivity/sqliterator.hxx"
-#ifndef _CONNECTIVITY_PARSE_SQLPARSE_HXX_
#include "connectivity/sqlparse.hxx"
-#endif
#include <com/sun/star/sdbc/XStatement.hpp>
#include <com/sun/star/util/XCancellable.hpp>
#include <cppuhelper/compbase4.hxx>
diff --git a/connectivity/source/drivers/macab/MacabTable.hxx b/connectivity/source/drivers/macab/MacabTable.hxx
old mode 100755
new mode 100644
diff --git a/connectivity/source/drivers/macab/MacabTables.hxx b/connectivity/source/drivers/macab/MacabTables.hxx
old mode 100755
new mode 100644
diff --git a/connectivity/source/drivers/macab/macabcondition.hxx b/connectivity/source/drivers/macab/macabcondition.hxx
old mode 100755
new mode 100644
index 89dda9c..e0c3716
--- a/connectivity/source/drivers/macab/macabcondition.hxx
+++ b/connectivity/source/drivers/macab/macabcondition.hxx
@@ -31,9 +31,7 @@
#include "MacabHeader.hxx"
#include "MacabRecord.hxx"
-#ifndef _COMPHELPER_TYPES_H_
#include <comphelper/types.hxx>
-#endif
#include <connectivity/dbexception.hxx>
namespace connectivity
diff --git a/connectivity/source/drivers/macab/macaborder.hxx b/connectivity/source/drivers/macab/macaborder.hxx
old mode 100755
new mode 100644
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.hxx b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
index 72d3495..b128666 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.hxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
@@ -27,9 +27,7 @@
#ifndef CONNECTIVITY_SPREPAREDSTATEMENT_HXX
#define CONNECTIVITY_SPREPAREDSTATEMENT_HXX
-#ifndef CONNECTIVITY_SRESULTSET_HXX
#include "MResultSet.hxx"
-#endif
#include "MStatement.hxx"
#include <com/sun/star/sdbc/XPreparedStatement.hpp>
#include <com/sun/star/sdbc/XParameters.hpp>
diff --git a/connectivity/source/drivers/mozab/MStatement.hxx b/connectivity/source/drivers/mozab/MStatement.hxx
index f19668e..c49b239 100644
--- a/connectivity/source/drivers/mozab/MStatement.hxx
+++ b/connectivity/source/drivers/mozab/MStatement.hxx
@@ -43,9 +43,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <comphelper/broadcasthelper.hxx>
#include "connectivity/sqliterator.hxx"
-#ifndef _CONNECTIVITY_PARSE_SQLPARSE_HXX_
#include "connectivity/sqlparse.hxx"
-#endif
#include <connectivity/FValue.hxx>
#include "TSortIndex.hxx"
#include "MConnection.hxx"
diff --git a/connectivity/source/drivers/mozab/MTable.hxx b/connectivity/source/drivers/mozab/MTable.hxx
index 0fee248..806e9f6 100644
--- a/connectivity/source/drivers/mozab/MTable.hxx
+++ b/connectivity/source/drivers/mozab/MTable.hxx
@@ -30,9 +30,7 @@
#include "connectivity/TTableHelper.hxx"
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#ifndef _CONNECTIVITY_MOZAB_BCONNECTION_HXX_
#include "MConnection.hxx"
-#endif
namespace connectivity
{
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx
index 8c3c21b..eee8398 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx
@@ -31,9 +31,7 @@
#include <sal/types.h>
#include <osl/diagnose.h>
#include <osl/conditn.hxx>
-#ifndef _COM_SUN_STAR_MOZILLA_MOZILLPRODUCTTYPE_HPP_
#include <com/sun/star/mozilla/MozillaProductType.hpp>
-#endif
#include <rtl/ustring.hxx>
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
index 0f57d1b..6175e42 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
@@ -35,9 +35,7 @@
#include <sal/types.h>
#include <osl/diagnose.h>
#include <osl/conditn.hxx>
-#ifndef _COM_SUN_STAR_MOZILLA_MOZILLPRODUCTTYPE_HPP_
#include <com/sun/star/mozilla/MozillaProductType.hpp>
-#endif
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <rtl/ustring.hxx>
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
index 755a98b..4e18ea9 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
@@ -33,9 +33,7 @@
#include <sal/types.h>
#include <osl/diagnose.h>
#include <osl/conditn.hxx>
-#ifndef _COM_SUN_STAR_MOZILLA_MOZILLPRODUCTTYPE_HPP_
#include <com/sun/star/mozilla/MozillaProductType.hpp>
-#endif
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx
index 8af3091..c314cce 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx
@@ -32,9 +32,7 @@
#include <MNSInclude.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#ifndef _COM_SUN_STAR_MOZILLA_XCODEPROXY_HDL_
#include <com/sun/star/mozilla/XCodeProxy.hpp>
-#endif
using namespace com::sun::star::uno;
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx
index 610d2d2..150fb94 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx
@@ -33,13 +33,9 @@
#include <comphelper/propertycontainer.hxx>
#include "FDatabaseMetaDataResultSet.hxx"
-#ifndef _CONNECTIVITY_MAB_CONNECTION_HXX_
#include <MConnection.hxx>
-#endif
#include <com/sun/star/uno/Sequence.hxx>
-#ifndef _COM_SUN_STAR_MOZILLA_MOZILLPRODUCTTYPE_HPP_
#include <com/sun/star/mozilla/MozillaProductType.hpp>
-#endif
namespace connectivity
{
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
index b9a6142..6020f62 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
@@ -31,15 +31,9 @@
#include <osl/thread.hxx>
#include <MNSInclude.hxx>
-#ifndef _CPPUHELPER_COMPBASE2_HXX_
#include <cppuhelper/compbase1.hxx>
-#endif
-#ifndef _COM_SUN_STAR_MOZILLA_XCODEPROXY_HDL_
#include <com/sun/star/mozilla/XCodeProxy.hpp>
-#endif
-#ifndef _COM_SUN_STAR_MOZILLA_XPROXYRUNNER_HDL_
#include "com/sun/star/mozilla/XProxyRunner.hdl"
-#endif
namespace connectivity
{
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
index c5d3a7b..b003d06 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
@@ -34,9 +34,7 @@
#include <connectivity/FValue.hxx>
#include "MNSDeclares.hxx"
#include <osl/thread.hxx>
-#ifndef _COM_SUN_STAR_MOZILLA_MOZILLPRODUCTTYPE_HPP_
#include <com/sun/star/mozilla/MozillaProductType.hpp>
-#endif
namespace connectivity
{
diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx
index 84d351e..e56f419 100644
--- a/connectivity/source/inc/RowFunctionParser.hxx
+++ b/connectivity/source/inc/RowFunctionParser.hxx
@@ -29,9 +29,7 @@
#define CONNECTIVITY_ROWFUNCTIONPARSER_HXX_INCLUDED
#include <sal/config.h>
-#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
#include <boost/shared_ptr.hpp>
-#endif
#include "FDatabaseMetaDataResultSet.hxx"
#include <vector>
#include "connectivity/dbtoolsdllapi.hxx"
diff --git a/connectivity/source/inc/adabas/BStatement.hxx b/connectivity/source/inc/adabas/BStatement.hxx
index 1d141a4..f2cc66f 100644
--- a/connectivity/source/inc/adabas/BStatement.hxx
+++ b/connectivity/source/inc/adabas/BStatement.hxx
@@ -29,9 +29,7 @@
#include "odbc/OStatement.hxx"
#include "adabas/BConnection.hxx"
-#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
#include "connectivity/commontools.hxx"
-#endif
#include <vos/ref.hxx>
namespace connectivity
diff --git a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
index 45b4592..d7c56b3 100644
--- a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
@@ -39,9 +39,7 @@
#include <com/sun/star/sdbc/XRowUpdate.hpp>
#include <cppuhelper/compbase7.hxx>
#include <comphelper/proparrhlp.hxx>
-#ifndef _CONNECTIVITY_FILE_ASTATEMENT_HXX_
#include "file/FStatement.hxx"
-#endif
#include "connectivity/CommonTools.hxx"
#include <comphelper/propertycontainer.hxx>
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index ebd76a8..9b21b42 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -28,31 +28,15 @@
#ifndef _CONNECTIVITY_FILE_FRESULTSET_HXX_
#define _CONNECTIVITY_FILE_FRESULTSET_HXX_
-#ifndef _COM_SUN_STAR_SQLC_XRESULTSET_HPP_
#include <com/sun/star/sdbc/XResultSet.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SQLC_XROW_HPP_
#include <com/sun/star/sdbc/XRow.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SQLC_XRESULTSETMETADATASUPPLIER_HPP_
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SQLC_XCLOSEABLE_HPP_
#include <com/sun/star/sdbc/XCloseable.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SQLC_XCOLUMNLOCATE_HPP_
#include <com/sun/star/sdbc/XColumnLocate.hpp>
-#endif
#include <com/sun/star/util/XCancellable.hpp>
-#ifndef _COM_SUN_STAR_SQLC_XWARNINGSSUPPLIER_HPP_
#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SQLC_XRESULTSETUPDATE_HPP_
#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SQLC_XROWUPDATE_HPP_
#include <com/sun/star/sdbc/XRowUpdate.hpp>
-#endif
#include <cppuhelper/compbase12.hxx>
#include <comphelper/proparrhlp.hxx>
#include "file/FStatement.hxx"
diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx
index c58d540..928f672 100644
--- a/connectivity/source/inc/file/FTable.hxx
+++ b/connectivity/source/inc/file/FTable.hxx
@@ -31,9 +31,7 @@
#include "connectivity/sdbcx/VTable.hxx"
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#ifndef _CONNECTIVITY_FILE_BCONNECTION_HXX_
#include "file/FConnection.hxx"
-#endif
#include "file/filedllapi.hxx"
#include <tools/stream.hxx>
#include "connectivity/FValue.hxx"
diff --git a/connectivity/source/inc/hsqldb/HStorageMap.hxx b/connectivity/source/inc/hsqldb/HStorageMap.hxx
index c54afce..369e645 100644
--- a/connectivity/source/inc/hsqldb/HStorageMap.hxx
+++ b/connectivity/source/inc/hsqldb/HStorageMap.hxx
@@ -33,9 +33,7 @@
#include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XSeekable.hpp>
-#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
#include <boost/shared_ptr.hpp>
-#endif
#include <comphelper/stl_types.hxx>
#include <jni.h>
//........................................................................
diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx
index b917c0d..9ed39ce 100644
--- a/connectivity/source/inc/java/tools.hxx
+++ b/connectivity/source/inc/java/tools.hxx
@@ -31,9 +31,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/uno/Sequence.h>
-#ifndef JNI_H
#include <jni.h>
-#endif
#include "java/sql/SQLException.hxx"
#include <comphelper/uno3.hxx>
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 510b16d..442c9ee 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -32,9 +32,7 @@
#include <map>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <vcl/svapp.hxx>
-#ifndef _VCL_TIMER_HXX_
#include <vcl/timer.hxx>
-#endif
#include <tools/resmgr.hxx>
#include <unotools/bootstrap.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
diff --git a/desktop/source/app/cmdlinehelp.hxx b/desktop/source/app/cmdlinehelp.hxx
index ca6424c..556bea1 100644
--- a/desktop/source/app/cmdlinehelp.hxx
+++ b/desktop/source/app/cmdlinehelp.hxx
@@ -1,8 +1,6 @@
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
namespace desktop
{
diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx
index fe61c93..e53d034 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -35,9 +35,7 @@
#include <vos/thread.hxx>
#include <vos/signal.hxx>
#include <rtl/ustring.hxx>
-#ifndef _CPPUHELPER_WEAKBASE2_HXX_
#include <cppuhelper/implbase2.hxx>
-#endif
#include <osl/conditn.hxx>
#include "boost/optional.hpp"
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
index 3d982cd..dca2a51 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
@@ -32,9 +32,7 @@
#include <vector>
#include "tools/gen.hxx"
-#ifndef _SV_BUTTON_HXX
#include "vcl/button.hxx"
-#endif
#include "vcl/dialog.hxx"
#include "vcl/fixed.hxx"
#include "vcl/lstbox.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
old mode 100755
new mode 100644
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
old mode 100755
new mode 100644
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
old mode 100755
new mode 100644
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
old mode 100755
new mode 100644
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index ddc9cc5..dc1ed8f 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -40,9 +40,7 @@
#include "svx/checklbx.hxx"
#include "tools/link.hxx"
#include "tools/solar.h"
-#ifndef _SV_BUTTON_HXX
#include "vcl/button.hxx"
-#endif
#include "vcl/dialog.hxx"
#include "vcl/fixed.hxx"
#include <svtools/fixedhyper.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
index 7304185..e7dd414 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
@@ -29,9 +29,7 @@
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_INSTALLDIALOG_HXX
#include "sal/config.h"
-#ifndef _SV_BUTTON_HXX
#include "vcl/button.hxx"
-#endif
#include "vcl/fixed.hxx"
#include "vcl/dialog.hxx"
#include "svtools/prgsbar.hxx"
diff --git a/desktop/source/deployment/inc/dp_platform.hxx b/desktop/source/deployment/inc/dp_platform.hxx
index 5ef5fe0..0686829 100644
--- a/desktop/source/deployment/inc/dp_platform.hxx
+++ b/desktop/source/deployment/inc/dp_platform.hxx
@@ -29,9 +29,7 @@
#define INCLUDED_DP_PLATFORM_HXX
-#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_MISC_API_HXX
#include "dp_misc_api.hxx"
-#endif
#include "com/sun/star/uno/Sequence.hxx"
#include "rtl/ustring.hxx"
diff --git a/desktop/source/deployment/inc/dp_update.hxx b/desktop/source/deployment/inc/dp_update.hxx
old mode 100755
new mode 100644
diff --git a/editeng/inc/editeng/AccessibleImageBullet.hxx b/editeng/inc/editeng/AccessibleImageBullet.hxx
index a8c2b9d..b7221a7 100644
--- a/editeng/inc/editeng/AccessibleImageBullet.hxx
+++ b/editeng/inc/editeng/AccessibleImageBullet.hxx
@@ -32,9 +32,7 @@
#include <cppuhelper/weakref.hxx>
#include <cppuhelper/implbase5.hxx>
-#ifndef _CPPUHELPER_INTERFACECONTAINER_H_
#include <cppuhelper/interfacecontainer.hxx>
-#endif
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
old mode 100755
new mode 100644
index 7bf5df6..dd6fa3b
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -87,9 +87,7 @@ typedef std::vector<SpellPortion> SpellPortions;
namespace basegfx { class B2DPolyPolygon; }
#include <rsc/rscsfx.hxx>
-#ifndef _EDITDATA_HXX
#include <editeng/editdata.hxx>
-#endif
#include <i18npool/lang.h>
#include "editeng/editengdllapi.h"
diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx
index 8450c44..5d7dedd 100644
--- a/editeng/inc/editeng/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@@ -58,9 +58,7 @@ class SfxStyleSheet;
class Font;
class FontList;
-#ifndef _EDITDATA_HXX
#include <editeng/editdata.hxx>
-#endif
#include <com/sun/star/uno/Reference.h>
#include "editeng/editengdllapi.h"
diff --git a/editeng/inc/editeng/forbiddencharacterstable.hxx b/editeng/inc/editeng/forbiddencharacterstable.hxx
index 07a3b37..f342ad5 100644
--- a/editeng/inc/editeng/forbiddencharacterstable.hxx
+++ b/editeng/inc/editeng/forbiddencharacterstable.hxx
@@ -28,9 +28,7 @@
#ifndef _FORBIDDENCHARACTERSTABLE_HXX
#define _FORBIDDENCHARACTERSTABLE_HXX
-#ifndef _TABLE_HXX //autogen
#include <tools/table.hxx>
-#endif
#include <vos/refernce.hxx>
#include <com/sun/star/uno/Reference.hxx>
diff --git a/editeng/inc/editeng/measfld.hxx b/editeng/inc/editeng/measfld.hxx
index f78485e..28f8b7e 100644
--- a/editeng/inc/editeng/measfld.hxx
+++ b/editeng/inc/editeng/measfld.hxx
@@ -32,9 +32,7 @@
#ifndef _FLDITEM_HXX
#ifndef ITEMID_FIELD
-#ifndef _EDITDATA_HXX
#include <editeng/editdata.hxx> /* das include wird wg. EE_FEATURE_FIELD benoetigt */
-#endif
#define ITEMID_FIELD EE_FEATURE_FIELD /* wird fuer #include <editeng/flditem.hxx> benoetigt */
#endif
#include <editeng/flditem.hxx>
diff --git a/editeng/inc/editeng/splwrap.hxx b/editeng/inc/editeng/splwrap.hxx
old mode 100755
new mode 100644
diff --git a/editeng/inc/editeng/unoedsrc.hxx b/editeng/inc/editeng/unoedsrc.hxx
index c7ba241..d78d25f 100644
--- a/editeng/inc/editeng/unoedsrc.hxx
+++ b/editeng/inc/editeng/unoedsrc.hxx
@@ -36,9 +36,7 @@
#include <tools/gen.hxx>
#include <vcl/mapmod.hxx>
#include <tools/string.hxx>
-#ifndef _SV_COLOR_HXX //autogen
#include <tools/color.hxx>
-#endif
#include <svl/poolitem.hxx>
#include <svl/itempool.hxx>
#include "editeng/editengdllapi.h"
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index e3ad32c..e24deff 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -28,9 +28,7 @@
#ifndef _EDITDOC_HXX
#define _EDITDOC_HXX
-#ifndef _COM_SUN_STAR_I18N_XEXTENDEDINPUTSEQUENCECHECKER_HDL_
#include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
-#endif
#include <editattr.hxx>
#include <edtspell.hxx>
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
old mode 100755
new mode 100644
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.hxx b/editeng/source/misc/SvXMLAutoCorrectImport.hxx
index 2175a45..d5cc6df 100644
--- a/editeng/source/misc/SvXMLAutoCorrectImport.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.hxx
@@ -27,9 +27,7 @@
#ifndef _SV_XMLAUTOCORRECTIMPORT_HXX
#define _SV_XMLAUTOCORRECTIMPORT_HXX
-#ifndef _SVSTOR_HXX
#include <sot/storage.hxx>
-#endif
#include <xmloff/xmlictxt.hxx>
#include <xmloff/xmlimp.hxx>
#include <xmloff/nmspmap.hxx>
diff --git a/editeng/source/outliner/outleeng.hxx b/editeng/source/outliner/outleeng.hxx
index 536af8b..419344d 100644
--- a/editeng/source/outliner/outleeng.hxx
+++ b/editeng/source/outliner/outleeng.hxx
@@ -28,9 +28,7 @@
#define _OUTLEENG_HXX
#include <editeng/outliner.hxx>
-#ifndef _EDITENG_HXX
#include <editeng/editeng.hxx>
-#endif
typedef EENotify* EENotifyPtr;
SV_DECL_PTRARR_DEL( NotifyList, EENotifyPtr, 1, 1 )
diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx
index 38b601c..0358210 100644
--- a/embeddedobj/source/inc/docholder.hxx
+++ b/embeddedobj/source/inc/docholder.hxx
@@ -36,9 +36,7 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
#include <com/sun/star/frame/XBorderResizeListener.hpp>
-#ifndef _COM_SUN_STAR_FRAME_XBORDERWIDTHS_HPP_
#include <com/sun/star/frame/BorderWidths.hpp>
-#endif
#include <com/sun/star/awt/XWindowPeer.hpp>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/awt/Rectangle.hpp>
diff --git a/formula/source/core/inc/core_resource.hxx b/formula/source/core/inc/core_resource.hxx
index c38c158..bf3e2c2 100644
--- a/formula/source/core/inc/core_resource.hxx
+++ b/formula/source/core/inc/core_resource.hxx
@@ -28,9 +28,7 @@
#ifndef _FORMULA_CORE_RESOURCE_HXX_
#define _FORMULA_CORE_RESOURCE_HXX_
-#ifndef _RTL_USTRING_HXX_
#include <rtl/ustring.hxx>
-#endif
#include <osl/mutex.hxx>
class ResMgr;
diff --git a/fpicker/source/aqua/FilterHelper.hxx b/fpicker/source/aqua/FilterHelper.hxx
index d722358..e760518 100644
--- a/fpicker/source/aqua/FilterHelper.hxx
+++ b/fpicker/source/aqua/FilterHelper.hxx
@@ -47,13 +47,9 @@
#include <com/sun/star/beans/StringPair.hpp>
#include <com/sun/star/uno/Sequence.hxx>
-#ifndef _COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_HXX_
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UNO_RUNTIMEEXCEPTION_HXX_
#include <com/sun/star/uno/RuntimeException.hpp>
-#endif
// #ifndef _RTL_USTRING_H_
// #include <rtl/ustring.hxx>
diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx
index 2721147..5d9bbc5 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
@@ -42,16 +42,12 @@
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <com/sun/star/beans/StringPair.hpp>
-#ifndef _SALAQUAPICKER_HXX_
#include "SalAquaPicker.hxx"
-#endif
#include <memory>
#include <list>
-#ifndef _RTL_USTRING_H_
#include <rtl/ustring.hxx>
-#endif
#include "FilterHelper.hxx"
#include "AquaFilePickerDelegate.hxx"
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.hxx b/fpicker/source/aqua/SalAquaFolderPicker.hxx
index 38540ff..72d5214 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.hxx
+++ b/fpicker/source/aqua/SalAquaFolderPicker.hxx
@@ -32,26 +32,18 @@
// includes of other projects
//_______________________________________________________________________________________________________________________
-#ifndef _CPPUHELPER_COMPBASE4_HXX_
#include <cppuhelper/implbase4.hxx>
-#endif
#include <com/sun/star/util/XCancellable.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#ifndef _COM_SUN_STAR_UI_XFOLDERPICKER_HPP_
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
-#endif
-#ifndef _SALAQUAPICKER_HXX_
#include "SalAquaPicker.hxx"
-#endif
#include <memory>
-#ifndef _RTL_USTRING_H_
#include <rtl/ustring.hxx>
-#endif
#include <list>
diff --git a/fpicker/source/aqua/SalAquaPicker.hxx b/fpicker/source/aqua/SalAquaPicker.hxx
index fc01ab7..10f4c5e 100644
--- a/fpicker/source/aqua/SalAquaPicker.hxx
+++ b/fpicker/source/aqua/SalAquaPicker.hxx
@@ -34,17 +34,11 @@
#include <osl/mutex.hxx>
-#ifndef _RTL_USTRING_HXX
#include <rtl/ustring.hxx>
-#endif
-#ifndef _COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_HXX_
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UNO_RUNTIMEEXCEPTION_HXX_
#include <com/sun/star/uno/RuntimeException.hpp>
-#endif
#include "ControlHelper.hxx"
#include <premac.h>
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx
index cb5e869..8ca6733 100644
--- a/fpicker/source/office/OfficeFilePicker.hxx
+++ b/fpicker/source/office/OfficeFilePicker.hxx
@@ -37,9 +37,7 @@
#include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
-#ifndef _COM_SUN_STAR_UNO_XCOMPONENT_CONTEXT_HPP_
#include <com/sun/star/uno/XComponentContext.hpp>
-#endif
#include <vcl/wintypes.hxx>
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index 0753072..04eec2c 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -27,12 +27,8 @@
#ifndef _IODLGIMPL_HXX
#define _IODLGIMPL_HXX
-#ifndef _VCL_DIALOG_HXX
#include <vcl/dialog.hxx>
-#endif
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/fixed.hxx>
#include <vcl/edit.hxx>
#include <vcl/combobox.hxx>
diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.hxx b/fpicker/source/unx/gnome/SalGtkFilePicker.hxx
index 85e934d..3b0c200 100644
--- a/fpicker/source/unx/gnome/SalGtkFilePicker.hxx
+++ b/fpicker/source/unx/gnome/SalGtkFilePicker.hxx
@@ -41,15 +41,11 @@
#include <com/sun/star/ui/dialogs/XFilePreview.hpp>
#include <com/sun/star/beans/StringPair.hpp>
-#ifndef _SALGTKPICKER_HXX_
#include "SalGtkPicker.hxx"
-#endif
#include <memory>
-#ifndef _RTL_USTRING_H_
#include <rtl/ustring.hxx>
-#endif
#include <list>
diff --git a/fpicker/source/unx/gnome/SalGtkFolderPicker.hxx b/fpicker/source/unx/gnome/SalGtkFolderPicker.hxx
index e2804e2..39bd7cb 100644
--- a/fpicker/source/unx/gnome/SalGtkFolderPicker.hxx
+++ b/fpicker/source/unx/gnome/SalGtkFolderPicker.hxx
@@ -32,19 +32,13 @@
// includes of other projects
//_______________________________________________________________________________________________________________________
-#ifndef _CPPUHELPER_COMPBASE3_HXX_
#include <cppuhelper/implbase3.hxx>
-#endif
-#ifndef _SALGTKPICKER_HXX_
#include "SalGtkPicker.hxx"
-#endif
#include <memory>
-#ifndef _RTL_USTRING_H_
#include <rtl/ustring.hxx>
-#endif
#include <list>
diff --git a/fpicker/source/unx/gnome/eventnotification.hxx b/fpicker/source/unx/gnome/eventnotification.hxx
index e09917b..b9b7b23 100644
--- a/fpicker/source/unx/gnome/eventnotification.hxx
+++ b/fpicker/source/unx/gnome/eventnotification.hxx
@@ -28,9 +28,7 @@
#ifndef _EVENTNOTIFICATION_HXX_
#define _EVENTNOTIFICATION_HXX_
-#ifndef _COM_SUN_STAR_UNO_XINTEFACE_HPP_
#include <com/sun/star/uno/XInterface.hpp>
-#endif
#include <com/sun/star/uno/Reference.hxx>
//-----------------------------------
diff --git a/fpicker/source/unx/gnome/resourceprovider.hxx b/fpicker/source/unx/gnome/resourceprovider.hxx
index 8f424b0..a00c205 100644
--- a/fpicker/source/unx/gnome/resourceprovider.hxx
+++ b/fpicker/source/unx/gnome/resourceprovider.hxx
@@ -35,9 +35,7 @@
#include <sal/types.h>
-#ifndef _RTL_USTRING_HXX_
#include <rtl/ustring>
-#endif
#define FOLDERPICKER_TITLE 500
#define FOLDER_PICKER_DEF_DESCRIPTION 501
diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.hxx b/fpicker/source/win32/filepicker/FileOpenDlg.hxx
index 29083d4..d819dd6 100644
--- a/fpicker/source/win32/filepicker/FileOpenDlg.hxx
+++ b/fpicker/source/win32/filepicker/FileOpenDlg.hxx
@@ -34,9 +34,7 @@
#include <sal/types.h>
-#ifndef _RTL_USTRING_HXX_
#include <rtl/ustring>
-#endif
#include <rtl/ustrbuf.hxx>
#include "platform_xp.h"
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
index 6239b52..76070bb 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
@@ -33,9 +33,7 @@
// includes
//------------------------------------------------------------------------
-#ifndef _COM_SUN_STAR_UI_DIALOGS_XEXTENDEDFILEPICKER_HPP_
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
-#endif
#include <com/sun/star/ui/dialogs/FilePickerEvent.hpp>
#include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp>
#include "FilterContainer.hxx"
diff --git a/fpicker/source/win32/filepicker/eventnotification.hxx b/fpicker/source/win32/filepicker/eventnotification.hxx
index e09917b..b9b7b23 100644
--- a/fpicker/source/win32/filepicker/eventnotification.hxx
+++ b/fpicker/source/win32/filepicker/eventnotification.hxx
@@ -28,9 +28,7 @@
#ifndef _EVENTNOTIFICATION_HXX_
#define _EVENTNOTIFICATION_HXX_
-#ifndef _COM_SUN_STAR_UNO_XINTEFACE_HPP_
#include <com/sun/star/uno/XInterface.hpp>
-#endif
#include <com/sun/star/uno/Reference.hxx>
//-----------------------------------
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.hxx b/fpicker/source/win32/folderpicker/FolderPicker.hxx
index c98c9ca..7f35bf6 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.hxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.hxx
@@ -36,16 +36,12 @@
#include <osl/mutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#ifndef _COM_SUN_STAR_UI_XFOLDERPICKER_HPP_
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
-#endif
#include <com/sun/star/util/XCancellable.hpp>
#include <memory>
-#ifndef _FPIMPLBASE_HXX_
#include "WinFOPImpl.hxx"
-#endif
//----------------------------------------------------------
// class declaration
diff --git a/fpicker/source/win32/misc/resourceprovider.hxx b/fpicker/source/win32/misc/resourceprovider.hxx
index 9e65b5e..c64a195 100644
--- a/fpicker/source/win32/misc/resourceprovider.hxx
+++ b/fpicker/source/win32/misc/resourceprovider.hxx
@@ -35,9 +35,7 @@
#include <sal/types.h>
-#ifndef _RTL_USTRING_HXX_
#include <rtl/ustring>
-#endif
//------------------------------------------------------------------------
// deklarations
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx
index 020aafd..4db5135 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -34,9 +34,7 @@
#include <osl/mutex.hxx>
#include <rtl/ustring.hxx>
-#ifndef __COM_SUN_STAR_AWT_XBITMAP_HPP_
#include <com/sun/star/awt/XBitmap.hpp>
-#endif
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
diff --git a/framework/inc/classes/droptargetlistener.hxx b/framework/inc/classes/droptargetlistener.hxx
index 6d76204..ce2c044 100644
--- a/framework/inc/classes/droptargetlistener.hxx
+++ b/framework/inc/classes/droptargetlistener.hxx
@@ -39,9 +39,7 @@
// interface includes
//_________________________________________________________________________________________________________________
-#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDROPTARGETELISTENER_HPP_
#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
-#endif
#include <com/sun/star/frame/XFrame.hpp>
//_________________________________________________________________________________________________________________
@@ -49,9 +47,7 @@
//_________________________________________________________________________________________________________________
#include <cppuhelper/implbase1.hxx>
-#ifndef _SOT_EXCHANGE_HXX_
#include <sot/exchange.hxx>
-#endif
namespace framework
{
diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx
index b5f1761..c6053b2 100644
--- a/framework/inc/classes/filtercache.hxx
+++ b/framework/inc/classes/filtercache.hxx
@@ -42,9 +42,7 @@
#include <classes/filtercachedata.hxx>
#include <threadhelp/threadhelpbase.hxx>
-#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_
#include <threadhelp/transactionbase.hxx>
-#endif
#include <general.h>
#include <queries.h>
diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx
index db8fe77..9416b2b 100644
--- a/framework/inc/classes/framecontainer.hxx
+++ b/framework/inc/classes/framecontainer.hxx
@@ -40,9 +40,7 @@
//_________________________________________________________________________________________________________________
#include <threadhelp/threadhelpbase.hxx>
-#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_
#include <threadhelp/transactionbase.hxx>
-#endif
#include <macros/debug.hxx>
#include <general.h>
diff --git a/framework/inc/classes/fwlresid.hxx b/framework/inc/classes/fwlresid.hxx
old mode 100755
new mode 100644
diff --git a/framework/inc/dispatch/basedispatcher.hxx b/framework/inc/dispatch/basedispatcher.hxx
index 76c41f9..17b5542 100644
--- a/framework/inc/dispatch/basedispatcher.hxx
+++ b/framework/inc/dispatch/basedispatcher.hxx
@@ -36,9 +36,7 @@
#include <threadhelp/resetableguard.hxx>
#include <threadhelp/threadhelpbase.hxx>
-#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_
#include <threadhelp/transactionbase.hxx>
-#endif
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <macros/debug.hxx>
diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx
index 3bb619f..8dade33 100644
--- a/framework/inc/dispatch/dispatchprovider.hxx
+++ b/framework/inc/dispatch/dispatchprovider.hxx
@@ -37,9 +37,7 @@
#include <classes/protocolhandlercache.hxx>
#include <threadhelp/threadhelpbase.hxx>
-#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_
#include <threadhelp/transactionbase.hxx>
-#endif
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <macros/debug.hxx>
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx
index 33a8af3..9484b95 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -32,85 +32,49 @@
// my own includes
//_________________________________________________________________________________________________________________
-#ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_
#include <threadhelp/threadhelpbase.hxx>
-#endif
-#ifndef __FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_
#include <threadhelp/resetableguard.hxx>
-#endif
-#ifndef __FRAMEWORK_MACROS_XINTERFACE_HXX_
#include <macros/xinterface.hxx>
-#endif
-#ifndef __FRAMEWORK_MACROS_XTYPEPROVIDER_HXX_
#include <macros/xtypeprovider.hxx>
-#endif
-#ifndef __FRAMEWORK_MACROS_XSERVICEINFO_HXX_
#include <macros/xserviceinfo.hxx>
-#endif
-#ifndef __FRAMEWORK_MACROS_DEBUG_HXX_
#include <macros/debug.hxx>
-#endif
-#ifndef __FRAMEWORK_MACROS_GENERIC_HXX_
#include <macros/generic.hxx>
-#endif
-#ifndef __FRAMEWORK_GENERAL_H_
#include <general.h>
-#endif
-#ifndef __FRAMEWORK_STDTYPES_H_
#include <stdtypes.h>
-#endif
//_________________________________________________________________________________________________________________
// interface includes
//_________________________________________________________________________________________________________________
-#ifndef _COM_SUN_STAR_LANG_XTYPEPROVIDER_HPP_
#include <com/sun/star/lang/XTypeProvider.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
-#ifndef _COM_SUN_STAR_FRAME_XNOTIFYINGDISPATCH_HPP_
#include <com/sun/star/frame/XNotifyingDispatch.hpp>
-#endif
-#ifndef _COM_SUN_STAR_FRAME_XSTATUSLISTENER_HPP_
#include <com/sun/star/frame/XStatusListener.hpp>
-#endif
-#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_
#include <com/sun/star/frame/XFrame.hpp>
-#endif
-#ifndef _COM_SUN_STAR_DOCUMENT_XEXTENDEDFILTERDETECTION_HPP_
#include <com/sun/star/document/XExtendedFilterDetection.hpp>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
#include <com/sun/star/beans/PropertyValue.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UTIL_URL_HPP_
#include <com/sun/star/util/URL.hpp>
-#endif
//_________________________________________________________________________________________________________________
// other includes
//_________________________________________________________________________________________________________________
-#ifndef _CPPUHELPER_WEAK_HXX_
#include <cppuhelper/weak.hxx>
-#endif
//_________________________________________________________________________________________________________________
// namespace
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index f9feb35..465ed39 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -63,12 +63,8 @@
#include <com/sun/star/frame/XFrameActionListener.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
-#ifndef _COM_SUN_STAR_URI_XURLREFERENCEFACTORY_HPP_
#include <com/sun/star/uri/XUriReferenceFactory.hpp>
-#endif
-#ifndef _COM_SUN_STAR_URI_XURLREFERENCE_HPP_
#include <com/sun/star/uri/XUriReference.hpp>
-#endif
//_________________________________________________________________________________________________________________
// other includes
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
old mode 100755
new mode 100644
diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx
index acd5f68..16f4bd8 100644
--- a/framework/inc/helper/ocomponentenumeration.hxx
+++ b/framework/inc/helper/ocomponentenumeration.hxx
@@ -32,9 +32,7 @@
// my own includes
//_________________________________________________________________________________________________________________
-#ifndef __FRAMEWORK_OMUTEXMEMBER_HXX_
#include <threadhelp/threadhelpbase.hxx>
-#endif
#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
diff --git a/framework/inc/helper/otasksenumeration.hxx b/framework/inc/helper/otasksenumeration.hxx
index 31616bd..68682b6 100644
--- a/framework/inc/helper/otasksenumeration.hxx
+++ b/framework/inc/helper/otasksenumeration.hxx
@@ -32,9 +32,7 @@
// my own includes
//_________________________________________________________________________________________________________________
-#ifndef __FRAMEWORK_OMUTEXMEMBER_HXX_
#include <threadhelp/threadhelpbase.hxx>
-#endif
#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx
index fc00d99..98c5537 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -58,9 +58,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/frame/XFrame.hpp>
-#ifndef _COM_SUN_STAR_URTIL_XUPDATABLE_HPP_
#include <com/sun/star/util/XUpdatable.hpp>
-#endif
//_______________________________________________
// include others
diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx
index b1a2b3a..8a99fa9 100644
--- a/framework/inc/helper/titlebarupdate.hxx
+++ b/framework/inc/helper/titlebarupdate.hxx
@@ -32,73 +32,43 @@
// my own includes
//_________________________________________________________________________________________________________________
-#ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_
#include <threadhelp/threadhelpbase.hxx>
-#endif
-#ifndef __FRAMEWORK_MACROS_DEBUG_HXX_
#include <macros/debug.hxx>
-#endif
-#ifndef __FRAMEWORK_MACROS_XINTERFACE_HXX_
#include <macros/xinterface.hxx>
-#endif
-#ifndef __FRAMEWORK_MACROS_XTYPEPROVIDER_HXX_
#include <macros/xtypeprovider.hxx>
-#endif
-#ifndef __FRAMEWORK_GENERAL_H_
#include <general.h>
-#endif
//_________________________________________________________________________________________________________________
// interface includes
//_________________________________________________________________________________________________________________
-#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_
#include <com/sun/star/lang/XInitialization.hpp>
-#endif
-#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_
#include <com/sun/star/frame/XFrame.hpp>
-#endif
-#ifndef _COM_SUN_STAR_FRAME_XTITLE_HPP_
#include <com/sun/star/frame/XTitle.hpp>
-#endif
-#ifndef _COM_SUN_STAR_FRAME_XFRAMEACTIONLISTENER_HPP_
#include <com/sun/star/frame/XFrameActionListener.hpp>
-#endif
-#ifndef _COM_SUN_STAR_FRAME_XTITLECHANGELISTENER_HPP_
#include <com/sun/star/frame/XTitleChangeListener.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XEVENTLISTENER_HPP_
#include <com/sun/star/lang/XEventListener.hpp>
-#endif
//_________________________________________________________________________________________________________________
// other includes
//_________________________________________________________________________________________________________________
-#ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
#include <unotools/moduleoptions.hxx>
-#endif
-#ifndef _CPPUHELPER_WEAK_HXX_
#include <cppuhelper/weak.hxx>
-#endif
-#ifndef _RTL_USTRBUF_HXX_
#include <rtl/ustrbuf.hxx>
-#endif
//_________________________________________________________________________________________________________________
// const
diff --git a/framework/inc/helper/wakeupthread.hxx b/framework/inc/helper/wakeupthread.hxx
index e0ec288..8358900 100644
--- a/framework/inc/helper/wakeupthread.hxx
+++ b/framework/inc/helper/wakeupthread.hxx
@@ -35,16 +35,12 @@
#include <macros/debug.hxx>
#include <macros/generic.hxx>
-#ifndef __FRAMEWORK_GENERAL_HXX_
#include <general.h>
-#endif
//_______________________________________________
// include UNO interfaces
-#ifndef _COM_SUN_STAR_URTIL_XUPDATABLE_HPP_
#include <com/sun/star/util/XUpdatable.hpp>
-#endif
//_______________________________________________
// include all others
diff --git a/framework/inc/services/backingcomp.hxx b/framework/inc/services/backingcomp.hxx
index 2752c5f..764a25f 100644
--- a/framework/inc/services/backingcomp.hxx
+++ b/framework/inc/services/backingcomp.hxx
@@ -45,13 +45,9 @@
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/awt/XKeyListener.hpp>
-#ifndef _COM_SUN_STAR_FAME_XFRAME_HPP_
#include <com/sun/star/frame/XFrame.hpp>
-#endif
-#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDROPTARGETELISTENER_HPP_
#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
-#endif
#include <com/sun/star/lang/XEventListener.hpp>
#include <com/sun/star/lang/XComponent.hpp>
diff --git a/framework/inc/services/contenthandlerfactory.hxx b/framework/inc/services/contenthandlerfactory.hxx
index 9059cf1..50b63f0 100644
--- a/framework/inc/services/contenthandlerfactory.hxx
+++ b/framework/inc/services/contenthandlerfactory.hxx
@@ -40,9 +40,7 @@
#include <macros/xserviceinfo.hxx>
#include <threadhelp/threadhelpbase.hxx>
-#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_
#include <threadhelp/transactionbase.hxx>
-#endif
#include <general.h>
//_________________________________________________________________________________________________________________
diff --git a/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx
index 183b49d..00efbde 100644
--- a/framework/inc/services/frame.hxx
+++ b/framework/inc/services/frame.hxx
@@ -39,9 +39,7 @@
#include <threadhelp/readguard.hxx>
#include <threadhelp/threadhelpbase.hxx>
-#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_
#include <threadhelp/transactionbase.hxx>
-#endif
#include <macros/generic.hxx>
#include <macros/debug.hxx>
#include <macros/xinterface.hxx>
diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx
index b50dc6d..5a72c05 100644
--- a/framework/inc/services/logindialog.hxx
+++ b/framework/inc/services/logindialog.hxx
@@ -32,9 +32,7 @@
// my own includes
//_________________________________________________________________________________________________________________
-#ifndef __FRAMEWORK_THREADHELPER_THREADHELPBASE_HXX_
#include <threadhelp/threadhelpbase.hxx>
-#endif
#include <macros/generic.hxx>
#include <macros/debug.hxx>
#include <macros/xinterface.hxx>
@@ -65,13 +63,9 @@
#include <vcl/edit.hxx>
#include <vcl/combobox.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/morebtn.hxx>
//_________________________________________________________________________________________________________________
diff --git a/framework/inc/services/pluginframe.hxx b/framework/inc/services/pluginframe.hxx
index 4d2f448..da9310c 100644
--- a/framework/inc/services/pluginframe.hxx
+++ b/framework/inc/services/pluginframe.hxx
@@ -51,9 +51,7 @@
// other includes
//_________________________________________________________________________________________________________________
-#ifndef _VCL_ATOM_HXX
#include <vcl/threadex.hxx>
-#endif
#include <unotools/cmdoptions.hxx>
diff --git a/framework/inc/services/urltransformer.hxx b/framework/inc/services/urltransformer.hxx
index 5f14f2e..c166277 100644
--- a/framework/inc/services/urltransformer.hxx
+++ b/framework/inc/services/urltransformer.hxx
@@ -32,9 +32,7 @@
// my own includes
//_________________________________________________________________________________________________________________
-#ifndef __FRAMEWORK_OMUTEXMEMBER_HXX_
#include <threadhelp/threadhelpbase.hxx>
-#endif
#include <macros/generic.hxx>
#include <macros/debug.hxx>
#include <macros/xinterface.hxx>
diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx
index 80a43f6..b72b96a 100644
--- a/framework/inc/tabwin/tabwindow.hxx
+++ b/framework/inc/tabwin/tabwindow.hxx
@@ -48,12 +48,8 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
-#ifndef _COM_SUN_STAR_LANG_XWINDOW_HPP_
#include <com/sun/star/awt/XWindow.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XTOPWINDOW_HPP_
#include <com/sun/star/awt/XTopWindow.hpp>
-#endif
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/awt/XSimpleTabController.hpp>
#include <com/sun/star/awt/XTabListener.hpp>
diff --git a/framework/inc/uiconfiguration/graphicnameaccess.hxx b/framework/inc/uiconfiguration/graphicnameaccess.hxx
index 35b00ae..3226d0d 100644
--- a/framework/inc/uiconfiguration/graphicnameaccess.hxx
+++ b/framework/inc/uiconfiguration/graphicnameaccess.hxx
@@ -34,9 +34,7 @@
// interface includes
//_________________________________________________________________________________________________________________
#include <com/sun/star/container/XNameContainer.hpp>
-#ifndef _COM_SUN_STAR_GRAPHIC_XGRAPHIC_HXX_
#include <com/sun/star/graphic/XGraphic.hpp>
-#endif
#include <cppuhelper/implbase1.hxx>
namespace framework
diff --git a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
index 6bd26b6..c287a2b 100644
--- a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
+++ b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
@@ -56,9 +56,7 @@
#include <com/sun/star/ui/XUIConfiguration.hpp>
#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
-#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONSTORGAE_HPP_
#include <com/sun/star/ui/XUIConfigurationStorage.hpp>
-#endif
#include <com/sun/star/ui/XUIConfigurationManager.hpp>
#include <com/sun/star/ui/ConfigurationEvent.hpp>
#include <com/sun/star/ui/UIElementType.hpp>
diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx
index 26e39de..c4e7ba5 100644
--- a/framework/inc/uielement/addonstoolbarmanager.hxx
+++ b/framework/inc/uielement/addonstoolbarmanager.hxx
@@ -32,9 +32,7 @@
// my own includes
//_________________________________________________________________________________________________________________
-#ifndef __FRAMEWORK_UILEMENT_TOOLBARMANAGER_HXX_
#include <uielement/toolbarmanager.hxx>
-#endif
#include <threadhelp/threadhelpbase.hxx>
#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx
index ee14f19..662ce60 100644
--- a/framework/inc/uielement/menubarwrapper.hxx
+++ b/framework/inc/uielement/menubarwrapper.hxx
@@ -42,9 +42,7 @@
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#ifndef __COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
#include <com/sun/star/container/XNameAccess.hpp>
-#endif
//_________________________________________________________________________________________________________________
// other includes
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index 3e652b2..e758658 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -58,9 +58,7 @@
#include <cppuhelper/weak.hxx>
#include <rtl/ustring.hxx>
#include <vcl/accel.hxx>
-#ifndef _VCL_MENU_HXX_
#include <vcl/menu.hxx>
-#endif
#include <hash_map>
namespace framework
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx
old mode 100755
new mode 100644
diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx
index d56ad67..330caee 100644
--- a/framework/inc/xml/acceleratorconfigurationreader.hxx
+++ b/framework/inc/xml/acceleratorconfigurationreader.hxx
@@ -40,13 +40,9 @@
//_______________________________________________
// interface includes
-#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
-#ifndef __COM_SUN_STAR_XML_SAX_XLOCATOR_HPP_
#include <com/sun/star/xml/sax/XLocator.hpp>
-#endif
//_______________________________________________
// other includes
diff --git a/framework/inc/xml/acceleratorconfigurationwriter.hxx b/framework/inc/xml/acceleratorconfigurationwriter.hxx
index 26c2d3b..ac5bab5 100644
--- a/framework/inc/xml/acceleratorconfigurationwriter.hxx
+++ b/framework/inc/xml/acceleratorconfigurationwriter.hxx
@@ -39,9 +39,7 @@
//_______________________________________________
// interface includes
-#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
//_______________________________________________
// other includes
diff --git a/framework/inc/xml/eventsdocumenthandler.hxx b/framework/inc/xml/eventsdocumenthandler.hxx
index 8d32d5d..2591e0d 100644
--- a/framework/inc/xml/eventsdocumenthandler.hxx
+++ b/framework/inc/xml/eventsdocumenthandler.hxx
@@ -28,17 +28,13 @@
#ifndef __FRAMEWORK_XML_EVENTSDOCUMENTHANDLER_HXX_
#define __FRAMEWORK_XML_EVENTSDOCUMENTHANDLER_HXX_
-#ifndef __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_
#include <xml/eventsconfiguration.hxx>
-#endif
//_________________________________________________________________________________________________________________
// interface includes
//_________________________________________________________________________________________________________________
-#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
//_________________________________________________________________________________________________________________
// other includes
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index 6d4e8d5..015b13f 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -32,9 +32,7 @@
// interface includes
//_________________________________________________________________________________________________________________
-#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
//_________________________________________________________________________________________________________________
// other includes
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index 67d783a..cdf384e 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -32,9 +32,7 @@
// interface includes
//_________________________________________________________________________________________________________________
-#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/lang/XSingleComponentFactory.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index 86b25bf..a7f38ca 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -28,17 +28,13 @@
#ifndef __FRAMEWORK_XML_STATUSBARDOCUMENTHANDLER_HXX_
#define __FRAMEWORK_XML_STATUSBARDOCUMENTHANDLER_HXX_
-#ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_
#include <xml/statusbarconfiguration.hxx>
-#endif
//_________________________________________________________________________________________________________________
// interface includes
//_________________________________________________________________________________________________________________
-#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
//_________________________________________________________________________________________________________________
// other includes
diff --git a/framework/inc/xml/toolboxconfiguration.hxx b/framework/inc/xml/toolboxconfiguration.hxx
index f1f0949..9cf8ef0 100644
--- a/framework/inc/xml/toolboxconfiguration.hxx
+++ b/framework/inc/xml/toolboxconfiguration.hxx
@@ -5,9 +5,7 @@
#include <vcl/bitmap.hxx>
#include <tools/string.hxx>
#include <com/sun/star/io/XInputStream.hpp>
-#ifndef _COM_SUN_STAR_IO_XOUPUTSTREAM_HPP_
#include <com/sun/star/io/XOutputStream.hpp>
-#endif
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
diff --git a/framework/source/accelerators/acceleratorexecute.hxx b/framework/source/accelerators/acceleratorexecute.hxx
index 87c5717..d23f945 100644
--- a/framework/source/accelerators/acceleratorexecute.hxx
+++ b/framework/source/accelerators/acceleratorexecute.hxx
@@ -33,29 +33,17 @@
#include <vector>
-#ifndef __COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
-#ifndef __COM_SUN_STAR_FRAME_XFRAME_HPP_
#include <com/sun/star/frame/XFrame.hpp>
-#endif
-#ifndef __COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HPP_
#include <com/sun/star/frame/XDispatchProvider.hpp>
-#endif
-#ifndef __COM_SUN_STAR_UI_XACCELERATORCONFIGURATION_HPP_
#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
-#endif
-#ifndef __COM_SUN_STAR_UTIL_XURLTRANSFORMER_HPP_
#include <com/sun/star/util/XURLTransformer.hpp>
-#endif
-#ifndef __COM_SUN_STAR_AWT_KEYEVENT_HPP_
#include <com/sun/star/awt/KeyEvent.hpp>
-#endif
#include <vcl/keycod.hxx>
#include <vcl/evntpost.hxx>
#include <osl/mutex.h>
diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx
index 2462ce4..d7c415e 100644
--- a/framework/source/inc/accelerators/acceleratorcache.hxx
+++ b/framework/source/inc/accelerators/acceleratorcache.hxx
@@ -38,9 +38,7 @@
//__________________________________________
// interface includes
-#ifndef __COM_SUN_STAR_AWT_KEYEVENT_HPP_
#include <com/sun/star/awt/KeyEvent.hpp>
-#endif
//__________________________________________
// other includes
diff --git a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
index 0551577..02858de 100644
--- a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
@@ -34,18 +34,14 @@
#include <accelerators/acceleratorconfiguration.hxx>
#include <accelerators/presethandler.hxx>
-#ifndef __FRAMEWORK_MACROS_XINTERFACE_HXX_
#include <macros/interface.hxx>
-#endif
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
//__________________________________________
// interface includes
-#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_
#include <com/sun/star/lang/XInitialization.hpp>
-#endif
//__________________________________________
// other includes
diff --git a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
index de1a652..2a2d306 100644
--- a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
@@ -34,9 +34,7 @@
#include <accelerators/acceleratorconfiguration.hxx>
#include <accelerators/presethandler.hxx>
-#ifndef __FRAMEWORK_MACROS_XINTERFACE_HXX_
#include <macros/interface.hxx>
-#endif
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx
index 7131011..e6866ad 100644
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
@@ -39,13 +39,9 @@
//__________________________________________
// interface includes
-#ifndef __COM_SUN_STAR_EMBED_XSTORAGE_HPP_
#include <com/sun/star/embed/XStorage.hpp>
-#endif
-#ifndef __COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
//__________________________________________
// other includes
diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx
index b604d88..b0d3848 100644
--- a/framework/source/inc/accelerators/storageholder.hxx
+++ b/framework/source/inc/accelerators/storageholder.hxx
@@ -39,13 +39,9 @@
//===============================================
// interface includes
-#ifndef __COM_SUN_STAR_EMBED_XSTORAGE_HPP_
#include <com/sun/star/embed/XStorage.hpp>
-#endif
-#ifndef __COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
//===============================================
// other includes
diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx
old mode 100755
new mode 100644
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index 60c3c31..e2589ad 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -44,13 +44,9 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/util/URL.hpp>
-#ifndef _COM_SUN_STAR_LANG_IllegalArgumentException_HPP_
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#endif
-#ifndef _COM_SUN_STAR_IO_IOException_HPP_
#include <com/sun/star/io/IOException.hpp>
-#endif
//_______________________________________________
// includes of an other project
diff --git a/framework/source/inc/pattern/configuration.hxx b/framework/source/inc/pattern/configuration.hxx
index b2de45f..34b1291 100644
--- a/framework/source/inc/pattern/configuration.hxx
+++ b/framework/source/inc/pattern/configuration.hxx
@@ -39,9 +39,7 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Any.hxx>
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HXX_
#include <com/sun/star/beans/PropertyValue.hpp>
-#endif
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx
index 49d6ddb..a1fa0af 100644
--- a/framework/source/inc/pattern/window.hxx
+++ b/framework/source/inc/pattern/window.hxx
@@ -41,9 +41,7 @@
//_______________________________________________
// other includes
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
#include <toolkit/unohlp.hxx>
-#endif
#include <vcl/window.hxx>
#include <vcl/syswin.hxx>
#include <vcl/wrkwin.hxx>
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
old mode 100755
new mode 100644
diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
old mode 100755
new mode 100644
diff --git a/framework/source/uielement/rootitemcontainer.cxx b/framework/source/uielement/rootitemcontainer.cxx
index eeeb621..2f0a377 100644
--- a/framework/source/uielement/rootitemcontainer.cxx
+++ b/framework/source/uielement/rootitemcontainer.cxx
@@ -32,13 +32,9 @@
//_________________________________________________________________________________________________________________
#include <uielement/rootitemcontainer.hxx>
-#ifndef __FRAMEWORK_UIELEMENT_ITEMCONTAINER_HHX_
#include <uielement/itemcontainer.hxx>
-#endif
-#ifndef __FRAMEWORK_UIELEMENT_CONSTITEMCONTAINER_HHX_
#include <uielement/constitemcontainer.hxx>
-#endif
#include <threadhelp/resetableguard.hxx>
#include <general.h>
#include <properties.h>
diff --git a/framework/test/typecfg/cfgview.cxx b/framework/test/typecfg/cfgview.cxx
index 8faf4e6..32ef0cd 100644
--- a/framework/test/typecfg/cfgview.cxx
+++ b/framework/test/typecfg/cfgview.cxx
@@ -54,9 +54,7 @@
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
-#ifndef __SGI_STL_HASH_MAP
#include <hash_map>
-#endif
#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx
index c76ee09..428b938 100644
--- a/scripting/source/dlgprov/dlgevtatt.hxx
+++ b/scripting/source/dlgprov/dlgevtatt.hxx
@@ -35,9 +35,7 @@
#include <com/sun/star/script/XScriptListener.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/awt/XControl.hpp>
-#ifndef _COM_SUN_STAR_BEANS_XINTROSPECTION_HPP_
#include <com/sun/star/beans/XIntrospectionAccess.hpp>
-#endif
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/script/XScriptEventsSupplier.hpp>
diff --git a/scripting/source/storage/ScriptSecurityManager.hxx b/scripting/source/storage/ScriptSecurityManager.hxx
old mode 100755
new mode 100644
diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx
index 81ee75f..6216e03 100644
--- a/scripting/source/stringresource/stringresource.hxx
+++ b/scripting/source/stringresource/stringresource.hxx
@@ -28,12 +28,8 @@
#ifndef SCRIPTING_DLGPROV_HXX
#define SCRIPTING_DLGPROV_HXX
-#ifndef _COM_SUN_STAR_AWT_XSTRINGRESOURCEWITHSTORAGE_HPP_
#include <com/sun/star/resource/XStringResourceWithStorage.hpp>
-#endif
-#ifndef _COM_SUN_STAR_AWT_XSTRINGRESOURCEWITHSTORAGE_HPP_
#include <com/sun/star/resource/XStringResourceWithLocation.hpp>
-#endif
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/sfx2/inc/basmgr.hxx b/sfx2/inc/basmgr.hxx
index d961042..41f5701 100644
--- a/sfx2/inc/basmgr.hxx
+++ b/sfx2/inc/basmgr.hxx
@@ -28,8 +28,6 @@
#ifndef _SFX_BASMGR_HXX
#define _SFX_BASMGR_HXX
-#ifndef _BASMGR_HXX_
#include <basic/basmgr.hxx>
-#endif
#endif //_SFX_BASMGR_HXX
diff --git a/sfx2/inc/brokenpackageint.hxx b/sfx2/inc/brokenpackageint.hxx
old mode 100755
new mode 100644
diff --git a/sfx2/inc/dinfedt.hxx b/sfx2/inc/dinfedt.hxx
index ab2ea95..9a2d74e 100644
--- a/sfx2/inc/dinfedt.hxx
+++ b/sfx2/inc/dinfedt.hxx
@@ -29,9 +29,7 @@
// include ---------------------------------------------------------------
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/dialog.hxx>
#include <vcl/edit.hxx>
#include <vcl/fixed.hxx>
diff --git a/sfx2/inc/docvor.hxx b/sfx2/inc/docvor.hxx
index 8b84c0a..9060363 100644
--- a/sfx2/inc/docvor.hxx
+++ b/sfx2/inc/docvor.hxx
@@ -28,9 +28,7 @@
#define _SFXDOCVOR_HXX
-#ifndef _DIALOG_HXX //autogen
#include <vcl/dialog.hxx>
-#endif
#include <svtools/svtreebx.hxx>
#include <sfx2/objsh.hxx>
diff --git a/sfx2/inc/imgmgr.hxx b/sfx2/inc/imgmgr.hxx
index ce945eb..19fd4dc 100644
--- a/sfx2/inc/imgmgr.hxx
+++ b/sfx2/inc/imgmgr.hxx
@@ -33,9 +33,7 @@
#include <sal/types.h>
#include <tools/gen.hxx>
-#ifndef _IMAGE_HXX //autogen
#include <vcl/image.hxx>
-#endif
class ToolBox;
class SfxModule;
diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx
index c50e3a8..67c958b 100644
--- a/sfx2/inc/inettbc.hxx
+++ b/sfx2/inc/inettbc.hxx
@@ -32,9 +32,7 @@
#include <tools/string.hxx>
#include <tools/urlobj.hxx>
-#ifndef _COMBOBOX_HXX //autogen
#include <vcl/combobox.hxx>
-#endif
#include <svtools/acceleratorexecute.hxx>
#if _SOLAR__PRIVATE
diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx
index e8f7fea..5ace4b1 100644
--- a/sfx2/inc/sfx2/basedlgs.hxx
+++ b/sfx2/inc/sfx2/basedlgs.hxx
@@ -30,13 +30,9 @@
#include "sal/config.h"
#include "sfx2/dllapi.h"
#include "sal/types.h"
-#ifndef _FLOATWIN_HXX //autogen
#include <vcl/floatwin.hxx>
-#endif
#include <vcl/timer.hxx>
-#ifndef _DIALOG_HXX //autogen
#include <vcl/dialog.hxx>
-#endif
class TabPage;
class SfxTabPage;
diff --git a/sfx2/inc/sfx2/controlwrapper.hxx b/sfx2/inc/sfx2/controlwrapper.hxx
index 66fd1df..dae767f 100644
--- a/sfx2/inc/sfx2/controlwrapper.hxx
+++ b/sfx2/inc/sfx2/controlwrapper.hxx
@@ -34,9 +34,7 @@
#include <memory>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/edit.hxx>
#include <vcl/field.hxx>
#include <vcl/lstbox.hxx>
diff --git a/sfx2/inc/sfx2/doctdlg.hxx b/sfx2/inc/sfx2/doctdlg.hxx
index 415eb05..6ab5d45 100644
--- a/sfx2/inc/sfx2/doctdlg.hxx
+++ b/sfx2/inc/sfx2/doctdlg.hxx
@@ -31,9 +31,7 @@
#include <vcl/lstbox.hxx>
#include <vcl/edit.hxx>
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx
index 4257353..3be1314 100644
--- a/sfx2/inc/sfx2/filedlghelper.hxx
+++ b/sfx2/inc/sfx2/filedlghelper.hxx
@@ -38,9 +38,7 @@
#include <tools/errcode.hxx>
#include <vcl/dialog.hxx>
#include <vcl/edit.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/graph.hxx>
#include <sfx2/sfxdefs.hxx>
#include <sfx2/sfxuno.hxx>
diff --git a/sfx2/inc/sfx2/linksrc.hxx b/sfx2/inc/sfx2/linksrc.hxx
index 7286285..945dddf 100644
--- a/sfx2/inc/sfx2/linksrc.hxx
+++ b/sfx2/inc/sfx2/linksrc.hxx
@@ -30,9 +30,7 @@
#include "sal/config.h"
#include "sfx2/dllapi.h"
-#ifndef _TOOLS_REF_HXX
#include <tools/ref.hxx>
-#endif
#include <tools/rtti.hxx>
#include <com/sun/star/io/XInputStream.hpp>
diff --git a/sfx2/inc/sfx2/lnkbase.hxx b/sfx2/inc/sfx2/lnkbase.hxx
index bb34180..e905cb1 100644
--- a/sfx2/inc/sfx2/lnkbase.hxx
+++ b/sfx2/inc/sfx2/lnkbase.hxx
@@ -31,12 +31,8 @@
#include "sal/config.h"
#include "sfx2/dllapi.h"
#include <sot/exchange.hxx>
-#ifndef _TOOLS_REF_HXX
#include <tools/ref.hxx>
-#endif
-#ifndef _LINKSOURCE_HXX
#include <sfx2/linksrc.hxx>
-#endif
namespace com { namespace sun { namespace star { namespace uno
{
diff --git a/sfx2/inc/sfx2/mgetempl.hxx b/sfx2/inc/sfx2/mgetempl.hxx
index 8180a69..333640a 100644
--- a/sfx2/inc/sfx2/mgetempl.hxx
+++ b/sfx2/inc/sfx2/mgetempl.hxx
@@ -31,9 +31,7 @@
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
#include <svtools/stdctrl.hxx>
-#ifndef _SV_MEDIT_HXX
#include <svtools/svmedit.hxx>
-#endif
#include <sfx2/tabdlg.hxx>
diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx
index 4221d2b..6248001 100644
--- a/sfx2/inc/sfx2/mnumgr.hxx
+++ b/sfx2/inc/sfx2/mnumgr.hxx
@@ -29,9 +29,7 @@
#include <stdarg.h>
-#ifndef _MENU_HXX //autogen //wg. MENU_APPEND !!!!
#include <vcl/menu.hxx>
-#endif
#include <vcl/wintypes.hxx>
#include <tools/link.hxx>
#include <com/sun/star/embed/VerbDescriptor.hpp>
diff --git a/sfx2/inc/sfx2/new.hxx b/sfx2/inc/sfx2/new.hxx
index 9b2c4d1..8b22869 100644
--- a/sfx2/inc/sfx2/new.hxx
+++ b/sfx2/inc/sfx2/new.hxx
@@ -30,18 +30,10 @@
#include "sal/config.h"
#include "sfx2/dllapi.h"
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
#include <sfx2/basedlgs.hxx>
//=========================================================================
diff --git a/sfx2/inc/sfx2/newstyle.hxx b/sfx2/inc/sfx2/newstyle.hxx
index ac0c148..108b972 100644
--- a/sfx2/inc/sfx2/newstyle.hxx
+++ b/sfx2/inc/sfx2/newstyle.hxx
@@ -30,9 +30,7 @@
#include "sal/config.h"
#include "sfx2/dllapi.h"
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/msgbox.hxx>
#include <vcl/combobox.hxx>
#include <vcl/dialog.hxx>
diff --git a/sfx2/inc/sfx2/objface.hxx b/sfx2/inc/sfx2/objface.hxx
index 82c80f7..986c3f9 100644
--- a/sfx2/inc/sfx2/objface.hxx
+++ b/sfx2/inc/sfx2/objface.hxx
@@ -31,9 +31,7 @@
#include "sfx2/dllapi.h"
#include "sal/types.h"
#include <tools/string.hxx>
-#ifndef _RESID_HXX //autogen
#include <tools/resid.hxx>
-#endif
#include <sfx2/msg.hxx>
diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx
index 6a583fe..dc10c7d 100644
--- a/sfx2/inc/sfx2/passwd.hxx
+++ b/sfx2/inc/sfx2/passwd.hxx
@@ -30,9 +30,7 @@
#include "sal/config.h"
#include "sfx2/dllapi.h"
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/dialog.hxx>
#include <vcl/edit.hxx>
#include <vcl/fixed.hxx>
diff --git a/sfx2/inc/sfx2/printer.hxx b/sfx2/inc/sfx2/printer.hxx
index 64cbcb2..fadf0fa 100644
--- a/sfx2/inc/sfx2/printer.hxx
+++ b/sfx2/inc/sfx2/printer.hxx
@@ -30,9 +30,7 @@
#include "sal/config.h"
#include "sfx2/dllapi.h"
#include "sal/types.h"
-#ifndef _PRINT_HXX //autogen
#include <vcl/print.hxx>
-#endif
class SfxFont;
class SfxTabPage;
diff --git a/sfx2/inc/sfx2/printopt.hxx b/sfx2/inc/sfx2/printopt.hxx
index e65c273..79203c1 100644
--- a/sfx2/inc/sfx2/printopt.hxx
+++ b/sfx2/inc/sfx2/printopt.hxx
@@ -31,14 +31,10 @@
#include "sal/config.h"
#include "sfx2/dllapi.h"
#include "sal/types.h"
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX //autogen wg. FixedText
#include <vcl/button.hxx>
-#endif
#include <vcl/lstbox.hxx>
#include <vcl/print.hxx>
diff --git a/sfx2/inc/sfx2/securitypage.hxx b/sfx2/inc/sfx2/securitypage.hxx
old mode 100755
new mode 100644
diff --git a/sfx2/inc/sfx2/sfxuno.hxx b/sfx2/inc/sfx2/sfxuno.hxx
index 2953b95..454e1e5 100644
--- a/sfx2/inc/sfx2/sfxuno.hxx
+++ b/sfx2/inc/sfx2/sfxuno.hxx
@@ -55,9 +55,7 @@
//________________________________________________________________________________________________________________________
#include <osl/mutex.hxx>
-#ifndef _RTL_USTRING_HXX
#include <rtl/ustring.hxx>
-#endif
//________________________________________________________________________________________________________________________
// defines for namespaces !
diff --git a/sfx2/inc/sfx2/styfitem.hxx b/sfx2/inc/sfx2/styfitem.hxx
index f8dff35..7fb14e2 100644
--- a/sfx2/inc/sfx2/styfitem.hxx
+++ b/sfx2/inc/sfx2/styfitem.hxx
@@ -30,16 +30,10 @@
#include "sal/config.h"
#include "sfx2/dllapi.h"
-#ifndef _BITMAP_HXX //autogen
#include <vcl/bitmap.hxx>
-#endif
-#ifndef _IMAGE_HXX //autogen
#include <vcl/image.hxx>
-#endif
#include <tools/list.hxx>
-#ifndef _RC_HXX //autogen
#include <tools/rc.hxx>
-#endif
#include <rsc/rscsfx.hxx>
#ifndef _SFX_STYFITEM_HXX_NOLIST
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index 8bd07c4..7589d92 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.hxx
@@ -31,15 +31,9 @@
#include "sfx2/dllapi.h"
#include "sal/types.h"
#include <vcl/timer.hxx>
-#ifndef _MENU_HXX //autogen
#include <vcl/menu.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _FLOATWIN_HXX //autogen
#include <vcl/floatwin.hxx>
-#endif
#include <sfx2/ctrlitem.hxx>
#include <sfx2/sfxstatuslistener.hxx>
#include <svtools/toolboxcontroller.hxx>
diff --git a/sfx2/inc/sfxresid.hxx b/sfx2/inc/sfxresid.hxx
index aa3a13b..49dd041 100644
--- a/sfx2/inc/sfxresid.hxx
+++ b/sfx2/inc/sfxresid.hxx
@@ -29,9 +29,7 @@
#include <tools/string.hxx>
-#ifndef _RESID_HXX //autogen
#include <tools/resid.hxx>
-#endif
class SfxResId: public ResId
{
diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx
index 384f075..eb57e7c 100644
--- a/sfx2/inc/srchdlg.hxx
+++ b/sfx2/inc/srchdlg.hxx
@@ -27,16 +27,10 @@
#ifndef _SFX_SRCHDLG_HXX_
#define _SFX_SRCHDLG_HXX_
-#ifndef _VCL_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/combobox.hxx>
-#ifndef _VCL_EDIT_HXX
#include <vcl/edit.hxx>
-#endif
-#ifndef _VCL_FIXED_HXX
#include <vcl/fixed.hxx>
-#endif
#include <sfx2/basedlgs.hxx>
// ============================================================================
diff --git a/sfx2/inc/viewfac.hxx b/sfx2/inc/viewfac.hxx
index 0ab7159..cacbdbf 100644
--- a/sfx2/inc/viewfac.hxx
+++ b/sfx2/inc/viewfac.hxx
@@ -30,9 +30,7 @@
#include "sal/config.h"
#include "sfx2/dllapi.h"
#include <tools/string.hxx>
-#ifndef _RESID_HXX //autogen
#include <tools/resid.hxx>
-#endif
class SfxViewFrame;
class SfxViewShell;
diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx
index 5fe4add..69072fc 100644
--- a/sfx2/source/appl/helpinterceptor.hxx
+++ b/sfx2/source/appl/helpinterceptor.hxx
@@ -27,9 +27,7 @@
#ifndef INCLUDED_SFX_HELPINTERCEPTOR_HXX
#define INCLUDED_SFX_HELPINTERCEPTOR_HXX
-#ifndef _CPPUHELPER_IMPLBASE2_HXX_
#include <cppuhelper/implbase3.hxx>
-#endif
#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
#include <com/sun/star/frame/XInterceptorInfo.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx
index cc18016..13fc55b 100644
--- a/sfx2/source/appl/shutdownicon.hxx
+++ b/sfx2/source/appl/shutdownicon.hxx
@@ -12,12 +12,8 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/beans/XFastPropertySet.hpp>
-#ifndef _RTL_STRING_HXX
#include <rtl/string.hxx>
-#endif
-#ifndef _RTL_USTRING_HXX
#include <rtl/ustring.hxx>
-#endif
#include <osl/mutex.hxx>
#include <osl/module.hxx>
#include <sfx2/sfxuno.hxx>
diff --git a/sfx2/source/doc/doctemplateslocal.hxx b/sfx2/source/doc/doctemplateslocal.hxx
index 5b3feb3..e81c4d4 100644
--- a/sfx2/source/doc/doctemplateslocal.hxx
+++ b/sfx2/source/doc/doctemplateslocal.hxx
@@ -28,9 +28,7 @@
#ifndef _SFX_DOCTEMPLATESLOCAL_HXX
#define _SFX_DOCTEMPLATESLOCAL_HXX
-#ifndef _COM_SUN_STAR_XML_SAX_XDUCUMENTHANDLER_HPP_
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
#include <com/sun/star/beans/StringPair.hpp>
... etc. - the rest is truncated
More information about the ooo-build-commit
mailing list