diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-10-26 23:15:06 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-10-26 23:17:45 +0200 |
| commit | 11d2f3d6e1b6c9baf43d8521293c53525108436d (patch) | |
| tree | ffe35d5d47713a11c93c3bf11f588eeaf492fc16 /desktop | |
| parent | 213f7c02d4f3ddbe2f52950575e2559c52d98ac2 (diff) | |
vcl: make MapMode constructor explicit
Insert constructor everywhere, except a couple places that apparently
want to compare GetMapUnit().
Change-Id: I1910deb60562e5e949203435e827057f70a3f988
Diffstat (limited to 'desktop')
4 files changed, 5 insertions, 5 deletions
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()); |