[Libreoffice-commits] core.git: basctl/source basic/source canvas/source chart2/source cppcanvas/source cui/source dbaccess/source desktop/source drawinglayer/source editeng/source extensions/source filter/source forms/source formula/source fpicker/source framework/source include/editeng include/svtools include/svx include/tools include/vcl lotuswordpro/source oox/source reportdesign/source rsc/inc rsc/source sc/source sd/source sfx2/source slideshow/source starmath/source svl/source svtools/source svx/source sw/qa sw/source toolkit/source uui/source vcl/osx vcl/qa vcl/README.GDIMetaFile vcl/source vcl/unx vcl/workben writerfilter/source xmlsecurity/source

Noel Grandin noel.grandin at collabora.co.uk
Wed Oct 5 06:54:50 UTC 2016


 basctl/source/accessibility/accessibledialogcontrolshape.cxx          |    2 
 basctl/source/accessibility/accessibledialogwindow.cxx                |    2 
 basctl/source/basicide/basicrenderable.cxx                            |    2 
 basctl/source/basicide/baside2.cxx                                    |    2 
 basctl/source/basicide/baside2b.cxx                                   |    4 
 basctl/source/basicide/moduldl2.cxx                                   |    4 
 basctl/source/basicide/moduldlg.cxx                                   |    2 
 basctl/source/basicide/objdlg.cxx                                     |    6 
 basctl/source/dlged/dlged.cxx                                         |   10 -
 basctl/source/dlged/dlgedobj.cxx                                      |   36 +--
 basic/source/runtime/inputbox.cxx                                     |    4 
 basic/source/runtime/iosys.cxx                                        |    2 
 basic/source/runtime/methods1.cxx                                     |    8 
 basic/source/runtime/stdobj1.cxx                                      |    4 
 canvas/source/cairo/cairo_devicehelper.cxx                            |    4 
 canvas/source/opengl/ogl_spritedevicehelper.cxx                       |    4 
 canvas/source/vcl/devicehelper.cxx                                    |    4 
 chart2/source/controller/accessibility/AccessibleViewForwarder.cxx    |    2 
 chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx  |    2 
 chart2/source/controller/dialogs/DataBrowser.cxx                      |   14 -
 chart2/source/controller/dialogs/dlg_CreationWizard.cxx               |    4 
 chart2/source/controller/dialogs/dlg_DataEditor.cxx                   |    2 
 chart2/source/controller/dialogs/tp_ChartType.cxx                     |    2 
 chart2/source/controller/drawinglayer/ViewElementListProvider.cxx     |    4 
 chart2/source/controller/main/ChartController_Window.cxx              |    4 
 chart2/source/controller/main/ChartWindow.cxx                         |    2 
 chart2/source/controller/main/ElementSelector.cxx                     |    2 
 chart2/source/controller/sidebar/ChartLinePanel.cxx                   |    2 
 chart2/source/view/main/ChartItemPool.cxx                             |    2 
 chart2/source/view/main/ChartView.cxx                                 |    2 
 chart2/source/view/main/DrawModelWrapper.cxx                          |    6 
 cppcanvas/source/mtfrenderer/implrenderer.cxx                         |    2 
 cui/source/customize/acccfg.cxx                                       |   10 -
 cui/source/customize/cfg.cxx                                          |    6 
 cui/source/customize/eventdlg.cxx                                     |    2 
 cui/source/customize/macropg.cxx                                      |    8 
 cui/source/dialogs/SpellDialog.cxx                                    |    2 
 cui/source/dialogs/colorpicker.cxx                                    |    2 
 cui/source/dialogs/cuigaldlg.cxx                                      |    2 
 cui/source/dialogs/cuigrfflt.cxx                                      |    4 
 cui/source/dialogs/hlmarkwn.cxx                                       |    2 
 cui/source/dialogs/linkdlg.cxx                                        |    8 
 cui/source/dialogs/multipat.cxx                                       |    4 
 cui/source/options/certpath.cxx                                       |    2 
 cui/source/options/connpooloptions.cxx                                |    8 
 cui/source/options/dbregister.cxx                                     |    8 
 cui/source/options/fontsubs.cxx                                       |    6 
 cui/source/options/optaboutconfig.cxx                                 |    6 
 cui/source/options/optfltr.cxx                                        |    2 
 cui/source/options/optjava.cxx                                        |    6 
 cui/source/options/optlingu.cxx                                       |    2 
 cui/source/options/optpath.cxx                                        |    8 
 cui/source/options/treeopt.cxx                                        |    2 
 cui/source/options/webconninfo.cxx                                    |    2 
 cui/source/tabpages/autocdlg.cxx                                      |   10 -
 cui/source/tabpages/border.cxx                                        |   10 -
 cui/source/tabpages/chardlg.cxx                                       |   16 -
 cui/source/tabpages/grfpage.cxx                                       |   10 -
 cui/source/tabpages/labdlg.cxx                                        |    2 
 cui/source/tabpages/macroass.cxx                                      |    4 
 cui/source/tabpages/measure.cxx                                       |    2 
 cui/source/tabpages/numpages.cxx                                      |   12 -
 cui/source/tabpages/page.cxx                                          |   70 +++----
 cui/source/tabpages/paragrph.cxx                                      |    6 
 cui/source/tabpages/tabstpge.cxx                                      |   14 -
 cui/source/tabpages/tparea.cxx                                        |    4 
 cui/source/tabpages/tpbitmap.cxx                                      |   16 -
 cui/source/tabpages/tpcolor.cxx                                       |    4 
 cui/source/tabpages/tpline.cxx                                        |   18 -
 cui/source/tabpages/transfrm.cxx                                      |   14 -
 dbaccess/source/ext/macromigration/macromigrationdialog.cxx           |    2 
 dbaccess/source/ui/app/AppDetailPageHelper.cxx                        |    2 
 dbaccess/source/ui/app/AppDetailView.cxx                              |    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/browser/brwview.cxx                                |    2 
 dbaccess/source/ui/browser/unodatbr.cxx                               |    4 
 dbaccess/source/ui/control/FieldDescControl.cxx                       |    8 
 dbaccess/source/ui/control/RelationControl.cxx                        |    2 
 dbaccess/source/ui/control/VertSplitView.cxx                          |    2 
 dbaccess/source/ui/dlg/adminpages.cxx                                 |    2 
 dbaccess/source/ui/dlg/adtabdlg.cxx                                   |    2 
 dbaccess/source/ui/dlg/dbfindex.cxx                                   |    2 
 dbaccess/source/ui/dlg/dbwiz.cxx                                      |    2 
 dbaccess/source/ui/dlg/dbwizsetup.cxx                                 |    2 
 dbaccess/source/ui/dlg/indexdialog.cxx                                |    4 
 dbaccess/source/ui/dlg/sqlmessage.cxx                                 |   12 -
 dbaccess/source/ui/misc/UITools.cxx                                   |    8 
 dbaccess/source/ui/misc/WCopyTable.cxx                                |   10 -
 dbaccess/source/ui/querydesign/querycontainerwindow.cxx               |    2 
 dbaccess/source/ui/querydesign/querydlg.cxx                           |    2 
 desktop/source/deployment/gui/dp_gui_dialog2.cxx                      |    4 
 desktop/source/deployment/gui/dp_gui_extlistbox.cxx                   |    2 
 desktop/source/deployment/gui/dp_gui_updatedialog.cxx                 |    4 
 desktop/source/deployment/gui/license_dialog.cxx                      |    2 
 drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx          |    2 
 drawinglayer/source/primitive2d/controlprimitive2d.cxx                |    6 
 drawinglayer/source/primitive2d/metafileprimitive2d.cxx               |   20 +-
 drawinglayer/source/primitive2d/sceneprimitive2d.cxx                  |    2 
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx            |   10 -
 drawinglayer/source/tools/converters.cxx                              |    2 
 editeng/source/editeng/editdbg.cxx                                    |    4 
 editeng/source/editeng/editview.cxx                                   |    4 
 editeng/source/editeng/eehtml.cxx                                     |   10 -
 editeng/source/editeng/eertfpar.cxx                                   |    6 
 editeng/source/editeng/impedit.cxx                                    |   26 +-
 editeng/source/editeng/impedit2.cxx                                   |    4 
 editeng/source/editeng/impedit4.cxx                                   |    6 
 editeng/source/items/itemtype.cxx                                     |   62 +++---
 editeng/source/items/numitem.cxx                                      |    4 
 editeng/source/items/paperinf.cxx                                     |   12 -
 editeng/source/items/textitem.cxx                                     |   73 ++++---
 editeng/source/outliner/outliner.cxx                                  |    2 
 editeng/source/uno/unoipset.cxx                                       |   20 +-
 extensions/source/abpilot/abspilot.cxx                                |    2 
 extensions/source/bibliography/general.cxx                            |    2 
 extensions/source/dbpilots/controlwizard.cxx                          |    2 
 extensions/source/propctrlr/browserline.cxx                           |    2 
 extensions/source/propctrlr/browserlistbox.cxx                        |    4 
 extensions/source/propctrlr/fontdialog.cxx                            |    4 
 extensions/source/propctrlr/inspectorhelpwindow.cxx                   |    8 
 extensions/source/propctrlr/listselectiondlg.cxx                      |    2 
 extensions/source/scanner/grid.cxx                                    |    4 
 extensions/source/scanner/sanedlg.cxx                                 |   16 -
 filter/source/flash/swfwriter.cxx                                     |    4 
 filter/source/flash/swfwriter1.cxx                                    |    4 
 filter/source/graphicfilter/egif/egif.cxx                             |    4 
 filter/source/graphicfilter/eps/eps.cxx                               |    2 
 filter/source/graphicfilter/etiff/etiff.cxx                           |    4 
 filter/source/graphicfilter/idxf/dxf2mtf.cxx                          |    4 
 filter/source/graphicfilter/ieps/ieps.cxx                             |   16 -
 filter/source/graphicfilter/ios2met/ios2met.cxx                       |    4 
 filter/source/graphicfilter/ipcx/ipcx.cxx                             |    2 
 filter/source/graphicfilter/ipict/ipict.cxx                           |    2 
 filter/source/graphicfilter/ipsd/ipsd.cxx                             |    6 
 filter/source/graphicfilter/itiff/itiff.cxx                           |    2 
 filter/source/msfilter/escherex.cxx                                   |   10 -
 filter/source/msfilter/eschesdo.cxx                                   |    4 
 filter/source/msfilter/msdffimp.cxx                                   |   30 +--
 filter/source/msfilter/svdfppt.cxx                                    |    2 
 filter/source/pdf/impdialog.cxx                                       |    2 
 filter/source/pdf/pdfexport.cxx                                       |   10 -
 filter/source/svg/svgexport.cxx                                       |   12 -
 filter/source/svg/svgfontexport.cxx                                   |    2 
 filter/source/svg/svgwriter.cxx                                       |    6 
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx                  |    8 
 forms/source/richtext/richtextcontrol.cxx                             |    4 
 forms/source/richtext/richtextengine.cxx                              |    2 
 forms/source/richtext/richtextimplcontrol.cxx                         |    2 
 forms/source/richtext/rtattributehandler.cxx                          |    8 
 formula/source/ui/dlg/formula.cxx                                     |    2 
 formula/source/ui/dlg/funcpage.cxx                                    |    2 
 formula/source/ui/dlg/structpg.cxx                                    |    2 
 fpicker/source/office/PlacesListBox.cxx                               |    2 
 fpicker/source/office/iodlg.cxx                                       |    4 
 fpicker/source/office/iodlgimp.cxx                                    |    2 
 framework/source/uielement/comboboxtoolbarcontroller.cxx              |    2 
 framework/source/uielement/complextoolbarcontroller.cxx               |    2 
 framework/source/uielement/dropdownboxtoolbarcontroller.cxx           |    2 
 include/editeng/fhgtitem.hxx                                          |    2 
 include/editeng/paperinf.hxx                                          |    4 
 include/svtools/simptabl.hxx                                          |    2 
 include/svtools/svtabbx.hxx                                           |    4 
 include/svx/nbdtmg.hxx                                                |    2 
 include/svx/svdetc.hxx                                                |    6 
 include/svx/svdmodel.hxx                                              |   16 -
 include/svx/svdtrans.hxx                                              |    6 
 include/tools/mapunit.hxx                                             |   15 +
 include/tools/rc.h                                                    |    5 
 include/vcl/gdimtf.hxx                                                |    2 
 include/vcl/outdev.hxx                                                |    4 
 include/vcl/pdfwriter.hxx                                             |    2 
 lotuswordpro/source/filter/lwppagelayout.cxx                          |    2 
 oox/source/drawingml/shape.cxx                                        |    2 
 oox/source/export/drawingml.cxx                                       |    4 
 oox/source/export/shapes.cxx                                          |    4 
 oox/source/helper/graphichelper.cxx                                   |    2 
 reportdesign/source/core/api/ReportDefinition.cxx                     |    4 
 reportdesign/source/ui/dlg/Condition.cxx                              |    2 
 reportdesign/source/ui/dlg/DateTime.cxx                               |    4 
 reportdesign/source/ui/dlg/GroupsSorting.cxx                          |    2 
 reportdesign/source/ui/dlg/Navigator.cxx                              |    2 
 reportdesign/source/ui/misc/UITools.cxx                               |    6 
 reportdesign/source/ui/report/DesignView.cxx                          |    4 
 reportdesign/source/ui/report/ReportController.cxx                    |    4 
 reportdesign/source/ui/report/ReportSection.cxx                       |    2 
 reportdesign/source/ui/report/ReportWindow.cxx                        |    8 
 reportdesign/source/ui/report/ScrollHelper.cxx                        |    6 
 reportdesign/source/ui/report/SectionWindow.cxx                       |    2 
 reportdesign/source/ui/report/ViewsWindow.cxx                         |    2 
 rsc/inc/rscdb.hxx                                                     |    2 
 rsc/source/parser/rscibas.cxx                                         |   27 +-
 sc/source/core/data/column2.cxx                                       |    2 
 sc/source/core/data/docpool.cxx                                       |    4 
 sc/source/core/data/documen2.cxx                                      |    4 
 sc/source/core/data/documen8.cxx                                      |    8 
 sc/source/core/data/documen9.cxx                                      |    2 
 sc/source/core/data/drwlayer.cxx                                      |    8 
 sc/source/core/data/global.cxx                                        |    6 
 sc/source/core/data/patattr.cxx                                       |    4 
 sc/source/core/data/poolhelp.cxx                                      |    4 
 sc/source/core/data/table1.cxx                                        |    2 
 sc/source/core/tool/editutil.cxx                                      |    4 
 sc/source/core/tool/interpr1.cxx                                      |    2 
 sc/source/filter/excel/xechart.cxx                                    |    2 
 sc/source/filter/excel/xeescher.cxx                                   |    6 
 sc/source/filter/excel/xiescher.cxx                                   |    6 
 sc/source/filter/excel/xlescher.cxx                                   |   10 -
 sc/source/filter/excel/xlroot.cxx                                     |    6 
 sc/source/filter/html/htmlexp.cxx                                     |    4 
 sc/source/filter/html/htmlimp.cxx                                     |    4 
 sc/source/filter/html/htmlpars.cxx                                    |    2 
 sc/source/filter/oox/workbookhelper.cxx                               |    2 
 sc/source/filter/oox/worksheethelper.cxx                              |    4 
 sc/source/filter/rtf/eeimpars.cxx                                     |    6 
 sc/source/filter/rtf/rtfparse.cxx                                     |    2 
 sc/source/filter/xml/xmlimprt.cxx                                     |    2 
 sc/source/ui/Accessibility/AccessibleText.cxx                         |    8 
 sc/source/ui/app/client.cxx                                           |    2 
 sc/source/ui/app/inputhdl.cxx                                         |    4 
 sc/source/ui/app/inputwin.cxx                                         |    4 
 sc/source/ui/app/msgpool.cxx                                          |    4 
 sc/source/ui/app/transobj.cxx                                         |    4 
 sc/source/ui/cctrl/cbuttonw.cxx                                       |    2 
 sc/source/ui/cctrl/tbzoomsliderctrl.cxx                               |    2 
 sc/source/ui/condformat/condformatdlg.cxx                             |    2 
 sc/source/ui/condformat/condformatdlgentry.cxx                        |    2 
 sc/source/ui/condformat/condformatmgr.cxx                             |    4 
 sc/source/ui/dbgui/csvgrid.cxx                                        |    2 
 sc/source/ui/dbgui/csvtablebox.cxx                                    |    2 
 sc/source/ui/dbgui/scendlg.cxx                                        |    2 
 sc/source/ui/dbgui/validate.cxx                                       |    2 
 sc/source/ui/dialogs/searchresults.cxx                                |    2 
 sc/source/ui/docshell/docsh3.cxx                                      |    6 
 sc/source/ui/docshell/docsh6.cxx                                      |    2 
 sc/source/ui/docshell/sizedev.cxx                                     |    4 
 sc/source/ui/drawfunc/fuins1.cxx                                      |    8 
 sc/source/ui/drawfunc/fuins2.cxx                                      |   10 -
 sc/source/ui/drawfunc/futext2.cxx                                     |    2 
 sc/source/ui/miscdlgs/acredlin.cxx                                    |    2 
 sc/source/ui/miscdlgs/retypepassdlg.cxx                               |    2 
 sc/source/ui/miscdlgs/sharedocdlg.cxx                                 |    2 
 sc/source/ui/namedlg/namemgrtable.cxx                                 |    8 
 sc/source/ui/namedlg/namepast.cxx                                     |    2 
 sc/source/ui/pagedlg/scuitphfedit.cxx                                 |    2 
 sc/source/ui/pagedlg/tphfedit.cxx                                     |    2 
 sc/source/ui/sidebar/AlignmentPropertyPanel.cxx                       |    4 
 sc/source/ui/undo/undostyl.cxx                                        |    2 
 sc/source/ui/unoobj/chartuno.cxx                                      |    2 
 sc/source/ui/unoobj/styleuno.cxx                                      |    8 
 sc/source/ui/unoobj/textuno.cxx                                       |    6 
 sc/source/ui/view/drawutil.cxx                                        |    2 
 sc/source/ui/view/drawvie4.cxx                                        |    8 
 sc/source/ui/view/drawview.cxx                                        |    6 
 sc/source/ui/view/gridmerg.cxx                                        |    2 
 sc/source/ui/view/gridwin.cxx                                         |   10 -
 sc/source/ui/view/gridwin4.cxx                                        |   26 +-
 sc/source/ui/view/gridwin_dbgutil.cxx                                 |    4 
 sc/source/ui/view/hintwin.cxx                                         |    4 
 sc/source/ui/view/notemark.cxx                                        |    4 
 sc/source/ui/view/output.cxx                                          |    2 
 sc/source/ui/view/output3.cxx                                         |    6 
 sc/source/ui/view/preview.cxx                                         |   20 +-
 sc/source/ui/view/printfun.cxx                                        |   26 +-
 sc/source/ui/view/tabview.cxx                                         |    2 
 sc/source/ui/view/tabview3.cxx                                        |    2 
 sc/source/ui/view/tabvwsh4.cxx                                        |    4 
 sc/source/ui/view/tabvwshb.cxx                                        |    4 
 sc/source/ui/view/viewdata.cxx                                        |    6 
 sc/source/ui/view/viewfun7.cxx                                        |   10 -
 sc/source/ui/view/viewfunc.cxx                                        |    4 
 sc/source/ui/xmlsource/xmlsourcedlg.cxx                               |    2 
 sd/source/core/drawdoc.cxx                                            |    4 
 sd/source/core/drawdoc2.cxx                                           |    8 
 sd/source/core/sdpage.cxx                                             |    2 
 sd/source/filter/eppt/eppt.cxx                                        |    4 
 sd/source/filter/eppt/pptx-epptbase.cxx                               |    8 
 sd/source/filter/grf/sdgrffilter.cxx                                  |    2 
 sd/source/filter/html/buttonset.cxx                                   |    2 
 sd/source/filter/html/pubdlg.cxx                                      |    2 
 sd/source/ui/animations/CustomAnimationList.cxx                       |    4 
 sd/source/ui/animations/SlideTransitionPane.cxx                       |    2 
 sd/source/ui/annotations/annotationwindow.cxx                         |    2 
 sd/source/ui/app/sdmod.cxx                                            |    2 
 sd/source/ui/app/sdmod2.cxx                                           |    2 
 sd/source/ui/dlg/PaneDockingWindow.cxx                                |    2 
 sd/source/ui/dlg/RemoteDialogClientBox.cxx                            |    6 
 sd/source/ui/dlg/animobjs.cxx                                         |   10 -
 sd/source/ui/dlg/copydlg.cxx                                          |   28 +-
 sd/source/ui/dlg/dlgsnap.cxx                                          |    8 
 sd/source/ui/dlg/docprev.cxx                                          |    2 
 sd/source/ui/dlg/headerfooterdlg.cxx                                  |    2 
 sd/source/ui/dlg/sdpreslt.cxx                                         |    2 
 sd/source/ui/dlg/vectdlg.cxx                                          |    2 
 sd/source/ui/docshell/docshel2.cxx                                    |    8 
 sd/source/ui/docshell/docshel4.cxx                                    |    2 
 sd/source/ui/docshell/sdclient.cxx                                    |    2 
 sd/source/ui/func/fuinsert.cxx                                        |   28 +-
 sd/source/ui/presenter/PresenterHelper.cxx                            |    2 
 sd/source/ui/presenter/PresenterTextView.cxx                          |    8 
 sd/source/ui/sidebar/SlideBackground.cxx                              |    2 
 sd/source/ui/slideshow/showwin.cxx                                    |   10 -
 sd/source/ui/slidesorter/controller/SlideSorterController.cxx         |    2 
 sd/source/ui/slidesorter/view/SlsTheme.cxx                            |    2 
 sd/source/ui/tools/PreviewRenderer.cxx                                |    6 
 sd/source/ui/unoidl/UnoDocumentSettings.cxx                           |    2 
 sd/source/ui/unoidl/unomodel.cxx                                      |    4 
 sd/source/ui/unoidl/unopage.cxx                                       |    2 
 sd/source/ui/view/DocumentRenderer.cxx                                |    4 
 sd/source/ui/view/ViewShellBase.cxx                                   |    8 
 sd/source/ui/view/drviews8.cxx                                        |    4 
 sd/source/ui/view/drviews9.cxx                                        |    2 
 sd/source/ui/view/sdview.cxx                                          |    8 
 sd/source/ui/view/sdview3.cxx                                         |   20 +-
 sd/source/ui/view/sdview4.cxx                                         |   10 -
 sd/source/ui/view/sdwindow.cxx                                        |    6 
 sfx2/source/appl/appuno.cxx                                           |    8 
 sfx2/source/appl/newhelp.cxx                                          |   12 -
 sfx2/source/control/ctrlitem.cxx                                      |    2 
 sfx2/source/control/dispatch.cxx                                      |    2 
 sfx2/source/control/unoctitm.cxx                                      |    8 
 sfx2/source/dialog/dialoghelper.cxx                                   |    8 
 sfx2/source/dialog/dinfdlg.cxx                                        |   10 -
 sfx2/source/dialog/mgetempl.cxx                                       |   10 -
 sfx2/source/dialog/versdlg.cxx                                        |    6 
 sfx2/source/doc/graphhelp.cxx                                         |    2 
 sfx2/source/doc/new.cxx                                               |    4 
 sfx2/source/doc/objembed.cxx                                          |    4 
 sfx2/source/doc/objxtor.cxx                                           |    2 
 sfx2/source/doc/printhelper.cxx                                       |    2 
 sfx2/source/doc/sfxbasemodel.cxx                                      |    6 
 sfx2/source/sidebar/SidebarChildWindow.cxx                            |    2 
 sfx2/source/view/classificationcontroller.cxx                         |    2 
 slideshow/source/engine/rehearsetimingsactivity.cxx                   |    4 
 starmath/source/ElementsDockingWindow.cxx                             |    6 
 starmath/source/accessibility.cxx                                     |    2 
 starmath/source/dialog.cxx                                            |    6 
 starmath/source/document.cxx                                          |   28 +-
 starmath/source/edit.cxx                                              |    2 
 starmath/source/tmpdevice.cxx                                         |    4 
 starmath/source/unomodel.cxx                                          |    2 
 starmath/source/view.cxx                                              |   30 +--
 svl/source/inc/poolio.hxx                                             |    2 
 svl/source/items/itempool.cxx                                         |    2 
 svl/source/items/poolitem.cxx                                         |    2 
 svtools/source/brwbox/brwbox2.cxx                                     |   16 -
 svtools/source/contnr/fileview.cxx                                    |    8 
 svtools/source/contnr/simptabl.cxx                                    |    2 
 svtools/source/contnr/svtabbx.cxx                                     |    4 
 svtools/source/control/ctrlbox.cxx                                    |    4 
 svtools/source/control/ctrltool.cxx                                   |    2 
 svtools/source/control/roadmap.cxx                                    |    8 
 svtools/source/control/ruler.cxx                                      |   26 +-
 svtools/source/control/scrwin.cxx                                     |    2 
 svtools/source/dialogs/roadmapwizard.cxx                              |    2 
 svtools/source/dialogs/wizardmachine.cxx                              |   10 -
 svtools/source/dialogs/wizdlg.cxx                                     |    2 
 svtools/source/filter/DocumentToGraphicRenderer.cxx                   |    2 
 svtools/source/filter/GraphicExportOptionsDialog.cxx                  |    4 
 svtools/source/filter/exportdialog.cxx                                |   50 ++---
 svtools/source/graphic/descriptor.cxx                                 |    4 
 svtools/source/graphic/grfmgr.cxx                                     |   20 +-
 svtools/source/graphic/provider.cxx                                   |   12 -
 svtools/source/misc/embedhlp.cxx                                      |    4 
 svtools/source/misc/embedtransfer.cxx                                 |    4 
 svtools/source/misc/imap.cxx                                          |   14 -
 svtools/source/misc/imap2.cxx                                         |    4 
 svtools/source/misc/transfer.cxx                                      |    8 
 svtools/source/misc/unitconv.cxx                                      |   96 +++++-----
 svtools/source/table/tablecontrol_impl.cxx                            |   10 -
 svtools/source/uno/svtxgridcontrol.cxx                                |    4 
 svtools/source/uno/wizard/wizardshell.cxx                             |    2 
 svx/source/customshapes/EnhancedCustomShape3d.cxx                     |   12 -
 svx/source/customshapes/EnhancedCustomShapeFontWork.cxx               |    4 
 svx/source/dialog/_bmpmask.cxx                                        |    4 
 svx/source/dialog/_contdlg.cxx                                        |   12 -
 svx/source/dialog/compressgraphicdialog.cxx                           |    6 
 svx/source/dialog/connctrl.cxx                                        |    6 
 svx/source/dialog/contwnd.cxx                                         |    2 
 svx/source/dialog/ctredlin.cxx                                        |    2 
 svx/source/dialog/dialcontrol.cxx                                     |    2 
 svx/source/dialog/dlgctl3d.cxx                                        |    6 
 svx/source/dialog/dlgctrl.cxx                                         |    8 
 svx/source/dialog/dlgunit.hxx                                         |    2 
 svx/source/dialog/docrecovery.cxx                                     |    2 
 svx/source/dialog/fntctrl.cxx                                         |    8 
 svx/source/dialog/fontwork.cxx                                        |   24 +-
 svx/source/dialog/frmsel.cxx                                          |    2 
 svx/source/dialog/graphctl.cxx                                        |    4 
 svx/source/dialog/hdft.cxx                                            |   20 +-
 svx/source/dialog/imapwnd.cxx                                         |    2 
 svx/source/dialog/measctrl.cxx                                        |    2 
 svx/source/dialog/pagectrl.cxx                                        |    4 
 svx/source/dialog/paraprev.cxx                                        |    2 
 svx/source/dialog/rubydialog.cxx                                      |    4 
 svx/source/dialog/srchdlg.cxx                                         |   14 -
 svx/source/dialog/swframeexample.cxx                                  |    4 
 svx/source/engine3d/float3d.cxx                                       |    4 
 svx/source/fmcomp/fmgridcl.cxx                                        |    8 
 svx/source/fmcomp/fmgridif.cxx                                        |   10 -
 svx/source/fmcomp/gridctrl.cxx                                        |    4 
 svx/source/form/datanavi.cxx                                          |   14 -
 svx/source/form/filtnav.cxx                                           |    6 
 svx/source/form/fmexpl.cxx                                            |    6 
 svx/source/form/fmvwimp.cxx                                           |    4 
 svx/source/gallery2/GalleryControl.cxx                                |    2 
 svx/source/gallery2/galbrws1.cxx                                      |    2 
 svx/source/gallery2/galctrl.cxx                                       |    2 
 svx/source/gallery2/galmisc.cxx                                       |    2 
 svx/source/gallery2/galobj.cxx                                        |    4 
 svx/source/gallery2/galtheme.cxx                                      |    2 
 svx/source/items/grfitem.cxx                                          |    8 
 svx/source/sdr/contact/viewcontactofgraphic.cxx                       |   12 -
 svx/source/sdr/overlay/overlayobjectlist.cxx                          |    4 
 svx/source/sdr/primitive2d/sdrattributecreator.cxx                    |    6 
 svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx               |    6 
 svx/source/sidebar/area/AreaTransparencyGradientControl.cxx           |   40 ++--
 svx/source/sidebar/line/LinePropertyPanelBase.cxx                     |    4 
 svx/source/sidebar/line/LineWidthPopup.cxx                            |   10 -
 svx/source/sidebar/line/LineWidthValueSet.cxx                         |    2 
 svx/source/sidebar/nbdtmg.cxx                                         |    6 
 svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx               |    6 
 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx                    |   40 ++--
 svx/source/sidebar/paragraph/ParaSpacingWindow.cxx                    |    4 
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx                   |   10 -
 svx/source/sidebar/possize/SidebarDialControl.cxx                     |    2 
 svx/source/sidebar/text/TextCharacterSpacingControl.cxx               |    4 
 svx/source/svdraw/svddrgmt.cxx                                        |    4 
 svx/source/svdraw/svdedxv.cxx                                         |    2 
 svx/source/svdraw/svdibrow.cxx                                        |    2 
 svx/source/svdraw/svdmodel.cxx                                        |   28 +-
 svx/source/svdraw/svdmrkv.cxx                                         |    8 
 svx/source/svdraw/svdoashp.cxx                                        |    8 
 svx/source/svdraw/svdobj.cxx                                          |    8 
 svx/source/svdraw/svdocapt.cxx                                        |    4 
 svx/source/svdraw/svdograf.cxx                                        |    8 
 svx/source/svdraw/svdomeas.cxx                                        |    8 
 svx/source/svdraw/svdomedia.cxx                                       |    2 
 svx/source/svdraw/svdoole2.cxx                                        |    6 
 svx/source/svdraw/svdopath.cxx                                        |    8 
 svx/source/svdraw/svdotext.cxx                                        |    8 
 svx/source/svdraw/svdtrans.cxx                                        |   84 ++++----
 svx/source/table/tablecontroller.cxx                                  |    8 
 svx/source/table/tablertfexporter.cxx                                 |    2 
 svx/source/table/tablertfimporter.cxx                                 |    2 
 svx/source/tbxctrls/bulletsnumbering.cxx                              |    2 
 svx/source/tbxctrls/colrctrl.cxx                                      |    6 
 svx/source/tbxctrls/fillctrl.cxx                                      |    2 
 svx/source/tbxctrls/fontworkgallery.cxx                               |    2 
 svx/source/tbxctrls/grafctrl.cxx                                      |    6 
 svx/source/tbxctrls/itemwin.cxx                                       |   14 -
 svx/source/tbxctrls/layctrl.cxx                                       |    2 
 svx/source/tbxctrls/lboxctrl.cxx                                      |    2 
 svx/source/tbxctrls/linectrl.cxx                                      |    2 
 svx/source/tbxctrls/tbcontrl.cxx                                      |    6 
 svx/source/tbxctrls/tbunocontroller.cxx                               |    2 
 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx |    4 
 svx/source/unodraw/UnoGraphicExporter.cxx                             |    6 
 svx/source/unodraw/unopool.cxx                                        |    8 
 svx/source/unodraw/unoprov.cxx                                        |   44 ++--
 svx/source/unodraw/unoshap4.cxx                                       |    4 
 svx/source/unodraw/unoshape.cxx                                       |   24 +-
 svx/source/xoutdev/_xoutbmp.cxx                                       |    4 
 svx/source/xoutdev/xattr.cxx                                          |    2 
 svx/source/xoutdev/xtabdash.cxx                                       |    2 
 svx/source/xoutdev/xtabhtch.cxx                                       |    2 
 sw/qa/extras/rtfimport/rtfimport.cxx                                  |    2 
 sw/source/core/access/accmap.cxx                                      |   12 -
 sw/source/core/bastyp/swtypes.cxx                                     |    4 
 sw/source/core/crsr/crstrvl.cxx                                       |    2 
 sw/source/core/doc/DocumentDeviceManager.cxx                          |    4 
 sw/source/core/doc/fmtcol.cxx                                         |    2 
 sw/source/core/docnode/ndnotxt.cxx                                    |   18 -
 sw/source/core/draw/dflyobj.cxx                                       |    4 
 sw/source/core/draw/dpage.cxx                                         |    2 
 sw/source/core/draw/drawdoc.cxx                                       |    2 
 sw/source/core/frmedt/fecopy.cxx                                      |    2 
 sw/source/core/frmedt/fefly1.cxx                                      |    6 
 sw/source/core/layout/atrfrm.cxx                                      |    8 
 sw/source/core/layout/fly.cxx                                         |    6 
 sw/source/core/ole/ndole.cxx                                          |    6 
 sw/source/core/text/EnhancedPDFExportHelper.cxx                       |    2 
 sw/source/core/text/itratr.cxx                                        |    4 
 sw/source/core/text/noteurl.cxx                                       |    2 
 sw/source/core/text/porrst.cxx                                        |    2 
 sw/source/core/text/txtdrop.cxx                                       |    4 
 sw/source/core/txtnode/fntcache.cxx                                   |    2 
 sw/source/core/unocore/unoframe.cxx                                   |   10 -
 sw/source/core/unocore/unoparagraph.cxx                               |    2 
 sw/source/core/unocore/unostyle.cxx                                   |    8 
 sw/source/core/view/pagepreviewlayout.cxx                             |    2 
 sw/source/core/view/viewpg.cxx                                        |    2 
 sw/source/core/view/viewsh.cxx                                        |    2 
 sw/source/core/view/vprint.cxx                                        |    2 
 sw/source/filter/html/css1atr.cxx                                     |    2 
 sw/source/filter/html/htmlatr.cxx                                     |    2 
 sw/source/filter/html/htmldrawreader.cxx                              |    4 
 sw/source/filter/html/htmldrawwriter.cxx                              |    4 
 sw/source/filter/html/htmlflywriter.cxx                               |   16 -
 sw/source/filter/html/htmlform.cxx                                    |    8 
 sw/source/filter/html/htmlforw.cxx                                    |    2 
 sw/source/filter/html/htmlgrin.cxx                                    |    2 
 sw/source/filter/html/htmlnumreader.cxx                               |    2 
 sw/source/filter/html/htmlplug.cxx                                    |    4 
 sw/source/filter/html/htmlsect.cxx                                    |    4 
 sw/source/filter/html/htmltab.cxx                                     |    4 
 sw/source/filter/html/htmltabw.cxx                                    |   10 -
 sw/source/filter/html/svxcss1.cxx                                     |    2 
 sw/source/filter/html/swhtml.cxx                                      |    6 
 sw/source/filter/html/wrthtml.cxx                                     |    2 
 sw/source/filter/ww8/docxattributeoutput.cxx                          |    4 
 sw/source/filter/ww8/writerhelper.cxx                                 |    4 
 sw/source/filter/ww8/wrtw8esh.cxx                                     |   16 -
 sw/source/filter/ww8/wrtww8.cxx                                       |    4 
 sw/source/filter/ww8/ww8par3.cxx                                      |    6 
 sw/source/filter/ww8/ww8par4.cxx                                      |   10 -
 sw/source/filter/xml/xmlexp.cxx                                       |    2 
 sw/source/filter/xml/xmlimp.cxx                                       |    4 
 sw/source/filter/xml/xmltexte.cxx                                     |    2 
 sw/source/filter/xml/xmltexti.cxx                                     |   10 -
 sw/source/ui/chrdlg/drpcps.cxx                                        |    2 
 sw/source/ui/config/optload.cxx                                       |    2 
 sw/source/ui/config/optpage.cxx                                       |   36 +--
 sw/source/ui/dbui/addresslistdialog.cxx                               |    4 
 sw/source/ui/dbui/createaddresslistdialog.cxx                         |   16 -
 sw/source/ui/dbui/dbtablepreviewdialog.cxx                            |    2 
 sw/source/ui/dbui/mmaddressblockpage.cxx                              |   12 -
 sw/source/ui/dbui/mmdocselectpage.cxx                                 |    2 
 sw/source/ui/dbui/mmgreetingspage.cxx                                 |    4 
 sw/source/ui/dbui/mmlayoutpage.cxx                                    |    2 
 sw/source/ui/dbui/mmoutputtypepage.cxx                                |    4 
 sw/source/ui/dbui/selectdbtabledialog.cxx                             |    4 
 sw/source/ui/envelp/envfmt.cxx                                        |    4 
 sw/source/ui/envelp/envlop1.cxx                                       |    4 
 sw/source/ui/envelp/labfmt.cxx                                        |    4 
 sw/source/ui/fldui/flddb.cxx                                          |    2 
 sw/source/ui/fldui/flddinf.cxx                                        |    2 
 sw/source/ui/fldui/flddok.cxx                                         |    2 
 sw/source/ui/fldui/fldfunc.cxx                                        |    2 
 sw/source/ui/fldui/fldref.cxx                                         |    2 
 sw/source/ui/fldui/fldvar.cxx                                         |    2 
 sw/source/ui/frmdlg/column.cxx                                        |    4 
 sw/source/ui/frmdlg/frmpage.cxx                                       |    2 
 sw/source/ui/index/cnttab.cxx                                         |    8 
 sw/source/ui/misc/bookmark.cxx                                        |    2 
 sw/source/ui/misc/glosbib.cxx                                         |    2 
 sw/source/ui/misc/glossary.cxx                                        |    2 
 sw/source/ui/misc/pgfnote.cxx                                         |    6 
 sw/source/uibase/app/appenv.cxx                                       |    2 
 sw/source/uibase/app/docshini.cxx                                     |    4 
 sw/source/uibase/dbui/dbtree.cxx                                      |    2 
 sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx                  |    2 
 sw/source/uibase/dochdl/swdtflvr.cxx                                  |   14 -
 sw/source/uibase/docvw/HeaderFooterWin.cxx                            |    2 
 sw/source/uibase/docvw/PageBreakWin.cxx                               |    2 
 sw/source/uibase/docvw/SidebarScrollBar.cxx                           |    2 
 sw/source/uibase/docvw/SidebarWin.cxx                                 |    2 
 sw/source/uibase/docvw/edtwin.cxx                                     |    2 
 sw/source/uibase/docvw/srcedtw.cxx                                    |    2 
 sw/source/uibase/frmdlg/colex.cxx                                     |    4 
 sw/source/uibase/lingu/sdrhhcwrap.cxx                                 |    2 
 sw/source/uibase/misc/redlndlg.cxx                                    |    2 
 sw/source/uibase/shells/grfshex.cxx                                   |    4 
 sw/source/uibase/shells/textsh.cxx                                    |    2 
 sw/source/uibase/sidebar/PageFormatPanel.cxx                          |    2 
 sw/source/uibase/sidebar/PageMarginControl.cxx                        |    4 
 sw/source/uibase/table/chartins.cxx                                   |    2 
 sw/source/uibase/uiview/pview.cxx                                     |    2 
 sw/source/uibase/uiview/srcview.cxx                                   |    4 
 sw/source/uibase/uiview/swcli.cxx                                     |    2 
 sw/source/uibase/uiview/view2.cxx                                     |    2 
 sw/source/uibase/uiview/viewdraw.cxx                                  |    4 
 sw/source/uibase/uiview/viewmdi.cxx                                   |    2 
 sw/source/uibase/uiview/viewport.cxx                                  |    2 
 sw/source/uibase/uno/unotxdoc.cxx                                     |    4 
 sw/source/uibase/utlui/attrdesc.cxx                                   |    2 
 sw/source/uibase/utlui/shdwcrsr.cxx                                   |    2 
 sw/source/uibase/utlui/unotools.cxx                                   |    2 
 sw/source/uibase/wrtsh/wrtsh1.cxx                                     |    8 
 toolkit/source/awt/vclxcontainer.cxx                                  |    2 
 toolkit/source/awt/vclxdevice.cxx                                     |    2 
 toolkit/source/controls/controlmodelcontainerbase.cxx                 |    2 
 toolkit/source/controls/dialogcontrol.cxx                             |    6 
 toolkit/source/controls/tabpagemodel.cxx                              |    6 
 toolkit/source/helper/vclunohelper.cxx                                |   72 +++----
 uui/source/fltdlg.cxx                                                 |    2 
 vcl/README.GDIMetaFile                                                |    2 
 vcl/osx/salprn.cxx                                                    |    2 
 vcl/qa/cppunit/mapmode.cxx                                            |   50 ++---
 vcl/source/app/settings.cxx                                           |    2 
 vcl/source/app/svapp.cxx                                              |    2 
 vcl/source/control/button.cxx                                         |   10 -
 vcl/source/control/field.cxx                                          |   36 +--
 vcl/source/control/morebtn.cxx                                        |    2 
 vcl/source/control/scrbar.cxx                                         |    8 
 vcl/source/control/tabctrl.cxx                                        |    2 
 vcl/source/filter/graphicfilter.cxx                                   |   16 -
 vcl/source/filter/graphicfilter2.cxx                                  |   12 -
 vcl/source/filter/igif/gifread.cxx                                    |    2 
 vcl/source/filter/jpeg/JpegReader.cxx                                 |    6 
 vcl/source/filter/sgfbram.cxx                                         |    2 
 vcl/source/filter/sgvmain.cxx                                         |    2 
 vcl/source/filter/sgvtext.cxx                                         |    2 
 vcl/source/filter/wmf/emfwr.cxx                                       |    4 
 vcl/source/filter/wmf/winmtf.cxx                                      |    8 
 vcl/source/filter/wmf/winwmf.cxx                                      |    4 
 vcl/source/filter/wmf/wmfwr.cxx                                       |    6 
 vcl/source/gdi/bitmap.cxx                                             |    4 
 vcl/source/gdi/bitmap3.cxx                                            |    2 
 vcl/source/gdi/dibtools.cxx                                           |    6 
 vcl/source/gdi/gdimetafiletools.cxx                                   |    6 
 vcl/source/gdi/gdimtf.cxx                                             |    4 
 vcl/source/gdi/graph.cxx                                              |    2 
 vcl/source/gdi/impgraph.cxx                                           |    4 
 vcl/source/gdi/impvect.cxx                                            |    2 
 vcl/source/gdi/mapmod.cxx                                             |   30 +--
 vcl/source/gdi/oldprintadaptor.cxx                                    |    2 
 vcl/source/gdi/pdfwriter_impl.cxx                                     |   22 +-
 vcl/source/gdi/pdfwriter_impl2.cxx                                    |    4 
 vcl/source/gdi/pngread.cxx                                            |    6 
 vcl/source/gdi/pngwrite.cxx                                           |    2 
 vcl/source/gdi/print.cxx                                              |    6 
 vcl/source/gdi/print2.cxx                                             |    2 
 vcl/source/gdi/print3.cxx                                             |   26 +-
 vcl/source/gdi/svgdata.cxx                                            |    2 
 vcl/source/gdi/svmconverter.cxx                                       |    2 
 vcl/source/gdi/textlayout.cxx                                         |    8 
 vcl/source/outdev/bitmap.cxx                                          |    6 
 vcl/source/outdev/font.cxx                                            |    2 
 vcl/source/outdev/map.cxx                                             |   92 ++++-----
 vcl/source/outdev/text.cxx                                            |    2 
 vcl/source/window/decoview.cxx                                        |    2 
 vcl/source/window/dockwin.cxx                                         |    2 
 vcl/source/window/menubarwindow.cxx                                   |    2 
 vcl/source/window/paint.cxx                                           |    6 
 vcl/source/window/printdlg.cxx                                        |   28 +-
 vcl/source/window/resource.cxx                                        |    4 
 vcl/source/window/window.cxx                                          |    2 
 vcl/source/window/window2.cxx                                         |    4 
 vcl/unx/generic/print/genprnpsp.cxx                                   |    2 
 vcl/workben/svptest.cxx                                               |    2 
 writerfilter/source/dmapper/SdtHelper.cxx                             |    2 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx                        |    4 
 xmlsecurity/source/dialogs/certificatechooser.cxx                     |    2 
 xmlsecurity/source/dialogs/certificateviewer.cxx                      |    2 
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx                |    2 
 xmlsecurity/source/dialogs/macrosecurity.cxx                          |    2 
 648 files changed, 2090 insertions(+), 2080 deletions(-)

