[Libreoffice-commits] .: 5 commits - avmedia/inc avmedia/source basctl/source basic/source chart2/source connectivity/source connectivity/workben cui/source dbaccess/source desktop/source desktop/unx editeng/inc editeng/source extensions/source extensions/workben filter/inc filter/source forms/source formula/inc formula/source fpicker/source framework/inc framework/source idl/source l10ntools/inc l10ntools/source linguistic/source lotuswordpro/source padmin/source reportdesign/source rsc/inc sc/inc sc/source sdext/source sd/source sfx2/inc sfx2/source starmath/source svl/source svtools/inc svtools/source svtools/workben svx/inc svx/source svx/workben sw/inc sw/source toolkit/source tools/bootstrp tools/inc tools/source unotools/inc unotools/source uui/source vbahelper/source vcl/aqua vcl/generic vcl/inc vcl/ios vcl/source vcl/unx vcl/win writerfilter/source xmloff/inc xmloff/source xmlsecurity/source
Lubos Lunak
llunak at kemper.freedesktop.org
Thu Jan 5 07:18:30 PST 2012
avmedia/inc/avmedia/mediaplayer.hxx | 1 -
avmedia/source/gstreamer/gstcommon.hxx | 1 -
avmedia/source/quicktime/quicktimecommon.hxx | 2 --
avmedia/source/viewer/mediawindow_impl.cxx | 1 -
avmedia/source/win/wincommon.hxx | 2 --
basctl/source/basicide/scriptdocument.cxx | 1 -
basic/source/classes/propacc.cxx | 1 -
basic/source/classes/sb.cxx | 1 -
basic/source/sbx/sbxres.cxx | 2 ++
basic/source/sbx/sbxres.hxx | 2 +-
chart2/source/view/axes/VAxisProperties.cxx | 1 -
chart2/source/view/diagram/VDiagram.cxx | 1 -
chart2/source/view/main/ShapeFactory.cxx | 1 -
connectivity/source/drivers/calc/CDatabaseMetaData.cxx | 1 -
connectivity/source/drivers/calc/CTable.cxx | 1 -
connectivity/source/drivers/dbase/DConnection.cxx | 1 -
connectivity/source/drivers/dbase/DDatabaseMetaData.cxx | 1 -
connectivity/source/drivers/evoab2/NConnection.cxx | 1 -
connectivity/source/drivers/flat/EConnection.cxx | 1 -
connectivity/source/drivers/flat/EDatabaseMetaData.cxx | 1 -
connectivity/source/drivers/flat/ETable.cxx | 1 -
connectivity/workben/testmoz/main.cxx | 1 -
connectivity/workben/testmoz/mozthread.cxx | 1 -
cui/source/dialogs/about.cxx | 1 -
cui/source/dialogs/hangulhanjadlg.cxx | 1 -
cui/source/dialogs/hldocntp.cxx | 1 -
cui/source/factory/cuiresmgr.cxx | 1 -
cui/source/factory/dlgfact.cxx | 1 -
cui/source/inc/about.hxx | 1 -
cui/source/inc/hltpbase.hxx | 1 -
cui/source/options/dbregister.cxx | 1 -
cui/source/options/optinet2.cxx | 1 -
cui/source/options/optpath.cxx | 1 -
dbaccess/source/core/api/viewcontainer.cxx | 1 -
dbaccess/source/core/dataaccess/ModelImpl.hxx | 1 -
dbaccess/source/core/dataaccess/databasedocument.cxx | 1 -
dbaccess/source/core/dataaccess/datasource.hxx | 1 -
dbaccess/source/ext/adabas/AdabasNewDb.cxx | 1 -
dbaccess/source/filter/xml/dbloader2.cxx | 1 -
dbaccess/source/filter/xml/xmlfilter.cxx | 1 -
dbaccess/source/inc/OAuthenticationContinuation.hxx | 2 +-
dbaccess/source/ui/app/AppControllerDnD.cxx | 1 -
dbaccess/source/ui/app/AppControllerGen.cxx | 1 -
dbaccess/source/ui/browser/brwctrlr.cxx | 1 -
dbaccess/source/ui/browser/formadapter.cxx | 1 -
dbaccess/source/ui/browser/genericcontroller.cxx | 1 -
dbaccess/source/ui/browser/sbagrid.cxx | 1 -
dbaccess/source/ui/dlg/ConnectionPage.cxx | 1 -
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 1 -
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 1 -
dbaccess/source/ui/inc/JoinDesignView.hxx | 1 -
dbaccess/source/ui/inc/RelationDesignView.hxx | 1 -
dbaccess/source/ui/inc/TableRow.hxx | 1 -
dbaccess/source/ui/inc/charsets.hxx | 3 +--
dbaccess/source/ui/inc/imageprovider.hxx | 1 +
desktop/source/app/appfirststart.cxx | 1 -
desktop/source/app/appinit.cxx | 2 --
desktop/source/app/langselect.hxx | 1 -
desktop/source/app/userinstall.cxx | 1 -
desktop/source/deployment/gui/dp_gui_dependencydialog.cxx | 2 --
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 1 -
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 1 -
desktop/source/deployment/inc/dp_resource.h | 1 -
desktop/source/deployment/manager/dp_manager.cxx | 1 -
desktop/source/deployment/misc/dp_resource.cxx | 1 +
desktop/source/migration/migration.cxx | 1 -
desktop/source/offacc/acceptor.cxx | 1 -
desktop/source/splash/splash.cxx | 1 -
desktop/unx/splash/unxsplash.cxx | 1 -
editeng/inc/editeng/outliner.hxx | 1 +
editeng/source/editeng/editdbg.hxx | 1 -
editeng/source/items/textitem.cxx | 1 -
editeng/source/misc/unolingu.cxx | 1 -
editeng/source/rtf/svxrtf.cxx | 1 -
extensions/source/bibliography/bibbeam.cxx | 1 -
extensions/source/bibliography/bibcont.cxx | 1 -
extensions/source/bibliography/bibload.cxx | 1 -
extensions/source/bibliography/bibmod.cxx | 1 -
extensions/source/bibliography/datman.cxx | 1 -
extensions/source/bibliography/toolbar.cxx | 1 -
extensions/source/dbpilots/optiongrouplayouter.cxx | 1 -
extensions/source/nsplugin/source/so_instance.cxx | 1 -
extensions/source/plugin/inc/plugin/unx/mediator.hxx | 1 -
extensions/source/propctrlr/browserline.cxx | 1 -
extensions/source/propctrlr/eformshelper.hxx | 2 +-
extensions/source/propctrlr/pcrcommon.hxx | 1 -
extensions/source/propctrlr/proplinelistener.hxx | 2 +-
extensions/source/propctrlr/stringdefine.hxx | 1 -
extensions/source/scanner/sanedlg.hxx | 1 -
extensions/source/xmlextract/xmxcom.hxx | 2 --
extensions/workben/testcomponent.cxx | 1 -
filter/inc/filter/msfilter/mstoolbar.hxx | 1 -
filter/source/graphicfilter/eps/eps.cxx | 1 -
filter/source/graphicfilter/ieps/ieps.cxx | 1 -
filter/source/svg/svgwriter.hxx | 1 -
forms/source/component/ComboBox.hxx | 2 --
forms/source/component/EditBase.hxx | 1 -
forms/source/component/imgprod.hxx | 1 -
forms/source/richtext/richtextunowrapper.cxx | 1 +
forms/source/richtext/richtextvclcontrol.cxx | 3 ---
formula/inc/formula/ExternalReferenceHelper.hxx | 2 +-
formula/source/ui/dlg/formula.cxx | 1 -
fpicker/source/aqua/SalAquaFilePicker.mm | 2 --
fpicker/source/aqua/SalAquaFolderPicker.mm | 3 ---
fpicker/source/aqua/SalAquaPicker.mm | 1 -
fpicker/source/office/fpsmartcontent.cxx | 1 -
fpicker/source/office/iodlgimp.cxx | 1 -
framework/inc/framework/eventsconfiguration.hxx | 1 -
framework/inc/framework/statusbarconfiguration.hxx | 1 -
framework/inc/framework/toolboxconfiguration.hxx | 1 -
framework/inc/jobs/jobdata.hxx | 1 -
framework/inc/uiconfiguration/imagemanager.hxx | 3 ---
framework/inc/uiconfiguration/moduleimagemanager.hxx | 3 ---
framework/source/classes/fwlresid.cxx | 1 -
framework/source/dispatch/menudispatcher.cxx | 1 -
framework/source/fwe/classes/addonsoptions.cxx | 1 -
framework/source/fwe/classes/bmkmenu.cxx | 1 -
framework/source/fwe/classes/fwkresid.cxx | 1 -
framework/source/services/backingcomp.cxx | 2 --
framework/source/services/sessionlistener.cxx | 2 --
framework/source/services/tabwindowservice.cxx | 1 -
framework/source/tabwin/tabwindow.cxx | 1 -
framework/source/tabwin/tabwinfactory.cxx | 1 -
framework/source/uiconfiguration/imagemanager.cxx | 1 -
framework/source/uiconfiguration/imagemanagerimpl.hxx | 3 ---
framework/source/uiconfiguration/moduleimagemanager.cxx | 1 -
framework/source/uiconfiguration/uicategorydescription.cxx | 1 -
framework/source/uielement/buttontoolbarcontroller.cxx | 1 -
framework/source/uielement/comboboxtoolbarcontroller.cxx | 1 -
framework/source/uielement/complextoolbarcontroller.cxx | 1 -
framework/source/uielement/controlmenucontroller.cxx | 1 -
framework/source/uielement/dropdownboxtoolbarcontroller.cxx | 1 -
framework/source/uielement/edittoolbarcontroller.cxx | 1 -
framework/source/uielement/footermenucontroller.cxx | 1 -
framework/source/uielement/headermenucontroller.cxx | 1 -
framework/source/uielement/imagebuttontoolbarcontroller.cxx | 1 -
framework/source/uielement/langselectionmenucontroller.cxx | 1 -
framework/source/uielement/macrosmenucontroller.cxx | 1 -
framework/source/uielement/menubarmanager.cxx | 1 -
framework/source/uielement/newmenucontroller.cxx | 1 -
framework/source/uielement/objectmenucontroller.cxx | 1 -
framework/source/uielement/spinfieldtoolbarcontroller.cxx | 1 -
framework/source/uielement/togglebuttontoolbarcontroller.cxx | 1 -
framework/source/uielement/toolbarsmenucontroller.cxx | 1 -
framework/source/uifactory/addonstoolboxfactory.cxx | 1 -
framework/source/uifactory/menubarfactory.cxx | 1 -
framework/source/uifactory/statusbarfactory.cxx | 1 -
framework/source/uifactory/toolboxfactory.cxx | 1 -
framework/source/uifactory/uielementfactorymanager.cxx | 1 -
framework/source/uifactory/windowcontentfactorymanager.cxx | 1 -
idl/source/cmptools/lex.cxx | 1 -
l10ntools/inc/l10ntools/directory.hxx | 1 -
l10ntools/source/directory.cxx | 2 +-
l10ntools/source/export2.cxx | 1 -
linguistic/source/convdicxml.cxx | 1 -
linguistic/source/convdicxml.hxx | 1 -
linguistic/source/hhconvdic.cxx | 1 -
lotuswordpro/source/filter/lwpheader.hxx | 1 -
padmin/source/adddlg.cxx | 1 +
padmin/source/cmddlg.cxx | 1 +
padmin/source/cmddlg.hxx | 1 -
padmin/source/fontentry.hxx | 2 --
padmin/source/newppdlg.cxx | 1 +
padmin/source/padialog.cxx | 1 +
padmin/source/padialog.hxx | 1 -
reportdesign/source/core/api/FixedText.cxx | 1 +
reportdesign/source/core/api/FormatCondition.cxx | 1 +
reportdesign/source/core/api/FormattedField.cxx | 1 +
reportdesign/source/core/api/ImageControl.cxx | 1 +
reportdesign/source/core/api/ReportEngineJFree.cxx | 1 -
reportdesign/source/core/inc/ReportControlModel.hxx | 1 -
reportdesign/source/filter/xml/dbloader2.cxx | 1 +
reportdesign/source/filter/xml/dbloader2.hxx | 1 -
reportdesign/source/filter/xml/xmlfilter.cxx | 1 -
reportdesign/source/ui/dlg/Formula.cxx | 1 -
reportdesign/source/ui/inc/FunctionHelper.hxx | 1 -
rsc/inc/rscall.h | 1 -
rsc/inc/rscdb.hxx | 1 +
rsc/inc/rsctools.hxx | 3 ++-
sc/inc/dpsave.hxx | 1 -
sc/inc/sortparam.hxx | 1 -
sc/source/core/data/table2.cxx | 1 -
sc/source/core/data/validat.cxx | 1 -
sc/source/core/inc/core_pch.hxx | 2 --
sc/source/core/tool/compiler.cxx | 1 -
sc/source/core/tool/interpr4.cxx | 1 -
sc/source/filter/excel/excdoc.cxx | 1 -
sc/source/filter/excel/excimp8.cxx | 1 -
sc/source/filter/excel/namebuff.cxx | 1 -
sc/source/filter/inc/biff.hxx | 2 --
sc/source/filter/inc/decl.h | 1 -
sc/source/filter/inc/excrecds.hxx | 1 -
sc/source/filter/inc/filt_pch.hxx | 2 --
sc/source/filter/inc/formel.hxx | 1 -
sc/source/filter/inc/qpro.hxx | 1 -
sc/source/filter/inc/qproform.hxx | 1 -
sc/source/filter/inc/qprostyle.hxx | 1 -
sc/source/filter/qpro/qprostyle.cxx | 1 -
sc/source/filter/xml/sheetdata.cxx | 2 +-
sc/source/filter/xml/xmlcelli.hxx | 1 -
sc/source/filter/xml/xmlimprt.cxx | 1 -
sc/source/filter/xml/xmlimprt.hxx | 1 -
sc/source/filter/xml/xmlwrap.cxx | 1 -
sc/source/ui/Accessibility/AccessibleContextBase.cxx | 1 -
sc/source/ui/drawfunc/fuins1.cxx | 1 -
sc/source/ui/inc/formdata.hxx | 1 -
sc/source/ui/inc/ui_pch.hxx | 2 --
sc/source/ui/unoobj/scdetect.hxx | 1 -
sc/source/ui/unoobj/unodoc.cxx | 2 +-
sc/source/ui/vba/vbawindows.cxx | 1 -
sc/source/ui/view/gridwin.cxx | 1 -
sd/source/core/CustomAnimationPreset.cxx | 1 -
sd/source/core/TransitionPreset.cxx | 1 -
sd/source/core/anminfo.cxx | 1 -
sd/source/core/drawdoc4.cxx | 1 -
sd/source/core/sdpage2.cxx | 1 -
sd/source/filter/eppt/eppt.cxx | 1 -
sd/source/filter/eppt/pptx-epptbase.cxx | 1 -
sd/source/filter/html/sdhtmlfilter.cxx | 1 -
sd/source/filter/ppt/propread.cxx | 1 -
sd/source/filter/ppt/propread.hxx | 1 -
sd/source/filter/xml/sdxmlwrp.cxx | 1 -
sd/source/ui/annotations/annotationwindow.hxx | 3 ---
sd/source/ui/app/sddll.cxx | 1 -
sd/source/ui/app/sdxfer.cxx | 1 -
sd/source/ui/dlg/dlgassim.cxx | 1 -
sd/source/ui/dlg/filedlg.cxx | 1 -
sd/source/ui/dlg/morphdlg.cxx | 1 -
sd/source/ui/dlg/sdabstdlg.cxx | 2 +-
sd/source/ui/dlg/sddlgfact.cxx | 1 -
sd/source/ui/dlg/vectdlg.cxx | 1 -
sd/source/ui/func/fuinsfil.cxx | 1 -
sd/source/ui/inc/unokywds.hxx | 1 -
sd/source/ui/slideshow/slideshowimpl.hxx | 1 -
sd/source/ui/slideshow/slideshowviewimpl.hxx | 1 -
sd/source/ui/toolpanel/controls/MasterPageContainer.cxx | 1 -
sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx | 1 -
sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx | 1 -
sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx | 1 -
sd/source/ui/unoidl/sddetect.hxx | 1 -
sd/source/ui/unoidl/unodoc.cxx | 2 +-
sd/source/ui/unoidl/unomodel.cxx | 1 -
sd/source/ui/view/drviewsb.cxx | 1 -
sd/source/ui/view/drviewsf.cxx | 1 -
sdext/source/presenter/PresenterPaneBorderManager.hxx | 1 -
sfx2/inc/frmload.hxx | 1 -
sfx2/inc/inettbc.hxx | 1 -
sfx2/inc/sfx2/sfxresid.hxx | 1 -
sfx2/source/appl/app.cxx | 3 ---
sfx2/source/appl/appbas.cxx | 1 -
sfx2/source/appl/appcfg.cxx | 2 --
sfx2/source/appl/appdata.cxx | 2 --
sfx2/source/appl/appinit.cxx | 3 ---
sfx2/source/appl/appmain.cxx | 2 --
sfx2/source/appl/appmisc.cxx | 1 -
sfx2/source/appl/appserv.cxx | 1 -
sfx2/source/appl/appuno.cxx | 2 --
sfx2/source/appl/helpdispatch.cxx | 1 -
sfx2/source/appl/newhelp.cxx | 1 -
sfx2/source/bastyp/fltfnc.cxx | 1 -
sfx2/source/bastyp/sfxresid.cxx | 2 --
sfx2/source/config/evntconf.cxx | 2 --
sfx2/source/dialog/filtergrouping.cxx | 1 -
sfx2/source/dialog/sfxdlg.cxx | 1 -
sfx2/source/doc/SfxDocumentMetaData.cxx | 2 --
sfx2/source/doc/docfac.cxx | 2 --
sfx2/source/doc/docfile.cxx | 2 --
sfx2/source/doc/doctempl.cxx | 1 -
sfx2/source/doc/objcont.cxx | 1 -
sfx2/source/doc/objstor.cxx | 2 --
sfx2/source/doc/objxtor.cxx | 1 -
sfx2/source/inc/helper.hxx | 1 -
sfx2/source/menu/mnumgr.cxx | 1 -
sfx2/source/menu/virtmenu.cxx | 1 -
starmath/source/math_pch.cxx | 2 --
starmath/source/mathmlexport.cxx | 1 -
starmath/source/mathmlimport.cxx | 1 -
starmath/source/smdetect.hxx | 1 -
starmath/source/unodoc.cxx | 1 -
svl/source/items/cntwall.cxx | 1 -
svl/source/memtools/svarray.cxx | 1 -
svl/source/misc/documentlockfile.cxx | 1 -
svl/source/misc/sharecontrolfile.cxx | 1 -
svl/source/numbers/numuno.cxx | 1 -
svtools/inc/svtools/accessibilityoptions.hxx | 1 -
svtools/source/config/colorcfg.cxx | 1 -
svtools/source/config/miscopt.cxx | 2 --
svtools/source/contnr/contentenumeration.hxx | 1 +
svtools/source/contnr/fileview.cxx | 1 -
svtools/source/contnr/treelist.cxx | 1 -
svtools/source/control/filectrl.cxx | 1 -
svtools/source/dialogs/insdlg.cxx | 1 -
svtools/source/filter/filter2.cxx | 1 -
svtools/source/filter/wmf/wmfwr.cxx | 1 +
svtools/source/filter/wmf/wmfwr.hxx | 1 -
svtools/source/graphic/transformer.cxx | 1 -
svtools/source/hatchwindow/ipwin.hxx | 1 -
svtools/source/misc/transfer2.cxx | 1 -
svtools/source/misc/wallitem.cxx | 3 ---
svtools/source/svhtml/htmlout.cxx | 2 --
svtools/workben/cui/loadlib.cxx | 1 -
svtools/workben/treecontrol/treetest.cxx | 1 -
svx/inc/svx/fmsrccfg.hxx | 1 -
svx/inc/svx/gridctrl.hxx | 1 -
svx/inc/svx/msdffdef.hxx | 1 -
svx/inc/svx/scene3d.hxx | 1 -
svx/inc/svx/sdrhittesthelper.hxx | 1 -
svx/inc/svx/svdogrp.hxx | 1 -
svx/inc/svx/svdsob.hxx | 4 ----
svx/source/accessibility/ShapeTypeHandler.cxx | 1 -
svx/source/dialog/dialmgr.cxx | 1 -
svx/source/fmcomp/dbaexchange.cxx | 1 -
svx/source/form/fmobj.cxx | 1 -
svx/source/form/fmshimp.cxx | 2 --
svx/source/form/fmtools.cxx | 1 -
svx/source/form/fmview.cxx | 1 -
svx/source/inc/AccessibleFrameSelector.hxx | 1 +
svx/source/inc/charmapacc.hxx | 1 -
svx/source/inc/fmvwimp.hxx | 1 -
svx/source/smarttags/SmartTagMgr.cxx | 1 -
svx/source/svdraw/svdedxv.cxx | 1 -
svx/source/svdraw/svdetc.cxx | 2 --
svx/source/svdraw/svdhlpln.cxx | 1 -
svx/source/svdraw/svdmodel.cxx | 2 --
svx/source/svdraw/svdoashp.cxx | 1 -
svx/source/svdraw/svdocirc.cxx | 1 -
svx/source/svdraw/svdogrp.cxx | 1 -
svx/source/tbxctrls/extrusioncontrols.cxx | 1 -
svx/workben/edittest.cxx | 1 -
sw/inc/SidebarWin.hxx | 1 -
sw/inc/SwNumberTree.hxx | 1 -
sw/inc/ccoll.hxx | 1 -
sw/inc/index.hxx | 1 -
sw/inc/shellio.hxx | 1 -
sw/inc/splargs.hxx | 1 -
sw/inc/unocoll.hxx | 1 -
sw/source/core/SwNumberTree/SwNumberTree.cxx | 1 +
sw/source/core/bastyp/calc.cxx | 1 -
sw/source/core/bastyp/index.cxx | 1 +
sw/source/core/doc/docdesc.cxx | 1 -
sw/source/core/edit/editsh.cxx | 1 -
sw/source/core/edit/edtox.cxx | 2 --
sw/source/core/inc/mvsave.hxx | 1 -
sw/source/core/ole/ndole.cxx | 1 -
sw/source/core/sw3io/swacorr.cxx | 1 -
sw/source/core/text/wrong.cxx | 1 -
sw/source/core/unocore/unocrsrhelper.cxx | 1 -
sw/source/core/unocore/unoframe.cxx | 1 -
sw/source/core/unocore/unoobj.cxx | 1 -
sw/source/core/unocore/unoobj2.cxx | 1 -
sw/source/core/unocore/unostyle.cxx | 1 -
sw/source/filter/html/css1kywd.hxx | 2 +-
sw/source/filter/html/htmlatr.cxx | 1 -
sw/source/filter/html/htmlfly.hxx | 1 -
sw/source/filter/html/htmlforw.cxx | 1 -
sw/source/filter/html/swhtml.hxx | 1 -
sw/source/filter/inc/fltini.hxx | 1 -
sw/source/filter/ww8/ww8scan.hxx | 1 -
sw/source/filter/xml/swxml.cxx | 1 -
sw/source/filter/xml/wrtxml.cxx | 1 -
sw/source/filter/xml/xmlfmt.cxx | 1 -
sw/source/filter/xml/xmltexte.cxx | 1 -
sw/source/ui/app/apphdl.cxx | 1 -
sw/source/ui/app/docsh.cxx | 1 -
sw/source/ui/app/mainwn.cxx | 1 -
sw/source/ui/config/optcomp.cxx | 1 -
sw/source/ui/inc/swrenamexnameddlg.hxx | 1 -
sw/source/ui/inc/swuiccoll.hxx | 1 +
sw/source/ui/inc/swuicnttab.hxx | 1 -
sw/source/ui/misc/num.cxx | 1 -
sw/source/ui/misc/swmodalredlineacceptdlg.cxx | 1 -
sw/source/ui/shells/listsh.cxx | 1 -
sw/source/ui/shells/mediash.cxx | 1 -
sw/source/ui/shells/textfld.cxx | 1 -
sw/source/ui/uno/unotxvw.cxx | 1 -
sw/source/ui/wrtsh/wrtsh3.cxx | 1 -
toolkit/source/controls/dialogcontrol.cxx | 1 -
toolkit/source/controls/tabpagemodel.cxx | 1 -
toolkit/source/controls/unocontrol.cxx | 3 ---
toolkit/source/controls/unocontrolmodel.cxx | 2 --
tools/bootstrp/cppdep.hxx | 1 -
tools/inc/tools/multisel.hxx | 2 +-
tools/inc/tools/resary.hxx | 3 ++-
tools/inc/tools/urlobj.hxx | 1 -
tools/source/fsys/unx.hxx | 1 -
tools/source/fsys/wntmsc.cxx | 2 --
tools/source/fsys/wntmsc.hxx | 1 -
tools/source/inet/inetmime.cxx | 1 -
tools/source/rc/resary.cxx | 1 +
tools/source/rc/resmgr.cxx | 1 -
unotools/inc/unotools/useroptions.hxx | 1 -
unotools/source/config/cmdoptions.cxx | 1 -
unotools/source/config/defaultoptions.cxx | 2 --
unotools/source/config/eventcfg.cxx | 1 -
unotools/source/config/extendedsecurityoptions.cxx | 2 --
unotools/source/config/inetoptions.cxx | 2 --
unotools/source/config/pathoptions.cxx | 1 -
unotools/source/misc/syslocale.cxx | 1 -
unotools/source/ucbhelper/xtempfile.cxx | 1 -
uui/source/iahndl-ssl.cxx | 1 -
vbahelper/source/vbahelper/vbahelper.cxx | 1 -
vcl/aqua/source/app/salsys.cxx | 2 --
vcl/generic/fontmanager/fontmanager.cxx | 1 -
vcl/inc/impgraph.hxx | 1 -
vcl/inc/unx/salstd.hxx | 1 -
vcl/inc/unx/sm.hxx | 1 +
vcl/inc/vcl/bitmap.hxx | 2 +-
vcl/inc/vcl/gdimtf.hxx | 1 -
vcl/inc/vcl/pdfwriter.hxx | 1 +
vcl/inc/vcl/prntypes.hxx | 1 -
vcl/inc/vcl/sound.hxx | 2 --
vcl/ios/source/app/salsys.cxx | 2 --
vcl/source/control/field.cxx | 6 ------
vcl/source/gdi/gfxlink.cxx | 1 -
vcl/source/window/winproc.cxx | 1 +
vcl/unx/generic/app/salinst.cxx | 1 -
vcl/unx/generic/gdi/salgdi3.cxx | 1 -
vcl/win/source/app/salinfo.cxx | 1 -
writerfilter/source/dmapper/ConversionHelper.cxx | 2 +-
xmloff/inc/xmloff/shapeimport.hxx | 1 -
xmloff/inc/xmloff/xmlkywd.hxx | 2 --
xmloff/source/chart/SchXMLAxisContext.cxx | 1 +
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 3 ---
xmloff/source/core/xmlerror.cxx | 1 -
xmloff/source/draw/propimp0.cxx | 1 -
xmloff/source/draw/sdxmlimp.cxx | 2 +-
xmloff/source/draw/shapeexport2.cxx | 1 -
xmloff/source/draw/ximp3dscene.hxx | 1 -
xmloff/source/forms/propertyexport.cxx | 1 -
xmloff/source/forms/propertyimport.cxx | 2 --
xmloff/source/meta/MetaImportComponent.cxx | 1 -
xmloff/source/meta/xmlmetae.cxx | 2 --
xmloff/source/meta/xmlversion.cxx | 1 -
xmloff/source/style/TransGradientStyle.cxx | 1 +
xmloff/source/style/xmlnumfi.cxx | 1 +
xmloff/source/style/xmlnumi.cxx | 1 -
xmloff/source/text/txtimppr.cxx | 2 +-
xmloff/source/text/txtparai.cxx | 1 -
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 2 +-
439 files changed, 51 insertions(+), 484 deletions(-)
New commits:
commit 1bae43a3d75d9be75b027dab2eff12695ad4f353
Author: Marcel Metz <mmetz at adrian-broher.net>
Date: Tue Jan 3 15:13:30 2012 +0100
Removed unnecessary tools includes.
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 8a3c8bd..657cc66 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -35,7 +35,6 @@
#include <tools/datetime.hxx>
#include <tools/poly.hxx>
#include <tools/stream.hxx>
-#include <tools/zcodec.hxx>
#include <vcl/graph.hxx>
#include <vcl/bmpacc.hxx>
#include <vcl/gradient.hxx>
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 11754d4..0332493 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -71,7 +71,6 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/security/DocumentSignatureInformation.hpp>
#include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
-#include <tools/zcodec.hxx>
#include <tools/urlobj.hxx>
#include <unotools/tempfile.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 3fbe37d..8355ebd 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -31,7 +31,6 @@
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
#include <svl/intitem.hxx>
-#include <tools/zcodec.hxx>
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/frame/XFrame.hpp>
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index 33e4ede..3fac1ec 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -32,7 +32,6 @@
#include <stdlib.h>
#include "osl/module.hxx"
-#include "tools/solarmutex.hxx"
#include "unx/salunx.h"
#include "unx/saldata.hxx"
commit 53d27eb2077794b3fa785576f011f9c358561d51
Author: Marcel Metz <mmetz at adrian-broher.net>
Date: Tue Jan 3 15:13:13 2012 +0100
Removed unnecessary tools includes.
diff --git a/avmedia/source/gstreamer/gstcommon.hxx b/avmedia/source/gstreamer/gstcommon.hxx
index 1d9b5ca..d7aa082 100644
--- a/avmedia/source/gstreamer/gstcommon.hxx
+++ b/avmedia/source/gstreamer/gstcommon.hxx
@@ -34,7 +34,6 @@
#include <osl/mutex.hxx>
#include <tools/debug.hxx>
#include <tools/stream.hxx>
-#include <tools/string.hxx>
#include <tools/urlobj.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
diff --git a/avmedia/source/quicktime/quicktimecommon.hxx b/avmedia/source/quicktime/quicktimecommon.hxx
index 3ea131d..c2a9c7b 100644
--- a/avmedia/source/quicktime/quicktimecommon.hxx
+++ b/avmedia/source/quicktime/quicktimecommon.hxx
@@ -42,7 +42,6 @@
#endif
#include <tools/debug.hxx>
#include <tools/stream.hxx>
-#include <tools/string.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/weak.hxx>
diff --git a/avmedia/source/win/wincommon.hxx b/avmedia/source/win/wincommon.hxx
index c90339b..66d9164 100644
--- a/avmedia/source/win/wincommon.hxx
+++ b/avmedia/source/win/wincommon.hxx
@@ -33,7 +33,6 @@
#include <rtl/ustring.hxx>
#include <tools/debug.hxx>
#include <tools/stream.hxx>
-#include <tools/string.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/weak.hxx>
diff --git a/basic/source/sbx/sbxres.cxx b/basic/source/sbx/sbxres.cxx
index 84bb602..1648bca 100644
--- a/basic/source/sbx/sbxres.cxx
+++ b/basic/source/sbx/sbxres.cxx
@@ -29,6 +29,8 @@
#include "sbxres.hxx"
+#include <rtl/ustring.hxx>
+
static const char* pSbxRes[] = {
"Empty",
"Null",
diff --git a/basic/source/sbx/sbxres.hxx b/basic/source/sbx/sbxres.hxx
index c50b197..08396f5 100644
--- a/basic/source/sbx/sbxres.hxx
+++ b/basic/source/sbx/sbxres.hxx
@@ -29,7 +29,7 @@
#ifndef _SBXRES_HXX
#define _SBXRES_HXX
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
// Currently there are no resources provided in the SVTOOLS-Project.
// Because it is non-critical resources (BASIC-Keywords),
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index 804e2f9..874b2f2 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -79,7 +79,6 @@
#include <cppuhelper/weakref.hxx>
#include <sfx2/docmacromode.hxx>
#include <sfx2/docstoragemodifylistener.hxx>
-#include <tools/string.hxx>
#include <unotools/sharedunocomponent.hxx>
#include <osl/mutex.hxx>
#include <rtl/ref.hxx>
diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx
index 88cb631..0ded171 100644
--- a/dbaccess/source/core/dataaccess/datasource.hxx
+++ b/dbaccess/source/core/dataaccess/datasource.hxx
@@ -47,7 +47,6 @@
#include "apitools.hxx"
#include "bookmarkcontainer.hxx"
#include <rtl/ref.hxx>
-#include <tools/string.hxx>
#include <connectivity/CommonTools.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/dbaccess/source/inc/OAuthenticationContinuation.hxx b/dbaccess/source/inc/OAuthenticationContinuation.hxx
index 743772c..2a72fb8 100644
--- a/dbaccess/source/inc/OAuthenticationContinuation.hxx
+++ b/dbaccess/source/inc/OAuthenticationContinuation.hxx
@@ -35,7 +35,7 @@
#include <com/sun/star/ucb/RememberAuthentication.hpp>
#include <com/sun/star/uno/Sequence.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <comphelper/interaction.hxx>
diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx
index 874a4e7..3fa5d94 100644
--- a/dbaccess/source/ui/browser/formadapter.cxx
+++ b/dbaccess/source/ui/browser/formadapter.cxx
@@ -33,7 +33,6 @@
#include <comphelper/types.hxx>
#include <comphelper/enumhelper.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <tools/string.hxx>
#include "dbu_brw.hrc"
#include "dbustrings.hrc"
#include <cppuhelper/typeprovider.hxx>
diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx
index ce67cc1..b321ab9 100644
--- a/dbaccess/source/ui/inc/JoinDesignView.hxx
+++ b/dbaccess/source/ui/inc/JoinDesignView.hxx
@@ -33,7 +33,6 @@
#ifndef _VECTOR_
#include <vector>
#endif
-#include <tools/string.hxx>
#include "QEnumTypes.hxx"
#include <memory>
diff --git a/dbaccess/source/ui/inc/RelationDesignView.hxx b/dbaccess/source/ui/inc/RelationDesignView.hxx
index 423885b..901fb2c 100644
--- a/dbaccess/source/ui/inc/RelationDesignView.hxx
+++ b/dbaccess/source/ui/inc/RelationDesignView.hxx
@@ -33,7 +33,6 @@
#ifndef _VECTOR_
#include <vector>
#endif
-#include <tools/string.hxx>
#include "QEnumTypes.hxx"
#include "RelationTableView.hxx"
diff --git a/dbaccess/source/ui/inc/TableRow.hxx b/dbaccess/source/ui/inc/TableRow.hxx
index 9e02a0d..3d336bb 100644
--- a/dbaccess/source/ui/inc/TableRow.hxx
+++ b/dbaccess/source/ui/inc/TableRow.hxx
@@ -29,7 +29,6 @@
#define DBAUI_TABLEROW_HXX
#include <comphelper/stl_types.hxx>
-#include <tools/string.hxx>
#include <tools/stream.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include "TypeInfo.hxx"
diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx
index 89fa3d4..9798255 100644
--- a/dbaccess/source/ui/inc/charsets.hxx
+++ b/dbaccess/source/ui/inc/charsets.hxx
@@ -29,8 +29,8 @@
#ifndef _DBAUI_CHARSETS_HXX_
#define _DBAUI_CHARSETS_HXX_
-#include <tools/string.hxx>
#include <connectivity/dbcharset.hxx>
+#include <rtl/ustring.hxx>
#include <svx/txenctab.hxx>
//.........................................................................
diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx
index fdb229a..2fd8074 100644
--- a/desktop/source/app/langselect.hxx
+++ b/desktop/source/app/langselect.hxx
@@ -28,7 +28,6 @@
#include <list>
#include <sal/types.h>
-#include <tools/string.hxx>
#include <rtl/ustring.hxx>
#include <tools/resid.hxx>
#include <com/sun/star/lang/Locale.hpp>
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
index 314660a..cc3e168 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
@@ -36,7 +36,6 @@
#include "tools/gen.hxx"
#include "tools/resid.hxx"
#include "tools/solar.h"
-#include "tools/string.hxx"
#include "vcl/dialog.hxx"
#include "dp_gui.hrc"
diff --git a/editeng/source/editeng/editdbg.hxx b/editeng/source/editeng/editdbg.hxx
index c7f6e98..f208981 100644
--- a/editeng/source/editeng/editdbg.hxx
+++ b/editeng/source/editeng/editdbg.hxx
@@ -30,7 +30,6 @@
#define _EDITDBG_HXX
#include <svl/solar.hrc>
-#include <tools/string.hxx>
#include <stdio.h>
class EditEngine;
diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx
index 03da1a8..1d1a1fc 100644
--- a/extensions/source/dbpilots/optiongrouplayouter.cxx
+++ b/extensions/source/dbpilots/optiongrouplayouter.cxx
@@ -28,7 +28,6 @@
#include "optiongrouplayouter.hxx"
#include <tools/debug.hxx>
-#include <tools/string.hxx>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/awt/Point.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
index 6a0dd05..6e249e0 100644
--- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
@@ -30,7 +30,6 @@
#include <string.h>
#include <stdarg.h>
-#include <tools/string.hxx>
#include <tools/link.hxx>
#include <osl/pipe.hxx>
#include <osl/mutex.hxx>
diff --git a/extensions/source/propctrlr/eformshelper.hxx b/extensions/source/propctrlr/eformshelper.hxx
index ba6c3ca..3d2d8d8 100644
--- a/extensions/source/propctrlr/eformshelper.hxx
+++ b/extensions/source/propctrlr/eformshelper.hxx
@@ -40,7 +40,7 @@
#include <com/sun/star/form/binding/XListEntrySource.hpp>
/** === end UNO includes === **/
#include <osl/mutex.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <comphelper/listenernotification.hxx>
#include <vector>
diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx
index 528c88d..3a96026 100644
--- a/extensions/source/propctrlr/pcrcommon.hxx
+++ b/extensions/source/propctrlr/pcrcommon.hxx
@@ -38,7 +38,6 @@
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
/** === end UNO includes === **/
-#include <tools/string.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/listenernotification.hxx>
diff --git a/extensions/source/propctrlr/proplinelistener.hxx b/extensions/source/propctrlr/proplinelistener.hxx
index 79eeaee..4d72352 100644
--- a/extensions/source/propctrlr/proplinelistener.hxx
+++ b/extensions/source/propctrlr/proplinelistener.hxx
@@ -29,7 +29,7 @@
#ifndef _EXTENSIONS_PROPCTRLR_PROPLINELISTENER_HXX_
#define _EXTENSIONS_PROPCTRLR_PROPLINELISTENER_HXX_
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
//........................................................................
namespace pcr
diff --git a/extensions/source/propctrlr/stringdefine.hxx b/extensions/source/propctrlr/stringdefine.hxx
index e5a27ca..2394c98 100644
--- a/extensions/source/propctrlr/stringdefine.hxx
+++ b/extensions/source/propctrlr/stringdefine.hxx
@@ -30,7 +30,6 @@
#define _EXTENSIONS_FORMSCTRLR_STRINGDEFINE_HXX_
#include <rtl/ustring.hxx>
-#include <tools/string.hxx>
//............................................................................
namespace pcr
diff --git a/extensions/source/xmlextract/xmxcom.hxx b/extensions/source/xmlextract/xmxcom.hxx
index 515a0e2..2afc4eb 100644
--- a/extensions/source/xmlextract/xmxcom.hxx
+++ b/extensions/source/xmlextract/xmxcom.hxx
@@ -33,7 +33,6 @@
#include <rtl/ustring.hxx>
#include <tools/debug.hxx>
#include <tools/stream.hxx>
-#include <tools/string.hxx>
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/uno/Reference.h>
diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx
index 4212c2e..a8e08e1 100644
--- a/extensions/workben/testcomponent.cxx
+++ b/extensions/workben/testcomponent.cxx
@@ -43,7 +43,6 @@
#include <usr/services.hxx>
#include <vcl/svapp.hxx>
#include <usr/ustring.hxx>
-#include <tools/string.hxx>
#include <osl/conditn.hxx>
#include <smart/com/sun/star/test/XSimpleTest.hxx>
diff --git a/filter/inc/filter/msfilter/mstoolbar.hxx b/filter/inc/filter/msfilter/mstoolbar.hxx
index 6cb7ef4..ccbefb2 100644
--- a/filter/inc/filter/msfilter/mstoolbar.hxx
+++ b/filter/inc/filter/msfilter/mstoolbar.hxx
@@ -31,7 +31,6 @@
#ifndef _MSTOOLBAR_HXX
#define _MSTOOLBAR_HXX
#include "filter/msfilter/msfilterdllapi.h"
-#include <tools/string.hxx>
#include <sot/storage.hxx>
#include <ostream>
#include <memory>
diff --git a/forms/source/component/imgprod.hxx b/forms/source/component/imgprod.hxx
index 53d673c..00cf032 100644
--- a/forms/source/component/imgprod.hxx
+++ b/forms/source/component/imgprod.hxx
@@ -32,7 +32,6 @@
#include <boost/ptr_container/ptr_vector.hpp>
#include <tools/link.hxx>
-#include <tools/string.hxx>
#include <com/sun/star/awt/ImageStatus.hpp>
#include <com/sun/star/awt/XImageConsumer.hpp>
#include <com/sun/star/awt/XImageProducer.hpp>
diff --git a/formula/inc/formula/ExternalReferenceHelper.hxx b/formula/inc/formula/ExternalReferenceHelper.hxx
index f0f946a..68d2860 100644
--- a/formula/inc/formula/ExternalReferenceHelper.hxx
+++ b/formula/inc/formula/ExternalReferenceHelper.hxx
@@ -29,7 +29,7 @@
#ifndef FORMULA_EXTERNALREFERENCEHELPER_HXX
#define FORMULA_EXTERNALREFERENCEHELPER_HXX
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include "formula/formuladllapi.h"
namespace formula
diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx
index 49692ac..0e4c9fe 100644
--- a/fpicker/source/office/fpsmartcontent.cxx
+++ b/fpicker/source/office/fpsmartcontent.cxx
@@ -39,7 +39,6 @@
#include <ucbhelper/commandenvironment.hxx>
#include <tools/solar.h>
#include <tools/debug.hxx>
-#include <tools/string.hxx>
//........................................................................
namespace svt
diff --git a/framework/inc/framework/eventsconfiguration.hxx b/framework/inc/framework/eventsconfiguration.hxx
index 3a67873..f02beed 100644
--- a/framework/inc/framework/eventsconfiguration.hxx
+++ b/framework/inc/framework/eventsconfiguration.hxx
@@ -31,7 +31,6 @@
#include <framework/fwedllapi.h>
#include <svl/svarray.hxx>
-#include <tools/string.hxx>
#include <tools/stream.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/framework/inc/framework/statusbarconfiguration.hxx b/framework/inc/framework/statusbarconfiguration.hxx
index 710f092..b357998 100644
--- a/framework/inc/framework/statusbarconfiguration.hxx
+++ b/framework/inc/framework/statusbarconfiguration.hxx
@@ -30,7 +30,6 @@
#include <framework/fwedllapi.h>
#include <svl/svarray.hxx>
-#include <tools/string.hxx>
#include <tools/stream.hxx>
#include <vcl/status.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/framework/inc/framework/toolboxconfiguration.hxx b/framework/inc/framework/toolboxconfiguration.hxx
index 63abfcd..8252840 100644
--- a/framework/inc/framework/toolboxconfiguration.hxx
+++ b/framework/inc/framework/toolboxconfiguration.hxx
@@ -31,7 +31,6 @@
#include <framework/fwedllapi.h>
#include <svl/svarray.hxx>
#include <vcl/bitmap.hxx>
-#include <tools/string.hxx>
#include <com/sun/star/io/XInputStream.hpp>
#ifndef _COM_SUN_STAR_IO_XOUPUTSTREAM_HPP_
#include <com/sun/star/io/XOutputStream.hpp>
diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx
index b61bfd0..5aa46a7 100644
--- a/framework/source/classes/fwlresid.cxx
+++ b/framework/source/classes/fwlresid.cxx
@@ -28,7 +28,6 @@
#include "classes/fwlresid.hxx"
-#include <tools/string.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
diff --git a/framework/source/fwe/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx
index 0c0a9d4..4e58056 100644
--- a/framework/source/fwe/classes/fwkresid.cxx
+++ b/framework/source/fwe/classes/fwkresid.cxx
@@ -28,7 +28,6 @@
#include "classes/fwkresid.hxx"
-#include <tools/string.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index 83c006b..c955565 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -54,7 +54,6 @@
#include <rtl/ustrbuf.hxx>
#include <cppuhelper/implbase2.hxx>
#include <unotools/configmgr.hxx>
-#include <tools/string.hxx>
#include <vcl/mnemonic.hxx>
#include <comphelper/sequence.hxx>
diff --git a/l10ntools/inc/l10ntools/directory.hxx b/l10ntools/inc/l10ntools/directory.hxx
index 34e4a3a..ba2590f 100644
--- a/l10ntools/inc/l10ntools/directory.hxx
+++ b/l10ntools/inc/l10ntools/directory.hxx
@@ -2,7 +2,6 @@
#include <vector>
#include <algorithm>
#include <rtl/ustring.hxx>
-#include <tools/string.hxx>
#ifdef WNT
#else
diff --git a/l10ntools/source/directory.cxx b/l10ntools/source/directory.cxx
index 2bf56d4..82984fa 100644
--- a/l10ntools/source/directory.cxx
+++ b/l10ntools/source/directory.cxx
@@ -33,7 +33,7 @@
#endif
#include <l10ntools/directory.hxx>
-#include "tools/string.hxx"
+#include <rtl/ustring.hxx>
#include <iostream>
#include <vector>
#include <algorithm>
diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx
index 6e9026e..3d52b0f 100644
--- a/linguistic/source/convdicxml.hxx
+++ b/linguistic/source/convdicxml.hxx
@@ -39,7 +39,6 @@
#include <xmloff/xmlimp.hxx>
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/interfacecontainer.h>
-#include <tools/string.hxx>
#include <rtl/ustring.hxx>
#include "linguistic/misc.hxx"
#include "defs.hxx"
diff --git a/lotuswordpro/source/filter/lwpheader.hxx b/lotuswordpro/source/filter/lwpheader.hxx
index 36c1770..37e13c3 100644
--- a/lotuswordpro/source/filter/lwpheader.hxx
+++ b/lotuswordpro/source/filter/lwpheader.hxx
@@ -78,7 +78,6 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
-#include <tools/string.hxx>
#include <memory.h>
diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx
index e59be1a..c7902aa 100644
--- a/reportdesign/source/ui/inc/FunctionHelper.hxx
+++ b/reportdesign/source/ui/inc/FunctionHelper.hxx
@@ -35,7 +35,6 @@
#include <com/sun/star/report/meta/XFunctionDescription.hpp>
#include <vector>
#include <boost/shared_ptr.hpp>
-#include <tools/string.hxx>
#include <comphelper/stl_types.hxx>
diff --git a/rsc/inc/rscall.h b/rsc/inc/rscall.h
index 6d33911..8bbe047 100644
--- a/rsc/inc/rscall.h
+++ b/rsc/inc/rscall.h
@@ -28,7 +28,6 @@
#ifndef _RSCALL_H
#define _RSCALL_H
-#include <tools/string.hxx>
#include <rsctools.hxx>
#include <rscerror.h>
#include <rscdef.hxx>
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 2a5f606..c7a4950 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -37,6 +37,7 @@
#include <rscstr.hxx>
#include <rscarray.hxx>
#include <rscdef.hxx>
+#include <tools/string.hxx>
#include <vector>
#include <map>
diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx
index c326b1c..ba266de 100644
--- a/rsc/inc/rsctools.hxx
+++ b/rsc/inc/rsctools.hxx
@@ -35,8 +35,9 @@ class RscPtrPtr;
#include <stdlib.h>
#endif
#include <stdio.h>
-#include <tools/string.hxx>
#include <vector>
+#include <tools/solar.h>
+#include <rtl/ustring.hxx>
/******************* T y p e s *******************************************/
// Zeichensatz
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index 5e3c7c9..fc16b49 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -39,7 +39,6 @@
#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
#include <rtl/ustring.hxx>
#include <sal/types.h>
-#include <tools/string.hxx>
#include "scdllapi.h"
diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx
index 2a27064..f1d4e21 100644
--- a/sc/inc/sortparam.hxx
+++ b/sc/inc/sortparam.hxx
@@ -30,7 +30,6 @@
#define SC_SORTPARAM_HXX
#include "address.hxx"
-#include <tools/string.hxx>
#include <tools/solar.h>
#include <com/sun/star/lang/Locale.hpp>
#include "scdllapi.h"
diff --git a/sc/source/core/inc/core_pch.hxx b/sc/source/core/inc/core_pch.hxx
index 3b0dd3e..8bb1f0f 100644
--- a/sc/source/core/inc/core_pch.hxx
+++ b/sc/source/core/inc/core_pch.hxx
@@ -37,7 +37,6 @@
#include <tools/solar.h>
#include <string.h>
-#include <tools/string.hxx>
#include <tools/rtti.hxx>
#include <limits.h>
#include <tools/ref.hxx>
diff --git a/sc/source/filter/inc/biff.hxx b/sc/source/filter/inc/biff.hxx
index a6de6bd..0a02fa0 100644
--- a/sc/source/filter/inc/biff.hxx
+++ b/sc/source/filter/inc/biff.hxx
@@ -34,7 +34,6 @@
#include "filter.hxx"
#include "document.hxx"
#include "cell.hxx"
-#include <tools/string.hxx>
#include "flttypes.hxx"
#include "ftools.hxx"
diff --git a/sc/source/filter/inc/decl.h b/sc/source/filter/inc/decl.h
index 91157cf..54a1d0e 100644
--- a/sc/source/filter/inc/decl.h
+++ b/sc/source/filter/inc/decl.h
@@ -31,7 +31,6 @@
#define SC_DECL_H
#include <tools/solar.h>
-#include <tools/string.hxx>
enum WKTYP { eWK_UNKNOWN = -2, eWK_1 = 0, eWK_2, eWK3, eWK4, eWK_Error, eWK123 };
typedef void ( BEARBFKT )( void );
diff --git a/sc/source/filter/inc/filt_pch.hxx b/sc/source/filter/inc/filt_pch.hxx
index 2672dc7..ac73821 100644
--- a/sc/source/filter/inc/filt_pch.hxx
+++ b/sc/source/filter/inc/filt_pch.hxx
@@ -36,7 +36,6 @@
#define SC_PROGRESS_CXX
#include <tools/solar.h>
-#include <tools/string.hxx>
#include <rtl/textenc.h>
#include <sal/types.h>
#include <sal/config.h>
diff --git a/sc/source/filter/inc/formel.hxx b/sc/source/filter/inc/formel.hxx
index d5b9ac9..9208859 100644
--- a/sc/source/filter/inc/formel.hxx
+++ b/sc/source/filter/inc/formel.hxx
@@ -30,7 +30,6 @@
#define SC_FORMEL_HXX
#include <tools/solar.h>
-#include <tools/string.hxx>
#include <compiler.hxx>
#include <global.hxx>
diff --git a/sc/source/filter/inc/qproform.hxx b/sc/source/filter/inc/qproform.hxx
index 6e06827..bc222fa 100644
--- a/sc/source/filter/inc/qproform.hxx
+++ b/sc/source/filter/inc/qproform.hxx
@@ -32,7 +32,6 @@
#include <sal/config.h>
#include "formel.hxx"
-#include <tools/string.hxx>
#include "qpro.hxx"
#include <compiler.hxx>
diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx
index f21676f..747b8db 100644
--- a/sc/source/filter/xml/sheetdata.cxx
+++ b/sc/source/filter/xml/sheetdata.cxx
@@ -29,10 +29,10 @@
// INCLUDE ---------------------------------------------------------------
+#include <rtl/ustring.hxx>
#include <xmloff/families.hxx>
#include <xmloff/xmlaustp.hxx>
#include <xmloff/nmspmap.hxx>
-#include <tools/string.hxx>
#include "sheetdata.hxx"
diff --git a/sc/source/ui/inc/formdata.hxx b/sc/source/ui/inc/formdata.hxx
index 3958093..c220a96 100644
--- a/sc/source/ui/inc/formdata.hxx
+++ b/sc/source/ui/inc/formdata.hxx
@@ -29,7 +29,6 @@
#ifndef SC_FORMDATA_HXX
#define SC_FORMDATA_HXX
-#include <tools/string.hxx>
#include <tools/gen.hxx>
#include <formula/formdata.hxx>
class ScInputHandler;
diff --git a/sc/source/ui/inc/ui_pch.hxx b/sc/source/ui/inc/ui_pch.hxx
index 9be80b5..318071d 100644
--- a/sc/source/ui/inc/ui_pch.hxx
+++ b/sc/source/ui/inc/ui_pch.hxx
@@ -36,7 +36,6 @@
#define _INPUTHDL_CXX
#include <tools/solar.h>
-#include <tools/string.hxx>
#include <svl/solar.hrc>
#include <tools/rtti.hxx>
#include <string.h>
diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx
index 0079fdb..85f214c 100644
--- a/sc/source/ui/unoobj/scdetect.hxx
+++ b/sc/source/ui/unoobj/scdetect.hxx
@@ -39,7 +39,6 @@
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <cppuhelper/factory.hxx>
#include <tools/link.hxx>
-#include <tools/string.hxx>
class SfxObjectFactory;
class SfxFilterMatcher;
diff --git a/sc/source/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxx
index 5c59e59..616d03f 100644
--- a/sc/source/ui/unoobj/unodoc.cxx
+++ b/sc/source/ui/unoobj/unodoc.cxx
@@ -29,7 +29,7 @@
// System - Includes -----------------------------------------------------
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <sfx2/docfac.hxx>
#include <sfx2/sfxmodelfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx
index a0110fa..c5f68ff 100644
--- a/sd/source/ui/dlg/sdabstdlg.cxx
+++ b/sd/source/ui/dlg/sdabstdlg.cxx
@@ -30,7 +30,7 @@
#include "sdabstdlg.hxx"
#include <osl/module.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <vcl/unohelp.hxx>
typedef SdAbstractDialogFactory* (__LOADONCALLAPI *SdFuncPtrCreateDialogFactory)();
diff --git a/sd/source/ui/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx
index 56f3f93..89c77b2 100644
--- a/sd/source/ui/inc/unokywds.hxx
+++ b/sd/source/ui/inc/unokywds.hxx
@@ -29,7 +29,6 @@
#ifndef _SD_UNOKYWDS_HXX_
#define _SD_UNOKYWDS_HXX_
-#include <tools/string.hxx>
#include <tools/solar.h>
#ifndef SD_DEFINE_KEYWORDS
diff --git a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx
index 592cfd0..5e5367a 100644
--- a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx
+++ b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx
@@ -34,7 +34,6 @@
#include <tools/link.hxx>
#include <vcl/image.hxx>
#include <vector>
-#include <tools/string.hxx>
#include "DrawDocShell.hxx"
#include "MasterPageContainer.hxx"
diff --git a/sd/source/ui/unoidl/sddetect.hxx b/sd/source/ui/unoidl/sddetect.hxx
index 814cb49..1236436 100644
--- a/sd/source/ui/unoidl/sddetect.hxx
+++ b/sd/source/ui/unoidl/sddetect.hxx
@@ -40,7 +40,6 @@
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <cppuhelper/factory.hxx>
#include <tools/link.hxx>
-#include <tools/string.hxx>
class SfxObjectFactory;
class SfxFilterMatcher;
diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx
index 885d975..09ef57e 100644
--- a/sd/source/ui/unoidl/unodoc.cxx
+++ b/sd/source/ui/unoidl/unodoc.cxx
@@ -29,7 +29,7 @@
// System - Includes -----------------------------------------------------
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <sfx2/docfac.hxx>
#include <sfx2/sfxmodelfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/sfx2/inc/frmload.hxx b/sfx2/inc/frmload.hxx
index a35ce9d..3a7df31 100644
--- a/sfx2/inc/frmload.hxx
+++ b/sfx2/inc/frmload.hxx
@@ -53,7 +53,6 @@
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/factory.hxx>
#include <tools/link.hxx>
-#include <tools/string.hxx>
#include <comphelper/componentcontext.hxx>
#include <comphelper/namedvaluecollection.hxx>
diff --git a/sfx2/inc/sfx2/sfxresid.hxx b/sfx2/inc/sfx2/sfxresid.hxx
index 32e929e..42a5593 100644
--- a/sfx2/inc/sfx2/sfxresid.hxx
+++ b/sfx2/inc/sfx2/sfxresid.hxx
@@ -28,7 +28,6 @@
#ifndef _SFX_SFXRESID_HXX
#define _SFX_SFXRESID_HXX
-#include <tools/string.hxx>
#include "sfx2/dllapi.h"
#include <tools/resid.hxx>
diff --git a/sfx2/source/dialog/sfxdlg.cxx b/sfx2/source/dialog/sfxdlg.cxx
index 32ab862..37d952f 100644
--- a/sfx2/source/dialog/sfxdlg.cxx
+++ b/sfx2/source/dialog/sfxdlg.cxx
@@ -31,7 +31,6 @@
//#include "cuilib.hxx"
#include <osl/module.hxx>
-#include <tools/string.hxx>
SfxAbstractDialogFactory* SfxAbstractDialogFactory::Create()
{
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 8f029ee..05f98b4 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -67,7 +67,6 @@
#include "SfxDocumentMetaData.hxx"
#include "rtl/ustrbuf.hxx"
#include "tools/debug.hxx"
-#include "tools/string.hxx" // for DBG
#include "tools/datetime.hxx"
#include "osl/mutex.hxx"
#include "cppuhelper/basemutex.hxx"
diff --git a/starmath/source/smdetect.hxx b/starmath/source/smdetect.hxx
index ae5fc38..3513bb6 100644
--- a/starmath/source/smdetect.hxx
+++ b/starmath/source/smdetect.hxx
@@ -40,7 +40,6 @@
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <cppuhelper/factory.hxx>
#include <tools/link.hxx>
-#include <tools/string.hxx>
class SfxObjectFactory;
class SfxFilterMatcher;
diff --git a/starmath/source/unodoc.cxx b/starmath/source/unodoc.cxx
index 2e992dc..81d736f 100644
--- a/starmath/source/unodoc.cxx
+++ b/starmath/source/unodoc.cxx
@@ -29,7 +29,6 @@
// System - Includes -----------------------------------------------------
-#include <tools/string.hxx>
#include <sfx2/docfac.hxx>
#include <sfx2/sfxmodelfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx
index 245596e..76660e0 100644
--- a/svl/source/items/cntwall.cxx
+++ b/svl/source/items/cntwall.cxx
@@ -28,7 +28,6 @@
#include <tools/debug.hxx>
-#include <tools/string.hxx>
#include <tools/stream.hxx>
#include <tools/vcompat.hxx>
diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx
index 3302321..5d92043 100644
--- a/svl/source/memtools/svarray.cxx
+++ b/svl/source/memtools/svarray.cxx
@@ -47,7 +47,6 @@
#define _SVSTDARR_XUB_STRLEN
#include <svl/svstdarr.hxx>
-#include <tools/string.hxx>
#include <tools/debug.hxx>
SV_IMPL_VARARR(SvPtrarr,VoidPtr)
diff --git a/svtools/inc/svtools/accessibilityoptions.hxx b/svtools/inc/svtools/accessibilityoptions.hxx
index 1c21994..7038bac 100644
--- a/svtools/inc/svtools/accessibilityoptions.hxx
+++ b/svtools/inc/svtools/accessibilityoptions.hxx
@@ -30,7 +30,6 @@
#include "svtools/svtdllapi.h"
#include <unotools/configitem.hxx>
-#include <tools/string.hxx>
#include <svl/brdcst.hxx>
#include <svl/lstner.hxx>
#include <unotools/options.hxx>
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index f4a081f..51a0d1e 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -28,7 +28,6 @@
#include <svtools/treelist.hxx>
-
DBG_NAME(SvListEntry);
SvListEntry::SvListEntry()
diff --git a/svtools/source/misc/wallitem.cxx b/svtools/source/misc/wallitem.cxx
index 294b002..2f0edaf 100644
--- a/svtools/source/misc/wallitem.cxx
+++ b/svtools/source/misc/wallitem.cxx
@@ -36,7 +36,6 @@
#include <tools/stream.hxx>
#include <tools/debug.hxx>
-#include <tools/string.hxx>
#include <tools/stream.hxx>
#include <vcl/graph.hxx>
diff --git a/svtools/workben/cui/loadlib.cxx b/svtools/workben/cui/loadlib.cxx
index f3d4f8d..6b4c116 100644
--- a/svtools/workben/cui/loadlib.cxx
+++ b/svtools/workben/cui/loadlib.cxx
@@ -31,7 +31,6 @@
#include <string.h>
#include <stdlib.h>
-#include <tools/string.hxx>
#include <osl/module.h>
#include <rtl/ustring.hxx>
diff --git a/svx/inc/svx/fmsrccfg.hxx b/svx/inc/svx/fmsrccfg.hxx
index 08a5dfd..e178e83 100644
--- a/svx/inc/svx/fmsrccfg.hxx
+++ b/svx/inc/svx/fmsrccfg.hxx
@@ -29,7 +29,6 @@
#ifndef _FMSRCCF_HXX_
#define _FMSRCCF_HXX_
-#include <tools/string.hxx>
#include <unotools/configvaluecontainer.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include "svx/svxdllapi.h"
diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx
index 1d86986..42acdbb 100644
--- a/svx/inc/svx/msdffdef.hxx
+++ b/svx/inc/svx/msdffdef.hxx
@@ -32,7 +32,6 @@
#include <tools/solar.h>
#include <tools/stream.hxx>
-#include <tools/string.hxx>
#include <tools/gen.hxx>
#include "svx/svxdllapi.h"
diff --git a/svx/inc/svx/sdrhittesthelper.hxx b/svx/inc/svx/sdrhittesthelper.hxx
index 88e08a4..acb8717 100644
--- a/svx/inc/svx/sdrhittesthelper.hxx
+++ b/svx/inc/svx/sdrhittesthelper.hxx
@@ -30,7 +30,6 @@
#define _SDRHITTESTHELPER_HXX
#include "svx/svxdllapi.h"
-#include <tools/string.hxx>
#include <tools/gen.hxx>
/////////////////////////////////////////////////////////////////////
diff --git a/svx/inc/svx/svdsob.hxx b/svx/inc/svx/svdsob.hxx
index c995516..5764abe 100644
--- a/svx/inc/svx/svdsob.hxx
+++ b/svx/inc/svx/svdsob.hxx
@@ -32,10 +32,6 @@
#include <com/sun/star/uno/Any.hxx>
#include <tools/stream.hxx>
-#ifndef _STRING_H
-#include <tools/string.hxx> //wg. memset
-#define _STRING_H
-#endif
#include "svx/svxdllapi.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index 291c7aa..da66296 100644
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -200,7 +200,6 @@ bool ShapeTypeHandler::AddShapeTypeList (int nDescriptorCount,
-#include <tools/string.hxx>
long ShapeTypeHandler::GetSlotId (const OUString& aServiceName) const
{
tServiceNameToSlotId::iterator I (maServiceNameToSlotId.find (aServiceName));
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 610de4d..c68cfef 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -91,7 +91,6 @@
#include <svl/stritem.hxx>
#include <toolkit/unohlp.hxx>
#include <tools/debug.hxx>
-#include <tools/string.hxx>
#include <vcl/stdtext.hxx>
#include <vcl/svapp.hxx>
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 81332aa..f76c69d 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -47,7 +47,6 @@
#include <comphelper/stl_types.hxx>
#include <tools/link.hxx>
-#include <tools/string.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/implbase3.hxx>
#include <comphelper/uno3.hxx>
diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index 97445a4..7eeff0e 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -51,7 +51,6 @@
#include <com/sun/star/util/XChangesNotifier.hpp>
#include <comphelper/processfactory.hxx>
#include <rtl/ustring.hxx>
-#include <tools/string.hxx>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx
index 1508acc..00256ab 100644
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.hxx
@@ -31,7 +31,6 @@
#include <set>
#include <vector>
-#include <tools/string.hxx>
#include <swdllapi.h>
#include <SwNumberTreeTypes.hxx>
diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index a671e04..329fcb4 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.hxx
@@ -33,7 +33,6 @@
#include "rtl/instance.hxx"
#include <tools/solar.h>
#include <tools/rtti.hxx> // for RTTI of SwIndexReg
-#include <tools/string.hxx> // for xub_StrLen
#include <swdllapi.h>
// Maximum index in IndexArray (for testing on overflows).
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index 839f357..ee86352 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -32,7 +32,6 @@
#include <tools/solar.h>
#include <tools/gen.hxx>
#include <limits.h> // USHRT_MAX
-#include <tools/string.hxx>
class SwTxtNode;
class SwIndex;
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index 0449bab..07596e0 100644
--- a/sw/inc/unocoll.hxx
+++ b/sw/inc/unocoll.hxx
@@ -34,7 +34,6 @@
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
-#include <tools/string.hxx>
#include <cppuhelper/implbase1.hxx> // helper for implementations
#include <cppuhelper/implbase2.hxx> // helper for implementations
#include <cppuhelper/implbase3.hxx> // helper for implementations
diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx
index 2f20150..bc34218 100644
--- a/sw/source/core/SwNumberTree/SwNumberTree.cxx
+++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx
@@ -30,6 +30,7 @@
#include <algorithm>
#include <functional>
#include <SwNumberTree.hxx>
+#include <osl/diagnose.h>
using std::vector;
using std::find;
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index 70b5712..88ee1d3 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -30,6 +30,7 @@
#include <assert.h>
#include <stdlib.h> // fuer qsort
#include <tools/solar.h>
+#include <tools/string.hxx>
#include "index.hxx"
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index 37ebc5b..0fdac74 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -28,7 +28,6 @@
#ifndef SW_MVSAVE_HXX
#define SW_MVSAVE_HXX
-#include <tools/string.hxx>
#include <vcl/keycod.hxx>
#include <svl/svarray.hxx>
#include <IDocumentMarkAccess.hxx>
diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx
index 4ef3428..6764f05 100644
--- a/sw/source/core/text/wrong.cxx
+++ b/sw/source/core/text/wrong.cxx
@@ -28,7 +28,6 @@
-#include <tools/string.hxx>
#include "swtypes.hxx"
#include "txttypes.hxx"
diff --git a/sw/source/filter/html/css1kywd.hxx b/sw/source/filter/html/css1kywd.hxx
index 2c4d0dc..9628289 100644
--- a/sw/source/filter/html/css1kywd.hxx
+++ b/sw/source/filter/html/css1kywd.hxx
@@ -29,7 +29,7 @@
#ifndef _CSS1KYWD_HXX
#define _CSS1KYWD_HXX
-#include <tools/string.hxx>
+#include <sal/types.h>
#ifndef CSS1_CONSTASCII_DECL
#define CSS1_CONSTASCII_DECL( n, s ) n[sizeof(s)]
diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx
index e18cfcc..ff86a53 100644
--- a/sw/source/filter/html/htmlfly.hxx
+++ b/sw/source/filter/html/htmlfly.hxx
@@ -30,7 +30,6 @@
#define _HTMLFLY_HXX
#include <tools/solar.h>
-#include <tools/string.hxx>
#include <svl/svarray.hxx>
diff --git a/sw/source/ui/app/mainwn.cxx b/sw/source/ui/app/mainwn.cxx
index c4c0124..ba73043 100644
--- a/sw/source/ui/app/mainwn.cxx
+++ b/sw/source/ui/app/mainwn.cxx
@@ -31,7 +31,6 @@
#include <mdiexp.hxx>
#include <tools/shl.hxx>
-#include <tools/string.hxx>
#include <svl/svstdarr.hxx>
#include <sfx2/progress.hxx>
#include <tools/resid.hxx>
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index e5bb98f..98e6392 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -39,7 +39,6 @@
#include <rtl/memory.h>
#include <rtl/uuid.h>
#include <osl/mutex.hxx>
-#include <tools/string.hxx>
#include <tools/table.hxx>
#include <tools/date.hxx>
#include <tools/debug.hxx>
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index 2993b6a..9c731d2 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -43,7 +43,6 @@
#include <rtl/memory.h>
#include <rtl/uuid.h>
#include <tools/diagnose_ex.h>
-#include <tools/string.hxx>
#include <tools/table.hxx>
#include <tools/date.hxx>
#include <tools/time.hxx>
diff --git a/tools/bootstrp/cppdep.hxx b/tools/bootstrp/cppdep.hxx
index 3ed2942..62900c7 100644
--- a/tools/bootstrp/cppdep.hxx
+++ b/tools/bootstrp/cppdep.hxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-#include <tools/string.hxx>
#include <vector>
#define PATH_SEP ":"
#define DIR_SEP "/"
diff --git a/tools/inc/tools/multisel.hxx b/tools/inc/tools/multisel.hxx
index 47f56f2..20f1c63 100644
--- a/tools/inc/tools/multisel.hxx
+++ b/tools/inc/tools/multisel.hxx
@@ -30,7 +30,7 @@
#include "tools/toolsdllapi.h"
#include <tools/gen.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <vector>
#include <set>
diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx
index e8ac79a..b49d026 100644
--- a/tools/inc/tools/urlobj.hxx
+++ b/tools/inc/tools/urlobj.hxx
@@ -29,7 +29,6 @@
#define _URLOBJ_HXX
#include "tools/toolsdllapi.h"
-#include <tools/string.hxx>
#include "com/sun/star/uno/Reference.hxx"
#include "rtl/string.h"
#include "rtl/ustrbuf.hxx"
diff --git a/tools/source/fsys/wntmsc.hxx b/tools/source/fsys/wntmsc.hxx
index 5137d99..b7b3391 100644
--- a/tools/source/fsys/wntmsc.hxx
+++ b/tools/source/fsys/wntmsc.hxx
@@ -41,7 +41,6 @@
#include <windows.h>
#include <tools/solar.h>
-#include <tools/string.hxx>
#include <rtl/strbuf.hxx>
//--------------------------------------------------------------------
diff --git a/unotools/inc/unotools/useroptions.hxx b/unotools/inc/unotools/useroptions.hxx
index 2467fd2..c511342 100644
--- a/unotools/inc/unotools/useroptions.hxx
+++ b/unotools/inc/unotools/useroptions.hxx
@@ -30,7 +30,6 @@
#include "unotools/unotoolsdllapi.h"
#include <unotools/configitem.hxx>
-#include <tools/string.hxx>
#include <osl/mutex.hxx>
#include <unotools/options.hxx>
diff --git a/unotools/source/misc/syslocale.cxx b/unotools/source/misc/syslocale.cxx
index 50d5664..79aaa39 100644
--- a/unotools/source/misc/syslocale.cxx
+++ b/unotools/source/misc/syslocale.cxx
@@ -28,7 +28,6 @@
#include <unotools/syslocale.hxx>
-#include <tools/string.hxx>
#include <unotools/syslocaleoptions.hxx>
#include <unotools/localedatawrapper.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/vcl/inc/unx/salstd.hxx b/vcl/inc/unx/salstd.hxx
index 07056a9..e21115c 100644
--- a/vcl/inc/unx/salstd.hxx
+++ b/vcl/inc/unx/salstd.hxx
@@ -31,7 +31,6 @@
// -=-= includes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
#include <tools/ref.hxx>
-#include <tools/string.hxx>
#include <tools/gen.hxx>
#include <vcl/sv.h>
diff --git a/vcl/inc/unx/sm.hxx b/vcl/inc/unx/sm.hxx
index d940bcf..0dfc463 100644
--- a/vcl/inc/unx/sm.hxx
+++ b/vcl/inc/unx/sm.hxx
@@ -29,6 +29,7 @@
#define _VCL_SM_HXX
#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
#include "tools/link.hxx"
#include "unx/salunx.h"
#include <X11/SM/SMlib.h>
diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx
index aaf0012..6c682bd 100644
--- a/vcl/inc/vcl/gdimtf.hxx
+++ b/vcl/inc/vcl/gdimtf.hxx
@@ -32,7 +32,6 @@
#include <vcl/dllapi.h>
#include <tools/gen.hxx>
#include <tools/link.hxx>
-#include <tools/string.hxx>
#include <vcl/mapmod.hxx>
#include <vector>
diff --git a/vcl/inc/vcl/prntypes.hxx b/vcl/inc/vcl/prntypes.hxx
index 13d87a9..f1c05b5 100644
--- a/vcl/inc/vcl/prntypes.hxx
+++ b/vcl/inc/vcl/prntypes.hxx
@@ -29,7 +29,6 @@
#ifndef _SV_PRNTYPES_HXX
#define _SV_PRNTYPES_HXX
-#include <tools/string.hxx>
#include <vcl/sv.h>
#include <i18npool/paper.hxx>
diff --git a/vcl/inc/vcl/sound.hxx b/vcl/inc/vcl/sound.hxx
index a4c2a3d..344d1a7 100644
--- a/vcl/inc/vcl/sound.hxx
+++ b/vcl/inc/vcl/sound.hxx
@@ -31,7 +31,6 @@
#include <vcl/dllapi.h>
#include <vcl/sndstyle.hxx>
-#include <tools/string.hxx>
#include <tools/link.hxx>
class Window;
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index fbd9239..a7e532b 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -45,7 +45,6 @@
#include "osl/file.hxx"
#include "osl/module.hxx"
-#include "tools/string.hxx"
#include "tools/debug.hxx"
#include "tools/stream.hxx"
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index 9f13b03..d6410b8 100644
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.cxx
@@ -31,7 +31,6 @@
#include "rtl/ustrbuf.hxx"
#include "tools/debug.hxx"
-#include "tools/string.hxx"
#include "vcl/window.hxx"
diff --git a/xmloff/inc/xmloff/xmlkywd.hxx b/xmloff/inc/xmloff/xmlkywd.hxx
index 53623cb..cd901c0 100644
--- a/xmloff/inc/xmloff/xmlkywd.hxx
+++ b/xmloff/inc/xmloff/xmlkywd.hxx
@@ -29,8 +29,6 @@
#ifndef _XMLOFF_XMLKYWD_HXX
#define _XMLOFF_XMLKYWD_HXX
-#include <tools/string.hxx>
-
/*
* THIS FILE IS DEPRECATED. IT IS SUPERSEDED BY XMLTOKEN.HXX.
*
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 09690cd..4c6969d 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -35,9 +35,6 @@
#include "SchXMLSeries2Context.hxx"
#include "SchXMLTools.hxx"
#include <tools/debug.hxx>
-#ifdef DBG_UTIL
-#include <tools/string.hxx>
-#endif
#include <comphelper/processfactory.hxx>
#include "xmloff/xmlnmspe.hxx"
diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx
index b43716f..10c437b 100644
--- a/xmloff/source/core/xmlerror.cxx
+++ b/xmloff/source/core/xmlerror.cxx
@@ -37,7 +37,6 @@
#include <rtl/ustrbuf.hxx>
-#include <tools/string.hxx>
diff --git a/xmloff/source/draw/propimp0.cxx b/xmloff/source/draw/propimp0.cxx
index 958072f..92e327a 100644
--- a/xmloff/source/draw/propimp0.cxx
+++ b/xmloff/source/draw/propimp0.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-#include <tools/string.hxx>
#include <rtl/ustrbuf.hxx>
#include "propimp0.hxx"
#include <com/sun/star/drawing/LineDash.hpp>
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 8c643aa..ad6362f 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -27,7 +27,7 @@
************************************************************************/
-#include <tools/string.hxx>
+#include <osl/thread.h>
#include <xmloff/xmlscripti.hxx>
#include "sdxmlimp_impl.hxx"
diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx
index 1ff5151..5c5afb9 100644
--- a/xmloff/source/meta/MetaImportComponent.cxx
+++ b/xmloff/source/meta/MetaImportComponent.cxx
@@ -33,7 +33,6 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlmetai.hxx>
#include <xmloff/nmspmap.hxx>
-#include <tools/string.hxx>
using namespace ::com::sun::star;
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index c21d4cc..f36bd05 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -41,7 +41,6 @@
#include <com/sun/star/xml/sax/InputSource.hpp>
#include <com/sun/star/xml/sax/XParser.hpp>
-#include <tools/string.hxx>
class SvStringsDtor;
using namespace ::com::sun::star::xml::sax;
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index 5c63fcb..84b7a6b 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -27,12 +27,12 @@
************************************************************************/
#include <tools/debug.hxx>
+#include <osl/thread.h>
#include <com/sun/star/awt/FontFamily.hpp>
#include <com/sun/star/awt/FontPitch.hpp>
#include <com/sun/star/table/BorderLine2.hpp>
#include <com/sun/star/text/VertOrientation.hpp>
#include <com/sun/star/text/SizeType.hpp>
-#include <tools/string.hxx>
#include <xmloff/XMLFontStylesContext.hxx>
#include <xmloff/txtprmap.hxx>
#include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 66d8f00..fc95999 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -31,7 +31,6 @@
#include <rtl/ustrbuf.hxx>
#include <tools/debug.hxx>
-#include <tools/string.hxx>
#include <svl/svarray.hxx>
#include <com/sun/star/text/XTextFrame.hpp>
#include <com/sun/star/text/XTextCursor.hpp>
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index f9e7e15..aa53a60 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -52,7 +52,6 @@
#include <xmlsec/base64.h>
#include <xmlsec/strings.h>
-#include <tools/string.hxx>
#include <rtl/ustrbuf.hxx>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/servicefactory.hxx>
@@ -62,6 +61,7 @@
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <vector>
#include "boost/scoped_array.hpp"
+#include <osl/thread.h>
#include "secerror.hxx"
commit a1cfce768f83842defd8068a8eba5ed3eaeea255
Author: Marcel Metz <mmetz at adrian-broher.net>
Date: Tue Jan 3 15:12:33 2012 +0100
Removed unnecessary tools includes.
diff --git a/cui/source/factory/cuiresmgr.cxx b/cui/source/factory/cuiresmgr.cxx
index 8e3bc31..20d41b3 100644
--- a/cui/source/factory/cuiresmgr.cxx
+++ b/cui/source/factory/cuiresmgr.cxx
@@ -29,7 +29,6 @@
// include ---------------------------------------------------------------
#include <dialmgr.hxx>
-#include <tools/rc.hxx>
#include <svl/solar.hrc>
#include <vcl/svapp.hxx>
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index dc7c368..55b2b72 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -29,7 +29,6 @@
#include "align.hxx" //add for SvxAlignmentTabPage
#include "dlgfact.hxx"
-#include <tools/rc.hxx>
#include <sfx2/basedlgs.hxx>
#include <sfx2/app.hxx>
#include <sfx2/request.hxx>
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index 4e09e0e..e7e5227 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -30,7 +30,6 @@
// include ---------------------------------------------------------------
-#include <tools/resary.hxx>
#include <vcl/button.hxx>
#include <vcl/accel.hxx>
#include <svtools/svmedit.hxx>
diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx
index 83badfb..4f004e1 100644
--- a/dbaccess/source/core/api/viewcontainer.cxx
+++ b/dbaccess/source/core/api/viewcontainer.cxx
@@ -34,7 +34,6 @@
#include "View.hxx"
#include <tools/debug.hxx>
-#include <tools/wldcrd.hxx>
#include <comphelper/enumhelper.hxx>
#include <comphelper/types.hxx>
#include <connectivity/dbtools.hxx>
diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx
index f5f5169..89fa3d4 100644
--- a/dbaccess/source/ui/inc/charsets.hxx
+++ b/dbaccess/source/ui/inc/charsets.hxx
@@ -30,7 +30,6 @@
#define _DBAUI_CHARSETS_HXX_
#include <tools/string.hxx>
-#include <tools/rc.hxx>
#include <connectivity/dbcharset.hxx>
#include <svx/txenctab.hxx>
diff --git a/dbaccess/source/ui/inc/imageprovider.hxx b/dbaccess/source/ui/inc/imageprovider.hxx
index e3b5489..85ac3a5 100644
--- a/dbaccess/source/ui/inc/imageprovider.hxx
+++ b/dbaccess/source/ui/inc/imageprovider.hxx
@@ -36,6 +36,7 @@
#include <com/sun/star/sdb/application/DatabaseObject.hpp>
/** === end UNO includes === **/
+#include <tools/string.hxx>
#include <boost/shared_ptr.hpp>
//........................................................................
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index 4815558..f91eb1f 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -41,7 +41,6 @@
#include <osl/security.hxx>
#include <rtl/ref.hxx>
-#include <tools/resmgr.hxx>
#include <unotools/bootstrap.hxx>
#include <svl/languageoptions.hxx>
#include <unotools/syslocaleoptions.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
index 604a696..314660a 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
@@ -35,7 +35,6 @@
#include "rtl/ustring.hxx"
#include "tools/gen.hxx"
#include "tools/resid.hxx"
-#include "tools/resmgr.hxx"
#include "tools/solar.h"
#include "tools/string.hxx"
#include "vcl/dialog.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 0445ed7..a5d9ab3 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -96,7 +96,6 @@
#include "tools/gen.hxx"
#include "tools/link.hxx"
#include "tools/resid.hxx"
-#include "tools/resmgr.hxx"
#include "tools/solar.h"
#include "tools/string.hxx"
#include "unotools/configmgr.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 35dc8f3..76c250e 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -34,7 +34,6 @@
#include "osl/conditn.hxx"
#include "cppuhelper/exc_hlp.hxx"
#include "tools/resid.hxx"
-#include "tools/resmgr.hxx"
#include "tools/solar.h"
#include "tools/string.hxx"
#include "vcl/dialog.hxx"
diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h
index d7c16bb..d39aa24 100644
--- a/desktop/source/deployment/inc/dp_resource.h
+++ b/desktop/source/deployment/inc/dp_resource.h
@@ -29,7 +29,6 @@
#if ! defined INCLUDED_DP_RESOURCE_H
#define INCLUDED_DP_RESOURCE_H
-#include "tools/resmgr.hxx"
#include "tools/string.hxx"
#include "tools/resid.hxx"
#include "com/sun/star/lang/Locale.hpp"
diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx
index 04609e7..4999e78 100644
--- a/desktop/source/deployment/misc/dp_resource.cxx
+++ b/desktop/source/deployment/misc/dp_resource.cxx
@@ -31,6 +31,7 @@
#include "dp_resource.h"
#include "osl/module.hxx"
#include "osl/mutex.hxx"
+#include <tools/resmgr.hxx>
#include "rtl/ustring.h"
#include "cppuhelper/implbase1.hxx"
#include "unotools/configmgr.hxx"
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index dbcc958..416dade 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -41,6 +41,7 @@
#include <tools/link.hxx>
#include <rsc/rscsfx.hxx>
#include "editeng/editengdllapi.h"
+#include <com/sun/star/lang/Locale.hpp>
#include <svtools/grfmgr.hxx>
diff --git a/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx
index 67d65cc..5b07844 100644
--- a/forms/source/richtext/richtextunowrapper.cxx
+++ b/forms/source/richtext/richtextunowrapper.cxx
@@ -29,6 +29,7 @@
#include "richtextunowrapper.hxx"
/** === begin UNO includes === **/
+#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
/** === end UNO includes === **/
#include <editeng/unofored.hxx>
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index 2d80b30..02408a9 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -46,7 +46,6 @@
#include "resourceprovider.hxx"
-#include <tools/rc.hxx>
#include <osl/file.hxx>
#include "CFStringUtilities.hxx"
#include "NSString_OOoAdditions.hxx"
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm
index 838f9e3..0ee6bc6 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.mm
+++ b/fpicker/source/aqua/SalAquaFolderPicker.mm
@@ -49,8 +49,6 @@
#include "resourceprovider.hxx"
-#include <tools/rc.hxx>
-
#include <osl/file.hxx>
#include "CFStringUtilities.hxx"
#include "NSString_OOoAdditions.hxx"
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 046a4a4..5e02c2d 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -32,7 +32,6 @@
#include "iodlgimp.hxx"
#include "svtools/headbar.hxx"
#include <tools/debug.hxx>
-#include <tools/wldcrd.hxx>
#include <tools/urlobj.hxx>
#include <vcl/menu.hxx>
#include <vcl/msgbox.hxx>
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index df6f90c..969d68f 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -55,7 +55,6 @@
#include <vcl/syswin.hxx>
#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
-#include <tools/resmgr.hxx>
#include <tools/rcid.h>
#include <osl/mutex.hxx>
#include <toolkit/helper/vclunohelper.hxx>
diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index 19d62d2..619bfdb 100644
--- a/framework/source/services/backingcomp.cxx
+++ b/framework/source/services/backingcomp.cxx
@@ -62,7 +62,6 @@
#include <vcl/keycod.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/svapp.hxx>
-#include <tools/resmgr.hxx>
#include <rtl/ustrbuf.hxx>
#include <svl/solar.hrc>
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index a0fef93..67dc2de 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -36,7 +36,6 @@
#include <svl/zforlist.hxx>
#include <sal/macros.h>
#include <tools/rcid.h>
-#include <tools/rc.hxx>
#include <tools/solar.h>
#include <unotools/charclass.hxx>
#include <com/sun/star/lang/Locale.hpp>
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index 5cae0f3..7133599 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -32,7 +32,6 @@
#endif
#include <sfx2/objsh.hxx>
-#include <tools/rc.hxx>
#include "sddlgfact.hxx"
#include "strings.hrc"
#include "BreakDlg.hxx"
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 47b12fa..ca9060a 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -53,7 +53,6 @@
#include <unotools/configmgr.hxx>
#include <tools/urlobj.hxx>
-#include <tools/wldcrd.hxx>
#include <unotools/saveopt.hxx>
#include <svtools/helpopt.hxx>
#include <unotools/undoopt.hxx>
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 8af046c..15fb235 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -27,7 +27,6 @@
************************************************************************/
#include <tools/config.hxx>
-#include <svl/inetstrm.hxx>
#include <svl/stritem.hxx>
#include <osl/mutex.hxx>
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 8f48fd3..48dbcdf 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -37,7 +37,6 @@
#include <svtools/svtools.hrc>
#include <unotools/saveopt.hxx>
#include <unotools/localisationoptions.hxx>
-#include <tools/resary.hxx>
#include <svl/intitem.hxx>
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 7680ff2..b9ae282 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -42,7 +42,6 @@
#include <svl/itempool.hxx>
#include <svl/rectitem.hxx>
#include <tools/debug.hxx>
-#include <tools/wldcrd.hxx>
#include <tools/urlobj.hxx>
#include <tools/config.hxx>
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 575ea4b..b839bd8 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -30,7 +30,6 @@
#include <boost/scoped_ptr.hpp>
#include <vcl/msgbox.hxx>
-#include <tools/resary.hxx>
#include <svl/lstner.hxx>
#include <basic/basmgr.hxx>
#include <basic/sbmod.hxx>
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index faaca46..863017c 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -41,7 +41,6 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <comphelper/string.hxx>
-#include <tools/wldcrd.hxx>
#include <tools/diagnose_ex.h>
#include <list>
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index d990d25..a62d1fe 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -32,7 +32,6 @@
#include <osl/mutex.hxx>
#include <osl/thread.hxx>
-#include <tools/resary.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <unotools/localedatawrapper.hxx>
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index d666204..47105d7 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -41,7 +41,6 @@
#include <com/sun/star/frame/XTitle.hpp>
#include <osl/mutex.hxx>
-#include <tools/resary.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/svapp.hxx>
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index c1d418b..a2f26ff 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -33,7 +33,6 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <tools/link.hxx>
-#include <tools/wldcrd.hxx>
#include <rtl/logfile.hxx>
#include <rtl/instance.hxx>
diff --git a/svtools/source/contnr/contentenumeration.hxx b/svtools/source/contnr/contentenumeration.hxx
index c8e42ba..4cb8f9c 100644
--- a/svtools/source/contnr/contentenumeration.hxx
+++ b/svtools/source/contnr/contentenumeration.hxx
@@ -38,6 +38,7 @@
#include <ucbhelper/content.hxx>
#include <rtl/ustring.hxx>
#include <tools/datetime.hxx>
+#include <tools/string.hxx>
#include <vcl/image.hxx>
class IUrlFilter;
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index 347fdd1..351236e 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -35,7 +35,6 @@
#include <svtools/sores.hxx>
#include <svtools/svtdata.hxx>
-#include <tools/rc.hxx>
#include <unotools/configmgr.hxx>
#include <sot/clsids.hxx>
#include <sot/stg.hxx>
diff --git a/svtools/source/graphic/transformer.cxx b/svtools/source/graphic/transformer.cxx
index 8b3f136..9bc4753 100644
--- a/svtools/source/graphic/transformer.cxx
+++ b/svtools/source/graphic/transformer.cxx
@@ -33,7 +33,6 @@
#include <vcl/metaact.hxx>
#include <tools/rcid.h>
#include <tools/resid.hxx>
-#include <tools/resmgr.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <svl/solar.hrc>
#include <vcl/salbtype.hxx>
diff --git a/svx/source/dialog/dialmgr.cxx b/svx/source/dialog/dialmgr.cxx
index eb4bffa..fb6014d 100644
--- a/svx/source/dialog/dialmgr.cxx
+++ b/svx/source/dialog/dialmgr.cxx
@@ -34,7 +34,6 @@
// include ---------------------------------------------------------------
#include <svx/dialmgr.hxx>
-#include <tools/rc.hxx>
#include <svl/solar.hrc>
#include <vcl/svapp.hxx>
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index c185be6..1610bb1 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -53,7 +53,6 @@
#include <comphelper/processfactory.hxx>
#include <toolkit/awt/vclxdevice.hxx>
#include <vcl/svapp.hxx>
-#include <tools/resmgr.hxx>
#include <tools/diagnose_ex.h>
using namespace ::com::sun::star::io;
diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx
index 09aeeff..052dbef 100644
--- a/svx/source/inc/AccessibleFrameSelector.hxx
+++ b/svx/source/inc/AccessibleFrameSelector.hxx
@@ -37,6 +37,7 @@
#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
#include <tools/resary.hxx>
+#include <tools/rc.hxx>
#include <cppuhelper/implbase5.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <comphelper/accessibleeventnotifier.hxx>
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index 35ea265..24b140d 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -38,7 +38,6 @@
#include <svtools/svtabbx.hxx>
#include <vcl/lstbox.hxx>
-#include <tools/resary.hxx>
#include "swdllapi.h"
#include "cmdid.h"
diff --git a/sw/source/ui/inc/swrenamexnameddlg.hxx b/sw/source/ui/inc/swrenamexnameddlg.hxx
index de02fa8..1f21305 100644
--- a/sw/source/ui/inc/swrenamexnameddlg.hxx
+++ b/sw/source/ui/inc/swrenamexnameddlg.hxx
@@ -39,7 +39,6 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/awt/XControl.hpp>
#include <com/sun/star/container/XNamed.hpp>
-#include <tools/resary.hxx>
#include <swunodef.hxx>
class SwRenameXNamedDlg : public ModalDialog
diff --git a/sw/source/ui/inc/swuiccoll.hxx b/sw/source/ui/inc/swuiccoll.hxx
index b665a06..96e11da 100644
--- a/sw/source/ui/inc/swuiccoll.hxx
+++ b/sw/source/ui/inc/swuiccoll.hxx
@@ -28,6 +28,7 @@
#ifndef _SWUI_CCOLL_HXX
#define _SWUI_CCOLL_HXX
+#include <tools/resary.hxx>
#include "ccoll.hxx"
class SwWrtShell;
diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx
index 727cdae..7a4557b 100644
--- a/sw/source/ui/inc/swuicnttab.hxx
+++ b/sw/source/ui/inc/swuicnttab.hxx
@@ -43,7 +43,6 @@
#include "tox.hxx"
#include <toxmgr.hxx>
#include <svx/checklbx.hxx>
-#include <tools/resary.hxx>
#include <svtools/svtreebx.hxx>
#include <vcl/menubtn.hxx>
#include <svx/langbox.hxx>
diff --git a/tools/inc/tools/resary.hxx b/tools/inc/tools/resary.hxx
index 6f3af58..429c05d 100644
--- a/tools/inc/tools/resary.hxx
+++ b/tools/inc/tools/resary.hxx
@@ -28,9 +28,10 @@
#ifndef _TOOLS_RESARY_HXX
#define _TOOLS_RESARY_HXX
+#include <vector>
#include "tools/toolsdllapi.h"
+#include <tools/string.hxx>
#include <tools/resid.hxx>
-#include <tools/rc.hxx>
// ---------------------
// - ImplResStringItem -
diff --git a/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx
index cc6d77b..932973c 100644
--- a/tools/source/fsys/wntmsc.cxx
+++ b/tools/source/fsys/wntmsc.cxx
@@ -40,7 +40,6 @@
#include "wntmsc.hxx"
#include <tools/errinf.hxx>
#include <tools/debug.hxx>
-#include <tools/wldcrd.hxx>
#include <tools/fsys.hxx>
#include <vector>
diff --git a/tools/source/rc/resary.cxx b/tools/source/rc/resary.cxx
index c4f1166..7b831c6 100644
--- a/tools/source/rc/resary.cxx
+++ b/tools/source/rc/resary.cxx
@@ -28,6 +28,7 @@
#define _TOOLS_RESARY_CXX
+#include <tools/resmgr.hxx>
#include <tools/resary.hxx>
#include <tools/rcid.h>
diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index c7b1a82..eb8c600 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -32,7 +32,6 @@
#include <unotools/configitem.hxx>
#include <unotools/configmgr.hxx>
#include <tools/debug.hxx>
-#include <tools/resmgr.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <osl/mutex.hxx>
diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx
index 3d51cda..1608cdc 100644
--- a/unotools/source/config/extendedsecurityoptions.cxx
+++ b/unotools/source/config/extendedsecurityoptions.cxx
@@ -32,7 +32,6 @@
#include <tools/debug.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <tools/wldcrd.hxx>
#include <rtl/ustrbuf.hxx>
#include <unotools/pathoptions.hxx>
diff --git a/unotools/source/config/inetoptions.cxx b/unotools/source/config/inetoptions.cxx
index 4ed1408..d49726b 100644
--- a/unotools/source/config/inetoptions.cxx
+++ b/unotools/source/config/inetoptions.cxx
@@ -28,7 +28,6 @@
#include <unotools/inetoptions.hxx>
#include "rtl/instance.hxx"
-#include <tools/wldcrd.hxx>
#include <algorithm>
#include <map>
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index 463d903..74f19dd 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -30,7 +30,6 @@
#include <unotools/configitem.hxx>
#include <unotools/configmgr.hxx>
#include <tools/debug.hxx>
-#include <tools/resmgr.hxx>
#include <tools/urlobj.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx
index 0061d63..d85f7ae 100644
--- a/vcl/aqua/source/app/salsys.cxx
+++ b/vcl/aqua/source/app/salsys.cxx
@@ -27,8 +27,6 @@
************************************************************************/
-#include "tools/rc.hxx"
-
#include "rtl/ustrbuf.hxx"
#include "vcl/button.hxx"
diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx
index dfe5e4d..17041d8 100644
--- a/vcl/inc/vcl/bitmap.hxx
+++ b/vcl/inc/vcl/bitmap.hxx
@@ -29,10 +29,10 @@
#ifndef _SV_BITMAP_HXX
#define _SV_BITMAP_HXX
+#include <tools/link.hxx>
#include <vcl/sv.h>
#include <vcl/dllapi.h>
#include <vcl/mapmod.hxx>
-#include <tools/rc.hxx>
#include <vcl/region.hxx>
#include <vcl/scopedbitmapaccess.hxx>
diff --git a/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx
index 816518b..b14ebd5 100644
--- a/vcl/inc/vcl/pdfwriter.hxx
+++ b/vcl/inc/vcl/pdfwriter.hxx
@@ -41,6 +41,7 @@
#include "com/sun/star/io/XOutputStream.hpp"
#include "com/sun/star/beans/XMaterialHolder.hpp"
+#include "com/sun/star/lang/Locale.hpp"
#include <boost/scoped_ptr.hpp>
diff --git a/vcl/ios/source/app/salsys.cxx b/vcl/ios/source/app/salsys.cxx
index 9d300fd..fbc7bb4 100644
--- a/vcl/ios/source/app/salsys.cxx
+++ b/vcl/ios/source/app/salsys.cxx
@@ -27,8 +27,6 @@
************************************************************************/
-#include "tools/rc.hxx"
-
#include "rtl/ustrbuf.hxx"
#include "vcl/button.hxx"
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index bcd330f..1538287 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -32,7 +32,6 @@
#include "tools/debug.hxx"
#include "tools/rc.h"
-#include "tools/resary.hxx"
#include "vcl/field.hxx"
#include "vcl/event.hxx"
commit 571ad11bc091871e8f71cda20c4aa56786f43837
Author: Marcel Metz <mmetz at adrian-broher.net>
Date: Tue Jan 3 15:12:48 2012 +0100
Removed unnecessary tools includes.
diff --git a/avmedia/inc/avmedia/mediaplayer.hxx b/avmedia/inc/avmedia/mediaplayer.hxx
index f11f4c0..f0d6820 100644
--- a/avmedia/inc/avmedia/mediaplayer.hxx
+++ b/avmedia/inc/avmedia/mediaplayer.hxx
@@ -31,7 +31,6 @@
#include <sfx2/ctrlitem.hxx>
#include <sfx2/dockwin.hxx>
-#include <tools/urlobj.hxx>
#include <avmedia/avmediadllapi.h>
// -----------
diff --git a/avmedia/source/quicktime/quicktimecommon.hxx b/avmedia/source/quicktime/quicktimecommon.hxx
index 1c22377..3ea131d 100644
--- a/avmedia/source/quicktime/quicktimecommon.hxx
+++ b/avmedia/source/quicktime/quicktimecommon.hxx
@@ -43,7 +43,6 @@
#include <tools/debug.hxx>
#include <tools/stream.hxx>
#include <tools/string.hxx>
-#include <tools/urlobj.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/weak.hxx>
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index c89fa53..556a599 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -35,7 +35,6 @@
#include <algorithm>
#include <cmath>
#include <osl/mutex.hxx>
-#include <tools/time.hxx>
#include <vcl/svapp.hxx>
#ifdef UNX
#include <vcl/sysdata.hxx>
diff --git a/avmedia/source/win/wincommon.hxx b/avmedia/source/win/wincommon.hxx
index 0dd7cae..c90339b 100644
--- a/avmedia/source/win/wincommon.hxx
+++ b/avmedia/source/win/wincommon.hxx
@@ -34,7 +34,6 @@
#include <tools/debug.hxx>
#include <tools/stream.hxx>
#include <tools/string.hxx>
-#include <tools/urlobj.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/weak.hxx>
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index a194029..bc850bc 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -65,7 +65,6 @@
#include <unotools/collatorwrapper.hxx>
#include <tools/diagnose_ex.h>
-#include <tools/urlobj.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/documentinfo.hxx>
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index 35789b2..80b0c72 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -29,7 +29,6 @@
#include "propacc.hxx"
-#include <tools/urlobj.hxx>
#include <tools/errcode.hxx>
#include <svl/svarray.hxx>
#include <basic/sbstar.hxx>
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index 32cb0f5..a8077f7 100644
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -43,7 +43,6 @@
#include <com/sun/star/sheet/XCellRangeAddressable.hpp>
#include <com/sun/star/sheet/XDatabaseRanges.hpp>
#include <com/sun/star/sheet/XDatabaseRange.hpp>
-#include <tools/urlobj.hxx>
#include "FDatabaseMetaDataResultSet.hxx"
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <comphelper/types.hxx>
diff --git a/connectivity/source/drivers/dbase/DConnection.cxx b/connectivity/source/drivers/dbase/DConnection.cxx
index fe6cd6f..cecc2dd 100644
--- a/connectivity/source/drivers/dbase/DConnection.cxx
+++ b/connectivity/source/drivers/dbase/DConnection.cxx
@@ -32,7 +32,6 @@
#include "dbase/DCatalog.hxx"
#include "dbase/DDriver.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
-#include <tools/urlobj.hxx>
#include "dbase/DPreparedStatement.hxx"
#include "dbase/DStatement.hxx"
#include <tools/debug.hxx>
diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index 7aecf6e..aad436e 100644
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -36,7 +36,6 @@
#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/sdbcx/XIndexesSupplier.hpp>
-#include <tools/urlobj.hxx>
#include "FDatabaseMetaDataResultSet.hxx"
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include "dbase/DIndex.hxx"
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index 7315193..61d5d8d 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -31,7 +31,6 @@
#include "NCatalog.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/sdbc/TransactionIsolation.hpp>
-#include <tools/urlobj.hxx>
#include "NPreparedStatement.hxx"
#include "NStatement.hxx"
#include <comphelper/extract.hxx>
diff --git a/connectivity/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx
index 79d2459..f83fd4a 100644
--- a/connectivity/source/drivers/flat/EConnection.cxx
+++ b/connectivity/source/drivers/flat/EConnection.cxx
@@ -31,7 +31,6 @@
#include "flat/ECatalog.hxx"
#include "flat/EDriver.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
-#include <tools/urlobj.hxx>
#include "flat/EPreparedStatement.hxx"
#include "flat/EStatement.hxx"
#include <comphelper/extract.hxx>
diff --git a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
index e5ed822..f9f2411 100644
--- a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
@@ -36,7 +36,6 @@
#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/sdbcx/XIndexesSupplier.hpp>
-#include <tools/urlobj.hxx>
#include "FDatabaseMetaDataResultSet.hxx"
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <comphelper/extract.hxx>
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 250a0d2..70648a0 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -32,7 +32,6 @@
#include <vcl/msgbox.hxx>
#include <tools/stream.hxx>
-#include <tools/urlobj.hxx>
#include <rtl/bootstrap.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/bootstrap.hxx>
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 865c05a..e518649 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -35,7 +35,6 @@
#include "helpid.hrc"
#include <algorithm>
-#include <tools/urlobj.hxx>
#include <vcl/controllayout.hxx>
#include <vcl/msgbox.hxx>
#include <unotools/lingucfg.hxx>
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index 686d561..9e8bbf5 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -36,7 +36,6 @@
#include <vcl/combobox.hxx>
#include <vcl/edit.hxx>
#include <vcl/lstbox.hxx>
-#include <tools/urlobj.hxx>
#include <svl/stritem.hxx>
#include <svl/eitem.hxx>
#include <svtools/transfer.hxx>
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index e42385a..717d589 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -46,7 +46,6 @@
#include <svtools/svtabbx.hxx>
#include <svl/itemset.hxx>
#include "doclinkdialog.hxx"
-#include <tools/urlobj.hxx>
#include <unotools/localfilehelper.hxx>
#include "optHeaderTabListbox.hxx"
#include <sfx2/docfilt.hxx>
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 5d1b394..e0c7c7a 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -49,7 +49,6 @@
#include <unotools/bootstrap.hxx>
#include <vcl/help.hxx>
#include <sfx2/viewfrm.hxx>
-#include <tools/urlobj.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/securityoptions.hxx>
#include <unotools/localfilehelper.hxx>
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 5f6a40d..5b525ff 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -91,7 +91,6 @@
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
#include <tools/errcode.hxx>
-#include <tools/urlobj.hxx>
#include <boost/bind.hpp>
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index e03e9c0..1e5aa44 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -75,7 +75,6 @@
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/diagnose_ex.h>
-#include <tools/urlobj.hxx>
#include <ucbhelper/commandenvironment.hxx>
#include <ucbhelper/content.hxx>
#include <ucbhelper/contentbroker.hxx>
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 84ef50d..dfa7eb1 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -49,7 +49,6 @@
#include <com/sun/star/uno/XNamingService.hpp>
#include "xmlDatabase.hxx"
#include "xmlEnums.hxx"
-#include <tools/urlobj.hxx>
#include "xmlstrings.hrc"
#include <xmloff/DocumentSettingsContext.hxx>
#include "xmlStyleImport.hxx"
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 6e8653f..d81d388 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -49,7 +49,6 @@
#include <com/sun/star/sdbcx/XViewsSupplier.hpp>
#include <com/sun/star/sdb/XQueryDefinitionsSupplier.hpp>
#include <com/sun/star/sdbcx/XDrop.hpp>
-#include <tools/urlobj.hxx>
#include <unotools/ucbhelper.hxx>
#include "dlgsave.hxx"
#include <comphelper/types.hxx>
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index ef40f0f..da6fa2b 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -74,7 +74,6 @@
#include <toolkit/unohlp.hxx>
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
-#include <tools/urlobj.hxx>
#include <unotools/bootstrap.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/svapp.hxx>
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index fe8f4e7..da54960 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -52,7 +52,6 @@
#include <sal/macros.h>
#include <vcl/waitobj.hxx>
-#include <tools/urlobj.hxx>
#include <svl/urihelper.hxx>
#include "datasourceconnector.hxx"
#include <unotools/moduleoptions.hxx>
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 9d3a539..7ba5def 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -62,7 +62,6 @@
#include <com/sun/star/util/Time.hpp>
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
-#include <tools/urlobj.hxx>
#include <tools/diagnose_ex.h>
#include <svl/intitem.hxx>
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 06e3495..84fd116 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -65,7 +65,6 @@
#include <ucbhelper/commandenvironment.hxx>
#include "finteraction.hxx"
#include <connectivity/CommonTools.hxx>
-#include <tools/urlobj.hxx>
#include <sfx2/docfilt.hxx>
#include "dsnItem.hxx"
#if defined(WNT)
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index b23f4c2..e392b87 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -62,7 +62,6 @@
#include <ucbhelper/commandenvironment.hxx>
#include "finteraction.hxx"
#include <connectivity/CommonTools.hxx>
-#include <tools/urlobj.hxx>
#include <sfx2/docfilt.hxx>
#include <vcl/mnemonic.hxx>
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 238418e..a7cbcf4 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -73,7 +73,6 @@
#include <svl/itempool.hxx>
#include <svl/poolitem.hxx>
#include <svl/stritem.hxx>
-#include <tools/urlobj.hxx>
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
#include <typelib/typedescription.hxx>
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index ab6fdf9..6de527e 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -58,7 +58,6 @@
#include <ucbhelper/configurationkeys.hxx>
#include <cppuhelper/bootstrap.hxx>
-#include <tools/urlobj.hxx>
#include <tools/rcid.h>
#include <rtl/logfile.hxx>
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index d2a6550..4f6f6c0 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -61,7 +61,6 @@
#include "com/sun/star/task/XInteractionApprove.hpp"
#include "com/sun/star/ucb/UnsupportedCommandException.hpp"
#include "boost/bind.hpp"
-#include "tools/urlobj.hxx"
#include "unotools/tempfile.hxx"
#include "osl/file.hxx"
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index caa0564..4ebc355 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -29,7 +29,6 @@
#include "acceptor.hxx"
#include <unotools/bootstrap.hxx>
-#include <tools/urlobj.hxx>
#include <tools/stream.hxx>
#include <vcl/svapp.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index c27923e..8773f1a 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -30,7 +30,6 @@
#include "splash.hxx"
#include <stdio.h>
#include <unotools/bootstrap.hxx>
-#include <tools/urlobj.hxx>
#include <tools/stream.hxx>
#include <sfx2/sfx.hrc>
#include <vcl/svapp.hxx>
diff --git a/desktop/unx/splash/unxsplash.cxx b/desktop/unx/splash/unxsplash.cxx
index bda0185..e7c7bd5 100644
--- a/desktop/unx/splash/unxsplash.cxx
+++ b/desktop/unx/splash/unxsplash.cxx
@@ -30,7 +30,6 @@
#include <stdio.h>
#include <unotools/bootstrap.hxx>
#include <osl/process.h>
-#include <tools/urlobj.hxx>
#include <tools/stream.hxx>
#include <sfx2/sfx.hrc>
#include <com/sun/star/registry/XRegistryKey.hpp>
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index d95a54b..8106dad 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -33,7 +33,6 @@
#include <list>
#include <memory>
#include <editeng/unolingu.hxx>
-#include <tools/urlobj.hxx>
#include <rtl/logfile.hxx>
#include <unotools/pathoptions.hxx>
#include <com/sun/star/frame/XModel.hpp>
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index e5fba9c..9458497 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -27,7 +27,6 @@
************************************************************************/
#include <osl/mutex.hxx>
-#include <tools/urlobj.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/awt/PosSize.hpp>
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index afa868f..bc29e60 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -28,7 +28,6 @@
#include <osl/mutex.hxx>
-#include <tools/urlobj.hxx>
#include <cppuhelper/weak.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/awt/XWindow.hpp>
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 42b9aa0..882b9a2 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -29,7 +29,6 @@
#include <osl/mutex.hxx>
-#include <tools/urlobj.hxx>
#include <tools/diagnose_ex.h>
#include <cppuhelper/weak.hxx>
#include <svl/itemprop.hxx>
diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx
index 1cf6932..03719c6 100644
--- a/extensions/source/bibliography/bibmod.cxx
+++ b/extensions/source/bibliography/bibmod.cxx
@@ -29,7 +29,6 @@
#include <tools/resmgr.hxx>
-#include <tools/urlobj.hxx>
#include <svl/urihelper.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/util/XLocalizedAliases.hpp>
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 5958ba6..6fe89fe 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -28,7 +28,6 @@
#include <osl/mutex.hxx>
#include <tools/diagnose_ex.h>
-#include <tools/urlobj.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/io/XPersistObject.hpp>
#include <com/sun/star/sdbc/ResultSetType.hpp>
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index ba1cb90..4b1e32c 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -27,7 +27,6 @@
************************************************************************/
#include <comphelper/processfactory.hxx>
-#include <tools/urlobj.hxx>
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index 7eef06c..480ac6b 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -36,7 +36,6 @@
#include <comphelper/string.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
-#include <tools/urlobj.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
diff --git a/extensions/source/xmlextract/xmxcom.hxx b/extensions/source/xmlextract/xmxcom.hxx
index fd8690f..515a0e2 100644
--- a/extensions/source/xmlextract/xmxcom.hxx
+++ b/extensions/source/xmlextract/xmxcom.hxx
@@ -34,7 +34,6 @@
#include <tools/debug.hxx>
#include <tools/stream.hxx>
#include <tools/string.hxx>
-#include <tools/urlobj.hxx>
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/uno/Reference.h>
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index f9aa999..6fd4dd7 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -45,7 +45,6 @@
#include <vcl/cvtgrf.hxx>
#include <vcl/bmpacc.hxx>
#include <svtools/fltcall.hxx>
-#include <tools/urlobj.hxx>
#include <tools/tempfile.hxx>
#include <osl/process.h>
#include <osl/file.hxx>
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index b4fe4ae..d06c8b3 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -35,7 +35,6 @@
#include <tools/debug.hxx>
#include <tools/stream.hxx>
#include <tools/string.hxx>
-#include <tools/urlobj.hxx>
#include <vcl/salbtype.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/metaact.hxx>
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 4197ae4..d34e86f 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -47,7 +47,6 @@
#include <svl/eitem.hxx>
#include <unotools/charclass.hxx>
-#include <tools/urlobj.hxx>
#include <tools/diagnose_ex.h>
#include "formdlgs.hrc"
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index 2788da4..2d80b30 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -44,7 +44,6 @@
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
-#include <tools/urlobj.hxx>
#include "resourceprovider.hxx"
#include <tools/rc.hxx>
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm
index 7f269ec..838f9e3 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.mm
+++ b/fpicker/source/aqua/SalAquaFolderPicker.mm
@@ -45,7 +45,6 @@
#include <vcl/svapp.hxx>
#include "SalAquaFolderPicker.hxx"
-#include <tools/urlobj.hxx>
#include <iostream>
#include "resourceprovider.hxx"
diff --git a/fpicker/source/aqua/SalAquaPicker.mm b/fpicker/source/aqua/SalAquaPicker.mm
index 07534a2..a00eb4e 100644
--- a/fpicker/source/aqua/SalAquaPicker.mm
+++ b/fpicker/source/aqua/SalAquaPicker.mm
@@ -39,7 +39,6 @@
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include "SalAquaPicker.hxx"
-#include <tools/urlobj.hxx>
#include <osl/file.hxx>
#include "CFStringUtilities.hxx"
#include "NSString_OOoAdditions.hxx"
diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index 598358e..19d62d2 100644
--- a/framework/source/services/backingcomp.cxx
+++ b/framework/source/services/backingcomp.cxx
@@ -63,7 +63,6 @@
#include <vcl/wrkwin.hxx>
#include <vcl/svapp.hxx>
#include <tools/resmgr.hxx>
-#include <tools/urlobj.hxx>
#include <rtl/ustrbuf.hxx>
#include <svl/solar.hrc>
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index 134471a..524a14c 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -39,7 +39,6 @@
#include <vcl/svapp.hxx>
-#include <tools/urlobj.hxx>
#include <unotools/tempfile.hxx>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XComponent.hpp>
diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index 8a43b89..8b021cd 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -49,7 +49,6 @@
//_________________________________________________________________________________________________________________
#include <toolkit/helper/vclunohelper.hxx>
-#include <tools/urlobj.hxx>
#include <rtl/ustrbuf.hxx>
#include <vcl/svapp.hxx>
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index 9d38c70..d496c09 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -46,7 +46,6 @@
// includes of other projects
//_________________________________________________________________________________________________________________
#include <rtl/ustrbuf.hxx>
-#include <tools/urlobj.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <vcl/wrkwin.hxx>
diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx
index 344128d..704fc2c 100644
--- a/framework/source/tabwin/tabwinfactory.cxx
+++ b/framework/source/tabwin/tabwinfactory.cxx
@@ -46,7 +46,6 @@
// includes of other projects
//_________________________________________________________________________________________________________________
#include <vcl/svapp.hxx>
-#include <tools/urlobj.hxx>
#include <rtl/ustrbuf.hxx>
//_________________________________________________________________________________________________________________
diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx
index d85e8ef..fcb768f 100644
--- a/framework/source/uiconfiguration/imagemanager.cxx
+++ b/framework/source/uiconfiguration/imagemanager.cxx
@@ -56,7 +56,6 @@
#include <rtl/ustrbuf.hxx>
#include <osl/mutex.hxx>
#include <comphelper/sequence.hxx>
-#include <tools/urlobj.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <vcl/pngread.hxx>
#include <vcl/pngwrite.hxx>
diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx
index c43ce27..390ba4d 100644
--- a/framework/source/uiconfiguration/moduleimagemanager.cxx
+++ b/framework/source/uiconfiguration/moduleimagemanager.cxx
@@ -61,7 +61,6 @@
#include <osl/mutex.hxx>
#include <osl/file.hxx>
#include <comphelper/sequence.hxx>
-#include <tools/urlobj.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <vcl/pngread.hxx>
#include <vcl/pngwrite.hxx>
diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx
index 4f8c655..1a1613f 100644
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.cxx
@@ -54,7 +54,6 @@
#include <osl/mutex.hxx>
#include <comphelper/processfactory.hxx>
#include <unotools/ucbstreamhelper.hxx>
-#include <tools/urlobj.hxx>
#include <vcl/svapp.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/window.hxx>
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index 38879eb..32658f3 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -56,7 +56,6 @@
#include <vcl/mnemonic.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/combobox.hxx>
-#include <tools/urlobj.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index a70dd5a..a9ba6c5 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -54,7 +54,6 @@
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/mnemonic.hxx>
-#include <tools/urlobj.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::awt;
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 1f5e64e..53a4483 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -53,7 +53,6 @@
#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
#include <vcl/i18nhelp.hxx>
-#include <tools/urlobj.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/strbuf.hxx>
#include <svl/solar.hrc>
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index bf6896d..1b2f2f3 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -53,7 +53,6 @@
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/mnemonic.hxx>
-#include <tools/urlobj.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::awt;
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index 9bf3c71..0afdab7 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -53,7 +53,6 @@
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/mnemonic.hxx>
-#include <tools/urlobj.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx
index 6b6926b..e2938c9 100644
--- a/framework/source/uielement/footermenucontroller.cxx
+++ b/framework/source/uielement/footermenucontroller.cxx
@@ -55,7 +55,6 @@
#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
#include <vcl/i18nhelp.hxx>
-#include <tools/urlobj.hxx>
#include <rtl/ustrbuf.hxx>
//_________________________________________________________________________________________________________________
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index 3c1e1b4..103e155 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -55,7 +55,6 @@
#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
#include <vcl/i18nhelp.hxx>
-#include <tools/urlobj.hxx>
#include <rtl/ustrbuf.hxx>
#include <osl/mutex.hxx>
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index 92719b5..55f82dc 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -54,7 +54,6 @@
#include <osl/mutex.hxx>
#include <comphelper/processfactory.hxx>
#include <unotools/ucbstreamhelper.hxx>
-#include <tools/urlobj.hxx>
#include <vcl/svapp.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/window.hxx>
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index 2e24332..fb7c59a 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -50,7 +50,6 @@
#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
#include <vcl/i18nhelp.hxx>
-#include <tools/urlobj.hxx>
#include <rtl/ustrbuf.hxx>
#include <vcl/mnemonic.hxx>
#include <com/sun/star/awt/XMenuExtended.hpp>
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index 568383d..b954bce 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list