[Libreoffice-commits] .: 6 commits - accessibility/inc accessibility/source basctl/source basic/inc basic/source chart2/source comphelper/inc comphelper/source connectivity/inc connectivity/source cui/source dbaccess/inc dbaccess/source editeng/Library_editeng.mk editeng/source extensions/source filter/source forms/source fpicker/source framework/inc framework/source reportdesign/inc reportdesign/source sal/cpprt salhelper/inc salhelper/source sal/osl sc/inc sc/source sd/inc sd/source sd/workben sfx2/inc sfx2/source sfx2/workben store/source store/workben svl/inc svl/source svtools/inc svtools/source svtools/workben svx/inc svx/source svx/util sw/inc sw/source toolkit/inc toolkit/source tools/source ucb/source ucb/workben unotools/inc unotools/source writerfilter/source xmloff/inc xmloff/source xmlsecurity/inc xmlsecurity/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Fri Jun 29 00:26:26 PDT 2012
accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx | 3
accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx | 3
accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx | 3
accessibility/source/extended/AccessibleToolPanelDeck.cxx | 2
accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx | 2
accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx | 2
basctl/source/basicide/basdoc.hxx | 3
basctl/source/basicide/basicbox.cxx | 7
basctl/source/basicide/baside2.cxx | 12
basctl/source/basicide/baside3.cxx | 16 -
basctl/source/basicide/basides1.cxx | 23 +
basctl/source/basicide/basides2.cxx | 7
basctl/source/basicide/basides3.cxx | 9
basctl/source/basicide/basidesh.cxx | 20 -
basctl/source/basicide/basobj2.cxx | 4
basctl/source/basicide/basobj3.cxx | 8
basctl/source/basicide/bastype2.cxx | 4
basctl/source/basicide/bastype2.hxx | 1
basctl/source/basicide/bastype3.cxx | 7
basctl/source/basicide/doceventnotifier.cxx | 2
basctl/source/basicide/docsignature.cxx | 4
basctl/source/basicide/documentenumeration.cxx | 2
basctl/source/basicide/documentenumeration.hxx | 2
basctl/source/basicide/ide_pch.cxx | 22 -
basctl/source/basicide/ide_pch.hxx | 41 --
basctl/source/basicide/iderdll.cxx | 5
basctl/source/basicide/localizationmgr.cxx | 4
basctl/source/basicide/macrodlg.cxx | 9
basctl/source/basicide/moduldl2.cxx | 6
basctl/source/basicide/scriptdocument.cxx | 2
basctl/source/inc/doceventnotifier.hxx | 2
basctl/source/inc/docsignature.hxx | 2
basctl/source/inc/scriptdocument.hxx | 2
basctl/source/inc/svheader.hxx | 15 -
basic/inc/basic/basicmanagerrepository.hxx | 2
basic/source/basmgr/basicmanagerrepository.cxx | 2
basic/source/classes/sb.cxx | 6
basic/source/uno/sbservices.cxx | 3
chart2/source/controller/main/ChartModelClone.cxx | 2
chart2/source/controller/main/ChartModelClone.hxx | 2
chart2/source/model/main/UndoManager.cxx | 2
chart2/source/model/main/UndoManager.hxx | 2
comphelper/inc/comphelper/accessiblekeybindinghelper.hxx | 4
comphelper/inc/comphelper/anycompare.hxx | 2
comphelper/inc/comphelper/componentbase.hxx | 4
comphelper/inc/comphelper/componentcontext.hxx | 2
comphelper/inc/comphelper/componentguard.hxx | 2
comphelper/inc/comphelper/componentmodule.hxx | 2
comphelper/inc/comphelper/documentinfo.hxx | 2
comphelper/inc/comphelper/listenernotification.hxx | 2
comphelper/inc/comphelper/logging.hxx | 2
comphelper/inc/comphelper/namedvaluecollection.hxx | 2
comphelper/inc/comphelper/officeresourcebundle.hxx | 2
comphelper/inc/comphelper/propertybag.hxx | 3
comphelper/inc/comphelper/sequence.hxx | 3
comphelper/inc/comphelper/sequenceashashmap.hxx | 3
comphelper/source/container/enumerablemap.cxx | 2
comphelper/source/misc/anycompare.cxx | 4
comphelper/source/misc/componentbase.cxx | 2
comphelper/source/misc/componentcontext.cxx | 2
comphelper/source/misc/componentmodule.cxx | 2
comphelper/source/misc/documentinfo.cxx | 2
comphelper/source/misc/listenernotification.cxx | 2
comphelper/source/misc/logging.cxx | 2
comphelper/source/misc/officeresourcebundle.cxx | 2
comphelper/source/misc/synchronousdispatch.cxx | 2
comphelper/source/property/opropertybag.hxx | 2
comphelper/source/property/propertybag.cxx | 2
connectivity/inc/connectivity/dbmetadata.hxx | 2
connectivity/inc/connectivity/filtermanager.hxx | 2
connectivity/inc/connectivity/formattedcolumnvalue.hxx | 2
connectivity/inc/connectivity/parameters.hxx | 2
connectivity/inc/connectivity/paramwrapper.hxx | 2
connectivity/inc/connectivity/sqlerror.hxx | 2
connectivity/inc/connectivity/statementcomposer.hxx | 2
connectivity/inc/connectivity/warningscontainer.hxx | 2
connectivity/source/commontools/dbmetadata.cxx | 2
connectivity/source/commontools/dbtools.cxx | 2
connectivity/source/commontools/filtermanager.cxx | 2
connectivity/source/commontools/formattedcolumnvalue.cxx | 2
connectivity/source/commontools/parameters.cxx | 2
connectivity/source/commontools/paramwrapper.cxx | 2
connectivity/source/commontools/sqlerror.cxx | 2
connectivity/source/commontools/statementcomposer.cxx | 2
connectivity/source/drivers/hsqldb/HConnection.cxx | 2
connectivity/source/drivers/hsqldb/HTools.cxx | 4
connectivity/source/drivers/hsqldb/HView.cxx | 2
connectivity/source/drivers/jdbc/ConnectionLog.cxx | 2
connectivity/source/drivers/jdbc/ContextClassLoader.cxx | 4
connectivity/source/drivers/kab/KDriver.cxx | 2
connectivity/source/drivers/kab/KDriver.hxx | 2
connectivity/source/drivers/macab/MacabDriver.cxx | 2
connectivity/source/drivers/macab/MacabDriver.hxx | 2
connectivity/source/drivers/mozab/MStatement.hxx | 3
connectivity/source/inc/hsqldb/HConnection.hxx | 2
connectivity/source/inc/hsqldb/HTools.hxx | 3
connectivity/source/inc/hsqldb/HView.hxx | 2
connectivity/source/inc/java/ContextClassLoader.hxx | 3
connectivity/source/inc/java/GlobalRef.hxx | 3
connectivity/source/inc/java/LocalRef.hxx | 3
connectivity/source/inc/java/sql/ConnectionLog.hxx | 2
connectivity/source/inc/resource/sharedresources.hxx | 3
connectivity/source/resource/sharedresources.cxx | 2
cui/source/tabpages/tpbitmap.cxx | 11
dbaccess/inc/controllerframe.hxx | 2
dbaccess/inc/dbaundomanager.hxx | 2
dbaccess/inc/dbsubcomponentcontroller.hxx | 2
dbaccess/inc/genericcontroller.hxx | 2
dbaccess/source/core/api/RowSet.cxx | 2
dbaccess/source/core/api/RowSet.hxx | 2
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 2
dbaccess/source/core/api/View.cxx | 2
dbaccess/source/core/api/columnsettings.cxx | 2
dbaccess/source/core/api/definitioncolumn.cxx | 2
dbaccess/source/core/api/query.cxx | 2
dbaccess/source/core/api/querycontainer.cxx | 2
dbaccess/source/core/dataaccess/ModelImpl.cxx | 2
dbaccess/source/core/dataaccess/ModelImpl.hxx | 2
dbaccess/source/core/dataaccess/connection.cxx | 2
dbaccess/source/core/dataaccess/connection.hxx | 2
dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx | 2
dbaccess/source/core/dataaccess/databasecontext.cxx | 2
dbaccess/source/core/dataaccess/databasecontext.hxx | 2
dbaccess/source/core/dataaccess/databasedocument.cxx | 2
dbaccess/source/core/dataaccess/databasedocument.hxx | 2
dbaccess/source/core/dataaccess/databaseregistrations.cxx | 2
dbaccess/source/core/dataaccess/databaseregistrations.hxx | 2
dbaccess/source/core/dataaccess/datasource.cxx | 2
dbaccess/source/core/dataaccess/documenteventexecutor.cxx | 2
dbaccess/source/core/dataaccess/documenteventexecutor.hxx | 2
dbaccess/source/core/dataaccess/documenteventnotifier.cxx | 2
dbaccess/source/core/dataaccess/documenteventnotifier.hxx | 2
dbaccess/source/core/dataaccess/documentevents.cxx | 2
dbaccess/source/core/dataaccess/documentevents.hxx | 2
dbaccess/source/core/inc/View.hxx | 2
dbaccess/source/core/inc/columnsettings.hxx | 2
dbaccess/source/core/inc/composertools.hxx | 2
dbaccess/source/core/inc/containerapprove.hxx | 2
dbaccess/source/core/inc/objectnameapproval.hxx | 2
dbaccess/source/core/inc/querycontainer.hxx | 2
dbaccess/source/core/inc/recovery/dbdocrecovery.hxx | 2
dbaccess/source/core/inc/sdbcoretools.hxx | 2
dbaccess/source/core/inc/veto.hxx | 2
dbaccess/source/core/misc/objectnameapproval.cxx | 2
dbaccess/source/core/misc/sdbcoretools.cxx | 2
dbaccess/source/core/misc/veto.cxx | 4
dbaccess/source/core/recovery/dbdocrecovery.cxx | 2
dbaccess/source/core/recovery/settingsimport.cxx | 4
dbaccess/source/core/recovery/settingsimport.hxx | 2
dbaccess/source/core/recovery/storagestream.cxx | 2
dbaccess/source/core/recovery/storagestream.hxx | 2
dbaccess/source/core/recovery/storagetextstream.cxx | 2
dbaccess/source/core/recovery/storagetextstream.hxx | 3
dbaccess/source/core/recovery/storagexmlstream.cxx | 2
dbaccess/source/core/recovery/storagexmlstream.hxx | 2
dbaccess/source/core/recovery/subcomponentloader.cxx | 2
dbaccess/source/core/recovery/subcomponentloader.hxx | 2
dbaccess/source/core/recovery/subcomponentrecovery.cxx | 2
dbaccess/source/core/recovery/subcomponentrecovery.hxx | 2
dbaccess/source/core/recovery/subcomponents.hxx | 2
dbaccess/source/ext/macromigration/docinteraction.cxx | 2
dbaccess/source/ext/macromigration/docinteraction.hxx | 2
dbaccess/source/ext/macromigration/macromigrationdialog.cxx | 2
dbaccess/source/ext/macromigration/macromigrationdialog.hxx | 2
dbaccess/source/ext/macromigration/macromigrationpages.cxx | 2
dbaccess/source/ext/macromigration/macromigrationwizard.cxx | 2
dbaccess/source/ext/macromigration/migrationengine.cxx | 2
dbaccess/source/ext/macromigration/migrationengine.hxx | 2
dbaccess/source/ext/macromigration/migrationerror.hxx | 2
dbaccess/source/ext/macromigration/migrationlog.cxx | 2
dbaccess/source/ext/macromigration/migrationlog.hxx | 3
dbaccess/source/ext/macromigration/migrationprogress.hxx | 3
dbaccess/source/ext/macromigration/progresscapture.cxx | 4
dbaccess/source/ext/macromigration/progresscapture.hxx | 2
dbaccess/source/ext/macromigration/progressmixer.cxx | 4
dbaccess/source/ext/macromigration/progressmixer.hxx | 3
dbaccess/source/ext/macromigration/rangeprogressbar.hxx | 3
dbaccess/source/filter/xml/dbloader2.cxx | 2
dbaccess/source/sdbtools/connection/connectiondependent.hxx | 2
dbaccess/source/sdbtools/connection/connectiontools.cxx | 6
dbaccess/source/sdbtools/connection/connectiontools.hxx | 2
dbaccess/source/sdbtools/connection/datasourcemetadata.cxx | 2
dbaccess/source/sdbtools/connection/datasourcemetadata.hxx | 2
dbaccess/source/sdbtools/connection/objectnames.cxx | 2
dbaccess/source/sdbtools/connection/objectnames.hxx | 2
dbaccess/source/sdbtools/connection/tablename.cxx | 2
dbaccess/source/sdbtools/connection/tablename.hxx | 2
dbaccess/source/ui/app/AppController.cxx | 2
dbaccess/source/ui/app/AppController.hxx | 2
dbaccess/source/ui/app/AppControllerGen.cxx | 2
dbaccess/source/ui/app/IApplicationController.hxx | 3
dbaccess/source/ui/app/subcomponentmanager.cxx | 2
dbaccess/source/ui/app/subcomponentmanager.hxx | 2
dbaccess/source/ui/browser/brwctrlr.cxx | 2
dbaccess/source/ui/browser/dbloader.cxx | 2
dbaccess/source/ui/browser/dsbrowserDnD.cxx | 2
dbaccess/source/ui/browser/unodatbr.cxx | 2
dbaccess/source/ui/control/charsetlistbox.cxx | 4
dbaccess/source/ui/control/opendoccontrols.cxx | 2
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 2
dbaccess/source/ui/dlg/advancedsettings.cxx | 4
dbaccess/source/ui/dlg/advancedsettings.hxx | 3
dbaccess/source/ui/dlg/dbwizsetup.cxx | 2
dbaccess/source/ui/dlg/textconnectionsettings.cxx | 4
dbaccess/source/ui/inc/TableFieldDescription.hxx | 4
dbaccess/source/ui/inc/advancedsettingsdlg.hxx | 3
dbaccess/source/ui/inc/asyncmodaldialog.hxx | 2
dbaccess/source/ui/inc/brwctrlr.hxx | 2
dbaccess/source/ui/inc/charsetlistbox.hxx | 3
dbaccess/source/ui/inc/defaultobjectnamecheck.hxx | 2
dbaccess/source/ui/inc/dsmeta.hxx | 3
dbaccess/source/ui/inc/imageprovider.hxx | 2
dbaccess/source/ui/inc/objectnamecheck.hxx | 3
dbaccess/source/ui/inc/propertystorage.hxx | 2
dbaccess/source/ui/inc/querycontroller.hxx | 2
dbaccess/source/ui/inc/singledoccontroller.hxx | 2
dbaccess/source/ui/inc/textconnectionsettings.hxx | 3
dbaccess/source/ui/misc/WCopyTable.cxx | 2
dbaccess/source/ui/misc/asyncmodaldialog.cxx | 2
dbaccess/source/ui/misc/controllerframe.cxx | 2
dbaccess/source/ui/misc/databaseobjectview.cxx | 2
dbaccess/source/ui/misc/dbaundomanager.cxx | 2
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 2
dbaccess/source/ui/misc/defaultobjectnamecheck.cxx | 2
dbaccess/source/ui/misc/dsmeta.cxx | 2
dbaccess/source/ui/misc/imageprovider.cxx | 2
dbaccess/source/ui/misc/propertystorage.cxx | 4
dbaccess/source/ui/misc/singledoccontroller.cxx | 4
dbaccess/source/ui/querydesign/QTableWindowData.hxx | 3
dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx | 4
dbaccess/source/ui/querydesign/querycontroller.cxx | 2
dbaccess/source/ui/tabledesign/TableController.cxx | 2
dbaccess/source/ui/uno/composerdialogs.cxx | 2
dbaccess/source/ui/uno/composerdialogs.hxx | 2
dbaccess/source/ui/uno/copytablewizard.cxx | 2
dbaccess/source/ui/uno/dbinteraction.hxx | 2
dbaccess/source/ui/uno/textconnectionsettings_uno.cxx | 2
editeng/Library_editeng.mk | 2
editeng/source/editeng/editsel.cxx | 7
editeng/source/editeng/editundo.cxx | 7
editeng/source/editeng/eeng_pch.cxx | 22 -
editeng/source/editeng/eeng_pch.hxx | 26 -
editeng/source/editeng/eeobj.cxx | 8
editeng/source/editeng/impedit.cxx | 7
editeng/source/editeng/impedit5.cxx | 10
editeng/source/outliner/outl_pch.cxx | 22 -
editeng/source/outliner/outl_pch.hxx | 27 -
editeng/source/outliner/outlobj.cxx | 9
extensions/source/logging/consolehandler.cxx | 2
extensions/source/logging/csvformatter.cxx | 2
extensions/source/logging/filehandler.cxx | 2
extensions/source/logging/log_services.cxx | 3
extensions/source/logging/logger.cxx | 2
extensions/source/logging/loggerconfig.cxx | 2
extensions/source/logging/loggerconfig.hxx | 2
extensions/source/logging/loghandler.cxx | 2
extensions/source/logging/loghandler.hxx | 2
extensions/source/logging/logrecord.cxx | 3
extensions/source/logging/logrecord.hxx | 2
extensions/source/logging/methodguard.hxx | 3
extensions/source/logging/plaintextformatter.cxx | 2
extensions/source/propctrlr/browserline.hxx | 2
extensions/source/propctrlr/browserlistbox.cxx | 2
extensions/source/propctrlr/browserlistbox.hxx | 2
extensions/source/propctrlr/buttonnavigationhandler.cxx | 2
extensions/source/propctrlr/buttonnavigationhandler.hxx | 3
extensions/source/propctrlr/cellbindinghandler.cxx | 2
extensions/source/propctrlr/cellbindinghandler.hxx | 2
extensions/source/propctrlr/cellbindinghelper.hxx | 2
extensions/source/propctrlr/commoncontrol.hxx | 2
extensions/source/propctrlr/composeduiupdate.cxx | 2
extensions/source/propctrlr/composeduiupdate.hxx | 2
extensions/source/propctrlr/defaultforminspection.cxx | 2
extensions/source/propctrlr/defaultforminspection.hxx | 3
extensions/source/propctrlr/defaulthelpprovider.cxx | 2
extensions/source/propctrlr/defaulthelpprovider.hxx | 2
extensions/source/propctrlr/editpropertyhandler.cxx | 2
extensions/source/propctrlr/editpropertyhandler.hxx | 3
extensions/source/propctrlr/eformshelper.cxx | 2
extensions/source/propctrlr/eformshelper.hxx | 2
extensions/source/propctrlr/eformspropertyhandler.cxx | 2
extensions/source/propctrlr/eformspropertyhandler.hxx | 3
extensions/source/propctrlr/enumrepresentation.hxx | 2
extensions/source/propctrlr/eventhandler.cxx | 2
extensions/source/propctrlr/eventhandler.hxx | 2
extensions/source/propctrlr/formcomponenthandler.cxx | 2
extensions/source/propctrlr/formcomponenthandler.hxx | 2
extensions/source/propctrlr/formcontroller.cxx | 2
extensions/source/propctrlr/formcontroller.hxx | 2
extensions/source/propctrlr/formgeometryhandler.cxx | 2
extensions/source/propctrlr/formlinkdialog.cxx | 2
extensions/source/propctrlr/formlinkdialog.hxx | 2
extensions/source/propctrlr/genericpropertyhandler.cxx | 2
extensions/source/propctrlr/genericpropertyhandler.hxx | 2
extensions/source/propctrlr/handlerhelper.cxx | 2
extensions/source/propctrlr/handlerhelper.hxx | 2
extensions/source/propctrlr/inspectorhelpwindow.cxx | 3
extensions/source/propctrlr/inspectorhelpwindow.hxx | 3
extensions/source/propctrlr/inspectormodelbase.cxx | 2
extensions/source/propctrlr/inspectormodelbase.hxx | 2
extensions/source/propctrlr/linedescriptor.hxx | 2
extensions/source/propctrlr/listselectiondlg.cxx | 3
extensions/source/propctrlr/listselectiondlg.hxx | 2
extensions/source/propctrlr/newdatatype.cxx | 3
extensions/source/propctrlr/newdatatype.hxx | 3
extensions/source/propctrlr/objectinspectormodel.cxx | 2
extensions/source/propctrlr/pcrcommon.cxx | 2
extensions/source/propctrlr/pcrcommon.hxx | 2
extensions/source/propctrlr/pcrcommontypes.hxx | 2
extensions/source/propctrlr/pcrcomponentcontext.cxx | 2
extensions/source/propctrlr/pcrcomponentcontext.hxx | 2
extensions/source/propctrlr/propcontroller.cxx | 2
extensions/source/propctrlr/propcontroller.hxx | 2
extensions/source/propctrlr/propcontrolobserver.hxx | 2
extensions/source/propctrlr/propertycomposer.cxx | 2
extensions/source/propctrlr/propertycomposer.hxx | 2
extensions/source/propctrlr/propertycontrolextender.cxx | 2
extensions/source/propctrlr/propertycontrolextender.hxx | 2
extensions/source/propctrlr/propertyeditor.cxx | 2
extensions/source/propctrlr/propertyeditor.hxx | 2
extensions/source/propctrlr/propertyhandler.cxx | 2
extensions/source/propctrlr/propertyhandler.hxx | 2
extensions/source/propctrlr/propeventtranslation.cxx | 2
extensions/source/propctrlr/propeventtranslation.hxx | 2
extensions/source/propctrlr/sqlcommanddesign.cxx | 2
extensions/source/propctrlr/sqlcommanddesign.hxx | 2
extensions/source/propctrlr/standardcontrol.cxx | 2
extensions/source/propctrlr/standardcontrol.hxx | 2
extensions/source/propctrlr/submissionhandler.cxx | 2
extensions/source/propctrlr/submissionhandler.hxx | 2
extensions/source/propctrlr/usercontrol.cxx | 2
extensions/source/propctrlr/xsddatatypes.cxx | 2
extensions/source/propctrlr/xsddatatypes.hxx | 2
extensions/source/propctrlr/xsdvalidationhelper.cxx | 2
extensions/source/propctrlr/xsdvalidationhelper.hxx | 2
extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx | 2
extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx | 3
filter/source/msfilter/mscodec.cxx | 19 -
filter/source/xsltdialog/xmlfileview.cxx | 137 ----------
forms/source/component/Columns.hxx | 2
forms/source/component/ComboBox.cxx | 2
forms/source/component/ComboBox.hxx | 2
forms/source/component/Filter.cxx | 2
forms/source/component/FormComponent.cxx | 2
forms/source/component/Grid.cxx | 2
forms/source/component/Grid.hxx | 2
forms/source/component/ListBox.cxx | 2
forms/source/component/ListBox.hxx | 2
forms/source/component/Pattern.cxx | 4
forms/source/component/cachedrowset.cxx | 2
forms/source/component/cachedrowset.hxx | 2
forms/source/component/entrylisthelper.hxx | 2
forms/source/component/propertybaghelper.cxx | 2
forms/source/component/refvaluecomponent.cxx | 3
forms/source/component/refvaluecomponent.hxx | 3
forms/source/helper/commanddescriptionprovider.cxx | 2
forms/source/helper/commandimageprovider.cxx | 2
forms/source/helper/resettable.cxx | 4
forms/source/helper/urltransformer.cxx | 2
forms/source/helper/windowstateguard.cxx | 2
forms/source/inc/FormComponent.hxx | 2
forms/source/inc/commanddescriptionprovider.hxx | 2
forms/source/inc/commandimageprovider.hxx | 2
forms/source/inc/componenttools.hxx | 2
forms/source/inc/controlfeatureinterception.hxx | 2
forms/source/inc/listenercontainers.hxx | 2
forms/source/inc/propertybaghelper.hxx | 2
forms/source/inc/resettable.hxx | 2
forms/source/inc/togglestate.hxx | 3
forms/source/inc/urltransformer.hxx | 2
forms/source/inc/windowstateguard.hxx | 2
forms/source/misc/componenttools.cxx | 2
forms/source/misc/listenercontainers.cxx | 4
forms/source/richtext/attributedispatcher.cxx | 2
forms/source/richtext/clipboarddispatcher.cxx | 2
forms/source/richtext/featuredispatcher.cxx | 3
forms/source/richtext/featuredispatcher.hxx | 2
forms/source/richtext/richtextcontrol.cxx | 2
forms/source/richtext/richtextcontrol.hxx | 2
forms/source/richtext/richtextmodel.cxx | 2
forms/source/richtext/richtextmodel.hxx | 2
forms/source/richtext/richtextunowrapper.cxx | 2
forms/source/richtext/richtextvclcontrol.hxx | 3
forms/source/runtime/formoperations.cxx | 2
forms/source/runtime/formoperations.hxx | 2
forms/source/solar/component/navbarcontrol.cxx | 2
forms/source/solar/component/navbarcontrol.hxx | 2
forms/source/xforms/datatyperepository.cxx | 2
forms/source/xforms/datatyperepository.hxx | 2
forms/source/xforms/datatypes.hxx | 2
fpicker/source/office/asyncfilepicker.hxx | 3
fpicker/source/office/fpsmartcontent.cxx | 2
fpicker/source/office/fpsmartcontent.hxx | 2
framework/inc/framework/documentundoguard.hxx | 2
framework/inc/framework/undomanagerhelper.hxx | 2
framework/source/fwe/helper/documentundoguard.cxx | 2
framework/source/fwe/helper/undomanagerhelper.cxx | 2
reportdesign/inc/ReportDefinition.hxx | 2
reportdesign/inc/UndoActions.hxx | 2
reportdesign/inc/conditionalexpression.hxx | 4
reportdesign/inc/reportformula.hxx | 2
reportdesign/source/core/api/ReportDefinition.cxx | 2
reportdesign/source/core/inc/conditionupdater.hxx | 2
reportdesign/source/core/misc/conditionalexpression.cxx | 3
reportdesign/source/core/misc/conditionupdater.cxx | 2
reportdesign/source/core/misc/reportformula.cxx | 4
reportdesign/source/core/sdr/UndoActions.cxx | 2
reportdesign/source/core/sdr/UndoEnv.cxx | 2
reportdesign/source/core/sdr/formatnormalizer.cxx | 2
reportdesign/source/core/sdr/formatnormalizer.hxx | 2
reportdesign/source/ui/dlg/CondFormat.cxx | 2
reportdesign/source/ui/inc/DefaultInspection.hxx | 2
reportdesign/source/ui/inc/FixedTextColor.hxx | 2
reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx | 2
reportdesign/source/ui/inc/IReportControllerObserver.hxx | 2
reportdesign/source/ui/inc/ReportController.hxx | 2
reportdesign/source/ui/inc/metadata.hxx | 2
sal/cpprt/operators_new_delete.cxx | 11
sal/osl/unx/process_impl.cxx | 17 -
salhelper/inc/salhelper/simplereferenceobject.hxx | 6
salhelper/source/simplereferenceobject.cxx | 3
sc/inc/compiler.hxx | 8
sc/inc/compressedarray.hxx | 8
sc/source/ui/drawfunc/futext2.cxx | 55 ----
sc/source/ui/view/cellsh1.cxx | 16 -
sc/source/ui/view/formatsh.cxx | 17 -
sc/source/ui/view/olkact.cxx | 72 -----
sc/source/ui/view/prevwsh2.cxx | 64 ----
sc/source/ui/view/tabview.cxx | 56 ----
sc/source/ui/view/viewfun3.cxx | 52 ---
sd/inc/drawdoc.hxx | 5
sd/inc/sdmod.hxx | 3
sd/source/core/stlpool.cxx | 3
sd/source/helper/simplereferencecomponent.cxx | 3
sd/source/ui/inc/WindowUpdater.hxx | 3
sd/source/ui/inc/filedlg.hxx | 4
sd/source/ui/toolpanel/ToolPanel.cxx | 2
sd/source/ui/toolpanel/ToolPanel.hxx | 2
sd/source/ui/toolpanel/ToolPanelFactory.cxx | 2
sd/source/ui/toolpanel/ToolPanelUIElement.cxx | 2
sd/source/ui/toolpanel/ToolPanelUIElement.hxx | 2
sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 2
sd/source/ui/unoidl/facreg.cxx | 4
sd/workben/custompanel/ctp_panel.cxx | 2
sd/workben/custompanel/ctp_panel.hxx | 2
sfx2/inc/frmload.hxx | 2
sfx2/inc/sfx2/docmacromode.hxx | 2
sfx2/inc/sfx2/docstoragemodifylistener.hxx | 2
sfx2/inc/sfx2/linksrc.hxx | 3
sfx2/inc/sfx2/sfxmodelfactory.hxx | 2
sfx2/inc/sfx2/userinputinterception.hxx | 2
sfx2/source/dialog/taskpane.cxx | 2
sfx2/source/doc/docmacromode.cxx | 2
sfx2/source/doc/docstoragemodifylistener.cxx | 4
sfx2/source/doc/docundomanager.cxx | 2
sfx2/source/doc/sfxmodelfactory.cxx | 2
sfx2/source/inc/docundomanager.hxx | 2
sfx2/source/view/frmload.cxx | 2
sfx2/source/view/userinputinterception.cxx | 2
sfx2/workben/custompanel/ctp_factory.cxx | 2
sfx2/workben/custompanel/ctp_factory.hxx | 2
sfx2/workben/custompanel/ctp_panel.cxx | 2
sfx2/workben/custompanel/ctp_panel.hxx | 2
sfx2/workben/custompanel/ctp_services.cxx | 4
store/source/lockbyte.cxx | 3
store/source/storbase.cxx | 3
store/source/storbase.hxx | 7
store/source/storcach.cxx | 3
store/workben/t_file.cxx | 3
svl/inc/svl/folderrestriction.hxx | 3
svl/inc/svl/itempool.hxx | 3
svl/inc/svl/whiter.hxx | 3
svl/source/misc/inethist.cxx | 4
svtools/inc/svtools/acceleratorexecute.hxx | 8
svtools/inc/svtools/brwbox.hxx | 7
svtools/inc/svtools/helpopt.hxx | 3
svtools/inc/svtools/imageresourceaccess.hxx | 2
svtools/inc/svtools/svlbox.hxx | 3
svtools/inc/svtools/svtabbx.hxx | 3
svtools/inc/svtools/textdata.hxx | 7
svtools/source/contnr/contentenumeration.cxx | 2
svtools/source/contnr/contentenumeration.hxx | 2
svtools/source/filter/FilterConfigCache.hxx | 4
svtools/source/misc/imageresourceaccess.cxx | 2
svtools/source/table/cellvalueconversion.cxx | 4
svtools/source/table/cellvalueconversion.hxx | 2
svtools/source/table/gridtablerenderer.cxx | 2
svtools/source/table/tablecontrol_impl.cxx | 2
svtools/source/toolpanel/paneltabbarpeer.cxx | 2
svtools/source/toolpanel/paneltabbarpeer.hxx | 3
svtools/source/toolpanel/toolpaneldeck.cxx | 2
svtools/source/toolpanel/toolpaneldeckpeer.cxx | 2
svtools/source/toolpanel/toolpaneldeckpeer.hxx | 3
svtools/source/toolpanel/toolpaneldrawerpeer.cxx | 2
svtools/source/uno/unocontroltablemodel.cxx | 2
svtools/source/uno/unocontroltablemodel.hxx | 2
svtools/source/uno/unogridcolumnfacade.cxx | 2
svtools/source/uno/unogridcolumnfacade.hxx | 2
svtools/source/uno/unowizard.hxx | 2
svtools/source/uno/wizard/unowizard.cxx | 2
svtools/source/uno/wizard/wizardpagecontroller.cxx | 2
svtools/source/uno/wizard/wizardpagecontroller.hxx | 2
svtools/source/uno/wizard/wizardshell.cxx | 2
svtools/source/uno/wizard/wizardshell.hxx | 2
svtools/workben/unodialog/udlg_services.cxx | 3
svtools/workben/unodialog/unodialogsample.cxx | 3
svx/inc/svx/databaselocationinput.hxx | 3
svx/inc/svx/fmsrcimp.hxx | 2
svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx | 2
svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx | 2
svx/inc/svx/shapeproperty.hxx | 3
svx/inc/svx/shapepropertynotifier.hxx | 2
svx/source/dialog/_contdlg.cxx | 10
svx/source/dialog/imapdlg.cxx | 10
svx/source/fmcomp/fmgridif.cxx | 2
svx/source/form/databaselocationinput.cxx | 2
svx/source/form/filtnav.cxx | 2
svx/source/form/fmPropBrw.cxx | 2
svx/source/form/fmcontrolbordermanager.cxx | 2
svx/source/form/fmcontrollayout.cxx | 2
svx/source/form/fmdocumentclassification.cxx | 2
svx/source/form/fmobj.cxx | 2
svx/source/form/fmscriptingenv.cxx | 2
svx/source/form/fmshimp.cxx | 2
svx/source/form/fmtextcontrolfeature.cxx | 3
svx/source/form/fmtextcontrolshell.cxx | 2
svx/source/form/fmtools.cxx | 2
svx/source/form/fmundo.cxx | 2
svx/source/form/fmvwimp.cxx | 2
svx/source/form/formcontrolfactory.cxx | 2
svx/source/form/formcontroller.cxx | 2
svx/source/form/formcontrolling.cxx | 2
svx/source/form/formdispatchinterceptor.cxx | 4
svx/source/form/formtoolbars.cxx | 2
svx/source/form/legacyformcontroller.cxx | 2
svx/source/form/stringlistresource.cxx | 4
svx/source/form/xfm_addcondition.cxx | 2
svx/source/inc/fmPropBrw.hxx | 2
svx/source/inc/fmcontrolbordermanager.hxx | 2
svx/source/inc/fmcontrollayout.hxx | 2
svx/source/inc/fmdocumentclassification.hxx | 2
svx/source/inc/fmexpl.hxx | 2
svx/source/inc/fmscriptingenv.hxx | 2
svx/source/inc/fmtextcontrolfeature.hxx | 2
svx/source/inc/fmtextcontrolshell.hxx | 2
svx/source/inc/fmundo.hxx | 2
svx/source/inc/fmvwimp.hxx | 2
svx/source/inc/formcontrolfactory.hxx | 2
svx/source/inc/formcontroller.hxx | 2
svx/source/inc/formdispatchinterceptor.hxx | 2
svx/source/inc/formfeaturedispatcher.hxx | 2
svx/source/inc/gridcell.hxx | 2
svx/source/inc/xfm_addcondition.hxx | 2
svx/source/sdr/contact/viewcontactofunocontrol.cxx | 2
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 2
svx/source/unodraw/shapepropertynotifier.cxx | 2
svx/util/svxpch.cxx | 59 ----
sw/inc/SwStyleNameMapper.hxx | 3
sw/inc/fesh.hxx | 3
sw/inc/swtypes.hxx | 4
sw/inc/tabcol.hxx | 3
sw/inc/tox.hxx | 4
sw/source/core/fields/flddropdown.cxx | 3
sw/source/ui/uno/unofreg.cxx | 4
toolkit/inc/toolkit/awt/animatedimagespeer.hxx | 2
toolkit/inc/toolkit/controls/animatedimages.hxx | 2
toolkit/inc/toolkit/controls/spinningprogress.hxx | 3
toolkit/inc/toolkit/helper/formpdfexport.hxx | 2
toolkit/inc/toolkit/helper/imagealign.hxx | 4
toolkit/source/awt/animatedimagespeer.cxx | 2
toolkit/source/awt/stylesettings.cxx | 2
toolkit/source/awt/stylesettings.hxx | 2
toolkit/source/controls/animatedimages.cxx | 2
toolkit/source/controls/grid/defaultgridcolumnmodel.cxx | 2
toolkit/source/controls/grid/defaultgridcolumnmodel.hxx | 2
toolkit/source/controls/grid/grideventforwarder.cxx | 4
toolkit/source/controls/grid/grideventforwarder.hxx | 2
toolkit/source/controls/grid/initguard.hxx | 2
toolkit/source/controls/grid/sortablegriddatamodel.cxx | 2
toolkit/source/controls/grid/sortablegriddatamodel.hxx | 2
toolkit/source/controls/spinningprogress.cxx | 2
toolkit/source/helper/formpdfexport.cxx | 2
tools/source/fsys/urlobj.cxx | 6
ucb/source/ucp/ext/ucpext_content.cxx | 2
ucb/source/ucp/ext/ucpext_content.hxx | 2
ucb/source/ucp/ext/ucpext_datasupplier.cxx | 2
ucb/source/ucp/ext/ucpext_provider.cxx | 4
ucb/source/ucp/ext/ucpext_resultset.cxx | 4
ucb/source/ucp/ext/ucpext_services.cxx | 4
ucb/workben/cachemap/cachemapobject1.cxx | 3
ucb/workben/cachemap/cachemapobject1.hxx | 6
ucb/workben/cachemap/cachemapobject3.cxx | 3
ucb/workben/cachemap/cachemapobject3.hxx | 6
ucb/workben/cachemap/cachemaptest.cxx | 9
unotools/inc/unotools/closeveto.hxx | 2
unotools/inc/unotools/componentresmodule.hxx | 2
unotools/inc/unotools/desktopterminationobserver.hxx | 3
unotools/source/misc/closeveto.cxx | 2
unotools/source/misc/desktopterminationobserver.cxx | 2
writerfilter/source/dmapper/PropertyMapHelper.cxx | 14 -
writerfilter/source/dmapper/PropertyMapHelper.hxx | 4
xmloff/inc/xmloff/XMLSettingsExportContext.hxx | 2
xmloff/source/forms/elementexport.cxx | 2
xmloff/source/forms/elementimport.cxx | 2
xmloff/source/forms/elementimport.hxx | 2
xmloff/source/forms/gridcolumnproptranslator.cxx | 2
xmloff/source/forms/gridcolumnproptranslator.hxx | 2
xmloff/source/forms/layerexport.cxx | 2
xmloff/source/xforms/XFormsSubmissionContext.cxx | 4
xmlsecurity/inc/xmlsecurity/sigstruct.hxx | 4
xmlsecurity/source/framework/buffernode.hxx | 3
xmlsecurity/source/framework/saxeventkeeperimpl.hxx | 3
xmlsecurity/source/framework/signatureengine.hxx | 3
xmlsecurity/source/helper/xsecctl.hxx | 3
xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx | 3
xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx | 3
616 files changed, 109 insertions(+), 2253 deletions(-)
New commits:
commit c064aad68b8b6e8579b53c9a86b73f43a6d2e3b8
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Jun 29 09:18:26 2012 +0200
Remove unused header guards and options
Change-Id: I391358363a9d30e089b249d894b7abea5a2d1434
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 27637df..4faa668 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -17,14 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define _SDR_NOITEMS
-#define _SDR_NOTOUCH
-#define _SDR_NOTRANSFORM
-#define _SDR_NOOBJECTS
-#define _SDR_NOVIEWMARKER
-#define _SDR_NODRAGMETHODS
-#define _SDR_NOXOUTDEV
-
#include "basidesh.hrc"
#include "helpid.hrc"
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 321560c..b0f8865 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -19,12 +19,6 @@
#define _SOLAR__PRIVATE 1
-#define SI_NOCONTROL
-#define SI_NOSBXCONTROLS
-#define SI_NOITEMS
-#define SI_NODRW
-#define _VCTRLS_HXX
-
#include "basidesh.hrc"
#include "helpid.hrc"
diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index 93351df..c4ce84e 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -19,9 +19,6 @@
#include "docsignature.hxx"
-#define SI_NOCONTROL
-#define SI_NOSBXCONTROLS
-
#include <basic/sbx.hxx>
#include "basicrenderable.hxx"
diff --git a/basctl/source/basicide/basides3.cxx b/basctl/source/basicide/basides3.cxx
index 668cbc6..61ef6ba 100644
--- a/basctl/source/basicide/basides3.cxx
+++ b/basctl/source/basicide/basides3.cxx
@@ -17,10 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#define SI_NOCONTROL
-#define SI_NOSBXCONTROLS
-
#include <basidesh.hrc>
#define _SOLAR__PRIVATE 1
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 23a1667..8144b17 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -19,13 +19,6 @@
// CLOOKS:
#define _SPIN_HXX
-#define _PRVWIN_HXX
-#define _DIALOGS_HXX
-#define _SVRTF_HXX
-#define _ISETBRW_HXX
-#define _VCTRLS_HXX
-#define SI_NOCONTROL
-#define SI_NOSBXCONTROLS
#define _SOLAR__PRIVATE 1
#include <tools/diagnose_ex.h>
diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index bf60e29..5a3374d 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -24,7 +24,6 @@
#include <memory>
#include "tools/solar.h"
-#define _SVICNVW_HXX
#include <svtools/svtreebx.hxx>
#include <svl/lstner.hxx>
#include <basic/sbstar.hxx>
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index 9b18816..7ae2c5d 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define _SI_NOSBXCONTROLS
-
#include <basic/basmgr.hxx>
#include <basic/sbmod.hxx>
#include <basic/sbx.hxx>
diff --git a/basctl/source/inc/svheader.hxx b/basctl/source/inc/svheader.hxx
index 6becbab..5851faa 100644
--- a/basctl/source/inc/svheader.hxx
+++ b/basctl/source/inc/svheader.hxx
@@ -21,16 +21,11 @@
// SV
-#define _COLDLG_HXX
#define _CONFIG_HXX
#define _CURSOR_HXX
-#define _FONTDLG_HXX
-#define _PRVWIN_HXX
-#define _VIRTDEV_HXX
// SVTOOLS
#define _CTRLBOX_HXX
-#define _EXTATTR_HXX
#define _CTRLTOOL_HXX
#define _CTRLBOX_HXX
#define _STDMENU_HXX
@@ -39,11 +34,8 @@
#define _SCRWIN_HXX
// SFX
-#define _SFXAPPWIN_HXX
#define _SFX_RESMGR_HXX
#define _SFX_PRNMON_HXX
-#define _INTRO_HXX
-#define _SFXMSGDESCR_HXX
#define _SFXMSGPOOL_HXX
#define _SFXMNUMGR_HXX
@@ -57,13 +49,6 @@
#define _SFX_TEMPLDLG_HXX
#define _SFXNEW_HXX
-// SFXDOC
-#define _SFX_IPFRM_HXX
-#define _SFX_INTERNO_HXX
-
-// SVCONTNR
-#define _SVICNVW_HXX
-
#define _SBSTDOBJ1_HXX
#define _SBXMSTRM_HXX
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 80880f1..2bb0d73 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -26,17 +26,6 @@
*
************************************************************************/
-//svdraw.hxx
-#define _SVDRAW_HXX
-#define _SDR_NOITEMS
-#define _SDR_NOTOUCH
-#define _SDR_NOTRANSFORM
-#define _SDR_NOOBJECTS
-#define _SDR_NOVIEWS
-#define _SDR_NOVIEWMARKER
-#define _SDR_NODRAGMETHODS
-#define _SDR_NOUNDO
-#define _SDR_NOXOUTDEV
#include <vcl/wrkwin.hxx>
#include <tools/shl.hxx>
#include <vcl/msgbox.hxx>
diff --git a/sc/source/ui/drawfunc/futext2.cxx b/sc/source/ui/drawfunc/futext2.cxx
index 6db7907..b7994fb 100644
--- a/sc/source/ui/drawfunc/futext2.cxx
+++ b/sc/source/ui/drawfunc/futext2.cxx
@@ -17,21 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-
-
-//------------------------------------------------------------------------
-
// TOOLS
#define _BIGINT_HXX
-#define _SFXMULTISEL_HXX
-#define _STACK_HXX
-#define _QUEUE_HXX
-#define _DYNARR_HXX
-#define _TREELIST_HXX
#define _CACHESTR_HXX
-#define _NEW_HXX
-#define _DYNARY_HXX
#define _SVMEMPOOL_HXX
#define _CACHESTR_HXX
#define _SV_MULTISEL_HXX
@@ -39,14 +27,9 @@
//SV
#define _CONFIG_HXX
#define _CURSOR_HXX
-#define _FONTDLG_HXX
-#define _PRVWIN_HXX
#define _HELP_HXX
-#define _MDIWIN_HXX
#define _SPIN_HXX
#define _STATUS_HXX
-#define _SVTCTRL3_HXX
-#define _COLDLG_HXX
#define _SOUND_HXX
//svtools
@@ -54,55 +37,33 @@
#define _RULER_HXX
#define _STDMENU_HXX
#define _CTRLTOOL_HXX
-#define _EXTATTR_HXX
-#define _FRM3D_HXX
-#define _EXTATTR_HXX
//SVTOOLS
#define _FILTER_HXX
-#define _SVICNVW_HXX
#define _SVTABBX_HXX
//sfxcore.hxx
#define _SFXGENLINK_HXX
#define _SFXHINTPOST_HXX
#define _SFXDOCINF_HXX
-#define _SFXLINKHDL_HXX
-
-//sfxsh.hxx
-#define _SFXMACRO_HXX
// SFX
-#define _SFX_SAVEOPT_HXX
-#define _SFXPRNMON_HXX
-#define _INTRO_HXX
-#define _SFXMSGDESCR_HXX
#define _SFXMSGPOOL_HXX
-#define _SFXFILEDLG_HXX
#define _PASSWD_HXX
#define _SFXTBXCTRL_HXX
#define _SFXSTBITEM_HXX
#define _SFXMNUITEM_HXX
#define _SFXIMGMGR_HXX
-#define _SFXTBXMGR_HXX
-#define _SFXSTBMGR_HXX
#define _SFX_MINFITEM_HXX
#define _SFXEVENT_HXX
-//sfxdoc.hxx
-#define _SFX_DOCFILT_HXX
-#define _SFX_IPFRM_HXX
-
//sfxdlg.hxx
#define _SFX_DINFDLG_HXX
-#define _SFXDINFEDT_HXX
#define _SFX_MGETEMPL_HXX
#define _SFX_TPLPITEM_HXX
#define _NEWSTYLE_HXX
-#define _SFXDOCMAN_HXX
//sfxitems.hxx
-#define _SFX_WHMAP_HXX
#define _SFXFLAGITEM_HXX
#define _SFXPTITEM_HXX
#define _SFXRECTITEM_HXX
@@ -111,22 +72,6 @@
#define _SFXPOOLCACH_HXX
#define _SFXRNGITEM_HXX
-//svdraw.hxx
-#define _SDR_NOITEMS
-#define _SDR_NOTOUCH
-#define _SDR_NOTRANSFORM
-
-#define _SI_NOSBXCONTROLS
-#define _VCATTR_HXX
-#define _VCONT_HXX
-#define _SI_NOOTHERFORMS
-#define _VCTRLS_HXX
-#define _SI_NOCONTROL
-#define _SETBRW_HXX
-#define _VCBRW_HXX
-#define _SI_NOSBXCONTROLS
-#define _SIDLL_HXX
-
//------------------------------------------------------------------------
#include <svx/svdmodel.hxx>
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index ca84b2b..52d3390 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -28,22 +28,6 @@
#include <iostream>
-//------------------------------------------------------------------
-
-//svdraw.hxx
-#define _SDR_NOITEMS
-#define _SDR_NOTOUCH
-#define _SDR_NOTRANSFORM
-#define _SI_NOSBXCONTROLS
-#define _VCONT_HXX
-#define _SI_NOOTHERFORMS
-#define _VCTRLS_HXX
-#define _SI_NOCONTROL
-#define _SETBRW_HXX
-#define _VCBRW_HXX
-#define _SI_NOSBXCONTROLS
-
-//------------------------------------------------------------------
#include <com/sun/star/i18n/TextConversionOption.hpp>
#include <com/sun/star/sheet/DataPilotFieldFilter.hpp>
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 97b5b0f..8e8a657 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -30,23 +30,6 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
-//------------------------------------------------------------------
-
-//svdraw.hxx
-#define _SDR_NOITEMS
-#define _SDR_NOTOUCH
-#define _SDR_NOTRANSFORM
-#define _SI_NOSBXCONTROLS
-#define _VCONT_HXX
-#define _SI_NOOTHERFORMS
-#define _VCTRLS_HXX
-#define _SI_NOCONTROL
-#define _SETBRW_HXX
-#define _VCBRW_HXX
-#define _SI_NOSBXCONTROLS
-
-//------------------------------------------------------------------
-
#include "scitems.hxx"
#include <editeng/eeitem.hxx>
diff --git a/sc/source/ui/view/olkact.cxx b/sc/source/ui/view/olkact.cxx
index 8dd68c4..071d8de 100644
--- a/sc/source/ui/view/olkact.cxx
+++ b/sc/source/ui/view/olkact.cxx
@@ -22,87 +22,43 @@
#define _CONFIG_HXX
#define _CURSOR_HXX
#define _CTRLTOOL_HXX
-#define _DLGCFG_HXX
-#define _DYNARR_HXX
-#define _EXTATTR_HXX
-#define _FILDLG_HXX
-#define _FONTDLG_HXX
-#define _FRM3D_HXX
-#define _INTRO_HXX
-#define _ISETBWR_HXX
-#define _NO_SVRTF_PARSER_HXX
#define _MACRODLG_HXX
-#define _MODALDLG_HXX
-#define _MOREBUTTON_HXX
#define _OUTLINER_HXX
#define _PASSWD_HXX
#define _PRNDLG_HXX
-#define _PVRWIN_HXX
-#define _QUEUE_HXX
#define _RULER_HXX
#define _SCRWIN_HXX
-#define _SETBRW_HXX
-#define _STACK_HXX
#define _STDMENU_HXX
#define _TABBAR_HXX
-#define _VCTRLS_HXX
-#define _VCONT_HXX
-#define _VDRWOBJ_HXX
-
//sfx
-#define _SFXAPPWIN_HXX
#define _SFXCTRLITEM
#define _SFXDISPATCH_HXX
-#define _SFXFILEDLG_HXX
#define _SFXIMGMGR_HXX
-#define _SFXIPFRM_HXX
-#define _SFX_MACRO_HXX
-#define _SFXMULTISEL_HXX
#define _SFX_MINFITEM_HXX
-
//sfxcore.hxx
#define _SFXGENLINK_HXX
#define _SFXHINTPOST_HXX
#define _SFXDOCINF_HXX
-#define _SFXLINKHDL_HXX
-
-//sfxsh.hxx
-#define _SFXMACRO_HXX
// SFX
-#define _SFX_SAVEOPT_HXX
-#define _SFXPRNMON_HXX
-#define _INTRO_HXX
-#define _SFXMSGDESCR_HXX
#define _SFXMSGPOOL_HXX
-#define _SFXFILEDLG_HXX
#define _PASSWD_HXX
#define _SFXTBXCTRL_HXX
#define _SFXSTBITEM_HXX
#define _SFXMNUITEM_HXX
#define _SFXIMGMGR_HXX
-#define _SFXTBXMGR_HXX
-#define _SFXSTBMGR_HXX
#define _SFX_MINFITEM_HXX
#define _SFXEVENT_HXX
-//sfxdoc.hxx
-#define _SFX_DOCFILT_HXX
-#define _SFX_IPFRM_HXX
-
//sfxdlg.hxx
#define _SFX_DINFDLG_HXX
-#define _SFXDINFEDT_HXX
#define _SFX_MGETEMPL_HXX
#define _SFX_TPLPITEM_HXX
#define _NEWSTYLE_HXX
-#define _SFXDOCMAN_HXX
//sfxitems.hxx
-#define _SFX_WHMAP_HXX
-#define _ARGS_HXX
#define _SFXFLAGITEM_HXX
#define _SFXPTITEM_HXX
#define _SFXRECTITEM_HXX
@@ -111,56 +67,28 @@
#define _SFXPOOLCACH_HXX
#define _SFXRNGITEM_HXX
-//svdraw.hxx
-#define _SDR_NOITEMS
-#define _SDR_NOTOUCH
-#define _SDR_NOTRANSFORM
-
#define _SFXBASIC_HXX
-#define _SFX_DOCFILE_HXX
-#define _SFX_DOCFILT_HXX
-#define _SFX_DOCINF_HXX
-#define _SFX_DOCSH_HXX
#define _SFX_TEMPLDLG_HXX
-#define _SFXSTBMGR_HXX
-#define _SFXTBXMGR_HXX
#define _SFXIMGMGR_HXX
#define _SFXMNUITEM_HXX
#define _SFXMNUMGR_HXX
#define _SFXSTBITEM_HXX
#define _SFXTBXCTRL_HXX
-#define _SFXFILEDLG_HXX
#define _SFXREQUEST_HXX
#define _SFXOBJFACE_HXX
#define _SFXMSGPOOL_HXX
-#define _SFXMSGDESCR_HXX
#define _SFXMSG_HXX
#define _SFX_PRNMON_HXX
-//si
-#define _SI_NOSBXCONTROLS
-#define _SI_NOCONTROL
-#define _SIDLL_HXX
-
-#define _SVDXOUT_HXX
-#define _SVDEC_HXX
-#define _SVINCVW_HXX
-#define _SVRTV_HXX
#define _SVTABBX_HXX
-#define _SVX_DAILDLL_HXX
#define _SVX_HYPHEN_HXX
-#define _SVX_IMPGRF_HXX
-#define _SVX_OPTITEMS_HXX
-#define _SVX_OPTGERL_HXX
#define _SVX_OPTSAVE_HXX
-#define _SVX_OPTSPELL_HXX
#define _SVX_OPTPATH_HXX
#define _SVX_OPTLINGU_HXX
#define _SVX_RULER_HXX
#define _SVX_RULRITEM_HXX
#define _SVX_SPLWRAP_HXX
-#define _SVX_SPLDLG_HXX
#define _SVX_THESDLG_HXX
#include <sfx2/childwin.hxx>
diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx
index 9c1e0b1..5415847 100644
--- a/sc/source/ui/view/prevwsh2.cxx
+++ b/sc/source/ui/view/prevwsh2.cxx
@@ -26,33 +26,17 @@
*
************************************************************************/
-
-
-
-//------------------------------------------------------------------
-
// TOOLS
#define _BIGINT_HXX
-#define _SFXMULTISEL_HXX
-#define _STACK_HXX
-#define _QUEUE_HXX
-#define _DYNARR_HXX
-#define _TREELIST_HXX
#define _CACHESTR_HXX
-#define _NEW_HXX
-#define _DYNARY_HXX
#define _SVMEMPOOL_HXX
#define _CACHESTR_HXX
//SV
#define _CONFIG_HXX
#define _CURSOR_HXX
-#define _FONTDLG_HXX
-#define _PRVWIN_HXX
#define _HELP_HXX
-#define _MDIWIN_HXX
#define _SPIN_HXX
-#define _COLDLG_HXX
#define _SOUND_HXX
//svtools
@@ -60,56 +44,34 @@
#define _RULER_HXX
#define _STDMENU_HXX
#define _CTRLTOOL_HXX
-#define _EXTATTR_HXX
-#define _FRM3D_HXX
-#define _EXTATTR_HXX
//SVTOOLS
#define _FILTER_HXX
-#define _SVICNVW_HXX
#define _SVTABBX_HXX
//sfxcore.hxx
#define _SFXGENLINK_HXX
#define _SFXHINTPOST_HXX
#define _SFXDOCINF_HXX
-#define _SFXLINKHDL_HXX
-
-//sfxsh.hxx
-#define _SFXMACRO_HXX
// SFX
-#define _SFX_SAVEOPT_HXX
-#define _SFXPRNMON_HXX
-#define _INTRO_HXX
-#define _SFXMSGDESCR_HXX
#define _SFXMSGPOOL_HXX
-#define _SFXFILEDLG_HXX
#define _PASSWD_HXX
#define _SFXTBXCTRL_HXX
#define _SFXSTBITEM_HXX
#define _SFXMNUITEM_HXX
#define _SFXIMGMGR_HXX
-#define _SFXTBXMGR_HXX
-#define _SFXSTBMGR_HXX
#define _SFX_MINFITEM_HXX
#define _SFXEVENT_HXX
-//sfxdoc.hxx
-#define _SFX_DOCFILT_HXX
-#define _SFX_IPFRM_HXX
-
//sfxdlg.hxx
#define _SFX_DINFDLG_HXX
-#define _SFXDINFEDT_HXX
#define _SFX_MGETEMPL_HXX
#define _SFX_TPLPITEM_HXX
#define _NEWSTYLE_HXX
-#define _SFXDOCMAN_HXX
#define _SFXDOCKWIN_HXX
//sfxitems.hxx
-#define _SFX_WHMAP_HXX
#define _SFXFLAGITEM_HXX
#define _SFXPTITEM_HXX
#define _SFXRECTITEM_HXX
@@ -118,39 +80,13 @@
#define _SFXPOOLCACH_HXX
#define _SFXRNGITEM_HXX
-//svdraw.hxx
-#define _SDR_NOITEMS
-#define _SDR_NOTOUCH
-#define _SDR_NOTRANSFORM
-#define _SDR_NOTRANSFORM
-#define _SDR_NOVIEWMARKER
-#define _SDR_NODRAGMETHODS
-#define _SDR_NOUNDO
-#define _SDR_NOXOUTDEV
-
-
-#define _SI_NOSBXCONTROLS
-#define _VCONT_HXX
-#define _SI_NOOTHERFORMS
-#define _VCTRLS_HXX
-#define _SI_NOCONTROL
-#define _SETBRW_HXX
-#define _VCBRW_HXX
-#define _SI_NOSBXCONTROLS
-
-#define _SVX_DAILDLL_HXX
#define _SVX_HYPHEN_HXX
-#define _SVX_IMPGRF_HXX
-#define _SVX_OPTITEMS_HXX
-#define _SVX_OPTGERL_HXX
#define _SVX_OPTSAVE_HXX
-#define _SVX_OPTSPELL_HXX
#define _SVX_OPTPATH_HXX
#define _SVX_OPTLINGU_HXX
#define _SVX_RULER_HXX
#define _SVX_RULRITEM_HXX
#define _SVX_SPLWRAP_HXX
-#define _SVX_SPLDLG_HXX
#define _SVX_THESDLG_HXX
#include <svx/svdmodel.hxx>
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 73c0b44..97701fb 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -34,66 +34,10 @@
// Die u.a. Aenderungen nehmen vorgeschlagene Konstante vorweg
///////////////////////////////////////////////////////////////////////////
-// Dieses define entfernt die VCControls aus SI.HXX
-
-#define _SI_HXX // VCControls
-
////////////////////// Umsetzen der Standard-Defines //////////////////////
#define _SVDPAGE_HXX // SdrPage
-#ifdef _SDR_NOSURROGATEOBJ
- #undef _SDR_NOSURROGATEOBJ
- #define _SVDSURO_HXX
-#endif
-
-#ifdef _SDR_NOPAGEOBJ
- #undef _SDR_NOPAGEOBJ
- #define _SVDOPAGE_HXX
-#endif
-
-#ifdef _SDR_NOVIRTOBJ
- #undef _SDR_NOVIRTOBJ
- #define _SVDOVIRT_HXX
-#endif
-
-#ifdef _SDR_NOGROUPOBJ
- #undef _SDR_NOGROUPOBJ
- #define _SVDOGRP_HXX
-#endif
-
-#ifdef _SDR_NOTEXTOBJ
- #undef _SDR_NOTEXTOBJ
- #define _SVDOTEXT_HXX
-#endif
-
-#ifdef _SDR_NOPATHOBJ
- #undef _SDR_NOPATHOBJ
- #define _SVDOPATH_HXX
-#endif
-
-#ifdef _SDR_NOEDGEOBJ
- #undef _SDR_NOEDGEOBJ
- #define _SVDOEDGE_HXX
-#endif
-
-#ifdef _SDR_NORECTOBJ
- #undef _SDR_NORECTOBJ
- #define _SVDORECT_HXX
-#else
- #undef _SDVOTEXT_OBJ
-#endif
-
-#ifdef _SDR_NOCAPTIONOBJ
- #undef _SDR_NOCAPTIONOBJ
- #define _SVDCAPT_HXX
-#endif
-
-#ifdef _SDR_NOCIRCLEOBJ
- #undef _SDR_NOCIRCLEOBJ
- #define _SVDOCIRC_HXX
-#endif
-
#ifdef _SDR_NOGRAFOBJ
#undef _SDR_NOGRAFOBJ
#define _SVDOGRAF_HXX
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index e6b558d..ae057a7 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -26,100 +26,48 @@
*
************************************************************************/
-#define _SV_NOXSOUND
-
-#define _BASE_DLGS_HXX
#define _BIGINT_HXX
#define _CACHESTR_HXX
#define _CONFIG_HXX
#define _CURSOR_HXX
#define _CTRLTOOL_HXX
-#define _DLGCFG_HXX
-#define _DYNARR_HXX
-#define _EXTATTR_HXX
-#define _FILDLG_HXX
-#define _FONTDLG_HXX
-#define _FRM3D_HXX
-#define _INTRO_HXX
-#define _ISETBWR_HXX
-#define _NO_SVRTF_PARSER_HXX
#define _MACRODLG_HXX
-#define _MODALDLG_HXX
-#define _MOREBUTTON_HXX
#define _OUTLINER_HXX
-#define _PVRWIN_HXX
#define _RULER_HXX
#define _SCRWIN_HXX
-#define _SETBRW_HXX
#define _STDCTRL_HXX
#define _STDMENU_HXX
#define _TABBAR_HXX
-#define _TREELIST_HXX
#define _VALUESET_HXX
-#define _VCATTR_HXX
-#define _VCBRW_HXX
-#define _VCTRLS_HXX
-#define _VCSBX_HXX
-#define _VCONT_HXX
-#define _VDRWOBJ_HXX
#define _PASSWD_HXX
-#define _SFX_DOCFILE_HXX
-#define _SFX_DOCINF_HXX
-#define _SFX_DOCSH_HXX
#define _SFX_PRNMON_HXX
#define _SFX_RESMGR_HXX
#define _SFX_TEMPLDLG_HXX
#define _SFXBASIC_HXX
#define _SFXCTRLITEM
-#define _SFXDLGCFG_HXX
-#define _SFXFILEDLG_HXX
-#define _SFXIPFRM_HXX
-#define _SFX_MACRO_HXX
#define _SFXMNUITEM_HXX
#define _SFXMNUMGR_HXX
-#define _SFXMULTISEL_HXX
-#define _SFXMSGDESCR_HXX
#define _SFXMSGPOOL_HXX
#define _SFX_MINFITEM_HXX
#define _SFXOBJFACE_HXX
-#define _SFXOBJFAC_HXX
-#define _SFX_SAVEOPT_HXX
#define _SFXSTBITEM_HXX
-#define _SFXSTBMGR_HXX
#define _SFXTBXCTRL_HXX
-#define _SFXTBXMGR_HXX
-
-#define _SI_HXX
-
-#define _SVBOXITM_HXX
-#define _SVCONTNR_HXX //
-
-#define _SDR_NOTRANSFORM
-#define _SVDRAG_HXX
-#define _SVINCVW_HXX
-#define _SVRTV_HXX
#define _SVTABBX_HXX
#define _SVTREEBOX_HXX
#define _SVTREELIST_HXX
-#define _SVX_DAILDLL_HXX
#define _SVX_HYPHEN_HXX
-#define _SVX_IMPGRF_HXX
#define _SVX_LAYCTRL_HXX
-#define _SVX_OPTITEMS_HXX
-#define _SVX_OPTGERL_HXX
#define _SVX_OPTSAVE_HXX
-#define _SVX_OPTSPELL_HXX
#define _SVX_OPTPATH_HXX
#define _SVX_OPTLINGU_HXX
#define _SVX_RULER_HXX
#define _SVX_RULRITEM_HXX
#define _SVX_SELCTRL_HXX
#define _SVX_SPLWRAP_HXX
-#define _SVX_SPLDLG_HXX
#define _SVX_STDDLG_HXX
#define _SVX_THESDLG_HXX
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 7801da5..c40332c 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -60,9 +60,6 @@
#include <editeng/adjitem.hxx>
#include <svl/itempool.hxx>
-#define _SDR_POSITIVE
-#define _SDR_ITEMS
-
#include "stlpool.hxx"
#include "sdresid.hxx"
#include "stlsheet.hxx"
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 50486b8..3d1df1b 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -38,16 +38,6 @@
#include <unotools/localedatawrapper.hxx>
#include <comphelper/processfactory.hxx>
-#define _SDR_NOITEMS
-#define _SDR_NOTOUCH
-#define _SDR_NOTRANSFORM
-#define _SDR_NOOBJECTS
-#define _SDR_NOVIEWMARKER
-#define _SDR_NODRAGMETHODS
-#define _SDR_NOUNDO
-#define _SDR_NOXOUTDEV
-#define _XOUTBMP_STATICS_ONLY
-
#include <svx/dialmgr.hxx>
#include "svx/xoutbmp.hxx"
#include <svx/dialogs.hrc>
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 643fe62..9b32a30 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -26,16 +26,6 @@
*
************************************************************************/
-
-#define _SDR_NOITEMS
-#define _SDR_NOTOUCH
-#define _SDR_NOTRANSFORM
-#define _SDR_NOOBJECTS
-#define _SDR_NOVIEWMARKER
-#define _SDR_NODRAGMETHODS
-#define _SDR_NOUNDO
-#define _SDR_NOXOUTDEV
-
#include <stdlib.h>
#include <tools/shl.hxx>
#include <tools/errinf.hxx>
commit 1e322b7f260f6633b53859824ab76804b1dc907a
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Jun 29 08:30:14 2012 +0200
Remove last PCH traces
Change-Id: I6b5d7422eecb90c612e76fd59a6316a4ea7a8698
diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx
index 80dd7d6..60c899f 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -21,7 +21,8 @@
#define _BASDOC_HXX
#include <iderid.hxx>
-
+#include <sfx2/docfac.hxx>
+#include <sfx2/objsh.hxx>
#include <svx/ifaceids.hxx>
class SfxPrinter;
diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index 3be9e2b..600f6bb 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -17,10 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#include <ide_pch.hxx>
-
-
#include <basidesh.hrc>
#include <basidesh.hxx>
#include <basobj.hxx>
@@ -37,9 +33,10 @@
#include "dlgresid.hrc"
#include <editeng/unolingu.hxx>
+#include <sfx2/dinfdlg.hxx>
+#include <sfx2/dispatch.hxx>
#include <svtools/langtab.hxx>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index c0479fd..fa504e3 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#include <ide_pch.hxx>
-
#include "baside2.hxx"
#include "brkdlg.hxx"
#include "iderdll.hxx"
@@ -28,14 +25,23 @@
#include "baside2.hrc"
+#include <basic/basmgr.hxx>
#include <basic/basrdll.hxx>
+#include <basic/sbmeth.hxx>
#include <com/sun/star/script/ModuleType.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <comphelper/processfactory.hxx>
+#include <sfx2/dinfdlg.hxx>
+#include <sfx2/dispatch.hxx>
#include <sfx2/docfile.hxx>
+#include <sfx2/printer.hxx>
+#include <sfx2/request.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/srchitem.hxx>
+#include <svl/whiter.hxx>
#include <svtools/xtextedt.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/msgbox.hxx>
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index ec11125..27637df 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -25,8 +25,6 @@
#define _SDR_NODRAGMETHODS
#define _SDR_NOXOUTDEV
-#include "ide_pch.hxx"
-
#include "basidesh.hrc"
#include "helpid.hrc"
@@ -43,6 +41,7 @@
#include "localizationmgr.hxx"
#include "propbrw.hxx"
+#include <basic/basmgr.hxx>
#include <com/sun/star/resource/StringResourceWithLocation.hpp>
#include <com/sun/star/ucb/SimpleFileAccess.hpp>
#include <com/sun/star/ucb/XSimpleFileAccess2.hpp>
@@ -51,6 +50,11 @@
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <comphelper/processfactory.hxx>
+#include <sfx2/dinfdlg.hxx>
+#include <sfx2/dispatch.hxx>
+#include <sfx2/request.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/whiter.hxx>
#include <tools/diagnose_ex.h>
#include <tools/urlobj.hxx>
#include <vcl/msgbox.hxx>
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 939d18c..321560c 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#include "ide_pch.hxx"
-
#define _SOLAR__PRIVATE 1
#define SI_NOCONTROL
@@ -41,10 +38,24 @@
#include "managelang.hxx"
#include "moduldlg.hxx"
+#include <basic/basmgr.hxx>
+#include <basic/sbmeth.hxx>
#include <com/sun/star/frame/XLayoutManager.hpp>
#include <com/sun/star/script/XLibraryContainerPassword.hpp>
#include <com/sun/star/task/XStatusIndicatorFactory.hpp>
+#include <sfx2/childwin.hxx>
+#include <sfx2/docfac.hxx>
+#include <sfx2/dinfdlg.hxx>
+#include <sfx2/dispatch.hxx>
+#include <sfx2/minfitem.hxx>
+#include <sfx2/objface.hxx>
+#include <sfx2/printer.hxx>
+#include <sfx2/request.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/srchitem.hxx>
#include <svl/visitem.hxx>
+#include <svl/whiter.hxx>
#include <svtools/xtextedt.hxx>
#include <vcl/msgbox.hxx>
diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index 2ffa4eb..93351df 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -17,13 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "docsignature.hxx"
#define SI_NOCONTROL
#define SI_NOSBXCONTROLS
-#include <ide_pch.hxx>
#include <basic/sbx.hxx>
#include "basicrenderable.hxx"
@@ -39,6 +37,8 @@
#include <svtools/textview.hxx>
#include <svtools/xtextedt.hxx>
#include <tools/diagnose_ex.h>
+#include <sfx2/childwin.hxx>
+#include <sfx2/dispatch.hxx>
#include <sfx2/sfxdefs.hxx>
#include <sfx2/signaturestate.hxx>
#include <com/sun/star/container/XNameContainer.hpp>
diff --git a/basctl/source/basicide/basides3.cxx b/basctl/source/basicide/basides3.cxx
index 94ead6c..668cbc6 100644
--- a/basctl/source/basicide/basides3.cxx
+++ b/basctl/source/basicide/basides3.cxx
@@ -22,8 +22,6 @@
#define SI_NOSBXCONTROLS
#include <basidesh.hrc>
-#include <ide_pch.hxx>
-
#define _SOLAR__PRIVATE 1
@@ -37,6 +35,9 @@
#include <com/sun/star/script/XLibraryContainer.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <xmlscript/xmldlg_imexp.hxx>
+#include <sfx2/dispatch.hxx>
+#include <sfx2/docfac.hxx>
+#include <sfx2/request.hxx>
#include <tools/diagnose_ex.h>
using namespace comphelper;
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 9bdb424..23a1667 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -27,20 +27,27 @@
#define SI_NOCONTROL
#define SI_NOSBXCONTROLS
-// if without PCH's:
-#include <ide_pch.hxx>
-
#define _SOLAR__PRIVATE 1
#include <tools/diagnose_ex.h>
+#include <basic/basmgr.hxx>
#include <basidesh.hrc>
#include <baside2.hxx>
#include <basdoc.hxx>
#include <basicbox.hxx>
+#include <editeng/sizeitem.hxx>
#include <objdlg.hxx>
#include <tbxctl.hxx>
#include <iderdll2.hxx>
#include <basidectrlr.hxx>
#include <localizationmgr.hxx>
+#include <sfx2/app.hxx>
+#include <sfx2/dinfdlg.hxx>
+#include <sfx2/dispatch.hxx>
+#include <sfx2/minfitem.hxx>
+#include <sfx2/objface.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/srchitem.hxx>
#define BasicIDEShell
#define SFX_TYPEMAP
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index f4b3a40..471becd 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#include <ide_pch.hxx>
-
#include "basobj.hxx"
#include "iderdll.hxx"
#include "iderdll2.hxx"
@@ -35,6 +32,7 @@
#include <com/sun/star/document/XEmbeddedScripts.hpp>
#include <com/sun/star/document/XScriptInvocationContext.hpp>
+#include <basic/sbmeth.hxx>
#include <basic/sbx.hxx>
#include <framework/documentundoguard.hxx>
#include <tools/diagnose_ex.h>
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index aec8aab..088ff07 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -17,12 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#include <ide_pch.hxx>
-
#include <vcl/msgbox.hxx>
#include <vector>
#include <algorithm>
+#include <basic/basmgr.hxx>
+#include <basic/sbmeth.hxx>
#include <basic/sbx.hxx>
#include <unotools/moduleoptions.hxx>
@@ -46,6 +45,9 @@
#include <com/sun/star/script/XLibraryContainerPassword.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <xmlscript/xmldlg_imexp.hxx>
+#include <sfx2/app.hxx>
+#include <sfx2/dispatch.hxx>
+#include <sfx2/request.hxx>
#include <rtl/uri.hxx>
#include <osl/process.h>
#include <osl/file.hxx>
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index bdea98c..087651e 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -22,8 +22,6 @@
#include "vcl/bitmap.hxx"
-#include <ide_pch.hxx>
-
#include "basidesh.hxx"
#include "iderdll.hxx"
#include "iderdll2.hxx"
@@ -42,6 +40,8 @@
#include <com/sun/star/frame/XModuleManager.hpp>
#include <comphelper/processfactory.hxx>
#include <comphelper/componentcontext.hxx>
+#include <sfx2/dispatch.hxx>
+
#include <map>
#include <com/sun/star/script/ModuleType.hpp>
#include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index 5b1ad42..9b18816 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <ide_pch.hxx>
-
#define _SI_NOSBXCONTROLS
+#include <basic/basmgr.hxx>
+#include <basic/sbmod.hxx>
#include <basic/sbx.hxx>
#include <bastype2.hxx>
#include <basobj.hxx>
@@ -31,6 +31,7 @@
#include <com/sun/star/script/XLibraryContainer.hpp>
#include <com/sun/star/script/XLibraryContainerPassword.hpp>
#include <deque>
+#include <sfx2/docfac.hxx>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
diff --git a/basctl/source/basicide/ide_pch.hxx b/basctl/source/basicide/ide_pch.hxx
deleted file mode 100644
index b3bb40b..0000000
--- a/basctl/source/basicide/ide_pch.hxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <svl/aeitem.hxx>
-#include <svl/whiter.hxx>
-#include <svl/intitem.hxx>
-#include <svl/srchitem.hxx>
-
-#define _BASIC_TEXTPORTIONS
-#include <basic/sbmeth.hxx>
-#include <basic/sbmod.hxx>
-#include <basic/basmgr.hxx>
-
-#include <sfx2/app.hxx>
-#include <sfx2/objface.hxx>
-#include <sfx2/printer.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/childwin.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/minfitem.hxx>
-#include <sfx2/dinfdlg.hxx>
-#include <sfx2/docfac.hxx>
-#include <editeng/sizeitem.hxx>
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index be53883..9018f3a 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -17,19 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <comphelper/scoped_disposing_ptr.hxx>
#include <comphelper/processfactory.hxx>
-#include <ide_pch.hxx>
-
-
#include <svheader.hxx>
#include <sfx2/app.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/genlink.hxx>
-
#include <svl/solar.hrc>
#include <iderdll.hxx>
#include <iderdll2.hxx>
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index 411bf9b..1f10cd5 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -17,17 +17,15 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <ide_pch.hxx>
-
#include <basidesh.hxx>
#include <baside3.hxx>
#include <basobj.hxx>
#include <iderdll.hxx>
#include "dlged.hxx"
-
#include <localizationmgr.hxx>
#include <com/sun/star/resource/XStringResourceSupplier.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
+#include <sfx2/dispatch.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index c1886a8..761be97 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -17,11 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <memory>
#include <vcl/msgbox.hxx>
-#include <ide_pch.hxx>
-
#include <macrodlg.hxx>
#include <macrodlg.hrc>
@@ -36,11 +33,17 @@
#include <iderid.hxx>
#include <moduldlg.hxx>
+#include <basic/basmgr.hxx>
+#include <basic/sbmeth.hxx>
+#include <basic/sbmod.hxx>
#include <basic/sbx.hxx>
#include <bastypes.hxx>
#include <sbxitem.hxx>
+#include <sfx2/app.hxx>
+#include <sfx2/dispatch.hxx>
#include <sfx2/minfitem.hxx>
+#include <sfx2/request.hxx>
#include <com/sun/star/script/XLibraryContainer2.hpp>
#include <com/sun/star/document/MacroExecMode.hpp>
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index b94d92e..bf7d036 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#include <ide_pch.hxx>
#include <vcl/msgbox.hxx>
#include <sot/storinfo.hxx>
@@ -36,6 +34,10 @@
#include <basdoc.hxx>
#include <ucbhelper/content.hxx>
#include "rtl/uri.hxx"
+#include <sfx2/app.hxx>
+#include <sfx2/dinfdlg.hxx>
+#include <sfx2/dispatch.hxx>
+#include <sfx2/request.hxx>
#include <tools/urlobj.hxx>
#include <tools/diagnose_ex.h>
commit 688fcc847b0985b6c4c199ff2d701670e5dee46d
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Jun 28 18:34:33 2012 +0200
Remove unused locals
Change-Id: I14369787e99d31cba32957301340cef2fc832b91
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 5aae4d9..79fc969 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -939,14 +939,8 @@ void StarBASIC::SetModified( sal_Bool b )
SbxBase::SetModified( b );
}
-extern void lcl_closeTraceFile();
-
StarBASIC::~StarBASIC()
{
-#ifdef DBG_TRACE_BASIC
- lcl_closeTraceFile();
-#endif
-
// Needs to be first action as it can trigger events
disposeComVariablesForBasic( this );
diff --git a/filter/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx
index a081209..5fcd132 100644
--- a/filter/source/msfilter/mscodec.cxx
+++ b/filter/source/msfilter/mscodec.cxx
@@ -276,25 +276,6 @@ MSCodec_Std97::~MSCodec_Std97 ()
rtl_cipher_destroy (m_hCipher);
}
-#if 0
-#if DEBUG_MSO_ENCRYPTION_STD97
-static void lcl_PrintKeyData(const sal_uInt8* pKeyData, const char* msg)
-{
- printf("pKeyData: (%s)\n", msg);
- for (int j = 0; j < 4; ++j)
- {
- for (int i = 0; i < 16; ++i)
- printf("%2.2x ", pKeyData[j*16+i]);
- printf("\n");
- }
-}
-#else
-static void lcl_PrintKeyData(const sal_uInt8* /*pKeyData*/, const char* /*msg*/)
-{
-}
-#endif
-#endif
-
#if DEBUG_MSO_ENCRYPTION_STD97
static void lcl_PrintDigest(const sal_uInt8* pDigest, const char* msg)
{
diff --git a/filter/source/xsltdialog/xmlfileview.cxx b/filter/source/xsltdialog/xmlfileview.cxx
index 29f724d..ca1fa3f 100644
--- a/filter/source/xsltdialog/xmlfileview.cxx
+++ b/filter/source/xsltdialog/xmlfileview.cxx
@@ -147,141 +147,4 @@ void TextViewOutWin::Paint( const Rectangle& rRect )
pTextView->Paint( rRect );
}
-///////////////////////////////////////////////////////////////////////
-
-void lcl_Highlight(const String& rSource, SwTextPortions& aPortionList)
-{
- const sal_Unicode cOpenBracket = '<';
- const sal_Unicode cCloseBracket= '>';
- const sal_Unicode cSlash = '/';
- const sal_Unicode cExclamation = '!';
- const sal_Unicode cMinus = '-';
- const sal_Unicode cSpace = ' ';
- const sal_Unicode cTab = 0x09;
- const sal_Unicode cLF = 0x0a;
- const sal_Unicode cCR = 0x0d;
-
-
- const sal_uInt16 nStrLen = rSource.Len();
- sal_uInt16 nInsert = 0; // Number of inserted Portions
- sal_uInt16 nActPos = 0; // Position, at the '<' was found
- sal_uInt16 nOffset = 0; // Offset of nActPos for '<'
- sal_uInt16 nPortStart = USHRT_MAX; // For the TextPortion
- sal_uInt16 nPortEnd = 0; //
- SwTextPortion aText;
- while(nActPos < nStrLen)
- {
- svtools::ColorConfigEntry eFoundType = svtools::HTMLUNKNOWN;
- if(rSource.GetChar(nActPos) == cOpenBracket && nActPos < nStrLen - 2 )
- {
- // 'leere' Portion einfuegen
- if(nPortEnd < nActPos - 1 )
- {
- aText.nLine = 0;
- // am Anfang nicht verschieben
- aText.nStart = nPortEnd;
- if(nInsert)
- aText.nStart += 1;
- aText.nEnd = nActPos - 1;
- aText.eType = svtools::HTMLUNKNOWN;
- aPortionList.push_back( aText );
- nInsert++;
- }
- sal_Unicode cFollowFirst = rSource.GetChar((xub_StrLen)(nActPos + 1));
- sal_Unicode cFollowNext = rSource.GetChar((xub_StrLen)(nActPos + 2));
- if(cExclamation == cFollowFirst)
- {
- // "<!" SGML oder Kommentar
- if(cMinus == cFollowNext &&
- nActPos < nStrLen - 3 && cMinus == rSource.GetChar((xub_StrLen)(nActPos + 3)))
- {
- eFoundType = svtools::HTMLCOMMENT;
- }
- else
- eFoundType = svtools::HTMLSGML;
- nPortStart = nActPos;
- nPortEnd = nActPos + 1;
- }
- else if(cSlash == cFollowFirst)
- {
- // "</" Slash ignorieren
- nPortStart = nActPos;
- nActPos++;
- nOffset++;
- }
- if(svtools::HTMLUNKNOWN == eFoundType)
- {
- //jetzt koennte hier ein keyword folgen
- sal_uInt16 nSrchPos = nActPos;
- while(++nSrchPos < nStrLen - 1)
- {
- sal_Unicode cNext = rSource.GetChar(nSrchPos);
- if( cNext == cSpace ||
- cNext == cTab ||
- cNext == cLF ||
- cNext == cCR)
- break;
- else if(cNext == cCloseBracket)
- {
- break;
- }
- }
- if(nSrchPos > nActPos + 1)
- {
- //irgend ein String wurde gefunden
- String sToken = rSource.Copy(nActPos + 1, nSrchPos - nActPos - 1 );
- sToken.ToUpperAscii();
- {
- //Token gefunden
- eFoundType = svtools::HTMLKEYWORD;
- nPortEnd = nSrchPos;
- nPortStart = nActPos;
- }
- }
- }
- // jetzt muss noch '>' gesucht werden
- if(svtools::HTMLUNKNOWN != eFoundType)
- {
- sal_Bool bFound = sal_False;
- for(sal_uInt16 i = nPortEnd; i < nStrLen; i++)
- if(cCloseBracket == rSource.GetChar(i))
- {
- bFound = sal_True;
- nPortEnd = i;
- break;
- }
- if(!bFound && (eFoundType == svtools::HTMLCOMMENT))
- {
- // Kommentar ohne Ende in dieser Zeile
- bFound = sal_True;
- nPortEnd = nStrLen - 1;
- }
-
- if(bFound ||(eFoundType == svtools::HTMLCOMMENT))
- {
- SwTextPortion aText2;
- aText2.nLine = 0;
- aText2.nStart = nPortStart + 1;
- aText2.nEnd = nPortEnd;
- aText2.eType = eFoundType;
- aPortionList.push_back( aText2 );
- nInsert++;
- eFoundType = svtools::HTMLUNKNOWN;
- }
-
- }
- }
- nActPos++;
- }
- if(nInsert && nPortEnd < nActPos - 1)
- {
- aText.nLine = 0;
- aText.nStart = nPortEnd + 1;
- aText.nEnd = nActPos - 1;
- aText.eType = svtools::HTMLUNKNOWN;
- aPortionList.push_back( aText );
- nInsert++;
- }
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.cxx b/writerfilter/source/dmapper/PropertyMapHelper.cxx
index 5021922..50e82f3 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.cxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.cxx
@@ -96,20 +96,6 @@ void lcl_DumpPropertyValueSeq(const TagLogger::Pointer_t pLogger, PropertyValueS
pLogger->endElement();
}
-void lcl_DumpPropertyValueSeqSeq(const TagLogger::Pointer_t pLogger, PropertyValueSeqSeq_t rPropValSeqSeq)
-{
- pLogger->startElement("PropertyValueSeq");
-
- PropertyValueSeq_t * pValues = rPropValSeqSeq.getArray();
-
- for (sal_Int32 n = 0; n < rPropValSeqSeq.getLength(); ++n)
- {
- lcl_DumpPropertyValueSeq(pLogger, pValues[n]);
- }
-
- pLogger->endElement();
-}
-
}
}
#endif // OSL_DEBUG_LEVEL > 1
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.hxx b/writerfilter/source/dmapper/PropertyMapHelper.hxx
index 43190dc..13c0f34 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.hxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.hxx
@@ -35,10 +35,6 @@ typedef uno::Sequence<beans::PropertyValues> PropertyValueSeq_t;
void lcl_DumpPropertyValueSeq(const TagLogger::Pointer_t pLogger,
PropertyValueSeq_t & rPropValSeq);
-typedef uno::Sequence<PropertyValueSeq_t> PropertyValueSeqSeq_t;
-void lcl_DumpPropertyValueSeqSeq(const TagLogger::Pointer_t pLogger,
- PropertyValueSeqSeq_t & rPropValSeqSeq);
-}
}
#endif // OSL_DEBUG_LEVEL > 1
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx
index 18c1fe5..2ee8c6f 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.cxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx
@@ -77,10 +77,6 @@ static struct SvXMLTokenMapEntry aAttributeMap[] =
XML_TOKEN_MAP_END
};
-// helper function; see below
-void lcl_fillNamespaceContainer( const SvXMLNamespaceMap&,
- Reference<XNameContainer>& );
-
XFormsSubmissionContext::XFormsSubmissionContext(
SvXMLImport& rImport,
sal_uInt16 nPrefix,
commit 4c4d748767c5740cc4b5348c69ad86c68db234bd
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Jun 28 13:12:59 2012 +0200
Remove some more include guards
Change-Id: I7c62d086cb593744785abecae7a107686a4d65ce
diff --git a/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx b/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx
index 7fd5195..4849b12 100644
--- a/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx
+++ b/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx
@@ -24,10 +24,8 @@
#include <cppuhelper/implbase1.hxx>
#include <osl/mutex.hxx>
-#ifndef INCLUDED_VECTOR
#include <vector>
-#define INCLUDED_VECTOR
-#endif
+
#include "comphelper/comphelperdllapi.h"
//..............................................................................
diff --git a/comphelper/inc/comphelper/sequence.hxx b/comphelper/inc/comphelper/sequence.hxx
index 46bffc5..578948e 100644
--- a/comphelper/inc/comphelper/sequence.hxx
+++ b/comphelper/inc/comphelper/sequence.hxx
@@ -29,10 +29,7 @@
#ifndef _COMPHELPER_SEQUENCE_HXX_
#define _COMPHELPER_SEQUENCE_HXX_
-#ifndef INCLUDED_ALGORITHM
#include <algorithm> // copy algorithm
-#define INCLUDED_ALGORITHM
-#endif
#include <com/sun/star/uno/Sequence.hxx>
#include <osl/diagnose.h>
#include "comphelper/comphelperdllapi.h"
diff --git a/comphelper/inc/comphelper/sequenceashashmap.hxx b/comphelper/inc/comphelper/sequenceashashmap.hxx
index 2762d39..425a788 100644
--- a/comphelper/inc/comphelper/sequenceashashmap.hxx
+++ b/comphelper/inc/comphelper/sequenceashashmap.hxx
@@ -34,10 +34,7 @@
#include <boost/unordered_map.hpp>
-#ifndef INCLUDED_ALGORITHM
#include <algorithm>
-#define INCLUDED_ALGORITHM
-#endif
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
diff --git a/connectivity/source/drivers/mozab/MStatement.hxx b/connectivity/source/drivers/mozab/MStatement.hxx
index 5b05b06..233873d 100644
--- a/connectivity/source/drivers/mozab/MStatement.hxx
+++ b/connectivity/source/drivers/mozab/MStatement.hxx
@@ -28,10 +28,7 @@
#include <cppuhelper/compbase3.hxx>
#include <comphelper/uno3.hxx>
#include "connectivity/CommonTools.hxx"
-#ifndef INCLUDED_LIST
#include <list>
-#define INCLUDED_LIST
-#endif
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <comphelper/broadcasthelper.hxx>
#include "connectivity/sqliterator.hxx"
diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx
index 283444f..b523ff3 100644
--- a/dbaccess/source/ui/inc/TableFieldDescription.hxx
+++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx
@@ -19,10 +19,8 @@
#ifndef DBAUI_TABLEFIELDDESC_HXX
#define DBAUI_TABLEFIELDDESC_HXX
-#ifndef INCLUDED_VECTOR
-#define INCLUDED_VECTOR
#include <vector>
-#endif
+
#include "QEnumTypes.hxx"
#include <rtl/ustring.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/dbaccess/source/ui/querydesign/QTableWindowData.hxx b/dbaccess/source/ui/querydesign/QTableWindowData.hxx
index ccc632e..9f25d25 100644
--- a/dbaccess/source/ui/querydesign/QTableWindowData.hxx
+++ b/dbaccess/source/ui/querydesign/QTableWindowData.hxx
@@ -20,10 +20,7 @@
#define DBAUI_QUERY_TABLEWINDOWDATA_HXX
#include "TableWindowData.hxx"
-#ifndef INCLUDED_VECTOR
-#define INCLUDED_VECTOR
#include <vector>
-#endif
#include <com/sun/star/io/XObjectOutputStream.hpp>
#include <com/sun/star/io/XObjectInputStream.hpp>
diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx
index b997afe..00eb6d4 100644
--- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx
@@ -20,11 +20,7 @@
#define DBAUI_QUERYTABWINUNDOACT_HXX
#include "QueryDesignUndoAction.hxx"
-#ifndef INCLUDED_VECTOR
-#define INCLUDED_VECTOR
#include <vector>
-#endif // INCLUDED_VECTOR
-
#include <algorithm>
namespace dbaui
diff --git a/sal/cpprt/operators_new_delete.cxx b/sal/cpprt/operators_new_delete.cxx
index 9561a89..567287b 100644
--- a/sal/cpprt/operators_new_delete.cxx
+++ b/sal/cpprt/operators_new_delete.cxx
@@ -32,20 +32,9 @@
#define _NTSDK
#endif /* WNT */
-#ifndef INCLUDED_ALGORITHM
#include <algorithm>
-#define INCLUDED_ALGORITHM
-#endif
-
-#ifndef INCLUDED_NEW
#include <new>
-#define INCLUDED_NEW
-#endif
-
-#ifndef INCLUDED_STRING_H
#include <string.h>
-#define INCLUDED_STRING_H
-#endif
#include <osl/diagnose.h>
#include <rtl/alloc.h>
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index f2b90b8..817b0f6 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -26,28 +26,13 @@
*
************************************************************************/
-
#include "osl/process.h"
-#ifndef INCLUDED_LIMITS_H
#include <limits.h>
-#define INCLUDED_LIMITS_H
-#endif
-
-#ifndef INCLUDED_PTHREAD_H
#include <pthread.h>
-#define INCLUDED_PTHREAD_H
-#endif
-
-#ifndef INCLUDED_STDLIB_H
#include <stdlib.h>
-#define INCLUDED_STDLIB_H
-#endif
-
-#ifndef INCLUDED_STRING_H
#include <string.h>
-#define INCLUDED_STRING_H
-#endif
+
#include "osl/diagnose.h"
#include "osl/file.h"
#include "osl/module.h"
diff --git a/salhelper/inc/salhelper/simplereferenceobject.hxx b/salhelper/inc/salhelper/simplereferenceobject.hxx
index ca8db12..b32450c 100644
--- a/salhelper/inc/salhelper/simplereferenceobject.hxx
+++ b/salhelper/inc/salhelper/simplereferenceobject.hxx
@@ -24,14 +24,8 @@
#include "sal/types.h"
#include "salhelperdllapi.h"
-#ifndef INCLUDED_CSTDDEF
#include <cstddef>
-#define INCLUDED_CSTDDEF
-#endif
-#ifndef INCLUDED_NEW
#include <new>
-#define INCLUDED_NEW
-#endif
namespace salhelper {
diff --git a/salhelper/source/simplereferenceobject.cxx b/salhelper/source/simplereferenceobject.cxx
index c2ff482..2c5af54 100644
--- a/salhelper/source/simplereferenceobject.cxx
+++ b/salhelper/source/simplereferenceobject.cxx
@@ -20,10 +20,7 @@
#include "salhelper/simplereferenceobject.hxx"
#include "osl/diagnose.h"
-#ifndef INCLUDED_NEW
#include <new>
-#define INCLUDED_NEW
-#endif
using salhelper::SimpleReferenceObject;
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 470d8eb..c7031b8 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -29,10 +29,8 @@
#ifndef SC_COMPILER_HXX
#define SC_COMPILER_HXX
-#ifndef INCLUDED_STRING_H
#include <string.h>
-#define INCLUDED_STRING_H
-#endif
+
#include <tools/mempool.hxx>
#include "scdllapi.h"
#include "global.hxx"
@@ -47,11 +45,7 @@
#include <formula/FormulaCompiler.hxx>
#include <boost/intrusive_ptr.hpp>
-
-#ifndef INCLUDED_HASH_MAP
#include <boost/unordered_map.hpp>
-#define INCLUDED_HASH_MAP
-#endif
//-----------------------------------------------
diff --git a/sc/inc/compressedarray.hxx b/sc/inc/compressedarray.hxx
index 3d1ea6d..eb38a3d 100644
--- a/sc/inc/compressedarray.hxx
+++ b/sc/inc/compressedarray.hxx
@@ -29,15 +29,9 @@
#ifndef SC_COMPRESSEDARRAY_HXX
#define SC_COMPRESSEDARRAY_HXX
-#ifndef INCLUDED_CSTDDEF
#include <cstddef>
-#define INCLUDED_CSTDDEF
-#endif
-
-#ifndef INCLUDED_ALGORITHM
#include <algorithm>
-#define INCLUDED_ALGORITHM
-#endif
+
#include "scdllapi.h"
const size_t nScCompressedArrayDelta = 4;
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index fe70260..b8026e3 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -43,11 +43,8 @@
#include <svx/svdundo.hxx>
#include <vector>
-
-#ifndef INCLUDED_MEMORY
#include <memory>
-#define INCLUDED_MEMORY
-#endif
+
#include "sddllapi.h"
#include "sdpage.hxx"
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index f4cebe3..c6f5900 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -31,10 +31,7 @@
#include <sfx2/module.hxx>
#include <vcl/vclevent.hxx>
-#ifndef INCLUDED_MEMORY
#include <memory>
-#define INCLUDED_MEMORY
-#endif
class SdOptions;
class BasicIDE;
diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx
index 7ef62d7..353a9e9 100644
--- a/sd/source/helper/simplereferencecomponent.cxx
+++ b/sd/source/helper/simplereferencecomponent.cxx
@@ -32,10 +32,7 @@
#include "com/sun/star/uno/RuntimeException.hpp"
#include "osl/diagnose.h"
-#ifndef INCLUDED_NEW
#include <new>
-#define INCLUDED_NEW
-#endif
using com::sun::star::uno::RuntimeException;
using sd::SimpleReferenceComponent;
diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx
index 389b800..9f18cd2 100644
--- a/sd/source/ui/inc/WindowUpdater.hxx
+++ b/sd/source/ui/inc/WindowUpdater.hxx
@@ -24,10 +24,7 @@
#include <svl/ctloptions.hxx>
#include "sddllapi.h"
-#ifndef INCLUDED_VECTOR
#include <vector>
-#define INCLUDED_VECTOR
-#endif
class Window;
class OutputDevice;
diff --git a/sd/source/ui/inc/filedlg.hxx b/sd/source/ui/inc/filedlg.hxx
index e59e089..fdfffdc 100644
--- a/sd/source/ui/inc/filedlg.hxx
+++ b/sd/source/ui/inc/filedlg.hxx
@@ -24,10 +24,8 @@
#include <tools/string.hxx>
#include <tools/errcode.hxx>
-#ifndef INCLUDED_MEMORY
#include <memory>
-#define INCLUDED_MEMORY
-#endif
+
#include "sddllapi.h"
class SdFileDialog_Imp;
diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx
index c481cb7..8e200e5 100644
--- a/sd/source/ui/unoidl/facreg.cxx
+++ b/sd/source/ui/unoidl/facreg.cxx
@@ -36,10 +36,8 @@
#include "osl/diagnose.h"
#include "sal/types.h"
-#ifndef INCLUDED_STRING_H
#include <string.h>
-#define INCLUDED_STRING_H
-#endif
+
#include <comphelper/stl_types.hxx>
#include <boost/unordered_map.hpp>
#include <boost/shared_ptr.hpp>
diff --git a/sfx2/inc/sfx2/linksrc.hxx b/sfx2/inc/sfx2/linksrc.hxx
index a60ebda..1a90ec5 100644
--- a/sfx2/inc/sfx2/linksrc.hxx
+++ b/sfx2/inc/sfx2/linksrc.hxx
@@ -36,10 +36,7 @@
#include <tools/rtti.hxx>
#include <com/sun/star/io/XInputStream.hpp>
-#ifndef _SAL_CONFIG_H
#include <sal/config.h>
-#define _SAL_CONFIG_H
-#endif
namespace com { namespace sun { namespace star { namespace uno
{
diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx
index c884f78..42c50ed 100644
--- a/store/source/lockbyte.cxx
+++ b/store/source/lockbyte.cxx
@@ -30,10 +30,7 @@
#include "object.hxx"
#include "storbase.hxx"
-#ifndef INCLUDED_STRING_H
#include <string.h>
-#define INCLUDED_STRING_H
-#endif
using namespace store;
diff --git a/store/source/storbase.cxx b/store/source/storbase.cxx
index 077f5f3..ef3353f 100644
--- a/store/source/storbase.cxx
+++ b/store/source/storbase.cxx
@@ -28,10 +28,7 @@
#include "store/types.h"
#include "object.hxx"
-#ifndef INCLUDED_STDIO_H
#include <stdio.h>
-#define INCLUDED_STDIO_H
-#endif
using namespace store;
diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx
index 2407599..7c07dba 100644
--- a/store/source/storbase.hxx
+++ b/store/source/storbase.hxx
@@ -31,15 +31,8 @@
#include "store/types.h"
-#ifndef INCLUDED_STDDEF_H
#include <stddef.h>
-#define INCLUDED_STDDEF_H
-#endif
-
-#ifndef INCLUDED_STRING_H
#include <string.h>
-#define INCLUDED_STRING_H
-#endif
/*========================================================================
*
diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx
index cb64210..e07aa7f 100644
--- a/store/source/storcach.cxx
+++ b/store/source/storcach.cxx
@@ -29,10 +29,7 @@
#include "object.hxx"
#include "storbase.hxx"
-#ifndef INCLUDED_STDDEF_H
#include <stddef.h>
-#define INCLUDED_STDDEF_H
-#endif
using namespace store;
diff --git a/store/workben/t_file.cxx b/store/workben/t_file.cxx
index ffff8bd..745fbbd 100644
--- a/store/workben/t_file.cxx
+++ b/store/workben/t_file.cxx
@@ -24,10 +24,7 @@
#include "lockbyte.hxx"
-#ifndef INCLUDED_STDIO_H
#include <stdio.h>
-#define INCLUDED_STDIO_H
-#endif
#include "osl/file.h"
#include "osl/process.h"
diff --git a/svl/inc/svl/folderrestriction.hxx b/svl/inc/svl/folderrestriction.hxx
index 078f5ba..4ddb9d4 100644
--- a/svl/inc/svl/folderrestriction.hxx
+++ b/svl/inc/svl/folderrestriction.hxx
@@ -23,10 +23,7 @@
#include "svl/svldllapi.h"
#include <tools/string.hxx>
-#ifndef INCLUDED_VECTOR
#include <vector>
-#define INCLUDED_VECTOR
-#endif
//........................................................................
namespace svt
diff --git a/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx
index 12f7067..09a3f35 100644
--- a/svl/inc/svl/itempool.hxx
+++ b/svl/inc/svl/itempool.hxx
@@ -31,10 +31,7 @@
#include "svl/svldllapi.h"
-#ifndef INCLUDED_LIMITS_H
#include <limits.h>
-#define INCLUDED_LIMITS_H
-#endif
#include <tools/solar.h>
#include <tools/string.hxx>
#include <svl/svarray.hxx>
diff --git a/svl/inc/svl/whiter.hxx b/svl/inc/svl/whiter.hxx
index 37c7301..9e2aae4 100644
--- a/svl/inc/svl/whiter.hxx
+++ b/svl/inc/svl/whiter.hxx
@@ -30,10 +30,7 @@
#include "svl/svldllapi.h"
-#ifndef INCLUDED_LIMITS_H
#include <limits.h>
-#define INCLUDED_LIMITS_H
-#endif
#include <tools/solar.h>
class SfxItemSet;
diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx
index e9a2bb0..8165016 100644
--- a/svl/source/misc/inethist.cxx
+++ b/svl/source/misc/inethist.cxx
@@ -28,10 +28,8 @@
#include <svl/inethist.hxx>
-#ifndef INCLUDED_ALGORITHM
#include <algorithm>
-#define INCLUDED_ALGORITHM
-#endif
+
#include "rtl/instance.hxx"
#include "rtl/crc.h"
#include "rtl/memory.h"
diff --git a/svtools/inc/svtools/acceleratorexecute.hxx b/svtools/inc/svtools/acceleratorexecute.hxx
index 321c538..66a025d 100644
--- a/svtools/inc/svtools/acceleratorexecute.hxx
+++ b/svtools/inc/svtools/acceleratorexecute.hxx
@@ -34,22 +34,14 @@
#include "svtools/svtdllapi.h"
-#ifndef INCLUDED_VECTOR
#include <vector>
-#define INCLUDED_VECTOR
-#endif
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
#include <com/sun/star/frame/XFrame.hpp>
-
#include <com/sun/star/frame/XDispatchProvider.hpp>
-
#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
-
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/util/URL.hpp>
-
#include <com/sun/star/awt/KeyEvent.hpp>
#include <vcl/keycod.hxx>
#include <vcl/evntpost.hxx>
diff --git a/svtools/inc/svtools/brwbox.hxx b/svtools/inc/svtools/brwbox.hxx
index cc1b5b5..4a05fa8 100644
--- a/svtools/inc/svtools/brwbox.hxx
+++ b/svtools/inc/svtools/brwbox.hxx
@@ -38,15 +38,8 @@
#include <svtools/accessibletableprovider.hxx>
#include <vector>
-#ifndef INCLUDED_LIMITS_H
#include <limits.h>
-#define INCLUDED_LIMITS_H
-#endif
-
-#ifndef INCLUDED_MEMORY
#include <memory>
-#define INCLUDED_MEMORY
-#endif
class BrowserColumn;
class BrowserDataWin;
diff --git a/svtools/inc/svtools/helpopt.hxx b/svtools/inc/svtools/helpopt.hxx
index a22a10e..bcd367b 100644
--- a/svtools/inc/svtools/helpopt.hxx
+++ b/svtools/inc/svtools/helpopt.hxx
@@ -30,10 +30,7 @@
#include "svtools/svtdllapi.h"
-#ifndef INCLUDED_LIST
#include <list>
-#define INCLUDED_LIST
-#endif
#include <tools/string.hxx>
#include <unotools/options.hxx>
diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx
index 3d1f6a6..92aa946 100644
--- a/svtools/inc/svtools/svlbox.hxx
+++ b/svtools/inc/svtools/svlbox.hxx
@@ -31,10 +31,7 @@
#include "svtools/svtdllapi.h"
-#ifndef INCLUDED_DEQUE
#include <deque>
-#define INCLUDED_DEQUE
-#endif
#include <vcl/ctrl.hxx>
#include <vcl/seleng.hxx>
diff --git a/svtools/inc/svtools/svtabbx.hxx b/svtools/inc/svtools/svtabbx.hxx
index 99fdba2..4c57018 100644
--- a/svtools/inc/svtools/svtabbx.hxx
+++ b/svtools/inc/svtools/svtabbx.hxx
@@ -32,10 +32,7 @@
#include <svtools/svtreebx.hxx>
#include <svtools/accessibletableprovider.hxx>
-#ifndef INCLUDED_VECTOR
#include <vector>
-#define INCLUDED_VECTOR
-#endif
enum SvTabJustify
{
diff --git a/svtools/inc/svtools/textdata.hxx b/svtools/inc/svtools/textdata.hxx
index 1708f8f..29d97e6 100644
--- a/svtools/inc/svtools/textdata.hxx
+++ b/svtools/inc/svtools/textdata.hxx
@@ -154,15 +154,8 @@ struct TEIMEInfos
// ----------------- Wrapper for old Tools List -------------------
-#ifndef INCLUDED_VECTOR
#include <vector>
-#define INCLUDED_VECTOR
-#endif
-
-#ifndef INCLUDED_ALGORITHM
#include <algorithm>
-#define INCLUDED_ALGORITHM
-#endif
template <class T> class ToolsList : public ::std::vector< T >
{
diff --git a/svtools/source/filter/FilterConfigCache.hxx b/svtools/source/filter/FilterConfigCache.hxx
index 66e55c2..1967565 100644
--- a/svtools/source/filter/FilterConfigCache.hxx
+++ b/svtools/source/filter/FilterConfigCache.hxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#ifndef _FILTER_CONFIG_CACHE_HXX_
#define _FILTER_CONFIG_CACHE_HXX_
@@ -36,10 +35,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
-#ifndef INCLUDED_VECTOR
#include <vector>
-#define INCLUDED_VECTOR
-#endif
class FilterConfigCache
{
diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx
index 339f265..893ec73 100644
--- a/sw/inc/SwStyleNameMapper.hxx
+++ b/sw/inc/SwStyleNameMapper.hxx
@@ -33,10 +33,7 @@
#include <SwGetPoolIdFromName.hxx>
#include "swdllapi.h"
-#ifndef INCLUDED_HASH_MAP
#include <boost/unordered_map.hpp>
-#define INCLUDED_HASH_MAP
-#endif
#include <stringhash.hxx>
#include <boost/ptr_container/ptr_vector.hpp>
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 4377364..fe4a353 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -41,10 +41,7 @@
#include <svtools/embedhlp.hxx>
-#ifndef INCLUDED_VECTOR
#include <vector>
-#define INCLUDED_VECTOR
-#endif
namespace editeng { class SvxBorderLine; }
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 7b47fcd..d5849c7 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -30,11 +30,7 @@
#include <tools/solar.h>
#include <SwGetPoolIdFromName.hxx>
-#ifndef INCLUDED_LIMITS_H
#include <limits.h> //For LONG_MAX.
-#define INCLUDED_LIMITS_H
-#endif
-
#include <com/sun/star/uno/Reference.h>
#include "swdllapi.h"
#include <i18npool/lang.h>
diff --git a/sw/inc/tabcol.hxx b/sw/inc/tabcol.hxx
index d9c3219..6b896a6 100644
--- a/sw/inc/tabcol.hxx
+++ b/sw/inc/tabcol.hxx
@@ -30,10 +30,7 @@
#include <tools/solar.h>
-#ifndef INCLUDED_VECTOR
#include <vector>
-#define INCLUDED_VECTOR
-#endif
#include "swdllapi.h"
struct SwTabColsEntry
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 229d9d3..f821735 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -42,11 +42,7 @@
#include <toxe.hxx>
#include <calbck.hxx>
-#ifndef INCLUDED_VECTOR
#include <vector> // #i21237#
-#define INCLUDED_VECTOR
-#endif
-
namespace com { namespace sun { namespace star {
namespace text { class XDocumentIndexMark; }
diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx
index 84c6cae..1947e87 100644
--- a/sw/source/core/fields/flddropdown.cxx
+++ b/sw/source/core/fields/flddropdown.cxx
@@ -29,10 +29,7 @@
#include <flddropdown.hxx>
-#ifndef INCLUDED_ALGORITHM
#include <algorithm>
-#define INCLUDED_ALGORITHM
-#endif
#include <svl/poolitem.hxx>
#include <unofldmid.h>
diff --git a/sw/source/ui/uno/unofreg.cxx b/sw/source/ui/uno/unofreg.cxx
index a20be9d..ef7a1ce 100644
--- a/sw/source/ui/uno/unofreg.cxx
+++ b/sw/source/ui/uno/unofreg.cxx
@@ -32,10 +32,8 @@
#include <uno/lbnames.h>
#include <cppuhelper/factory.hxx>
#include <sfx2/sfxmodelfactory.hxx>
-#ifndef INCLUDED_STRING_H
+
#include <string.h>
-#define INCLUDED_STRING_H
-#endif
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index eb125fe..7e017fc 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -38,14 +38,8 @@
#include "rtl/ustring.hxx"
#include "sal/types.h"
-#ifndef INCLUDED_ALGORITHM
#include <algorithm>
-#define INCLUDED_ALGORITHM
-#endif
-#ifndef INCLUDED_LIMITS
#include <limits>
-#define INCLUDED_LIMITS
-#endif
#include <string.h>
diff --git a/ucb/workben/cachemap/cachemapobject1.cxx b/ucb/workben/cachemap/cachemapobject1.cxx
index 219a45a..fdd05c5 100644
--- a/ucb/workben/cachemap/cachemapobject1.cxx
+++ b/ucb/workben/cachemap/cachemapobject1.cxx
@@ -24,10 +24,7 @@
#include "rtl/ref.hxx"
#include "rtl/ustring.hxx"
-#ifndef INCLUDED_MEMORY
#include <memory>
-#define INCLUDED_MEMORY
-#endif
using ucb::cachemap::Object1;
using ucb::cachemap::ObjectContainer1;
diff --git a/ucb/workben/cachemap/cachemapobject1.hxx b/ucb/workben/cachemap/cachemapobject1.hxx
index 9dd3266..34b7e5e 100644
--- a/ucb/workben/cachemap/cachemapobject1.hxx
+++ b/ucb/workben/cachemap/cachemapobject1.hxx
@@ -26,14 +26,8 @@
#include "sal/types.h"
#include "salhelper/simplereferenceobject.hxx"
-#ifndef INCLUDED_MAP
#include <map>
-#define INCLUDED_MAP
-#endif
-#ifndef INCLUDED_MEMORY
#include <memory>
-#define INCLUDED_MEMORY
-#endif
namespace rtl { class OUString; }
namespace ucb { namespace cachemap { class Object1; } }
diff --git a/ucb/workben/cachemap/cachemapobject3.cxx b/ucb/workben/cachemap/cachemapobject3.cxx
index c86ca2d..b7cb555 100644
--- a/ucb/workben/cachemap/cachemapobject3.cxx
+++ b/ucb/workben/cachemap/cachemapobject3.cxx
@@ -24,10 +24,7 @@
#include "rtl/ref.hxx"
#include "rtl/ustring.hxx"
-#ifndef INCLUDED_MEMORY
#include <memory>
-#define INCLUDED_MEMORY
-#endif
using ucb::cachemap::Object3;
using ucb::cachemap::ObjectContainer3;
diff --git a/ucb/workben/cachemap/cachemapobject3.hxx b/ucb/workben/cachemap/cachemapobject3.hxx
index 95709c4..279436d 100644
--- a/ucb/workben/cachemap/cachemapobject3.hxx
+++ b/ucb/workben/cachemap/cachemapobject3.hxx
@@ -26,14 +26,8 @@
#include "sal/types.h"
#include "salhelper/simplereferenceobject.hxx"
-#ifndef INCLUDED_MAP
#include <map>
-#define INCLUDED_MAP
-#endif
-#ifndef INCLUDED_MEMORY
#include <memory>
-#define INCLUDED_MEMORY
-#endif
namespace rtl { class OUString; }
namespace ucb { namespace cachemap { class Object3; } }
diff --git a/ucb/workben/cachemap/cachemaptest.cxx b/ucb/workben/cachemap/cachemaptest.cxx
index 72aa19b..f486fba 100644
--- a/ucb/workben/cachemap/cachemaptest.cxx
+++ b/ucb/workben/cachemap/cachemaptest.cxx
@@ -26,18 +26,9 @@
#include "rtl/ref.hxx"
#include "rtl/ustring.hxx"
-#ifndef INCLUDED_CSTDLIB
#include <cstdlib>
-#define INCLUDED_CSTDLIB
-#endif
-#ifndef INCLUDED_MEMORY
#include <memory>
-#define INCLUDED_MEMORY
-#endif
-#ifndef INCLUDED_STDIO_H
#include <stdio.h> // <iostream> or <cstdio> do not work well on all platforms
-#define INCLUDED_STDIO_H
-#endif
using ucb::cachemap::Object1;
using ucb::cachemap::Object2;
diff --git a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx b/xmlsecurity/inc/xmlsecurity/sigstruct.hxx
index d763a68..657ba6b 100644
--- a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx
+++ b/xmlsecurity/inc/xmlsecurity/sigstruct.hxx
@@ -22,13 +22,9 @@
#include <rtl/ustring.hxx>
#include <com/sun/star/util/DateTime.hpp>
-
#include <com/sun/star/xml/crypto/SecurityOperationStatus.hpp>
-#ifndef INCLUDED_VECTOR
#include <vector>
-#define INCLUDED_VECTOR
-#endif
/*
* type of reference
diff --git a/xmlsecurity/source/framework/buffernode.hxx b/xmlsecurity/source/framework/buffernode.hxx
index 7744a2d..ac0c966 100644
--- a/xmlsecurity/source/framework/buffernode.hxx
+++ b/xmlsecurity/source/framework/buffernode.hxx
@@ -32,10 +32,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp>
-#ifndef INCLUDED_VECTOR
#include <vector>
-#define INCLUDED_VECTOR
-#endif
class ElementMark;
class ElementCollector;
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
index 8c58d61..df0ac8b 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
@@ -35,10 +35,7 @@
#include "elementmark.hxx"
#include "elementcollector.hxx"
-#ifndef INCLUDED_VECTOR
#include <vector>
-#define INCLUDED_VECTOR
-#endif
class SAXEventKeeperImpl : public cppu::WeakImplHelper6
<
diff --git a/xmlsecurity/source/framework/signatureengine.hxx b/xmlsecurity/source/framework/signatureengine.hxx
index 73b9434..bfde8fe 100644
--- a/xmlsecurity/source/framework/signatureengine.hxx
+++ b/xmlsecurity/source/framework/signatureengine.hxx
@@ -35,10 +35,7 @@
#include "securityengine.hxx"
-#ifndef INCLUDED_VECTOR
#include <vector>
-#define INCLUDED_VECTOR
-#endif
class SignatureEngine : public cppu::ImplInheritanceHelper2
<
diff --git a/xmlsecurity/source/helper/xsecctl.hxx b/xmlsecurity/source/helper/xsecctl.hxx
index b500ef7..bf640f2 100644
--- a/xmlsecurity/source/helper/xsecctl.hxx
+++ b/xmlsecurity/source/helper/xsecctl.hxx
@@ -54,10 +54,7 @@
#include <cppuhelper/implbase4.hxx>
-#ifndef INCLUDED_VECTOR
#include <vector>
-#define INCLUDED_VECTOR
-#endif
/*
* all error information
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
index 7110481..acfcdc4 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
@@ -35,10 +35,7 @@
#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
-#ifndef INCLUDED_VECTOR
#include <vector>
-#define INCLUDED_VECTOR
-#endif
class XMLSecurityContext_NssImpl : public ::cppu::WeakImplHelper3<
::com::sun::star::xml::crypto::XXMLSecurityContext ,
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
index e12824d..2b018c6 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
@@ -40,10 +40,7 @@
#include <sys/types.h>
#include <sys/stat.h>
-#ifndef INCLUDED_VECTOR
#include <vector>
-#define INCLUDED_VECTOR
-#endif
#ifdef UNX
#define stricmp strcasecmp
commit 57154616f064752c237a278db18767241da13c3f
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Jun 28 12:28:46 2012 +0200
Remove UNO includes comments
Change-Id: I48e193322967fb75e93eaf81e9e2110d3056f92a
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
index df76b8b..24462dd 100644
--- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
@@ -20,9 +20,6 @@
#ifndef ACC_ACCESSIBLETOOLPANELDECK_HXX
#define ACC_ACCESSIBLETOOLPANELDECK_HXX
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <cppuhelper/implbase1.hxx>
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
index 3a27c63..ad81c58 100644
--- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
@@ -20,9 +20,6 @@
#ifndef ACC_ACCESSIBLETOOLPANELTABBAR_HXX
#define ACC_ACCESSIBLETOOLPANELTABBAR_HXX
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <cppuhelper/implbase1.hxx>
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
index 3516bbb..8126621 100644
--- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
@@ -20,9 +20,6 @@
#ifndef ACC_ACCESSIBLETOOLPANELDECKTABBARITEM_HXX
#define ACC_ACCESSIBLETOOLPANELDECKTABBARITEM_HXX
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <comphelper/accessiblecomponenthelper.hxx>
#include <cppuhelper/implbase1.hxx>
diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
index b0a7ff8..786a4b4 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
@@ -28,12 +28,10 @@
#include "accessibility/extended/AccessibleToolPanelDeck.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
#include <svtools/toolpanel/toolpaneldeck.hxx>
#include <toolkit/awt/vclxwindow.hxx>
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
index 8ede78c..6a58f99 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
@@ -31,12 +31,10 @@
#include "accessibility/helper/accresmgr.hxx"
#include "accessibility/helper/accessiblestrings.hrc"
-/** === begin UNO includes === **/
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
#include <svtools/toolpanel/toolpaneldeck.hxx>
#include <svtools/toolpanel/paneltabbar.hxx>
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
index fb51f54..87ef61e 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
@@ -28,12 +28,10 @@
#include "accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
#include <svtools/toolpanel/toolpaneldeck.hxx>
#include <svtools/toolpanel/paneltabbar.hxx>
diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx
index 2e6175d..bc863a2 100644
--- a/basctl/source/basicide/doceventnotifier.cxx
+++ b/basctl/source/basicide/doceventnotifier.cxx
@@ -21,9 +21,7 @@
#include "doceventnotifier.hxx"
#include "scriptdocument.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/document/XEventBroadcaster.hpp>
-/** === end UNO includes === **/
#include <vcl/svapp.hxx>
diff --git a/basctl/source/basicide/docsignature.cxx b/basctl/source/basicide/docsignature.cxx
index c1284d3..17adaf3 100644
--- a/basctl/source/basicide/docsignature.cxx
+++ b/basctl/source/basicide/docsignature.cxx
@@ -17,13 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "docsignature.hxx"
#include "scriptdocument.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <sfx2/objsh.hxx>
#include <sfx2/signaturestate.hxx>
diff --git a/basctl/source/basicide/documentenumeration.cxx b/basctl/source/basicide/documentenumeration.cxx
index 8f0b634..87f521c 100644
--- a/basctl/source/basicide/documentenumeration.cxx
+++ b/basctl/source/basicide/documentenumeration.cxx
@@ -20,13 +20,11 @@
#include "documentenumeration.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XDesktop.hpp>
#include <com/sun/star/frame/XModel2.hpp>
#include <com/sun/star/frame/FrameSearchFlag.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/frame/XFramesSupplier.hpp>
-/** === end UNO includes === **/
#include <tools/diagnose_ex.h>
diff --git a/basctl/source/basicide/documentenumeration.hxx b/basctl/source/basicide/documentenumeration.hxx
index 998a579..4ee8646 100644
--- a/basctl/source/basicide/documentenumeration.hxx
+++ b/basctl/source/basicide/documentenumeration.hxx
@@ -20,10 +20,8 @@
#ifndef BASCTL_DOCUMENTENUMERATION_HXX
#define BASCTL_DOCUMENTENUMERATION_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/frame/XController.hpp>
-/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index e1ef569..f0a92f7 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -25,7 +25,6 @@
#include "doceventnotifier.hxx"
#include "documentenumeration.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/uri/XUriReferenceFactory.hpp>
#include <com/sun/star/util/XMacroExpander.hpp>
#include <com/sun/star/document/MacroExecMode.hpp>
@@ -37,7 +36,6 @@
#include <com/sun/star/document/XEmbeddedScripts.hpp>
#include <com/sun/star/script/vba/XVBACompatibility.hpp>
#include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
-/** === end UNO includes === **/
#include <sfx2/objsh.hxx>
#include <sfx2/app.hxx>
diff --git a/basctl/source/inc/doceventnotifier.hxx b/basctl/source/inc/doceventnotifier.hxx
index 071ee0e..145e18d 100644
--- a/basctl/source/inc/doceventnotifier.hxx
+++ b/basctl/source/inc/doceventnotifier.hxx
@@ -20,9 +20,7 @@
#ifndef BASCTL_DOCEVENTNOTIFIER_HXX
#define BASCTL_DOCEVENTNOTIFIER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XModel.hpp>
-/** === end UNO includes === **/
#include <rtl/ref.hxx>
diff --git a/basctl/source/inc/docsignature.hxx b/basctl/source/inc/docsignature.hxx
index 86faed7..4ff3e2a 100644
--- a/basctl/source/inc/docsignature.hxx
+++ b/basctl/source/inc/docsignature.hxx
@@ -19,9 +19,7 @@
#ifndef BASCTL_DOCSIGNATURE_HXX
#define BASCTL_DOCSIGNATURE_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XModel.hpp>
-/** === end UNO includes === **/
#include <memory>
diff --git a/basctl/source/inc/scriptdocument.hxx b/basctl/source/inc/scriptdocument.hxx
index f525586..e941222 100644
--- a/basctl/source/inc/scriptdocument.hxx
+++ b/basctl/source/inc/scriptdocument.hxx
@@ -20,12 +20,10 @@
#ifndef SCRIPTDOCUMENT_HXX
#define SCRIPTDOCUMENT_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/script/XLibraryContainer.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/task/XStatusIndicator.hpp>
#include <com/sun/star/io/XInputStreamProvider.hpp>
-/** === end UNO includes === **/
#include <boost/shared_ptr.hpp>
#include <vector>
diff --git a/basic/inc/basic/basicmanagerrepository.hxx b/basic/inc/basic/basicmanagerrepository.hxx
index bf7d8a8..42adef0 100644
--- a/basic/inc/basic/basicmanagerrepository.hxx
+++ b/basic/inc/basic/basicmanagerrepository.hxx
@@ -29,10 +29,8 @@
#ifndef BASICMANAGERREPOSITORY_HXX
#define BASICMANAGERREPOSITORY_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/embed/XStorage.hpp>
-/** === end UNO includes === **/
#include "basicdllapi.h"
class BasicManager;
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index f3ef0b1..f318dd0 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -33,11 +33,9 @@
#include <basic/sbuno.hxx>
#include "sbintern.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/document/XStorageBasedDocument.hpp>
#include <com/sun/star/document/XEmbeddedScripts.hpp>
-/** === end UNO includes === **/
#include <svtools/ehdl.hxx>
#include <svtools/sfxecode.hxx>
#include <unotools/pathoptions.hxx>
diff --git a/basic/source/uno/sbservices.cxx b/basic/source/uno/sbservices.cxx
index 6b22e18..9f80490 100644
--- a/basic/source/uno/sbservices.cxx
+++ b/basic/source/uno/sbservices.cxx
@@ -28,9 +28,6 @@
#include "sbmodule.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//........................................................................
namespace basic
{
diff --git a/chart2/source/controller/main/ChartModelClone.cxx b/chart2/source/controller/main/ChartModelClone.cxx
index 4d6b3c8..ed9717e 100644
--- a/chart2/source/controller/main/ChartModelClone.cxx
+++ b/chart2/source/controller/main/ChartModelClone.cxx
@@ -23,7 +23,6 @@
#include "ControllerLockGuard.hxx"
#include "DataSourceHelper.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/chart2/XAnyDescriptionAccess.hpp>
#include <com/sun/star/util/XCloneable.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp>
@@ -33,7 +32,6 @@
#include <com/sun/star/util/XModifiable.hpp>
#include <com/sun/star/chart2/data/XDataSource.hpp>
#include <com/sun/star/chart2/data/XLabeledDataSequence.hpp>
-/** === end UNO includes === **/
#include <comphelper/property.hxx>
#include <tools/diagnose_ex.h>
diff --git a/chart2/source/controller/main/ChartModelClone.hxx b/chart2/source/controller/main/ChartModelClone.hxx
index 8513879..a4af3d2 100644
--- a/chart2/source/controller/main/ChartModelClone.hxx
+++ b/chart2/source/controller/main/ChartModelClone.hxx
@@ -20,10 +20,8 @@
#ifndef CHART2_CHARTMODELCLONE_HXX
#define CHART2_CHARTMODELCLONE_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/chart2/XInternalDataProvider.hpp>
-/** === end UNO includes === **/
#include <boost/noncopyable.hpp>
diff --git a/chart2/source/model/main/UndoManager.cxx b/chart2/source/model/main/UndoManager.cxx
index 95095db..65bca73 100644
--- a/chart2/source/model/main/UndoManager.cxx
+++ b/chart2/source/model/main/UndoManager.cxx
@@ -29,9 +29,7 @@
#include "UndoManager.hxx"
#include "ChartViewHelper.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
#include <framework/undomanagerhelper.hxx>
#include <officecfg/Office/Common.hxx>
diff --git a/chart2/source/model/main/UndoManager.hxx b/chart2/source/model/main/UndoManager.hxx
index 55eceda..c261b6c 100644
--- a/chart2/source/model/main/UndoManager.hxx
+++ b/chart2/source/model/main/UndoManager.hxx
@@ -20,11 +20,9 @@
#ifndef CHART2_UNDOMANAGER_HXX
#define CHART2_UNDOMANAGER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/document/XUndoManager.hpp>
#include <com/sun/star/util/XModifyBroadcaster.hpp>
#include <com/sun/star/container/XChild.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase2.hxx>
diff --git a/comphelper/inc/comphelper/anycompare.hxx b/comphelper/inc/comphelper/anycompare.hxx
index 7295332..5ae1d93 100644
--- a/comphelper/inc/comphelper/anycompare.hxx
+++ b/comphelper/inc/comphelper/anycompare.hxx
@@ -22,10 +22,8 @@
#include "comphelper/comphelperdllapi.h"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/i18n/XCollator.hpp>
-/** === end UNO includes === **/
#include <comphelper/extract.hxx>
diff --git a/comphelper/inc/comphelper/componentbase.hxx b/comphelper/inc/comphelper/componentbase.hxx
index 7c82ea3..0b81031 100644
--- a/comphelper/inc/comphelper/componentbase.hxx
+++ b/comphelper/inc/comphelper/componentbase.hxx
@@ -29,10 +29,6 @@
#define COMPHELPER_COMPONENTBASE_HXX
#include "comphelper/comphelperdllapi.h"
-
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <cppuhelper/interfacecontainer.hxx>
//........................................................................
diff --git a/comphelper/inc/comphelper/componentcontext.hxx b/comphelper/inc/comphelper/componentcontext.hxx
index 5b6a901..1ea3d76 100644
--- a/comphelper/inc/comphelper/componentcontext.hxx
+++ b/comphelper/inc/comphelper/componentcontext.hxx
@@ -31,10 +31,8 @@
#include <comphelper/comphelperdllapi.h>
-/** === begin UNO includes === **/
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-/** === end UNO includes === **/
//........................................................................
namespace comphelper
diff --git a/comphelper/inc/comphelper/componentguard.hxx b/comphelper/inc/comphelper/componentguard.hxx
index 9c2c55b..3fc17f9 100644
--- a/comphelper/inc/comphelper/componentguard.hxx
+++ b/comphelper/inc/comphelper/componentguard.hxx
@@ -20,9 +20,7 @@
#ifndef COMPHELPER_COMPONENTGUARD_HXX
#define COMPHELPER_COMPONENTGUARD_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/weak.hxx>
#include <cppuhelper/interfacecontainer.hxx>
diff --git a/comphelper/inc/comphelper/componentmodule.hxx b/comphelper/inc/comphelper/componentmodule.hxx
index 8397e7c..dc106ce 100644
--- a/comphelper/inc/comphelper/componentmodule.hxx
+++ b/comphelper/inc/comphelper/componentmodule.hxx
@@ -30,10 +30,8 @@
#include <comphelper/comphelperdllapi.h>
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/uno/Sequence.hxx>
-/** === end UNO includes === **/
#include <cppuhelper/factory.hxx>
diff --git a/comphelper/inc/comphelper/documentinfo.hxx b/comphelper/inc/comphelper/documentinfo.hxx
index 1d092a2..e97b749 100644
--- a/comphelper/inc/comphelper/documentinfo.hxx
+++ b/comphelper/inc/comphelper/documentinfo.hxx
@@ -22,9 +22,7 @@
#include "comphelper/comphelperdllapi.h"
-/** === begin UNO includes === **/
#include <com/sun/star/frame/XModel.hpp>
-/** === end UNO includes === **/
//........................................................................
namespace comphelper {
diff --git a/comphelper/inc/comphelper/listenernotification.hxx b/comphelper/inc/comphelper/listenernotification.hxx
index 46ae73a..f79f796 100644
--- a/comphelper/inc/comphelper/listenernotification.hxx
+++ b/comphelper/inc/comphelper/listenernotification.hxx
@@ -31,9 +31,7 @@
#include <cppuhelper/interfacecontainer.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XEventListener.hpp>
-/** === end UNO includes === **/
#include "comphelper/comphelperdllapi.h"
#include <memory>
diff --git a/comphelper/inc/comphelper/logging.hxx b/comphelper/inc/comphelper/logging.hxx
index 2b1d03e..c9cb2d4 100644
--- a/comphelper/inc/comphelper/logging.hxx
+++ b/comphelper/inc/comphelper/logging.hxx
@@ -31,11 +31,9 @@
#include <comphelper/comphelperdllapi.h>
-/** === begin UNO includes === **/
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/logging/XLogHandler.hpp>
#include <com/sun/star/logging/LogLevel.hpp>
-/** === end UNO includes === **/
#include <boost/shared_ptr.hpp>
#include <boost/optional.hpp>
diff --git a/comphelper/inc/comphelper/namedvaluecollection.hxx b/comphelper/inc/comphelper/namedvaluecollection.hxx
index bfaa1a0..6a0335e 100644
--- a/comphelper/inc/comphelper/namedvaluecollection.hxx
+++ b/comphelper/inc/comphelper/namedvaluecollection.hxx
@@ -31,12 +31,10 @@
#include <comphelper/comphelperdllapi.h>
-/** === begin UNO includes === **/
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
-/** === end UNO includes === **/
#include <memory>
#include <algorithm>
diff --git a/comphelper/inc/comphelper/officeresourcebundle.hxx b/comphelper/inc/comphelper/officeresourcebundle.hxx
index 4946fee..595596d 100644
--- a/comphelper/inc/comphelper/officeresourcebundle.hxx
+++ b/comphelper/inc/comphelper/officeresourcebundle.hxx
@@ -31,9 +31,7 @@
#include <comphelper/comphelperdllapi.h>
-/** === begin UNO includes === **/
#include <com/sun/star/uno/XComponentContext.hpp>
-/** === end UNO includes === **/
#include <rtl/ustring.hxx>
#include <memory>
diff --git a/comphelper/inc/comphelper/propertybag.hxx b/comphelper/inc/comphelper/propertybag.hxx
index 7491e75..997b9e3 100644
--- a/comphelper/inc/comphelper/propertybag.hxx
+++ b/comphelper/inc/comphelper/propertybag.hxx
@@ -23,9 +23,6 @@
#include "comphelper/comphelperdllapi.h"
#include <comphelper/propertycontainerhelper.hxx>
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
#include <memory>
//........................................................................
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index d55465c..6d8d273 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -33,13 +33,11 @@
#include "comphelper/componentcontext.hxx"
#include "comphelper/extract.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/container/XEnumerableMap.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
#include <com/sun/star/beans/Pair.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/compbase3.hxx>
#include <cppuhelper/implbase1.hxx>
diff --git a/comphelper/source/misc/anycompare.cxx b/comphelper/source/misc/anycompare.cxx
index 5ee5c10..66e8a7b 100644
--- a/comphelper/source/misc/anycompare.cxx
+++ b/comphelper/source/misc/anycompare.cxx
@@ -25,12 +25,8 @@
*
************************************************************************/
-
#include "comphelper/anycompare.hxx"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
//......................................................................................................................
namespace comphelper
{
diff --git a/comphelper/source/misc/componentbase.cxx b/comphelper/source/misc/componentbase.cxx
index 872f1e1..c132562 100644
--- a/comphelper/source/misc/componentbase.cxx
+++ b/comphelper/source/misc/componentbase.cxx
@@ -20,10 +20,8 @@
#include "comphelper/componentbase.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/lang/NotInitializedException.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
//........................................................................
namespace comphelper
diff --git a/comphelper/source/misc/componentcontext.cxx b/comphelper/source/misc/componentcontext.cxx
index a1cc171..a57c637 100644
--- a/comphelper/source/misc/componentcontext.cxx
+++ b/comphelper/source/misc/componentcontext.cxx
@@ -28,11 +28,9 @@
#include <comphelper/componentcontext.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/lang/NullPointerException.hpp>
#include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-/** === end UNO includes === **/
//........................................................................
namespace comphelper
diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx
index 6f4e1fe..a39f4ba 100644
--- a/comphelper/source/misc/componentmodule.cxx
+++ b/comphelper/source/misc/componentmodule.cxx
@@ -28,8 +28,6 @@
#include <comphelper/componentmodule.hxx>
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
#include <comphelper/sequence.hxx>
#include <osl/diagnose.h>
diff --git a/comphelper/source/misc/documentinfo.cxx b/comphelper/source/misc/documentinfo.cxx
index 7a7e69b..eb26e70 100644
--- a/comphelper/source/misc/documentinfo.cxx
+++ b/comphelper/source/misc/documentinfo.cxx
@@ -30,13 +30,11 @@
#include "comphelper/documentinfo.hxx"
#include "comphelper/namedvaluecollection.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/frame/XTitle.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/exc_hlp.hxx>
diff --git a/comphelper/source/misc/listenernotification.cxx b/comphelper/source/misc/listenernotification.cxx
index e3d189a..8947b60 100644
--- a/comphelper/source/misc/listenernotification.cxx
+++ b/comphelper/source/misc/listenernotification.cxx
@@ -19,9 +19,7 @@
#include <comphelper/listenernotification.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/lang/DisposedException.hpp>
-/** === end UNO includes === **/
//........................................................................
namespace comphelper
diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx
index a72d8c8..846b62d 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.cxx
@@ -30,12 +30,10 @@
#include <comphelper/logging.hxx>
#include <comphelper/componentcontext.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/logging/LoggerPool.hpp>
#include <com/sun/star/logging/LogLevel.hpp>
#include <com/sun/star/resource/XResourceBundle.hpp>
#include <com/sun/star/resource/XResourceBundleLoader.hpp>
-/** === end UNO includes === **/
#include <rtl/ustrbuf.hxx>
diff --git a/comphelper/source/misc/officeresourcebundle.cxx b/comphelper/source/misc/officeresourcebundle.cxx
index db51b13..2efa02c 100644
--- a/comphelper/source/misc/officeresourcebundle.cxx
+++ b/comphelper/source/misc/officeresourcebundle.cxx
@@ -28,11 +28,9 @@
#include <comphelper/officeresourcebundle.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/resource/XResourceBundle.hpp>
#include <com/sun/star/resource/XResourceBundleLoader.hpp>
#include <com/sun/star/lang/NullPointerException.hpp>
-/** === end UNO includes === **/
#include <osl/mutex.hxx>
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
diff --git a/comphelper/source/misc/synchronousdispatch.cxx b/comphelper/source/misc/synchronousdispatch.cxx
index f25fb8a..f699ec3 100644
--- a/comphelper/source/misc/synchronousdispatch.cxx
+++ b/comphelper/source/misc/synchronousdispatch.cxx
@@ -27,13 +27,11 @@
************************************************************************/
-/** === begin UNO includes === **/
#include "com/sun/star/frame/XDispatchProvider.hpp"
#include "com/sun/star/frame/XSynchronousDispatch.hpp"
#include "com/sun/star/lang/XComponent.hpp"
#include "com/sun/star/lang/XMultiServiceFactory.hpp"
#include "com/sun/star/util/XURLTransformer.hpp"
-/** === end UNO includes === **/
#include "comphelper/synchronousdispatch.hxx"
#include "comphelper/processfactory.hxx"
diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx
index 0fd4b1c..f5dbf4e 100644
--- a/comphelper/source/property/opropertybag.hxx
+++ b/comphelper/source/property/opropertybag.hxx
@@ -20,7 +20,6 @@
#ifndef COMPHELPER_OPROPERTYBAG_HXX
#define COMPHELPER_OPROPERTYBAG_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -30,7 +29,6 @@
#include <com/sun/star/beans/XPropertyAccess.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/container/XSet.hpp>
-/** === end UNO includes === **/
#include <cppuhelper/implbase6.hxx>
#include <comphelper/propstate.hxx>
diff --git a/comphelper/source/property/propertybag.cxx b/comphelper/source/property/propertybag.cxx
index 4583153..d2752c1 100644
--- a/comphelper/source/property/propertybag.cxx
+++ b/comphelper/source/property/propertybag.cxx
@@ -28,13 +28,11 @@
#include "comphelper/propertybag.hxx"
-/** === begin UNO includes === **/
#include <com/sun/star/beans/IllegalTypeException.hpp>
#include <com/sun/star/beans/PropertyExistException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/NotRemoveableException.hpp>
-/** === end UNO includes === **/
#include <map>
diff --git a/connectivity/inc/connectivity/dbmetadata.hxx b/connectivity/inc/connectivity/dbmetadata.hxx
index 42eb5fc..cc4cd02 100644
--- a/connectivity/inc/connectivity/dbmetadata.hxx
+++ b/connectivity/inc/connectivity/dbmetadata.hxx
@@ -20,9 +20,7 @@
#ifndef CONNECTIVITY_INC_CONNECTIVITY_DBMETADATA_HXX
#define CONNECTIVITY_INC_CONNECTIVITY_DBMETADATA_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/sdbc/XConnection.hpp>
-/** === end UNO includes === **/
#include <memory>
#include "connectivity/dbtoolsdllapi.hxx"
diff --git a/connectivity/inc/connectivity/filtermanager.hxx b/connectivity/inc/connectivity/filtermanager.hxx
index 65516ce..f52d6d6 100644
--- a/connectivity/inc/connectivity/filtermanager.hxx
+++ b/connectivity/inc/connectivity/filtermanager.hxx
@@ -19,12 +19,10 @@
#ifndef CONNECTIVITY_FILTERMANAGER_HXX
#define CONNECTIVITY_FILTERMANAGER_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sdb/XSQLQueryComposer.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
-/** === end UNO includes === **/
#include <rtl/ustrbuf.hxx>
diff --git a/connectivity/inc/connectivity/formattedcolumnvalue.hxx b/connectivity/inc/connectivity/formattedcolumnvalue.hxx
index 7e222fd..a56147a 100644
--- a/connectivity/inc/connectivity/formattedcolumnvalue.hxx
+++ b/connectivity/inc/connectivity/formattedcolumnvalue.hxx
@@ -20,13 +20,11 @@
#ifndef CONNECTIVITY_FORMATTEDCOLUMNVALUE_HXX
#define CONNECTIVITY_FORMATTEDCOLUMNVALUE_HXX
-/** === begin UNO includes === **/
#include <com/sun/star/sdbc/XRowSet.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sdb/XColumn.hpp>
#include <com/sun/star/sdb/XColumnUpdate.hpp>
#include <com/sun/star/util/XNumberFormatter.hpp>
-/** === end UNO includes === **/
#include <boost/noncopyable.hpp>
diff --git a/connectivity/inc/connectivity/parameters.hxx b/connectivity/inc/connectivity/parameters.hxx
index a4c2d97..0e25f99 100644
--- a/connectivity/inc/connectivity/parameters.hxx
+++ b/connectivity/inc/connectivity/parameters.hxx
@@ -22,7 +22,6 @@
#include <map>
#include <vector>
-/** === begin UNO includes === **/
#include <com/sun/star/uno/XAggregation.hpp>
#include <com/sun/star/form/XDatabaseParameterListener.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
@@ -32,7 +31,6 @@
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
-/** === end UNO includes === **/
#include "connectivity/dbtoolsdllapi.hxx"
#include "connectivity/paramwrapper.hxx"
diff --git a/connectivity/inc/connectivity/paramwrapper.hxx b/connectivity/inc/connectivity/paramwrapper.hxx
index f60a01d..e2fbfc3 100644
--- a/connectivity/inc/connectivity/paramwrapper.hxx
+++ b/connectivity/inc/connectivity/paramwrapper.hxx
@@ -23,12 +23,10 @@
#include "connectivity/dbtoolsdllapi.hxx"
#include <connectivity/FValue.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/sdbc/XParameters.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.hpp>
-/** === end UNO includes === **/
#include <comphelper/uno3.hxx>
#include <comphelper/broadcasthelper.hxx>
diff --git a/connectivity/inc/connectivity/sqlerror.hxx b/connectivity/inc/connectivity/sqlerror.hxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list