New commits:
commit 954f752cf10fc6a8777af2a6a93e496688464687
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Tue Sep 20 16:41:39 2016 +0200

    convert MapUnit to scoped enum
    
    I left a prefix on the names "Map" so that I would not have to re-arrange
    each name too much, since I can't start identifiers with digits like "100thMM"
    
    And remove RSC_EXTRAMAPUNIT, which doesn't seem to be doing anything anymore.
    
    Change-Id: I5187824aa87e30caf5357b51b5384b5ab919d224
    Reviewed-on: https://gerrit.libreoffice.org/29096
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index b4f8ac0..05e16b6 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -146,7 +146,7 @@ awt::Rectangle AccessibleDialogControlShape::GetBounds()
             aRect.Move( aOrg.X(), aOrg.Y() );
 
             // convert logic units to pixel
-            aRect = m_pDialogWindow->LogicToPixel( aRect, MapMode(MAP_100TH_MM) );
+            aRect = m_pDialogWindow->LogicToPixel( aRect, MapMode(MapUnit::Map100thMM) );
 
             // clip the shape's bounding box with the bounding box of its parent
             Rectangle aParentRect( Point( 0, 0 ), m_pDialogWindow->GetSizePixel() );
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index 830d885..6536258 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -222,7 +222,7 @@ bool AccessibleDialogWindow::IsChildVisible( const ChildDescriptor& rDesc )
                     aRect.Move( aOrg.X(), aOrg.Y() );
 
                     // convert logic units to pixel
