[Libreoffice-commits] core.git: 4 commits - basctl/source basic/source chart2/source configure.ac cppcanvas/source cui/source dbaccess/source desktop/source drawinglayer/source editeng/source emfio/source extensions/source filter/source formula/source fpicker/source framework/source include/tools include/vcl oox/source reportdesign/source sc/source sd/source sfx2/source slideshow/source starmath/source svtools/source svx/source sw/source toolkit/source uui/source vcl/source xmlsecurity/source
Michael Stahl
mstahl at redhat.com
Thu Oct 26 21:20:45 UTC 2017
basctl/source/basicide/baside2.cxx | 2
basctl/source/basicide/baside2b.cxx | 2
basctl/source/basicide/moduldl2.cxx | 2
basctl/source/basicide/moduldlg.cxx | 2
basctl/source/basicide/objdlg.cxx | 6 +-
basctl/source/dlged/dlgedobj.cxx | 18 ++++----
basic/source/runtime/inputbox.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 | 2
chart2/source/controller/main/ChartWindow.cxx | 2
chart2/source/controller/main/ElementSelector.cxx | 2
chart2/source/view/main/ChartView.cxx | 2
configure.ac | 2
cppcanvas/source/mtfrenderer/implrenderer.cxx | 2
cui/source/customize/acccfg.cxx | 10 ++--
cui/source/customize/cfg.cxx | 2
cui/source/customize/eventdlg.cxx | 2
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/dialogs/screenshotannotationdlg.cxx | 2
cui/source/options/certpath.cxx | 2
cui/source/options/connpooloptions.cxx | 8 +--
cui/source/options/dbregister.cxx | 2
cui/source/options/fontsubs.cxx | 4 -
cui/source/options/optaboutconfig.cxx | 4 -
cui/source/options/optfltr.cxx | 2
cui/source/options/optjava.cxx | 4 -
cui/source/options/optlingu.cxx | 2
cui/source/options/optpath.cxx | 2
cui/source/options/treeopt.cxx | 2
cui/source/tabpages/autocdlg.cxx | 8 +--
cui/source/tabpages/grfpage.cxx | 2
cui/source/tabpages/labdlg.cxx | 2
cui/source/tabpages/numpages.cxx | 4 -
cui/source/tabpages/page.cxx | 6 +-
cui/source/tabpages/tpcolor.cxx | 4 -
cui/source/tabpages/tpline.cxx | 6 +-
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/WCopyTable.cxx | 10 ++--
dbaccess/source/ui/querydesign/querycontainerwindow.cxx | 2
dbaccess/source/ui/querydesign/querydlg.cxx | 2
dbaccess/source/ui/tabledesign/TableDesignControl.cxx | 2
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 2
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/primitive2d/sceneprimitive2d.cxx | 2
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 4 -
drawinglayer/source/tools/wmfemfhelper.cxx | 2
editeng/source/editeng/eerdll.cxx | 2
editeng/source/editeng/impedit.cxx | 10 ++--
editeng/source/editeng/impedit2.cxx | 2
editeng/source/items/paperinf.cxx | 10 +++-
editeng/source/outliner/outliner.cxx | 4 +
editeng/source/uno/unoviwou.cxx | 6 +-
emfio/source/emfuno/xemfparser.cxx | 2
emfio/source/reader/mtftools.cxx | 4 -
emfio/source/reader/wmfreader.cxx | 2
extensions/source/abpilot/abspilot.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 | 2
extensions/source/scanner/sanedlg.cxx | 12 ++---
filter/source/graphicfilter/egif/egif.cxx | 2
filter/source/graphicfilter/eps/eps.cxx | 2
filter/source/graphicfilter/etiff/etiff.cxx | 2
filter/source/graphicfilter/ieps/ieps.cxx | 16 +++----
filter/source/graphicfilter/ipsd/ipsd.cxx | 2
filter/source/msfilter/escherex.cxx | 6 +-
filter/source/msfilter/msdffimp.cxx | 12 ++---
filter/source/pdf/pdfexport.cxx | 4 -
filter/source/svg/svgexport.cxx | 12 ++---
filter/source/svg/svgfontexport.cxx | 2
filter/source/svg/svgwriter.cxx | 6 +-
formula/source/ui/dlg/formula.cxx | 2
formula/source/ui/dlg/funcpage.cxx | 2
formula/source/ui/dlg/structpg.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/tools/fract.hxx | 9 ++++
include/vcl/mapmod.hxx | 12 +++++
oox/source/drawingml/shape.cxx | 2
reportdesign/source/ui/dlg/Condition.cxx | 2
reportdesign/source/ui/dlg/GroupsSorting.cxx | 2
reportdesign/source/ui/dlg/Navigator.cxx | 2
reportdesign/source/ui/misc/UITools.cxx | 4 -
reportdesign/source/ui/report/ReportWindow.cxx | 2
reportdesign/source/ui/report/ScrollHelper.cxx | 2
sc/source/core/data/documen2.cxx | 4 -
sc/source/core/data/documen8.cxx | 6 +-
sc/source/core/data/documen9.cxx | 2
sc/source/core/data/global.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/xlroot.cxx | 6 +-
sc/source/filter/oox/workbookhelper.cxx | 2
sc/source/filter/xml/xmlimprt.cxx | 2
sc/source/ui/Accessibility/AccessibleText.cxx | 10 ++--
sc/source/ui/app/client.cxx | 2
sc/source/ui/app/inputwin.cxx | 4 -
sc/source/ui/app/transobj.cxx | 2
sc/source/ui/cctrl/cbuttonw.cxx | 2
sc/source/ui/condformat/condformatdlg.cxx | 2
sc/source/ui/condformat/condformatmgr.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/sizedev.cxx | 4 -
sc/source/ui/drawfunc/fuins1.cxx | 4 -
sc/source/ui/drawfunc/fuins2.cxx | 4 -
sc/source/ui/miscdlgs/retypepassdlg.cxx | 2
sc/source/ui/namedlg/namepast.cxx | 2
sc/source/ui/navipi/content.cxx | 2
sc/source/ui/pagedlg/scuitphfedit.cxx | 2
sc/source/ui/pagedlg/tphfedit.cxx | 2
sc/source/ui/sidebar/CellLineStyleValueSet.cxx | 2
sc/source/ui/undo/undostyl.cxx | 2
sc/source/ui/unoobj/styleuno.cxx | 8 +--
sc/source/ui/unoobj/textuno.cxx | 4 -
sc/source/ui/view/drawvie4.cxx | 3 -
sc/source/ui/view/drawview.cxx | 4 -
sc/source/ui/view/gridwin.cxx | 10 ++--
sc/source/ui/view/gridwin4.cxx | 20 ++++-----
sc/source/ui/view/gridwin_dbgutil.cxx | 2
sc/source/ui/view/hintwin.cxx | 2
sc/source/ui/view/preview.cxx | 8 ++-
sc/source/ui/view/printfun.cxx | 8 +--
sc/source/ui/view/tabview.cxx | 2
sc/source/ui/view/tabvwsh4.cxx | 4 -
sc/source/ui/view/tabvwshb.cxx | 2
sc/source/ui/view/viewfun7.cxx | 6 +-
sc/source/ui/view/viewfunc.cxx | 4 -
sc/source/ui/xmlsource/xmlsourcedlg.cxx | 2
sd/source/core/sdpage.cxx | 2
sd/source/filter/eppt/eppt.cxx | 2
sd/source/filter/grf/sdgrffilter.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/app/sdmod.cxx | 2
sd/source/ui/dlg/PaneDockingWindow.cxx | 2
sd/source/ui/dlg/RemoteDialogClientBox.cxx | 2
sd/source/ui/dlg/animobjs.cxx | 4 -
sd/source/ui/dlg/docprev.cxx | 2
sd/source/ui/dlg/headerfooterdlg.cxx | 2
sd/source/ui/dlg/navigatr.cxx | 2
sd/source/ui/dlg/sdpreslt.cxx | 2
sd/source/ui/dlg/vectdlg.cxx | 2
sd/source/ui/func/fuinsert.cxx | 22 +++++-----
sd/source/ui/presenter/PresenterHelper.cxx | 2
sd/source/ui/presenter/PresenterTextView.cxx | 6 +-
sd/source/ui/slideshow/showwin.cxx | 8 +--
sd/source/ui/unoidl/unomodel.cxx | 2
sd/source/ui/unoidl/unopage.cxx | 2
sd/source/ui/view/Outliner.cxx | 2
sd/source/ui/view/ViewShellBase.cxx | 4 -
sd/source/ui/view/sdview.cxx | 4 -
sd/source/ui/view/sdview3.cxx | 12 ++---
sd/source/ui/view/sdview4.cxx | 6 +-
sd/source/ui/view/sdwindow.cxx | 2
sfx2/source/appl/newhelp.cxx | 14 +++---
sfx2/source/dialog/dialoghelper.cxx | 4 -
sfx2/source/dialog/dinfdlg.cxx | 8 +--
sfx2/source/dialog/versdlg.cxx | 4 -
sfx2/source/doc/new.cxx | 4 -
sfx2/source/doc/objembed.cxx | 4 -
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 | 2
starmath/source/accessibility.cxx | 12 ++---
starmath/source/document.cxx | 2
starmath/source/edit.cxx | 2
starmath/source/tmpdevice.cxx | 2
starmath/source/unomodel.cxx | 2
starmath/source/view.cxx | 2
svtools/source/brwbox/brwbox2.cxx | 16 +++----
svtools/source/contnr/fileview.cxx | 2
svtools/source/control/roadmap.cxx | 8 +--
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/exportdialog.cxx | 9 ++--
svtools/source/graphic/descriptor.cxx | 5 +-
svtools/source/graphic/grfmgr.cxx | 6 +-
svtools/source/graphic/provider.cxx | 8 +--
svtools/source/misc/embedhlp.cxx | 2
svtools/source/misc/transfer.cxx | 6 +-
svtools/source/table/tablecontrol_impl.cxx | 10 ++--
svtools/source/uno/svtxgridcontrol.cxx | 4 -
svtools/source/uno/wizard/wizardshell.cxx | 2
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 4 -
svx/source/dialog/ClassificationEditView.cxx | 2
svx/source/dialog/_bmpmask.cxx | 4 -
svx/source/dialog/compressgraphicdialog.cxx | 2
svx/source/dialog/connctrl.cxx | 4 -
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/docrecovery.cxx | 2
svx/source/dialog/frmsel.cxx | 2
svx/source/dialog/imapwnd.cxx | 2
svx/source/dialog/measctrl.cxx | 2
svx/source/dialog/rubydialog.cxx | 2
svx/source/dialog/swframeexample.cxx | 2
svx/source/engine3d/float3d.cxx | 2
svx/source/fmcomp/fmgridcl.cxx | 8 +--
svx/source/fmcomp/fmgridif.cxx | 10 ++--
svx/source/fmcomp/gridctrl.cxx | 2
svx/source/form/datanavi.cxx | 14 +++---
svx/source/form/filtnav.cxx | 6 +-
svx/source/form/fmexpl.cxx | 6 +-
svx/source/gallery2/GalleryControl.cxx | 2
svx/source/gallery2/galbrws1.cxx | 2
svx/source/gallery2/galctrl.cxx | 2
svx/source/gallery2/galobj.cxx | 2
svx/source/sdr/contact/viewcontactofgraphic.cxx | 8 +--
svx/source/sdr/overlay/overlayobjectlist.cxx | 2
svx/source/sdr/primitive2d/sdrattributecreator.cxx | 8 +--
svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx | 4 -
svx/source/sidebar/line/LineWidthValueSet.cxx | 2
svx/source/sidebar/nbdtmg.cxx | 2
svx/source/sidebar/possize/SidebarDialControl.cxx | 2
svx/source/styles/CommonStylePreviewRenderer.cxx | 2
svx/source/svdraw/sdrpagewindow.cxx | 2
svx/source/svdraw/svdmrkv.cxx | 4 -
svx/source/svdraw/svdograf.cxx | 6 +-
svx/source/svdraw/svdomedia.cxx | 2
svx/source/svdraw/svdoole2.cxx | 18 ++++----
svx/source/table/tablecontroller.cxx | 6 +-
svx/source/tbxctrls/bulletsnumbering.cxx | 2
svx/source/tbxctrls/fillctrl.cxx | 2
svx/source/tbxctrls/fontworkgallery.cxx | 2
svx/source/tbxctrls/itemwin.cxx | 12 ++---
svx/source/tbxctrls/lboxctrl.cxx | 2
svx/source/tbxctrls/tbcontrl.cxx | 6 +-
svx/source/tbxctrls/tbunocontroller.cxx | 2
svx/source/unodraw/unoshap4.cxx | 2
svx/source/unodraw/unoshape.cxx | 2
svx/source/xoutdev/_xoutbmp.cxx | 4 -
svx/source/xoutdev/xtabdash.cxx | 2
svx/source/xoutdev/xtabhtch.cxx | 2
sw/source/core/unocore/unoframe.cxx | 6 +-
sw/source/filter/ww8/ww8par3.cxx | 4 -
sw/source/filter/ww8/ww8par4.cxx | 8 +--
sw/source/filter/xml/xmltexti.cxx | 2
sw/source/ui/config/optpage.cxx | 2
sw/source/ui/dbui/addresslistdialog.cxx | 2
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/mmgreetingspage.cxx | 2
sw/source/ui/dbui/mmlayoutpage.cxx | 2
sw/source/ui/dbui/mmoutputtypepage.cxx | 2
sw/source/ui/dbui/selectdbtabledialog.cxx | 2
sw/source/ui/envelp/envlop1.cxx | 2
sw/source/ui/envelp/labfmt.cxx | 2
sw/source/ui/index/cnttab.cxx | 2
sw/source/ui/misc/glosbib.cxx | 2
sw/source/uibase/app/appenv.cxx | 2
sw/source/uibase/dochdl/swdtflvr.cxx | 10 ++--
sw/source/uibase/docvw/srcedtw.cxx | 2
sw/source/uibase/ribbar/workctrl.cxx | 4 -
sw/source/uibase/shells/grfshex.cxx | 4 -
sw/source/uibase/table/chartins.cxx | 2
sw/source/uibase/uiview/srcview.cxx | 4 -
sw/source/uibase/uiview/viewdraw.cxx | 4 -
sw/source/uibase/uiview/viewport.cxx | 2
sw/source/uibase/utlui/content.cxx | 2
sw/source/uibase/utlui/glbltree.cxx | 2
sw/source/uibase/utlui/shdwcrsr.cxx | 2
sw/source/uibase/wrtsh/wrtsh1.cxx | 4 -
toolkit/source/controls/dialogcontrol.cxx | 2
toolkit/source/controls/tabpagemodel.cxx | 2
uui/source/fltdlg.cxx | 2
vcl/source/app/settings.cxx | 2
vcl/source/control/button.cxx | 4 -
vcl/source/control/listctrl.cxx | 2
vcl/source/control/morebtn.cxx | 2
vcl/source/filter/graphicfilter.cxx | 8 +--
vcl/source/filter/igif/gifread.cxx | 2
vcl/source/filter/jpeg/JpegReader.cxx | 2
vcl/source/filter/wmf/emfwr.cxx | 2
vcl/source/gdi/dibtools.cxx | 2
vcl/source/gdi/gdimetafiletools.cxx | 8 +--
vcl/source/gdi/gdimtf.cxx | 2
vcl/source/gdi/graph.cxx | 3 -
vcl/source/gdi/pdfwriter_impl.cxx | 2
vcl/source/gdi/pdfwriter_impl2.cxx | 4 -
vcl/source/gdi/pngread.cxx | 2
vcl/source/gdi/pngwrite.cxx | 2
vcl/source/gdi/print.cxx | 6 +-
vcl/source/gdi/print3.cxx | 2
vcl/source/gdi/textlayout.cxx | 4 -
vcl/source/gdi/vectorgraphicdata.cxx | 2
vcl/source/outdev/bitmap.cxx | 2
vcl/source/window/printdlg.cxx | 8 +--
vcl/source/window/split.cxx | 2
xmlsecurity/source/dialogs/certificatechooser.cxx | 2
xmlsecurity/source/dialogs/certificateviewer.cxx | 2
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 2
341 files changed, 690 insertions(+), 657 deletions(-)
New commits:
commit 11d2f3d6e1b6c9baf43d8521293c53525108436d
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Oct 26 23:15:06 2017 +0200
vcl: make MapMode constructor explicit
Insert constructor everywhere, except a couple places that apparently
want to compare GetMapUnit().
Change-Id: I1910deb60562e5e949203435e827057f70a3f988
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index c8846b413615..e77e86dd1759 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -799,7 +799,7 @@ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter, sal_Int32 nPrintPage )
aFont.SetTransparent( true );
aFont.SetFontSize( Size( 0, 360 ) );
pPrinter->SetFont( aFont );
- pPrinter->SetMapMode( MapUnit::Map100thMM );
+ pPrinter->SetMapMode(MapMode(MapUnit::Map100thMM));
OUString aTitle( CreateQualifiedName() );
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 877b8a9e26ef..34b3c62126af 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1554,7 +1554,7 @@ WatchWindow::WatchWindow (Layout* pParent)
{
aXEdit->SetAccessibleName(IDEResId(RID_STR_WATCHNAME));
aXEdit->SetHelpId(HID_BASICIDE_WATCHWINDOW_EDIT);
- aXEdit->SetSizePixel(aXEdit->LogicToPixel(Size(80, 12), MapUnit::MapAppFont));
+ aXEdit->SetSizePixel(aXEdit->LogicToPixel(Size(80, 12), MapMode(MapUnit::MapAppFont)));
aTreeListBox->SetAccessibleName(IDEResId(RID_STR_WATCHNAME));
long nTextLen = GetTextWidth( aWatchStr ) + DWBORDER + 3;
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index f2a7aa054833..827474abfbce 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -474,7 +474,7 @@ LibPage::LibPage(vcl::Window * pParent)
{
get(m_pBasicsBox, "location");
get(m_pLibBox, "library");
- Size aSize(m_pLibBox->LogicToPixel(Size(130, 87), MapUnit::MapAppFont));
+ Size aSize(m_pLibBox->LogicToPixel(Size(130, 87), MapMode(MapUnit::MapAppFont)));
m_pLibBox->set_height_request(aSize.Height());
m_pLibBox->set_width_request(aSize.Width());
get(m_pEditButton, "edit");
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index dd5b4697f135..91a90c608d5f 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -550,7 +550,7 @@ ObjectPage::ObjectPage(vcl::Window *pParent, const OString &rName, BrowseMode nM
".ui")
{
get(m_pBasicBox, "library");
- Size aSize(m_pBasicBox->LogicToPixel(Size(130, 117), MapUnit::MapAppFont));
+ Size aSize(m_pBasicBox->LogicToPixel(Size(130, 117), MapMode(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 a20f8e3a0a45..16389cadc51f 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), MapUnit::MapAppFont);
+ Size aTitleSize = LogicToPixel(Size(3, 10), MapMode(MapUnit::MapAppFont));
aTitleSize.Width() = aSize.Width() - 2*aTitleSize.Width();
- aTitle->SetPosPixel(LogicToPixel(Point(3, 3), MapUnit::MapAppFont));
+ aTitle->SetPosPixel(LogicToPixel(Point(3, 3), MapMode(MapUnit::MapAppFont)));
aTitle->SetSizePixel(aTitleSize);
aTitle->Show();
}
// tree
- Point const aTreePos = LogicToPixel(Point(3, bFloating ? 3 : 16), MapUnit::MapAppFont);
+ Point const aTreePos = LogicToPixel(Point(3, bFloating ? 3 : 16), MapMode(MapUnit::MapAppFont));
long const nMargin = aTreePos.X();
Size const aTreeSize(
aSize.Width() - 2*nMargin,
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 2590dc74362f..f61986d62592 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -158,8 +158,8 @@ bool DlgEdObj::TransformSdrToControlCoordinates(
}
// convert pixel to logic units
- aPos = pDevice->PixelToLogic( aPos, MapUnit::MapAppFont );
- aSize = pDevice->PixelToLogic( aSize, MapUnit::MapAppFont );
+ aPos = pDevice->PixelToLogic(aPos, MapMode(MapUnit::MapAppFont));
+ aSize = pDevice->PixelToLogic(aSize, MapMode(MapUnit::MapAppFont));
// set out parameters
nXOut = aPos.Width();
@@ -205,8 +205,8 @@ bool DlgEdObj::TransformSdrToFormCoordinates(
aSize.Height() -= aDeviceInfo.TopInset + aDeviceInfo.BottomInset;
}
// convert pixel to logic units
- aPos = pDevice->PixelToLogic( aPos, MapUnit::MapAppFont );
- aSize = pDevice->PixelToLogic( aSize, MapUnit::MapAppFont );
+ aPos = pDevice->PixelToLogic(aPos, MapMode(MapUnit::MapAppFont));
+ aSize = pDevice->PixelToLogic(aSize, MapMode(MapUnit::MapAppFont));
// set out parameters
nXOut = aPos.Width();
@@ -246,9 +246,9 @@ bool DlgEdObj::TransformControlToSdrCoordinates(
DBG_ASSERT( pDevice, "DlgEdObj::TransformControlToSdrCoordinates: missing default device!" );
if ( !pDevice )
return false;
- aPos = pDevice->LogicToPixel( aPos, MapUnit::MapAppFont );
- aSize = pDevice->LogicToPixel( aSize, MapUnit::MapAppFont );
- aFormPos = pDevice->LogicToPixel( aFormPos, MapUnit::MapAppFont );
+ aPos = pDevice->LogicToPixel(aPos, MapMode(MapUnit::MapAppFont));
+ aSize = pDevice->LogicToPixel(aSize, MapMode(MapUnit::MapAppFont));
+ aFormPos = pDevice->LogicToPixel(aFormPos, MapMode(MapUnit::MapAppFont));
// add form position
aPos.Width() += aFormPos.Width();
@@ -296,8 +296,8 @@ bool DlgEdObj::TransformFormToSdrCoordinates(
if ( !lcl_getDlgEdForm( this, pForm ) )
return false;
- aPos = pDevice->LogicToPixel( aPos, MapUnit::MapAppFont );
- aSize = pDevice->LogicToPixel( aSize, MapUnit::MapAppFont );
+ aPos = pDevice->LogicToPixel(aPos, MapMode(MapUnit::MapAppFont));
+ aSize = pDevice->LogicToPixel(aSize, MapMode(MapUnit::MapAppFont));
// take window borders into account
Reference< beans::XPropertySet > xPSetForm( pForm->GetUnoControlModel(), UNO_QUERY );
diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index 7f7730728649..1d0e4e335e3c 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -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, MapUnit::MapTwip ) );
+ SetPosPixel(LogicToPixel(aDlgPosApp, MapMode(MapUnit::MapTwip)));
}
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index f5205d1691a6..5aa508d93ed0 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -388,7 +388,7 @@ void lcl_correctSymbolSizeForBitmaps( chart2::Symbol& rSymbol )
if( xProp->getPropertyValue( "SizePixel" ) >>= aAWTPixelSize )
{
Size aPixelSize(aAWTPixelSize.Width,aAWTPixelSize.Height);
- Size aNewSize = ( OutputDevice::LogicToLogic( aPixelSize, MapUnit::MapPixel, MapUnit::Map100thMM ));
+ Size aNewSize = OutputDevice::LogicToLogic(aPixelSize, MapMode(MapUnit::MapPixel), MapMode(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 e1978f0e44e3..02b2856d1ae1 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, MapUnit::MapAppFont );
+ aSize = m_pDevice->LogicToPixel(aSize, MapMode(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, MapUnit::MapAppFont );
+ aSize = m_pDevice->LogicToPixel(aSize, MapMode(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, MapUnit::MapAppFont );
+ aSize = m_pDevice->LogicToPixel(aSize, MapMode(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, MapUnit::MapAppFont );
+ aSize = m_pDevice->LogicToPixel(aSize, MapMode(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, MapUnit::MapAppFont );
+ aSize = m_pDevice->LogicToPixel(aSize, MapMode(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 ), MapUnit::MapAppFont ).getWidth());
+ SetWidth( m_pDevice->PixelToLogic(Size(nWidth, 0), MapMode(MapUnit::MapAppFont)).getWidth());
}
void SeriesHeader::SetChartType(
@@ -578,7 +578,7 @@ void DataBrowser::RenewTable()
OUString aDefaultSeriesName(SchResId(STR_COLUMN_LABEL));
replaceParamterInString( aDefaultSeriesName, "%COLUMNNUMBER", OUString::number( 24 ) );
sal_Int32 nColumnWidth = GetDataWindow().GetTextWidth( aDefaultSeriesName )
- + GetDataWindow().LogicToPixel( Point( 4 + impl::SeriesHeader::GetRelativeAppFontXPosForNameField(), 0 ), MapUnit::MapAppFont ).X();
+ + GetDataWindow().LogicToPixel(Point(4 + impl::SeriesHeader::GetRelativeAppFontXPosForNameField(), 0), MapMode(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 4eeeb775da4e..83531433d1f7 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -72,8 +72,8 @@ CreationWizard::CreationWizard(vcl::Window* pParent, const uno::Reference<frame:
SetRoadmapHelpId(HID_SCH_WIZARD_ROADMAP);
SetRoadmapInteractive(true);
- Size aAdditionalRoadmapSize(LogicToPixel(Size(85, 0), MapUnit::MapAppFont));
- Size aSize(LogicToPixel(Size(CHART_WIZARD_PAGEWIDTH, CHART_WIZARD_PAGEHEIGHT), MapUnit::MapAppFont));
+ Size aAdditionalRoadmapSize(LogicToPixel(Size(85, 0), MapMode(MapUnit::MapAppFont)));
+ Size aSize(LogicToPixel(Size(CHART_WIZARD_PAGEWIDTH, CHART_WIZARD_PAGEHEIGHT), MapMode(MapUnit::MapAppFont)));
aSize.Width() += aAdditionalRoadmapSize.Width();
SetSizePixel(aSize);
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index a7ac832c2e4e..9392444e8494 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), MapUnit::MapAppFont));
+ Size aSize(m_xBrwData->LogicToPixel(Size(232, 121), MapMode(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 a393aaba1eb9..acaae5c1f7a4 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -679,7 +679,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), MapUnit::MapAppFont));
+ Size aSize(m_pSubTypeList->LogicToPixel(Size(150, 50), MapMode(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 6d3f05666fce..f7e28f69a8b6 100644
--- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
@@ -177,7 +177,7 @@ Graphic ViewElementListProvider::GetSymbolGraphic( sal_Int32 nStandardSymbol, co
Graphic aGraph(aMeta);
Size aSize = pObj->GetSnapRect().GetSize();
aGraph.SetPrefSize(aSize);
- aGraph.SetPrefMapMode(MapUnit::Map100thMM);
+ aGraph.SetPrefMapMode(MapMode(MapUnit::Map100thMM));
pView->UnmarkAll();
pObj=pPage->RemoveObject(0);
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index 4dccd6ebaf29..8949e8dbc58a 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -332,7 +332,7 @@ void ChartWindow::LogicInvalidate(const tools::Rectangle* pRectangle)
if (IsMapModeEnabled())
{
if (GetMapMode().GetMapUnit() == MapUnit::Map100thMM)
- aRectangle = OutputDevice::LogicToLogic(aRectangle, MapUnit::Map100thMM, MapUnit::MapTwip);
+ aRectangle = OutputDevice::LogicToLogic(aRectangle, MapMode(MapUnit::Map100thMM), MapMode(MapUnit::MapTwip));
}
else
{
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index 4af2f3d54e2e..4f660cf8cb8b 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -301,7 +301,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, MapUnit::MapAppFont );
+ ::Size aPixelSize = m_apSelectorListBox->LogicToPixel(aLogicalSize, MapMode(MapUnit::MapAppFont));
m_apSelectorListBox->SetSizePixel( aPixelSize );
m_apSelectorListBox->SetDropDownLineCount( 5 );
}
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 35f4751f397c..e13d6b9cbc56 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -3388,7 +3388,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::Map100thMM );
+ Size aSize = pWindow->LogicToPixel(Size(aPageSize.Width, aPageSize.Height), MapMode(MapUnit::Map100thMM));
pWindow->SetSizePixel(aSize);
}
pWindow->Show();
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index d7a8850b2883..6804b121fd7f 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -805,7 +805,7 @@ namespace cppcanvas
rFontSizeLog = ::Size(0, 16);
// convert to target MapUnit if not pixels
- rFontSizeLog = OutputDevice::LogicToLogic(rFontSizeLog, MapUnit::MapPixel, rParms.mrVDev.GetMapMode());
+ rFontSizeLog = OutputDevice::LogicToLogic(rFontSizeLog, MapMode(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 b314af956459..bf1635051f98 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -742,20 +742,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), MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(Size(174, 100), MapMode(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), MapUnit::MapAppFont);
+ aSize = LogicToPixel(Size(78 , 91), MapMode(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), MapUnit::MapAppFont);
+ aSize = LogicToPixel(Size(88, 91), MapMode(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), MapUnit::MapAppFont);
+ aSize = LogicToPixel(Size(80, 91), MapMode(MapUnit::MapAppFont));
m_pKeyBox->set_width_request(aSize.Width());
m_pKeyBox->set_height_request(aSize.Height());
get(m_pSearchEdit, "searchEntry");
@@ -795,7 +795,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( vcl::Window* pParent, const
nMaxWidth = nTmp;
}
// recalc second tab
- long nNewTab = PixelToLogic( Size( nMaxWidth, 0 ), MapUnit::MapAppFont ).Width();
+ long nNewTab = PixelToLogic(Size(nMaxWidth, 0), MapMode(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 d1ba1b61f5a5..d6aa0b1eabab 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1168,7 +1168,7 @@ SvxConfigPage::SvxConfigPage(vcl::Window *pParent, const SfxItemSet& rSet)
get(m_pDescriptionField, "desc");
m_pDescriptionField->set_height_request(m_pDescriptionField->GetTextHeight()*2.9);
get(m_pEntries, "entries");
- Size aSize(LogicToPixel(Size(108, 115), MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(Size(108, 115), MapMode(MapUnit::MapAppFont)));
m_pEntries->set_height_request(aSize.Height());
m_pEntries->set_width_request(aSize.Width());
m_pFunctions->set_height_request(aSize.Height());
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 02b8961e033d..d96325931e71 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -63,7 +63,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), MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(Size(205, 229), MapMode(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/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index a86acf2a5405..a81b3ede251a 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -183,7 +183,7 @@ SpellDialog::SpellDialog(SpellDialogChildWindow* pChildWindow,
get(m_pExplainLink, "explainlink");
get(m_pNotInDictFT, "notindictft");
get(m_pSentenceED, "sentence");
- Size aEdSize(LogicToPixel(Size(197, 48), MapUnit::MapAppFont));
+ Size aEdSize(LogicToPixel(Size(197, 48), MapMode(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 5546573e0645..2d9d0c4e53ed 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -259,7 +259,7 @@ VCL_BUILDER_FACTORY_CONSTRUCTOR(ColorFieldControl, 0)
Size ColorFieldControl::GetOptimalSize() const
{
- return LogicToPixel(Size(158, 158), MapUnit::MapAppFont);
+ return LogicToPixel(Size(158, 158), MapMode(MapUnit::MapAppFont));
}
void ColorFieldControl::UpdateBitmap()
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 5685b48d333a..edd5e8ac8fe6 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -718,7 +718,7 @@ TPGalleryThemeProperties::TPGalleryThemeProperties( vcl::Window* pWindow, const
{
get(m_pCbbFileType, "filetype");
get(m_pLbxFound, "files");
- Size aSize(LogicToPixel(Size(172, 156), MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(Size(172, 156), MapMode(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 5ad65ac327ba..4c1d3fcf6cc9 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -41,7 +41,7 @@ VCL_BUILDER_FACTORY_CONSTRUCTOR(GraphicPreviewWindow, WB_TABSTOP)
Size GraphicPreviewWindow::GetOptimalSize() const
{
- return LogicToPixel(Size(81, 73), MapUnit::MapAppFont);
+ return LogicToPixel(Size(81, 73), MapMode(MapUnit::MapAppFont));
}
@@ -525,7 +525,7 @@ void EmbossControl::MouseButtonDown( const MouseEvent& rEvt )
Size EmbossControl::GetOptimalSize() const
{
- return LogicToPixel(Size(77, 60), MapUnit::MapAppFont);
+ return LogicToPixel(Size(77, 60), MapMode(MapUnit::MapAppFont));
}
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 579181dcea5f..0af200e7a955 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -89,7 +89,7 @@ VCL_BUILDER_FACTORY_CONSTRUCTOR(SvxHlmarkTreeLBox, WB_TABSTOP)
Size SvxHlmarkTreeLBox::GetOptimalSize() const
{
- return LogicToPixel(Size(103, 162), MapUnit::MapAppFont);
+ return LogicToPixel(Size(103, 162), MapMode(MapUnit::MapAppFont));
}
void SvxHlmarkTreeLBox::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect)
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 4a5538922c95..86a2963014dd 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), MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(Size(257, 87), MapMode(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), MapUnit::MapAppFont).Width());
+ pFtFiles->set_width_request(LogicToPixel(Size(nTabs[2] - nTabs[1] - 2, 0), MapMode(MapUnit::MapAppFont)).Width());
FixedText *pFtLinks = get<FixedText>("LINKS");
- pFtLinks->set_width_request(LogicToPixel(Size(nTabs[3] - nTabs[2] - 2, 0), MapUnit::MapAppFont).Width());
+ pFtLinks->set_width_request(LogicToPixel(Size(nTabs[3] - nTabs[2] - 2, 0), MapMode(MapUnit::MapAppFont)).Width());
FixedText *pFtTypes = get<FixedText>("TYPE");
- pFtTypes->set_width_request(LogicToPixel(Size(nTabs[4] - nTabs[3] - 2, 0), MapUnit::MapAppFont).Width());
+ pFtTypes->set_width_request(LogicToPixel(Size(nTabs[4] - nTabs[3] - 2, 0), MapMode(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 69ecf270d382..e52bdd06b11b 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), MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(Size(195, 77), MapMode(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), MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(Size(189, 80), MapMode(MapUnit::MapAppFont)));
m_pPathLB->set_width_request(aSize.Width());
m_pPathLB->set_height_request(aSize.Height());
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx
index e75957c1848b..49ffbc98e2ca 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -265,7 +265,7 @@ ScreenshotAnnotationDlg_Impl::ScreenshotAnnotationDlg_Impl(
mpText->set_width_request(400);
mpText->set_height_request( mpText->GetTextHeight() * 10 );
OUString aHelpId = OStringToOUString( mrParentDialog.GetHelpId(), RTL_TEXTENCODING_UTF8 );
- Size aSizeCm = mrParentDialog.PixelToLogic( maParentDialogSize, MapUnit::MapCM );
+ Size aSizeCm = mrParentDialog.PixelToLogic(maParentDialogSize, MapMode(MapUnit::MapCM));
maMainMarkupText = lcl_ParagraphWithImage( aHelpId, aSizeCm );
mpText->SetText( maMainMarkupText );
mpText->SetReadOnly();
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 3cd712174f75..cc2e6b99dad6 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -29,7 +29,7 @@ CertPathDialog::CertPathDialog(vcl::Window* pParent)
get(m_pOKBtn, "ok");
get(m_pAddBtn, "add");
get(m_pCertPathListContainer, "paths");
- Size aSize(LogicToPixel(Size(210, 60), MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(Size(210, 60), MapMode(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 5e5da2593100..2b6767ff90c0 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), MapUnit::MapAppFont);
+ Size aColWidth = LogicToPixel(Size(160, 0), MapMode(MapUnit::MapAppFont));
InsertDataColumn(1, CuiResId(RID_SVXSTR_DRIVER_NAME), aColWidth.Width());
- aColWidth = LogicToPixel(Size(30, 0), MapUnit::MapAppFont);
+ aColWidth = LogicToPixel(Size(30, 0), MapMode(MapUnit::MapAppFont));
InsertDataColumn(2, CuiResId(RID_SVXSTR_POOLED_FLAG), aColWidth.Width());
- aColWidth = LogicToPixel(Size(60, 0), MapUnit::MapAppFont);
+ aColWidth = LogicToPixel(Size(60, 0), MapMode(MapUnit::MapAppFont));
InsertDataColumn(3, CuiResId(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, MapUnit::MapAppFont);
+ aControlSize = LogicToPixel(aControlSize, MapMode(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 fc02372cdd48..4c334d9bcbe2 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -111,7 +111,7 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons
{
get(m_pPathCtrl, "pathctrl");
Size aControlSize(248, 147);
- aControlSize = LogicToPixel(aControlSize, MapUnit::MapAppFont);
+ aControlSize = LogicToPixel(aControlSize, MapMode(MapUnit::MapAppFont));
m_pPathCtrl->set_width_request(aControlSize.Width());
m_pPathCtrl->set_height_request(aControlSize.Height());
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index eb67957b9588..b7ceda7a8576 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -57,7 +57,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( vcl::Window* pParent,
SvSimpleTableContainer *pCheckLBContainer = get<SvSimpleTableContainer>("checklb");
Size aControlSize(248, 75);
- aControlSize = LogicToPixel(aControlSize, MapUnit::MapAppFont);
+ aControlSize = LogicToPixel(aControlSize, MapMode(MapUnit::MapAppFont));
pCheckLBContainer->set_width_request(aControlSize.Width());
pCheckLBContainer->set_height_request(aControlSize.Height());
@@ -418,7 +418,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), MapUnit::MapAppFont).Width();
+ long nMin = rBar.LogicToPixel(Size(10, 0), MapMode(MapUnit::MapAppFont)).Width();
nMax = std::max( nMax, nMin );
const long nDoubleMax = 2*nMax;
const long nRest = GetSizePixel().Width() - nDoubleMax;
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index df500a2c28b8..ca6ca3673353 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()), MapUnit::MapAppFont);
+ return LogicToPixel(Size(150, GetTextHeight()), MapMode(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), MapUnit::MapAppFont));
+ Size aControlSize(LogicToPixel(Size(385, 230), MapMode(MapUnit::MapAppFont)));
m_pPrefCtrl->set_width_request(aControlSize.Width());
m_pPrefCtrl->set_height_request(aControlSize.Height());
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 478aacb4bd89..d1fd93342264 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -157,7 +157,7 @@ OfaMSFilterTabPage2::OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet
get( aShadingRB, "shading" );
Size aControlSize(248, 55);
- aControlSize = LogicToPixel(aControlSize, MapUnit::MapAppFont);
+ aControlSize = LogicToPixel(aControlSize, MapMode(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 b226fc143739..b3443d7734c4 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -83,7 +83,7 @@ public:
if (rBar.GetItemCount() < 4)
return;
long nCheckWidth = std::max(GetControlColumnWidth() + 12,
- rBar.LogicToPixel(Size(15, 0), MapUnit::MapAppFont).Width());
+ rBar.LogicToPixel(Size(15, 0), MapMode(MapUnit::MapAppFont)).Width());
long nVersionWidth = 12 +
std::max(rBar.GetTextWidth(rBar.GetItemText(3)),
GetTextWidth("0.0.0_00-icedtea"));
@@ -131,7 +131,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet&
SvSimpleTableContainer *pJavaListContainer = get<SvSimpleTableContainer>("javas");
Size aControlSize(177, 60);
- aControlSize = LogicToPixel(aControlSize, MapUnit::MapAppFont);
+ aControlSize = LogicToPixel(aControlSize, MapMode(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 e02914813903..b8b80d3000ac 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1758,7 +1758,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), MapUnit::MapAppFont));
+ Size aListSize(m_pModulesCLB->LogicToPixel(Size(166, 120), MapMode(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 ffe3d530f9c8..6651c2d22dff 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, MapUnit::MapAppFont);
+ aControlSize = LogicToPixel(aControlSize, MapMode(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;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 07f469b2b307..898453f300bd 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -488,7 +488,7 @@ void OfaTreeOptionsDialog::InitWidgets()
get(pBackPB, "revert");
get(pTreeLB, "pages");
get(pTabBox, "box");
- Size aSize(pTabBox->LogicToPixel(Size(278, 259), MapUnit::MapAppFont));
+ Size aSize(pTabBox->LogicToPixel(Size(278, 259), MapMode(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/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 9b356317e54a..8292c7c27120 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, MapUnit::MapAppFont);
+ aControlSize = LogicToPixel(aControlSize, MapMode(MapUnit::MapAppFont));
pCheckLBContainer->set_width_request(aControlSize.Width());
pCheckLBContainer->set_height_request(aControlSize.Height());
m_pCheckLB = VclPtr<OfaACorrCheckListBox>::Create(*pCheckLBContainer);
@@ -1819,7 +1819,7 @@ OfaQuoteTabPage::OfaQuoteTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
SvSimpleTableContainer *pListContainer = get<SvSimpleTableContainer>("list");
Size aControlSize(252 , 85);
- aControlSize = LogicToPixel(aControlSize, MapUnit::MapAppFont);
+ aControlSize = LogicToPixel(aControlSize, MapMode(MapUnit::MapAppFont));
pListContainer->set_width_request(aControlSize.Width());
pListContainer->set_height_request(aControlSize.Height());
m_pSwCheckLB = VclPtr<OfaACorrCheckListBox>::Create(*pListContainer);
@@ -2186,7 +2186,7 @@ OfaAutoCompleteTabPage::OfaAutoCompleteTabPage(vcl::Window* pParent,
get(m_pNFMaxEntries, "maxentries");
get(m_pLBEntries, "entries");
m_pLBEntries->SetPage(this);
- aSize = LogicToPixel(Size(121, 158), MapUnit::MapAppFont);
+ aSize = LogicToPixel(Size(121, 158), MapMode(MapUnit::MapAppFont));
m_pLBEntries->set_width_request(aSize.Width());
m_pLBEntries->set_height_request(aSize.Height());
get(m_pPBEntries, "delete");
@@ -2464,7 +2464,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), MapUnit::MapAppFont));
+ Size aControlSize(LogicToPixel(Size(172, 154), MapMode(MapUnit::MapAppFont)));
m_pSmartTagTypesLB->set_width_request(aControlSize.Width());
m_pSmartTagTypesLB->set_height_request(aControlSize.Height());
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 3661f5b74de4..6009f92f9749 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -771,7 +771,7 @@ SvxCropExample::SvxCropExample( vcl::Window* pPar, WinBits nStyle )
Size SvxCropExample::GetOptimalSize() const
{
- return LogicToPixel(Size(78, 78), MapUnit::MapAppFont);
+ return LogicToPixel(Size(78, 78), MapMode(MapUnit::MapAppFont));
}
VCL_BUILDER_FACTORY_CONSTRUCTOR(SvxCropExample, 0)
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index dfc7e0f74342..f16c4c81b4e4 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -86,7 +86,7 @@ SvxCaptionTabPage::SvxCaptionTabPage(vcl::Window* pParent, const SfxItemSet& rIn
{
get(m_pCT_CAPTTYPE, "valueset");
- Size aSize(m_pCT_CAPTTYPE->LogicToPixel(Size(187, 38), MapUnit::MapAppFont));
+ Size aSize(m_pCT_CAPTTYPE->LogicToPixel(Size(187, 38), MapMode(MapUnit::MapAppFont)));
m_pCT_CAPTTYPE->set_width_request(aSize.Width());
m_pCT_CAPTTYPE->set_height_request(aSize.Height());
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index ad8078fe6602..bfed9705b462 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -963,7 +963,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, MapUnit::Map100thMM, eCoreUnit);
+ aSize = OutputDevice::LogicToLogic(aSize, MapMode(MapUnit::Map100thMM), MapMode(eCoreUnit));
SvxBrushItem aBrush(aGraphic, GPOS_AREA, SID_ATTR_BRUSH );
aFmt.SetGraphicBrush( &aBrush, &aSize, &eOrient );
}
@@ -1980,7 +1980,7 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton, void )
}
if(bSucc)
{
- aSize = OutputDevice::LogicToLogic(aSize, MapUnit::Map100thMM, eCoreUnit);
+ aSize = OutputDevice::LogicToLogic(aSize, MapMode(MapUnit::Map100thMM), MapMode(eCoreUnit));
sal_uInt16 nMask = 1;
for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 90612b428267..4e895fa09ff7 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -264,7 +264,7 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr
}
MapMode aOldMode = mpDefPrinter->GetMapMode();
- mpDefPrinter->SetMapMode( MapUnit::MapTwip );
+ mpDefPrinter->SetMapMode(MapMode(MapUnit::MapTwip));
// set first- and last-values for the margins
Size aPaperSize = mpDefPrinter->GetPaperSize();
@@ -509,7 +509,7 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet )
m_pBspWin->SetSize( Size( ConvertLong_Impl( aPaperSize.Width(), eUnit ),
ConvertLong_Impl( aPaperSize.Height(), eUnit ) ) );
- aPaperSize = OutputDevice::LogicToLogic(aPaperSize, eUnit, MapUnit::Map100thMM);
+ aPaperSize = OutputDevice::LogicToLogic(aPaperSize, MapMode(eUnit), MapMode(MapUnit::Map100thMM));
if ( bLandscape )
Swap( aPaperSize );
@@ -1039,7 +1039,7 @@ void SvxPageDescPage::SwapFirstValues_Impl( bool bSet )
eOri = Orientation::Landscape;
Orientation eOldOri = mpDefPrinter->GetOrientation();
mpDefPrinter->SetOrientation( eOri );
- mpDefPrinter->SetMapMode( MapUnit::MapTwip );
+ mpDefPrinter->SetMapMode(MapMode(MapUnit::MapTwip));
// set first- and last-values for margins
Size aPaperSize = mpDefPrinter->GetPaperSize();
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 1b4b88ea6da3..8b43dd6830bc 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -68,13 +68,13 @@ SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr
{
get(m_pSelectPalette, "paletteselector");
get(m_pValSetColorList, "colorset");
- Size aSize = LogicToPixel(Size(100 , 120), MapUnit::MapAppFont);
+ Size aSize = LogicToPixel(Size(100 , 120), MapMode(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), MapUnit::MapAppFont);
+ aSize = LogicToPixel(Size(34 , 25), MapMode(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 cf23d73813dc..7c238dfeeba6 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -485,7 +485,7 @@ void SvxLineTabPage::SymbolSelected(MenuButton const * pButton)
if(pGraphic)
{
Size aSize = SvxNumberFormat::GetGraphicSizeMM100(pGraphic);
- aSize = OutputDevice::LogicToLogic(aSize, MapUnit::Map100thMM, m_ePoolUnit);
+ aSize = OutputDevice::LogicToLogic(aSize, MapMode(MapUnit::Map100thMM), MapMode(m_ePoolUnit));
m_aSymbolGraphic=*pGraphic;
if( bResetSize )
{
@@ -1158,7 +1158,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
m_aSymbolGraphic=Graphic(aMeta);
m_aSymbolSize=pObj->GetSnapRect().GetSize();
m_aSymbolGraphic.SetPrefSize(pInvisibleSquare->GetSnapRect().GetSize());
- m_aSymbolGraphic.SetPrefMapMode(MapUnit::Map100thMM);
+ m_aSymbolGraphic.SetPrefMapMode(MapMode(MapUnit::Map100thMM));
bPrevSym=true;
bEnable=true;
bIgnoreGraphic=true;
@@ -1186,7 +1186,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
{
m_aSymbolSize=OutputDevice::LogicToLogic( pGraphic->GetPrefSize(),
pGraphic->GetPrefMapMode(),
- MapUnit::Map100thMM );
+ MapMode(MapUnit::Map100thMM));
}
bPrevSym=true;
}
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index 6dcd3c1f75b4..7fffb394e49b 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -140,7 +140,7 @@ namespace dbmm
declarePath( PATH_DEFAULT, {STATE_CLOSE_SUB_DOCS, STATE_BACKUP_DBDOC, STATE_MIGRATE, STATE_SUMMARY} );
- SetPageSizePixel( LogicToPixel( ::Size( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT ), MapUnit::MapAppFont ) );
+ SetPageSizePixel(LogicToPixel(::Size(TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT), MapMode(MapUnit::MapAppFont)));
SetRoadmapInteractive( true );
enableAutomaticNextButtonState();
defaultButton( WizardButtonFlags::NEXT );
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 0dc91616ec29..915321866cb8 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -926,7 +926,7 @@ void OAppDetailPageHelper::Resize()
vcl::Window* pWindow = getCurrentView();
if ( pWindow )
{
- Size aFLSize = LogicToPixel( Size( 2, 6 ), MapUnit::MapAppFont );
+ Size aFLSize = LogicToPixel(Size(2, 6), MapMode(MapUnit::MapAppFont));
sal_Int32 n6PPT = aFLSize.Height();
long nHalfOutputWidth = static_cast<long>(nOutputWidth * 0.5);
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index c702d17cb6f3..294d631cc37d 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -442,7 +442,7 @@ void OTasksWindow::Resize()
long nOutputWidth = aOutputSize.Width();
long nOutputHeight = aOutputSize.Height();
- Size aFLSize = LogicToPixel( Size( 2, 6 ), MapUnit::MapAppFont );
+ Size aFLSize = LogicToPixel(Size(2, 6), MapMode(MapUnit::MapAppFont));
sal_Int32 n6PPT = aFLSize.Height();
long nHalfOutputWidth = static_cast<long>(nOutputWidth * 0.5);
@@ -540,7 +540,7 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe
m_aContainer->Show();
- const long nFrameWidth = LogicToPixel( Size( 3, 0 ), MapUnit::MapAppFont ).Width();
+ const long nFrameWidth = LogicToPixel(Size(3, 0), MapMode(MapUnit::MapAppFont)).Width();
m_aHorzSplitter->SetPosSizePixel( Point(0,50), Size(0,nFrameWidth) );
// now set the components at the base class
set(m_aContainer.get(),m_aTasks.get());
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index 81fc34116786..ae9391900db0 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -62,7 +62,7 @@ void OApplicationSwapWindow::dispose()
void OApplicationSwapWindow::Resize()
{
- Size aFLSize = LogicToPixel( Size( 8, 0 ), MapUnit::MapAppFont );
+ Size aFLSize = LogicToPixel(Size(8, 0), MapMode(MapUnit::MapAppFont));
long nX = 0;
if ( m_aIconControl->GetEntryCount() != 0 )
nX = m_aIconControl->GetBoundingBox( m_aIconControl->GetEntry(0) ).GetWidth() + aFLSize.Width();
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index 04755cc32d54..9f18829c2c67 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -81,7 +81,7 @@ void OTitleWindow::Resize()
long nOutputWidth = aOutputSize.Width();
long nOutputHeight = aOutputSize.Height();
- Size aTextSize = LogicToPixel( Size( 6, 3 ), MapUnit::MapAppFont );
+ Size aTextSize = LogicToPixel(Size(6, 3), MapMode(MapUnit::MapAppFont));
sal_Int32 nXOffset = aTextSize.Width();
sal_Int32 nYOffset = aTextSize.Height();
sal_Int32 nHeight = GetTextHeight() + 2*nYOffset;
@@ -116,7 +116,7 @@ void OTitleWindow::GetFocus()
long OTitleWindow::GetWidthPixel() const
{
- Size aTextSize = LogicToPixel( Size( 12, 0 ), MapUnit::MapAppFont );
+ Size aTextSize = LogicToPixel(Size(12, 0), MapMode(MapUnit::MapAppFont));
sal_Int32 nWidth = GetTextWidth(m_aTitle->GetText()) + 2*aTextSize.Width();
return nWidth;
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 18f765520d2c..30889fe85f83 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -112,7 +112,7 @@ void OAppBorderWindow::Resize()
long nOutputHeight = aOutputSize.Height();
long nX = 0;
- Size aFLSize = LogicToPixel( Size( 3, 8 ), MapUnit::MapAppFont );
+ Size aFLSize = LogicToPixel(Size(3, 8), MapMode(MapUnit::MapAppFont));
if ( m_pPanel )
{
OApplicationSwapWindow* pSwap = getPanel();
@@ -237,7 +237,7 @@ void OApplicationView::resizeDocumentView(tools::Rectangle& _rPlayground)
{
if ( m_pWin && !_rPlayground.IsEmpty() )
{
- Size aFLSize = LogicToPixel( Size( 3, 3 ), MapUnit::MapAppFont );
+ Size aFLSize = LogicToPixel(Size(3, 3), MapMode(MapUnit::MapAppFont));
_rPlayground.Move( aFLSize.Width(),aFLSize.Height() );
Size aOldSize = _rPlayground.GetSize();
_rPlayground.SetSize( Size(aOldSize.Width() - 2*aFLSize.Width(), aOldSize.Height() - 2*aFLSize.Height()) );
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index 8cdbf8e4d99e..4a98532f7c71 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -216,7 +216,7 @@ void UnoDataBrowserView::resizeDocumentView(tools::Rectangle& _rPlayground)
if (m_pStatus && m_pStatus->IsVisible())
{
Size aStatusSize(aPlaygroundPos.X(), GetTextHeight() + 2);
- aStatusSize = LogicToPixel(aStatusSize, MapUnit::MapAppFont);
+ aStatusSize = LogicToPixel(aStatusSize, MapMode(MapUnit::MapAppFont));
aStatusSize.Width() = aTreeViewSize.Width() - 2 - 2;
Point aStatusPos( aPlaygroundPos.X() + 2, aTreeViewPos.Y() + aTreeViewSize.Height() - aStatusSize.Height() );
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 8013a7561d5e..60b233d851de 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -343,7 +343,7 @@ bool SbaTableQueryBrowser::Construct(vcl::Window* pParent)
{
// create controls and set sizes
- const long nFrameWidth = getBrowserView()->LogicToPixel( ::Size( 3, 0 ), MapUnit::MapAppFont ).Width();
+ const long nFrameWidth = getBrowserView()->LogicToPixel(::Size(3, 0), MapMode(MapUnit::MapAppFont)).Width();
m_pSplitter = VclPtr<Splitter>::Create(getBrowserView(),WB_HSCROLL);
m_pSplitter->SetPosSizePixel( ::Point(0,0), ::Size(nFrameWidth,0) );
@@ -359,7 +359,7 @@ bool SbaTableQueryBrowser::Construct(vcl::Window* pParent)
m_pTreeView->SetHelpId(HID_CTL_TREEVIEW);
// a default pos for the splitter, so that the listbox is about 80 (logical) pixels wide
- m_pSplitter->SetSplitPosPixel( getBrowserView()->LogicToPixel( ::Size( 80, 0 ), MapUnit::MapAppFont ).Width() );
+ m_pSplitter->SetSplitPosPixel(getBrowserView()->LogicToPixel(::Size(80, 0), MapMode(MapUnit::MapAppFont)).Width());
getBrowserView()->setSplitter(m_pSplitter);
getBrowserView()->setTreeView(m_pTreeView);
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 1a312ec1da34..15db79ca2fa2 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -290,7 +290,7 @@ void OFieldDescControl::CheckScrollBars()
// Which one is the last one that fits?
sal_uInt16 nLastVisible;
const sal_Int32 nControlHeight = GetMaxControlHeight();
- const sal_Int32 nControl_Spacing_y = LogicToPixel(Size(0, CONTROL_SPACING_Y),MapUnit::MapAppFont).Height();
+ const sal_Int32 nControl_Spacing_y = LogicToPixel(Size(0, CONTROL_SPACING_Y), MapMode(MapUnit::MapAppFont)).Height();
if (bNeedHScrollBar)
nLastVisible = static_cast<sal_uInt16>((szOverallSize.Height() - nControl_Spacing_y - nHScrollHeight) / (nControl_Spacing_y + nControlHeight));
else
@@ -369,7 +369,7 @@ void OFieldDescControl::ScrollAllAggregates()
if (m_nOldVThumb != m_pVertScroll->GetThumbPos())
{
const sal_Int32 nControlHeight = GetMaxControlHeight();
- const sal_Int32 nControl_Spacing_y = LogicToPixel(Size(0, CONTROL_SPACING_Y),MapUnit::MapAppFont).Height();
+ const sal_Int32 nControl_Spacing_y = LogicToPixel(Size(0, CONTROL_SPACING_Y), MapMode(MapUnit::MapAppFont)).Height();
nDeltaY = (m_nOldVThumb - m_pVertScroll->GetThumbPos()) * (nControl_Spacing_y + nControlHeight);
m_nOldVThumb = m_pVertScroll->GetThumbPos();
}
@@ -996,7 +996,7 @@ void OFieldDescControl::SetPosSize( VclPtr<Control> const & rControl, long nRow,
const sal_Int32 nControlHeight = GetMaxControlHeight();
Size aSize(0,nControlHeight);
if ( isRightAligned() && nCol )
- aSize.Width() = LogicToPixel(Size(m_nWidth, 0),MapUnit::MapAppFont).Width();
+ aSize.Width() = LogicToPixel(Size(m_nWidth, 0), MapMode(MapUnit::MapAppFont)).Width();
else
{
switch( nCol )
@@ -1043,7 +1043,7 @@ void OFieldDescControl::SetPosSize( VclPtr<Control> const & rControl, long nRow,
rControl->SetSizePixel( aSize );
aSize = rControl->GetSizePixel( );
- const sal_Int32 nControl_Spacing_y = LogicToPixel(Size(0, CONTROL_SPACING_Y),MapUnit::MapAppFont).Height();
+ const sal_Int32 nControl_Spacing_y = LogicToPixel(Size(0, CONTROL_SPACING_Y), MapMode(MapUnit::MapAppFont)).Height();
aPosition.Y() += ((nRow+1)*nControl_Spacing_y) +
(nRow*nControlHeight);
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index 45e199234dc8..1129015ac905 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -434,7 +434,7 @@ namespace dbaui
Size ORelationControl::GetOptimalSize() const
{
- return LogicToPixel(Size(140, 80), MapUnit::MapAppFont);
+ return LogicToPixel(Size(140, 80), MapMode(MapUnit::MapAppFont));
}
// class OTableListBoxControl
diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx
index 7938f1be137b..b12b1c9be94f 100644
--- a/dbaccess/source/ui/control/VertSplitView.cxx
+++ b/dbaccess/source/ui/control/VertSplitView.cxx
@@ -155,7 +155,7 @@ void OSplitterView::setSplitter(Splitter* _pSplitter)
m_pSplitter = _pSplitter;
if ( m_pSplitter )
{
- m_pSplitter->SetSplitPosPixel( LogicToPixel( Size( SPLITTER_WIDTH, 0 ), MapUnit::MapAppFont ).Width() );
+ m_pSplitter->SetSplitPosPixel(LogicToPixel(Size(SPLITTER_WIDTH, 0), MapMode(MapUnit::MapAppFont)).Width());
m_pSplitter->SetSplitHdl( LINK(this, OSplitterView, SplitHdl) );
m_pSplitter->Show();
LINK( this, OSplitterView, SplitHdl ).Call(m_pSplitter);
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 944590902af1..92d62b0fcf1c 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -279,7 +279,7 @@ namespace dbaui
aReference.Y() += _rReference.GetSizePixel().Height();
const vcl::Window* pConverter = _rControl.GetParent();
- Size aOffset = pConverter->LogicToPixel( Size( _nIndentAppFont, ( _eRelation == RelatedControls ? 3 : 6 ) ), MapUnit::MapAppFont );
+ Size aOffset = pConverter->LogicToPixel(Size(_nIndentAppFont, (_eRelation == RelatedControls ? 3 : 6)), MapMode(MapUnit::MapAppFont));
Point aControlPos( aReference.X() + aOffset.Width(), aReference.Y() + aOffset.Height() );
_rControl.SetPosPixel( aControlPos );
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index e7c0bde45c9e..b31304907f10 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -324,7 +324,7 @@ OAddTableDlg::OAddTableDlg( vcl::Window* pParent, IAddTableDialogContext& _rCont
get(m_pTableList, "tablelist");
get(m_pQueryList, "querylist");
- Size aSize(LogicToPixel(Size(106 , 122), MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(Size(106 , 122), MapMode(MapUnit::MapAppFont)));
m_pTableList->set_height_request(aSize.Height());
m_pTableList->set_width_request(aSize.Width());
get(m_pQueryList, "querylist");
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index aeba83f7451a..91e80069e6d2 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -50,7 +50,7 @@ ODbaseIndexDialog::ODbaseIndexDialog(vcl::Window * pParent, const OUString& aDat
get(m_pIndexes, "frame");
get(m_pLB_TableIndexes, "tableindex");
get(m_pLB_FreeIndexes, "freeindex");
- Size aSize(LogicToPixel(Size(76, 98), MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(Size(76, 98), MapMode(MapUnit::MapAppFont)));
m_pLB_TableIndexes->set_height_request(aSize.Height());
m_pLB_TableIndexes->set_width_request(aSize.Width());
m_pLB_FreeIndexes->set_height_request(aSize.Height());
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 21c58e43b954..5f442463b0b2 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -80,7 +80,7 @@ ODbTypeWizDialog::ODbTypeWizDialog(vcl::Window* _pParent
m_pImpl->translateProperties(xDatasource, *m_pOutSet);
m_eType = dbaui::ODbDataSourceAdministrationHelper::getDatasourceType(*m_pOutSet);
- SetPageSizePixel(LogicToPixel(::Size(PAGE_X, PAGE_Y), MapUnit::MapAppFont));
+ SetPageSizePixel(LogicToPixel(::Size(PAGE_X, PAGE_Y), MapMode(MapUnit::MapAppFont)));
defaultButton(WizardButtonFlags::NEXT);
enableButtons(WizardButtonFlags::FINISH, false);
enableAutomaticNextButtonState();
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index e79fde0c1466..44fff07cca7f 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -147,7 +147,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent
m_pImpl->translateProperties(xDatasource, *m_pOutSet);
- SetPageSizePixel(LogicToPixel(::Size(WIZARD_PAGE_X, WIZARD_PAGE_Y), MapUnit::MapAppFont));
+ SetPageSizePixel(LogicToPixel(::Size(WIZARD_PAGE_X, WIZARD_PAGE_Y), MapMode(MapUnit::MapAppFont)));
defaultButton(WizardButtonFlags::NEXT);
enableButtons(WizardButtonFlags::FINISH, true);
enableAutomaticNextButtonState();
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index b833d8b6ba32..571ea3f7ef54 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -190,7 +190,7 @@ namespace dbaui
maLcResetCmdImg = get<FixedImage>("image5")->GetImage();
get(m_pIndexList, "INDEX_LIST");
- Size aSize(LogicToPixel(Size(70, 97), MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(Size(70, 97), MapMode(MapUnit::MapAppFont)));
m_pIndexList->set_width_request(aSize.Width());
m_pIndexList->set_height_request(aSize.Height());
get(m_pIndexDetails, "INDEX_DETAILS");
@@ -199,7 +199,7 @@ namespace dbaui
get(m_pUnique, "UNIQUE");
get(m_pFieldsLabel, "FIELDS_LABEL");
get(m_pFields, "FIELDS");
- aSize = LogicToPixel(Size(128, 61), MapUnit::MapAppFont);
+ aSize = LogicToPixel(Size(128, 61), MapMode(MapUnit::MapAppFont));
m_pFields->set_width_request(aSize.Width());
m_pFields->set_height_request(aSize.Height());
get(m_pClose, "close");
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 33adebe519d0..c33ae52b22d4 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -305,11 +305,11 @@ OExceptionChainDialog::OExceptionChainDialog(vcl::Window* pParent, const Excepti
, m_aExceptions(_rExceptions)
{
get(m_pExceptionList, "list");
- Size aListSize(LogicToPixel(Size(85, 93), MapUnit::MapAppFont));
+ Size aListSize(LogicToPixel(Size(85, 93), MapMode(MapUnit::MapAppFont)));
m_pExceptionList->set_width_request(aListSize.Width());
m_pExceptionList->set_height_request(aListSize.Height());
get(m_pExceptionText, "description");
- Size aTextSize(LogicToPixel(Size(125 , 93), MapUnit::MapAppFont));
+ Size aTextSize(LogicToPixel(Size(125, 93), MapMode(MapUnit::MapAppFont)));
m_pExceptionText->set_width_request(aTextSize.Width());
m_pExceptionText->set_height_request(aTextSize.Height());
@@ -400,8 +400,8 @@ namespace
{
void lcl_positionInAppFont( const vcl::Window& _rParent, vcl::Window& _rChild, long _nX, long _nY, long Width, long Height )
{
- Point aPos = _rParent.LogicToPixel( Point( _nX, _nY ), MapUnit::MapAppFont );
- Size aSize = _rParent.LogicToPixel( Size( Width, Height ), MapUnit::MapAppFont );
+ Point aPos = _rParent.LogicToPixel(Point(_nX, _nY), MapMode(MapUnit::MapAppFont));
+ Size aSize = _rParent.LogicToPixel(Size(Width, Height), MapMode(MapUnit::MapAppFont));
_rChild.SetPosSizePixel( aPos, aSize );
}
@@ -514,8 +514,8 @@ void OSQLMessageBox::impl_positionControls()
// adjust dialog size accordingly
const tools::Rectangle& rBottomTextRect( bHaveSecondaryText ? aSecondaryRect : aPrimaryRect );
- Size aBorderSize = LogicToPixel( Size( OUTER_MARGIN, OUTER_MARGIN ), MapUnit::MapAppFont );
- Size aDialogSize( LogicToPixel( Size( DIALOG_WIDTH, 30 ), MapUnit::MapAppFont ) );
+ Size aBorderSize = LogicToPixel(Size(OUTER_MARGIN, OUTER_MARGIN), MapMode(MapUnit::MapAppFont));
+ Size aDialogSize( LogicToPixel(Size(DIALOG_WIDTH, 30), MapMode(MapUnit::MapAppFont)));
aDialogSize.Height() = rBottomTextRect.Bottom() + aBorderSize.Height();
aDialogSize.Width() = aPrimaryRect.Right() + aBorderSize.Width();
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index d02fe9a4db7a..355c19bbd40d 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -646,11 +646,11 @@ void OCopyTableWizard::construct()
AddButton( m_pbNext = VclPtr<PushButton>::Create(this, WB_TABSTOP));
AddButton( m_pbFinish = VclPtr<PushButton>::Create(this, WB_TABSTOP));
- m_pbHelp->SetSizePixel( LogicToPixel( Size( 50, 14 ), MapUnit::MapAppFont ) );
- m_pbCancel->SetSizePixel( LogicToPixel( Size( 50, 14 ), MapUnit::MapAppFont ) );
- m_pbPrev->SetSizePixel( LogicToPixel( Size( 50, 14 ), MapUnit::MapAppFont ) );
- m_pbNext->SetSizePixel( LogicToPixel( Size( 50, 14 ), MapUnit::MapAppFont ) );
- m_pbFinish->SetSizePixel( LogicToPixel( Size( 50, 14 ), MapUnit::MapAppFont ) );
+ m_pbHelp->SetSizePixel( LogicToPixel(Size(50, 14), MapMode(MapUnit::MapAppFont)) );
+ m_pbCancel->SetSizePixel( LogicToPixel(Size(50, 14), MapMode(MapUnit::MapAppFont)) );
+ m_pbPrev->SetSizePixel( LogicToPixel(Size(50, 14), MapMode(MapUnit::MapAppFont)) );
+ m_pbNext->SetSizePixel( LogicToPixel(Size(50, 14), MapMode(MapUnit::MapAppFont)) );
+ m_pbFinish->SetSizePixel( LogicToPixel(Size(50, 14), MapMode(MapUnit::MapAppFont)) );
m_pbPrev->SetText(DBA_RES(STR_WIZ_PB_PREV));
m_pbNext->SetText(DBA_RES(STR_WIZ_PB_NEXT));
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index c558da3bd186..b22ceb332ad9 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -202,7 +202,7 @@ namespace dbaui
Size aSize = GetOutputSizePixel();
Size aBeamer(aSize.Width(),sal_Int32(aSize.Height()*0.33));
- const long nFrameHeight = LogicToPixel( Size( 0, 3 ), MapUnit::MapAppFont ).Height();
+ const long nFrameHeight = LogicToPixel(Size(0, 3), MapMode(MapUnit::MapAppFont)).Height();
Point aPos(0,aBeamer.Height()+nFrameHeight);
m_pBeamer->SetPosSizePixel(Point(0,0),aBeamer);
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx
index 6a6ae3ead9b0..fc72b132033b 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -55,7 +55,7 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent,
, m_xConnection(_xConnection)
{
get(m_pML_HelpText, "helptext");
- Size aSize(LogicToPixel(Size(179, 49), MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(Size(179, 49), MapMode(MapUnit::MapAppFont)));
//alternatively loop through the STR_QUERY_* strings with their STR_JOIN_TYPE_HINT
//suffix to find the longest entry at runtime
m_pML_HelpText->set_height_request(aSize.Height());
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index 4cebe4d78a64..bcd2ff733812 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -45,7 +45,7 @@ OTableRowView::OTableRowView(vcl::Window* pParent)
, m_nCurUndoActId(0)
{
SetHelpId(HID_TABDESIGN_BACKGROUND);
- SetSizePixel(LogicToPixel(Size(40, 12), MapUnit::MapAppFont));
+ SetSizePixel(LogicToPixel(Size(40, 12), MapMode(MapUnit::MapAppFont)));
}
void OTableRowView::Init()
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 5cfe53b22b25..d4dbb3623480 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -1446,7 +1446,7 @@ ShowLicenseDialog::ShowLicenseDialog( vcl::Window * pParent,
: ModalDialog(pParent, "ShowLicenseDialog", "desktop/ui/showlicensedialog.ui")
{
get(m_pLicenseText, "textview");
- Size aSize(m_pLicenseText->LogicToPixel(Size(290, 170), MapUnit::MapAppFont));
+ Size aSize(m_pLicenseText->LogicToPixel(Size(290, 170), MapMode(MapUnit::MapAppFont)));
m_pLicenseText->set_width_request(aSize.Width());
m_pLicenseText->set_height_request(aSize.Height());
m_pLicenseText->SetText(xPackage->getLicenseText());
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 1a1a32a6bfcc..a5407c954ef3 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -752,7 +752,7 @@ void ExtensionBox_Impl::Resize()
Size ExtensionBox_Impl::GetOptimalSize() const
{
- return LogicToPixel(Size(250, 150), MapUnit::MapAppFont);
+ return LogicToPixel(Size(250, 150), MapMode(MapUnit::MapAppFont));
}
extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeExtensionBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &)
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 8fa20b8cd48e..229b8a262bae 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -497,7 +497,7 @@ UpdateDialog::UpdateDialog(
get(m_pUpdate, "UPDATE_LABEL");
get(m_pContainer, "UPDATES_CONTAINER");
m_pUpdates = VclPtr<UpdateDialog::CheckListBox>::Create(m_pContainer, *this);
- Size aSize(LogicToPixel(Size(240, 51), MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(Size(240, 51), MapMode(MapUnit::MapAppFont)));
m_pUpdates->set_width_request(aSize.Width());
m_pUpdates->set_height_request(aSize.Height());
m_pUpdates->Show();
@@ -508,7 +508,7 @@ UpdateDialog::UpdateDialog(
get(m_pReleaseNotesLabel, "RELEASE_NOTES_LABEL");
get(m_pReleaseNotesLink, "RELEASE_NOTES_LINK");
get(m_pDescriptions, "DESCRIPTIONS");
- aSize = LogicToPixel(Size(240, 59), MapUnit::MapAppFont);
+ aSize = LogicToPixel(Size(240, 59), MapMode(MapUnit::MapAppFont));
m_pDescriptions->set_width_request(aSize.Width());
m_pDescriptions->set_height_request(aSize.Height());
get(m_pOk, "INSTALL");
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 6219d3ede3b2..39c5d61d427e 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -202,7 +202,7 @@ LicenseDialogImpl::LicenseDialogImpl(
m_pArrow2->Show(false);
get(m_pLicense, "textview");
- Size aSize(m_pLicense->LogicToPixel(Size(290, 170), MapUnit::MapAppFont));
+ Size aSize(m_pLicense->LogicToPixel(Size(290, 170), MapMode(MapUnit::MapAppFont)));
m_pLicense->set_width_request(aSize.Width());
m_pLicense->set_height_request(aSize.Height());
diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
index 6dce6773202b..d4fd9c0c5e94 100644
--- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
@@ -124,7 +124,7 @@ namespace
aRetval = BitmapEx(aContent, aAlpha);
// #i101811# set PrefMapMode and PrefSize at newly created Bitmap
- aRetval.SetPrefMapMode(MapUnit::MapPixel);
+ aRetval.SetPrefMapMode(MapMode(MapUnit::MapPixel));
aRetval.SetPrefSize(Size(nWidth, nHeight));
}
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 6f6deef4bfb5..e9473c3e4d23 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -2014,8 +2014,8 @@ namespace drawinglayer
// between Printer and VDev (mpOutputDevice and aBufferDevice here).
// To get the DPI, LogicToPixel from (1,1) from MapUnit::MapInch needs to be used.
basegfx::B2DHomMatrix aViewTransform(aBufferDevice->GetViewTransformation());
- const Size aDPIOld(mpOutputDevice->LogicToPixel(Size(1, 1), MapUnit::MapInch));
- const Size aDPINew(aBufferDevice->LogicToPixel(Size(1, 1), MapUnit::MapInch));
+ const Size aDPIOld(mpOutputDevice->LogicToPixel(Size(1, 1), MapMode(MapUnit::MapInch)));
+ const Size aDPINew(aBufferDevice->LogicToPixel(Size(1, 1), MapMode(MapUnit::MapInch)));
const double fDPIXChange((double)aDPIOld.getWidth() / (double)aDPINew.getWidth());
const double fDPIYChange((double)aDPIOld.getHeight() / (double)aDPINew.getHeight());
diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx
index ce9aab77b495..2b338eab94b3 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -2584,7 +2584,7 @@ namespace wmfemfhelper
// convert to target MapUnit if not pixels
aFontSize = OutputDevice::LogicToLogic(
- aFontSize, MapUnit::MapPixel, rPropertyHolders.Current().getMapUnit());
+ aFontSize, MapMode(MapUnit::MapPixel), MapMode(rPropertyHolders.Current().getMapUnit()));
aCorrectedFont.SetFontSize(aFontSize);
rPropertyHolders.Current().setFont(aCorrectedFont);
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index 005a0e4a218d..a7f74bf2701f 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -216,7 +216,7 @@ std::locale& EditDLL::GetResLocale()
editeng::SharedVclResources::SharedVclResources()
: m_pVirDev(VclPtr<VirtualDevice>::Create())
{
- m_pVirDev->SetMapMode(MapUnit::MapTwip);
+ m_pVirDev->SetMapMode(MapMode(MapUnit::MapTwip));
}
editeng::SharedVclResources::~SharedVclResources()
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 8622bc4a7133..f613f419b74b 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -431,7 +431,7 @@ void ImpEditView::DrawSelectionXOR( EditSelection aTmpSel, vcl::Region* pRegion,
tools::Rectangle& rStart = aRectangles.front();
tools::Rectangle aStart = tools::Rectangle(rStart.Left(), rStart.Top(), rStart.Left() + 1, rStart.Bottom());
if (bMm100ToTwip)
- aStart = OutputDevice::LogicToLogic(aStart, MapUnit::Map100thMM, MapUnit::MapTwip);
+ aStart = OutputDevice::LogicToLogic(aStart, MapMode(MapUnit::Map100thMM), MapMode(MapUnit::MapTwip));
aStart.Move(aOrigin.getX(), aOrigin.getY());
mpViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_TEXT_SELECTION_START, aStart.toString().getStr());
@@ -439,7 +439,7 @@ void ImpEditView::DrawSelectionXOR( EditSelection aTmpSel, vcl::Region* pRegion,
tools::Rectangle& rEnd = aRectangles.back();
tools::Rectangle aEnd = tools::Rectangle(rEnd.Right() - 1, rEnd.Top(), rEnd.Right(), rEnd.Bottom());
if (bMm100ToTwip)
- aEnd = OutputDevice::LogicToLogic(aEnd, MapUnit::Map100thMM, MapUnit::MapTwip);
+ aEnd = OutputDevice::LogicToLogic(aEnd, MapMode(MapUnit::Map100thMM), MapMode(MapUnit::MapTwip));
aEnd.Move(aOrigin.getX(), aOrigin.getY());
mpViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_TEXT_SELECTION_END, aEnd.toString().getStr());
@@ -449,7 +449,7 @@ void ImpEditView::DrawSelectionXOR( EditSelection aTmpSel, vcl::Region* pRegion,
for (tools::Rectangle & rRectangle : aRectangles)
{
if (bMm100ToTwip)
- rRectangle = OutputDevice::LogicToLogic(rRectangle, MapUnit::Map100thMM, MapUnit::MapTwip);
+ rRectangle = OutputDevice::LogicToLogic(rRectangle, MapMode(MapUnit::Map100thMM), MapMode(MapUnit::MapTwip));
rRectangle.Move(aOrigin.getX(), aOrigin.getY());
v.emplace_back(rRectangle.toString().getStr());
}
@@ -496,7 +496,7 @@ void ImpEditView::ImplDrawHighlightRect( OutputDevice* _pTarget, const Point& rD
{
if ( rDocPosTopLeft.X() != rDocPosBottomRight.X() )
{
- bool bPixelMode = _pTarget->GetMapMode() == MapUnit::MapPixel;
+ bool bPixelMode = _pTarget->GetMapMode().GetMapUnit() == MapUnit::MapPixel;
Point aPnt1( GetWindowPos( rDocPosTopLeft ) );
Point aPnt2( GetWindowPos( rDocPosBottomRight ) );
@@ -1100,7 +1100,7 @@ void ImpEditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor )
// LOK output is always in twips, convert from mm100 if necessary.
if (pOutWin->GetMapMode().GetMapUnit() == MapUnit::Map100thMM)
- aRect = OutputDevice::LogicToLogic(aRect, MapUnit::Map100thMM, MapUnit::MapTwip);
+ aRect = OutputDevice::LogicToLogic(aRect, MapMode(MapUnit::Map100thMM), MapMode(MapUnit::MapTwip));
else if (pOutWin->GetMapMode().GetMapUnit() == MapUnit::MapTwip)
{
// Writer comments: they use editeng, but are separate widgets.
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 8ea502e278ac..2ba8c6cde892 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -228,7 +228,7 @@ void ImpEditEngine::SetRefMapMode( const MapMode& rMapMode )
mpOwnDev.disposeAndClear();
mpOwnDev = VclPtr<VirtualDevice>::Create();
pRefDev = mpOwnDev;
- pRefDev->SetMapMode( MapUnit::MapTwip );
+ pRefDev->SetMapMode(MapMode(MapUnit::MapTwip));
SetRefDevice( pRefDev );
pRefDev->SetMapMode( rMapMode );
diff --git a/editeng/source/items/paperinf.cxx b/editeng/source/items/paperinf.cxx
index bde8319d93e7..9f2da29c14eb 100644
--- a/editeng/source/items/paperinf.cxx
+++ b/editeng/source/items/paperinf.cxx
@@ -37,7 +37,9 @@ Size SvxPaperInfo::GetPaperSize( Paper ePaper, MapUnit eUnit )
{
PaperInfo aInfo(ePaper);
Size aRet(aInfo.getWidth(), aInfo.getHeight()); // in 100thMM
- return eUnit == MapUnit::Map100thMM ? aRet : OutputDevice::LogicToLogic(aRet, MapUnit::Map100thMM, eUnit);
+ return eUnit == MapUnit::Map100thMM
+ ? aRet
+ : OutputDevice::LogicToLogic(aRet, MapMode(MapUnit::Map100thMM), MapMode(eUnit));
}
/*------------------------------------------------------------------------
@@ -85,7 +87,7 @@ Size SvxPaperInfo::GetPaperSize( const Printer* pPrinter )
Paper SvxPaperInfo::GetSvxPaper( const Size &rSize, MapUnit eUnit, bool bSloppy )
{
- Size aSize(eUnit == MapUnit::Map100thMM ? rSize : OutputDevice::LogicToLogic(rSize, eUnit, MapUnit::Map100thMM));
+ Size aSize(eUnit == MapUnit::Map100thMM ? rSize : OutputDevice::LogicToLogic(rSize, MapMode(eUnit), MapMode(MapUnit::Map100thMM)));
PaperInfo aInfo(aSize.Width(), aSize.Height());
if (bSloppy)
aInfo.doSloppyFit();
@@ -105,7 +107,9 @@ Size SvxPaperInfo::GetDefaultPaperSize( MapUnit eUnit )
{
PaperInfo aInfo(PaperInfo::getSystemDefaultPaper());
Size aRet(aInfo.getWidth(), aInfo.getHeight());
- return eUnit == MapUnit::Map100thMM ? aRet : OutputDevice::LogicToLogic(aRet, MapUnit::Map100thMM, eUnit);
+ return eUnit == MapUnit::Map100thMM
+ ? aRet
+ : OutputDevice::LogicToLogic(aRet, MapMode(MapUnit::Map100thMM), MapMode(eUnit));
}
/*------------------------------------------------------------------------
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index ef9852b83102..e4455865396d 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1438,7 +1438,9 @@ Size Outliner::ImplGetBulletSize( sal_Int32 nPara )
}
else
{
- pPara->aBulSize = OutputDevice::LogicToLogic( pFmt->GetGraphicSize(), MapUnit::Map100thMM, pEditEngine->GetRefDevice()->GetMapMode() );
+ pPara->aBulSize = OutputDevice::LogicToLogic(pFmt->GetGraphicSize(),
+ MapMode(MapUnit::Map100thMM),
+ pEditEngine->GetRefDevice()->GetMapMode());
}
}
diff --git a/editeng/source/uno/unoviwou.cxx b/editeng/source/uno/unoviwou.cxx
index 96f445e7cb02..6cb02472b3c3 100644
--- a/editeng/source/uno/unoviwou.cxx
+++ b/editeng/source/uno/unoviwou.cxx
@@ -70,7 +70,7 @@ tools::Rectangle SvxDrawOutlinerViewForwarder::GetVisArea() const
MapMode aMapMode(pOutDev->GetMapMode());
aVisArea = OutputDevice::LogicToLogic( aVisArea,
pOutliner->GetRefMapMode(),
- aMapMode.GetMapUnit() );
+ MapMode(aMapMode.GetMapUnit()));
aMapMode.SetOrigin(Point());
return pOutDev->LogicToPixel( aVisArea, aMapMode );
}
@@ -93,7 +93,7 @@ Point SvxDrawOutlinerViewForwarder::LogicToPixel( const Point& rPoint, const Map
MapMode aMapMode(pOutDev->GetMapMode());
Point aPoint2( OutputDevice::LogicToLogic( aPoint1, rMapMode,
- aMapMode.GetMapUnit() ) );
+ MapMode(aMapMode.GetMapUnit())));
aMapMode.SetOrigin(Point());
return pOutDev->LogicToPixel( aPoint2, aMapMode );
}
@@ -111,7 +111,7 @@ Point SvxDrawOutlinerViewForwarder::PixelToLogic( const Point& rPoint, const Map
aMapMode.SetOrigin(Point());
Point aPoint1( pOutDev->PixelToLogic( rPoint, aMapMode ) );
Point aPoint2( OutputDevice::LogicToLogic( aPoint1,
- aMapMode.GetMapUnit(),
+ MapMode(aMapMode.GetMapUnit()),
rMapMode ) );
Point aTextOffset( GetTextOffset() );
diff --git a/emfio/source/emfuno/xemfparser.cxx b/emfio/source/emfuno/xemfparser.cxx
index 2f1db153b422..f2415bbf5a54 100644
--- a/emfio/source/emfuno/xemfparser.cxx
+++ b/emfio/source/emfuno/xemfparser.cxx
@@ -163,7 +163,7 @@ namespace emfio
if (aMtf.GetPrefMapMode().GetMapUnit() == MapUnit::MapPixel)
{
- aSize = Application::GetDefaultDevice()->PixelToLogic(aSize, MapUnit::Map100thMM);
+ aSize = Application::GetDefaultDevice()->PixelToLogic(aSize, MapMode(MapUnit::Map100thMM));
}
else
{
diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index d6df538dc27c..349f686f4ea9 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -919,7 +919,7 @@ namespace emfio
MtfTools::~MtfTools()
{
mpGDIMetaFile->AddAction( new MetaPopAction() );
- mpGDIMetaFile->SetPrefMapMode( MapUnit::Map100thMM );
+ mpGDIMetaFile->SetPrefMapMode(MapMode(MapUnit::Map100thMM));
if ( mrclFrame.IsEmpty() )
mpGDIMetaFile->SetPrefSize( Size( mnDevWidth, mnDevHeight ) );
else
@@ -1607,7 +1607,7 @@ namespace emfio
SolarMutexGuard aGuard;
ScopedVclPtrInstance< VirtualDevice > pVDev;
pDX = new long[ rText.getLength() ];
- pVDev->SetMapMode( MapUnit::Map100thMM );
+ pVDev->SetMapMode(MapMode(MapUnit::Map100thMM));
pVDev->SetFont( maLatestFont );
pVDev->GetTextArray( rText, pDX, 0, rText.getLength());
}
diff --git a/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx
index 83e2fb3ad19c..cecd93a82ac0 100644
--- a/emfio/source/reader/wmfreader.cxx
+++ b/emfio/source/reader/wmfreader.cxx
@@ -1297,7 +1297,7 @@ namespace emfio
{
const Fraction aFrac( 1, mnUnitsPerInch);
MapMode aWMFMap( MapUnit::MapInch, Point(), aFrac, aFrac );
- Size aSize100( OutputDevice::LogicToLogic( aWMFSize, aWMFMap, MapUnit::Map100thMM ) );
+ Size aSize100(OutputDevice::LogicToLogic(aWMFSize, aWMFMap, MapMode(MapUnit::Map100thMM)));
aDevExt = Size( labs( aSize100.Width() ), labs( aSize100.Height() ) );
}
SetDevExt( aDevExt );
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index ff41cbd1698a..270025e986c1 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -62,7 +62,7 @@ namespace abp
,m_aNewDataSource(_rxORB)
,m_eNewDataSourceType( AST_INVALID )
{
- SetPageSizePixel(LogicToPixel(Size(WINDOW_SIZE_X, WINDOW_SIZE_Y), MapUnit::MapAppFont));
+ SetPageSizePixel(LogicToPixel(Size(WINDOW_SIZE_X, WINDOW_SIZE_Y), MapMode(MapUnit::MapAppFont)));
declarePath( PATH_COMPLETE,
{STATE_SELECT_ABTYPE,
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index af24701eac77..5f14c6760b39 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -247,7 +247,7 @@ namespace dbp
m_aContext.xObjectModel = _rxObjectModel;
initContext();
- SetPageSizePixel(LogicToPixel(::Size(WINDOW_SIZE_X, WINDOW_SIZE_Y), MapUnit::MapAppFont));
+ SetPageSizePixel(LogicToPixel(::Size(WINDOW_SIZE_X, WINDOW_SIZE_Y), MapMode(MapUnit::MapAppFont)));
defaultButton(WizardButtonFlags::NEXT);
enableButtons(WizardButtonFlags::FINISH, false);
}
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index e345381733e9..67b9d6801dda 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -209,7 +209,7 @@ namespace pcr
if ( m_bIndentTitle )
{
- Size aIndent( m_pTheParent->LogicToPixel( Size( 8, 0 ), MapUnit::MapAppFont ) );
+ Size aIndent( m_pTheParent->LogicToPixel(Size(8, 0), MapMode(MapUnit::MapAppFont)) );
aTitlePos.X() += aIndent.Width();
aTitleSize.Width() -= aIndent.Width();
}
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 2d53642bf580..38f5a92c6be8 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -418,7 +418,7 @@ namespace pcr
void OBrowserListBox::Resize()
{
tools::Rectangle aPlayground( Point( 0, 0 ), GetOutputSizePixel() );
- Size aHelpWindowDistance( LogicToPixel( Size( 0, LAYOUT_HELP_WINDOW_DISTANCE_APPFONT ), MapUnit::MapAppFont ) );
+ Size aHelpWindowDistance( LogicToPixel(Size(0, LAYOUT_HELP_WINDOW_DISTANCE_APPFONT), MapMode(MapUnit::MapAppFont)) );
long nHelpWindowHeight = m_nCurrentPreferredHelpHeight = impl_getPrefererredHelpHeight();
bool bPositionHelpWindow = ( nHelpWindowHeight != 0 );
@@ -746,7 +746,7 @@ namespace pcr
if ( HasHelpSection() )
{
- Size aHelpWindowDistance( LogicToPixel( Size( 0, LAYOUT_HELP_WINDOW_DISTANCE_APPFONT ), MapUnit::MapAppFont ) );
+ Size aHelpWindowDistance( LogicToPixel(Size(0, LAYOUT_HELP_WINDOW_DISTANCE_APPFONT), MapMode(MapUnit::MapAppFont)) );
nMinHeight += aHelpWindowDistance.Height();
nMinHeight += m_pHelpWindow->GetMinimalHeightPixel();
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index 447583056343..c9b0f0137cb7 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -224,7 +224,7 @@ namespace pcr
// build SfxItems with the values
SvxFontItem aFontItem((FontFamily)nFontFamily, aFontName, aFontStyleName, PITCH_DONTKNOW, nFontCharset, CFID_FONT);
- nFontHeight = (float)OutputDevice::LogicToLogic(Size(0, (sal_Int32)nFontHeight), MapUnit::MapPoint, MapUnit::MapTwip).Height();
+ nFontHeight = (float)OutputDevice::LogicToLogic(Size(0, (sal_Int32)nFontHeight), MapMode(MapUnit::MapPoint), MapMode(MapUnit::MapTwip)).Height();
SvxFontHeightItem aSvxFontHeightItem((sal_uInt32)nFontHeight,100,CFID_HEIGHT);
FontWeight eWeight=vcl::unohelper::ConvertFontWeight(nFontWeight);
@@ -328,7 +328,7 @@ namespace pcr
const SvxFontHeightItem& rSvxFontHeightItem =
static_cast<const SvxFontHeightItem&>(_rSet.Get(CFID_HEIGHT));
- float nHeight = (float)OutputDevice::LogicToLogic(Size(0, rSvxFontHeightItem.GetHeight()), MapUnit::MapTwip, MapUnit::MapPoint).Height();
+ float nHeight = (float)OutputDevice::LogicToLogic(Size(0, rSvxFontHeightItem.GetHeight()), MapMode(MapUnit::MapTwip), MapMode(MapUnit::MapPoint)).Height();
lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_HEIGHT,makeAny(nHeight));
}
diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx
index 05accc9b1365..91ee10a9d886 100644
--- a/extensions/source/propctrlr/inspectorhelpwindow.cxx
+++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx
@@ -81,8 +81,8 @@ namespace pcr
long InspectorHelpWindow::impl_getSpaceAboveTextWindow()
{
- Size aSeparatorSize( LogicToPixel( Size( 0, 8 ), MapUnit::MapAppFont ) );
- Size a3AppFontSize( LogicToPixel( Size( 3, 3 ), MapUnit::MapAppFont ) );
+ Size aSeparatorSize(LogicToPixel(Size(0, 8), MapMode(MapUnit::MapAppFont)));
+ Size a3AppFontSize(LogicToPixel(Size(3, 3), MapMode(MapUnit::MapAppFont)));
return aSeparatorSize.Height() + a3AppFontSize.Height();
}
@@ -125,12 +125,12 @@ namespace pcr
void InspectorHelpWindow::Resize()
{
- Size a3AppFont( LogicToPixel( Size( 3, 3 ), MapUnit::MapAppFont ) );
+ Size a3AppFont(LogicToPixel(Size(3, 3), MapMode(MapUnit::MapAppFont)));
tools::Rectangle aPlayground( Point( 0, 0 ), GetOutputSizePixel() );
tools::Rectangle aSeparatorArea( aPlayground );
- aSeparatorArea.Bottom() = aSeparatorArea.Top() + LogicToPixel( Size( 0, 8 ), MapUnit::MapAppFont ).Height();
+ aSeparatorArea.Bottom() = aSeparatorArea.Top() + LogicToPixel(Size(0, 8), MapMode(MapUnit::MapAppFont)).Height();
m_aSeparator->SetPosSizePixel( aSeparatorArea.TopLeft(), aSeparatorArea.GetSize() );
tools::Rectangle aTextArea( aPlayground );
diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx
index d1ce396bac15..2bc3d154c9c9 100644
--- a/extensions/source/propctrlr/listselectiondlg.cxx
+++ b/extensions/source/propctrlr/listselectiondlg.cxx
@@ -39,7 +39,7 @@ namespace pcr
OSL_PRECOND( m_xListBox.is(), "ListSelectionDialog::ListSelectionDialog: invalid list box!" );
get(m_pEntries, "treeview");
- Size aSize(LogicToPixel(Size(85, 97), MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(Size(85, 97), MapMode(MapUnit::MapAppFont)));
m_pEntries->set_width_request(aSize.Width());
m_pEntries->set_height_request(aSize.Height());
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx
index 47f90a77061e..b0cc583aca43 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -200,7 +200,7 @@ void GridWindow::onResize()
Size GridWindow::GetOptimalSize() const
{
- return LogicToPixel(Size(240, 200), MapUnit::MapAppFont);
+ return LogicToPixel(Size(240, 200), MapMode(MapUnit::MapAppFont));
}
GridDialog::GridDialog(double* pXValues, double* pYValues, int nValues, vcl::Window* pParent )
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index 1d5baeda124f..e515a763af39 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -195,7 +195,7 @@ public:
}
virtual Size GetOptimalSize() const override
{
- Size aSize(LogicToPixel(Size(PREVIEW_WIDTH, PREVIEW_HEIGHT), MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(Size(PREVIEW_WIDTH, PREVIEW_HEIGHT), MapMode(MapUnit::MapAppFont)));
aSize.setWidth(aSize.getWidth()+1);
aSize.setHeight(aSize.getHeight()+1);
return aSize;
@@ -222,7 +222,7 @@ SaneDlg::SaneDlg( vcl::Window* pParent, Sane& rSane, bool bScanEnabled ) :
get(mpScanButton, "scanButton");
get(mpButtonOption, "optionsButton");
get(mpOptionTitle, "optionTitleLabel");
- Size aSize(LogicToPixel(Size(130, 102), MapUnit::MapAppFont));
+ Size aSize(LogicToPixel(Size(130, 102), MapMode(MapUnit::MapAppFont)));
mpOptionTitle->set_width_request(aSize.Width());
mpOptionTitle->set_height_request(aSize.Height() / 2);
get(mpOptionDescTxt, "optionsDescLabel");
@@ -944,7 +944,7 @@ void ScanPreview::UpdatePreviewBounds()
void ScanPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect)
{
Window::Paint(rRenderContext, rRect);
- rRenderContext.SetMapMode(MapUnit::MapAppFont);
+ rRenderContext.SetMapMode(MapMode(MapUnit::MapAppFont));
rRenderContext.SetFillColor(Color(COL_WHITE));
rRenderContext.SetLineColor(Color(COL_WHITE));
rRenderContext.DrawRect(tools::Rectangle(Point(0, 0),
@@ -1247,7 +1247,7 @@ void ScanPreview::DrawDrag(vcl::RenderContext& rRenderContext)
mbDragDrawn = true;
rRenderContext.SetRasterOp(eROP);
- rRenderContext.SetMapMode(MapUnit::MapAppFont);
+ rRenderContext.SetMapMode(MapMode(MapUnit::MapAppFont));
}
Point ScanPreview::GetPixelPos( const Point& rIn) const
@@ -1260,12 +1260,12 @@ Point ScanPreview::GetPixelPos( const Point& rIn) const
/ ( maMaxBottomRight.Y() - maMinTopLeft.Y() ) )
);
- return LogicToPixel(aConvert, MapUnit::MapAppFont);
+ return LogicToPixel(aConvert, MapMode(MapUnit::MapAppFont));
}
Point ScanPreview::GetLogicPos(const Point& rIn) const
{
- Point aConvert = PixelToLogic(rIn, MapUnit::MapAppFont);
+ Point aConvert = PixelToLogic(rIn, MapMode(MapUnit::MapAppFont));
if( aConvert.X() < 0 )
aConvert.X() = 0;
if( aConvert.X() >= PREVIEW_WIDTH )
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index 66778e06369d..d8e7eb3f4591 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -102,7 +102,7 @@ bool GIFWriter::WriteGIF(const Graphic& rGraphic, FilterConfigItem* pFilterConfi
bool bLogSize = ( aMap.GetMapUnit() != MapUnit::MapPixel );
if( bLogSize )
- aSize100 = OutputDevice::LogicToLogic( rGraphic.GetPrefSize(), aMap, MapUnit::Map100thMM );
+ aSize100 = OutputDevice::LogicToLogic(rGraphic.GetPrefSize(), aMap, MapMode(MapUnit::Map100thMM));
bStatus = true;
nLastPercent = 0;
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index c407c9fcbde1..a155d8d5dd65 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -456,7 +456,7 @@ void PSWriter::ImplWriteProlog( const Graphic* pPreview )
ImplWriteLong( 0 );
ImplWriteLong( 0 );
Size aSizePoint = OutputDevice::LogicToLogic( pMTF->GetPrefSize(),
- pMTF->GetPrefMapMode(), MapUnit::MapPoint );
+ pMTF->GetPrefMapMode(), MapMode(MapUnit::MapPoint));
ImplWriteLong( aSizePoint.Width() );
ImplWriteLong( aSizePoint.Height() ,PS_RET );
ImplWriteLine( "%%Pages: 0" );
diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx
index 5a77fad0fc23..f02985fc1658 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -195,7 +195,7 @@ bool TIFFWriter::WriteTIFF( const Graphic& rGraphic, FilterConfigItem const * pF
if ( aMapMode.GetMapUnit() != MapUnit::MapPixel )
{
const Size aPrefSize( rGraphic.GetPrefSize() );
- aDestMapSize = OutputDevice::LogicToLogic( aPrefSize, aMapMode, MapUnit::MapInch );
+ aDestMapSize = OutputDevice::LogicToLogic(aPrefSize, aMapMode, MapMode(MapUnit::MapInch));
}
ImplWriteResolution( mnXResPos, aDestMapSize.Width() );
ImplWriteResolution( mnYResPos, aDestMapSize.Height() );
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index 65414afe6a82..4d6001cd9538 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -135,17 +135,17 @@ static void MakeAsMeta(Graphic &rGraphic)
if( !aSize.Width() || !aSize.Height() )
aSize = Application::GetDefaultDevice()->PixelToLogic(
- aBmp.GetSizePixel(), MapUnit::Map100thMM );
+ aBmp.GetSizePixel(), MapMode(MapUnit::Map100thMM));
else
aSize = OutputDevice::LogicToLogic( aSize,
- aBmp.GetPrefMapMode(), MapUnit::Map100thMM );
+ aBmp.GetPrefMapMode(), MapMode(MapUnit::Map100thMM));
pVDev->EnableOutput( false );
aMtf.Record( pVDev );
pVDev->DrawBitmap( Point(), aSize, rGraphic.GetBitmap() );
aMtf.Stop();
aMtf.WindStart();
- aMtf.SetPrefMapMode( MapUnit::Map100thMM );
+ aMtf.SetPrefMapMode(MapMode(MapUnit::Map100thMM));
aMtf.SetPrefSize( aSize );
rGraphic = aMtf;
}
@@ -554,7 +554,7 @@ void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead,
pVDev->Pop();
aMtf.Stop();
aMtf.WindStart();
- aMtf.SetPrefMapMode( MapUnit::MapPoint );
+ aMtf.SetPrefMapMode(MapMode(MapUnit::MapPoint));
aMtf.SetPrefSize( Size( nWidth, nHeight ) );
rGraphic = aMtf;
}
@@ -731,13 +731,13 @@ ipsGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
aMtf.Record( pVDev );
aSize = aBitmap.GetPrefSize();
if( !aSize.Width() || !aSize.Height() )
- aSize = Application::GetDefaultDevice()->PixelToLogic( aBitmap.GetSizePixel(), MapUnit::Map100thMM );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list