[Libreoffice-commits] core.git: accessibility/source avmedia/source basctl/source basic/qa basic/source chart2/source cui/source dbaccess/Library_dbu.mk dbaccess/source desktop/source drawinglayer/source editeng/source extensions/source filter/source forms/source formula/source fpicker/source framework/source include/editeng include/framework include/svtools include/svx include/vcl oox/source padmin/source reportdesign/source scripting/source sc/source sdext/source sd/source sfx2/source slideshow/source starmath/inc starmath/source svtools/source svx/source sw/qa sw/source toolkit/source uui/source vcl/generic vcl/inc vcl/source vcl/unx writerfilter/source xmlsecurity/inc xmlsecurity/source
Tobias Lippert
drtl at fastmail.fm
Thu Feb 20 08:23:10 PST 2014
accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 1
accessibility/source/extended/accessiblelistboxentry.cxx | 1
accessibility/source/extended/accessibletabbar.cxx | 1
accessibility/source/extended/accessibletabbarpage.cxx | 1
accessibility/source/extended/accessibletabbarpagelist.cxx | 1
accessibility/source/helper/accresmgr.cxx | 1
accessibility/source/standard/accessiblemenucomponent.cxx | 2
accessibility/source/standard/accessiblemenuitemcomponent.cxx | 2
accessibility/source/standard/vclxaccessiblelistitem.cxx | 1
accessibility/source/standard/vclxaccessiblemenubar.cxx | 2
accessibility/source/standard/vclxaccessiblemenuitem.cxx | 1
accessibility/source/standard/vclxaccessiblepopupmenu.cxx | 1
accessibility/source/standard/vclxaccessiblestatusbaritem.cxx | 1
accessibility/source/standard/vclxaccessibletabpage.cxx | 1
accessibility/source/standard/vclxaccessibletextcomponent.cxx | 1
accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 1
avmedia/source/framework/mediacontrol.cxx | 1
avmedia/source/framework/mediamisc.cxx | 1
basctl/source/accessibility/accessibledialogcontrolshape.cxx | 1
basctl/source/accessibility/accessibledialogwindow.cxx | 1
basctl/source/basicide/baside2.cxx | 1
basctl/source/basicide/baside2b.cxx | 1
basctl/source/basicide/baside3.cxx | 1
basctl/source/basicide/basidesh.cxx | 1
basctl/source/basicide/bastype3.hxx | 1
basctl/source/basicide/iderdll.cxx | 1
basctl/source/basicide/layout.cxx | 1
basctl/source/basicide/linenumberwindow.cxx | 1
basctl/source/dlged/managelang.cxx | 1
basic/qa/cppunit/test_vba.cxx | 1
basic/source/classes/global.cxx | 1
basic/source/comp/basiccharclass.cxx | 1
basic/source/runtime/basrdll.cxx | 1
basic/source/runtime/methods1.cxx | 1
basic/source/runtime/runtime.cxx | 1
basic/source/sbx/sbxdate.cxx | 1
basic/source/sbx/sbxscan.cxx | 2
chart2/source/controller/accessibility/AccessibleBase.cxx | 2
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 1
chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 1
chart2/source/controller/dialogs/DataBrowser.cxx | 1
chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx | 1
chart2/source/controller/dialogs/tp_ErrorBars.cxx | 1
chart2/source/controller/dialogs/tp_Trendline.cxx | 1
chart2/source/controller/main/ChartController_Window.cxx | 1
chart2/source/controller/main/ChartWindow.cxx | 1
chart2/source/model/main/ChartModel_Persistence.cxx | 1
chart2/source/tools/DiagramHelper.cxx | 1
cui/source/customize/cfg.cxx | 1
cui/source/dialogs/SpellDialog.cxx | 1
cui/source/dialogs/about.cxx | 1
cui/source/dialogs/cuicharmap.cxx | 1
cui/source/dialogs/iconcdlg.cxx | 1
cui/source/dialogs/insdlg.cxx | 1
cui/source/dialogs/pastedlg.cxx | 1
cui/source/dialogs/postdlg.cxx | 1
cui/source/factory/cuiresmgr.cxx | 1
cui/source/options/optHeaderTabListbox.cxx | 1
cui/source/options/optasian.cxx | 1
cui/source/options/optcolor.cxx | 1
cui/source/options/optdict.cxx | 1
cui/source/options/optgdlg.cxx | 10
cui/source/options/optgdlg.hxx | 2
cui/source/options/optgenrl.cxx | 1
cui/source/options/optlingu.cxx | 1
cui/source/options/optupdt.cxx | 1
cui/source/options/personalization.cxx | 1
cui/source/options/treeopt.cxx | 1
cui/source/tabpages/align.cxx | 1
cui/source/tabpages/autocdlg.cxx | 1
cui/source/tabpages/backgrnd.cxx | 1
cui/source/tabpages/border.cxx | 1
cui/source/tabpages/grfpage.cxx | 1
cui/source/tabpages/labdlg.cxx | 1
cui/source/tabpages/measure.cxx | 1
cui/source/tabpages/numfmt.cxx | 1
cui/source/tabpages/numpages.cxx | 1
cui/source/tabpages/tabstpge.cxx | 1
cui/source/tabpages/tpbitmap.cxx | 1
cui/source/tabpages/tphatch.cxx | 1
cui/source/tabpages/tpline.cxx | 1
cui/source/tabpages/tplnedef.cxx | 1
cui/source/tabpages/tplneend.cxx | 1
dbaccess/Library_dbu.mk | 1
dbaccess/source/core/resource/core_resource.cxx | 1
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 1
dbaccess/source/ui/app/AppDetailView.cxx | 1
dbaccess/source/ui/app/AppSwapWindow.cxx | 1
dbaccess/source/ui/app/AppTitleWindow.cxx | 1
dbaccess/source/ui/app/AppView.cxx | 1
dbaccess/source/ui/browser/dataview.cxx | 1
dbaccess/source/ui/browser/unodatbr.cxx | 1
dbaccess/source/ui/control/FieldControls.cxx | 123 ++++++++++
dbaccess/source/ui/control/VertSplitView.cxx | 1
dbaccess/source/ui/control/curledit.cxx | 1
dbaccess/source/ui/control/marktree.cxx | 1
dbaccess/source/ui/control/sqledit.cxx | 1
dbaccess/source/ui/dlg/indexdialog.cxx | 1
dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 1
dbaccess/source/ui/dlg/queryorder.cxx | 1
dbaccess/source/ui/dlg/tablespage.cxx | 1
dbaccess/source/ui/inc/CollectionView.hxx | 1
dbaccess/source/ui/inc/DExport.hxx | 1
dbaccess/source/ui/inc/FieldControls.hxx | 102 +-------
dbaccess/source/ui/inc/HtmlReader.hxx | 1
dbaccess/source/ui/inc/TokenWriter.hxx | 1
dbaccess/source/ui/inc/dlgsave.hxx | 1
dbaccess/source/ui/inc/indexdialog.hxx | 1
dbaccess/source/ui/misc/DExport.cxx | 1
dbaccess/source/ui/misc/HtmlReader.cxx | 1
dbaccess/source/ui/misc/RtfReader.cxx | 1
dbaccess/source/ui/misc/TokenWriter.cxx | 1
dbaccess/source/ui/misc/ToolBoxHelper.cxx | 1
dbaccess/source/ui/misc/UITools.cxx | 1
dbaccess/source/ui/misc/WNameMatch.cxx | 1
dbaccess/source/ui/querydesign/ConnectionLine.cxx | 1
dbaccess/source/ui/querydesign/JoinDesignView.cxx | 1
dbaccess/source/ui/querydesign/JoinTableView.cxx | 1
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 1
dbaccess/source/ui/querydesign/TableWindow.cxx | 1
dbaccess/source/ui/querydesign/TableWindowTitle.cxx | 1
dbaccess/source/ui/querydesign/querycontainerwindow.cxx | 1
dbaccess/source/ui/querydesign/querydlg.cxx | 1
dbaccess/source/ui/relationdesign/RTableConnection.cxx | 1
dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx | 1
dbaccess/source/ui/tabledesign/TableDesignView.cxx | 1
dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx | 1
desktop/source/app/app.cxx | 1
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 1
desktop/source/deployment/gui/dp_gui_service.cxx | 1
drawinglayer/source/processor2d/getdigitlanguage.cxx | 1
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 2
editeng/source/accessibility/AccessibleImageBullet.cxx | 1
editeng/source/editeng/eerdll.cxx | 1
editeng/source/editeng/impedit.cxx | 2
editeng/source/editeng/impedit3.cxx | 1
editeng/source/items/frmitems.cxx | 1
editeng/source/items/numitem.cxx | 1
editeng/source/misc/svxacorr.cxx | 1
editeng/source/rtf/svxrtf.cxx | 1
extensions/source/abpilot/abspilot.cxx | 1
extensions/source/abpilot/datasourcehandling.hxx | 2
extensions/source/bibliography/general.cxx | 1
extensions/source/bibliography/toolbar.cxx | 1
extensions/source/plugin/base/context.cxx | 1
extensions/source/plugin/inc/plugin/impl.hxx | 1
extensions/source/propctrlr/browserline.cxx | 1
extensions/source/propctrlr/fontdialog.cxx | 2
extensions/source/propctrlr/formlinkdialog.hxx | 1
extensions/source/propctrlr/standardcontrol.cxx | 1
extensions/source/propctrlr/taborder.hxx | 1
extensions/source/resource/oooresourceloader.cxx | 1
filter/source/graphic/GraphicExportDialog.cxx | 1
filter/source/graphicfilter/eps/eps.cxx | 1
filter/source/msfilter/msdffimp.cxx | 1
filter/source/pdf/impdialog.cxx | 1
filter/source/pdf/pdfexport.cxx | 1
filter/source/svg/svgfontexport.cxx | 1
filter/source/svg/svgwriter.cxx | 2
filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 1
forms/source/component/Edit.cxx | 1
forms/source/component/FormattedField.cxx | 1
forms/source/component/FormattedFieldWrapper.cxx | 1
forms/source/resource/frm_resource.cxx | 1
forms/source/richtext/richtextengine.cxx | 1
forms/source/richtext/richtextimplcontrol.cxx | 1
forms/source/solar/component/navbarcontrol.cxx | 1
formula/source/core/resource/core_resource.cxx | 1
formula/source/ui/dlg/parawin.cxx | 1
fpicker/source/office/iodlg.cxx | 1
fpicker/source/win32/misc/resourceprovider.cxx | 1
framework/source/classes/fwlresid.cxx | 1
framework/source/classes/menumanager.cxx | 2
framework/source/fwe/classes/bmkmenu.cxx | 1
framework/source/fwe/classes/fwkresid.cxx | 1
framework/source/fwe/xml/toolboxdocumenthandler.cxx | 1
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 2
framework/source/services/license.cxx | 1
framework/source/uielement/addonstoolbarmanager.cxx | 1
framework/source/uielement/complextoolbarcontroller.cxx | 1
framework/source/uielement/controlmenucontroller.cxx | 1
framework/source/uielement/fontmenucontroller.cxx | 1
framework/source/uielement/fontsizemenucontroller.cxx | 1
framework/source/uielement/menubarmanager.cxx | 1
framework/source/uielement/newmenucontroller.cxx | 1
framework/source/uielement/statusbarmanager.cxx | 1
framework/source/uielement/toolbarmanager.cxx | 2
framework/source/uielement/toolbarsmenucontroller.cxx | 1
include/editeng/hangulhanja.hxx | 1
include/framework/menuconfiguration.hxx | 2
include/svtools/addresstemplate.hxx | 1
include/svtools/table/tablerenderer.hxx | 2
include/svx/ucsubset.hxx | 1
include/vcl/button.hxx | 1
include/vcl/ctrl.hxx | 9
include/vcl/outdev.hxx | 9
include/vcl/svapp.hxx | 4
oox/source/export/drawingml.cxx | 1
padmin/source/adddlg.cxx | 1
padmin/source/helper.cxx | 1
padmin/source/padialog.cxx | 1
padmin/source/pamain.cxx | 1
reportdesign/source/core/api/ReportComponent.cxx | 2
reportdesign/source/core/resource/core_resource.cxx | 1
reportdesign/source/ui/dlg/AddField.cxx | 2
reportdesign/source/ui/dlg/CondFormat.cxx | 1
reportdesign/source/ui/dlg/Condition.cxx | 2
reportdesign/source/ui/dlg/GroupsSorting.cxx | 2
reportdesign/source/ui/dlg/PageNumber.cxx | 2
reportdesign/source/ui/inc/UITools.hxx | 1
reportdesign/source/ui/misc/ColorListener.cxx | 2
reportdesign/source/ui/misc/RptUndo.cxx | 2
reportdesign/source/ui/misc/UITools.cxx | 2
reportdesign/source/ui/report/DesignView.cxx | 2
reportdesign/source/ui/report/EndMarker.cxx | 2
reportdesign/source/ui/report/ReportControllerObserver.cxx | 2
reportdesign/source/ui/report/ReportSection.cxx | 1
reportdesign/source/ui/report/ReportWindow.cxx | 2
reportdesign/source/ui/report/ScrollHelper.cxx | 2
reportdesign/source/ui/report/SectionWindow.cxx | 2
reportdesign/source/ui/report/StartMarker.cxx | 2
reportdesign/source/ui/report/ViewsWindow.cxx | 2
sc/source/core/data/docpool.cxx | 1
sc/source/core/data/drwlayer.cxx | 1
sc/source/core/data/global.cxx | 1
sc/source/core/data/stlpool.cxx | 1
sc/source/core/tool/addincol.cxx | 1
sc/source/core/tool/callform.cxx | 1
sc/source/core/tool/zforauto.cxx | 1
sc/source/filter/excel/xlroot.cxx | 2
sc/source/filter/excel/xlstyle.cxx | 1
sc/source/filter/xcl97/xcl97rec.cxx | 2
sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 1
sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx | 1
sc/source/ui/app/inputhdl.cxx | 1
sc/source/ui/app/inputwin.cxx | 1
sc/source/ui/cctrl/cbuttonw.cxx | 1
sc/source/ui/cctrl/checklistmenu.cxx | 1
sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 1
sc/source/ui/condformat/condformatdlg.cxx | 1
sc/source/ui/condformat/condformatdlgentry.cxx | 1
sc/source/ui/dbgui/csvcontrol.cxx | 1
sc/source/ui/dbgui/csvgrid.cxx | 2
sc/source/ui/dbgui/csvruler.cxx | 1
sc/source/ui/dbgui/csvtablebox.cxx | 1
sc/source/ui/dbgui/fieldwnd.cxx | 1
sc/source/ui/dbgui/pvlaydlg.cxx | 1
sc/source/ui/dbgui/textimportoptions.cxx | 1
sc/source/ui/formdlg/privsplt.cxx | 1
sc/source/ui/inc/inputwin.hxx | 1
sc/source/ui/miscdlgs/autofmt.cxx | 1
sc/source/ui/namedlg/namedefdlg.cxx | 2
sc/source/ui/namedlg/namedlg.cxx | 1
sc/source/ui/navipi/navipi.cxx | 1
sc/source/ui/navipi/scenwnd.cxx | 1
sc/source/ui/pagedlg/scuitphfedit.cxx | 2
sc/source/ui/pagedlg/tphfedit.cxx | 1
sc/source/ui/pagedlg/tptable.cxx | 2
sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx | 1
sc/source/ui/sidebar/CellBorderStyleControl.cxx | 1
sc/source/ui/sidebar/CellBorderUpdater.cxx | 1
sc/source/ui/sidebar/CellLineStyleControl.cxx | 1
sc/source/ui/sidebar/CellLineStyleValueSet.cxx | 1
sc/source/ui/view/gridwin.cxx | 1
sc/source/ui/view/gridwin2.cxx | 1
sc/source/ui/view/gridwin4.cxx | 1
sc/source/ui/view/hdrcont.cxx | 1
sc/source/ui/view/notemark.cxx | 1
sc/source/ui/view/olinewin.cxx | 1
sc/source/ui/view/output.cxx | 1
sc/source/ui/view/output2.cxx | 1
sc/source/ui/view/output3.cxx | 1
sc/source/ui/view/preview.cxx | 1
sc/source/ui/view/prevwsh.cxx | 1
sc/source/ui/view/spelleng.cxx | 1
sc/source/ui/view/tabsplit.cxx | 2
sc/source/ui/view/tabview.cxx | 1
sc/source/ui/view/tabview5.cxx | 1
sc/source/ui/view/viewutil.cxx | 1
scripting/source/dlgprov/dlgprov.cxx | 2
sd/source/core/drawdoc.cxx | 1
sd/source/core/drawdoc2.cxx | 2
sd/source/core/drawdoc4.cxx | 2
sd/source/filter/eppt/pptx-text.cxx | 2
sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx | 1
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 2
sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 1
sd/source/ui/animations/CustomAnimationDialog.cxx | 2
sd/source/ui/animations/CustomAnimationList.cxx | 2
sd/source/ui/annotations/annotationmanager.cxx | 2
sd/source/ui/annotations/annotationtag.cxx | 1
sd/source/ui/annotations/annotationwindow.cxx | 2
sd/source/ui/dlg/RemoteDialogClientBox.cxx | 1
sd/source/ui/dlg/TemplateScanner.cxx | 1
sd/source/ui/dlg/animobjs.cxx | 3
sd/source/ui/dlg/docprev.cxx | 1
sd/source/ui/dlg/navigatr.cxx | 2
sd/source/ui/presenter/SlideRenderer.hxx | 2
sd/source/ui/slideshow/showwin.cxx | 2
sd/source/ui/slideshow/slideshowimpl.cxx | 2
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 1
sd/source/ui/slidesorter/controller/SlsProperties.cxx | 1
sd/source/ui/slidesorter/shell/SlideSorter.cxx | 1
sd/source/ui/slidesorter/view/SlideSorterView.cxx | 2
sd/source/ui/slidesorter/view/SlsTheme.cxx | 2
sd/source/ui/slidesorter/view/SlsToolTip.cxx | 3
sd/source/ui/table/TableDesignPane.cxx | 2
sd/source/ui/tools/PreviewRenderer.cxx | 2
sd/source/ui/unoidl/unomodel.cxx | 2
sd/source/ui/view/Outliner.cxx | 2
sd/source/ui/view/ViewShellBase.cxx | 2
sd/source/ui/view/ViewTabBar.cxx | 2
sd/source/ui/view/drviews5.cxx | 2
sd/source/ui/view/frmview.cxx | 1
sd/source/ui/view/grviewsh.cxx | 2
sd/source/ui/view/outlnvsh.cxx | 2
sd/source/ui/view/sdview.cxx | 4
sd/source/ui/view/sdwindow.cxx | 1
sdext/source/presenter/PresenterHelpView.cxx | 1
sdext/source/presenter/PresenterNotesView.cxx | 1
sdext/source/presenter/PresenterSlideSorter.cxx | 1
sdext/source/presenter/PresenterToolBar.cxx | 1
sdext/source/presenter/PresenterWindowManager.cxx | 1
sfx2/source/appl/linkmgr2.cxx | 1
sfx2/source/appl/newhelp.cxx | 1
sfx2/source/appl/shutdowniconunx.cxx | 1
sfx2/source/bastyp/sfxresid.cxx | 1
sfx2/source/control/objface.cxx | 1
sfx2/source/control/thumbnailview.cxx | 1
sfx2/source/control/thumbnailviewacc.cxx | 1
sfx2/source/dialog/dialoghelper.cxx | 1
sfx2/source/dialog/dinfdlg.cxx | 1
sfx2/source/dialog/infobar.cxx | 1
sfx2/source/dialog/templdlg.cxx | 1
sfx2/source/dialog/titledockwin.cxx | 1
sfx2/source/dialog/versdlg.cxx | 1
sfx2/source/doc/objcont.cxx | 1
sfx2/source/doc/printhelper.cxx | 1
sfx2/source/menu/mnuitem.cxx | 1
sfx2/source/menu/virtmenu.cxx | 1
sfx2/source/sidebar/Theme.cxx | 1
sfx2/source/view/viewsh.cxx | 2
slideshow/source/engine/rehearsetimingsactivity.cxx | 2
starmath/inc/smmod.hxx | 1
starmath/source/accessibility.cxx | 2
starmath/source/cfgitem.cxx | 2
starmath/source/document.cxx | 2
starmath/source/edit.cxx | 2
starmath/source/parse.cxx | 1
starmath/source/toolbox.cxx | 2
starmath/source/view.cxx | 2
svtools/source/brwbox/brwbox2.cxx | 1
svtools/source/brwbox/datwin.cxx | 3
svtools/source/brwbox/editbrowsebox.cxx | 1
svtools/source/config/colorcfg.cxx | 1
svtools/source/config/extcolorcfg.cxx | 1
svtools/source/config/menuoptions.cxx | 1
svtools/source/config/miscopt.cxx | 1
svtools/source/config/optionsdrawinglayer.cxx | 1
svtools/source/contnr/DocumentInfoPreview.cxx | 1
svtools/source/contnr/fileview.cxx | 1
svtools/source/contnr/imivctl1.cxx | 1
svtools/source/contnr/ivctrl.cxx | 2
svtools/source/contnr/simptabl.cxx | 1
svtools/source/contnr/svimpbox.cxx | 1
svtools/source/contnr/templwin.cxx | 1
svtools/source/contnr/treelistbox.cxx | 1
svtools/source/control/calendar.cxx | 1
svtools/source/control/ctrlbox.cxx | 1
svtools/source/control/ctrltool.cxx | 1
svtools/source/control/fmtfield.cxx | 1
svtools/source/control/headbar.cxx | 1
svtools/source/control/hyperlabel.cxx | 4
svtools/source/control/roadmap.cxx | 1
svtools/source/control/ruler.cxx | 1
svtools/source/control/scrwin.cxx | 1
svtools/source/control/stdmenu.cxx | 1
svtools/source/control/tabbar.cxx | 1
svtools/source/control/toolbarmenu.cxx | 1
svtools/source/control/toolbarmenuacc.cxx | 1
svtools/source/control/valueacc.cxx | 1
svtools/source/control/valueset.cxx | 2
svtools/source/control/vclxaccessibleheaderbaritem.cxx | 1
svtools/source/dialogs/addresstemplate.cxx | 1
svtools/source/filter/SvFilterOptionsDialog.cxx | 1
svtools/source/graphic/provider.cxx | 1
svtools/source/hatchwindow/ipwin.cxx | 1
svtools/source/misc/ehdl.cxx | 1
svtools/source/misc/imagemgr.cxx | 1
svtools/source/misc/langhelp.cxx | 1
svtools/source/misc/svtresid.cxx | 1
svtools/source/svhtml/htmlout.cxx | 1
svtools/source/table/gridtablerenderer.cxx | 1
svtools/source/table/tablecontrol.cxx | 1
svtools/source/table/tablecontrol_impl.cxx | 1
svtools/source/table/tabledatawindow.cxx | 1
svtools/source/toolpanel/paneltabbar.cxx | 1
svtools/source/toolpanel/toolpaneldrawer.cxx | 1
svtools/source/uno/contextmenuhelper.cxx | 1
svx/source/accessibility/AccessibleFrameSelector.cxx | 1
svx/source/accessibility/GraphCtlAccessibleContext.cxx | 1
svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 1
svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 1
svx/source/dialog/_bmpmask.cxx | 1
svx/source/dialog/_contdlg.cxx | 1
svx/source/dialog/charmap.cxx | 1
svx/source/dialog/compressgraphicdialog.cxx | 1
svx/source/dialog/connctrl.cxx | 1
svx/source/dialog/dialcontrol.cxx | 1
svx/source/dialog/dialmgr.cxx | 1
svx/source/dialog/dlgctl3d.cxx | 1
svx/source/dialog/dlgctrl.cxx | 1
svx/source/dialog/docrecovery.cxx | 1
svx/source/dialog/fntctrl.cxx | 1
svx/source/dialog/fontlb.cxx | 1
svx/source/dialog/fontwork.cxx | 1
svx/source/dialog/frmsel.cxx | 1
svx/source/dialog/graphctl.cxx | 1
svx/source/dialog/imapdlg.cxx | 1
svx/source/dialog/measctrl.cxx | 1
svx/source/dialog/pagectrl.cxx | 1
svx/source/dialog/paraprev.cxx | 1
svx/source/dialog/rubydialog.cxx | 1
svx/source/dialog/svxbmpnumvalueset.cxx | 1
svx/source/dialog/svxruler.cxx | 1
svx/source/dialog/swframeexample.cxx | 1
svx/source/dialog/txencbox.cxx | 1
svx/source/fmcomp/fmgridcl.cxx | 1
svx/source/fmcomp/gridcell.cxx | 1
svx/source/fmcomp/gridctrl.cxx | 1
svx/source/form/filtnav.cxx | 1
svx/source/form/fmshimp.cxx | 1
svx/source/form/formcontroller.cxx | 1
svx/source/form/tabwin.cxx | 1
svx/source/form/tbxform.cxx | 1
svx/source/gallery2/GalleryControl.cxx | 1
svx/source/gallery2/galbrws.cxx | 1
svx/source/gallery2/galbrws1.cxx | 1
svx/source/gallery2/galbrws2.cxx | 1
svx/source/gallery2/galctrl.cxx | 1
svx/source/gallery2/galini.cxx | 1
svx/source/gallery2/galmisc.cxx | 1
svx/source/gallery2/galobj.cxx | 1
svx/source/inc/formcontrolfactory.hxx | 1
svx/source/items/numfmtsh.cxx | 1
svx/source/sdr/contact/viewcontactofgraphic.cxx | 1
svx/source/sdr/contact/viewcontactofsdrpage.cxx | 1
svx/source/sdr/overlay/overlayrectangle.cxx | 1
svx/source/sdr/overlay/overlayselection.cxx | 1
svx/source/sdr/overlay/overlaytools.cxx | 1
svx/source/sdr/primitive2d/primitivefactory2d.cxx | 1
svx/source/sidebar/debug/ColorPanel.cxx | 1
svx/source/sidebar/line/LineWidthControl.cxx | 1
svx/source/sidebar/line/LineWidthValueSet.cxx | 1
svx/source/sidebar/nbdtmg.cxx | 1
svx/source/sidebar/paragraph/ParaBulletsControl.cxx | 1
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 1
svx/source/sidebar/paragraph/ParaNumberingControl.cxx | 2
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 1
svx/source/sidebar/possize/SidebarDialControl.cxx | 1
svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 1
svx/source/sidebar/text/TextUnderlineControl.cxx | 1
svx/source/sidebar/tools/ValueSetWithTextControl.cxx | 1
svx/source/stbctrls/pszctrl.cxx | 1
svx/source/stbctrls/zoomctrl.cxx | 1
svx/source/stbctrls/zoomsliderctrl.cxx | 1
svx/source/svdraw/sdrpaintwindow.cxx | 2
svx/source/svdraw/svdattr.cxx | 1
svx/source/svdraw/svddrgmt.cxx | 1
svx/source/svdraw/svdetc.cxx | 1
svx/source/svdraw/svdhdl.cxx | 2
svx/source/svdraw/svdmodel.cxx | 3
svx/source/table/tablecontroller.cxx | 2
svx/source/tbxctrls/SvxColorValueSet.cxx | 1
svx/source/tbxctrls/fillctrl.cxx | 2
svx/source/tbxctrls/fontworkgallery.cxx | 1
svx/source/tbxctrls/formatpaintbrushctrl.cxx | 1
svx/source/tbxctrls/itemwin.cxx | 1
svx/source/tbxctrls/layctrl.cxx | 1
svx/source/tbxctrls/lboxctrl.cxx | 1
svx/source/tbxctrls/tbcontrl.cxx | 1
svx/source/tbxctrls/tbunocontroller.cxx | 1
svx/source/tbxctrls/tbxcolorupdate.cxx | 1
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 2
svx/source/xoutdev/xattr2.cxx | 1
svx/source/xoutdev/xtabdash.cxx | 1
svx/source/xoutdev/xtabgrdt.cxx | 1
svx/source/xoutdev/xtabhtch.cxx | 1
svx/source/xoutdev/xtablend.cxx | 1
sw/qa/extras/rtfimport/rtfimport.cxx | 1
sw/source/core/access/acccontext.cxx | 1
sw/source/core/access/accfield.cxx | 1
sw/source/core/bastyp/init.cxx | 1
sw/source/core/crsr/crsrsh.cxx | 1
sw/source/core/crsr/findattr.cxx | 1
sw/source/core/crsr/viscrs.cxx | 1
sw/source/core/doc/docdesc.cxx | 1
sw/source/core/edit/edtox.cxx | 1
sw/source/core/layout/paintfrm.cxx | 1
sw/source/core/unocore/unoobj.cxx | 1
sw/source/core/view/pagepreviewlayout.cxx | 2
sw/source/core/view/vdraw.cxx | 1
sw/source/filter/ww8/ww8atr.cxx | 2
sw/source/filter/ww8/ww8scan.cxx | 2
sw/source/ui/app/docshini.cxx | 1
sw/source/ui/chrdlg/drpcps.cxx | 1
sw/source/ui/config/optload.cxx | 2
sw/source/ui/config/optpage.cxx | 2
sw/source/ui/dbui/mailmergehelper.cxx | 2
sw/source/ui/dbui/mmoutputpage.cxx | 2
sw/source/ui/docvw/AnnotationMenuButton.cxx | 1
sw/source/ui/docvw/DashedLine.cxx | 1
sw/source/ui/docvw/HeaderFooterWin.cxx | 1
sw/source/ui/docvw/PageBreakWin.cxx | 2
sw/source/ui/docvw/PostItMgr.cxx | 1
sw/source/ui/docvw/SidebarTxtControl.cxx | 1
sw/source/ui/docvw/SidebarWin.cxx | 1
sw/source/ui/docvw/srcedtw.cxx | 1
sw/source/ui/envelp/envlop1.cxx | 2
sw/source/ui/envelp/labfmt.cxx | 2
sw/source/ui/envelp/mailmrge.cxx | 2
sw/source/ui/frmdlg/colex.cxx | 1
sw/source/ui/frmdlg/column.cxx | 2
sw/source/ui/frmdlg/wrap.cxx | 2
sw/source/ui/misc/outline.cxx | 2
sw/source/ui/misc/swruler.cxx | 1
sw/source/ui/ribbar/inputwin.cxx | 1
sw/source/ui/ribbar/workctrl.cxx | 1
sw/source/ui/sidebar/PageColumnControl.cxx | 1
sw/source/ui/sidebar/PageMarginControl.cxx | 1
sw/source/ui/sidebar/PageOrientationControl.cxx | 1
sw/source/ui/sidebar/PageSizeControl.cxx | 1
sw/source/ui/sidebar/WrapPropertyPanel.cxx | 1
sw/source/ui/table/tautofmt.cxx | 2
sw/source/ui/uiview/pview.cxx | 2
sw/source/ui/uiview/view2.cxx | 1
sw/source/ui/uiview/viewport.cxx | 3
sw/source/ui/utlui/attrdesc.cxx | 2
sw/source/ui/utlui/content.cxx | 1
sw/source/ui/utlui/glbltree.cxx | 2
sw/source/ui/utlui/navipi.cxx | 1
sw/source/ui/utlui/unotools.cxx | 1
toolkit/source/awt/animatedimagespeer.cxx | 1
toolkit/source/awt/scrollabledialog.cxx | 1
toolkit/source/awt/vclxaccessiblecomponent.cxx | 1
toolkit/source/awt/vclxwindow.cxx | 1
toolkit/source/awt/vclxwindows.cxx | 1
toolkit/source/controls/grid/sortablegriddatamodel.cxx | 1
uui/source/iahndl-ssl.cxx | 1
vcl/generic/print/genprnpsp.cxx | 1
vcl/generic/print/genpspgraphics.cxx | 1
vcl/inc/svdata.hxx | 1
vcl/source/app/dbggui.cxx | 1
vcl/source/app/help.cxx | 1
vcl/source/app/svdata.cxx | 1
vcl/source/control/button.cxx | 1
vcl/source/control/combobox.cxx | 1
vcl/source/control/ctrl.cxx | 10
vcl/source/control/edit.cxx | 1
vcl/source/control/field.cxx | 1
vcl/source/control/field2.cxx | 1
vcl/source/control/fixed.cxx | 2
vcl/source/control/group.cxx | 1
vcl/source/control/lstbox.cxx | 1
vcl/source/control/menubtn.cxx | 1
vcl/source/control/prgsbar.cxx | 1
vcl/source/control/quickselectionengine.cxx | 1
vcl/source/control/scrbar.cxx | 1
vcl/source/control/slider.cxx | 2
vcl/source/control/spinbtn.cxx | 1
vcl/source/control/spinfld.cxx | 1
vcl/source/control/tabctrl.cxx | 1
vcl/source/edit/texteng.cxx | 3
vcl/source/edit/textview.cxx | 1
vcl/source/edit/vclmedit.cxx | 1
vcl/source/edit/xtextedt.cxx | 1
vcl/source/filter/graphicfilter.cxx | 1
vcl/source/gdi/base14.cxx | 1
vcl/source/gdi/bitmapex.cxx | 1
vcl/source/gdi/imagerepository.cxx | 1
vcl/source/gdi/impimage.cxx | 1
vcl/source/gdi/outdev.cxx | 5
vcl/source/gdi/outdev3.cxx | 1
vcl/source/gdi/outdev4.cxx | 1
vcl/source/gdi/pdfwriter_impl.cxx | 1
vcl/source/gdi/pdfwriter_impl.hxx | 1
vcl/source/gdi/salgdilayout.cxx | 1
vcl/source/gdi/wall.cxx | 2
vcl/source/window/brdwin.cxx | 1
vcl/source/window/builder.cxx | 1
vcl/source/window/dialog.cxx | 2
vcl/source/window/dlgctrl.cxx | 3
vcl/source/window/dndevdis.cxx | 1
vcl/source/window/dockingarea.cxx | 1
vcl/source/window/dockmgr.cxx | 1
vcl/source/window/dockwin.cxx | 1
vcl/source/window/floatwin.cxx | 1
vcl/source/window/layout.cxx | 1
vcl/source/window/menu.cxx | 1
vcl/source/window/mnemonicengine.cxx | 1
vcl/source/window/msgbox.cxx | 2
vcl/source/window/printdlg.cxx | 1
vcl/source/window/split.cxx | 1
vcl/source/window/splitwin.cxx | 1
vcl/source/window/status.cxx | 1
vcl/source/window/tabpage.cxx | 1
vcl/source/window/toolbox.cxx | 1
vcl/source/window/toolbox2.cxx | 1
vcl/source/window/window.cxx | 21 -
vcl/source/window/window2.cxx | 1
vcl/unx/generic/app/saldisp.cxx | 2
vcl/unx/generic/dtrans/bmp.cxx | 1
vcl/unx/generic/gdi/salgdi3.cxx | 2
vcl/unx/generic/printer/ppdparser.cxx | 1
vcl/unx/gtk/app/gtkinst.cxx | 3
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 1
vcl/unx/gtk/window/gtksalframe.cxx | 2
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 1
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 1
writerfilter/source/rtftok/rtftokenizer.cxx | 1
xmlsecurity/inc/xmlsecurity/certificatechooser.hxx | 1
xmlsecurity/inc/xmlsecurity/macrosecurity.hxx | 2
xmlsecurity/source/dialogs/certificateviewer.cxx | 2
623 files changed, 902 insertions(+), 134 deletions(-)
New commits:
commit a18a1a454505193b922e1d5dc3215526f01f5efd
Author: Tobias Lippert <drtl at fastmail.fm>
Date: Thu Jan 2 23:52:37 2014 +0100
Remove vcl/settings.hxx from vcl/svapp.hxx and vcl/outdev.hxx
Added vcl/settings.hxx to all cxx files which require it.
This helps to speed up compilation after changes to the settings.
Conflicts:
sc/source/ui/dbgui/pvlaydlg.cxx
Change-Id: I211a0735c47f72d6879f6f15339355abfe0e3cf4
Reviewed-on: https://gerrit.libreoffice.org/7933
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 437dc48..acbda97 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -27,6 +27,7 @@
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <vcl/svapp.hxx>
#include <vcl/controllayout.hxx>
+#include <vcl/settings.hxx>
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/convert.hxx>
#include <unotools/accessiblestatesethelper.hxx>
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index cdbf943..eb6b9f2 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -30,6 +30,7 @@
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <vcl/svapp.hxx>
#include <vcl/controllayout.hxx>
+#include <vcl/settings.hxx>
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/convert.hxx>
#include <unotools/accessiblestatesethelper.hxx>
diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx
index 8e1730b..96812cc 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -27,6 +27,7 @@
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <toolkit/awt/vclxfont.hxx>
#include <toolkit/helper/convert.hxx>
diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx
index 3fe2426..090e0bf 100644
--- a/accessibility/source/extended/accessibletabbarpage.cxx
+++ b/accessibility/source/extended/accessibletabbarpage.cxx
@@ -26,6 +26,7 @@
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <toolkit/helper/convert.hxx>
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx
index 8899086..57c054d 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -27,6 +27,7 @@
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <toolkit/helper/convert.hxx>
diff --git a/accessibility/source/helper/accresmgr.cxx b/accessibility/source/helper/accresmgr.cxx
index 953ebde..2251266 100644
--- a/accessibility/source/helper/accresmgr.cxx
+++ b/accessibility/source/helper/accresmgr.cxx
@@ -21,6 +21,7 @@
#include <tools/simplerm.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
using namespace accessibility;
// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx
index 3bf4d15..1db0ff7 100644
--- a/accessibility/source/standard/accessiblemenucomponent.cxx
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -34,7 +34,7 @@
#include <vcl/window.hxx>
#include <vcl/menu.hxx>
#include <vcl/unohelp2.hxx>
-
+#include <vcl/settings.hxx>
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index 04f531e..1e0cdbc 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -41,7 +41,7 @@
#include <vcl/window.hxx>
#include <vcl/menu.hxx>
#include <vcl/unohelp2.hxx>
-
+#include <vcl/settings.hxx>
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index d4b2408..21e1d45 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -33,6 +33,7 @@
#include <vcl/svapp.hxx>
#include <vcl/controllayout.hxx>
#include <vcl/unohelp2.hxx>
+#include <vcl/settings.hxx>
#include <toolkit/awt/vclxwindow.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx
index 3a11316..740ce1a 100644
--- a/accessibility/source/standard/vclxaccessiblemenubar.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx
@@ -23,7 +23,7 @@
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <vcl/menu.hxx>
-
+#include <vcl/settings.hxx>
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index cc426a9..c72ae8e 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -35,6 +35,7 @@
#include <vcl/window.hxx>
#include <vcl/menu.hxx>
#include <vcl/unohelp2.hxx>
+#include <vcl/settings.hxx>
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
diff --git a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
index 5e90402..3db137b 100644
--- a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
+++ b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
@@ -21,6 +21,7 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index dbf5d30..7659f31 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -34,6 +34,7 @@
#include <vcl/unohelp2.hxx>
#include <vcl/status.hxx>
#include <vcl/controllayout.hxx>
+#include <vcl/settings.hxx>
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx
index f4a5e13..a1b2646 100644
--- a/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpage.cxx
@@ -34,6 +34,7 @@
#include <vcl/unohelp2.hxx>
#include <vcl/tabctrl.hxx>
#include <vcl/tabpage.hxx>
+#include <vcl/settings.hxx>
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
index d0002ab..598ac7e 100644
--- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
+++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
@@ -31,6 +31,7 @@
#include <vcl/svapp.hxx>
#include <vcl/unohelp2.hxx>
#include <vcl/ctrl.hxx>
+#include <vcl/settings.hxx>
#include <vector>
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index f63f0e4..f32aab0 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -35,6 +35,7 @@
#include <vcl/toolbox.hxx>
#include <vcl/unohelp2.hxx>
#include <vcl/help.hxx>
+#include <vcl/settings.hxx>
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/externallock.hxx>
#include <unotools/accessiblestatesethelper.hxx>
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index c0f28c0..b0b84fa 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -26,6 +26,7 @@
#include <tools/time.hxx>
#include <svtools/miscopt.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <vcl/lstbox.hxx>
#include <unotools/syslocale.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx
index 686a22b..d3e9199 100644
--- a/avmedia/source/framework/mediamisc.cxx
+++ b/avmedia/source/framework/mediamisc.cxx
@@ -20,6 +20,7 @@
#include <tools/resmgr.hxx>
#include <svl/solar.hrc>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
namespace avmedia {
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index c9dd46d..4078efe 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -33,6 +33,7 @@
#include <toolkit/helper/convert.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
namespace basctl
{
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index 6138f29..dc48285 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -36,6 +36,7 @@
#include <toolkit/helper/externallock.hxx>
#include <toolkit/helper/convert.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
namespace basctl
{
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 520b61c..1aa12a4 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -49,6 +49,7 @@
#include <svl/visitem.hxx>
#include <svl/whiter.hxx>
#include <vcl/xtextedt.hxx>
+#include <vcl/settings.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/msgbox.hxx>
#include <cassert>
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 4d8f0d9..07b0a99 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -44,6 +44,7 @@
#include <svl/urihelper.hxx>
#include <vcl/xtextedt.hxx>
#include <vcl/txtattr.hxx>
+#include <vcl/settings.hxx>
#include <svtools/textwindowpeer.hxx>
#include <tools/stream.hxx>
#include <comphelper/syntaxhighlight.hxx>
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 14ef27f..d7b2167 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -52,6 +52,7 @@
#include <tools/diagnose_ex.h>
#include <tools/urlobj.hxx>
#include <vcl/msgbox.hxx>
+#include <vcl/settings.hxx>
#include <xmlscript/xmldlg_imexp.hxx>
namespace basctl
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 03a31ee..1100f46 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -55,6 +55,7 @@
#include <svx/xmlsecctrl.hxx>
#include <sfx2/viewfac.hxx>
#include <vcl/msgbox.hxx>
+#include <vcl/settings.hxx>
namespace basctl
{
diff --git a/basctl/source/basicide/bastype3.hxx b/basctl/source/basicide/bastype3.hxx
index ca2da15..26f4875 100644
--- a/basctl/source/basicide/bastype3.hxx
+++ b/basctl/source/basicide/bastype3.hxx
@@ -22,6 +22,7 @@
#include <svheader.hxx>
#include <svtools/svmedit.hxx>
#include <iderid.hxx>
+#include <vcl/accel.hxx>
namespace basctl
{
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index dd20ff6..a370b34 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -41,6 +41,7 @@
#include <svl/srchitem.hxx>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/script/XLibraryContainerPassword.hpp>
+#include <vcl/settings.hxx>
#include <boost/scoped_ptr.hpp>
diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx
index 344345f..0770a1b 100644
--- a/basctl/source/basicide/layout.cxx
+++ b/basctl/source/basicide/layout.cxx
@@ -20,6 +20,7 @@
#include "layout.hxx"
#include "bastypes.hxx"
+#include <vcl/settings.hxx>
#include <boost/make_shared.hpp>
diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx
index 3ee023b..22eb1ff 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -12,6 +12,7 @@
#include <vcl/xtextedt.hxx>
#include <vcl/textview.hxx>
+#include <vcl/settings.hxx>
namespace basctl
{
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index e313641..fb10cd4 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -37,6 +37,7 @@
#include <vcl/unohelp.hxx>
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
+#include <vcl/settings.hxx>
namespace basctl
{
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 94637f3..ca39856 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -8,6 +8,7 @@
*/
#include "basictest.hxx"
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <comphelper/processfactory.hxx>
using namespace ::com::sun::star;
diff --git a/basic/source/classes/global.cxx b/basic/source/classes/global.cxx
index 2efb9da..f0fa742 100644
--- a/basic/source/classes/global.cxx
+++ b/basic/source/classes/global.cxx
@@ -12,6 +12,7 @@
#include <rtl/instance.hxx>
#include <unotools/transliterationwrapper.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include "global.hxx"
diff --git a/basic/source/comp/basiccharclass.cxx b/basic/source/comp/basiccharclass.cxx
index 529be3f..59ae724 100644
--- a/basic/source/comp/basiccharclass.cxx
+++ b/basic/source/comp/basiccharclass.cxx
@@ -21,6 +21,7 @@
#include <unotools/charclass.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
BasicCharClass::BasicCharClass()
{
diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx
index 59be107..6438b5b 100644
--- a/basic/source/runtime/basrdll.cxx
+++ b/basic/source/runtime/basrdll.cxx
@@ -22,6 +22,7 @@
#include <svl/solar.hrc>
#include <tools/debug.hxx>
#include <vcl/msgbox.hxx>
+#include <vcl/settings.hxx>
#include <basic/sbstar.hxx>
#include <basic/basrdll.hxx>
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index efbd2da..9749ece 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -26,6 +26,7 @@
#include <vcl/mapmod.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/timer.hxx>
+#include <vcl/settings.hxx>
#include <basic/sbxvar.hxx>
#include <basic/sbx.hxx>
#include <svl/zforlist.hxx>
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 83e81e6..2adbc61 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -39,6 +39,7 @@
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <rtl/instance.hxx>
#include <rtl/math.hxx>
diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx
index 6db87a7..65d4940 100644
--- a/basic/source/sbx/sbxdate.cxx
+++ b/basic/source/sbx/sbxdate.cxx
@@ -18,6 +18,7 @@
*/
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <svl/zforlist.hxx>
#include <tools/errcode.hxx>
#include <tools/color.hxx>
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 43620d3..c3b52f0 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -26,6 +26,8 @@
#include <stdlib.h>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
+
#include <math.h>
#include <string.h>
#include <ctype.h>
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index aa99cff..c732212 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -47,6 +47,8 @@
#include <vcl/unohelp.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/window.hxx>
+#include <vcl/graph.hxx>
+#include <vcl/settings.hxx>
#include <algorithm>
#include <o3tl/compat_functional.hxx>
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 342facf..3d6f4c4 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -53,6 +53,7 @@
#include <comphelper/InlineContainer.hxx>
#include <comphelper/processfactory.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <com/sun/star/drawing/ShapeCollection.hpp>
#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 5cdda02..43f560f 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -39,6 +39,7 @@
// header for class Bitmap
#include <vcl/bitmap.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 6836e8f..01ea4c2 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -41,6 +41,7 @@
#include <vcl/image.hxx>
#include <vcl/layout.hxx>
#include <vcl/msgbox.hxx>
+#include <vcl/settings.hxx>
#include <rtl/math.hxx>
#include <com/sun/star/util/XCloneable.hpp>
diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
index 47e00d2..b392b71 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
@@ -29,6 +29,7 @@
#include <com/sun/star/chart2/XAxis.hpp>
#include <com/sun/star/chart2/XDiagram.hpp>
+#include <vcl/settings.hxx>
using ::com::sun::star::uno::Reference;
using namespace ::com::sun::star;
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
index 7b6743d..05b04b0 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
@@ -21,6 +21,7 @@
#include "ResId.hxx"
#include "TabPages.hrc"
#include "TabPageNotifiable.hxx"
+#include <vcl/settings.hxx>
using namespace ::com::sun::star;
diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx
index cbe03b0..f8633d8 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.cxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.cxx
@@ -20,6 +20,7 @@
#include "tp_Trendline.hxx"
#include "ResId.hxx"
#include "TabPages.hrc"
+#include <vcl/settings.hxx>
namespace chart
{
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 439c13c..f51dd49 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -69,6 +69,7 @@
// header for class SdrDragMethod
#include <svx/svddrgmt.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <osl/mutex.hxx>
// for InfoBox
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index a1c3870..c56489f 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -22,6 +22,7 @@
#include "HelpIds.hrc"
#include <vcl/help.hxx>
+#include <vcl/settings.hxx>
using namespace ::com::sun::star;
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index 003e335..22e78a1 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -49,6 +49,7 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/storagehelper.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <algorithm>
#include <functional>
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index 7aa0f97..a683903 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -57,6 +57,7 @@
#include <svl/zformat.hxx>
// header for class Application
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 7402c3d..ddef600 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -29,6 +29,7 @@
#include <vcl/toolbox.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/virdev.hxx>
+#include <vcl/settings.hxx>
#include <sfx2/app.hxx>
#include <sfx2/sfxdlg.hxx>
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 255817f..1b984c5 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -22,6 +22,7 @@
#include <vcl/menu.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/scrbar.hxx>
+#include <vcl/settings.hxx>
#include <SpellAttrib.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/bindings.hxx>
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 1591f4e..e4bdbb5 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -20,6 +20,7 @@
#include <vcl/layout.hxx>
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
+#include <vcl/settings.hxx>
#include <tools/stream.hxx>
#include <rtl/bootstrap.hxx>
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 782421f..952bf39 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -30,6 +30,7 @@
#include <svx/ucsubset.hxx>
#include <sfx2/objsh.hxx>
#include <vcl/msgbox.hxx>
+#include <vcl/settings.hxx>
#include <svl/stritem.hxx>
#include <cuires.hrc>
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 3768911..2e8b446 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -31,6 +31,7 @@
#include <svtools/apearcfg.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/i18nhelp.hxx>
+#include <vcl/settings.hxx>
using ::std::vector;
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 7319f4a..458f310f 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -60,6 +60,7 @@
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
+#include <vcl/settings.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 87c672c..0e3886b 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -32,6 +32,7 @@
#include <sot/stg.hxx>
#include <svtools/sores.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <dialmgr.hxx>
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index e9769ab..e4ba4c0 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -22,6 +22,7 @@
#include <tools/time.hxx>
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
+#include <vcl/settings.hxx>
#include <svl/itempool.hxx>
#include <svl/itemset.hxx>
#include <unotools/useroptions.hxx>
diff --git a/cui/source/factory/cuiresmgr.cxx b/cui/source/factory/cuiresmgr.cxx
index 318ce4d..5409156 100644
--- a/cui/source/factory/cuiresmgr.cxx
+++ b/cui/source/factory/cuiresmgr.cxx
@@ -20,6 +20,7 @@
#include <dialmgr.hxx>
#include <svl/solar.hrc>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
// struct DialogsResMgr --------------------------------------------------
ResMgr* CuiResMgr::GetResMgr()
diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx
index 74ed494..13255ef 100644
--- a/cui/source/options/optHeaderTabListbox.cxx
+++ b/cui/source/options/optHeaderTabListbox.cxx
@@ -19,6 +19,7 @@
#include "optHeaderTabListbox.hxx"
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <svtools/headbar.hxx>
#include <svtools/svlbitm.hxx>
#include <svtools/treelistentry.hxx>
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 98852705..4e37694 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -33,6 +33,7 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/objsh.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <comphelper/processfactory.hxx>
#include <unotools/localedatawrapper.hxx>
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 846e5e9..16f3655 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -30,6 +30,7 @@
#include <unotools/moduleoptions.hxx>
#include <unotools/pathoptions.hxx>
#include <vcl/msgbox.hxx>
+#include <vcl/settings.hxx>
#include <boost/shared_ptr.hpp>
#include <svx/svxdlg.hxx>
#include <helpid.hrc>
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 3f65a6b..5476f8d 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -28,6 +28,7 @@
#include <unotools/intlwrapper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
+#include <vcl/settings.hxx>
#include <svx/dialogs.hrc>
#include <linguistic/misc.hxx>
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 682469f..e2544a6 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -84,6 +84,7 @@
#include <com/sun/star/office/Quickstart.hpp>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include "optgdlg.hxx"
#include <svx/ofaitem.hxx>
@@ -537,6 +538,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "OptViewPage", "cui/ui/optviewpage.ui", rSet)
, nSizeLB_InitialSelection(0)
, nStyleLB_InitialSelection(0)
+ , aIconStyleItemId(STYLE_SYMBOLS_THEMES_MAX, 0)
, pAppearanceCfg(new SvtTabAppearanceCfg)
, pCanvasSettings(new CanvasSettings)
, mpDrawinglayerOpt(new SvtOptionsDrawinglayer)
@@ -625,10 +627,10 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet)
// prefer the icon style set by the desktop native widgets modules
sal_uLong nAutoStyle = aStyleSettings.GetPreferredSymbolsStyle();
// fallback to the statically defined values
- if ( nAutoStyle == STYLE_SYMBOLS_AUTO || !aIconStyleItemId[nAutoStyle] )
+ if ( nAutoStyle == STYLE_SYMBOLS_AUTO || !aIconStyleItemId.at(nAutoStyle) )
nAutoStyle = aStyleSettings.GetAutoSymbolsStyle();
- if ( aIconStyleItemId[nAutoStyle] )
- aAutoStr += m_pIconStyleLB->GetEntry( aIconStyleItemId[nAutoStyle] );
+ if ( aIconStyleItemId.at(nAutoStyle) )
+ aAutoStr += m_pIconStyleLB->GetEntry( aIconStyleItemId.at(nAutoStyle) );
m_pIconStyleLB->RemoveEntry( 0 );
m_pIconStyleLB->InsertEntry( aAutoStr += ")", 0 );
@@ -879,7 +881,7 @@ void OfaViewTabPage::Reset( const SfxItemSet& )
m_pIconSizeLB->SaveValue();
if( aMiscOptions.GetSymbolsStyle() != STYLE_SYMBOLS_AUTO )
- nStyleLB_InitialSelection = aIconStyleItemId[aMiscOptions.GetCurrentSymbolsStyle()];
+ nStyleLB_InitialSelection = aIconStyleItemId.at(aMiscOptions.GetCurrentSymbolsStyle());
m_pIconStyleLB->SelectEntryPos( nStyleLB_InitialSelection );
m_pIconStyleLB->SaveValue();
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 3b5799f..6f2f7c8 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -106,7 +106,7 @@ private:
// item ID for the given icon theme
// might be zero when the theme is not installed and the item is removed
- sal_uLong aIconStyleItemId[STYLE_SYMBOLS_THEMES_MAX];
+ std::vector<unsigned> aIconStyleItemId;
SvtTabAppearanceCfg* pAppearanceCfg;
CanvasSettings* pCanvasSettings;
SvtOptionsDrawinglayer* mpDrawinglayerOpt;
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 4f99dba..0ff50b9 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -25,6 +25,7 @@
#include <unotools/saveopt.hxx>
#include <svl/intitem.hxx>
#include <vcl/edit.hxx>
+#include <vcl/settings.hxx>
#include <cuires.hrc>
#include <unotools/useroptions.hxx>
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index f6e2be5..8b6a21c 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -20,6 +20,7 @@
#include <vcl/msgbox.hxx>
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
+#include <vcl/settings.hxx>
#include <tools/shl.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <unotools/lingucfg.hxx>
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 20990c3..a697b9f 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -18,6 +18,7 @@
*/
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <sfx2/filedlghelper.hxx>
#include <svl/zforlist.hxx>
#include "optupdt.hxx"
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index b9c6aee..0588e38 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -19,6 +19,7 @@
#include <vcl/edit.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/system/SystemShellExecute.hpp>
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 13dc1e8..aa4d775 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -97,6 +97,7 @@
#include <vcl/layout.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/waitobj.hxx>
+#include <vcl/settings.hxx>
#include "svtools/treelistentry.hxx"
#ifdef LINUX
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index f033a6d..4c05ba4 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -40,6 +40,7 @@
#include <svx/flagsdef.hxx>
#include <svl/intitem.hxx>
#include <sfx2/request.hxx>
+#include <vcl/settings.hxx>
namespace svx {
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index a438073..8016ee4 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -22,6 +22,7 @@
#include <vcl/msgbox.hxx>
#include <vcl/field.hxx>
#include <vcl/keycodes.hxx>
+#include <vcl/settings.hxx>
#include <sot/exchange.hxx>
#include <svtools/transfer.hxx>
#include <unotools/syslocale.hxx>
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index c7d9c9a..b6d2e42 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -20,6 +20,7 @@
#include <unotools/pathoptions.hxx>
#include <vcl/builder.hxx>
#include <vcl/msgbox.hxx>
+#include <vcl/settings.hxx>
#include <tools/urlobj.hxx>
#include <sfx2/dialoghelper.hxx>
#include <sfx2/objsh.hxx>
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index ed31b01..84ab485 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -36,6 +36,7 @@
#include <dialmgr.hxx>
#include <sfx2/htmlmode.hxx>
#include <vcl/msgbox.hxx>
+#include <vcl/settings.hxx>
#include "svx/flagsdef.hxx"
#include <sfx2/request.hxx>
#include <svl/intitem.hxx>
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 0c049c4..e4bc0ae 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -33,6 +33,7 @@
#include <cuires.hrc>
#include <svx/dialogs.hrc>
#include <vcl/builder.hxx>
+#include <vcl/settings.hxx>
#define CM_1_TO_TWIP 567
#define TWIP_TO_INCH 1440
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 1fd3866..4795f17 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -24,6 +24,7 @@
#include <sfx2/module.hxx>
#include <swpossizetabpage.hxx>
#include <tools/shl.hxx>
+#include <vcl/settings.hxx>
#include <svx/dialogs.hrc>
#include <svx/svddef.hxx>
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 28fe6fc..4c462c3 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -23,6 +23,7 @@
#include <sfx2/module.hxx>
#include <sfx2/request.hxx>
#include <tools/shl.hxx>
+#include <vcl/settings.hxx>
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index c3deb390..5fc426d 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -22,6 +22,7 @@
#include <sfx2/objsh.hxx>
#include <vcl/builder.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <unotools/localedatawrapper.hxx>
#include <i18nlangtag/lang.h>
#include <svx/dialogs.hrc>
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 364247c..d934505 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -38,6 +38,7 @@
#include <sfx2/objsh.hxx>
#include <vcl/graph.hxx>
#include <vcl/msgbox.hxx>
+#include <vcl/settings.hxx>
#include "cuicharmap.hxx"
#include <editeng/flstitem.hxx>
#include <svx/dlgutil.hxx>
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 8e3b90a..8e10a77 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -21,6 +21,7 @@
#include <tools/shl.hxx>
#include <svtools/ruler.hxx>
#include <svx/dialogs.hrc>
+#include <vcl/settings.hxx>
#include <cuires.hrc>
#include <editeng/lrspitem.hxx>
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index ec2f06d..fff7dcf 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -30,6 +30,7 @@
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
#include <svx/dialmgr.hxx>
#include <vcl/bmpacc.hxx>
+#include <vcl/settings.hxx>
#include <svx/dialogs.hrc>
#include <cuires.hrc>
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 6144ade..327d582 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -20,6 +20,7 @@
#include <tools/shl.hxx>
#include <tools/urlobj.hxx>
#include <vcl/msgbox.hxx>
+#include <vcl/settings.hxx>
#include <unotools/pathoptions.hxx>
#include <sfx2/app.hxx>
#include <sfx2/dialoghelper.hxx>
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 70ecfa9..de6311b 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -51,6 +51,7 @@
#include "sfx2/opengrf.hxx"
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
+#include <vcl/settings.hxx>
#define MAX_BMP_WIDTH 16
#define MAX_BMP_HEIGHT 16
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 44d1413..0189334 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -20,6 +20,7 @@
#include <tools/shl.hxx>
#include <tools/urlobj.hxx>
#include <vcl/msgbox.hxx>
+#include <vcl/settings.hxx>
#include <unotools/pathoptions.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index b45c775..e12ded3 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -20,6 +20,7 @@
#include <tools/shl.hxx>
#include <tools/urlobj.hxx>
#include <vcl/msgbox.hxx>
+#include <vcl/settings.hxx>
#include <unotools/pathoptions.hxx>
#include <sfx2/app.hxx>
#include <sfx2/filedlghelper.hxx>
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 996b7b2..d01342b 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -108,6 +108,7 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
dbaccess/source/ui/control/ColumnControlWindow \
dbaccess/source/ui/control/curledit \
dbaccess/source/ui/control/dbtreelistbox \
+ dbaccess/source/ui/control/FieldControls \
dbaccess/source/ui/control/FieldDescControl \
dbaccess/source/ui/control/listviewitems \
dbaccess/source/ui/control/marktree \
diff --git a/dbaccess/source/core/resource/core_resource.cxx b/dbaccess/source/core/resource/core_resource.cxx
index 66140cf..471d049 100644
--- a/dbaccess/source/core/resource/core_resource.cxx
+++ b/dbaccess/source/core/resource/core_resource.cxx
@@ -23,6 +23,7 @@
// ---- needed as long as we have no contexts for components ---
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <rtl/instance.hxx>
#include <svl/solar.hrc>
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 6211f55..001c174 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -59,6 +59,7 @@
#include "databaseobjectview.hxx"
#include "imageprovider.hxx"
#include <vcl/waitobj.hxx>
+#include <vcl/settings.hxx>
#include <tools/stream.hxx>
#include <rtl/ustrbuf.hxx>
#include "IApplicationController.hxx"
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 0495f50..130a39c 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -32,6 +32,7 @@
#include "listviewitems.hxx"
#include <vcl/image.hxx>
#include <vcl/mnemonic.hxx>
+#include <vcl/settings.hxx>
#include "browserids.hxx"
#include "AppDetailPageHelper.hxx"
#include <vcl/svapp.hxx>
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index f5cc75e..05253c2 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -26,6 +26,7 @@
#include <vcl/syswin.hxx>
#include <vcl/menu.hxx>
#include <vcl/mnemonic.hxx>
+#include <vcl/settings.hxx>
#include "IApplicationController.hxx"
using namespace ::dbaui;
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index 381ed4a..3f794cf 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -21,6 +21,7 @@
#include "moduledbu.hxx"
#include "memory"
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <tools/debug.hxx>
namespace dbaui
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index d35e8cd..056aa43 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -36,6 +36,7 @@
#include "tabletree.hxx"
#include "AppSwapWindow.hxx"
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include "AppTitleWindow.hxx"
#include "dsntypes.hxx"
#include "dbustrings.hrc"
diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx
index 8a3d7a7..edd48b4 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -28,6 +28,7 @@
#include <sfx2/sfx.hrc>
#include <svtools/imgdef.hxx>
#include <tools/diagnose_ex.h>
+#include <vcl/settings.hxx>
namespace dbaui
{
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index aa502ff..44d0880 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -125,6 +125,7 @@
#include <vcl/toolbox.hxx>
#include <vcl/waitobj.hxx>
#include <vcl/wrkwin.hxx>
+#include <vcl/settings.hxx>
#include <memory>
diff --git a/dbaccess/source/ui/control/FieldControls.cxx b/dbaccess/source/ui/control/FieldControls.cxx
new file mode 100644
index 0000000..9d9ea9e
--- /dev/null
+++ b/dbaccess/source/ui/control/FieldControls.cxx
@@ -0,0 +1,123 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "FieldControls.hxx"
+#include "SqlNameEdit.hxx"
+
+#include <vcl/settings.hxx>
+
+namespace dbaui {
+
+namespace {
+
+void lcl_setSpecialReadOnly( sal_Bool _bReadOnly, Window* _pWin )
+{
+ StyleSettings aSystemStyle = Application::GetSettings().GetStyleSettings();
+ const Color& rNewColor = _bReadOnly ? aSystemStyle.GetDialogColor() : aSystemStyle.GetFieldColor();
+ _pWin->SetBackground(Wallpaper(rNewColor));
+ _pWin->SetControlBackground(rNewColor);
+}
+
+}
+
+OPropColumnEditCtrl::OPropColumnEditCtrl(Window* pParent,
+ rtl::OUString& _rAllowedChars,
+ sal_uInt16 nHelpId,
+ short nPosition,
+ WinBits nWinStyle)
+ :OSQLNameEdit(pParent, nWinStyle, _rAllowedChars)
+ ,m_nPos(nPosition)
+{
+ m_strHelpText = ModuleRes(nHelpId);
+}
+
+void
+OPropColumnEditCtrl::SetSpecialReadOnly(sal_Bool _bReadOnly)
+{
+ SetReadOnly(_bReadOnly);
+ lcl_setSpecialReadOnly(_bReadOnly,this);
+}
+
+
+
+OPropEditCtrl::OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
+ :Edit(pParent, nWinStyle)
+ ,m_nPos(nPosition)
+{
+ m_strHelpText = ModuleRes(nHelpId);
+}
+
+OPropEditCtrl::OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition)
+ :Edit(pParent, _rRes)
+ ,m_nPos(nPosition)
+{
+ m_strHelpText = ModuleRes(nHelpId);
+}
+
+void
+OPropEditCtrl::SetSpecialReadOnly(sal_Bool _bReadOnly)
+{
+ SetReadOnly(_bReadOnly);
+ lcl_setSpecialReadOnly(_bReadOnly,this);
+}
+
+void
+OPropNumericEditCtrl::SetSpecialReadOnly(sal_Bool _bReadOnly)
+{
+ SetReadOnly(_bReadOnly);
+ lcl_setSpecialReadOnly(_bReadOnly,this);
+}
+
+
+OPropNumericEditCtrl::OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
+ :NumericField(pParent, nWinStyle)
+ ,m_nPos(nPosition)
+{
+ m_strHelpText = ModuleRes(nHelpId);
+}
+
+OPropNumericEditCtrl::OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition)
+ :NumericField(pParent, _rRes)
+ ,m_nPos(nPosition)
+{
+ m_strHelpText = ModuleRes(nHelpId);
+}
+
+OPropListBoxCtrl::OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
+ :ListBox(pParent, nWinStyle)
+ ,m_nPos(nPosition)
+{
+ m_strHelpText = ModuleRes(nHelpId);
+}
+OPropListBoxCtrl::OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition)
+ :ListBox(pParent, _rRes)
+ ,m_nPos(nPosition)
+{
+ m_strHelpText = ModuleRes(nHelpId);
+}
+
+
+void
+OPropListBoxCtrl::SetSpecialReadOnly(sal_Bool _bReadOnly)
+{
+ SetReadOnly(_bReadOnly);
+ lcl_setSpecialReadOnly(_bReadOnly,this);
+}
+
+} // end namespace dbaui
diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx
index fa9cb54..b14bf5a 100644
--- a/dbaccess/source/ui/control/VertSplitView.cxx
+++ b/dbaccess/source/ui/control/VertSplitView.cxx
@@ -21,6 +21,7 @@
#include <tools/debug.hxx>
#include <vcl/split.hxx>
+#include <vcl/settings.hxx>
#define SPLITTER_WIDTH 80
diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx
index 98165e9..4799a80 100644
--- a/dbaccess/source/ui/control/curledit.cxx
+++ b/dbaccess/source/ui/control/curledit.cxx
@@ -19,6 +19,7 @@
#include "curledit.hxx"
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <osl/diagnose.h>
namespace dbaui
diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx
index f60b59d..b012cba 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -20,6 +20,7 @@
#include "marktree.hxx"
#include "dbu_control.hrc"
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
namespace dbaui
{
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index 1418c21..8f39385 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -34,6 +34,7 @@
#include "undosqledit.hxx"
#include "QueryDesignView.hxx"
#include <svl/smplhint.hxx>
+#include <vcl/settings.hxx>
using namespace dbaui;
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index d302a03..3e089a7 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -28,6 +28,7 @@
#include "indexfieldscontrol.hxx"
#include "indexcollection.hxx"
#include <vcl/msgbox.hxx>
+#include <vcl/settings.hxx>
#include <com/sun/star/sdb/SQLContext.hpp>
#include "UITools.hxx"
#include <svtools/imgdef.hxx>
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index 824abc2..e72494d 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -21,6 +21,7 @@
#include "dbu_dlg.hrc"
#include <osl/diagnose.h>
#include "dbaccess_helpid.hrc"
+#include <vcl/settings.hxx>
namespace dbaui
{
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index d7c9b67..2fabcb4 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -30,6 +30,7 @@
#include <comphelper/extract.hxx>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <tools/diagnose_ex.h>
+#include <vcl/settings.hxx>
#include <algorithm>
using namespace dbaui;
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index 15f2acb..1a76c21 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -31,6 +31,7 @@
#include <svl/stritem.hxx>
#include "dbustrings.hrc"
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <vcl/waitobj.hxx>
#include <com/sun/star/i18n/Collator.hpp>
#include <com/sun/star/sdb/SQLContext.hpp>
diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx
index 21c8ee6..cea9025 100644
--- a/dbaccess/source/ui/inc/CollectionView.hxx
+++ b/dbaccess/source/ui/inc/CollectionView.hxx
@@ -26,6 +26,7 @@
#include <vcl/fixed.hxx>
#include <com/sun/star/ucb/XContent.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
namespace dbaui
{
diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx
index aef6c7d..2724d1e 100644
--- a/dbaccess/source/ui/inc/DExport.hxx
+++ b/dbaccess/source/ui/inc/DExport.hxx
@@ -28,6 +28,7 @@
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/util/Date.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <map>
#include <vector>
#include <comphelper/stl_types.hxx>
diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx
index 0fb95c0..2503fa7 100644
--- a/dbaccess/source/ui/inc/FieldControls.hxx
+++ b/dbaccess/source/ui/inc/FieldControls.hxx
@@ -27,16 +27,6 @@
namespace dbaui
{
- namespace
- {
- void lcl_setSpecialReadOnly( sal_Bool _bReadOnly, Window* _pWin )
- {
- StyleSettings aSystemStyle = Application::GetSettings().GetStyleSettings();
- const Color& rNewColor = _bReadOnly ? aSystemStyle.GetDialogColor() : aSystemStyle.GetFieldColor();
- _pWin->SetBackground(Wallpaper(rNewColor));
- _pWin->SetControlBackground(rNewColor);
- }
- }
class OPropColumnEditCtrl : public OSQLNameEdit
{
@@ -44,29 +34,17 @@ namespace dbaui
short m_nPos;
OUString m_strHelpText;
public:
- inline OPropColumnEditCtrl(Window* pParent, OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
+ OPropColumnEditCtrl(Window* pParent, OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
virtual bool IsModified() const SAL_OVERRIDE { return GetText() != GetSavedValue(); }
short GetPos() const { return m_nPos; }
OUString GetHelp() const { return m_strHelpText; }
- virtual void SetSpecialReadOnly(sal_Bool _bReadOnly)
- {
- SetReadOnly(_bReadOnly);
- lcl_setSpecialReadOnly(_bReadOnly,this);
- }
+ virtual void SetSpecialReadOnly(sal_Bool _bReadOnly);
+
};
- inline OPropColumnEditCtrl::OPropColumnEditCtrl(Window* pParent,
- OUString& _rAllowedChars,
- sal_uInt16 nHelpId,
- short nPosition,
- WinBits nWinStyle)
- :OSQLNameEdit(pParent, nWinStyle, _rAllowedChars)
- ,m_nPos(nPosition)
- {
- m_strHelpText = ModuleRes(nHelpId);
- }
+
class OPropEditCtrl : public Edit
{
OModuleClient m_aModuleClient;
@@ -74,67 +52,34 @@ namespace dbaui
OUString m_strHelpText;
public:
- inline OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
- inline OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1);
+ OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
+ OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1);
virtual bool IsModified() const SAL_OVERRIDE { return GetText() != GetSavedValue(); }
short GetPos() const { return m_nPos; }
OUString GetHelp() const { return m_strHelpText; }
- virtual void SetSpecialReadOnly(sal_Bool _bReadOnly)
- {
- SetReadOnly(_bReadOnly);
- lcl_setSpecialReadOnly(_bReadOnly,this);
- }
+ virtual void SetSpecialReadOnly(sal_Bool _bReadOnly);
};
- inline OPropEditCtrl::OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
- :Edit(pParent, nWinStyle)
- ,m_nPos(nPosition)
- {
- m_strHelpText = ModuleRes(nHelpId);
- }
- inline OPropEditCtrl::OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition)
- :Edit(pParent, _rRes)
- ,m_nPos(nPosition)
- {
- m_strHelpText = ModuleRes(nHelpId);
- }
-
class OPropNumericEditCtrl : public NumericField
{
short m_nPos;
OUString m_strHelpText;
public:
- inline OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
- inline OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1);
+ OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
+ OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1);
virtual bool IsModified() const SAL_OVERRIDE { return GetText() != GetSavedValue(); }
short GetPos() const { return m_nPos; }
OUString GetHelp() const { return m_strHelpText; }
- virtual void SetSpecialReadOnly(sal_Bool _bReadOnly)
- {
- SetReadOnly(_bReadOnly);
- lcl_setSpecialReadOnly(_bReadOnly,this);
- }
- };
+ virtual void SetSpecialReadOnly(sal_Bool _bReadOnly);
- inline OPropNumericEditCtrl::OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
- :NumericField(pParent, nWinStyle)
- ,m_nPos(nPosition)
- {
- m_strHelpText = ModuleRes(nHelpId);
- }
- inline OPropNumericEditCtrl::OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition)
- :NumericField(pParent, _rRes)
- ,m_nPos(nPosition)
- {
- m_strHelpText = ModuleRes(nHelpId);
- }
+ };
class OPropListBoxCtrl : public ListBox
{
@@ -142,33 +87,18 @@ namespace dbaui
OUString m_strHelpText;
public:
- inline OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
- inline OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1);
+ OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
+ OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1);
- inline sal_Bool IsModified() const { return GetSelectEntryPos() != GetSavedValue(); }
+ sal_Bool IsModified() const { return GetSelectEntryPos() != GetSavedValue(); }
short GetPos() const { return m_nPos; }
OUString GetHelp() const { return m_strHelpText; }
- virtual void SetSpecialReadOnly(sal_Bool _bReadOnly)
- {
- SetReadOnly(_bReadOnly);
- lcl_setSpecialReadOnly(_bReadOnly,this);
- }
+ virtual void SetSpecialReadOnly(sal_Bool _bReadOnly);
+
};
- inline OPropListBoxCtrl::OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
- :ListBox(pParent, nWinStyle)
- ,m_nPos(nPosition)
- {
- m_strHelpText = ModuleRes(nHelpId);
- }
- inline OPropListBoxCtrl::OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition)
- :ListBox(pParent, _rRes)
- ,m_nPos(nPosition)
- {
- m_strHelpText = ModuleRes(nHelpId);
- }
}
#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_FIELDCONTROLS_HXX
diff --git a/dbaccess/source/ui/inc/HtmlReader.hxx b/dbaccess/source/ui/inc/HtmlReader.hxx
index 0c9a056..ac802e5 100644
--- a/dbaccess/source/ui/inc/HtmlReader.hxx
+++ b/dbaccess/source/ui/inc/HtmlReader.hxx
@@ -24,6 +24,7 @@
#include <editeng/svxenum.hxx>
#include <tools/stream.hxx>
#include <com/sun/star/awt/FontDescriptor.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
namespace dbaui
{
diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx
index e9068d1..71742ef 100644
--- a/dbaccess/source/ui/inc/TokenWriter.hxx
+++ b/dbaccess/source/ui/inc/TokenWriter.hxx
@@ -32,6 +32,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
#include <com/sun/star/sdbcx/XRowLocate.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/implbase1.hxx>
#include <tools/stream.hxx>
diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx
index 6707591..5d30bd9 100644
--- a/dbaccess/source/ui/inc/dlgsave.hxx
+++ b/dbaccess/source/ui/inc/dlgsave.hxx
@@ -23,6 +23,7 @@
#include "apitools.hxx"
#include <vcl/dialog.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <vcl/msgbox.hxx>
namespace com { namespace sun { namespace star {
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index cbacdfc..61e3e67 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -28,6 +28,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <vcl/toolbox.hxx>
#include <svtools/treelistbox.hxx>
#include <unotools/viewoptions.hxx>
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index 814cd38..ea8b68b 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -30,6 +30,7 @@
#include <com/sun/star/sdb/CommandType.hpp>
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/util/NumberFormat.hpp>
#include <com/sun/star/util/XNumberFormatTypes.hpp>
#include "dbustrings.hrc"
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index dcb03ea..ceb52b4 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -55,6 +55,7 @@
#include <rtl/tencinfo.h>
#include "UITools.hxx"
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
using namespace dbaui;
using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx
index 9951a4d..83021aa 100644
--- a/dbaccess/source/ui/misc/RtfReader.cxx
+++ b/dbaccess/source/ui/misc/RtfReader.cxx
@@ -46,6 +46,7 @@
#include "QEnumTypes.hxx"
#include "UITools.hxx"
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
using namespace dbaui;
using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index d9e5c58..21cc786 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -51,6 +51,7 @@
#include "UITools.hxx"
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/outdev.hxx>
+#include <vcl/settings.hxx>
#include <svtools/rtfout.hxx>
#include <svtools/htmlcfg.hxx>
#include <connectivity/formattedcolumnvalue.hxx>
diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx
index dae1258b..6a03ebd 100644
--- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx
+++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx
@@ -24,6 +24,7 @@
#include "UITools.hxx"
#include <svtools/imgdef.hxx>
#include <vcl/event.hxx>
+#include <vcl/settings.hxx>
namespace dbaui
{
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 9cd2d9b..95afe5f 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -53,6 +53,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <toolkit/awt/vclxwindow.hxx>
#include <vcl/stdtext.hxx>
+#include <vcl/settings.hxx>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 18cab46..685da8d 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -25,6 +25,7 @@
#include "dbu_misc.hrc"
#include "WizardPages.hrc"
#include <vcl/scrbar.hxx>
+#include <vcl/settings.hxx>
#include "svtools/treelistentry.hxx"
#include <com/sun/star/sdbc/DataType.hpp>
diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx
index 36afe62..ec66d041 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx
@@ -26,6 +26,7 @@
#include <math.h>
#include <osl/diagnose.h>
#include <vcl/lineinfo.hxx>
+#include <vcl/settings.hxx>
using namespace dbaui;
const long DESCRIPT_LINE_WIDTH = 15;
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index 31dd26d..ce3a7ca 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -37,6 +37,7 @@
#include "dbustrings.hrc"
#include <comphelper/extract.hxx>
#include "UITools.hxx"
+#include <vcl/settings.hxx>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 718c7c5..75db5a2 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -34,6 +34,7 @@
#include "QueryMoveTabWinUndoAct.hxx"
#include "QuerySizeTabWinUndoAct.hxx"
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include "TableWindowData.hxx"
#include "JAccess.hxx"
#include <com/sun/star/accessibility/XAccessible.hpp>
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 3fb10b2..54754ad 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -35,6 +35,7 @@
#include "dbustrings.hrc"
#include "QTableWindow.hxx"
#include <vcl/msgbox.hxx>
+#include <vcl/settings.hxx>
#include "QueryDesignFieldUndoAct.hxx"
#include "sqlmessage.hxx"
#include "UITools.hxx"
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 8041308..f4e6a73 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -27,6 +27,7 @@
#include <osl/diagnose.h>
#include <vcl/svapp.hxx>
#include <vcl/wall.hxx>
+#include <vcl/settings.hxx>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
index 7b10481..ae99032 100644
--- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
@@ -23,6 +23,7 @@
#include <vcl/svapp.hxx>
#include <vcl/help.hxx>
#include <vcl/menu.hxx>
+#include <vcl/settings.hxx>
#include <tools/debug.hxx>
#include "dbustrings.hrc"
#include <sfx2/cntids.hrc>
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index c549510..4bc0b92 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -21,6 +21,7 @@
#include "QueryDesignView.hxx"
#include <tools/debug.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include "JoinController.hxx"
#include <toolkit/helper/vclunohelper.hxx>
#include "dbustrings.hrc"
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx
index caf3e43..0782c3a 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -29,6 +29,7 @@
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
#include "RelationControl.hxx"
#include <vcl/msgbox.hxx>
+#include <vcl/settings.hxx>
using namespace dbaui;
using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx
index cdd1ad4..f84984f 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx
@@ -21,6 +21,7 @@
#include <tools/debug.hxx>
#include "RelationTableView.hxx"
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include "ConnectionLine.hxx"
using namespace dbaui;
diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
index 2677a5b..2bb1d3f 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
@@ -20,6 +20,7 @@
#include "TableDesignHelpBar.hxx"
#include <tools/debug.hxx>
#include <svtools/svmedit.hxx>
+#include <vcl/settings.hxx>
#include "dbaccess_helpid.hrc"
#include <boost/scoped_ptr.hpp>
using namespace dbaui;
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 92e286e..3630278 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -29,6 +29,7 @@
#include <comphelper/types.hxx>
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
#include <unotools/syslocale.hxx>
+#include <vcl/settings.hxx>
#include "UITools.hxx"
using namespace ::dbaui;
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index 04ea9cb..a59c6f1 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -23,6 +23,7 @@
#include "dbu_tbl.hrc"
#include "TableDesignHelpBar.hxx"
#include <vcl/fixed.hxx>
+#include <vcl/settings.hxx>
#include "dbaccess_helpid.hrc"
#include "moduledbu.hxx"
#include <boost/scoped_ptr.hpp>
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index b9290c4..316580e 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -93,6 +93,7 @@
#include <rtl/bootstrap.hxx>
#include <vcl/help.hxx>
#include <vcl/msgbox.hxx>
+#include <vcl/settings.hxx>
#include <sfx2/sfx.hrc>
#include <sfx2/app.hxx>
#include <svl/itemset.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 5534a21..8a12b20 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -30,6 +30,7 @@
#include "com/sun/star/deployment/DependencyException.hpp"
#include "com/sun/star/deployment/DeploymentException.hpp"
#include "cppuhelper/weakref.hxx"
+#include <vcl/settings.hxx>
#define USER_PACKAGE_MANAGER "user"
#define SHARED_PACKAGE_MANAGER "shared"
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index dc694a2..d19f175 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -29,6 +29,7 @@
#include "comphelper/unwrapargs.hxx"
#include <i18nlangtag/languagetag.hxx>
#include "vcl/svapp.hxx"
+#include <vcl/settings.hxx>
#include "vcl/msgbox.hxx"
#include "com/sun/star/lang/XServiceInfo.hpp"
#include "com/sun/star/task/XJobExecutor.hpp"
diff --git a/drawinglayer/source/processor2d/getdigitlanguage.cxx b/drawinglayer/source/processor2d/getdigitlanguage.cxx
index 5d058fc..fff455c 100644
--- a/drawinglayer/source/processor2d/getdigitlanguage.cxx
+++ b/drawinglayer/source/processor2d/getdigitlanguage.cxx
@@ -12,6 +12,7 @@
#include "i18nlangtag/lang.h"
#include "svl/ctloptions.hxx"
#include "vcl/svapp.hxx"
+#include "vcl/settings.hxx"
#include "getdigitlanguage.hxx"
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 7fc3f53..168eb81 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -47,6 +47,8 @@
#include <unotools/accessiblerelationsethelper.hxx>
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
#include <vcl/unohelp.hxx>
+#include <vcl/settings.hxx>
+
#include <editeng/editeng.hxx>
#include <editeng/unoprnms.hxx>
#include <editeng/unoipset.hxx>
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 40f3ed8..6ee3a7e 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -20,6 +20,7 @@
#include <tools/gen.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <rtl/ustring.hxx>
#include <com/sun/star/awt/Point.hpp>
#include <com/sun/star/awt/Rectangle.hpp>
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index f383caf..cf9327e 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -22,6 +22,7 @@
#include <vcl/dialog.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <com/sun/star/linguistic2/LanguageGuessing.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 1503ba6..b640a3b 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -21,6 +21,8 @@
#include <vcl/dialog.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
+
#include <impedit.hxx>
#include <editeng/editeng.hxx>
#include <editeng/editview.hxx>
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 8bfefb3..2c8b98e 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -24,6 +24,7 @@
#include <vcl/svapp.hxx>
#include <vcl/metaact.hxx>
#include <vcl/gdimtf.hxx>
+#include <vcl/settings.hxx>
#include <editeng/adjustitem.hxx>
#include <editeng/tstpitem.hxx>
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 7f2cf42..deff249 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -57,6 +57,7 @@
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
#include <vcl/graphicfilter.hxx>
+#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
#include <editeng/editids.hrc>
#include <editeng/editrids.hrc>
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 8a87a64..e92f836 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/text/RelOrientation.hpp>
#include <editeng/brushitem.hxx>
#include <vcl/font.hxx>
+#include <vcl/settings.hxx>
#include <editeng/editids.hrc>
#include <editeng/editrids.hrc>
#include <editeng/numdef.hxx>
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index fcb91dd..d908888 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -22,6 +22,7 @@
#include <tools/urlobj.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <sot/storinfo.hxx>
#include <svl/fstathelper.hxx>
#include <svtools/helpopt.hxx>
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index e20eb82..88ac6ba 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -35,6 +35,7 @@
#include <editeng/svxrtf.hxx>
#include <editeng/editids.hrc>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <com/sun/star/document/XDocumentProperties.hpp>
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index a20ca1c..012c23b 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -29,6 +29,7 @@
#include "tableselectionpage.hxx"
#include <vcl/waitobj.hxx>
#include <vcl/msgbox.hxx>
+#include <vcl/settings.hxx>
#include "abpfinalpage.hxx"
#include "fieldmappingpage.hxx"
#include "fieldmappingimpl.hxx"
diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx
index c8efed9..d77a626 100644
--- a/extensions/source/abpilot/datasourcehandling.hxx
+++ b/extensions/source/abpilot/datasourcehandling.hxx
@@ -21,6 +21,8 @@
#define EXTENSIONS_ABP_DATASOURCEHANDLING_HXX
#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
+
#include "abptypes.hxx"
//========================================================================
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 1387502..af36359 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -27,6 +27,7 @@
#include <com/sun/star/awt/XWindow.hpp>
#include <toolkit/helper/vclunohelper.hxx>
#include <cppuhelper/implbase1.hxx>
+#include <vcl/settings.hxx>
#include "general.hxx"
#include "sections.hrc"
#include "bibresid.hxx"
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 06cf392..f306179 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -28,6 +28,7 @@
#include <svtools/miscopt.hxx>
#include <svtools/imgdef.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <vcl/mnemonic.hxx>
#include "bibbeam.hxx"
#include "toolbar.hrc"
diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx
index 680a485..2edf862 100644
--- a/extensions/source/plugin/base/context.cxx
+++ b/extensions/source/plugin/base/context.cxx
@@ -46,6 +46,7 @@
#include <sal/log.hxx>
#include <com/sun/star/frame/FrameSearchFlag.hpp>
#include <com/sun/star/frame/XComponentLoader.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#include <tools/urlobj.hxx>
#include <osl/file.hxx>
diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx
index df48176..e7488dc 100644
--- a/extensions/source/plugin/inc/plugin/impl.hxx
+++ b/extensions/source/plugin/inc/plugin/impl.hxx
@@ -66,6 +66,7 @@
#include "com/sun/star/awt/RasterOperation.hpp"
#include "com/sun/star/awt/Gradient.hpp"
#include "com/sun/star/awt/XGraphics.hpp"
+#include <com/sun/star/uno/XComponentContext.hpp>
#include "cppuhelper/implbase3.hxx"
#include "cppuhelper/implbase2.hxx"
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index f75694b..5ebeac6 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -30,6 +30,7 @@
#include <tools/diagnose_ex.h>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
//............................................................................
namespace pcr
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index ac4e88d..5fcf214 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -55,6 +55,8 @@
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
#include <svx/flagsdef.hxx>
+#include <vcl/settings.hxx>
+
//............................................................................
namespace pcr
{
diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx
index 80b3d0e..abf7b86 100644
--- a/extensions/source/propctrlr/formlinkdialog.hxx
+++ b/extensions/source/propctrlr/formlinkdialog.hxx
@@ -28,6 +28,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <memory>
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 787de56..caaaec8 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -44,6 +44,7 @@
#include <i18nlangtag/languagetag.hxx>
#include <vcl/button.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
//==================================================================
#include <limits>
diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx
index d36249c..75f2d39 100644
--- a/extensions/source/propctrlr/taborder.hxx
+++ b/extensions/source/propctrlr/taborder.hxx
@@ -24,6 +24,7 @@
#include <com/sun/star/awt/XTabControllerModel.hpp>
#include <com/sun/star/awt/XControlContainer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <vcl/dialog.hxx>
diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx
index 4f0c8f3..0de4b76 100644
--- a/extensions/source/resource/oooresourceloader.cxx
+++ b/extensions/source/resource/oooresourceloader.cxx
@@ -20,6 +20,7 @@
#include <oooresourceloader.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <tools/simplerm.hxx>
#include <tools/rcid.h>
#include <cppuhelper/implbase1.hxx>
diff --git a/filter/source/graphic/GraphicExportDialog.cxx b/filter/source/graphic/GraphicExportDialog.cxx
index ace8e75..f784636 100644
--- a/filter/source/graphic/GraphicExportDialog.cxx
+++ b/filter/source/graphic/GraphicExportDialog.cxx
@@ -30,6 +30,7 @@
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <svtools/GraphicExportOptionsDialog.hxx>
+#include <unotools/syslocale.hxx>
using namespace css;
using namespace css::uno;
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index e818bd0..434f057 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -31,6 +31,7 @@
#include <vcl/msgbox.hxx>
#include <vcl/cvtgrf.hxx>
#include <vcl/gradient.hxx>
+#include <vcl/settings.hxx>
#include <unotools/configmgr.hxx>
#include <svl/solar.hrc>
#include <vcl/fltcall.hxx>
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 9bea5b3..cf255a8 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -37,6 +37,7 @@
#include <sot/storinfo.hxx>
#include <vcl/cvtgrf.hxx>
#include <vcl/wmf.hxx>
+#include <vcl/settings.hxx>
#include "viscache.hxx"
// SvxItem-Mapping. Is needed to successfully include the SvxItem-Header
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 17e03cb..9d968a0 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -23,6 +23,7 @@
#include "impdialog.hrc"
#include "vcl/svapp.hxx"
#include "vcl/msgbox.hxx"
+#include <vcl/settings.hxx>
#include "sfx2/passwd.hxx"
#include "svtools/miscopt.hxx"
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index e709c9c..13f4f4f 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -36,6 +36,7 @@
#include "unotools/localfilehelper.hxx"
#include <vcl/FilterConfigItem.hxx>
#include <vcl/graphicfilter.hxx>
+#include <vcl/settings.hxx>
#include "svl/solar.hrc"
#include "comphelper/string.hxx"
#include "comphelper/storagehelper.hxx"
diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx
index 2ce7bb0..39835a6 100644
--- a/filter/source/svg/svgfontexport.cxx
+++ b/filter/source/svg/svgfontexport.cxx
@@ -26,6 +26,7 @@
#include <vcl/unohelp.hxx>
#include <vcl/font.hxx>
#include <vcl/outdev.hxx>
+#include <vcl/settings.hxx>
static const sal_Int32 nFontEM = 2048;
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 4851258..ffdfe68 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -23,6 +23,8 @@
#include <rtl/crc.h>
#include <vcl/unohelp.hxx>
+#include <vcl/outdev.hxx>
+#include <vcl/settings.hxx>
#include <tools/helpers.hxx>
#include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
#include <sax/tools/converter.hxx>
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index 1edb72c..9884cf7 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -36,6 +36,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <tools/resmgr.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <rtl/instance.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index 899df45..bdaf676 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -29,6 +29,7 @@
#include <com/sun/star/awt/XVclWindowPeer.hpp>
#include <vcl/svapp.hxx>
+#include <vcl/keycodes.hxx>
#include <tools/wintypes.hxx>
#include <connectivity/dbtools.hxx>
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 937f46f..afb857d 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -32,6 +32,7 @@
#include <svl/zforlist.hxx>
#include <svl/numuno.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <tools/debug.hxx>
#include <tools/wintypes.hxx>
#include <i18nlangtag/languagetag.hxx>
diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx
index 55083bf..b48002f 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.cxx
@@ -27,6 +27,7 @@
#include <connectivity/dbtools.hxx>
#include <tools/debug.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
namespace frm
{
diff --git a/forms/source/resource/frm_resource.cxx b/forms/source/resource/frm_resource.cxx
index 3e64350..a2a92e1 100644
--- a/forms/source/resource/frm_resource.cxx
+++ b/forms/source/resource/frm_resource.cxx
@@ -23,6 +23,7 @@
// ---- needed as long as we have no contexts for components ---
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
//---------------------------------------------------
#include <svl/solar.hrc>
diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx
index 0f2997d..98221cc 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -28,6 +28,7 @@
#include <tools/mapunit.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/outdev.hxx>
+#include <vcl/settings.hxx>
#include <unotools/lingucfg.hxx>
#include <svl/undo.hxx>
#include <osl/mutex.hxx>
diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index a5dbc96..164b573 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -33,6 +33,7 @@
#include <tools/mapunit.hxx>
#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#define EMPTY_PAPER_SIZE 0x7FFFFFFF
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index 825191a..d727aef 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -37,6 +37,7 @@
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
//--------------------------------------------------------------------------
extern "C" void SAL_CALL createRegistryInfo_ONavigationBarControl()
diff --git a/formula/source/core/resource/core_resource.cxx b/formula/source/core/resource/core_resource.cxx
index 3e7160a..97debb2 100644
--- a/formula/source/core/resource/core_resource.cxx
+++ b/formula/source/core/resource/core_resource.cxx
@@ -23,6 +23,7 @@
// ---- needed as long as we have no contexts for components ---
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <rtl/instance.hxx>
#include <svl/solar.hrc>
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index 24a22c2..ebcbd73 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -20,6 +20,7 @@
#include <comphelper/string.hxx>
#include <svl/zforlist.hxx>
#include <svl/stritem.hxx>
+#include <vcl/settings.hxx>
#include "parawin.hxx"
#include "parawin.hrc"
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 36f4a5a..9792a86 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -73,6 +73,7 @@
#include <osl/file.h>
#include <vcl/dibtools.hxx>
#include <vcl/waitobj.hxx>
+#include <vcl/settings.hxx>
#include <com/sun/star/task/InteractionHandler.hpp>
#include "com/sun/star/ucb/InteractiveAugmentedIOException.hpp"
diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx
index 3cd22e6..b700fbd 100644
--- a/fpicker/source/win32/misc/resourceprovider.cxx
+++ b/fpicker/source/win32/misc/resourceprovider.cxx
@@ -22,6 +22,7 @@
#include "resourceprovider.hxx"
#include <osl/mutex.hxx>
#include <vcl/fpicker.hrc>
+#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
#include <tools/simplerm.hxx>
diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx
index ff01b34..30fd281 100644
--- a/framework/source/classes/fwlresid.cxx
+++ b/framework/source/classes/fwlresid.cxx
@@ -21,6 +21,7 @@
#include "classes/fwlresid.hxx"
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <rtl/strbuf.hxx>
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 0df49f7..7f88960 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -51,6 +51,8 @@
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
+#include <vcl/settings.hxx>
+
#include <osl/mutex.hxx>
#include <osl/file.hxx>
#include <cppuhelper/implbase1.hxx>
diff --git a/framework/source/fwe/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx
index 78b0298..4d49b4e 100644
--- a/framework/source/fwe/classes/bmkmenu.cxx
+++ b/framework/source/fwe/classes/bmkmenu.cxx
@@ -33,6 +33,7 @@
#include <com/sun/star/util/DateTime.hpp>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <unotools/dynamicmenuoptions.hxx>
#include <svtools/menuoptions.hxx>
diff --git a/framework/source/fwe/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx
index 0ae4d3e..4316f8f 100644
--- a/framework/source/fwe/classes/fwkresid.cxx
+++ b/framework/source/fwe/classes/fwkresid.cxx
@@ -21,6 +21,7 @@
#include "classes/fwkresid.hxx"
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <rtl/strbuf.hxx>
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index 68cca5d..7b69a97 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -33,6 +33,7 @@
#include <sal/macros.h>
#include <vcl/svapp.hxx>
#include <vcl/toolbox.hxx>
+#include <vcl/settings.hxx>
#include <rtl/ustrbuf.hxx>
#include <comphelper/attributelist.hxx>
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 333d325..3a82a28 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -41,6 +41,8 @@
#include <toolkit/awt/vclxwindow.hxx>
#include <vcl/i18nhelp.hxx>
#include <vcl/dockingarea.hxx>
+#include <vcl/settings.hxx>
+
#include <boost/bind.hpp>
using namespace ::com::sun::star;
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index 043322d..16e8661 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -45,6 +45,7 @@
#include <osl/file.hxx>
#include <vcl/xtextedt.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <comphelper/processfactory.hxx>
#include <tools/date.hxx>
#include <tools/time.hxx>
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index f729965..079d4a2 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -56,6 +56,7 @@
#include <vcl/syswin.hxx>
#include <vcl/taskpanelist.hxx>
#include <vcl/toolbox.hxx>
+#include <vcl/settings.hxx>
//_________________________________________________________________________________________________________________
// namespaces
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index 8049855..1d64c56 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -36,6 +36,7 @@
#include <vcl/svapp.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/toolbox.hxx>
+#include <vcl/settings.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 08723c8..c6bb47a 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -33,6 +33,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <vcl/i18nhelp.hxx>
#include <rtl/ref.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index 3881275..4105279 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -29,6 +29,7 @@
#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <vcl/i18nhelp.hxx>
#include <tools/urlobj.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index 72f5c7e..e90bbaf 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -34,6 +34,7 @@
#include <vcl/i18nhelp.hxx>
#include <vcl/outdev.hxx>
#include <vcl/print.hxx>
+#include <vcl/settings.hxx>
#include <svtools/ctrltool.hxx>
#include <osl/mutex.hxx>
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 736c2d5..61b1aaa 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -68,6 +68,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
+#include <vcl/settings.hxx>
#include <osl/mutex.hxx>
#include <osl/file.hxx>
#include <cppuhelper/implbase1.hxx>
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 98f63dc..b602b39 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -37,6 +37,7 @@
#include <vcl/svapp.hxx>
#include <vcl/i18nhelp.hxx>
+#include <vcl/settings.hxx>
#include <rtl/ustrbuf.hxx>
#include <cppuhelper/implbase1.hxx>
#include <osl/file.hxx>
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 399a89e..577ca61 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -49,6 +49,7 @@
#include <vcl/status.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include <functional>
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index f4a599a..810fdf8 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -69,6 +69,8 @@
#include <vcl/syswin.hxx>
#include <vcl/taskpanelist.hxx>
#include <vcl/toolbox.hxx>
+#include <vcl/settings.hxx>
+
#include <svtools/menuoptions.hxx>
#include <boost/bind.hpp>
#include <svtools/acceleratorexecute.hxx>
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 2e2f633..aea7706 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -48,6 +48,7 @@
#include <vcl/svapp.hxx>
#include <vcl/i18nhelp.hxx>
#include <vcl/image.hxx>
+#include <vcl/settings.hxx>
#include <rtl/ustrbuf.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/window.hxx>
diff --git a/include/editeng/hangulhanja.hxx b/include/editeng/hangulhanja.hxx
index b739111..74fdbe4 100644
--- a/include/editeng/hangulhanja.hxx
+++ b/include/editeng/hangulhanja.hxx
@@ -24,6 +24,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <editeng/editengdllapi.h>
#include <i18nlangtag/mslangid.hxx>
diff --git a/include/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx
index ad820f4..a6bc26f 100644
--- a/include/framework/menuconfiguration.hxx
+++ b/include/framework/menuconfiguration.hxx
@@ -28,6 +28,8 @@
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+
#include <framework/fwedllapi.h>
#include <cppuhelper/weak.hxx>
diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx
index 7985bd6..a922ed3 100644
--- a/include/svtools/addresstemplate.hxx
+++ b/include/svtools/addresstemplate.hxx
@@ -31,6 +31,7 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/util/AliasProgrammaticPair.hpp>
#include <com/sun/star/sdb/XDatabaseContext.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/sdbc/XDataSource.hpp>
#include <unotools/configitem.hxx>
diff --git a/include/svtools/table/tablerenderer.hxx b/include/svtools/table/tablerenderer.hxx
index 5b4428c..bbd7d85 100644
--- a/include/svtools/table/tablerenderer.hxx
+++ b/include/svtools/table/tablerenderer.hxx
@@ -26,6 +26,8 @@
#include <boost/shared_ptr.hpp>
+class StyleSettings;
+
//........................................................................
namespace svt { namespace table
{
diff --git a/include/svx/ucsubset.hxx b/include/svx/ucsubset.hxx
index 371a5c8..4cf0b45 100644
--- a/include/svx/ucsubset.hxx
+++ b/include/svx/ucsubset.hxx
@@ -24,6 +24,7 @@
#include <svx/ucsubset.hrc>
#include <vcl/metric.hxx>
+#include "tools/rc.hxx"
#include <list>
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index fae2d1d..863d25f8 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_VCL_BUTTON_HXX
#include <tools/solar.h>
+#include <tools/color.hxx>
#include <vcl/dllapi.h>
#include <vcl/image.hxx>
#include <vcl/ctrl.hxx>
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index f5d6124..fb29c71 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -28,6 +28,7 @@
// forward
namespace vcl { struct ImplControlData; struct ControlLayoutData; }
+class StyleSettings;
// -----------
// - Control -
@@ -180,13 +181,7 @@ public:
void SetReferenceDevice( OutputDevice* _referenceDevice );
OutputDevice* GetReferenceDevice() const;
- Font GetUnzoomedControlPointFont() const
- {
- Font aFont( GetCanonicalFont( GetSettings().GetStyleSettings() ) );
- if ( IsControlFont() )
- aFont.Merge( GetControlFont() );
- return aFont;
- }
+ Font GetUnzoomedControlPointFont() const;
};
#endif // INCLUDED_VCL_CTRL_HXX
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 546331b..52eb6b5 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -29,14 +29,15 @@
#include <vcl/region.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/wall.hxx>
-#include <vcl/settings.hxx>
#include <vcl/salnativewidgets.hxx>
#include <tools/poly.hxx>
#include <basegfx/vector/b2enums.hxx>
#include <com/sun/star/uno/Reference.h>
#include <unotools/fontdefs.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <boost/scoped_ptr.hpp>
#include <com/sun/star/drawing/LineCap.hpp>
+
#include <vector>
struct ImplOutDevData;
@@ -53,6 +54,7 @@ class ImplMultiTextLineInfo;
class SalGraphics;
class Gradient;
class Hatch;
+class AllSettings;
class Bitmap;
class BitmapReadAccess;
class BitmapEx;
@@ -70,6 +72,7 @@ class SalLayout;
class ImplLayoutArgs;
class ImplFontAttributes;
class VirtualDevice;
+class Window;
struct SalTwoRect;
namespace com {
@@ -325,7 +328,7 @@ private:
TextAlign meTextAlign;
RasterOp meRasterOp;
Wallpaper maBackground;
- AllSettings maSettings;
+ boost::scoped_ptr<AllSettings> mxSettings;
MapMode maMapMode;
Point maRefPoint;
sal_uInt16 mnAntialiasing;
@@ -1169,7 +1172,7 @@ public:
TextAlign GetTextAlign() const { return maFont.GetAlign(); }
virtual void SetSettings( const AllSettings& rSettings );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list