-                    aRect = m_pDialogWindow->LogicToPixel( aRect, MapMode(MAP_100TH_MM) );
+                    aRect = m_pDialogWindow->LogicToPixel( aRect, MapMode(MapUnit::Map100thMM) );
 
                     // check, if the shape's bounding box intersects with the bounding box of its parent
                     Rectangle aParentRect( Point( 0, 0 ), m_pDialogWindow->GetSizePixel() );
diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx
index d30171c..4e5a967 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -128,7 +128,7 @@ Sequence<beans::PropertyValue> SAL_CALL Renderable::getRenderer (
     // no renderdevice is legal; the first call is to get our print ui options
     if( pPrinter )
     {
-        Size aPageSize( pPrinter->PixelToLogic( pPrinter->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) ) );
+        Size aPageSize( pPrinter->PixelToLogic( pPrinter->GetPaperSizePixel(), MapMode( MapUnit::Map100thMM ) ) );
 
         awt::Size aSize;
         aSize.Width  = aPageSize.Width();
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index c994910..11872eb 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -804,7 +804,7 @@ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter, sal_Int32 nPrintPage )
     aFont.SetTransparent( true );
     aFont.SetFontSize( Size( 0, 360 ) );
     pPrinter->SetFont( aFont );
-    pPrinter->SetMapMode( MAP_100TH_MM );
+    pPrinter->SetMapMode( MapUnit::Map100thMM );
 
     OUString aTitle( CreateQualifiedName() );
 
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 9b8eb6f..57f04b0 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1617,7 +1617,7 @@ WatchWindow::WatchWindow (Layout* pParent) :
     tabs[ 1 ] = 0;
     tabs[ 2 ] = nVarTabWidth;
     tabs[ 3 ] = nVarTabWidth + nValueTabWidth;
-    aTreeListBox->SvHeaderTabListBox::SetTabs( tabs, MAP_PIXEL );
+    aTreeListBox->SvHeaderTabListBox::SetTabs( tabs, MapUnit::MapPixel );
     aTreeListBox->InitHeaderBar( aHeaderBar.get() );
 
     aTreeListBox->SetNodeDefaultImages( );
