accessibility/inc/accessibility/helper/characterattributeshelper.hxx | 2
accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 2
accessibility/source/extended/AccessibleGridControlBase.cxx | 2
accessibility/source/extended/accessibletabbar.cxx | 4
accessibility/source/extended/textwindowaccessibility.cxx | 2
accessibility/source/helper/characterattributeshelper.cxx | 2
accessibility/source/standard/vclxaccessiblemenuitem.cxx | 2
accessibility/source/standard/vclxaccessiblestatusbaritem.cxx | 2
accessibility/source/standard/vclxaccessibletabpage.cxx | 2
accessibility/source/standard/vclxaccessibletextcomponent.cxx | 2
basctl/source/accessibility/accessibledialogcontrolshape.cxx | 4
basctl/source/accessibility/accessibledialogwindow.cxx | 4
basctl/source/basicide/baside2.cxx | 8 -
basctl/source/basicide/baside2b.cxx | 6
basctl/source/basicide/baside3.cxx | 2
basctl/source/basicide/layout.cxx | 4
basctl/source/dlged/dlged.cxx | 6
basic/source/runtime/inputbox.cxx | 2
canvas/source/cairo/cairo_canvasfont.cxx | 4
canvas/source/cairo/cairo_canvasfont.hxx | 4
canvas/source/cairo/cairo_canvashelper_text.cxx | 4
canvas/source/cairo/cairo_textlayout.cxx | 2
canvas/source/directx/dx_textlayout_drawhelper.cxx | 2
canvas/source/opengl/ogl_canvashelper.cxx | 2
canvas/source/vcl/canvasfont.cxx | 4
canvas/source/vcl/canvasfont.hxx | 4
canvas/source/vcl/canvashelper.cxx | 2
canvas/source/vcl/impltools.cxx | 2
canvas/source/vcl/impltools.hxx | 6
canvas/source/vcl/spritecanvashelper.cxx | 2
canvas/source/vcl/spritehelper.cxx | 2
chart2/source/controller/dialogs/tp_DataSource.cxx | 2
chart2/source/controller/main/ChartController_TextEdit.cxx | 2
chart2/source/tools/CharacterProperties.cxx | 6
chart2/source/view/main/3DChartObjects.cxx | 2
chart2/source/view/main/DummyXShape.cxx | 6
chart2/source/view/main/OpenGLRender.cxx | 2
chart2/source/view/main/OpenGLRender.hxx | 2
cppcanvas/source/inc/implrenderer.hxx | 4
cppcanvas/source/mtfrenderer/implrenderer.cxx | 8 -
cppcanvas/source/mtfrenderer/textaction.cxx | 4
cui/source/dialogs/SpellAttrib.cxx | 6
cui/source/dialogs/SpellAttrib.hxx | 6
cui/source/dialogs/about.cxx | 4
cui/source/dialogs/cuicharmap.cxx | 20 +-
cui/source/dialogs/hangulhanjadlg.cxx | 6
cui/source/dialogs/postdlg.cxx | 2
cui/source/dialogs/thesdlg.cxx | 4
cui/source/factory/init.cxx | 2
cui/source/inc/autocdlg.hxx | 6
cui/source/inc/cuicharmap.hxx | 10 -
cui/source/inc/numpages.hxx | 4
cui/source/options/optHeaderTabListbox.cxx | 4
cui/source/options/optlingu.cxx | 8 -
cui/source/tabpages/autocdlg.cxx | 10 -
cui/source/tabpages/numfmt.cxx | 14 -
cui/source/tabpages/numpages.cxx | 24 +--
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 43
++---
dbaccess/source/ui/app/AppDetailView.cxx | 8 -
dbaccess/source/ui/app/AppDetailView.hxx | 4
dbaccess/source/ui/app/AppSwapWindow.cxx | 2
dbaccess/source/ui/app/AppTitleWindow.cxx | 4
dbaccess/source/ui/app/AppView.cxx | 4
dbaccess/source/ui/control/VertSplitView.cxx | 2
dbaccess/source/ui/control/listviewitems.cxx | 4
dbaccess/source/ui/control/marktree.cxx | 4
dbaccess/source/ui/control/sqledit.cxx | 4
dbaccess/source/ui/inc/UITools.hxx | 2
dbaccess/source/ui/misc/TokenWriter.cxx | 2
dbaccess/source/ui/querydesign/JoinTableView.cxx | 2
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 4
dbaccess/source/ui/querydesign/TableWindow.cxx | 4
dbaccess/source/ui/querydesign/TableWindowTitle.cxx | 4
dbaccess/source/ui/tabledesign/TableDesignControl.cxx | 2
dbaccess/source/ui/tabledesign/TableDesignView.cxx | 2
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 4
desktop/source/splash/splash.cxx | 2
drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 20 +-
drawinglayer/source/primitive2d/textlayoutdevice.cxx | 10 -
drawinglayer/source/processor2d/vclprocessor2d.cxx | 2
editeng/source/editeng/editdoc.cxx | 4
editeng/source/editeng/editeng.cxx | 6
editeng/source/editeng/editview.cxx | 2
editeng/source/editeng/eehtml.cxx | 2
editeng/source/editeng/eertfpar.cxx | 2
editeng/source/editeng/eertfpar.hxx | 2
editeng/source/editeng/impedit.hxx | 6
editeng/source/editeng/impedit3.cxx | 10 -
editeng/source/editeng/impedit4.cxx | 6
editeng/source/editeng/textconv.cxx | 4
editeng/source/editeng/textconv.hxx | 4
editeng/source/items/bulitem.cxx | 10 -
editeng/source/items/numitem.cxx | 8 -
editeng/source/items/svxfont.cxx | 10 -
editeng/source/items/textitem.cxx | 2
editeng/source/misc/hangulhanja.cxx | 12 -
editeng/source/outliner/outliner.cxx | 24 +--
editeng/source/outliner/outlvw.cxx | 2
editeng/source/rtf/rtfitem.cxx | 6
editeng/source/rtf/svxrtf.cxx | 10 -
editeng/source/uno/unofdesc.cxx | 4
editeng/source/uno/unonrule.cxx | 2
extensions/source/propctrlr/fontdialog.cxx | 4
extensions/source/propctrlr/standardcontrol.cxx | 2
extensions/source/update/ui/updatecheckui.cxx | 8 -
filter/source/flash/swfwriter.hxx | 8 -
filter/source/flash/swfwriter1.cxx | 12 -
filter/source/flash/swfwriter2.cxx | 6
filter/source/graphicfilter/eos2met/eos2met.cxx | 14 -
filter/source/graphicfilter/epict/epict.cxx | 14 -
filter/source/graphicfilter/eps/eps.cxx | 10 -
filter/source/graphicfilter/idxf/dxf2mtf.cxx | 2
filter/source/graphicfilter/idxf/dxf2mtf.hxx | 2
filter/source/graphicfilter/ieps/ieps.cxx | 2
filter/source/graphicfilter/ios2met/ios2met.cxx | 4
filter/source/graphicfilter/ipict/ipict.cxx | 2
filter/source/msfilter/svdfppt.cxx | 10 -
filter/source/svg/svgfontexport.cxx | 8 -
filter/source/svg/svgfontexport.hxx | 8 -
filter/source/svg/svgwriter.cxx | 26 +--
filter/source/svg/svgwriter.hxx | 28 +--
forms/source/richtext/richtextengine.cxx | 2
formula/source/ui/dlg/ControlHelper.hxx | 2
formula/source/ui/dlg/formula.cxx | 6
formula/source/ui/dlg/funcutl.cxx | 2
formula/source/ui/dlg/parawin.cxx | 4
formula/source/ui/dlg/parawin.hxx | 8 -
formula/source/ui/dlg/structpg.cxx | 2
framework/source/uielement/complextoolbarcontroller.cxx | 2
include/drawinglayer/primitive2d/textlayoutdevice.hxx | 8 -
include/editeng/bulletitem.hxx | 10 -
include/editeng/editeng.hxx | 8 -
include/editeng/editview.hxx | 4
include/editeng/hangulhanja.hxx | 4
include/editeng/numitem.hxx | 8 -
include/editeng/outliner.hxx | 4
include/editeng/svxfont.hxx | 6
include/editeng/svxrtf.hxx | 8 -
include/editeng/swafopt.hxx | 4
include/editeng/unofdesc.hxx | 4
include/filter/msfilter/svdfppt.hxx | 2
include/postx.h | 1
include/prex.h | 1
include/sfx2/thumbnailviewitem.hxx | 2
include/svtools/brwbox.hxx | 8 -
include/svtools/calendar.hxx | 2
include/svtools/hyperlabel.hxx | 4
include/svtools/ivctrl.hxx | 4
include/svtools/sampletext.hxx | 8 -
include/svtools/scriptedtext.hxx | 4
include/svtools/treelistbox.hxx | 8 -
include/svx/charmap.hxx | 2
include/svx/dialcontrol.hxx | 8 -
include/svx/fontlb.hxx | 10 -
include/svx/gridctrl.hxx | 2
include/svx/nbdtmg.hxx | 4
include/toolkit/awt/vclxfont.hxx | 6
include/toolkit/awt/vclxgraphics.hxx | 4
include/toolkit/helper/vclunohelper.hxx | 6
include/vcl/button.hxx | 6
include/vcl/ctrl.hxx | 4
include/vcl/edit.hxx | 2
include/vcl/fixed.hxx | 4
include/vcl/font.hxx | 12 +
include/vcl/graph.hxx | 4
include/vcl/group.hxx | 2
include/vcl/inputctx.hxx | 10 -
include/vcl/metaact.hxx | 8 -
include/vcl/metric.hxx | 2
include/vcl/outdev.hxx | 22 +-
include/vcl/outdevstate.hxx | 2
include/vcl/pdfwriter.hxx | 6
include/vcl/settings.hxx | 52
+++---
include/vcl/tabctrl.hxx | 2
include/vcl/texteng.hxx | 22 +-
include/vcl/txtattr.hxx | 12 -
include/vcl/window.hxx | 18 +-
reportdesign/source/core/api/ReportComponent.cxx | 4
reportdesign/source/ui/dlg/Condition.cxx | 4
reportdesign/source/ui/dlg/GroupsSorting.cxx | 2
reportdesign/source/ui/misc/UITools.cxx | 18 +-
sc/inc/patattr.hxx | 6
sc/qa/unit/helper/qahelper.cxx | 2
sc/source/core/data/column2.cxx | 6
sc/source/core/data/docpool.cxx | 2
sc/source/core/data/global.cxx | 2
sc/source/core/data/patattr.cxx | 4
sc/source/core/data/stlpool.cxx | 2
sc/source/core/tool/autoform.cxx | 2
sc/source/core/tool/editutil.cxx | 2
sc/source/core/tool/interpr1.cxx | 4
sc/source/filter/excel/xecontent.cxx | 2
sc/source/filter/excel/xehelper.cxx | 2
sc/source/filter/excel/xestyle.cxx | 10 -
sc/source/filter/excel/xistyle.cxx | 2
sc/source/filter/excel/xlroot.cxx | 2
sc/source/filter/excel/xlstyle.cxx | 4
sc/source/filter/inc/richstring.hxx | 15 -
sc/source/filter/inc/worksheethelper.hxx | 2
sc/source/filter/inc/xestyle.hxx | 6
sc/source/filter/inc/xlstyle.hxx | 6
sc/source/filter/oox/richstring.cxx | 14 -
sc/source/filter/oox/sheetdatabuffer.cxx | 2
sc/source/filter/oox/unitconverter.cxx | 2
sc/source/filter/oox/worksheethelper.cxx | 2
sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 2
sc/source/ui/app/inputwin.cxx | 2
sc/source/ui/cctrl/dpcontrol.cxx | 4
sc/source/ui/docshell/docsh3.cxx | 4
sc/source/ui/drawfunc/drtxtob.cxx | 2
sc/source/ui/formdlg/dwfunctr.cxx | 2
sc/source/ui/formdlg/privsplt.cxx | 2
sc/source/ui/inc/autofmt.hxx | 6
sc/source/ui/inc/checklistmenu.hxx | 4
sc/source/ui/inc/csvgrid.hxx | 4
sc/source/ui/inc/hdrcont.hxx | 4
sc/source/ui/inc/hintwin.hxx | 4
sc/source/ui/inc/inputwin.hxx | 2
sc/source/ui/inc/output.hxx | 4
sc/source/ui/inc/spellparam.hxx | 6
sc/source/ui/inc/viewfunc.hxx | 2
sc/source/ui/miscdlgs/autofmt.cxx | 8 -
sc/source/ui/miscdlgs/solveroptions.cxx | 4
sc/source/ui/navipi/scenwnd.cxx | 4
sc/source/ui/optdlg/calcoptionsdlg.cxx | 8 -
sc/source/ui/sidebar/CellLineStyleValueSet.cxx | 4
sc/source/ui/vba/vbarange.cxx | 2
sc/source/ui/view/cellsh1.cxx | 10 -
sc/source/ui/view/editsh.cxx | 2
sc/source/ui/view/gridwin.cxx | 8 -
sc/source/ui/view/gridwin4.cxx | 6
sc/source/ui/view/output2.cxx | 6
sc/source/ui/view/printfun.cxx | 4
sc/source/ui/view/spelleng.cxx | 2
sc/source/ui/view/viewfun2.cxx | 2
sd/inc/Outliner.hxx | 2
sd/inc/drawdoc.hxx | 2
sd/inc/stlpool.hxx | 4
sd/source/core/drawdoc4.cxx | 10 -
sd/source/core/stlpool.cxx | 14 -
sd/source/core/stlsheet.cxx | 2
sd/source/filter/eppt/pptx-text.cxx | 2
sd/source/ui/animations/CustomAnimationDialog.cxx | 2
sd/source/ui/annotations/annotationmanager.cxx | 2
sd/source/ui/annotations/annotationmanagerimpl.hxx | 2
sd/source/ui/annotations/annotationtag.cxx | 2
sd/source/ui/annotations/annotationtag.hxx | 4
sd/source/ui/annotations/annotationwindow.cxx | 4
sd/source/ui/dlg/RemoteDialogClientBox.cxx | 4
sd/source/ui/func/bulmaper.cxx | 2
sd/source/ui/func/fubullet.cxx | 6
sd/source/ui/func/fuhhconv.cxx | 6
sd/source/ui/inc/OutlineView.hxx | 4
sd/source/ui/inc/fuhhconv.hxx | 4
sd/source/ui/presenter/PresenterTextView.cxx | 2
sd/source/ui/slideshow/showwin.cxx | 8 -
sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx | 4
sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx | 2
sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx | 2
sd/source/ui/slidesorter/inc/view/SlsTheme.hxx | 2
sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx | 2
sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx | 2
sd/source/ui/slidesorter/view/SlsTheme.cxx | 8 -
sd/source/ui/tools/PreviewRenderer.cxx | 4
sd/source/ui/view/DocumentRenderer.cxx | 4
sd/source/ui/view/Outliner.cxx | 2
sd/source/ui/view/outlview.cxx | 2
sd/source/ui/view/sdview.cxx | 4
sdext/source/pdfimport/wrapper/wrapper.cxx | 2
sfx2/source/appl/appinit.cxx | 6
sfx2/source/control/recentdocsview.cxx | 8 -
sfx2/source/control/thumbnailview.cxx | 2
sfx2/source/dialog/backingwindow.cxx | 6
sfx2/source/dialog/templdlg.cxx | 4
sfx2/source/dialog/titledockwin.cxx | 4
sfx2/source/sidebar/TitleBar.cxx | 4
slideshow/source/engine/rehearsetimingsactivity.hxx | 4
starmath/inc/dialog.hxx | 14 -
starmath/inc/symbol.hxx | 6
starmath/inc/utility.hxx | 32
++--
starmath/source/cfgitem.cxx | 10 -
starmath/source/cfgitem.hxx | 6
starmath/source/dialog.cxx | 28 +--
starmath/source/document.cxx | 2
starmath/source/rect.cxx | 2
starmath/source/symbol.cxx | 4
starmath/source/tmpdevice.cxx | 2
starmath/source/tmpdevice.hxx | 2
starmath/source/unomodel.cxx | 8 -
starmath/source/utility.cxx | 26 +--
starmath/source/view.cxx | 4
svtools/source/brwbox/brwbox1.cxx | 2
svtools/source/brwbox/brwbox2.cxx | 2
svtools/source/brwbox/datwin.cxx | 4
svtools/source/brwbox/editbrowsebox.cxx | 2
svtools/source/contnr/imivctl1.cxx | 10 -
svtools/source/contnr/ivctrl.cxx | 6
svtools/source/contnr/treelistbox.cxx | 21 +-
svtools/source/control/calendar.cxx | 20 +-
svtools/source/control/ctrlbox.cxx | 6
svtools/source/control/filectrl.cxx | 2
svtools/source/control/headbar.cxx | 4
svtools/source/control/hyperlabel.cxx | 6
svtools/source/control/roadmap.cxx | 4
svtools/source/control/ruler.cxx | 6
svtools/source/control/scriptedtext.cxx | 26 +--
svtools/source/control/tabbar.cxx | 16 +-
svtools/source/control/valueset.cxx | 2
svtools/source/graphic/grfmgr2.cxx | 2
svtools/source/misc/embedhlp.cxx | 2
svtools/source/misc/sampletext.cxx | 10 -
svtools/source/toolpanel/paneltabbar.cxx | 2
svtools/source/toolpanel/toolpaneldrawer.cxx | 4
svx/source/accessibility/charmapacc.cxx | 2
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 4
svx/source/dialog/_bmpmask.cxx | 2
svx/source/dialog/charmap.cxx | 4
svx/source/dialog/dialcontrol.cxx | 12 -
svx/source/dialog/fntctrl.cxx | 10 -
svx/source/dialog/fontlb.cxx | 10 -
svx/source/dialog/pagectrl.cxx | 2
svx/source/dialog/rubydialog.cxx | 6
svx/source/dialog/svxbmpnumvalueset.cxx | 12 -
svx/source/dialog/swframeexample.cxx | 2
svx/source/fmcomp/fmgridif.cxx | 18 +-
svx/source/fmcomp/gridcell.cxx | 4
svx/source/fmcomp/gridctrl.cxx | 6
svx/source/form/filtnav.cxx | 8 -
svx/source/form/fmcontrollayout.cxx | 2
svx/source/gallery2/galbrws2.cxx | 4
svx/source/sidebar/line/LineWidthValueSet.cxx | 4
svx/source/sidebar/nbdtmg.cxx | 38
++--
svx/source/sidebar/tools/ValueSetWithTextControl.cxx | 24 +--
svx/source/svdraw/svdfmtf.cxx | 4
svx/source/svdraw/svdibrow.cxx | 2
svx/source/svdraw/svdmodel.cxx | 6
svx/source/svdraw/svdotext.cxx | 4
svx/source/svdraw/svdotextdecomposition.cxx | 4
svx/source/tbxctrls/layctrl.cxx | 4
svx/source/tbxctrls/tbcontrl.cxx | 6
sw/inc/hhcwrp.hxx | 2
sw/inc/ndtxt.hxx | 2
sw/inc/numrule.hxx | 4
sw/inc/splargs.hxx | 9 -
sw/source/core/doc/DocumentStylePoolManager.cxx | 8 -
sw/source/core/doc/notxtfrm.cxx | 4
sw/source/core/doc/number.cxx | 8 -
sw/source/core/edit/autofmt.cxx | 2
sw/source/core/inc/drawfont.hxx | 4
sw/source/core/inc/fntcache.hxx | 12 -
sw/source/core/inc/pagefrm.hxx | 4
sw/source/core/layout/paintfrm.cxx | 14 -
sw/source/core/text/inftxt.hxx | 2
sw/source/core/text/itrform2.cxx | 2
sw/source/core/text/txtdrop.cxx | 2
sw/source/core/text/txtfld.cxx | 2
sw/source/core/text/txtfrm.cxx | 2
sw/source/core/txtnode/fntcache.cxx | 32
++--
sw/source/core/txtnode/swfont.cxx | 2
sw/source/core/txtnode/txtedt.cxx | 2
sw/source/core/unocore/unocrsrhelper.cxx | 2
sw/source/core/unocore/unosett.cxx | 6
sw/source/core/unocore/unostyle.cxx | 2
sw/source/core/view/pagepreviewlayout.cxx | 4
sw/source/filter/ascii/parasc.cxx | 2
sw/source/filter/html/htmlform.cxx | 2
sw/source/filter/html/htmlforw.cxx | 2
sw/source/filter/writer/writer.cxx | 4
sw/source/filter/ww8/wrtw8num.cxx | 4
sw/source/filter/ww8/wrtw8sty.cxx | 2
sw/source/filter/ww8/wrtww8.hxx | 4
sw/source/filter/ww8/ww8par.cxx | 2
sw/source/filter/ww8/ww8par2.cxx | 2
sw/source/filter/ww8/ww8par3.cxx | 4
sw/source/ui/chrdlg/drpcps.cxx | 10 -
sw/source/ui/config/optload.cxx | 2
sw/source/ui/config/optpage.cxx | 10 -
sw/source/ui/dialog/ascfldlg.cxx | 2
sw/source/ui/envelp/labfmt.cxx | 6
sw/source/ui/fldui/inpdlg.cxx | 2
sw/source/ui/fldui/javaedit.cxx | 2
sw/source/ui/misc/insfnote.cxx | 4
sw/source/ui/misc/outline.cxx | 4
sw/source/ui/table/tautofmt.cxx | 12 -
sw/source/uibase/app/docshini.cxx | 6
sw/source/uibase/config/fontcfg.cxx | 2
sw/source/uibase/config/uinums.cxx | 4
sw/source/uibase/dbui/mailmergehelper.cxx | 2
sw/source/uibase/docvw/AnnotationMenuButton.cxx | 4
sw/source/uibase/docvw/HeaderFooterWin.cxx | 2
sw/source/uibase/docvw/SidebarWin.cxx | 20 +-
sw/source/uibase/docvw/edtwin.cxx | 2
sw/source/uibase/docvw/srcedtw.cxx | 10 -
sw/source/uibase/inc/numprevw.hxx | 4
sw/source/uibase/inc/view.hxx | 2
sw/source/uibase/lingu/hhcwrp.cxx | 6
sw/source/uibase/lingu/sdrhhcwrap.cxx | 2
sw/source/uibase/lingu/sdrhhcwrap.hxx | 4
sw/source/uibase/shells/annotsh.cxx | 4
sw/source/uibase/shells/basesh.cxx | 2
sw/source/uibase/shells/drwtxtsh.cxx | 4
sw/source/uibase/shells/textsh.cxx | 2
sw/source/uibase/uiview/srcview.cxx | 6
sw/source/uibase/uiview/viewling.cxx | 4
sw/source/uibase/utlui/content.cxx | 4
sw/source/uibase/utlui/glbltree.cxx | 4
sw/source/uibase/utlui/navipi.cxx | 2
sw/source/uibase/wrtsh/wrtsh1.cxx | 4
test/source/mtfxmldump.cxx | 2
toolkit/source/awt/stylesettings.cxx | 8 -
toolkit/source/awt/vclxaccessiblecomponent.cxx | 4
toolkit/source/awt/vclxfont.cxx | 12 -
toolkit/source/awt/vclxgraphics.cxx | 2
toolkit/source/awt/vclxwindow.cxx | 8 -
toolkit/source/controls/accessiblecontrolcontext.cxx | 2
toolkit/source/helper/formpdfexport.cxx | 2
toolkit/source/helper/vclunohelper.cxx | 10 -
uui/source/secmacrowarnings.cxx | 2
vcl/inc/impfont.hxx | 2
vcl/inc/outdev.h | 4
vcl/inc/outfont.hxx | 6
vcl/inc/win/saldata.hxx | 4
vcl/inc/window.h | 2
vcl/osx/salframe.cxx | 12 -
vcl/qa/cppunit/complextext.cxx | 4
vcl/source/app/dbggui.cxx | 4
vcl/source/app/settings.cxx | 80
+++++-----
vcl/source/control/button.cxx | 12 -
vcl/source/control/combobox.cxx | 2
vcl/source/control/ctrl.cxx | 2
vcl/source/control/edit.cxx | 6
vcl/source/control/fixed.cxx | 8 -
vcl/source/control/fixedhyper.cxx | 2
vcl/source/control/group.cxx | 4
vcl/source/control/ilstbox.cxx | 2
vcl/source/control/lstbox.cxx | 2
vcl/source/control/tabctrl.cxx | 6
vcl/source/edit/texteng.cxx | 16 +-
vcl/source/edit/textview.cxx | 2
vcl/source/edit/txtattr.cxx | 8 -
vcl/source/edit/vclmedit.cxx | 6
vcl/source/filter/sgvtext.cxx | 2
vcl/source/filter/wmf/emfwr.cxx | 10 -
vcl/source/filter/wmf/winmtf.cxx | 4
vcl/source/filter/wmf/winmtf.hxx | 12 -
vcl/source/filter/wmf/wmfwr.cxx | 6
vcl/source/filter/wmf/wmfwr.hxx | 10 -
vcl/source/gdi/cvtsvm.cxx | 18 +-
vcl/source/gdi/font.cxx | 14 -
vcl/source/gdi/gdimtf.cxx | 4
vcl/source/gdi/graph.cxx | 4
vcl/source/gdi/metaact.cxx | 2
vcl/source/gdi/pdfwriter.cxx | 2
vcl/source/gdi/pdfwriter_impl.cxx | 8 -
vcl/source/gdi/pdfwriter_impl.hxx | 2
vcl/source/outdev/font.cxx | 18 +-
vcl/source/outdev/outdevstate.cxx | 6
vcl/source/outdev/text.cxx | 6
vcl/source/outdev/textline.cxx | 2
vcl/source/window/layout.cxx | 2
vcl/source/window/paint.cxx | 2
vcl/source/window/settings.cxx | 4
vcl/source/window/status.cxx | 2
vcl/source/window/toolbox.cxx | 10 -
vcl/source/window/window.cxx | 18 +-
vcl/source/window/window2.cxx | 28 +--
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 2
vcl/workben/vcldemo.cxx | 2
writerfilter/source/dmapper/SdtHelper.cxx | 2
xmlsecurity/inc/xmlsecurity/certificateviewer.hxx | 4
470 files changed, 1397 insertions(+), 1393 deletions(-)
New commits:
commit 60e78fbb806bb45e635ba1de45ceffe187938ac0
Author: Noel Grandin <n...@peralex.com>
Date: Tue Sep 16 10:09:58 2014 +0200
fdo#82577: Handle Font
Put the VCL Font class in the vcl namespace. Avoids clash with the X11
Font typedef.
Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537
diff --git
a/accessibility/inc/accessibility/helper/characterattributeshelper.hxx
b/accessibility/inc/accessibility/helper/characterattributeshelper.hxx
index b567749..22d0604 100644
--- a/accessibility/inc/accessibility/helper/characterattributeshelper.hxx
+++ b/accessibility/inc/accessibility/helper/characterattributeshelper.hxx
@@ -40,7 +40,7 @@ private:
public:
- CharacterAttributesHelper( const Font& rFont, sal_Int32 nBackColor,
sal_Int32 nColor );
+ CharacterAttributesHelper( const vcl::Font& rFont, sal_Int32 nBackColor,
sal_Int32 nColor );
~CharacterAttributesHelper();
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
GetCharacterAttributes();
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index bf2e75f..bc0ad89 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -509,7 +509,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getForeground(
) throw (::com::sun:
nColor = pInst->GetControlForeground().GetColor();
else
{
- Font aFont;
+ vcl::Font aFont;
if ( pInst->IsControlFont() )
aFont = pInst->GetControlFont();
else
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx
b/accessibility/source/extended/AccessibleGridControlBase.cxx
index b79e753..cb9a6bf 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -426,7 +426,7 @@ sal_Int32 SAL_CALL
AccessibleGridControlBase::getForeground( ) throw (::com::su
nColor = pInst->GetControlForeground().GetColor();
else
{
- Font aFont;
+ vcl::Font aFont;
if ( pInst->IsControlFont() )
aFont = pInst->GetControlFont();
else
diff --git a/accessibility/source/extended/accessibletabbar.cxx
b/accessibility/source/extended/accessibletabbar.cxx
index d43f3f2..1fc53c7 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -444,7 +444,7 @@ namespace accessibility
nColor = m_pTabBar->GetControlForeground().GetColor();
else
{
- Font aFont;
+ vcl::Font aFont;
if ( m_pTabBar->IsControlFont() )
aFont = m_pTabBar->GetControlFont();
else
@@ -488,7 +488,7 @@ namespace accessibility
Reference< awt::XDevice > xDev(
m_pTabBar->GetComponentInterface(), UNO_QUERY );
if ( xDev.is() )
{
- Font aFont;
+ vcl::Font aFont;
if ( m_pTabBar->IsControlFont() )
aFont = m_pTabBar->GetControlFont();
else
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx
b/accessibility/source/extended/textwindowaccessibility.cxx
index 4a82970..24f0be2 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -997,7 +997,7 @@ Document::retrieveCharacterAttributes(
{
::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
- Font aFont = m_rEngine.GetFont();
+ vcl::Font aFont = m_rEngine.GetFont();
const sal_Int32 AttributeCount = 9;
sal_Int32 i = 0;
css::uno::Sequence< css::beans::PropertyValue > aAttribs( AttributeCount );
diff --git a/accessibility/source/helper/characterattributeshelper.cxx
b/accessibility/source/helper/characterattributeshelper.cxx
index 9f40168..df7e241 100644
--- a/accessibility/source/helper/characterattributeshelper.cxx
+++ b/accessibility/source/helper/characterattributeshelper.cxx
@@ -24,7 +24,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
-CharacterAttributesHelper::CharacterAttributesHelper( const Font& rFont,
sal_Int32 nBackColor, sal_Int32 nColor )
+CharacterAttributesHelper::CharacterAttributesHelper( const vcl::Font& rFont,
sal_Int32 nBackColor, sal_Int32 nColor )
{
m_aAttributeMap.insert( AttributeMap::value_type( OUString(
"CharBackColor" ), makeAny( (sal_Int32) nBackColor ) ) );
m_aAttributeMap.insert( AttributeMap::value_type( OUString( "CharColor" ),
makeAny( (sal_Int32) nColor ) ) );
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index 4c7c7dcc..971f319 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -242,7 +242,7 @@ Sequence< PropertyValue >
VCLXAccessibleMenuItem::getCharacterAttributes( sal_In
if ( !implIsValidIndex( nIndex, sText.getLength() ) )
throw IndexOutOfBoundsException();
- Font aFont = Application::GetSettings().GetStyleSettings().GetMenuFont();
+ vcl::Font aFont =
Application::GetSettings().GetStyleSettings().GetMenuFont();
sal_Int32 nBackColor = getBackground();
sal_Int32 nColor = getForeground();
return CharacterAttributesHelper( aFont, nBackColor, nColor )
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index 18786b9..6ed6ec6 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -511,7 +511,7 @@ Sequence< PropertyValue >
VCLXAccessibleStatusBarItem::getCharacterAttributes( s
if ( m_pStatusBar )
{
- Font aFont = m_pStatusBar->GetFont();
+ vcl::Font aFont = m_pStatusBar->GetFont();
sal_Int32 nBackColor = getBackground();
sal_Int32 nColor = getForeground();
aValues = CharacterAttributesHelper( aFont, nBackColor, nColor )
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx
b/accessibility/source/standard/vclxaccessibletabpage.cxx
index 6a9c23b..5797ccc 100644
--- a/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpage.cxx
@@ -585,7 +585,7 @@ Sequence< PropertyValue >
VCLXAccessibleTabPage::getCharacterAttributes( sal_Int
if ( m_pTabControl )
{
- Font aFont = m_pTabControl->GetFont();
+ vcl::Font aFont = m_pTabControl->GetFont();
sal_Int32 nBackColor = getBackground();
sal_Int32 nColor = getForeground();
aValues = CharacterAttributesHelper( aFont, nBackColor, nColor )
diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
index 7e3104f..ba92960 100644
--- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
+++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
@@ -183,7 +183,7 @@ Sequence< PropertyValue >
VCLXAccessibleTextComponent::getCharacterAttributes( s
if ( GetWindow() )
{
- Font aFont = GetWindow()->GetControlFont();
+ vcl::Font aFont = GetWindow()->GetControlFont();
sal_Int32 nBackColor = GetWindow()->GetControlBackground().GetColor();
sal_Int32 nColor = GetWindow()->GetControlForeground().GetColor();
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index cfa9eb3..aaec4fb 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -502,7 +502,7 @@ sal_Int32 AccessibleDialogControlShape::getForeground( )
throw (RuntimeExceptio
nColor = pWindow->GetControlForeground().GetColor();
else
{
- Font aFont;
+ vcl::Font aFont;
if ( pWindow->IsControlFont() )
aFont = pWindow->GetControlFont();
else
@@ -548,7 +548,7 @@ Reference< awt::XFont >
AccessibleDialogControlShape::getFont( ) throw (Runtime
Reference< awt::XDevice > xDev( pWindow->GetComponentInterface(),
UNO_QUERY );
if ( xDev.is() )
{
- Font aFont;
+ vcl::Font aFont;
if ( pWindow->IsControlFont() )
aFont = pWindow->GetControlFont();
else
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx
b/basctl/source/accessibility/accessibledialogwindow.cxx
index 7a21338..527da88 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -832,7 +832,7 @@ sal_Int32 AccessibleDialogWindow::getForeground( ) throw
(RuntimeException, std
nColor = m_pDialogWindow->GetControlForeground().GetColor();
else
{
- Font aFont;
+ vcl::Font aFont;
if ( m_pDialogWindow->IsControlFont() )
aFont = m_pDialogWindow->GetControlFont();
else
@@ -876,7 +876,7 @@ Reference< awt::XFont > AccessibleDialogWindow::getFont( )
throw (RuntimeExcept
Reference< awt::XDevice > xDev(
m_pDialogWindow->GetComponentInterface(), UNO_QUERY );
if ( xDev.is() )
{
- Font aFont;
+ vcl::Font aFont;
if ( m_pDialogWindow->IsControlFont() )
aFont = m_pDialogWindow->GetControlFont();
else
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index 75c78d7..57cf39d 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -104,12 +104,12 @@ void lcl_PrintHeader( Printer* pPrinter, sal_uInt16
nPages, sal_uInt16 nCurPage,
const Color aOldLineColor( pPrinter->GetLineColor() );
const Color aOldFillColor( pPrinter->GetFillColor() );
- const Font aOldFont( pPrinter->GetFont() );
+ const vcl::Font aOldFont( pPrinter->GetFont() );
pPrinter->SetLineColor( Color( COL_BLACK ) );
pPrinter->SetFillColor();
- Font aFont( aOldFont );
+ vcl::Font aFont( aOldFont );
aFont.SetWeight( WEIGHT_BOLD );
aFont.SetAlign( ALIGN_BOTTOM );
pPrinter->SetFont( aFont );
@@ -839,9 +839,9 @@ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter,
sal_Int32 nPrintPage )
AssertValidEditEngine();
MapMode eOldMapMode( pPrinter->GetMapMode() );
- Font aOldFont( pPrinter->GetFont() );
+ vcl::Font aOldFont( pPrinter->GetFont() );
- Font aFont( GetEditEngine()->GetFont() );
+ vcl::Font aFont( GetEditEngine()->GetFont() );
aFont.SetAlign( ALIGN_BOTTOM );
aFont.SetTransparent( true );
aFont.SetSize( Size( 0, 360 ) );
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 7118989..d3e2bb4 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1052,7 +1052,7 @@ void EditorWindow::DataChanged(DataChangedEvent const &
rDCEvt)
if (!pOldSettings || aColor !=
pOldSettings-> GetStyleSettings().GetFieldTextColor())
{
- Font aFont(pEditEngine->GetFont());
+ vcl::Font aFont(pEditEngine->GetFont());
aFont.SetColor(aColor);
pEditEngine->SetFont(aFont);
}
@@ -1220,11 +1220,11 @@ void EditorWindow::ImplSetFont()
get_value_or( OUString() ) );
if ( sFontName.isEmpty() )
{
- Font aTmpFont( OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED,
Application::GetSettings().GetUILanguageTag().getLanguageType(), 0 , this ) );
+ vcl::Font aTmpFont( OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED,
Application::GetSettings().GetUILanguageTag().getLanguageType(), 0 , this ) );
sFontName = aTmpFont.GetName();
}
Size aFontSize(0,
officecfg::Office::Common::Font::SourceViewFont::FontHeight::get());
- Font aFont( sFontName, aFontSize );
+ vcl::Font aFont( sFontName, aFontSize );
aFont.SetColor( GetSettings().GetStyleSettings().GetFieldTextColor() );
SetPointFont( aFont );
aFont = GetFont();
diff --git a/basctl/source/basicide/baside3.cxx
b/basctl/source/basicide/baside3.cxx
index c893386..c9973c4 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -1371,7 +1371,7 @@ void DialogWindow::InitSettings(bool bFont, bool
bForeground, bool bBackground)
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
if( bFont )
{
- Font aFont;
+ vcl::Font aFont;
aFont = rStyleSettings.GetFieldFont();
SetPointFont( aFont );
}
diff --git a/basctl/source/basicide/layout.cxx
b/basctl/source/basicide/layout.cxx
index 5965721..02fb50f 100644
--- a/basctl/source/basicide/layout.cxx
+++ b/basctl/source/basicide/layout.cxx
@@ -44,7 +44,7 @@ Layout::Layout (Window* pParent) :
{
SetBackground(GetSettings().GetStyleSettings().GetWindowColor());
- Font aFont = GetFont();
+ vcl::Font aFont = GetFont();
Size aSz = aFont.GetSize();
aSz.Height() *= 1.5;
aFont.SetSize(aSz);
@@ -145,7 +145,7 @@ void Layout::DataChanged (DataChangedEvent const& rDCEvt)
aColor = GetSettings().GetStyleSettings().GetWindowTextColor();
if (!pOldSettings || aColor !=
pOldSettings->GetStyleSettings().GetWindowTextColor())
{
- Font aFont(GetFont());
+ vcl::Font aFont(GetFont());
aFont.SetColor(aColor);
SetFont(aFont);
bInvalidate = true;
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index b43f798..bd1edb0 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -1125,7 +1125,7 @@ void lcl_PrintHeader( Printer* pPrinter, const OUString&
rTitle ) // not working
pPrinter->SetLineColor( COL_BLACK );
pPrinter->SetFillColor();
- Font aFont( pPrinter->GetFont() );
+ vcl::Font aFont( pPrinter->GetFont() );
aFont.SetWeight( WEIGHT_BOLD );
aFont.SetAlign( ALIGN_BOTTOM );
pPrinter->SetFont( aFont );
@@ -1170,11 +1170,11 @@ void DlgEditor::Print( Printer* pPrinter, const
OUString& rTitle ) // not wor
{
{
MapMode aOldMap( pPrinter->GetMapMode());
- Font aOldFont( pPrinter->GetFont() );
+ vcl::Font aOldFont( pPrinter->GetFont() );
MapMode aMap( MAP_100TH_MM );
pPrinter->SetMapMode( aMap );
- Font aFont;
+ vcl::Font aFont;
aFont.SetAlign( ALIGN_BOTTOM );
aFont.SetSize( Size( 0, 360 ));
pPrinter->SetFont( aFont );
diff --git a/basic/source/runtime/inputbox.cxx
b/basic/source/runtime/inputbox.cxx
index a939b2cb..b8e2696 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -67,7 +67,7 @@ SvRTLInputBox::SvRTLInputBox( Window* pParent, const
OUString& rPrompt,
aEdit.Show();
aPromptText.Show();
SetText( rTitle );
- Font aFont( GetFont());
+ vcl::Font aFont( GetFont());
Color aColor( GetBackground().GetColor() );
aFont.SetFillColor( aColor );
aEdit.SetFont( aFont );
diff --git a/canvas/source/cairo/cairo_canvasfont.cxx
b/canvas/source/cairo/cairo_canvasfont.cxx
index fd488c8..62bf3e2 100644
--- a/canvas/source/cairo/cairo_canvasfont.cxx
+++ b/canvas/source/cairo/cairo_canvasfont.cxx
@@ -41,7 +41,7 @@ namespace cairocanvas
const geometry::Matrix2D&
rFontMatrix,
const SurfaceProviderRef&
rDevice ) :
CanvasFont_Base( m_aMutex ),
- maFont( Font( rFontRequest.FontDescription.FamilyName,
+ maFont( vcl::Font( rFontRequest.FontDescription.FamilyName,
rFontRequest.FontDescription.StyleName,
Size( 0, ::basegfx::fround(rFontRequest.CellSize) ) ) ),
maFontRequest( rFontRequest ),
@@ -157,7 +157,7 @@ namespace cairocanvas
return aRet;
}
- ::Font CanvasFont::getVCLFont() const
+ vcl::Font CanvasFont::getVCLFont() const
{
return *maFont;
}
diff --git a/canvas/source/cairo/cairo_canvasfont.hxx
b/canvas/source/cairo/cairo_canvasfont.hxx
index 420e11b..677b6c4 100644
--- a/canvas/source/cairo/cairo_canvasfont.hxx
+++ b/canvas/source/cairo/cairo_canvasfont.hxx
@@ -71,10 +71,10 @@ namespace cairocanvas
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName
) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException,
std::exception ) SAL_OVERRIDE;
- ::Font getVCLFont() const;
+ vcl::Font getVCLFont() const;
private:
- ::canvas::vcltools::VCLObject<Font> maFont;
+ ::canvas::vcltools::VCLObject<vcl::Font> maFont;
::com::sun::star::rendering::FontRequest maFontRequest;
SurfaceProviderRef mpRefDevice;
};
diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx
b/canvas/source/cairo/cairo_canvashelper_text.cxx
index f95d71a..4e489f4 100644
--- a/canvas/source/cairo/cairo_canvashelper_text.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_text.cxx
@@ -61,7 +61,7 @@ namespace cairocanvas
static bool
setupFontTransform( ::OutputDevice& rOutDev,
::Point& o_rPoint,
- ::Font& io_rVCLFont,
+ vcl::Font& io_rVCLFont,
const rendering::ViewState& rViewState,
const rendering::RenderState& rRenderState )
{
@@ -247,7 +247,7 @@ namespace cairocanvas
{
setupOutDevState( rOutDev, pOwner, viewState, renderState, TEXT_COLOR
);
- ::Font aVCLFont;
+ vcl::Font aVCLFont;
CanvasFont* pFont = dynamic_cast< CanvasFont* >( xFont.get() );
diff --git a/canvas/source/cairo/cairo_textlayout.cxx
b/canvas/source/cairo/cairo_textlayout.cxx
index f01e75a..f2b5ddd 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -510,7 +510,7 @@ namespace cairocanvas
// Font rotation and scaling
cairo_matrix_t m;
- Font aFont = rOutDev.GetFont();
+ vcl::Font aFont = rOutDev.GetFont();
cairo_matrix_init_identity(&m);
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx
b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index a7409ba..23f5ab6 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -111,7 +111,7 @@ namespace dxcanvas
// create the font
const ::com::sun::star::rendering::FontRequest& rFontRequest =
rCanvasFont->getFontRequest();
- Font aFont(
+ vcl::Font aFont(
rFontRequest.FontDescription.FamilyName,
rFontRequest.FontDescription.StyleName,
Size( 0, ::basegfx::fround(rFontRequest.CellSize)));
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx
b/canvas/source/opengl/ogl_canvashelper.cxx
index 29c8ca6..8c4969b 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -735,7 +735,7 @@ namespace oglcanvas
// create the font
const rendering::FontRequest& rFontRequest =
pFont->getFontRequest();
const geometry::Matrix2D& rFontMatrix =
pFont->getFontMatrix();
- ::Font aFont(
+ vcl::Font aFont(
rFontRequest.FontDescription.FamilyName,
rFontRequest.FontDescription.StyleName,
Size( 0, ::basegfx::fround(rFontRequest.CellSize)));
diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx
index 98fe92d..a7e6f48 100644
--- a/canvas/source/vcl/canvasfont.cxx
+++ b/canvas/source/vcl/canvasfont.cxx
@@ -42,7 +42,7 @@ namespace vclcanvas
rendering::XGraphicDevice&
rDevice,
const OutDevProviderSharedPtr&
rOutDevProvider ) :
CanvasFont_Base( m_aMutex ),
- maFont( Font( rFontRequest.FontDescription.FamilyName,
+ maFont( vcl::Font( rFontRequest.FontDescription.FamilyName,
rFontRequest.FontDescription.StyleName,
Size( 0, ::basegfx::fround(rFontRequest.CellSize) ) ) ),
maFontRequest( rFontRequest ),
@@ -169,7 +169,7 @@ namespace vclcanvas
return aRet;
}
- ::Font CanvasFont::getVCLFont() const
+ vcl::Font CanvasFont::getVCLFont() const
{
return *maFont;
}
diff --git a/canvas/source/vcl/canvasfont.hxx b/canvas/source/vcl/canvasfont.hxx
index 6285e93..30cc464 100644
--- a/canvas/source/vcl/canvasfont.hxx
+++ b/canvas/source/vcl/canvasfont.hxx
@@ -74,10 +74,10 @@ namespace vclcanvas
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName
) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException,
std::exception ) SAL_OVERRIDE;
- ::Font getVCLFont() const;
+ vcl::Font getVCLFont() const;
private:
- ::canvas::vcltools::VCLObject<Font>
maFont;
+ ::canvas::vcltools::VCLObject<vcl::Font>
maFont;
::com::sun::star::rendering::FontRequest
maFontRequest;
::com::sun::star::uno::Reference<
::com::sun::star::rendering::XGraphicDevice> mpRefDevice;
OutDevProviderSharedPtr
mpOutDevProvider;
diff --git a/canvas/source/vcl/canvashelper.cxx
b/canvas/source/vcl/canvashelper.cxx
index eff50dc..d14ec6b 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -1369,7 +1369,7 @@ namespace vclcanvas
OutputDevice& rOutDev( mpOutDev->getOutDev() );
- ::Font aVCLFont;
+ vcl::Font aVCLFont;
CanvasFont* pFont = dynamic_cast< CanvasFont* >( xFont.get() );
diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx
index 4a5091d..673407b 100644
--- a/canvas/source/vcl/impltools.cxx
+++ b/canvas/source/vcl/impltools.cxx
@@ -100,7 +100,7 @@ namespace vclcanvas
}
bool setupFontTransform( ::Point& o_rPoint,
- ::Font& io_rVCLFont,
+ vcl::Font& io_rVCLFont,
const rendering::ViewState& rViewState,
const rendering::RenderState& rRenderState,
::OutputDevice& rOutDev )
diff --git a/canvas/source/vcl/impltools.hxx b/canvas/source/vcl/impltools.hxx
index 8f80939..3b7eac0 100644
--- a/canvas/source/vcl/impltools.hxx
+++ b/canvas/source/vcl/impltools.hxx
@@ -85,11 +85,11 @@ namespace vclcanvas
@returns false, if no text output should happen
*/
- bool setupFontTransform( ::Point&
o_rPoint,
- ::Font&
io_rVCLFont,
+ bool setupFontTransform( ::Point&
o_rPoint,
+ vcl::Font&
io_rVCLFont,
const ::com::sun::star::rendering::ViewState&
viewState,
const
::com::sun::star::rendering::RenderState& renderState,
- ::OutputDevice&
rOutDev );
+ ::OutputDevice&
rOutDev );
/** Predicate, to determine whether polygon is actually an
axis-aligned rectangle
diff --git a/canvas/source/vcl/spritecanvashelper.cxx
b/canvas/source/vcl/spritecanvashelper.cxx
index e2ded77..58dfa55 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -161,7 +161,7 @@ namespace vclcanvas
const OUString& rStr,
const Point& rPos )
{
- Font aVCLFont;
+ vcl::Font aVCLFont;
aVCLFont.SetHeight( 20 );
aVCLFont.SetColor( Color( INFO_COLOR ) );
diff --git a/canvas/source/vcl/spritehelper.cxx
b/canvas/source/vcl/spritehelper.cxx
index fc6e54a..0bda848 100644
--- a/canvas/source/vcl/spritehelper.cxx
+++ b/canvas/source/vcl/spritehelper.cxx
@@ -319,7 +319,7 @@ namespace vclcanvas
}
// paint sprite prio
- Font aVCLFont;
+ vcl::Font aVCLFont;
aVCLFont.SetHeight(
std::min(long(20),aOutputSize.Height()) );
aVCLFont.SetColor( COL_RED );
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx
b/chart2/source/controller/dialogs/tp_DataSource.cxx
index f8c93b4..a92298b 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -247,7 +247,7 @@ DataSourceTabPage::DataSourceTabPage(
// set symbol font for arrows
// note: StarSymbol is substituted to OpenSymbol for OOo
- Font aSymbolFont( m_pBTN_UP->GetFont());
+ vcl::Font aSymbolFont( m_pBTN_UP->GetFont());
aSymbolFont.SetName( "StarSymbol" );
m_pBTN_UP->SetControlFont( aSymbolFont );
m_pBTN_DOWN->SetControlFont( aSymbolFont );
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx
b/chart2/source/controller/main/ChartController_TextEdit.cxx
index e5effb8..0cb9648 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -166,7 +166,7 @@ void
ChartController::executeDispatch_InsertSpecialCharacter()
//set fixed current font
aSet.Put( SfxBoolItem( FN_PARAM_2, true ) ); //maybe not necessary in
future
- Font aCurFont =
m_pDrawViewWrapper->getOutliner()->GetRefDevice()->GetFont();
+ vcl::Font aCurFont =
m_pDrawViewWrapper->getOutliner()->GetRefDevice()->GetFont();
aSet.Put( SvxFontItem( aCurFont.GetFamily(), aCurFont.GetName(),
aCurFont.GetStyleName(), aCurFont.GetPitch(), aCurFont.GetCharSet(),
SID_ATTR_CHAR_FONT ) );
boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog(
m_pChartWindow, aSet, getFrame(), RID_SVXDLG_CHARMAP ));
diff --git a/chart2/source/tools/CharacterProperties.cxx
b/chart2/source/tools/CharacterProperties.cxx
index 75f3171..ac4add4 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -407,11 +407,11 @@ void CharacterProperties::AddDefaultsToMap(
using namespace ::com::sun::star::i18n::ScriptType;
LanguageType nLang;
nLang =
MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(
aDefaultLocale, false), LATIN);
- Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_LATIN_SPREADSHEET,
nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 );
+ vcl::Font aFont = OutputDevice::GetDefaultFont(
DEFAULTFONT_LATIN_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 );
nLang =
MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(
aDefaultLocale_CJK, false), ASIAN);
- Font aFontCJK = OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_SPREADSHEET,
nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 );
+ vcl::Font aFontCJK = OutputDevice::GetDefaultFont(
DEFAULTFONT_CJK_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 );
nLang =
MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(
aDefaultLocale_CTL, false), COMPLEX);
- Font aFontCTL = OutputDevice::GetDefaultFont( DEFAULTFONT_CTL_SPREADSHEET,
nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 );
+ vcl::Font aFontCTL = OutputDevice::GetDefaultFont(
DEFAULTFONT_CTL_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap,
PROP_CHAR_FONT_NAME, OUString( aFont.GetName() ) );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap,
PROP_CHAR_FONT_STYLE_NAME, OUString(aFont.GetStyleName()) );
diff --git a/chart2/source/view/main/3DChartObjects.cxx
b/chart2/source/view/main/3DChartObjects.cxx
index f4acef7..c0992e4 100644
--- a/chart2/source/view/main/3DChartObjects.cxx
+++ b/chart2/source/view/main/3DChartObjects.cxx
@@ -77,7 +77,7 @@ const TextCacheItem& TextCache::getText(OUString const &
rText)
return *itr->second;
VirtualDevice aDevice(*Application::GetDefaultDevice(), 0, 0);
- Font aFont = aDevice.GetFont();
+ vcl::Font aFont = aDevice.GetFont();
aFont.SetSize(Size(0, 96));
static bool bOldRender = getenv("OLDRENDER");
if (bOldRender)
diff --git a/chart2/source/view/main/DummyXShape.cxx
b/chart2/source/view/main/DummyXShape.cxx
index 13a3731..9c4ec11 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -767,7 +767,7 @@ namespace {
struct FontAttribSetter
{
- FontAttribSetter(Font& rFont):
+ FontAttribSetter(vcl::Font& rFont):
mrFont(rFont) {}
void operator()(const std::pair<OUString, uno::Any>& rProp)
@@ -807,7 +807,7 @@ struct FontAttribSetter
}
}
private:
- Font& mrFont;
+ vcl::Font& mrFont;
};
}
@@ -836,7 +836,7 @@ DummyText::DummyText(const OUString& rText, const
tNameSequence& rNames,
}
else
{
- Font aFont;
+ vcl::Font aFont;
std::for_each(maProperties.begin(), maProperties.end(),
FontAttribSetter(aFont));
VirtualDevice aDevice(*Application::GetDefaultDevice(), 0, 0);
aDevice.Erase();
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index 428b300..e8ac3ac 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -633,7 +633,7 @@ int OpenGLRender::RenderRectangleShape(bool bBorder, bool
bFill)
return 0;
}
-int OpenGLRender::CreateTextTexture(::rtl::OUString const &textValue, Font
aFont, long , awt::Point aPos, awt::Size aSize, long rotation)
+int OpenGLRender::CreateTextTexture(::rtl::OUString const &textValue,
vcl::Font aFont, long , awt::Point aPos, awt::Size aSize, long rotation)
{
VirtualDevice aDevice(*Application::GetDefaultDevice(), 0, 0);
aDevice.Erase();
diff --git a/chart2/source/view/main/OpenGLRender.hxx
b/chart2/source/view/main/OpenGLRender.hxx
index f2482f0..26f81c2 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -95,7 +95,7 @@ public:
int CreateTextTexture(const BitmapEx& rBitmapEx,
const css::awt::Point& aPos, const css::awt::Size& aSize,
long rotation, const css::drawing::HomogenMatrix3& rTrans);
- int CreateTextTexture(::rtl::OUString const &textValue, Font aFont, long
fontColor, css::awt::Point aPos, css::awt::Size aSize, long rotation);
+ int CreateTextTexture(::rtl::OUString const &textValue, vcl::Font aFont,
long fontColor, css::awt::Point aPos, css::awt::Size aSize, long rotation);
int RenderTextShape();
int SetArea2DShapePoint(float x, float y, int listLength);
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index deb3765..fe3d639 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -37,7 +37,7 @@ class GDIMetaFile;
class VirtualDevice;
class Gradient;
class Rectangle;
-class Font;
+namespace vcl { class Font; }
class PolyPolygon;
class Point;
class MetaCommentAction;
@@ -242,7 +242,7 @@ static float GetSwapFloat( SvStream& rSt )
::com::sun::star::uno::Reference<
::com::sun::star::rendering::XCanvasFont > createFont( double&
o_rFontRotation,
- const
::Font& rFont,
+ const
::vcl::Font& rFont,
const
ActionFactoryParameters& rParms ) const;
bool createActions( GDIMetaFile& rMtf,
const ActionFactoryParameters& rParms,
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 837609a..a111fab 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -753,7 +753,7 @@ namespace cppcanvas
}
uno::Reference< rendering::XCanvasFont > ImplRenderer::createFont(
double& o_rFontRotation,
-
const ::Font& rFont,
+
const vcl::Font& rFont,
const ActionFactoryParameters& rParms ) const
{
rendering::FontRequest aFontRequest;
@@ -824,7 +824,7 @@ namespace cppcanvas
const sal_Int32 nFontWidthLog = rFontSizeLog.Width();
if( nFontWidthLog != 0 )
{
- ::Font aTestFont = rFont;
+ vcl::Font aTestFont = rFont;
aTestFont.SetWidth( 0 );
sal_Int32 nNormalWidth = rParms.mrVDev.GetFontMetric(
aTestFont ).GetWidth();
if( nNormalWidth != nFontWidthLog )
@@ -1488,7 +1488,7 @@ namespace cppcanvas
case META_FONT_ACTION:
{
::cppcanvas::internal::OutDevState& rState =
rStates.getState();
- const ::Font& rFont(
static_cast<MetaFontAction*>(pCurrAct)->GetFont() );
+ const vcl::Font& rFont(
static_cast<MetaFontAction*>(pCurrAct)->GetFont() );
rState.xFont = createFont( rState.fontRotation,
rFont,
@@ -2985,7 +2985,7 @@ namespace cppcanvas
::cppcanvas::internal::OutDevState& rState =
aStateStack.getState();
rState.xFont = createFont( rState.fontRotation,
- ::Font(), // default font
+ ::vcl::Font(), // default font
aParms );
}
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx
b/cppcanvas/source/mtfrenderer/textaction.cxx
index ca2ff16..fd46607 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -1954,8 +1954,8 @@ namespace cppcanvas
// (which is already contained in the render state
// transformation matrix - otherwise, glyph polygons
// will be rotated twice)
- const ::Font aOrigFont( rVDev.GetFont() );
- ::Font aUnrotatedFont( aOrigFont );
+ const vcl::Font aOrigFont( rVDev.GetFont() );
+ vcl::Font aUnrotatedFont( aOrigFont );
aUnrotatedFont.SetOrientation(0);
rVDev.SetFont( aUnrotatedFont );
diff --git a/cui/source/dialogs/SpellAttrib.cxx
b/cui/source/dialogs/SpellAttrib.cxx
index be09cce..d8a0f73 100644
--- a/cui/source/dialogs/SpellAttrib.cxx
+++ b/cui/source/dialogs/SpellAttrib.cxx
@@ -47,7 +47,7 @@ SpellErrorAttrib::~SpellErrorAttrib()
}
-void SpellErrorAttrib::SetFont( Font& ) const
+void SpellErrorAttrib::SetFont( vcl::Font& ) const
{
//this attribute doesn't have a visual effect
}
@@ -85,7 +85,7 @@ SpellLanguageAttrib::~SpellLanguageAttrib()
}
-void SpellLanguageAttrib::SetFont( Font& ) const
+void SpellLanguageAttrib::SetFont( vcl::Font& ) const
{
//no visual effect
}
@@ -123,7 +123,7 @@ SpellBackgroundAttrib::~SpellBackgroundAttrib()
}
-void SpellBackgroundAttrib::SetFont( Font& rFont ) const
+void SpellBackgroundAttrib::SetFont( vcl::Font& rFont ) const
{
rFont.SetFillColor(m_aBackgroundColor);
}
diff --git a/cui/source/dialogs/SpellAttrib.hxx
b/cui/source/dialogs/SpellAttrib.hxx
index f0a53f3..d50b851 100644
--- a/cui/source/dialogs/SpellAttrib.hxx
+++ b/cui/source/dialogs/SpellAttrib.hxx
@@ -112,7 +112,7 @@ public:
const SpellErrorDescription& GetErrorDescription() const { return
m_aSpellErrorDescription; }
- virtual void SetFont( Font& rFont ) const SAL_OVERRIDE;
+ virtual void SetFont( vcl::Font& rFont ) const SAL_OVERRIDE;
virtual TextAttrib* Clone() const SAL_OVERRIDE;
virtual bool operator==( const TextAttrib& rAttr ) const
SAL_OVERRIDE;
};
@@ -135,7 +135,7 @@ public:
{m_eLanguage = eLang;}
- virtual void SetFont( Font& rFont ) const SAL_OVERRIDE;
+ virtual void SetFont( vcl::Font& rFont ) const SAL_OVERRIDE;
virtual TextAttrib* Clone() const SAL_OVERRIDE;
virtual bool operator==( const TextAttrib& rAttr ) const
SAL_OVERRIDE;
};
@@ -157,7 +157,7 @@ public:
void SetColor( const Color& rNewCol
){m_aBackgroundColor = rNewCol;}
- virtual void SetFont( Font& rFont ) const SAL_OVERRIDE;
+ virtual void SetFont( vcl::Font& rFont ) const SAL_OVERRIDE;
virtual TextAttrib* Clone() const SAL_OVERRIDE;
virtual bool operator==( const TextAttrib& rAttr ) const
SAL_OVERRIDE;
};
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 06a9913..8236eba 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -144,8 +144,8 @@ void AboutDialog::StyleControls()
m_pDescriptionText->SetPaintTransparent(true);
m_pCopyrightText->SetPaintTransparent(true);
- Font aLabelFont = GetSettings().GetStyleSettings().GetLabelFont();
- Font aLargeFont = aLabelFont;
+ vcl::Font aLabelFont = GetSettings().GetStyleSettings().GetLabelFont();
+ vcl::Font aLargeFont = aLabelFont;
aLargeFont.SetSize( Size( 0, aLabelFont.GetSize().Height() * 3 ) );
// Logo Replacement Text
diff --git a/cui/source/dialogs/cuicharmap.cxx
b/cui/source/dialogs/cuicharmap.cxx
index df37c79..81ad048 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -88,14 +88,14 @@ SvxCharacterMap::SvxCharacterMap( Window* pParent, bool
bOne_, const SfxItemSet*
SFX_ITEMSET_ARG( pSet, pFontNameItem, SfxStringItem, SID_FONT_NAME, false
);
if ( pFontItem )
{
- Font aTmpFont( pFontItem->GetFamilyName(), pFontItem->GetStyleName(),
GetCharFont().GetSize() );
+ vcl::Font aTmpFont( pFontItem->GetFamilyName(),
pFontItem->GetStyleName(), GetCharFont().GetSize() );
aTmpFont.SetCharSet( pFontItem->GetCharSet() );
aTmpFont.SetPitch( pFontItem->GetPitch() );
SetCharFont( aTmpFont );
}
else if ( pFontNameItem )
{
- Font aTmpFont( GetCharFont() );
+ vcl::Font aTmpFont( GetCharFont() );
aTmpFont.SetName( pFontNameItem->GetValue() );
SetCharFont( aTmpFont );
}
@@ -151,7 +151,7 @@ short SvxCharacterMap::Execute()
if ( pSet )
{
const SfxItemPool* pPool = pSet->GetPool();
- const Font& rFont( GetCharFont() );
+ const vcl::Font& rFont( GetCharFont() );
pSet->Put( SfxStringItem( pPool->GetWhich(SID_CHARMAP),
GetCharacters() ) );
pSet->Put( SvxFontItem( rFont.GetFamily(), rFont.GetName(),
rFont.GetStyleName(), rFont.GetPitch(), rFont.GetCharSet(),
pPool->GetWhich(SID_ATTR_CHAR_FONT) ) );
@@ -195,7 +195,7 @@ void SvxShowText::Paint( const Rectangle& )
bool bGotBoundary = true;
bool bShrankFont = false;
- Font aOrigFont(GetFont());
+ vcl::Font aOrigFont(GetFont());
Size aFontSize(aOrigFont.GetSize());
Rectangle aBoundRect;
@@ -212,7 +212,7 @@ void SvxShowText::Paint( const Rectangle& )
long nTextWidth = aBoundRect.GetWidth();
if (nAvailWidth > nTextWidth)
break;
- Font aFont(aOrigFont);
+ vcl::Font aFont(aOrigFont);
aFontSize.Height() = nFontHeight;
aFont.SetSize(aFontSize);
Control::SetFont(aFont);
@@ -263,10 +263,10 @@ void SvxShowText::Paint( const Rectangle& )
-void SvxShowText::SetFont( const Font& rFont )
+void SvxShowText::SetFont( const vcl::Font& rFont )
{
long nWinHeight = GetOutputSizePixel().Height();
- Font aFont = rFont;
+ vcl::Font aFont = rFont;
aFont.SetWeight( WEIGHT_NORMAL );
aFont.SetAlign( ALIGN_TOP );
aFont.SetSize( PixelToLogic( Size( 0, nWinHeight/2 ) ) );
@@ -279,7 +279,7 @@ void SvxShowText::SetFont( const Font& rFont )
Size SvxShowText::GetOptimalSize() const
{
- const Font &rFont = GetFont();
+ const vcl::Font &rFont = GetFont();
const Size rFontSize = rFont.GetSize();
long nWinHeight = LogicToPixel(rFontSize).Height() * 2;
return Size( GetTextWidth( GetText() ) + 2 * 12, nWinHeight );
@@ -379,11 +379,11 @@ void SvxCharacterMap::init()
-void SvxCharacterMap::SetCharFont( const Font& rFont )
+void SvxCharacterMap::SetCharFont( const vcl::Font& rFont )
{
// first get the underlying info in order to get font names
// like "Times New Roman;Times" resolved
- Font aTmp( GetFontMetric( rFont ) );
+ vcl::Font aTmp( GetFontMetric( rFont ) );
if ( m_pFontLB->GetEntryPos( aTmp.GetName() ) == LISTBOX_ENTRY_NOTFOUND )
return;
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx
b/cui/source/dialogs/hangulhanjadlg.cxx
index 99a5b1f..791bb7d3 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -61,7 +61,7 @@ namespace svx
OutputDevice& m_rDev;
public:
- inline FontSwitch( OutputDevice& _rDev, const Font&
_rTemporaryFont )
+ inline FontSwitch( OutputDevice& _rDev, const vcl::Font&
_rTemporaryFont )
:m_rDev( _rDev )
{
m_rDev.Push( PUSH_FONT );
@@ -127,7 +127,7 @@ namespace svx
Size aPlaygroundSize( _rRect.GetSize() );
// the font for the secondary text:
- Font aSmallerFont( _rDevice.GetFont() );
+ vcl::Font aSmallerFont( _rDevice.GetFont() );
// heuristic: 80% of the original size
aSmallerFont.SetHeight( (long)( 0.8 * aSmallerFont.GetHeight() ) );
@@ -304,7 +304,7 @@ namespace svx
Size RubyRadioButton::GetOptimalSize() const
{
- Font aSmallerFont( GetFont() );
+ vcl::Font aSmallerFont( GetFont() );
aSmallerFont.SetHeight( static_cast<long>( 0.8 *
aSmallerFont.GetHeight() ) );
Rectangle rect( Point(), Size( SAL_MAX_INT32, SAL_MAX_INT32 ) );
sal_uInt16 style = GetStyle();
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 2566f9b..bf2d6a3 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -57,7 +57,7 @@ SvxPostItDialog::SvxPostItDialog(Window* pParent, const
SfxItemSet& rCoreSet,
m_pAuthorBtn->SetClickHdl( LINK( this, SvxPostItDialog, Stamp ) );
m_pOKBtn->SetClickHdl( LINK( this, SvxPostItDialog, OKHdl ) );
- Font aFont( m_pEditED->GetFont() );
+ vcl::Font aFont( m_pEditED->GetFont() );
aFont.SetWeight( WEIGHT_LIGHT );
m_pEditED->SetFont( aFont );
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index d9d6ec76..abd225b 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -145,10 +145,10 @@ void AlternativesString::Paint(
{
AlternativesExtraData* pData = m_rControlImpl.GetExtraData( pEntry );
Point aPos( rPos );
- Font aOldFont( rDev.GetFont());
+ vcl::Font aOldFont( rDev.GetFont());
if (pData && pData->IsHeader())
{
- Font aFont( aOldFont );
+ vcl::Font aFont( aOldFont );
aFont.SetWeight( WEIGHT_BOLD );
rDev.SetFont( aFont );
aPos.X() = 0;
diff --git a/cui/source/factory/init.cxx b/cui/source/factory/init.cxx
index 80d25ee..cff2298 100644
--- a/cui/source/factory/init.cxx
+++ b/cui/source/factory/init.cxx
@@ -25,7 +25,7 @@
// caution: needs C-Linkage since dynamically loaded via symbol name
extern "C"
{
-SAL_DLLPUBLIC_EXPORT bool GetSpecialCharsForEdit(Window* i_pParent, const
Font& i_rFont, OUString& o_rResult)
+SAL_DLLPUBLIC_EXPORT bool GetSpecialCharsForEdit(Window* i_pParent, const
vcl::Font& i_rFont, OUString& o_rResult)
{
bool bRet = false;
boost::scoped_ptr<SvxCharacterMap> aDlg(new SvxCharacterMap( i_pParent ));
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index eb3ea5b..5d70cc9 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -154,9 +154,9 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
OUString sBulletChar;
OUString sByInputBulletChar;
- Font aBulletFont;
- Font aByInputBulletFont;
- sal_uInt16 nPercent;
+ vcl::Font aBulletFont;
+ vcl::Font aByInputBulletFont;
+ sal_uInt16 nPercent;
SvLBoxButtonData* pCheckButtonData;
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index 8af1b91..0c98267 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -43,7 +43,7 @@ public:
bool bCenter = false );
virtual ~SvxShowText();
- void SetFont( const Font& rFont );
+ void SetFont( const vcl::Font& rFont );
void SetText( const OUString& rText ) SAL_OVERRIDE;
void SetCentered(bool bCenter) { mbCenter = bCenter; }
@@ -80,8 +80,8 @@ private:
FixedText* m_pSymbolText;
SvxShowText* m_pShowChar;
FixedText* m_pCharCodeText;
- Font aFont;
- bool bOne;
+ vcl::Font aFont;
+ bool bOne;
const SubsetMap* pSubsetMap;
DECL_LINK(OKHdl, void *);
@@ -102,8 +102,8 @@ public:
void DisableFontSelection();
- const Font& GetCharFont() const { return aFont;}
- void SetCharFont( const Font& rFont );
+ const vcl::Font& GetCharFont() const { return aFont;}
+ void SetCharFont( const vcl::Font& rFont );
void SetChar( sal_UCS4 );
sal_UCS4 GetChar() const;
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 6c56ed0..5ead54c 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -41,7 +41,7 @@ class SvxBrushItem;
class SvxNumberingPreview : public Window
{
const SvxNumRule* pActNum;
- Font aStdFont;
+ vcl::Font aStdFont;
long nPageWidth;
const OUString* pOutlineNames;
bool bPosition;
@@ -308,7 +308,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
bool bMenuButtonInitialized : 1;
std::vector<OUString> aGrfNames;
- Font aActBulletFont;
+ vcl::Font aActBulletFont;
sal_uInt8 nBullet;
sal_uInt16 nActNumLvl;
diff --git a/cui/source/options/optHeaderTabListbox.cxx
b/cui/source/options/optHeaderTabListbox.cxx
index d9c355e..67de02c 100644
--- a/cui/source/options/optHeaderTabListbox.cxx
+++ b/cui/source/options/optHeaderTabListbox.cxx
@@ -43,8 +43,8 @@ public:
void OptLBoxString_Impl::Paint(
const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/,
const SvTreeListEntry* pEntry)
{
- Font aOldFont( rDev.GetFont() );
- Font aFont( aOldFont );
+ vcl::Font aOldFont( rDev.GetFont() );
+ vcl::Font aFont( aOldFont );
//detect readonly state by asking for a valid Image
if(pEntry && !(!((OptHeaderTabListBox&)rDev).GetCollapsedEntryBmp(pEntry)))
aFont.SetColor(
Application::GetSettings().GetStyleSettings().GetDeactiveTextColor() );
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 469b1f9..bd6edfd 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -281,10 +281,10 @@ void BrwStringDic_Impl::Paint(
{
ModuleUserData_Impl* pData = (ModuleUserData_Impl*)pEntry->GetUserData();
Point aPos(rPos);
- Font aOldFont( rDev.GetFont());
+ vcl::Font aOldFont( rDev.GetFont());
if(pData->IsParent())
{
- Font aFont( aOldFont );
+ vcl::Font aFont( aOldFont );
aFont.SetWeight( WEIGHT_BOLD );
rDev.SetFont( aFont );
aPos.X() = 0;
@@ -455,8 +455,8 @@ void BrwString_Impl::Paint(
{
Point aNewPos(aPos);
aNewPos.X() += rDev.GetTextWidth(GetText());
- Font aOldFont( rDev.GetFont());
- Font aFont( aOldFont );
+ vcl::Font aOldFont( rDev.GetFont());
+ vcl::Font aFont( aOldFont );
aFont.SetWeight( WEIGHT_BOLD );
//??? convert the lower byte from the user date into a string
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 29ed3c2..498a677 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -268,9 +268,9 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet* )
struct ImpUserData
{
OUString *pString;
- Font *pFont;
+ vcl::Font *pFont;
- ImpUserData(OUString* pText, Font* pFnt)
+ ImpUserData(OUString* pText, vcl::Font* pFnt)
{ pString = pText; pFont = pFnt;}
};
@@ -324,8 +324,8 @@ void OfaImpBrwString::Paint(
ImpUserData* pUserData = (ImpUserData* )pEntry->GetUserData();
Point aNewPos(rPos);
aNewPos.X() += rDev.GetTextWidth(GetText());
- Font aOldFont( rDev.GetFont());
- Font aFont( aOldFont );
+ vcl::Font aOldFont( rDev.GetFont());
+ vcl::Font aFont( aOldFont );
if(pUserData->pFont)
{
aFont = *pUserData->pFont;
@@ -701,7 +701,7 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl)
pMapDlg->SetChar( (*pUserData->pString)[0] );
if(RET_OK == pMapDlg->Execute())
{
- Font aFont(pMapDlg->GetCharFont());
+ vcl::Font aFont(pMapDlg->GetCharFont());
*pUserData->pFont = aFont;
sal_UCS4 aChar = pMapDlg->GetChar();
// using the UCS4 constructor
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index ebf1a03..6937e0c 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -81,7 +81,7 @@ SvxNumberPreview::SvxNumberPreview(Window* pParent, WinBits
nStyle)
, mnPos(-1)
, mnChar(0x0)
{
- Font aFont( GetFont() );
+ vcl::Font aFont( GetFont() );
aFont.SetTransparent( true );
aFont.SetColor(
Application::GetSettings().GetStyleSettings().GetFieldColor() );
SetFont( aFont );
@@ -149,10 +149,10 @@ void SvxNumberPreview::NotifyChange( const OUString&
rPrevStr,
void SvxNumberPreview::Paint( const Rectangle& )
{
- Font aDrawFont = GetFont();
- Size aSzWnd = GetOutputSizePixel();
- OUString aTmpStr( aPrevStr );
- long nLeadSpace = (aSzWnd.Width() - GetTextWidth( aTmpStr )) /2;
+ vcl::Font aDrawFont = GetFont();
+ Size aSzWnd = GetOutputSizePixel();
+ OUString aTmpStr( aPrevStr );
+ long nLeadSpace = (aSzWnd.Width() - GetTextWidth( aTmpStr )) /2;
aDrawFont.SetColor( aPrevCol );
SetFont( aDrawFont );
@@ -830,7 +830,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl(
std::vector<OUString>& rEnt
{
OUString aEntry;
OUString aTmpString;
- Font aFont=m_pLbCategory->GetFont();
+ vcl::Font aFont=m_pLbCategory->GetFont();
size_t i = 0;
short nTmpCatPos;
short aPrivCat;
@@ -877,7 +877,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl(
std::vector<OUString>& rEnt
{
Color* pPreviewColor = NULL;
OUString aPreviewString( GetExpColorString( pPreviewColor,
aEntry, aPrivCat ) );
- Font aEntryFont( m_pLbFormat->GetFont() );
+ vcl::Font aEntryFont( m_pLbFormat->GetFont() );
m_pLbFormat->InsertFontEntry( aPreviewString, aEntryFont,
pPreviewColor );
}
else
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index ca9fe1f..2e08773 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -156,10 +156,10 @@ static bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16
nLevelMask)
return bRet;
}
-static Font& lcl_GetDefaultBulletFont()
+static vcl::Font& lcl_GetDefaultBulletFont()
{
static bool bInit = false;
- static Font aDefBulletFont( OUString("StarSymbol"),
+ static vcl::Font aDefBulletFont( OUString("StarSymbol"),
OUString(), Size( 0, 14 ) );
if(!bInit)
{
@@ -476,7 +476,7 @@ IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl)
bPreset = false;
bModified = true;
sal_Unicode cChar = aBulletTypes[m_pExamplesVS->GetSelectItemId() - 1];
- Font& rActBulletFont = lcl_GetDefaultBulletFont();
+ vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
sal_uInt16 nMask = 1;
for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
@@ -679,7 +679,7 @@ IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl)
SvxNumSettingsArr_Impl& rItemArr =
aNumSettingsArrays[m_pExamplesVS->GetSelectItemId() - 1];
- Font& rActBulletFont = lcl_GetDefaultBulletFont();
+ vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
SvxNumSettings_Impl* pLevelSettings = 0;
for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
{
@@ -712,13 +712,13 @@ IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl)
{
vcl::FontInfo aInfo = pList->Get(
pLevelSettings->sBulletFont,WEIGHT_NORMAL,
ITALIC_NONE);
- Font aFont(aInfo);
+ vcl::Font aFont(aInfo);
aFmt.SetBulletFont(&aFont);
}
else
{
//if it cannot be found then create a new one
- Font aCreateFont( pLevelSettings->sBulletFont,
+ vcl::Font aCreateFont( pLevelSettings->sBulletFont,
OUString(), Size( 0, 14 ) );
aCreateFont.SetCharSet( RTL_TEXTENCODING_DONTKNOW );
aCreateFont.SetFamily( FAMILY_DONTKNOW );
@@ -2009,7 +2009,7 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, BulletHdl_Impl)
boost::scoped_ptr<SvxCharacterMap> pMap(new SvxCharacterMap( this, true ));
sal_uInt16 nMask = 1;
- const Font* pFmtFont = 0;
+ const vcl::Font* pFmtFont = 0;
bool bSameBullet = true;
sal_Unicode cBullet = 0;
bool bFirst = true;
@@ -2234,10 +2234,10 @@ static sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev,
const SvxNumberFormat& rFmt, sal_uInt16 nXStart,
sal_uInt16 nYStart, const Size& rSize)
{
- Font aTmpFont(pVDev->GetFont());
+ vcl::Font aTmpFont(pVDev->GetFont());
// via Uno it's possible that no font has been set!
- Font aFont(rFmt.GetBulletFont() ? *rFmt.GetBulletFont() : aTmpFont);
+ vcl::Font aFont(rFmt.GetBulletFont() ? *rFmt.GetBulletFont() : aTmpFont);
Size aTmpSize(rSize);
aTmpSize.Width() *= rFmt.GetBulletRelSize();
aTmpSize.Width() /= 100 ;
@@ -2403,8 +2403,8 @@ void SvxNumberingPreview::Paint( const Rectangle&
/*rRect*/ )
if(pActNum->IsContinuousNumbering())
aNum.GetLevelVal()[nLevel] = nPreNum;
OUString aText(pActNum->MakeNumString( aNum ));
- Font aSaveFont = pVDev->GetFont();
- Font aColorFont(aSaveFont);
+ vcl::Font aSaveFont = pVDev->GetFont();
+ vcl::Font aColorFont(aSaveFont);
Color aTmpBulletColor = rFmt.GetBulletColor();
if(aTmpBulletColor.GetColor() == COL_AUTO)
aTmpBulletColor = Color(aBackColor.IsDark() ?
COL_WHITE : COL_BLACK);
@@ -2526,7 +2526,7 @@ void SvxNumberingPreview::Paint( const Rectangle&
/*rRect*/ )
}
else
{
- Font aColorFont(aStdFont);
+ vcl::Font aColorFont(aStdFont);
Color aTmpBulletColor = rFmt.GetBulletColor();
if(aTmpBulletColor.GetColor() == COL_AUTO)
aTmpBulletColor = Color(aBackColor.IsDark() ?
COL_WHITE : COL_BLACK);
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index d5b5838..691775f 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -167,7 +167,7 @@ namespace
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
if( bFont )
{
- Font aFont;
+ vcl::Font aFont;
aFont = rStyleSettings.GetFieldFont();
aFont.SetColor( rStyleSettings.GetWindowTextColor() );
SetPointFont( aFont );
@@ -1232,7 +1232,7 @@ void OAppDetailPageHelper::DataChanged( const
DataChangedEvent& rDCEvt )
{
Window::DataChanged( rDCEvt );
- if ( (rDCEvt.GetType() == DATACHANGED_FONTS) ||
+ if ( (rDCEvt.GetType() == DATACHANGED_FONTS) ||
(rDCEvt.GetType() == DATACHANGED_DISPLAY) ||
(rDCEvt.GetType() == DATACHANGED_FONTSUBSTITUTION) ||
((rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
@@ -1253,25 +1253,24 @@ void OAppDetailPageHelper::DataChanged( const
DataChangedEvent& rDCEvt )
void OAppDetailPageHelper::ImplInitSettings()
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
- Font aFont;
- aFont = rStyleSettings.GetFieldFont();
- aFont.SetColor( rStyleSettings.GetWindowTextColor() );
- SetPointFont( aFont );
- m_aTBPreview.SetPointFont( aFont );
-
- SetTextColor( rStyleSettings.GetFieldTextColor() );
- SetTextFillColor();
- m_aBorder.SetTextColor( rStyleSettings.GetFieldTextColor() );
- m_aBorder.SetTextFillColor();
- m_aTBPreview.SetTextColor( rStyleSettings.GetFieldTextColor() );
- m_aTBPreview.SetTextFillColor();
-
- SetBackground( rStyleSettings.GetFieldColor() );
- m_aBorder.SetBackground( rStyleSettings.GetFieldColor() );
- m_aFL.SetBackground( rStyleSettings.GetFieldColor() );
- m_aDocumentInfo.SetBackground( rStyleSettings.GetFieldColor() );
- m_aTBPreview.SetBackground( rStyleSettings.GetFieldColor() );
- m_pTablePreview->SetBackground( rStyleSettings.GetFieldColor() );
+ vcl::Font aFont;
+ aFont = rStyleSettings.GetFieldFont();
+ aFont.SetColor( rStyleSettings.GetWindowTextColor() );
+ SetPointFont( aFont );
+ m_aTBPreview.SetPointFont( aFont );
+
+ SetTextColor( rStyleSettings.GetFieldTextColor() );
+ SetTextFillColor();
+ m_aBorder.SetTextColor( rStyleSettings.GetFieldTextColor() );
+ m_aBorder.SetTextFillColor();
+ m_aTBPreview.SetTextColor( rStyleSettings.GetFieldTextColor() );
+ m_aTBPreview.SetTextFillColor();
+ SetBackground( rStyleSettings.GetFieldColor() );
+ m_aBorder.SetBackground( rStyleSettings.GetFieldColor() );
+ m_aFL.SetBackground( rStyleSettings.GetFieldColor() );
+ m_aDocumentInfo.SetBackground( rStyleSettings.GetFieldColor() );
+ m_aTBPreview.SetBackground( rStyleSettings.GetFieldColor() );
+ m_pTablePreview->SetBackground( rStyleSettings.GetFieldColor() );
}
OPreviewWindow::OPreviewWindow(Window* _pParent)
@@ -1346,7 +1345,7 @@ void OPreviewWindow::ImplInitSettings( bool bFont, bool
bForeground, bool bBackg
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
if( bFont )
{
- Font aFont;
+ vcl::Font aFont;
aFont = rStyleSettings.GetFieldFont();
aFont.SetColor( rStyleSettings.GetWindowTextColor() );
SetPointFont( aFont );
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx
b/dbaccess/source/ui/app/AppDetailView.cxx
index 8f3a8d8..e6e01c4 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -111,7 +111,7 @@ void OCreationList::PreparePaint( SvTreeListEntry* _pEntry )
if ( bIsMouseDownEntry )
{
- Font aFont( GetFont() );
+ vcl::Font aFont( GetFont() );
aFont.SetColor(
GetSettings().GetStyleSettings().GetHighlightTextColor() );
Control::SetFont( aFont );
}
@@ -384,7 +384,7 @@ void OTasksWindow::ImplInitSettings( bool bFont, bool
bForeground, bool bBackgro
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
if( bFont )
{
- Font aFont;
+ vcl::Font aFont;
aFont = rStyleSettings.GetFieldFont();
aFont.SetColor( rStyleSettings.GetWindowTextColor() );
SetPointFont( aFont );
@@ -408,7 +408,7 @@ void OTasksWindow::ImplInitSettings( bool bFont, bool
bForeground, bool bBackgro
m_aFL.SetBackground( rStyleSettings.GetFieldColor() );
}
- Font aFont = m_aDescription.GetControlFont();
+ vcl::Font aFont = m_aDescription.GetControlFont();
aFont.SetWeight(WEIGHT_BOLD);
m_aDescription.SetControlFont(aFont);
}
@@ -565,7 +565,7 @@ void OApplicationDetailView::ImplInitSettings( bool bFont,
bool bForeground, boo
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
if( bFont )
{
- Font aFont;
+ vcl::Font aFont;
aFont = rStyleSettings.GetFieldFont();
aFont.SetColor( rStyleSettings.GetWindowTextColor() );
SetPointFont( aFont );
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx
b/dbaccess/source/ui/app/AppDetailView.hxx
index c11b07b..4f83589 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -51,8 +51,8 @@ namespace dbaui
// members related to drawing the currently hovered/selected entry
SvTreeListEntry* m_pMouseDownEntry;
SvTreeListEntry* m_pLastActiveEntry;
- Color m_aOriginalBackgroundColor;
- Font m_aOriginalFont;
+ Color m_aOriginalBackgroundColor;
+ vcl::Font m_aOriginalFont;
public:
OCreationList( OTasksWindow& _rParent );
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx
b/dbaccess/source/ui/app/AppSwapWindow.cxx
index 746a969..4f12cb9 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -74,7 +74,7 @@ void OApplicationSwapWindow::ImplInitSettings( bool bFont,
bool bForeground, boo
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
if( bFont )
{
- Font aFont;
+ vcl::Font aFont;
aFont = rStyleSettings.GetFieldFont();
aFont.SetColor( rStyleSettings.GetWindowTextColor() );
SetPointFont( aFont );
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx
b/dbaccess/source/ui/app/AppTitleWindow.cxx
index 0e652e0..72e3736 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -136,7 +136,7 @@ void OTitleWindow::ImplInitSettings( bool bFont, bool
bForeground, bool bBackgro
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
if( bFont )
{
- Font aFont;
+ vcl::Font aFont;
aFont = rStyleSettings.GetFieldFont();
aFont.SetColor( rStyleSettings.GetWindowTextColor() );
SetPointFont( aFont );
@@ -154,7 +154,7 @@ void OTitleWindow::ImplInitSettings( bool bFont, bool
bForeground, bool bBackgro
Window* pWindows [] = { &m_aSpace1, &m_aSpace2, &m_aTitle};
for (size_t i=0; i < sizeof(pWindows)/sizeof(pWindows[0]); ++i)
{
- Font aFont = pWindows[i]->GetFont();
+ vcl::Font aFont = pWindows[i]->GetFont();
aFont.SetWeight(WEIGHT_BOLD);
pWindows[i]->SetFont(aFont);
pWindows[i]->SetTextColor( aStyle.GetLightColor() );
diff --git a/dbaccess/source/ui/app/AppView.cxx
b/dbaccess/source/ui/app/AppView.cxx
index 8855e90..3b22fd8 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -153,7 +153,7 @@ void OAppBorderWindow::ImplInitSettings()
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
if( true )
{
- Font aFont;
+ vcl::Font aFont;
aFont = rStyleSettings.GetFieldFont();
aFont.SetColor( rStyleSettings.GetWindowTextColor() );
SetPointFont( aFont );
@@ -546,7 +546,7 @@ void OApplicationView::ImplInitSettings()
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
if( true )
{
- Font aFont;
+ vcl::Font aFont;
aFont = rStyleSettings.GetFieldFont();
aFont.SetColor( rStyleSettings.GetWindowTextColor() );
SetPointFont( aFont );
diff --git a/dbaccess/source/ui/control/VertSplitView.cxx
b/dbaccess/source/ui/control/VertSplitView.cxx
index ec3ede4..975cefd 100644
--- a/dbaccess/source/ui/control/VertSplitView.cxx
+++ b/dbaccess/source/ui/control/VertSplitView.cxx
@@ -63,7 +63,7 @@ void OSplitterView::ImplInitSettings( bool bFont, bool
bForeground, bool bBackgr
if ( bFont )
{
- Font aFont = rStyleSettings.GetAppFont();
+ vcl::Font aFont = rStyleSettings.GetAppFont();
if ( IsControlFont() )
aFont.Merge( GetControlFont() );
SetPointFont( aFont );
diff --git a/dbaccess/source/ui/control/listviewitems.cxx
b/dbaccess/source/ui/control/listviewitems.cxx
index 406eb6e..fef4647 100644
--- a/dbaccess/source/ui/control/listviewitems.cxx
+++ b/dbaccess/source/ui/control/listviewitems.cxx
@@ -32,7 +32,7 @@ namespace dbaui
if (!_pViewData)
_pViewData = pView->GetViewDataItem( pEntry, this );
pView->Push(PUSH_ALL);
- Font aFont( pView->GetFont());
+ vcl::Font aFont( pView->GetFont());
aFont.SetWeight(WEIGHT_BOLD);
pView->Control::SetFont( aFont );
_pViewData->maSize = Size(pView->GetTextWidth(GetText()),
pView->GetTextHeight());
@@ -51,7 +51,7 @@ namespace dbaui
if (m_bEmphasized)
{
rDev.Push(PUSH_ALL);
- Font aFont( rDev.GetFont());
+ vcl::Font aFont( rDev.GetFont());
aFont.SetWeight(WEIGHT_BOLD);
rDev.SetFont( aFont );
Point aPos(rPos);
diff --git a/dbaccess/source/ui/control/marktree.cxx
b/dbaccess/source/ui/control/marktree.cxx
index b6a7a59..3cb9c7d 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -45,8 +45,8 @@ void OMarkableTreeListBox::Paint(const Rectangle& _rRect)
{
if (!IsEnabled())
{
- Font aOldFont = GetFont();
- Font aNewFont(aOldFont);
+ vcl::Font aOldFont = GetFont();
+ vcl::Font aNewFont(aOldFont);
StyleSettings aSystemStyle =
Application::GetSettings().GetStyleSettings();
aNewFont.SetColor(aSystemStyle.GetDisableColor());
diff --git a/dbaccess/source/ui/control/sqledit.cxx
b/dbaccess/source/ui/control/sqledit.cxx
index 5c51f27..72f6a27 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -233,12 +233,12 @@ void OSqlEdit::ImplSetFont()
get_value_or( OUString() ) );
if ( sFontName.isEmpty() )
{
- Font aTmpFont( OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED,
Application::GetSettings().GetUILanguageTag().getLanguageType(), 0 , this ) );
+ vcl::Font aTmpFont( OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED,
Application::GetSettings().GetUILanguageTag().getLanguageType(), 0 , this ) );
sFontName = aTmpFont.GetName();
}
Size aFontSize(
0, officecfg::Office::Common::Font::SourceViewFont::FontHeight::get()
);
- Font aFont( sFontName, aFontSize );
+ vcl::Font aFont( sFontName, aFontSize );
aStyleSettings.SetFieldFont(aFont);
aSettings.SetStyleSettings(aStyleSettings);
SetSettings(aSettings);
diff --git a/dbaccess/source/ui/inc/UITools.hxx
b/dbaccess/source/ui/inc/UITools.hxx
index a0e20f7..7be8fd7 100644
--- a/dbaccess/source/ui/inc/UITools.hxx
+++ b/dbaccess/source/ui/inc/UITools.hxx
@@ -67,7 +67,7 @@ namespace svt
class Window;
class ToolBox;
-class Font;
+namespace vcl { class Font; }
class SvNumberFormatter;
class SfxFilter;
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx
b/dbaccess/source/ui/misc/TokenWriter.cxx
index 601ef11..994909e 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -320,7 +320,7 @@ void ODatabaseImportExport::initialize()
}
if ( m_aFont.Name.isEmpty() )
{
- Font aApplicationFont = OutputDevice::GetDefaultFont(
+ vcl::Font aApplicationFont = OutputDevice::GetDefaultFont(
DEFAULTFONT_SANS_UNICODE,
Application::GetSettings().GetUILanguageTag().getLanguageType(),
DEFAULTFONT_FLAGS_ONLYONE
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx
b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 9a954ea..668d543 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -1452,7 +1452,7 @@ void OJoinTableView::StateChanged( StateChangedType nType
)
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
- Font aFont = rStyleSettings.GetGroupFont();
+ vcl::Font aFont = rStyleSettings.GetGroupFont();
if ( IsControlFont() )
aFont.Merge( GetControlFont() );
SetZoomedPointFont( aFont );
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 43fc420..217604d 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -135,7 +135,7 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent )
// switch off triState of ::com::sun::star::form::CheckBox
m_pVisibleCell->GetBox().EnableTriState( false );
- Font aTitleFont = OutputDevice::GetDefaultFont(
DEFAULTFONT_SANS_UNICODE,Window::GetSettings().GetLanguageTag().getLanguageType(),DEFAULTFONT_FLAGS_ONLYONE);
+ vcl::Font aTitleFont = OutputDevice::GetDefaultFont(
DEFAULTFONT_SANS_UNICODE,Window::GetSettings().GetLanguageTag().getLanguageType(),DEFAULTFONT_FLAGS_ONLYONE);
aTitleFont.SetSize(Size(0, 6));
SetTitleFont(aTitleFont);
@@ -330,7 +330,7 @@ void OSelectionBrowseBox::Init()
SetHeaderBar(pNewHeaderBar);
SetMode(m_nMode);
- Font aFont( GetDataWindow().GetFont() );
+ vcl::Font aFont( GetDataWindow().GetFont() );
aFont.SetWeight( WEIGHT_NORMAL );
GetDataWindow().SetFont( aFont );
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx
b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 31f354c..027f49e 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -478,7 +478,7 @@ void OTableWindow::Resize()
void OTableWindow::SetBoldTitle( bool bBold )
{
- Font aFont = m_aTitle.GetFont();
+ vcl::Font aFont = m_aTitle.GetFont();
aFont.SetWeight( bBold?WEIGHT_BOLD:WEIGHT_NORMAL );
m_aTitle.SetFont( aFont );
m_aTitle.Invalidate();
@@ -554,7 +554,7 @@ void OTableWindow::StateChanged( StateChangedType nType )
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
- Font aFont = rStyleSettings.GetGroupFont();
+ vcl::Font aFont = rStyleSettings.GetGroupFont();
if ( IsControlFont() )
aFont.Merge( GetControlFont() );
SetZoomedPointFont( aFont );
diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
index 46e25c0..a2a2299 100644
--- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
@@ -48,7 +48,7 @@ OTableWindowTitle::OTableWindowTitle( OTableWindow* pParent )
:
SetBackground(Wallpaper(Color(aSystemStyle.GetFaceColor())));
SetTextColor(aSystemStyle.GetButtonTextColor());
- Font aFont( GetFont() );
+ vcl::Font aFont( GetFont() );
aFont.SetTransparent( true );
SetFont( aFont );
}
@@ -173,7 +173,7 @@ void OTableWindowTitle::StateChanged( StateChangedType
nType )
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
- Font aFont = rStyleSettings.GetGroupFont();
+ vcl::Font aFont = rStyleSettings.GetGroupFont();
if ( IsControlFont() )
aFont.Merge( GetControlFont() );
SetZoomedPointFont( aFont );
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index 0cb8cdc..9db53a8 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -57,7 +57,7 @@ void OTableRowView::Init()
{
EditBrowseBox::Init();
- Font aFont( GetDataWindow().GetFont() );
+ vcl::Font aFont( GetDataWindow().GetFont() );
aFont.SetWeight( WEIGHT_NORMAL );
GetDataWindow().SetFont( aFont );
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 239848c..46d20a9 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -122,7 +122,7 @@ void OTableBorderWindow::ImplInitSettings( bool bFont, bool
bForeground, bool bB
if ( bFont )
{
- Font aFont = rStyleSettings.GetAppFont();
+ vcl::Font aFont = rStyleSettings.GetAppFont();
if ( IsControlFont() )
aFont.Merge( GetControlFont() );
SetPointFont( aFont );
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 457e6dd..8e72256 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -537,8 +537,8 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect,
const TEntry_Impl pEntr
DrawImage( aPos, Size( ICON_WIDTH, ICON_HEIGHT ), aImage );
// Setup fonts
- Font aStdFont( GetFont() );
- Font aBoldFont( aStdFont );
+ vcl::Font aStdFont( GetFont() );
+ vcl::Font aBoldFont( aStdFont );
aBoldFont.SetWeight( WEIGHT_BOLD );
SetFont( aBoldFont );
long aTextHeight = GetTextHeight();
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 89ad429..8c59212 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -625,7 +625,7 @@ void SplashScreen::Paint( const Rectangle&)
_vdev.SetFillColor( _cProgressBarColor );
_vdev.SetLineColor();
_vdev.DrawRect(Rectangle(_tlx+_barspace, _tly+_barspace,
_tlx+_barspace+length, _tly+_barheight-_barspace));
- Font aFont;
+ vcl::Font aFont;
aFont.SetSize(Size(0, 12));
aFont.SetAlign(ALIGN_BASELINE);
_vdev.SetFont(aFont);
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 052d43a..5cad9d6 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -87,7 +87,7 @@ namespace
basegfx::B2DPolyPolygon maClipPolyPoygon;
/// font, etc.
- Font maFont;
+ vcl::Font maFont;
RasterOp maRasterOp;
ComplexTextLayoutMode mnLayoutMode;
LanguageType maLanguageType;
@@ -175,8 +175,8 @@ namespace
bool getClipPolyPolygonActive() const { return
mbClipPolyPolygonActive; }
void setClipPolyPolygonActive(bool bNew) { if(bNew !=
mbClipPolyPolygonActive) mbClipPolyPolygonActive = bNew; }
- const Font& getFont() const { return maFont; }
- void setFont(const Font& rFont) { if(rFont != maFont) maFont = rFont; }
+ const vcl::Font& getFont() const { return maFont; }
+ void setFont(const vcl::Font& rFont) { if(rFont != maFont) maFont =
rFont; }
const RasterOp& getRasterOp() const { return maRasterOp; }
void setRasterOp(const RasterOp& rRasterOp) { if(rRasterOp !=
maRasterOp) maRasterOp = rRasterOp; }
@@ -302,7 +302,7 @@ namespace
{
if(pLast->getFont().GetAlign() !=
pTip->getFont().GetAlign())
{
- Font aFont(pLast->getFont());
+ vcl::Font aFont(pLast->getFont());
aFont.SetAlign(pTip->getFont().GetAlign());
pLast->setFont(aFont);
}
@@ -1200,7 +1200,7 @@ namespace
}
/** helper to decide UnderlineAbove for text primitives */
- bool isUnderlineAbove(const Font& rFont)
+ bool isUnderlineAbove(const vcl::Font& rFont)
{
if(!rFont.IsVertical())
{
@@ -1222,7 +1222,7 @@ namespace
basegfx::B2DVector& rAlignmentOffset,
PropertyHolder& rProperty)
{
- const Font& rFont = rProperty.getFont();
+ const vcl::Font& rFont = rProperty.getFont();
basegfx::B2DVector aFontScaling;
rFontAttribute = drawinglayer::attribute::FontAttribute(
@@ -1273,7 +1273,7 @@ namespace
PropertyHolder& rProperty)
{
drawinglayer::primitive2d::BasePrimitive2D* pResult = 0;
- const Font& rFont = rProperty.getFont();
+ const vcl::Font& rFont = rProperty.getFont();
basegfx::B2DVector aAlignmentOffset(0.0, 0.0);
if(nTextLength)
@@ -2121,7 +2121,7 @@ namespace
// for sub-Mteafile contents, do start with
new, default render state
// #i124686# ...but copy font, this is already
set accordingly
- Font aTargetFont =
rPropertyHolders.Current().getFont();
+ vcl::Font aTargetFont =
rPropertyHolders.Current().getFont();
rPropertyHolders.PushDefault();
rPropertyHolders.Current().setFont(aTargetFont);
@@ -2660,7 +2660,7 @@ namespace
// playing the Metafile)
if(rPropertyHolders.Current().getFont().GetAlign() !=
aNewTextAlign)
{
- Font aNewFont(rPropertyHolders.Current().getFont());
+ vcl::Font
aNewFont(rPropertyHolders.Current().getFont());
aNewFont.SetAlign(aNewTextAlign);
rPropertyHolders.Current().setFont(aNewFont);
}
@@ -2735,7 +2735,7 @@ namespace
{
// this should not happen but i got Metafiles where
this was the
// case. A height needs to be guessed (similar to
OutputDevice::ImplNewFont())
- Font aCorrectedFont(pA->GetFont());
+ vcl::Font aCorrectedFont(pA->GetFont());
// guess 16 pixel (as in VCL)
aFontSize = Size(0, 16);
diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index cbd21e3..c472d19 100644
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@@ -155,7 +155,7 @@ namespace drawinglayer
releaseGlobalVirtualDevice();
}
- void TextLayouterDevice::setFont(const Font& rFont)
+ void TextLayouterDevice::setFont(const vcl::Font& rFont)
{
mrDevice.SetFont( rFont );
}
@@ -365,7 +365,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- Font getVclFontFromFontAttribute(
+ vcl::Font getVclFontFromFontAttribute(
const attribute::FontAttribute& rFontAttribute,
double fFontScaleX,
double fFontScaleY,
@@ -381,7 +381,7 @@ namespace drawinglayer
// for WIN32 systems, start with creating an unscaled font. If
FontScaling
// is wanted, that width needs to be adapted using FontMetric
again to get a
// width of the unscaled font
- Font aRetval(
+ vcl::Font aRetval(
rFontAttribute.getFamilyName(),
rFontAttribute.getStyleName(),
Size(0, nHeight));
@@ -391,7 +391,7 @@ namespace drawinglayer
// FontWidth when no scaling is used to explicitly have that zero
when e.g. the
// Font would be recorded in a MetaFile (The MetaFile FontAction
WILL record a
// set FontWidth; import that in a WIN32 system, and trouble is
there)
- Font aRetval(
+ vcl::Font aRetval(
rFontAttribute.getFamilyName(),
rFontAttribute.getStyleName(),
Size(bFontIsScaled ? nWidth : 0, nHeight));
@@ -432,7 +432,7 @@ namespace drawinglayer
attribute::FontAttribute getFontAttributeFromVclFont(
basegfx::B2DVector& o_rSize,
- const Font& rFont,
+ const vcl::Font& rFont,
bool bRTL,
bool bBiDiStrong)
{
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 869afd8..c05efd3 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -139,7 +139,7 @@ namespace drawinglayer
if(basegfx::fTools::more(aFontScaling.getX(), 0.0) &&
basegfx::fTools::more(aFontScaling.getY(), 0.0))
{
// Get the VCL font (use FontHeight as FontWidth)
- Font aFont(primitive2d::getVclFontFromFontAttribute(
+ vcl::Font aFont(primitive2d::getVclFontFromFontAttribute(
rTextCandidate.getFontAttribute(),
aFontScaling.getX(),
aFontScaling.getY(),
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index dc31300..93dc004 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1996,7 +1996,7 @@ void EditDoc::RemoveItemsFromPool(const ContentNode&
rNode)
void CreateFont( SvxFont& rFont, const SfxItemSet& rSet, bool bSearchInParent,
short nScriptType )
{
- Font aPrevFont( rFont );
+ vcl::Font aPrevFont( rFont );
rFont.SetAlign( ALIGN_BASELINE );
rFont.SetTransparent( true );
@@ -2255,7 +2255,7 @@ EditPaM EditDoc::RemoveText()
ContentNode* pPrevFirstNode = GetObject(0);
SfxStyleSheet* pPrevStyle = pPrevFirstNode->GetStyleSheet();
SfxItemSet aPrevSet( pPrevFirstNode->GetContentAttribs().GetItems() );
- Font aPrevFont( pPrevFirstNode->GetCharAttribs().GetDefFont() );
+ vcl::Font aPrevFont( pPrevFirstNode->GetCharAttribs().GetDefFont() );
ImplDestroyContents();
diff --git a/editeng/source/editeng/editeng.cxx
b/editeng/source/editeng/editeng.cxx
index 9f0e73f..00355e7 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1747,7 +1747,7 @@ void EditEngine::RemoveAttribs( const ESelection&
rSelection, bool bRemoveParaAt
pImpEditEngine->FormatAndUpdate();
}
-Font EditEngine::GetStandardFont( sal_Int32 nPara )
+vcl::Font EditEngine::GetStandardFont( sal_Int32 nPara )
{
return GetStandardSvxFont( nPara );
}
@@ -2578,7 +2578,7 @@ SfxItemPool& EditEngine::GetGlobalItemPool()
return *pGlobalPool;
}
-void EditEngine::SetFontInfoInItemSet( SfxItemSet& rSet, const Font& rFont )
+void EditEngine::SetFontInfoInItemSet( SfxItemSet& rSet, const vcl::Font&
rFont )
{
SvxFont aSvxFont( rFont );
SetFontInfoInItemSet( rSet, aSvxFont );
@@ -2609,7 +2609,7 @@ void EditEngine::SetFontInfoInItemSet( SfxItemSet& rSet,
const SvxFont& rFont )
rSet.Put( SvxCharReliefItem( rFont.GetRelief(), EE_CHAR_RELIEF ) );
}
-Font EditEngine::CreateFontFromItemSet( const SfxItemSet& rItemSet, sal_uInt16
nScriptType )
+vcl::Font EditEngine::CreateFontFromItemSet( const SfxItemSet& rItemSet,
sal_uInt16 nScriptType )
{
SvxFont aFont;
CreateFont( aFont, rItemSet, true, nScriptType );
diff --git a/editeng/source/editeng/editview.cxx
b/editeng/source/editeng/editview.cxx
index a908480..db0444b 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -704,7 +704,7 @@ EESpellState EditView::StartThesaurus()
}
void EditView::StartTextConversion(
- LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont,
+ LanguageType nSrcLang, LanguageType nDestLang, const vcl::Font
*pDestFont,
sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc )
{
pImpEditView->pEditEngine->pImpEditEngine->Convert( this, nSrcLang,
nDestLang, pDestFont, nOptions, bIsInteractive, bMultipleDoc );
diff --git a/editeng/source/editeng/eehtml.cxx
b/editeng/source/editeng/eehtml.cxx
index 38065cf..15d8c59 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -652,7 +652,7 @@ void EditHTMLParser::ImpSetStyleSheet( sal_uInt16 nHLevel )
// Choose a proportional Font for Pre
if ( nHLevel == STYLE_PRE )
{
- Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED,
LANGUAGE_SYSTEM, 0 );
+ vcl::Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED,
LANGUAGE_SYSTEM, 0 );
SvxFontItem aFontItem( aFont.GetFamily(), aFont.GetName(), OUString(),
aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO );
aItems.Put( aFontItem );
diff --git a/editeng/source/editeng/eertfpar.cxx
b/editeng/source/editeng/eertfpar.cxx
index 765c730..fc97797 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -151,7 +151,7 @@ void EditRTFParser::AddRTFDefaultValues( const EditPaM&
rStart, const EditPaM& r
MapMode
_aEditMapMode(mpEditEngine->GetRefDevice()->GetMapMode().GetMapUnit());
aSz = mpEditEngine->GetRefDevice()->LogicToLogic(aSz, &aPntMode,
&_aEditMapMode);
SvxFontHeightItem aFontHeightItem( aSz.Width(), 100, EE_CHAR_FONTHEIGHT );
- Font aDefFont( GetDefFont() );
+ vcl::Font aDefFont( GetDefFont() );
SvxFontItem aFontItem( aDefFont.GetFamily(), aDefFont.GetName(),
aDefFont.GetStyleName(), aDefFont.GetPitch(),
aDefFont.GetCharSet(), EE_CHAR_FONTINFO );
diff --git a/editeng/source/editeng/eertfpar.hxx
b/editeng/source/editeng/eertfpar.hxx
index e662aad..1f1b9d5 100644
--- a/editeng/source/editeng/eertfpar.hxx
+++ b/editeng/source/editeng/eertfpar.hxx
@@ -107,7 +107,7 @@ public:
GetDestCharSet() const { return eDestCharSet; }
sal_uInt16 GetDefTab() const { return nDefTab; }
- Font GetDefFont() { return GetFont( nDefFont
); }
+ vcl::Font GetDefFont() { return GetFont(
nDefFont ); }
EditPaM GetCurPaM() const { return aCurSel.Max(); }
};
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index 849ca75..634aaa0 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -915,14 +915,14 @@ public:
ImpSpell( EditView* pEditView );
// text conversion functions
- void Convert( EditView* pEditView, LanguageType nSrcLang,
LanguageType nDestLang, const Font *pDestFont, sal_Int32 nOptions, bool
bIsInteractive, bool bMultipleDoc );
+ void Convert( EditView* pEditView, LanguageType nSrcLang,
LanguageType nDestLang, const vcl::Font *pDestFont, sal_Int32 nOptions, bool
bIsInteractive, bool bMultipleDoc );
void ImpConvert( OUString &rConvTxt, LanguageType
&rConvTxtLang, EditView* pEditView, LanguageType nSrcLang, const ESelection
&rConvRange,
- bool
bAllowImplicitChangesForNotConvertibleText, LanguageType nTargetLang, const
Font *pTargetFont );
+ bool
bAllowImplicitChangesForNotConvertibleText, LanguageType nTargetLang, const
vcl::Font *pTargetFont );
ConvInfo * GetConvInfo() const { return pConvInfo; }
bool HasConvertibleTextPortion( LanguageType nLang );
void SetLanguageAndFont( const ESelection &rESel,
LanguageType nLang, sal_uInt16 nLangWhichId,
- const Font *pFont, sal_uInt16 nFontWhichId );
+ const vcl::Font *pFont, sal_uInt16
nFontWhichId );
// returns true if input sequence checking should be applied
bool IsInputSequenceCheckingRequired( sal_Unicode nChar, const
EditSelection& rCurSel ) const;
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 09367ca..0b26a07 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -368,7 +368,7 @@ void ImpEditEngine::FormatDoc()
long nY = 0;
bool bGrow = false;
- Font aOldFont( GetRefDevice()->GetFont() );
+ vcl::Font aOldFont( GetRefDevice()->GetFont() );
// Here already, so that not always in CreateLines...
bool bMapChanged = ImpCheckRefMapMode();
@@ -2857,7 +2857,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev,
Rectangle aClipRect, Point aSt
Point aRedLineTmpPos;
DBG_ASSERT( GetParaPortions().Count(), "No ParaPortion?!" );
SvxFont aTmpFont(
GetParaPortions()[0]->GetNode()->GetCharAttribs().GetDefFont() );
- Font aOldFont( pOutDev->GetFont() );
+ vcl::Font aOldFont( pOutDev->GetFont() );
vcl::PDFExtOutDevData* pPDFExtOutDevData = PTR_CAST(
vcl::PDFExtOutDevData, pOutDev->GetExtOutDevData() );
// In the case of rotated text is aStartPos considered TopLeft because
@@ -3186,7 +3186,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev,
Rectangle aClipRect, Point aSt
pTmpDXArray.reset(new long[
aText.getLength() ]);
pDXArray = pTmpDXArray.get();
- Font _aOldFont( GetRefDevice()->GetFont()
);
+ vcl::Font _aOldFont(
GetRefDevice()->GetFont() );
aTmpFont.SetPhysFont( GetRefDevice() );
aTmpFont.QuickGetTextSize( GetRefDevice(),
aText, nTextStart, nTextLen, pTmpDXArray.get() );
if ( aStatus.DoRestoreFont() )
@@ -3216,7 +3216,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev,
Rectangle aClipRect, Point aSt
// crash when accessing 0 pointer in
pDXArray
pTmpDXArray.reset(new long[
aText.getLength() ]);
pDXArray = pTmpDXArray.get();
- Font _aOldFont( GetRefDevice()->GetFont()
);
+ vcl::Font _aOldFont(
GetRefDevice()->GetFont() );
aTmpFont.SetPhysFont( GetRefDevice() );
aTmpFont.QuickGetTextSize( GetRefDevice(),
aText, 0, aText.getLength(), pTmpDXArray.get() );
if ( aStatus.DoRestoreFont() )
@@ -3925,7 +3925,7 @@ void ImpEditEngine::ShowParagraph( sal_Int32 nParagraph,
bool bShow )
{
if ( pPPortion->IsInvalid() )
{
- Font aOldFont( GetRefDevice()->GetFont() );
+ vcl::Font aOldFont( GetRefDevice()->GetFont() );
CreateLines( nParagraph, 0 ); // 0: No TextRanger
if ( aStatus.DoRestoreFont() )
GetRefDevice()->SetFont( aOldFont );
diff --git a/editeng/source/editeng/impedit4.cxx
b/editeng/source/editeng/impedit4.cxx
index db404f0..bc1986a 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1551,7 +1551,7 @@ bool ImpEditEngine::HasConvertibleTextPortion(
LanguageType nSrcLang )
void ImpEditEngine::Convert( EditView* pEditView,
- LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont,
+ LanguageType nSrcLang, LanguageType nDestLang, const vcl::Font
*pDestFont,
sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc )
{
// modified version of ImpEditEngine::Spell
@@ -1641,7 +1641,7 @@ void ImpEditEngine::Convert( EditView* pEditView,
void ImpEditEngine::SetLanguageAndFont(
const ESelection &rESel,
LanguageType nLang, sal_uInt16 nLangWhichId,
- const Font *pFont, sal_uInt16 nFontWhichId )
+ const vcl::Font *pFont, sal_uInt16 nFontWhichId )
{
ESelection aOldSel = pActiveView->GetSelection();
pActiveView->SetSelection( rESel );
@@ -1674,7 +1674,7 @@ void ImpEditEngine::SetLanguageAndFont(
void ImpEditEngine::ImpConvert( OUString &rConvTxt, LanguageType &rConvTxtLang,
EditView* pEditView, LanguageType nSrcLang, const ESelection
&rConvRange,
bool bAllowImplicitChangesForNotConvertibleText,
- LanguageType nTargetLang, const Font *pTargetFont )
+ LanguageType nTargetLang, const vcl::Font *pTargetFont )
{
// modified version of ImpEditEngine::ImpSpell
diff --git a/editeng/source/editeng/textconv.cxx
b/editeng/source/editeng/textconv.cxx
index f843f83..9203521 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -46,7 +46,7 @@ TextConvWrapper::TextConvWrapper( Window* pWindow,
const Reference< XComponentContext >& rxContext,
const Locale& rSourceLocale,
const Locale& rTargetLocale,
- const Font* pTargetFont,
+ const vcl::Font* pTargetFont,
sal_Int32 nOptions,
bool bIsInteractive,
bool bIsStart,
@@ -245,7 +245,7 @@ bool TextConvWrapper::ConvContinue_impl()
void TextConvWrapper::SetLanguageAndFont( const ESelection &rESel,
LanguageType nLang, sal_uInt16 nLangWhichId,
- const Font *pFont, sal_uInt16 nFontWhichId )
+ const vcl::Font *pFont, sal_uInt16 nFontWhichId )
{
ESelection aOldSel = m_pEditView->GetSelection();
m_pEditView->SetSelection( rESel );
diff --git a/editeng/source/editeng/textconv.hxx
b/editeng/source/editeng/textconv.hxx
index a3afc60..d8073b7 100644
--- a/editeng/source/editeng/textconv.hxx
+++ b/editeng/source/editeng/textconv.hxx
@@ -90,7 +90,7 @@ protected:
void SetLanguageAndFont( const ESelection &rESel,
LanguageType nLang, sal_uInt16 nLangWhichId,
- const Font *pFont, sal_uInt16 nFontWhichId );
+ const vcl::Font *pFont, sal_uInt16 nFontWhichId );
public:
@@ -98,7 +98,7 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::lang::Locale& rSourceLocale,
const ::com::sun::star::lang::Locale& rTargetLocale,
- const Font* pTargetFont,
+ const vcl::Font* pTargetFont,
sal_Int32 nOptions,
bool bIsInteractive,
bool bIsStart, EditView* pView );
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 28f4dfd..68eaf2c 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -34,7 +34,7 @@ TYPEINIT1(SvxBulletItem,SfxPoolItem);
-void SvxBulletItem::StoreFont( SvStream& rStream, const Font& rFont )
+void SvxBulletItem::StoreFont( SvStream& rStream, const vcl::Font& rFont )
{
sal_uInt16 nTemp;
@@ -61,9 +61,9 @@ void SvxBulletItem::StoreFont( SvStream& rStream, const Font&
rFont )
-Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer )
+vcl::Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer )
{
- Font aFont;
+ vcl::Font aFont;
Color aColor;
ReadColor( rStream, aColor ); aFont.SetColor( aColor );
sal_uInt16 nTemp;
@@ -237,8 +237,8 @@ sal_uInt16 SvxBulletItem::GetVersion( sal_uInt16
/*nVersion*/ ) const
void SvxBulletItem::CopyValidProperties( const SvxBulletItem& rCopyFrom )
{
- Font _aFont = GetFont();
- Font aNewFont = rCopyFrom.GetFont();
+ vcl::Font _aFont = GetFont();
+ vcl::Font aNewFont = rCopyFrom.GetFont();
if ( rCopyFrom.IsValid( VALID_FONTNAME ) )
{
_aFont.SetName( aNewFont.GetName() );
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 56cfeac..24c2ef1 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -219,7 +219,7 @@ SvxNumberFormat::SvxNumberFormat( SvStream &rStream )
rStream.ReadUInt16( hasBulletFont );
if ( hasBulletFont )
{
- pBulletFont = new Font( );
+ pBulletFont = new vcl::Font( );
ReadFont( rStream, *pBulletFont );
}
else pBulletFont = NULL;
@@ -345,7 +345,7 @@ SvxNumberFormat& SvxNumberFormat::operator=( const
SvxNumberFormat& rFormat )
}
DELETEZ(pBulletFont);
if(rFormat.pBulletFont)
- pBulletFont = new Font(*rFormat.pBulletFont);
+ pBulletFont = new vcl::Font(*rFormat.pBulletFont);
return *this;
}
@@ -443,10 +443,10 @@ sal_Int16 SvxNumberFormat::GetVertOrient() const
return eVertOrient;
}
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