@@ -1802,7 +1802,7 @@ IMPL_LINK_NOARG( WatchWindow, implEndDragHdl, HeaderBar *, void )
     for( sal_uInt16 i = 1 ; i < nTabs ; ++i )
     {
         nPos += aHeaderBar->GetItemSize( i );
-        aTreeListBox->SetTab( i, nPos, MAP_PIXEL );
+        aTreeListBox->SetTab( i, nPos, MapUnit::MapPixel );
     }
 }
 
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index b4933cd..1b661a8 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -483,7 +483,7 @@ LibPage::LibPage(vcl::Window * pParent)
 {
     get(m_pBasicsBox, "location");
     get(m_pLibBox, "library");
-    Size aSize(m_pLibBox->LogicToPixel(Size(130, 87), MAP_APPFONT));
+    Size aSize(m_pLibBox->LogicToPixel(Size(130, 87), MapUnit::MapAppFont));
     m_pLibBox->set_height_request(aSize.Height());
     m_pLibBox->set_width_request(aSize.Width());
     get(m_pEditButton, "edit");
@@ -510,7 +510,7 @@ LibPage::LibPage(vcl::Window * pParent)
     m_pLibBox->SetStyle( WB_HSCROLL | WB_BORDER | WB_TABSTOP );
 
     long aTabs[] = { 2, 30, 120 };
-    m_pLibBox->SetTabs( aTabs, MAP_PIXEL );
+    m_pLibBox->SetTabs( aTabs, MapUnit::MapPixel );
 
     FillListBox();
     m_pBasicsBox->SelectEntryPos( 0 );
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 5a7ce99..386069e 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -553,7 +553,7 @@ ObjectPage::ObjectPage(vcl::Window *pParent, const OString &rName, sal_uInt16 nM
         ".ui")
 {
     get(m_pBasicBox, "library");
-    Size aSize(m_pBasicBox->LogicToPixel(Size(130, 117), MAP_APPFONT));
+    Size aSize(m_pBasicBox->LogicToPixel(Size(130, 117), MapUnit::MapAppFont));
     m_pBasicBox->set_height_request(aSize.Height());
     m_pBasicBox->set_width_request(aSize.Width());
     get(m_pEditButton, "edit");
diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index 2371c3f..240b7e1 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -112,15 +112,15 @@ void ObjectCatalog::ArrangeWindows()
         aTitle->Hide();
     else
     {
-        Size aTitleSize = LogicToPixel(Size(3, 10), MAP_APPFONT);
+        Size aTitleSize = LogicToPixel(Size(3, 10), MapUnit::MapAppFont);
         aTitleSize.Width() = aSize.Width() - 2*aTitleSize.Width();
-        aTitle->SetPosPixel(LogicToPixel(Point(3, 3), MAP_APPFONT));
+        aTitle->SetPosPixel(LogicToPixel(Point(3, 3), MapUnit::MapAppFont));
         aTitle->SetSizePixel(aTitleSize);
         aTitle->Show();
     }
 
     // tree
-    Point const aTreePos = LogicToPixel(Point(3, bFloating ? 3 : 16), MAP_APPFONT);
+    Point const aTreePos = LogicToPixel(Point(3, bFloating ? 3 : 16), MapUnit::MapAppFont);
     long const nMargin = aTreePos.X();
     Size const aTreeSize(
         aSize.Width() - 2*nMargin,
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 363f043..09fb336 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -200,7 +200,7 @@ DlgEditor::DlgEditor (
 {
     pDlgEdModel->GetItemPool().FreezeIdRanges();
     pDlgEdView.reset(new DlgEdView(*pDlgEdModel, rWindow_, *this));
-    pDlgEdModel->SetScaleUnit( MAP_100TH_MM );
+    pDlgEdModel->SetScaleUnit( MapUnit::Map100thMM );
 
     SdrLayerAdmin& rAdmin = pDlgEdModel->GetLayerAdmin();
     rAdmin.NewLayer( rAdmin.GetControlLayerName() );
@@ -221,7 +221,7 @@ DlgEditor::DlgEditor (
     aMarkIdle.SetPriority(SchedulerPriority::LOW);
     aMarkIdle.SetIdleHdl( LINK( this, DlgEditor, MarkTimeout ) );
 
-    rWindow.SetMapMode( MapMode( MAP_100TH_MM ) );
+    rWindow.SetMapMode( MapMode( MapUnit::Map100thMM ) );
     pDlgEdPage->SetSize( rWindow.PixelToLogic( Size(DLGED_PAGE_WIDTH_MIN, DLGED_PAGE_HEIGHT_MIN) ) );
 
     pDlgEdView->ShowSdrPage(pDlgEdView->GetModel()->GetPage(0));
@@ -1150,7 +1150,7 @@ void DlgEditor::Print( Printer* pPrinter, const OUString& rTitle )    // not wor
         MapMode aOldMap( pPrinter->GetMapMode());
         vcl::Font aOldFont( pPrinter->GetFont() );
 
-        MapMode aMap( MAP_100TH_MM );
+        MapMode aMap( MapUnit::Map100thMM );
         pPrinter->SetMapMode( aMap );
         vcl::Font aFont;
         aFont.SetAlignment( ALIGN_BOTTOM );
@@ -1215,13 +1215,13 @@ bool DlgEditor::AdjustPageSize()
         if ( pDlgEdForm && pDlgEdForm->TransformFormToSdrCoordinates( nFormXIn, nFormYIn, nFormWidthIn, nFormHeightIn, nFormX, nFormY, nFormWidth, nFormHeight ) )
         {
             Size aPageSizeDelta( 400, 300 );
-            aPageSizeDelta = rWindow.PixelToLogic( aPageSizeDelta, MapMode( MAP_100TH_MM ) );
+            aPageSizeDelta = rWindow.PixelToLogic( aPageSizeDelta, MapMode( MapUnit::Map100thMM ) );
 
             sal_Int32 nNewPageWidth = nFormX + nFormWidth + aPageSizeDelta.Width();
             sal_Int32 nNewPageHeight = nFormY + nFormHeight + aPageSizeDelta.Height();
 
             Size aPageSizeMin( DLGED_PAGE_WIDTH_MIN, DLGED_PAGE_HEIGHT_MIN );
-            aPageSizeMin = rWindow.PixelToLogic( aPageSizeMin, MapMode( MAP_100TH_MM ) );
+            aPageSizeMin = rWindow.PixelToLogic( aPageSizeMin, MapMode( MapUnit::Map100thMM ) );
             sal_Int32 nPageWidthMin = aPageSizeMin.Width();
             sal_Int32 nPageHeightMin = aPageSizeMin.Height();
 
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 0f8edbe..e57f329 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -137,9 +137,9 @@ bool DlgEdObj::TransformSdrToControlCoordinates(
     DBG_ASSERT( pDevice, "DlgEdObj::TransformSdrToControlCoordinates: missing default device!" );
     if ( !pDevice )
         return false;
-    aPos = pDevice->LogicToPixel( aPos, MapMode( MAP_100TH_MM ) );
-    aSize = pDevice->LogicToPixel( aSize, MapMode( MAP_100TH_MM ) );
-    aFormPos = pDevice->LogicToPixel( aFormPos, MapMode( MAP_100TH_MM ) );
+    aPos = pDevice->LogicToPixel( aPos, MapMode( MapUnit::Map100thMM ) );
+    aSize = pDevice->LogicToPixel( aSize, MapMode( MapUnit::Map100thMM ) );
+    aFormPos = pDevice->LogicToPixel( aFormPos, MapMode( MapUnit::Map100thMM ) );
 
     // subtract form position
     aPos.Width() -= aFormPos.Width();
@@ -160,8 +160,8 @@ bool DlgEdObj::TransformSdrToControlCoordinates(
     }
 
     // convert pixel to logic units
-    aPos = pDevice->PixelToLogic( aPos, MAP_APPFONT );
-    aSize = pDevice->PixelToLogic( aSize, MAP_APPFONT );
+    aPos = pDevice->PixelToLogic( aPos, MapUnit::MapAppFont );
+    aSize = pDevice->PixelToLogic( aSize, MapUnit::MapAppFont );
 
     // set out parameters
     nXOut = aPos.Width();
@@ -185,8 +185,8 @@ bool DlgEdObj::TransformSdrToFormCoordinates(
     DBG_ASSERT( pDevice, "DlgEdObj::TransformSdrToFormCoordinates: missing default device!" );
     if ( !pDevice )
         return false;
-    aPos = pDevice->LogicToPixel( aPos, MapMode( MAP_100TH_MM ) );
-    aSize = pDevice->LogicToPixel( aSize, MapMode( MAP_100TH_MM ) );
+    aPos = pDevice->LogicToPixel( aPos, MapMode( MapUnit::Map100thMM ) );
+    aSize = pDevice->LogicToPixel( aSize, MapMode( MapUnit::Map100thMM ) );
 
     // take window borders into account
     DlgEdForm* pForm = nullptr;
@@ -207,8 +207,8 @@ bool DlgEdObj::TransformSdrToFormCoordinates(
         aSize.Height() -= aDeviceInfo.TopInset + aDeviceInfo.BottomInset;
     }
     // convert pixel to logic units
-    aPos = pDevice->PixelToLogic( aPos, MAP_APPFONT );
-    aSize = pDevice->PixelToLogic( aSize, MAP_APPFONT );
+    aPos = pDevice->PixelToLogic( aPos, MapUnit::MapAppFont );
+    aSize = pDevice->PixelToLogic( aSize, MapUnit::MapAppFont );
 
     // set out parameters
     nXOut = aPos.Width();
@@ -248,9 +248,9 @@ bool DlgEdObj::TransformControlToSdrCoordinates(
     DBG_ASSERT( pDevice, "DlgEdObj::TransformControlToSdrCoordinates: missing default device!" );
     if ( !pDevice )
         return false;
-    aPos = pDevice->LogicToPixel( aPos, MAP_APPFONT );
-    aSize = pDevice->LogicToPixel( aSize, MAP_APPFONT );
-    aFormPos = pDevice->LogicToPixel( aFormPos, MAP_APPFONT );
+    aPos = pDevice->LogicToPixel( aPos, MapUnit::MapAppFont );
+    aSize = pDevice->LogicToPixel( aSize, MapUnit::MapAppFont );
+    aFormPos = pDevice->LogicToPixel( aFormPos, MapUnit::MapAppFont );
 
     // add form position
     aPos.Width() += aFormPos.Width();
@@ -267,8 +267,8 @@ bool DlgEdObj::TransformControlToSdrCoordinates(
     }
 
     // convert pixel to 100th_mm
-    aPos = pDevice->PixelToLogic( aPos, MapMode( MAP_100TH_MM ) );
-    aSize = pDevice->PixelToLogic( aSize, MapMode( MAP_100TH_MM ) );
+    aPos = pDevice->PixelToLogic( aPos, MapMode( MapUnit::Map100thMM ) );
+    aSize = pDevice->PixelToLogic( aSize, MapMode( MapUnit::Map100thMM ) );
 
     // set out parameters
     nXOut = aPos.Width();
@@ -298,8 +298,8 @@ bool DlgEdObj::TransformFormToSdrCoordinates(
     if ( !lcl_getDlgEdForm( this, pForm ) )
         return false;
 
-    aPos = pDevice->LogicToPixel( aPos, MAP_APPFONT );
-    aSize = pDevice->LogicToPixel( aSize, MAP_APPFONT );
+    aPos = pDevice->LogicToPixel( aPos, MapUnit::MapAppFont );
+    aSize = pDevice->LogicToPixel( aSize, MapUnit::MapAppFont );
 
     // take window borders into account
     Reference< beans::XPropertySet > xPSetForm( pForm->GetUnoControlModel(), UNO_QUERY );
@@ -316,8 +316,8 @@ bool DlgEdObj::TransformFormToSdrCoordinates(
     }
 
     // convert pixel to 100th_mm
-    aPos = pDevice->PixelToLogic( aPos, MapMode( MAP_100TH_MM ) );
-    aSize = pDevice->PixelToLogic( aSize, MapMode( MAP_100TH_MM ) );
+    aPos = pDevice->PixelToLogic( aPos, MapMode( MapUnit::Map100thMM ) );
+    aSize = pDevice->PixelToLogic( aSize, MapMode( MapUnit::Map100thMM ) );
 
     // set out parameters
     nXOut = aPos.Width();
diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index 4b89c6c..215c2a5 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -58,7 +58,7 @@ SvRTLInputBox::SvRTLInputBox( vcl::Window* pParent, const OUString& rPrompt,
     aEdit( VclPtr<Edit>::Create(this,  WB_LEFT | WB_BORDER) ),
     aOk( VclPtr<OKButton>::Create(this) ), aCancel( VclPtr<CancelButton>::Create(this) ), aPromptText( VclPtr<FixedText>::Create(this, WB_WORDBREAK) )
 {
-    SetMapMode( MapMode( MAP_APPFONT ) );
+    SetMapMode( MapMode( MapUnit::MapAppFont ) );
     Size aDlgSizeApp( 280, 80 );
     PositionDialog( nXTwips, nYTwips, aDlgSizeApp );
     InitButtons( aDlgSizeApp );
@@ -104,7 +104,7 @@ void SvRTLInputBox::PositionDialog(long nXTwips, long nYTwips, const Size& rDlgS
     if( nXTwips != -1 && nYTwips != -1 )
     {
         Point aDlgPosApp( nXTwips, nYTwips );
-        SetPosPixel( LogicToPixel( aDlgPosApp, MAP_TWIP ) );
+        SetPosPixel( LogicToPixel( aDlgPosApp, MapUnit::MapTwip ) );
     }
 }
 
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index a56d6e3..a143257 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -83,7 +83,7 @@ SbiInputDialog::SbiInputDialog( vcl::Window* pParent, const OUString& rPrompt )
     SetText( rPrompt );
     aOk->SetClickHdl( LINK( this, SbiInputDialog, Ok ) );
     aCancel->SetClickHdl( LINK( this, SbiInputDialog, Cancel ) );
-    SetMapMode( MapMode( MAP_APPFONT ) );
+    SetMapMode( MapMode( MapUnit::MapAppFont ) );
 
     Point aPt = LogicToPixel( Point( 50, 50 ) );
     Size  aSz = LogicToPixel( Size( 145, 65 ) );
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index a60b16d..8a385c2 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -747,7 +747,7 @@ RTLFUNC(TwipsPerPixelX)
 
     sal_Int32 nResult = 0;
     Size aSize( 100,0 );
-    MapMode aMap( MAP_TWIP );
+    MapMode aMap( MapUnit::MapTwip );
     OutputDevice* pDevice = Application::GetDefaultDevice();
     if( pDevice )
     {
@@ -764,7 +764,7 @@ RTLFUNC(TwipsPerPixelY)
 
     sal_Int32 nResult = 0;
     Size aSize( 0,100 );
-    MapMode aMap( MAP_TWIP );
+    MapMode aMap( MapUnit::MapTwip );
     OutputDevice* pDevice = Application::GetDefaultDevice();
     if( pDevice )
     {
@@ -1345,9 +1345,9 @@ static double GetDialogZoomFactor( bool bX, long nValue )
         Size aRefSize( nValue, nValue );
         Fraction aFracX( 1, 26 );
         Fraction aFracY( 1, 24 );
-        MapMode aMap( MAP_APPFONT, Point(), aFracX, aFracY );
+        MapMode aMap( MapUnit::MapAppFont, Point(), aFracX, aFracY );
         Size aScaledSize = pDevice->LogicToPixel( aRefSize, aMap );
-        aRefSize = pDevice->LogicToPixel( aRefSize, MapMode(MAP_TWIP) );
+        aRefSize = pDevice->LogicToPixel( aRefSize, MapMode(MapUnit::MapTwip) );
 
         double nRef, nScaled;
         if( bX )
diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx
index 5c2e6e0..cd963d1 100644
--- a/basic/source/runtime/stdobj1.cxx
+++ b/basic/source/runtime/stdobj1.cxx
@@ -86,7 +86,7 @@ void SbStdPicture::PropWidth( SbxVariable* pVar, SbxArray*, bool bWrite )
 
     Size aSize = aGraphic.GetPrefSize();
     aSize = Application::GetAppWindow()->LogicToPixel( aSize, aGraphic.GetPrefMapMode() );
-    aSize = Application::GetAppWindow()->PixelToLogic( aSize, MapMode( MAP_TWIP ) );
+    aSize = Application::GetAppWindow()->PixelToLogic( aSize, MapMode( MapUnit::MapTwip ) );
 
     pVar->PutInteger( (sal_Int16)aSize.Width() );
 }
@@ -101,7 +101,7 @@ void SbStdPicture::PropHeight( SbxVariable* pVar, SbxArray*, bool bWrite )
 
     Size aSize = aGraphic.GetPrefSize();
     aSize = Application::GetAppWindow()->LogicToPixel( aSize, aGraphic.GetPrefMapMode() );
-    aSize = Application::GetAppWindow()->PixelToLogic( aSize, MapMode( MAP_TWIP ) );
+    aSize = Application::GetAppWindow()->PixelToLogic( aSize, MapMode( MapUnit::MapTwip ) );
 
     pVar->PutInteger( (sal_Int16)aSize.Height() );
 }
diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx
index d2ea841..eae1481 100644
--- a/canvas/source/cairo/cairo_devicehelper.cxx
+++ b/canvas/source/cairo/cairo_devicehelper.cxx
@@ -104,7 +104,7 @@ namespace cairocanvas
     {
         // Map a one-by-one millimeter box to pixel
         const MapMode aOldMapMode( mpRefDevice->GetMapMode() );
-        mpRefDevice->SetMapMode( MapMode(MAP_MM) );
+        mpRefDevice->SetMapMode( MapMode(MapUnit::MapMM) );
         const Size aPixelSize( mpRefDevice->LogicToPixel(Size(1,1)) );
         mpRefDevice->SetMapMode( aOldMapMode );
 
@@ -118,7 +118,7 @@ namespace cairocanvas
 
         // Map the pixel dimensions of the output window to millimeter
         const MapMode aOldMapMode( mpRefDevice->GetMapMode() );
-        mpRefDevice->SetMapMode( MapMode(MAP_MM) );
+        mpRefDevice->SetMapMode( MapMode(MapUnit::MapMM) );
         const Size aLogSize( mpRefDevice->PixelToLogic(mpRefDevice->GetOutputSizePixel()) );
         mpRefDevice->SetMapMode( aOldMapMode );
 
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 0ccf5b7..50bf714 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -160,7 +160,7 @@ namespace oglcanvas
         // Map a one-by-one millimeter box to pixel
         SystemChildWindow* pChildWindow = mxContext->getChildWindow();
         const MapMode aOldMapMode( pChildWindow->GetMapMode() );
-        pChildWindow->SetMapMode( MapMode(MAP_MM) );
+        pChildWindow->SetMapMode( MapMode(MapUnit::MapMM) );
         const Size aPixelSize( pChildWindow->LogicToPixel(Size(1,1)) );
         pChildWindow->SetMapMode( aOldMapMode );
 
@@ -175,7 +175,7 @@ namespace oglcanvas
         // Map the pixel dimensions of the output window to millimeter
         SystemChildWindow* pChildWindow = mxContext->getChildWindow();
         const MapMode aOldMapMode( pChildWindow->GetMapMode() );
-        pChildWindow->SetMapMode( MapMode(MAP_MM) );
+        pChildWindow->SetMapMode( MapMode(MapUnit::MapMM) );
         const Size aLogSize( pChildWindow->PixelToLogic(pChildWindow->GetOutputSizePixel()) );
         pChildWindow->SetMapMode( aOldMapMode );
 
diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx
index 7447cef..a278273 100644
--- a/canvas/source/vcl/devicehelper.cxx
+++ b/canvas/source/vcl/devicehelper.cxx
@@ -54,7 +54,7 @@ namespace vclcanvas
         // Map a one-by-one millimeter box to pixel
         OutputDevice& rOutDev = mpOutDev->getOutDev();
         const MapMode aOldMapMode( rOutDev.GetMapMode() );
-        rOutDev.SetMapMode( MapMode(MAP_MM) );
+        rOutDev.SetMapMode( MapMode(MapUnit::MapMM) );
         const Size aPixelSize( rOutDev.LogicToPixel(Size(1,1)) );
         rOutDev.SetMapMode( aOldMapMode );
 
@@ -69,7 +69,7 @@ namespace vclcanvas
         // Map the pixel dimensions of the output window to millimeter
         OutputDevice& rOutDev = mpOutDev->getOutDev();
         const MapMode aOldMapMode( rOutDev.GetMapMode() );
-        rOutDev.SetMapMode( MapMode(MAP_MM) );
+        rOutDev.SetMapMode( MapMode(MapUnit::MapMM) );
         const Size aLogSize( rOutDev.PixelToLogic(rOutDev.GetOutputSizePixel()) );
         rOutDev.SetMapMode( aOldMapMode );
 
diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
index 30e2acc..22dff81 100644
--- a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
+++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
@@ -30,7 +30,7 @@ namespace chart
 AccessibleViewForwarder::AccessibleViewForwarder( AccessibleChartView* pAccChartView, vcl::Window* pWindow )
     :m_pAccChartView( pAccChartView )
     ,m_pWindow( pWindow )
-    ,m_aMapMode( MAP_100TH_MM )
+    ,m_aMapMode( MapUnit::Map100thMM )
 {
 }
 
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index c256754..7ccda84 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -409,7 +409,7 @@ void lcl_correctSymbolSizeForBitmaps( chart2::Symbol& rSymbol )
                 if(  (xProp->getPropertyValue( "SizePixel" ) >>= aAWTPixelSize) )
                 {
                     Size aPixelSize(aAWTPixelSize.Width,aAWTPixelSize.Height);
-                    Size aNewSize = ( OutputDevice::LogicToLogic( aPixelSize, MAP_PIXEL, MAP_100TH_MM ));
+                    Size aNewSize = ( OutputDevice::LogicToLogic( aPixelSize, MapUnit::MapPixel, MapUnit::Map100thMM ));
                     aSize = awt::Size( aNewSize.Width(), aNewSize.Height() );
 
                     if( aSize.Width == 0 && aSize.Height == 0 )
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 79b214e..b6c7df5 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -244,29 +244,29 @@ void SeriesHeader::SetPos( const Point & rPos )
 
     // chart type symbol
     Size aSize( nSymbolHeight, nSymbolHeight );
-    aSize = m_pDevice->LogicToPixel( aSize, MAP_APPFONT );
+    aSize = m_pDevice->LogicToPixel( aSize, MapUnit::MapAppFont );
     m_spSymbol->set_width_request(aSize.Width());
     m_spSymbol->set_height_request(aSize.Height());
 
     // series name edit field
     aSize.setWidth(nSymbolDistance);
-    aSize = m_pDevice->LogicToPixel( aSize, MAP_APPFONT );
+    aSize = m_pDevice->LogicToPixel( aSize, MapUnit::MapAppFont );
     m_spSeriesName->set_margin_left(aSize.Width() + 2);
     aSize.setWidth( m_nWidth - nSymbolHeight - nSymbolDistance );
     sal_Int32 nHeight = 12;
     aSize.setHeight( nHeight );
-    aSize = m_pDevice->LogicToPixel( aSize, MAP_APPFONT );
+    aSize = m_pDevice->LogicToPixel( aSize, MapUnit::MapAppFont );
     m_spSeriesName->set_width_request(aSize.Width());
     m_spSeriesName->set_height_request(aSize.Height());
 
     // color bar
     aSize.setWidth(1);
-    aSize = m_pDevice->LogicToPixel( aSize, MAP_APPFONT );
+    aSize = m_pDevice->LogicToPixel( aSize, MapUnit::MapAppFont );
     m_spColorBar->set_margin_left(aSize.Width() + 2);
     nHeight = 3;
     aSize.setWidth( m_nWidth - 1 );
     aSize.setHeight( nHeight );
-    aSize = m_pDevice->LogicToPixel( aSize, MAP_APPFONT );
+    aSize = m_pDevice->LogicToPixel( aSize, MapUnit::MapAppFont );
     m_spColorBar->set_width_request(aSize.Width());
     m_spColorBar->set_height_request(aSize.Height());
 }
@@ -279,7 +279,7 @@ void SeriesHeader::SetWidth( sal_Int32 nWidth )
 
 void SeriesHeader::SetPixelWidth( sal_Int32 nWidth )
 {
-    SetWidth( m_pDevice->PixelToLogic( Size( nWidth, 0 ), MAP_APPFONT ).getWidth());
+    SetWidth( m_pDevice->PixelToLogic( Size( nWidth, 0 ), MapUnit::MapAppFont ).getWidth());
 }
 
 void SeriesHeader::SetChartType(
@@ -555,7 +555,7 @@ void DataBrowser::RenewTable()
     OUString aDefaultSeriesName(SCH_RESSTR(STR_COLUMN_LABEL));
     replaceParamterInString( aDefaultSeriesName, "%COLUMNNUMBER", OUString::number( 24 ) );
     sal_Int32 nColumnWidth = GetDataWindow().GetTextWidth( aDefaultSeriesName )
-        + GetDataWindow().LogicToPixel( Point( 4 + impl::SeriesHeader::GetRelativeAppFontXPosForNameField(), 0 ), MAP_APPFONT ).X();
+        + GetDataWindow().LogicToPixel( Point( 4 + impl::SeriesHeader::GetRelativeAppFontXPosForNameField(), 0 ), MapUnit::MapAppFont ).X();
     sal_Int32 nColumnCount = m_apDataBrowserModel->getColumnCount();
     // nRowCount is a member of a base class
     sal_Int32 nRowCountLocal = m_apDataBrowserModel->getMaxRowCount();
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index 268cf58..21f6e28 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -68,8 +68,8 @@ CreationWizard::CreationWizard( vcl::Window* pParent, const uno::Reference< fram
     );
     this->SetRoadmapHelpId( HID_SCH_WIZARD_ROADMAP );
     this->SetRoadmapInteractive( true );
-    Size aAdditionalRoadmapSize( LogicToPixel( Size( 85, 0 ), MAP_APPFONT ) );
-    Size aSize(LogicToPixel(Size(CHART_WIZARD_PAGEWIDTH, CHART_WIZARD_PAGEHEIGHT), MAP_APPFONT));
+    Size aAdditionalRoadmapSize( LogicToPixel( Size( 85, 0 ), MapUnit::MapAppFont ) );
+    Size aSize(LogicToPixel(Size(CHART_WIZARD_PAGEWIDTH, CHART_WIZARD_PAGEHEIGHT), MapUnit::MapAppFont));
     aSize.Width() += aAdditionalRoadmapSize.Width();
     this->SetSizePixel( aSize );
 
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index 36af3ff..15971ef 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -52,7 +52,7 @@ DataEditor::DataEditor(vcl::Window* pParent,
     m_xBrwData->set_hexpand(true);
     m_xBrwData->set_vexpand(true);
     m_xBrwData->set_expand(true);
-    Size aSize(m_xBrwData->LogicToPixel(Size(232, 121), MAP_APPFONT));
+    Size aSize(m_xBrwData->LogicToPixel(Size(232, 121), MapUnit::MapAppFont));
     m_xBrwData->set_width_request(aSize.Width());
     m_xBrwData->set_height_request(aSize.Height());
     m_xBrwData->Show();
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 777297c..99447ea 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -700,7 +700,7 @@ ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent
     get(m_pFT_ChooseType, "FT_CAPTION_FOR_WIZARD");
     get(m_pMainTypeList, "charttype");
     get(m_pSubTypeList, "subtype");
-    Size aSize(m_pSubTypeList->LogicToPixel(Size(150, 50), MAP_APPFONT));
+    Size aSize(m_pSubTypeList->LogicToPixel(Size(150, 50), MapUnit::MapAppFont));
     m_pSubTypeList->set_width_request(aSize.Width());
     m_pSubTypeList->set_height_request(aSize.Height());
 
diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
index 2a6e409..9ff9138 100644
--- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
@@ -143,7 +143,7 @@ Graphic ViewElementListProvider::GetSymbolGraphic( sal_Int32 nStandardSymbol, co
     SdrObject* pObj = pSymbolList->GetObj(nStandardSymbol);
 
     ScopedVclPtrInstance< VirtualDevice > pVDev;
-    pVDev->SetMapMode(MapMode(MAP_100TH_MM));
+    pVDev->SetMapMode(MapMode(MapUnit::Map100thMM));
     SdrModel* pModel = new SdrModel();
     pModel->GetItemPool().FreezeIdRanges();
     SdrPage* pPage = new SdrPage( *pModel, false );
@@ -164,7 +164,7 @@ Graphic ViewElementListProvider::GetSymbolGraphic( sal_Int32 nStandardSymbol, co
     Graphic aGraph(aMeta);
     Size aSize = pObj->GetSnapRect().GetSize();
     aGraph.SetPrefSize(aSize);
-    aGraph.SetPrefMapMode(MAP_100TH_MM);
+    aGraph.SetPrefMapMode(MapUnit::Map100thMM);
 
     pView->UnmarkAll();
     pObj=pPage->RemoveObject(0);
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index e55196f..b1daf04 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -229,7 +229,7 @@ void SAL_CALL ChartController::setPosSize(
 
     if(xWindow.is() && m_pChartWindow)
     {
-        Size aLogicSize = m_pChartWindow->PixelToLogic( Size( Width, Height ), MapMode( MAP_100TH_MM )  );
+        Size aLogicSize = m_pChartWindow->PixelToLogic( Size( Width, Height ), MapMode( MapUnit::Map100thMM )  );
 
         //todo: for standalone chart: detect whether we are standalone
         //change map mode to fit new size
@@ -239,7 +239,7 @@ void SAL_CALL ChartController::setPosSize(
         sal_Int32 nScaleYNumerator = aLogicSize.Height();
         sal_Int32 nScaleYDenominator = aModelPageSize.Height;
         MapMode aNewMapMode(
-                    MAP_100TH_MM,
+                    MapUnit::Map100thMM,
                     Point(0,0),
                     Fraction(nScaleXNumerator, nScaleXDenominator),
                     Fraction(nScaleYNumerator, nScaleYDenominator) );
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index ed053f67..21cc0ce 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -58,7 +58,7 @@ ChartWindow::ChartWindow( ChartController* pController, vcl::Window* pParent, Wi
 {
     set_id("chart_window");
     this->SetHelpId( HID_SCH_WIN_DOCUMENT );
-    this->SetMapMode( MapMode(MAP_100TH_MM) );
+    this->SetMapMode( MapMode(MapUnit::Map100thMM) );
     adjustHighContrastMode();
     // chart does not depend on exact pixel painting => enable antialiased drawing
     SetAntialiasing( AntialiasingFlags::EnableB2dDraw | GetAntialiasing() );
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index 6d1453b..e03a43c 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -318,7 +318,7 @@ uno::Reference< awt::XWindow > SAL_CALL ElementSelectorToolbarController::create
         {
             m_apSelectorListBox.reset( VclPtr<SelectorListBox>::Create( pParent, WB_DROPDOWN|WB_AUTOHSCROLL|WB_BORDER ) );
             ::Size aLogicalSize( 95, 160 );
-            ::Size aPixelSize = m_apSelectorListBox->LogicToPixel( aLogicalSize, MAP_APPFONT );
+            ::Size aPixelSize = m_apSelectorListBox->LogicToPixel( aLogicalSize, MapUnit::MapAppFont );
             m_apSelectorListBox->SetSizePixel( aPixelSize );
             m_apSelectorListBox->SetDropDownLineCount( 5 );
         }
diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx
index 8cc18b9..8fefe15 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx
@@ -174,7 +174,7 @@ void ChartLinePanel::Initialize()
     SvxColorToolBoxControl* pToolBoxColor = getColorToolBoxControl(mpTBColor.get());
     pToolBoxColor->setColorSelectFunction(maLineColorWrapper);
 
-    setMapUnit(MAP_100TH_MM);
+    setMapUnit(MapUnit::Map100thMM);
     updateData();
 }
 
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index 7ec565c..4ec9554 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -203,7 +203,7 @@ SfxItemPool* ChartItemPool::Clone() const
 
 MapUnit ChartItemPool::GetMetric(sal_uInt16 /* nWhich */) const
 {
-    return MAP_100TH_MM;
+    return MapUnit::Map100thMM;
 }
 
 SfxItemPool* ChartItemPool::CreateChartItemPool()
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 3c27e6d..5f81d85 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -3347,7 +3347,7 @@ void ChartView::createShapes3D()
     if( pWindow->GetSizePixel().Width() == 0 || pWindow->GetSizePixel().Height() == 0 )
     {
         awt::Size aPageSize = mrChartModel.getVisualAreaSize( embed::Aspects::MSOLE_CONTENT );
-        Size aSize = pWindow->LogicToPixel( Size(aPageSize.Width,aPageSize.Height), MapUnit(MAP_100TH_MM) );
+        Size aSize = pWindow->LogicToPixel( Size(aPageSize.Width,aPageSize.Height), MapUnit(MapUnit::Map100thMM) );
         pWindow->SetSizePixel(aSize);
     }
     pWindow->Show();
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx
index 4dda034..826e022 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -58,12 +58,12 @@ DrawModelWrapper::DrawModelWrapper( const uno::Reference<uno::XComponentContext>
 {
     m_pChartItemPool = ChartItemPool::CreateChartItemPool();
 
-    SetScaleUnit(MAP_100TH_MM);
+    SetScaleUnit(MapUnit::Map100thMM);
     SetScaleFraction(Fraction(1, 1));
     SetDefaultFontHeight(423);     // 12pt
 
     SfxItemPool* pMasterPool = &GetItemPool();
-    pMasterPool->SetDefaultMetric(MAP_100TH_MM);
+    pMasterPool->SetDefaultMetric(MapUnit::Map100thMM);
     pMasterPool->SetPoolDefaultItem(SfxBoolItem(EE_PARA_HYPHENATE, true) );
     pMasterPool->SetPoolDefaultItem(makeSvx3DPercentDiagonalItem (5));
 
@@ -113,7 +113,7 @@ DrawModelWrapper::DrawModelWrapper( const uno::Reference<uno::XComponentContext>
     m_pRefDevice.disposeAndClear();
     m_pRefDevice = VclPtr<VirtualDevice>::Create(*pDefaultDevice);
     MapMode aMapMode = m_pRefDevice->GetMapMode();
-    aMapMode.SetMapUnit(MAP_100TH_MM);
+    aMapMode.SetMapUnit(MapUnit::Map100thMM);
     m_pRefDevice->SetMapMode(aMapMode);
     SetRefDevice(m_pRefDevice.get());
     rOutliner.SetRefDevice(m_pRefDevice.get());
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 6d7b165..0491553 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -816,7 +816,7 @@ namespace cppcanvas
                 rFontSizeLog = ::Size(0, 16);
 
                 // convert to target MapUnit if not pixels
-                rFontSizeLog = OutputDevice::LogicToLogic(rFontSizeLog, MAP_PIXEL, rParms.mrVDev.GetMapMode());
+                rFontSizeLog = OutputDevice::LogicToLogic(rFontSizeLog, MapUnit::MapPixel, rParms.mrVDev.GetMapMode());
             }
 
             const sal_Int32 nFontWidthLog = rFontSizeLog.Width();
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 65281aa..c3f14d1 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -761,20 +761,20 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( vcl::Window* pParent, const
     get(m_pSaveButton, "save");
     get(m_pResetButton, "reset");
     get(m_pEntriesBox, "shortcuts");
-    Size aSize(LogicToPixel(Size(174, 100), MAP_APPFONT));
+    Size aSize(LogicToPixel(Size(174, 100), MapUnit::MapAppFont));
     m_pEntriesBox->set_width_request(aSize.Width());
     m_pEntriesBox->set_height_request(aSize.Height());
     m_pEntriesBox->SetAccelConfigPage(this);
     get(m_pGroupLBox, "category");
-    aSize = LogicToPixel(Size(78 , 91), MAP_APPFONT);
+    aSize = LogicToPixel(Size(78 , 91), MapUnit::MapAppFont);
     m_pGroupLBox->set_width_request(aSize.Width());
     m_pGroupLBox->set_height_request(aSize.Height());
     get(m_pFunctionBox, "function");
-    aSize = LogicToPixel(Size(88, 91), MAP_APPFONT);
+    aSize = LogicToPixel(Size(88, 91), MapUnit::MapAppFont);
     m_pFunctionBox->set_width_request(aSize.Width());
     m_pFunctionBox->set_height_request(aSize.Height());
     get(m_pKeyBox, "keys");
-    aSize = LogicToPixel(Size(80, 91), MAP_APPFONT);
+    aSize = LogicToPixel(Size(80, 91), MapUnit::MapAppFont);
     m_pKeyBox->set_width_request(aSize.Width());
     m_pKeyBox->set_height_request(aSize.Height());
 
@@ -810,7 +810,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( vcl::Window* pParent, const
             nMaxWidth = nTmp;
     }
     // recalc second tab
-    long nNewTab = PixelToLogic( Size( nMaxWidth, 0 ), MAP_APPFONT ).Width();
+    long nNewTab = PixelToLogic( Size( nMaxWidth, 0 ), MapUnit::MapAppFont ).Width();
     nNewTab = nNewTab + 5; // additional space
     m_pEntriesBox->SetTab( 1, nNewTab );
 
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index bfda9e3..dcbe98f 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1763,7 +1763,7 @@ SvxConfigPage::SvxConfigPage(vcl::Window *pParent, const SfxItemSet& rSet)
     get(m_pDescriptionField, "desc");
     m_pDescriptionField->set_height_request(m_pDescriptionField->GetTextHeight()*4);
     get(m_pEntries, "entries");
-    Size aSize(LogicToPixel(Size(108, 115), MAP_APPFONT));
+    Size aSize(LogicToPixel(Size(108, 115), MapUnit::MapAppFont));
     m_pEntries->set_height_request(aSize.Height());
     m_pEntries->set_width_request(aSize.Width());
 
@@ -5015,7 +5015,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( vcl::Window *pWindow,
     get(pBtnImport, "importButton");
     get(pBtnDelete, "deleteButton");
 
-    aTbSize = pTbSymbol->LogicToPixel(Size(160, 80), MapMode(MAP_APPFONT));
+    aTbSize = pTbSymbol->LogicToPixel(Size(160, 80), MapMode(MapUnit::MapAppFont));
     pTbSymbol->set_width_request(aTbSize.Width());
     pTbSymbol->set_height_request(aTbSize.Height());
     pTbSymbol->SetStyle(pTbSymbol->GetStyle() | WB_SCROLL | WB_LINESPACING);
@@ -5630,7 +5630,7 @@ SvxIconChangeDialog::SvxIconChangeDialog(
     get(pFImageInfo, "infoImage");
     get(pLineEditDescription, "addrTextview");
 
-    Size aSize(LogicToPixel(Size(140, 83), MapMode(MAP_APPFONT)));
+    Size aSize(LogicToPixel(Size(140, 83), MapMode(MapUnit::MapAppFont)));
     pLineEditDescription->set_width_request(aSize.Width());
     pLineEditDescription->set_height_request(aSize.Height());
 
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 082194f..9e422eb 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -65,7 +65,7 @@ SvxEventConfigPage::SvxEventConfigPage(vcl::Window *pParent, const SfxItemSet& r
     mpImpl->sStrEvent = get<FixedText>("eventft")->GetText();
     mpImpl->sAssignedMacro = get<FixedText>("actionft")->GetText();
     get(mpImpl->pEventLB, "events");
-    Size aSize(LogicToPixel(Size(205, 229), MAP_APPFONT));
+    Size aSize(LogicToPixel(Size(205, 229), MapUnit::MapAppFont));
     mpImpl->pEventLB->set_width_request(aSize.Width());
     mpImpl->pEventLB->set_height_request(aSize.Height());
     get(mpImpl->pAssignPB, "macro");
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 3826bf5..7ff2f55 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -110,7 +110,7 @@ IMPL_LINK( MacroEventListBox, HeaderEndDrag_Impl, HeaderBar*, pBar, void )
                 long _nWidth = maHeaderBar->GetItemSize( i );
                 aSz.Width() =  _nWidth + nTmpSz;
                 nTmpSz += _nWidth;
-                maListBox->SetTab( i, PixelToLogic( aSz, MapMode( MAP_APPFONT ) ).Width() );
+                maListBox->SetTab( i, PixelToLogic( aSz, MapMode( MapUnit::MapAppFont ) ).Width() );
             }
         }
     }
@@ -166,7 +166,7 @@ VCL_BUILDER_DECL_FACTORY(MacroEventListBox)
 
 Size MacroEventListBox::GetOptimalSize() const
 {
-    return LogicToPixel(Size(192, 72), MapMode(MAP_APPFONT ));
+    return LogicToPixel(Size(192, 72), MapMode(MapUnit::MapAppFont ));
 }
 
 void MacroEventListBox::Resize()
@@ -727,9 +727,9 @@ void SvxMacroTabPage_::InitAndSetHandler( const Reference< container::XNameRepla
     rListBox.SetSelectionMode( SelectionMode::Single );
     rListBox.SetTabs( &nTabs[0] );
     Size aSize( nTabs[ 2 ], 0 );
-    rHeaderBar.InsertItem( ITEMID_EVENT, mpImpl->sStrEvent, LogicToPixel( aSize, MapMode( MAP_APPFONT ) ).Width() );
+    rHeaderBar.InsertItem( ITEMID_EVENT, mpImpl->sStrEvent, LogicToPixel( aSize, MapMode( MapUnit::MapAppFont ) ).Width() );
     aSize.Width() = 1764;        // don't know what, so 42^2 is best to use...
-    rHeaderBar.InsertItem( ITMEID_ASSMACRO, mpImpl->sAssignedMacro, LogicToPixel( aSize, MapMode( MAP_APPFONT ) ).Width() );
+    rHeaderBar.InsertItem( ITMEID_ASSMACRO, mpImpl->sAssignedMacro, LogicToPixel( aSize, MapMode( MapUnit::MapAppFont ) ).Width() );
     rListBox.SetSpaceBetweenEntries( 0 );
 
     mpImpl->pEventLB->Show();
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 56bbd30..a08ec75 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -201,7 +201,7 @@ SpellDialog::SpellDialog(SpellDialogChildWindow* pChildWindow,
     get(m_pExplainLink, "explainlink");
     get(m_pNotInDictFT, "notindictft");
     get(m_pSentenceED, "sentence");
-    Size aEdSize(LogicToPixel(Size(197, 48), MAP_APPFONT));
+    Size aEdSize(LogicToPixel(Size(197, 48), MapUnit::MapAppFont));
     m_pSentenceED->set_width_request(aEdSize.Width());
     m_pSentenceED->set_height_request(aEdSize.Height());
     get(m_pSuggestionFT, "suggestionsft");
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index c1c7ac6..5591310 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -276,7 +276,7 @@ VCL_BUILDER_DECL_FACTORY(ColorFieldControl)
 
 Size ColorFieldControl::GetOptimalSize() const
 {
-    return LogicToPixel(Size(158, 158), MAP_APPFONT);
+    return LogicToPixel(Size(158, 158), MapUnit::MapAppFont);
 }
 
 void ColorFieldControl::UpdateBitmap()
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 2484a03..f90e719 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -733,7 +733,7 @@ TPGalleryThemeProperties::TPGalleryThemeProperties( vcl::Window* pWindow, const
 {
     get(m_pCbbFileType, "filetype");
     get(m_pLbxFound, "files");
-    Size aSize(LogicToPixel(Size(172, 156), MAP_APPFONT));
+    Size aSize(LogicToPixel(Size(172, 156), MapUnit::MapAppFont));
     m_pLbxFound->set_width_request(aSize.Width());
     m_pLbxFound->set_height_request(aSize.Height());
     m_pLbxFound->EnableMultiSelection(true);
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index dc680de..43217dc 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -53,7 +53,7 @@ VCL_BUILDER_DECL_FACTORY(GraphicPreviewWindow)
 
 Size GraphicPreviewWindow::GetOptimalSize() const
 {
-    return LogicToPixel(Size(81, 73), MAP_APPFONT);
+    return LogicToPixel(Size(81, 73), MapUnit::MapAppFont);
 }
 
 
@@ -532,7 +532,7 @@ void EmbossControl::MouseButtonDown( const MouseEvent& rEvt )
 
 Size EmbossControl::GetOptimalSize() const
 {
-    return LogicToPixel(Size(77, 60), MAP_APPFONT);
+    return LogicToPixel(Size(77, 60), MapUnit::MapAppFont);
 }
 
 
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 986e608..f2087cc 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -95,7 +95,7 @@ VCL_BUILDER_DECL_FACTORY(SvxHlmarkTreeLBox)
 
 Size SvxHlmarkTreeLBox::GetOptimalSize() const
 {
-    return LogicToPixel(Size(103, 162), MAP_APPFONT);
+    return LogicToPixel(Size(103, 162), MapUnit::MapAppFont);
 }
 
 void SvxHlmarkTreeLBox::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 4ee16b3..7df24bd 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -99,7 +99,7 @@ SvBaseLinksDlg::SvBaseLinksDlg( vcl::Window * pParent, LinkManager* pMgr, bool b
     aUpdateIdle("cui SvBaseLinksDlg UpdateIdle")
 {
     get(m_pTbLinks, "TB_LINKS");
-    Size aSize(LogicToPixel(Size(257, 87), MAP_APPFONT));
+    Size aSize(LogicToPixel(Size(257, 87), MapUnit::MapAppFont));
     m_pTbLinks->set_width_request(aSize.Width());
     m_pTbLinks->set_height_request(aSize.Height());
     get(m_pFtFullFileName, "FULL_FILE_NAME");
@@ -115,11 +115,11 @@ SvBaseLinksDlg::SvBaseLinksDlg( vcl::Window * pParent, LinkManager* pMgr, bool b
     m_pTbLinks->SetSelectionMode( SelectionMode::Multiple );
     m_pTbLinks->SetTabs( &nTabs[0] );
     FixedText *pFtFiles = get<FixedText>("FILES");
-    pFtFiles->set_width_request(LogicToPixel(Size(nTabs[2] - nTabs[1] - 2, 0), MAP_APPFONT).Width());
+    pFtFiles->set_width_request(LogicToPixel(Size(nTabs[2] - nTabs[1] - 2, 0), MapUnit::MapAppFont).Width());
     FixedText *pFtLinks = get<FixedText>("LINKS");
-    pFtLinks->set_width_request(LogicToPixel(Size(nTabs[3] - nTabs[2] - 2, 0), MAP_APPFONT).Width());
+    pFtLinks->set_width_request(LogicToPixel(Size(nTabs[3] - nTabs[2] - 2, 0), MapUnit::MapAppFont).Width());
     FixedText *pFtTypes = get<FixedText>("TYPE");
-    pFtTypes->set_width_request(LogicToPixel(Size(nTabs[4] - nTabs[3] - 2, 0), MAP_APPFONT).Width());
+    pFtTypes->set_width_request(LogicToPixel(Size(nTabs[4] - nTabs[3] - 2, 0), MapUnit::MapAppFont).Width());
     m_pTbLinks->Resize();  // OS: hack for correct selection
 
     // UpdateTimer for DDE-/Grf-links, which are waited for
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index afe5584..f20db7a 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -179,7 +179,7 @@ SvxMultiPathDialog::SvxMultiPathDialog(vcl::Window* pParent)
     get(m_pDelBtn, "delete");
 
     SvSimpleTableContainer* pRadioLBContainer = get<SvSimpleTableContainer>("paths");
-    Size aSize(LogicToPixel(Size(195, 77), MAP_APPFONT));
+    Size aSize(LogicToPixel(Size(195, 77), MapUnit::MapAppFont));
     pRadioLBContainer->set_width_request(aSize.Width());
     pRadioLBContainer->set_height_request(aSize.Height());
     m_pRadioLB = VclPtr<svx::SvxRadioButtonListBox>::Create(*pRadioLBContainer, 0);
@@ -207,7 +207,7 @@ SvxPathSelectDialog::SvxPathSelectDialog(vcl::Window* pParent)
     get(m_pAddBtn, "add");
     get(m_pDelBtn, "delete");
     get(m_pPathLB, "paths");
-    Size aSize(LogicToPixel(Size(189, 80), MAP_APPFONT));
+    Size aSize(LogicToPixel(Size(189, 80), MapUnit::MapAppFont));
     m_pPathLB->set_width_request(aSize.Width());
     m_pPathLB->set_height_request(aSize.Height());
 
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 18ad0b1..f853ce3 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -31,7 +31,7 @@ CertPathDialog::CertPathDialog(vcl::Window* pParent)
     get(m_pOKBtn, "ok");
     get(m_pAddBtn, "add");
     get(m_pCertPathListContainer, "paths");
-    Size aSize(LogicToPixel(Size(210, 60), MAP_APPFONT));
+    Size aSize(LogicToPixel(Size(210, 60), MapUnit::MapAppFont));
     m_pCertPathListContainer->set_width_request(aSize.Width());
     m_pCertPathListContainer->set_height_request(aSize.Height());
     m_pCertPathList =
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 9362469..bf34078 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -127,11 +127,11 @@ namespace offapp
     {
         EditBrowseBox::Init();
 
-        Size aColWidth = LogicToPixel(Size(160, 0), MAP_APPFONT);
+        Size aColWidth = LogicToPixel(Size(160, 0), MapUnit::MapAppFont);
         InsertDataColumn(1, OUString(CUI_RES(RID_SVXSTR_DRIVER_NAME)), aColWidth.Width());
-        aColWidth = LogicToPixel(Size(30, 0), MAP_APPFONT);
+        aColWidth = LogicToPixel(Size(30, 0), MapUnit::MapAppFont);
         InsertDataColumn(2, OUString(CUI_RES(RID_SVXSTR_POOLED_FLAG)), aColWidth.Width());
-        aColWidth = LogicToPixel(Size(60, 0), MAP_APPFONT);
+        aColWidth = LogicToPixel(Size(60, 0), MapUnit::MapAppFont);
         InsertDataColumn(3, OUString(CUI_RES(RID_SVXSTR_POOL_TIMEOUT)), aColWidth.Width());
             // Attention: the resource of the string is local to the resource of the enclosing dialog!
     }
@@ -303,7 +303,7 @@ namespace offapp
         get(m_pTimeout, "timeout");
 
         Size aControlSize(248, 100);
-        aControlSize = LogicToPixel(aControlSize, MAP_APPFONT);
+        aControlSize = LogicToPixel(aControlSize, MapUnit::MapAppFont);
         m_pDriverList->set_width_request(aControlSize.Width());
         m_pDriverList->set_height_request(aControlSize.Height());
         m_pDriverList->Init();
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index be470fc..c34f7b6 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -110,7 +110,7 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons
 {
     get(m_pPathCtrl, "pathctrl");
     Size aControlSize(248, 147);
-    aControlSize = LogicToPixel(aControlSize, MAP_APPFONT);
+    aControlSize = LogicToPixel(aControlSize, MapUnit::MapAppFont);
     m_pPathCtrl->set_width_request(aControlSize.Width());
     m_pPathCtrl->set_height_request(aControlSize.Height());
 
@@ -134,11 +134,11 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons
     Size aSz;
     aSz.Width() = TAB_WIDTH1;
     rBar.InsertItem( ITEMID_TYPE, m_aTypeText,
-                            LogicToPixel( aSz, MapMode( MAP_APPFONT ) ).Width(),
+                            LogicToPixel( aSz, MapMode( MapUnit::MapAppFont ) ).Width(),
                             HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER | HeaderBarItemBits::CLICKABLE | HeaderBarItemBits::UPARROW );
     aSz.Width() = TAB_WIDTH2;
     rBar.InsertItem( ITEMID_PATH, m_aPathText,
-                            LogicToPixel( aSz, MapMode( MAP_APPFONT ) ).Width(),
+                            LogicToPixel( aSz, MapMode( MapUnit::MapAppFont ) ).Width(),
                             HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER );
 
     static long aTabs[] = {3, 0, TAB_WIDTH1, TAB_WIDTH1 + TAB_WIDTH2 };
@@ -364,7 +364,7 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void
             long _nWidth = pBar->GetItemSize(i);
             aSz.Width() =  _nWidth + nTmpSz;
             nTmpSz += _nWidth;
-            m_pPathBox->SetTab( i, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width() );
+            m_pPathBox->SetTab( i, PixelToLogic( aSz, MapMode(MapUnit::MapAppFont) ).Width() );
         }
     }
 }
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 9abe7d4..7264c0d 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -59,7 +59,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( vcl::Window* pParent,
 
     SvSimpleTableContainer *pCheckLBContainer = get<SvSimpleTableContainer>("checklb");
     Size aControlSize(248, 75);
-    aControlSize = LogicToPixel(aControlSize, MAP_APPFONT);
+    aControlSize = LogicToPixel(aControlSize, MapUnit::MapAppFont);
     pCheckLBContainer->set_width_request(aControlSize.Width());
     pCheckLBContainer->set_height_request(aControlSize.Height());
 
@@ -421,7 +421,7 @@ void SvxFontSubstCheckListBox::setColSizes()
     long nW1 = rBar.GetTextWidth(rBar.GetItemText(3));
     long nW2 = rBar.GetTextWidth(rBar.GetItemText(4));
     long nMax = std::max( nW1, nW2 ) + 6; // width of the longest header + a little offset
-    long nMin = rBar.LogicToPixel(Size(10, 0), MAP_APPFONT).Width();
+    long nMin = rBar.LogicToPixel(Size(10, 0), MapUnit::MapAppFont).Width();
     nMax = std::max( nMax, nMin );
     const long nDoubleMax = 2*nMax;
     const long nRest = GetSizePixel().Width() - nDoubleMax;
@@ -429,7 +429,7 @@ void SvxFontSubstCheckListBox::setColSizes()
     aStaticTabs[2] = nMax;
     aStaticTabs[3] = nDoubleMax;
     aStaticTabs[4] = nDoubleMax + nRest/2;
-    SvSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL);
+    SvSimpleTable::SetTabs(aStaticTabs, MapUnit::MapPixel);
 }
 
 void SvxFontSubstCheckListBox::Resize()
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index a6c06a9..bacba9e 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -137,7 +137,7 @@ void CuiCustomMultilineEdit::KeyInput( const KeyEvent& rKeyEvent )
 
 Size CuiCustomMultilineEdit::GetOptimalSize() const
 {
-    return LogicToPixel(Size(150, GetTextHeight()), MAP_APPFONT);
+    return LogicToPixel(Size(150, GetTextHeight()), MapUnit::MapAppFont);
 }
 
 CuiAboutConfigTabPage::CuiAboutConfigTabPage( vcl::Window* pParent/*, const SfxItemSet& rItemSet*/ ) :
@@ -150,7 +150,7 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage( vcl::Window* pParent/*, const SfxI
     m_vectorOfModified(),
     m_pPrefBox( VclPtr<SvSimpleTable>::Create(*m_pPrefCtrl, WB_SCROLL | WB_HSCROLL | WB_VSCROLL ) )
 {
-    Size aControlSize(LogicToPixel(Size(385, 230), MAP_APPFONT));
+    Size aControlSize(LogicToPixel(Size(385, 230), MapUnit::MapAppFont));
     m_pPrefCtrl->set_width_request(aControlSize.Width());
     m_pPrefCtrl->set_height_request(aControlSize.Height());
 
@@ -179,7 +179,7 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage( vcl::Window* pParent/*, const SfxI
     m_options.searchFlag |= (util::SearchFlags::REG_NOT_BEGINOFLINE |
                                         util::SearchFlags::REG_NOT_ENDOFLINE);
 
-    m_pPrefBox->SetTabs(aTabs, MAP_PIXEL);
+    m_pPrefBox->SetTabs(aTabs, MapUnit::MapPixel);
     m_pPrefBox->SetAlternatingRowColors( true );
 }
 
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index d3c9fc1..6e791c8 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -158,7 +158,7 @@ OfaMSFilterTabPage2::OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet
     get( aShadingRB,      "shading"     );
 
     Size aControlSize(248, 55);
-    aControlSize = LogicToPixel(aControlSize, MAP_APPFONT);
+    aControlSize = LogicToPixel(aControlSize, MapUnit::MapAppFont);
     m_pCheckLBContainer->set_width_request(aControlSize.Width());
     m_pCheckLBContainer->set_height_request(aControlSize.Height());
 
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 9ddc4ff..c8bb0cb 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -108,7 +108,7 @@ public:
         if (rBar.GetItemCount() < 4)
             return;
         long nCheckWidth = std::max(GetControlColumnWidth() + 12,
-            rBar.LogicToPixel(Size(15, 0), MAP_APPFONT).Width());
+            rBar.LogicToPixel(Size(15, 0), MapUnit::MapAppFont).Width());
         long nVersionWidth = 12 +
             std::max(rBar.GetTextWidth(rBar.GetItemText(3)),
             GetTextWidth("0.0.0_00-icedtea"));
@@ -123,7 +123,7 @@ public:
         aStaticTabs[2] = nCheckWidth;
         aStaticTabs[3] = aStaticTabs[2] + nVendorWidth;
         aStaticTabs[4] = aStaticTabs[3] + nVersionWidth;
-        SvSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL);
+        SvSimpleTable::SetTabs(aStaticTabs, MapUnit::MapPixel);
     }
     virtual void Resize() override
     {
@@ -163,7 +163,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet&
 
     SvSimpleTableContainer *pJavaListContainer = get<SvSimpleTableContainer>("javas");
     Size aControlSize(177, 60);
-    aControlSize = LogicToPixel(aControlSize, MAP_APPFONT);
+    aControlSize = LogicToPixel(aControlSize, MapUnit::MapAppFont);
     pJavaListContainer->set_width_request(aControlSize.Width());
     pJavaListContainer->set_height_request(aControlSize.Height());
     m_pJavaList = VclPtr<SvxJavaListBox>::Create(*pJavaListContainer, m_sAccessibilityText);
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index fc9f3c6..6e3c099 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1816,7 +1816,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(vcl::Window* pParent, SvxLinguData_Impl& rD
     get(m_pPrioDownPB, "down");
     get(m_pPrioUpPB, "up");
     get(m_pModulesCLB, "lingudicts");
-    Size aListSize(m_pModulesCLB->LogicToPixel(Size(166, 120), MAP_APPFONT));
+    Size aListSize(m_pModulesCLB->LogicToPixel(Size(166, 120), MapUnit::MapAppFont));
     m_pModulesCLB->set_height_request(aListSize.Height());
     m_pModulesCLB->set_width_request(aListSize.Width());
     get(m_pLanguageLB, "language");
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 88d7fd5..f351151 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -204,7 +204,7 @@ SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     m_pPathBtn->SetClickHdl( LINK( this, SvxPathTabPage, PathHdl_Impl ) );
 
     Size aControlSize(236 , 147);
-    aControlSize = LogicToPixel(aControlSize, MAP_APPFONT);
+    aControlSize = LogicToPixel(aControlSize, MapUnit::MapAppFont);
     m_pPathCtrl->set_width_request(aControlSize.Width());
     m_pPathCtrl->set_height_request(aControlSize.Height());
     WinBits nBits = WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP;
@@ -227,7 +227,7 @@ SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     long aTabs[] = {3, 0, 0, 0};
     aTabs[2] = nWidth1 + 12;
     aTabs[3] = aTabs[2] + nWidth2 + 12;
-    pPathBox->SetTabs(aTabs, MAP_PIXEL);
+    pPathBox->SetTabs(aTabs, MapUnit::MapPixel);
 
     pPathBox->SetDoubleClickHdl( LINK( this, SvxPathTabPage, DoubleClickPathHdl_Impl ) );
     pPathBox->SetSelectHdl( LINK( this, SvxPathTabPage, PathSelect_Impl ) );
@@ -342,7 +342,7 @@ void SvxPathTabPage::Reset( const SfxItemSet* )
     long aTabs[] = {3, 0, 0, 0};
     aTabs[2] = nWidth1 + 12;
     aTabs[3] = aTabs[2] + nWidth2 + 12;
-    pPathBox->SetTabs(aTabs, MAP_PIXEL);
+    pPathBox->SetTabs(aTabs, MapUnit::MapPixel);
 
 #if 0
     String aUserData = GetUserData();
@@ -716,7 +716,7 @@ IMPL_LINK( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void )
             long _nWidth = pBar->GetItemSize(i);
             aSz.Width() =  _nWidth + nTmpSz;
             nTmpSz += _nWidth;
-            pPathBox->SetTab( i, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width() );
+            pPathBox->SetTab( i, PixelToLogic( aSz, MapMode(MapUnit::MapAppFont) ).Width() );
         }
     }
 }
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 716bb2a..3ecfdf6 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -498,7 +498,7 @@ void OfaTreeOptionsDialog::InitWidgets()
     get(pBackPB, "revert");
     get(pTreeLB, "pages");
     get(pTabBox, "box");
-    Size aSize(pTabBox->LogicToPixel(Size(278, 259), MAP_APPFONT));
+    Size aSize(pTabBox->LogicToPixel(Size(278, 259), MapUnit::MapAppFont));
     pTabBox->set_width_request(aSize.Width());
     pTabBox->set_height_request(aSize.Height() - get_action_area()->get_preferred_size().Height());
     pTreeLB->set_width_request(pTreeLB->approximate_char_width() * 25);
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 21ed6da..d9473ea 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -96,7 +96,7 @@ void PasswordTable::setColWidths()
         GetSizePixel().Width() - nUserNameWidth);
     long aStaticTabs[]= { 2, 0, 0 };
     aStaticTabs[2] = nWebSiteWidth;
-    SvSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL);
+    SvSimpleTable::SetTabs(aStaticTabs, MapUnit::MapPixel);
 }
 
 // class WebConnectionInfoDialog -----------------------------------------
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 64ab34f..67efba2 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -437,7 +437,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( vcl::Window* pParent,
 
     SvSimpleTableContainer* pCheckLBContainer(get<SvSimpleTableContainer>("list"));
     Size aControlSize(248 , 149);
-    aControlSize = LogicToPixel(aControlSize, MAP_APPFONT);
+    aControlSize = LogicToPixel(aControlSize, MapUnit::MapAppFont);
     pCheckLBContainer->set_width_request(aControlSize.Width());
     pCheckLBContainer->set_height_request(aControlSize.Height());
     m_pCheckLB = VclPtr<OfaACorrCheckListBox>::Create(*pCheckLBContainer);
@@ -1773,7 +1773,7 @@ void AutoCorrEdit::Resize()
     Edit::Resize();
     if (!m_xReplaceTLB)
         return;
-    m_xReplaceTLB->SetTab(m_nCol, GetPosPixel().X(), MAP_PIXEL);
+    m_xReplaceTLB->SetTab(m_nCol, GetPosPixel().X(), MapUnit::MapPixel);
 }
 
 enum OfaQuoteOptions
@@ -1823,7 +1823,7 @@ OfaQuoteTabPage::OfaQuoteTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
 
     SvSimpleTableContainer *pListContainer = get<SvSimpleTableContainer>("list");
     Size aControlSize(252 , 85);
-    aControlSize = LogicToPixel(aControlSize, MAP_APPFONT);
+    aControlSize = LogicToPixel(aControlSize, MapUnit::MapAppFont);
     pListContainer->set_width_request(aControlSize.Width());
     pListContainer->set_height_request(aControlSize.Height());
     m_pSwCheckLB = VclPtr<OfaACorrCheckListBox>::Create(*pListContainer);
@@ -2195,7 +2195,7 @@ OfaAutoCompleteTabPage::OfaAutoCompleteTabPage(vcl::Window* pParent,
     get(m_pNFMaxEntries, "maxentries");
     get(m_pLBEntries, "entries");
     m_pLBEntries->SetPage(this);
-    aSize = LogicToPixel(Size(121, 158), MAP_APPFONT);
+    aSize = LogicToPixel(Size(121, 158), MapUnit::MapAppFont);
     m_pLBEntries->set_width_request(aSize.Width());
     m_pLBEntries->set_height_request(aSize.Height());
     get(m_pPBEntries, "delete");
@@ -2477,7 +2477,7 @@ OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage( vcl::Window* pParent,
     // some options for the list box:
     m_pSmartTagTypesLB->SetStyle( m_pSmartTagTypesLB->GetStyle() | WB_HSCROLL | WB_HIDESELECTION );
     m_pSmartTagTypesLB->SetHighlightRange();
-    Size aControlSize(LogicToPixel(Size(172, 154), MAP_APPFONT));
+    Size aControlSize(LogicToPixel(Size(172, 154), MapUnit::MapAppFont));
     m_pSmartTagTypesLB->set_width_request(aControlSize.Width());
     m_pSmartTagTypesLB->set_height_request(aControlSize.Height());
 
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index f94fb4a..2a2a320 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -251,7 +251,7 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCore
         }
         bIsDontCare = !pBoxInfo->IsValid( SvxBoxInfoItemValidFlags::DISABLE );
     }
-    if(!mbUseMarginItem && eFUnit == FUNIT_MM && MAP_TWIP == rCoreAttrs.GetPool()->GetMetric( GetWhich( SID_ATTR_BORDER_INNER ) ))
+    if(!mbUseMarginItem && eFUnit == FUNIT_MM && MapUnit::MapTwip == rCoreAttrs.GetPool()->GetMetric( GetWhich( SID_ATTR_BORDER_INNER ) ))
     {
         //#i91548# changing the number of decimal digits changes the minimum values, too
         lcl_SetDecimalDigitsTo1(*m_pLeftMF);
@@ -540,7 +540,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet )
             // Determine the width first as some styles can be missing depending on it
             sal_Int64 nWidthPt =  static_cast<sal_Int64>(MetricField::ConvertDoubleValue(
                         sal_Int64( nWidth ), m_pLineWidthMF->GetDecimalDigits( ),
-                        MAP_TWIP,m_pLineWidthMF->GetUnit() ));
+                        MapUnit::MapTwip, m_pLineWidthMF->GetUnit() ));
             m_pLineWidthMF->SetValue( nWidthPt );
             m_pLbLineStyle->SetWidth( nWidth );
 
@@ -896,7 +896,7 @@ IMPL_LINK_NOARG(SvxBorderTabPage, ModifyWidthHdl_Impl, Edit&, void)
     sal_Int64 nVal = static_cast<sal_Int64>(MetricField::ConvertDoubleValue(
                 m_pLineWidthMF->GetValue( ),
                 m_pLineWidthMF->GetDecimalDigits( ),
-                m_pLineWidthMF->GetUnit(), MAP_TWIP ));
+                m_pLineWidthMF->GetUnit(), MapUnit::MapTwip ));
     m_pLbLineStyle->SetWidth( nVal );
 
     m_pFrameSel->SetStyleToSelection( nVal,
@@ -911,7 +911,7 @@ IMPL_LINK( SvxBorderTabPage, SelStyleHdl_Impl, ListBox&, rLb, void )
         sal_Int64 nVal = static_cast<sal_Int64>(MetricField::ConvertDoubleValue(
                     m_pLineWidthMF->GetValue( ),
                     m_pLineWidthMF->GetDecimalDigits( ),
-                    m_pLineWidthMF->GetUnit(), MAP_TWIP ));
+                    m_pLineWidthMF->GetUnit(), MapUnit::MapTwip ));
         m_pFrameSel->SetStyleToSelection ( nVal,
             SvxBorderStyle( m_pLbLineStyle->GetSelectEntryStyle() ) );
     }
@@ -1111,7 +1111,7 @@ void SvxBorderTabPage::FillLineListBox_Impl()
     sal_Int64 nVal = static_cast<sal_Int64>(MetricField::ConvertDoubleValue(
                 m_pLineWidthMF->GetValue( ),
                 m_pLineWidthMF->GetDecimalDigits( ),
-                m_pLineWidthMF->GetUnit(), MAP_TWIP ));
+                m_pLineWidthMF->GetUnit(), MapUnit::MapTwip ));
     m_pLbLineStyle->SetWidth( nVal );
 }
 
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 444fd62..1d27084 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -780,9 +780,9 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
         MapUnit eUnit = rSet.GetPool()->GetMetric( nWhich );
         const SvxFontHeightItem& rItem = static_cast<const SvxFontHeightItem&>(rSet.Get( nWhich ));
 
-        if( rItem.GetProp() != 100 || MAP_RELATIVE != rItem.GetPropUnit() )
+        if( rItem.GetProp() != 100 || MapUnit::MapRelative != rItem.GetPropUnit() )
         {
-            bool bPtRel = MAP_POINT == rItem.GetPropUnit();
+            bool bPtRel = MapUnit::MapPoint == rItem.GetPropUnit();
             pSizeBox->SetPtRelative( bPtRel );
             pSizeBox->SetValue( bPtRel ? ((short)rItem.GetProp()) * 10 : rItem.GetProp() );
         }
@@ -1079,7 +1079,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
     }
 
     if ( bChanged || !pOldHeight ||
-         bRel != ( MAP_RELATIVE != pOldHeight->GetPropUnit() || 100 != pOldHeight->GetProp() ) )
+         bRel != ( MapUnit::MapRelative != pOldHeight->GetPropUnit() || 100 != pOldHeight->GetProp() ) )
     {
         MapUnit eUnit = rSet.GetPool()->GetMetric( nWhich );
         if ( pSizeBox->IsRelative() )
@@ -1090,7 +1090,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
 
             SvxFontHeightItem aHeight( 240, 100, nWhich );
             if ( pSizeBox->IsPtRelative() )
-                aHeight.SetHeight( rOldItem.GetHeight(), (sal_uInt16)( nSize / 10 ), MAP_POINT, eUnit );
+                aHeight.SetHeight( rOldItem.GetHeight(), (sal_uInt16)( nSize / 10 ), MapUnit::MapPoint, eUnit );
             else
                 aHeight.SetHeight( rOldItem.GetHeight(), (sal_uInt16)nSize );
             rSet.Put( aHeight );
@@ -2826,7 +2826,7 @@ IMPL_LINK( SvxCharPositionPage, FitToLineHdl_Impl, Button*, pBox, void )
 IMPL_LINK_NOARG(SvxCharPositionPage, KerningModifyHdl_Impl, Edit&, void)
 {
     long nVal = static_cast<long>(m_pKerningMF->GetValue());
-    nVal = LogicToLogic( nVal, MAP_POINT, MAP_TWIP );
+    nVal = LogicToLogic( nVal, MapUnit::MapPoint, MapUnit::MapTwip );
     long nKern = (short)m_pKerningMF->Denormalize( nVal );
 
     SvxFont& rFont = GetPreviewFont();
@@ -3005,12 +3005,12 @@ void SvxCharPositionPage::Reset( const SfxItemSet* rSet )
         const SvxKerningItem& rItem = static_cast<const SvxKerningItem&>(rSet->Get( nWhich ));
         MapUnit eUnit = rSet->GetPool()->GetMetric( nWhich );
         MapUnit eOrgUnit = (MapUnit)eUnit;
-        MapUnit ePntUnit( MAP_POINT );
+        MapUnit ePntUnit( MapUnit::MapPoint );
         long nBig = static_cast<long>(m_pKerningMF->Normalize( static_cast<long>(rItem.GetValue()) ));
         long nKerning = LogicToLogic( nBig, eOrgUnit, ePntUnit );
 
         // set Kerning at the Font, convert into Twips before
-        long nKern = LogicToLogic( rItem.GetValue(), (MapUnit)eUnit, MAP_TWIP );
+        long nKern = LogicToLogic( rItem.GetValue(), (MapUnit)eUnit, MapUnit::MapTwip );
         rFont.SetFixKerning( (short)nKern );
         rCJKFont.SetFixKerning( (short)nKern );
         rCTLFont.SetFixKerning( (short)nKern );
@@ -3179,7 +3179,7 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet* rSet )
     MapUnit eUnit = rSet->GetPool()->GetMetric( nWhich );
 
     long nTmp = static_cast<long>(m_pKerningMF->GetValue());
-    long nVal = LogicToLogic( nTmp, MAP_POINT, (MapUnit)eUnit );
+    long nVal = LogicToLogic( nTmp, MapUnit::MapPoint, (MapUnit)eUnit );
     nKerning = (short)m_pKerningMF->Denormalize( nVal );
 
     SfxItemState eOldKernState = rOldSet.GetItemState( nWhich, false );
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 5c09f6b..0e09658 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -217,7 +217,7 @@ void SvxGrfCropPage::Reset( const SfxItemSet *rSet )
     {
         aPageSize = OutputDevice::LogicToLogic(
                         Size( CM_1_TO_TWIP,  CM_1_TO_TWIP ),
-                        MapMode( MAP_TWIP ),
+                        MapMode( MapUnit::MapTwip ),
                         MapMode( (MapUnit)rSet->GetPool()->GetMetric( nW ) ) );
     }
 
@@ -749,9 +749,9 @@ IMPL_LINK( SvxGrfCropPage, CropModifyHdl, Edit&, rField, void )
 
 Size SvxGrfCropPage::GetGrfOrigSize( const Graphic& rGrf ) const
 {
-    const MapMode aMapTwip( MAP_TWIP );
+    const MapMode aMapTwip( MapUnit::MapTwip );
     Size aSize( rGrf.GetPrefSize() );
-    if( MAP_PIXEL == rGrf.GetPrefMapMode().GetMapUnit() )
+    if( MapUnit::MapPixel == rGrf.GetPrefMapMode().GetMapUnit() )
         aSize = PixelToLogic( aSize, aMapTwip );
     else
         aSize = OutputDevice::LogicToLogic( aSize,
@@ -765,7 +765,7 @@ SvxCropExample::SvxCropExample( vcl::Window* pPar, WinBits nStyle )
     : Window( pPar, nStyle)
     , aFrameSize( OutputDevice::LogicToLogic(
                             Size( CM_1_TO_TWIP / 2, CM_1_TO_TWIP / 2 ),
-                            MapMode( MAP_TWIP ), GetMapMode() ))
+                            MapMode( MapUnit::MapTwip ), GetMapMode() ))
     , aTopLeft(0,0)
     , aBottomRight(0,0)
 {
@@ -774,7 +774,7 @@ SvxCropExample::SvxCropExample( vcl::Window* pPar, WinBits nStyle )
 
 Size SvxCropExample::GetOptimalSize() const
 {
-    return LogicToPixel(Size(78, 78), MAP_APPFONT);
+    return LogicToPixel(Size(78, 78), MapUnit::MapAppFont);
 }
 
 VCL_BUILDER_DECL_FACTORY(SvxCropExample)
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index c325ff9..e255e9c 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -87,7 +87,7 @@ SvxCaptionTabPage::SvxCaptionTabPage(vcl::Window* pParent, const SfxItemSet& rIn
 {
     get(m_pCT_CAPTTYPE, "valueset");
 
-    Size aSize(m_pCT_CAPTTYPE->LogicToPixel(Size(187, 38), MAP_APPFONT));
+    Size aSize(m_pCT_CAPTTYPE->LogicToPixel(Size(187, 38), MapUnit::MapAppFont));
     m_pCT_CAPTTYPE->set_width_request(aSize.Width());
     m_pCT_CAPTTYPE->set_height_request(aSize.Height());
 
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index b980bc1..8c7a4e0 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -398,9 +398,9 @@ void SfxMacroTabPage::InitAndSetHandler()
     rListBox.SetSelectionMode( SelectionMode::Single );
     rListBox.SetTabs( &nTabs[0] );
     Size aSize( nTabs[ 2 ], 0 );
-    rHeaderBar.InsertItem( ITEMID_EVENT, mpImpl->sStrEvent, LogicToPixel( aSize, MapMode( MAP_APPFONT ) ).Width() );
+    rHeaderBar.InsertItem( ITEMID_EVENT, mpImpl->sStrEvent, LogicToPixel( aSize, MapMode( MapUnit::MapAppFont ) ).Width() );
     aSize.Width() = 1764;       // don't know what, so 42^2 is best to use...
-    rHeaderBar.InsertItem( ITMEID_ASSMACRO, mpImpl->sAssignedMacro, LogicToPixel( aSize, MapMode( MAP_APPFONT ) ).Width() );
+    rHeaderBar.InsertItem( ITMEID_ASSMACRO, mpImpl->sAssignedMacro, LogicToPixel( aSize, MapMode( MapUnit::MapAppFont ) ).Width() );
     rListBox.SetSpaceBetweenEntries( 0 );
 
     mpImpl->pEventLB->Show();
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 6fabe1f..e023463 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -86,7 +86,7 @@ SvxMeasurePage::SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs
         rOutAttrs               ( rInAttrs ),
         aAttrSet                ( *rInAttrs.GetPool() ),
         pView( nullptr ),
-        eUnit( MAP_100TH_MM ),
+        eUnit( MapUnit::Map100thMM ),
         bPositionModified       ( false )
 {
     get(m_pMtrFldLineDist, "MTR_LINE_DIST");
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 04cabab..1d7ab68 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -969,7 +969,7 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl, ValueSet*, void)
                 {
                     Size aSize = SvxNumberFormat::GetGraphicSizeMM100(&aGraphic);
                     sal_Int16 eOrient = text::VertOrientation::LINE_CENTER;
-                    aSize = OutputDevice::LogicToLogic(aSize, MAP_100TH_MM, (MapUnit)eCoreUnit);
+                    aSize = OutputDevice::LogicToLogic(aSize, MapUnit::Map100thMM, (MapUnit)eCoreUnit);
                     SvxBrushItem aBrush(aGraphic, GPOS_AREA, SID_ATTR_BRUSH );
                     aFmt.SetGraphicBrush( &aBrush, &aSize, &eOrient );
                 }
@@ -2013,7 +2013,7 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton, void )
     }
     if(bSucc)
     {
-        aSize = OutputDevice::LogicToLogic(aSize, MAP_100TH_MM, (MapUnit)eCoreUnit);
+        aSize = OutputDevice::LogicToLogic(aSize, MapUnit::Map100thMM, (MapUnit)eCoreUnit);
 
         sal_uInt16 nMask = 1;
         for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
@@ -2171,9 +2171,9 @@ IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, Edit&, rField, void)
     long nWidthVal = static_cast<long>(m_pWidthMF->Denormalize(m_pWidthMF->GetValue(FUNIT_100TH_MM)));
     long nHeightVal = static_cast<long>(m_pHeightMF->Denormalize(m_pHeightMF->GetValue(FUNIT_100TH_MM)));
     nWidthVal = OutputDevice::LogicToLogic( nWidthVal ,
-                                                MAP_100TH_MM, (MapUnit)eCoreUnit );
+                                                MapUnit::Map100thMM, (MapUnit)eCoreUnit );
     nHeightVal = OutputDevice::LogicToLogic( nHeightVal,
-                                                MAP_100TH_MM, (MapUnit)eCoreUnit);
+                                                MapUnit::Map100thMM, (MapUnit)eCoreUnit);
     double  fSizeRatio;
 
     bool bRepaint = false;
@@ -2201,7 +2201,7 @@ IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, Edit&, rField, void)
                     {
                         aSize.Height() = aInitSize[i].Height() + (long)((double)nDelta / fSizeRatio);
                         m_pHeightMF->SetUserValue(m_pHeightMF->Normalize(
-                            OutputDevice::LogicToLogic( aSize.Height(), (MapUnit)eCoreUnit, MAP_100TH_MM )),
+                            OutputDevice::LogicToLogic( aSize.Height(), (MapUnit)eCoreUnit, MapUnit::Map100thMM )),
                                 FUNIT_100TH_MM);
                     }
                 }
@@ -2213,7 +2213,7 @@ IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, Edit&, rField, void)
                     {
                         aSize.Width() = aInitSize[i].Width() + (long)((double)nDelta * fSizeRatio);
                         m_pWidthMF->SetUserValue(m_pWidthMF->Normalize(
-                            OutputDevice::LogicToLogic( aSize.Width(), (MapUnit)eCoreUnit, MAP_100TH_MM )),
+                            OutputDevice::LogicToLogic( aSize.Width(), (MapUnit)eCoreUnit, MapUnit::Map100thMM )),
                                 FUNIT_100TH_MM);
                     }
                 }
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index b0940e4..a6097ea 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -118,7 +118,7 @@ Size GetMinBorderSpace_Impl( const SvxShadowItem& rShadow, const SvxBoxItem& rBo
 
 long ConvertLong_Impl( const long nIn, MapUnit eUnit )
 {
-    return OutputDevice::LogicToLogic( nIn, eUnit, MAP_TWIP );
+    return OutputDevice::LogicToLogic( nIn, eUnit, MapUnit::MapTwip );
 }
 
 bool IsEqualSize_Impl( const SvxSizeItem* pSize, const Size& rSize )
@@ -290,7 +290,7 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr
     }
 
     MapMode aOldMode = mpDefPrinter->GetMapMode();
-    mpDefPrinter->SetMapMode( MAP_TWIP );
+    mpDefPrinter->SetMapMode( MapUnit::MapTwip );
 
     // set first- and last-values for the margins
     Size aPaperSize = mpDefPrinter->GetPaperSize();
@@ -535,22 +535,22 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet )
     m_pBspWin->SetSize( Size( ConvertLong_Impl( aPaperSize.Width(), eUnit ),
                            ConvertLong_Impl( aPaperSize.Height(), eUnit ) ) );
 
-    aPaperSize = OutputDevice::LogicToLogic(aPaperSize, (MapUnit)eUnit, MAP_100TH_MM);
+    aPaperSize = OutputDevice::LogicToLogic(aPaperSize, (MapUnit)eUnit, MapUnit::Map100thMM);
     if ( bLandscape )
         Swap( aPaperSize );
 
     // Actual Paper Format
-    Paper ePaper = SvxPaperInfo::GetSvxPaper( aPaperSize, MAP_100TH_MM, true );
+    Paper ePaper = SvxPaperInfo::GetSvxPaper( aPaperSize, MapUnit::Map100thMM, true );
 
     if ( PAPER_USER != ePaper )
-        aPaperSize = SvxPaperInfo::GetPaperSize( ePaper, MAP_100TH_MM );
+        aPaperSize = SvxPaperInfo::GetPaperSize( ePaper, MapUnit::Map100thMM );
 
     if ( bLandscape )
         Swap( aPaperSize );
 
     // write values into the edits
-    SetMetricValue( *m_pPaperHeightEdit, aPaperSize.Height(), MAP_100TH_MM );
-    SetMetricValue( *m_pPaperWidthEdit, aPaperSize.Width(), MAP_100TH_MM );
+    SetMetricValue( *m_pPaperHeightEdit, aPaperSize.Height(), MapUnit::Map100thMM );
+    SetMetricValue( *m_pPaperWidthEdit, aPaperSize.Width(), MapUnit::Map100thMM );
     m_pPaperSizeBox->Clear();
 
     m_pPaperSizeBox->FillPaperSizeEntries( ( ePaperStart == PAPER_A3 ) ? PaperSizeApp::Std : PaperSizeApp::Draw );
@@ -953,7 +953,7 @@ IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox&, rBox, void )
 
     if ( ePaper != PAPER_USER )
     {
-        Size aSize( SvxPaperInfo::GetPaperSize( ePaper, MAP_100TH_MM ) );
+        Size aSize( SvxPaperInfo::GetPaperSize( ePaper, MapUnit::Map100thMM ) );
 
         if ( m_pLandscapeBtn->IsChecked() )
             Swap( aSize );
@@ -964,8 +964,8 @@ IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox&, rBox, void )
         if ( aSize.Width() < m_pPaperWidthEdit->GetMin( FUNIT_100TH_MM ) )
             m_pPaperWidthEdit->SetMin(
                 m_pPaperWidthEdit->Normalize( aSize.Width() ), FUNIT_100TH_MM );
-        SetMetricValue( *m_pPaperHeightEdit, aSize.Height(), MAP_100TH_MM );
-        SetMetricValue( *m_pPaperWidthEdit, aSize.Width(), MAP_100TH_MM );
+        SetMetricValue( *m_pPaperHeightEdit, aSize.Height(), MapUnit::Map100thMM );
+        SetMetricValue( *m_pPaperWidthEdit, aSize.Width(), MapUnit::Map100thMM );
 
         CalcMargin_Impl();
 
@@ -984,28 +984,28 @@ IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox&, rBox, void )
 
             if ( bScreen || m_pRightMarginEdit->GetValue() == 0 )
             {
-                SetMetricValue( *m_pRightMarginEdit, nTmp, MAP_CM );
+                SetMetricValue( *m_pRightMarginEdit, nTmp, MapUnit::MapCM );
                 if ( !bScreen &&
                      m_pRightMarginEdit->GetFirst() > m_pRightMarginEdit->GetValue() )
                     m_pRightMarginEdit->SetValue( m_pRightMarginEdit->GetFirst() );
             }
             if ( bScreen || m_pLeftMarginEdit->GetValue() == 0 )
             {
-                SetMetricValue( *m_pLeftMarginEdit, nTmp, MAP_CM );
+                SetMetricValue( *m_pLeftMarginEdit, nTmp, MapUnit::MapCM );
                 if ( !bScreen &&
                      m_pLeftMarginEdit->GetFirst() > m_pLeftMarginEdit->GetValue() )
                     m_pLeftMarginEdit->SetValue( m_pLeftMarginEdit->GetFirst() );
             }
             if ( bScreen || m_pBottomMarginEdit->GetValue() == 0 )
             {
-                SetMetricValue( *m_pBottomMarginEdit, nTmp, MAP_CM );
+                SetMetricValue( *m_pBottomMarginEdit, nTmp, MapUnit::MapCM );
                 if ( !bScreen &&
                      m_pBottomMarginEdit->GetFirst() > m_pBottomMarginEdit->GetValue() )
                     m_pBottomMarginEdit->SetValue( m_pBottomMarginEdit->GetFirst() );
             }
             if ( bScreen || m_pTopMarginEdit->GetValue() == 0 )
             {
-                SetMetricValue( *m_pTopMarginEdit, nTmp, MAP_CM );
+                SetMetricValue( *m_pTopMarginEdit, nTmp, MapUnit::MapCM );
                 if ( !bScreen &&
                      m_pTopMarginEdit->GetFirst() > m_pTopMarginEdit->GetValue() )
                     m_pTopMarginEdit->SetValue( m_pTopMarginEdit->GetFirst() );
@@ -1038,12 +1038,12 @@ IMPL_LINK( SvxPageDescPage, SwapOrientation_Impl, Button *, pBtn, void )
     {
         bLandscape = m_pLandscapeBtn->IsChecked();
 
-        const long lWidth = GetCoreValue( *m_pPaperWidthEdit, MAP_100TH_MM );
-        const long lHeight = GetCoreValue( *m_pPaperHeightEdit, MAP_100TH_MM );
+        const long lWidth = GetCoreValue( *m_pPaperWidthEdit, MapUnit::Map100thMM );
+        const long lHeight = GetCoreValue( *m_pPaperHeightEdit, MapUnit::Map100thMM );
 
         // swap width and height
-        SetMetricValue( *m_pPaperWidthEdit, lHeight, MAP_100TH_MM );
-        SetMetricValue( *m_pPaperHeightEdit, lWidth, MAP_100TH_MM );
+        SetMetricValue( *m_pPaperWidthEdit, lHeight, MapUnit::Map100thMM );
+        SetMetricValue( *m_pPaperHeightEdit, lWidth, MapUnit::Map100thMM );
 
         // recalculate margins if necessary
         CalcMargin_Impl();
@@ -1065,7 +1065,7 @@ void SvxPageDescPage::SwapFirstValues_Impl( bool bSet )
         eOri = Orientation::Landscape;
     Orientation eOldOri = mpDefPrinter->GetOrientation();
     mpDefPrinter->SetOrientation( eOri );
-    mpDefPrinter->SetMapMode( MAP_TWIP );
+    mpDefPrinter->SetMapMode( MapUnit::MapTwip );
 
     // set first- and last-values for margins
     Size aPaperSize = mpDefPrinter->GetPaperSize();
@@ -1133,16 +1133,16 @@ IMPL_LINK_NOARG(SvxPageDescPage, BorderModify_Impl, Edit&, void)
 void SvxPageDescPage::UpdateExample_Impl( bool bResetbackground )
 {
     // Size
-    Size aSize( GetCoreValue( *m_pPaperWidthEdit, MAP_TWIP ),
-                GetCoreValue( *m_pPaperHeightEdit, MAP_TWIP ) );
+    Size aSize( GetCoreValue( *m_pPaperWidthEdit, MapUnit::MapTwip ),
+                GetCoreValue( *m_pPaperHeightEdit, MapUnit::MapTwip ) );
 
     m_pBspWin->SetSize( aSize );
 
     // Margins
-    m_pBspWin->SetTop( GetCoreValue( *m_pTopMarginEdit, MAP_TWIP ) );
-    m_pBspWin->SetBottom( GetCoreValue( *m_pBottomMarginEdit, MAP_TWIP ) );
-    m_pBspWin->SetLeft( GetCoreValue( *m_pLeftMarginEdit, MAP_TWIP ) );
-    m_pBspWin->SetRight( GetCoreValue( *m_pRightMarginEdit, MAP_TWIP ) );
+    m_pBspWin->SetTop( GetCoreValue( *m_pTopMarginEdit, MapUnit::MapTwip ) );
+    m_pBspWin->SetBottom( GetCoreValue( *m_pBottomMarginEdit, MapUnit::MapTwip ) );
+    m_pBspWin->SetLeft( GetCoreValue( *m_pLeftMarginEdit, MapUnit::MapTwip ) );
+    m_pBspWin->SetRight( GetCoreValue( *m_pRightMarginEdit, MapUnit::MapTwip ) );
 
     // Layout
     m_pBspWin->SetUsage( PosToPageUsage_Impl( m_pLayoutBox->GetSelectEntryPos() ) );
@@ -1540,14 +1540,14 @@ IMPL_LINK_NOARG(SvxPageDescPage, RangeHdl_Impl, Control&, void)
 void SvxPageDescPage::CalcMargin_Impl()
 {
     // current values for page margins
-    long nBT = GetCoreValue( *m_pTopMarginEdit, MAP_TWIP );
-    long nBB = GetCoreValue( *m_pBottomMarginEdit, MAP_TWIP );
+    long nBT = GetCoreValue( *m_pTopMarginEdit, MapUnit::MapTwip );
+    long nBB = GetCoreValue( *m_pBottomMarginEdit, MapUnit::MapTwip );
 
-    long nBL = GetCoreValue( *m_pLeftMarginEdit, MAP_TWIP );
-    long nBR = GetCoreValue( *m_pRightMarginEdit, MAP_TWIP );
+    long nBL = GetCoreValue( *m_pLeftMarginEdit, MapUnit::MapTwip );
+    long nBR = GetCoreValue( *m_pRightMarginEdit, MapUnit::MapTwip );
 
-    long nH  = GetCoreValue( *m_pPaperHeightEdit, MAP_TWIP );
-    long nW  = GetCoreValue( *m_pPaperWidthEdit, MAP_TWIP );
+    long nH  = GetCoreValue( *m_pPaperHeightEdit, MapUnit::MapTwip );
+    long nW  = GetCoreValue( *m_pPaperWidthEdit, MapUnit::MapTwip );
 
     long nWidth = nBL + nBR + MINBODY;
     long nHeight = nBT + nBB + MINBODY;
@@ -1560,9 +1560,9 @@ void SvxPageDescPage::CalcMargin_Impl()
             nTmp -= nWidth - nW;
 
             if ( nBL <= nBR )
-                SetMetricValue( *m_pRightMarginEdit, nTmp, MAP_TWIP );
+                SetMetricValue( *m_pRightMarginEdit, nTmp, MapUnit::MapTwip );
             else
-                SetMetricValue( *m_pLeftMarginEdit, nTmp, MAP_TWIP );
+                SetMetricValue( *m_pLeftMarginEdit, nTmp, MapUnit::MapTwip );
         }
 
         if ( nHeight > nH )
@@ -1571,9 +1571,9 @@ void SvxPageDescPage::CalcMargin_Impl()
             nTmp -= nHeight - nH;
 
             if ( nBT <= nBB )
-                SetMetricValue( *m_pBottomMarginEdit, nTmp, MAP_TWIP );
+                SetMetricValue( *m_pBottomMarginEdit, nTmp, MapUnit::MapTwip );
             else
-                SetMetricValue( *m_pTopMarginEdit, nTmp, MAP_TWIP );
+                SetMetricValue( *m_pTopMarginEdit, nTmp, MapUnit::MapTwip );
         }
     }
 }
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 1266cc6..55a080c 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -365,7 +365,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
     if ( bNullTab )
     {
         MapUnit eUnit = (MapUnit)pPool->GetMetric( GetWhich( SID_ATTR_TABSTOP ) );
-        if ( MAP_100TH_MM != eUnit )
+        if ( MapUnit::Map100thMM != eUnit )
         {
 
             // negative first line indent -> set null default tabstob if applicable
@@ -837,7 +837,7 @@ IMPL_LINK( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox&, rBox, void )
             // if the value has been changed at SetMin,
             // it is time for the default
             if ( m_pLineDistAtMetricBox->GetValue() != nTemp )
-                SetMetricValue( *m_pLineDistAtMetricBox, FIX_DIST_DEF, MAP_TWIP ); // fix is only in Writer
+                SetMetricValue( *m_pLineDistAtMetricBox, FIX_DIST_DEF, MapUnit::MapTwip ); // fix is only in Writer
             m_pLineDistAtPercentBox->Hide();
             m_pLineDistAtMetricBox->Show();
             m_pLineDistAtMetricBox->Enable();
@@ -908,7 +908,7 @@ void SvxStdParagraphTabPage::UpdateExample_Impl()
         case LLINESPACE_DURCH:
         case LLINESPACE_FIX:
             m_pExampleWin->SetLineSpace( (SvxPrevLineSpace)nPos,
-                (sal_uInt16)GetCoreValue( *m_pLineDistAtMetricBox, MAP_TWIP ) );
+                (sal_uInt16)GetCoreValue( *m_pLineDistAtMetricBox, MapUnit::MapTwip ) );
             break;
     }
     m_pExampleWin->Invalidate();
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 477ac3b..2394063 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -224,7 +224,7 @@ bool SvxTabulatorTabPage::FillItemSet(SfxItemSet* rSet)
     MapUnit eUnit = (MapUnit)pPool->GetMetric(GetWhich(SID_ATTR_TABSTOP));
     const SfxPoolItem* pOld = GetOldItem(*rSet, SID_ATTR_TABSTOP);
 
-    if (MAP_100TH_MM != eUnit)
+    if (MapUnit::Map100thMM != eUnit)
     {
         // If the ItemSet contains a LRSpaceItem with negative first line indent,
         // the TabStopItem needs to have a DefTab at position 0.
@@ -245,7 +245,7 @@ bool SvxTabulatorTabPage::FillItemSet(SfxItemSet* rSet)
         for (sal_uInt16 i = 0; i < aNewTabs.Count(); ++i)
         {
             SvxTabStop aTmpStop = aNewTabs[i];
-            aTmpStop.GetTabPos() = LogicToLogic(aTmpStop.GetTabPos(), MAP_100TH_MM, eUnit);
+            aTmpStop.GetTabPos() = LogicToLogic(aTmpStop.GetTabPos(), MapUnit::Map100thMM, eUnit);
             aTmp.Insert(aTmpStop);
         }
 
@@ -278,7 +278,7 @@ void SvxTabulatorTabPage::Reset(const SfxItemSet* rSet)
 
     if (pItem)
     {
-        if (MAP_100TH_MM != eUnit)
+        if (MapUnit::Map100thMM != eUnit)
         {
             SvxTabStopItem aTmp(*static_cast<const SvxTabStopItem*>(pItem));
             aNewTabs.Remove(0, aNewTabs.Count());
@@ -286,7 +286,7 @@ void SvxTabulatorTabPage::Reset(const SfxItemSet* rSet)
             for (sal_uInt16 i = 0; i < aTmp.Count(); ++i)
             {
                 SvxTabStop aTmpStop = aTmp[i];
-                aTmpStop.GetTabPos() = LogicToLogic(aTmpStop.GetTabPos(), eUnit, MAP_100TH_MM);
+                aTmpStop.GetTabPos() = LogicToLogic(aTmpStop.GetTabPos(), eUnit, MapUnit::Map100thMM);
                 aNewTabs.Insert(aTmpStop);
             }
         }
@@ -301,7 +301,7 @@ void SvxTabulatorTabPage::Reset(const SfxItemSet* rSet)
     pItem = GetItem(*rSet, SID_ATTR_TABSTOP_DEFAULTS);
 
     if (pItem)
-        nDefDist = LogicToLogic(long(static_cast<const SfxUInt16Item*>(pItem)->GetValue()), eUnit, MAP_100TH_MM);
+        nDefDist = LogicToLogic(long(static_cast<const SfxUInt16Item*>(pItem)->GetValue()), eUnit, MapUnit::Map100thMM);
 
     // Tab pos currently selected
     sal_uInt16 nTabPos = 0;
@@ -373,7 +373,7 @@ void SvxTabulatorTabPage::InitTabPos_Impl( sal_uInt16 nTabPos )
     {
         nOffset = static_cast<const SfxInt32Item*>(pItem)->GetValue();
         MapUnit eUnit = (MapUnit)GetItemSet().GetPool()->GetMetric(GetWhich(SID_ATTR_TABSTOP));
-        nOffset = OutputDevice::LogicToLogic(nOffset, eUnit, MAP_100TH_MM);
+        nOffset = OutputDevice::LogicToLogic(nOffset, eUnit, MapUnit::Map100thMM);
     }
 
     // Correct current TabPos and default tabs
@@ -479,7 +479,7 @@ IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn, void )
     {
         nOffset = static_cast<const SfxInt32Item*>(pItem)->GetValue();
         MapUnit eUnit = (MapUnit)GetItemSet().GetPool()->GetMetric( GetWhich( SID_ATTR_TABSTOP ) );
-        nOffset = OutputDevice::LogicToLogic( nOffset, eUnit, MAP_100TH_MM  );
+        nOffset = OutputDevice::LogicToLogic( nOffset, eUnit, MapUnit::Map100thMM  );
     }
     const long nReal = nVal - nOffset;
     sal_Int32 nSize = m_pTabBox->GetEntryCount();
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index a902267..d89945d 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -137,7 +137,7 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs
     m_pCtlXRectPreview->EnableRTL(false);
 
     // Calculate size of dropdown listboxes
-    Size aSize = LogicToPixel(Size(108, 103), MAP_APPFONT);
+    Size aSize = LogicToPixel(Size(108, 103), MapUnit::MapAppFont);
 
     m_pLbColor->set_width_request(aSize.Width());
     m_pLbColor->set_height_request(aSize.Height());
@@ -151,7 +151,7 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs
     m_pLbBitmap->set_height_request(aSize.Height());
 
     // Calculate size of display boxes
-    Size aSize2 = LogicToPixel(Size(110, 42), MAP_APPFONT);
+    Size aSize2 = LogicToPixel(Size(110, 42), MapUnit::MapAppFont);
     m_pCtlBitmapPreview->set_width_request(aSize2.Width());
     m_pCtlBitmapPreview->set_height_request(aSize2.Height());
     m_pCtlXRectPreview->set_width_request(aSize2.Width());
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 5265f34..55f8ea5 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -298,12 +298,12 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs )
 
     pItem = GetItem( rGeoAttr, SID_ATTR_TRANSFORM_WIDTH );
     m_fObjectWidth = std::max( pItem ? (double)static_cast<const SfxUInt32Item*>(pItem)->GetValue() : 0.0, 1.0 );
-    double fTmpWidth((OutputDevice::LogicToLogic(static_cast<sal_Int32>(m_fObjectWidth),(MapUnit)mePoolUnit, MAP_100TH_MM )) / fUIScale);
+    double fTmpWidth((OutputDevice::LogicToLogic(static_cast<sal_Int32>(m_fObjectWidth), mePoolUnit, MapUnit::Map100thMM )) / fUIScale);
     m_fObjectWidth = fTmpWidth;
 
     pItem = GetItem( rGeoAttr, SID_ATTR_TRANSFORM_HEIGHT );
     m_fObjectHeight = std::max( pItem ? (double)static_cast<const SfxUInt32Item*>(pItem)->GetValue() : 0.0, 1.0 );
-    double fTmpHeight((OutputDevice::LogicToLogic(static_cast<sal_Int32>(m_fObjectHeight),(MapUnit)mePoolUnit, MAP_100TH_MM )) / fUIScale);
+    double fTmpHeight((OutputDevice::LogicToLogic(static_cast<sal_Int32>(m_fObjectHeight), mePoolUnit, MapUnit::Map100thMM )) / fUIScale);
     m_fObjectHeight = fTmpHeight;
 
     XFillBitmapItem aItem( static_cast<const XFillBitmapItem&>(rAttrs->Get(XATTR_FILLBITMAP)) );
@@ -324,8 +324,8 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs )
     {
         BitmapEx aBmpEx(pGraphicObject->GetGraphic().GetBitmapEx());
         Size aTempBitmapSize = aBmpEx.GetSizePixel();
-        rBitmapSize.Width() = ((OutputDevice::LogicToLogic(static_cast<sal_Int32>(aTempBitmapSize.Width()),MAP_PIXEL, MAP_100TH_MM )) / fUIScale);
-        rBitmapSize.Height() = ((OutputDevice::LogicToLogic(static_cast<sal_Int32>(aTempBitmapSize.Height()),MAP_PIXEL, MAP_100TH_MM )) / fUIScale);
+        rBitmapSize.Width() = ((OutputDevice::LogicToLogic(static_cast<sal_Int32>(aTempBitmapSize.Width()),MapUnit::MapPixel, MapUnit::Map100thMM )) / fUIScale);
+        rBitmapSize.Height() = ((OutputDevice::LogicToLogic(static_cast<sal_Int32>(aTempBitmapSize.Height()),MapUnit::MapPixel, MapUnit::Map100thMM )) / fUIScale);
         CalculateBitmapPresetSize();
     }
 
@@ -376,8 +376,8 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs )
 
     if(eRelative != TRISTATE_TRUE)
     {
-        nWidth = (OutputDevice::LogicToLogic(static_cast<long>(nWidth),(MapUnit)mePoolUnit, MAP_100TH_MM )) / fUIScale;
-        nHeight = (OutputDevice::LogicToLogic(static_cast<long>(nHeight),(MapUnit)mePoolUnit, MAP_100TH_MM )) / fUIScale;
+        nWidth = (OutputDevice::LogicToLogic(static_cast<long>(nWidth), mePoolUnit, MapUnit::Map100thMM )) / fUIScale;
+        nHeight = (OutputDevice::LogicToLogic(static_cast<long>(nHeight), mePoolUnit, MapUnit::Map100thMM )) / fUIScale;
     }
 
     if(m_pBitmapStyleLB->GetSelectEntryPos() == 0)
@@ -537,8 +537,8 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyBitmapHdl, ValueSet*, void)
     Size aTempBitmapSize = aBmpEx.GetSizePixel();
     const double fUIScale(double(mpView->GetModel()->GetUIScale()));
 
-    rBitmapSize.Width() = ((OutputDevice::LogicToLogic(static_cast<sal_Int32>(aTempBitmapSize.Width()),MAP_PIXEL, MAP_100TH_MM )) / fUIScale);
-    rBitmapSize.Height() = ((OutputDevice::LogicToLogic(static_cast<sal_Int32>(aTempBitmapSize.Height()),MAP_PIXEL, MAP_100TH_MM )) / fUIScale);
+    rBitmapSize.Width() = ((OutputDevice::LogicToLogic(static_cast<sal_Int32>(aTempBitmapSize.Width()),MapUnit::MapPixel, MapUnit::Map100thMM )) / fUIScale);
+    rBitmapSize.Height() = ((OutputDevice::LogicToLogic(static_cast<sal_Int32>(aTempBitmapSize.Height()),MapUnit::MapPixel, MapUnit::Map100thMM )) / fUIScale);
     CalculateBitmapPresetSize();
     ModifyBitmapStyleHdl( *m_pBitmapStyleLB );
     ModifyBitmapPositionHdl( *m_pPositionLB );
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index d0335f32..36abaf5 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -72,13 +72,13 @@ SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr
 {
     get(m_pSelectPalette, "paletteselector");
     get(m_pValSetColorList, "colorset");
-    Size aSize = LogicToPixel(Size(100 , 120), MAP_APPFONT);
+    Size aSize = LogicToPixel(Size(100 , 120), MapUnit::MapAppFont);
     m_pValSetColorList->set_width_request(aSize.Width());
     m_pValSetColorList->set_height_request(aSize.Height());
     get(m_pValSetRecentList, "recentcolorset");
     get(m_pCtlPreviewOld, "oldpreview");
     get(m_pCtlPreviewNew, "newpreview");
-    aSize = LogicToPixel(Size(34 , 25), MAP_APPFONT);
+    aSize = LogicToPixel(Size(34 , 25), MapUnit::MapAppFont);
     m_pCtlPreviewOld->set_width_request(aSize.Width());
     m_pCtlPreviewOld->set_height_request(aSize.Height());
     m_pCtlPreviewNew->set_width_request(aSize.Width());
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 6b5ade6..43f51a5 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -353,7 +353,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
     if(!pButton->GetPopupMenu()->GetPopupMenu( MN_SYMBOLS ) && m_pSymbolList)
     {
         ScopedVclPtrInstance< VirtualDevice > pVDev;
-        pVDev->SetMapMode(MapMode(MAP_100TH_MM));
+        pVDev->SetMapMode(MapMode(MapUnit::Map100thMM));
         std::unique_ptr<SdrModel> pModel(new SdrModel);
         pModel->GetItemPool().FreezeIdRanges();
         // Page
@@ -498,7 +498,7 @@ void SvxLineTabPage::SymbolSelected(MenuButton* pButton)
     if(pGraphic)
     {
         Size aSize = SvxNumberFormat::GetGraphicSizeMM100(pGraphic);
-        aSize = OutputDevice::LogicToLogic(aSize, MAP_100TH_MM, (MapUnit)m_ePoolUnit);
+        aSize = OutputDevice::LogicToLogic(aSize, MapUnit::Map100thMM, (MapUnit)m_ePoolUnit);
         m_aSymbolGraphic=*pGraphic;
         if( bResetSize )
         {
@@ -1134,7 +1134,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
     else if(nSymType >= 0)
     {
         ScopedVclPtrInstance< VirtualDevice > pVDev;
-        pVDev->SetMapMode(MapMode(MAP_100TH_MM));

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list