diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-20 16:41:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-05 06:51:20 +0000 |
| commit | 954f752cf10fc6a8777af2a6a93e496688464687 (patch) | |
| tree | 0fc776cdcb6ad9b1d2b9673ac044bb5b4f496972 /desktop | |
| parent | c1e18e05a53c1d55afe36a887ca25f74f3f1d32d (diff) | |
convert MapUnit to scoped enum
I left a prefix on the names "Map" so that I would not have to re-arrange
each name too much, since I can't start identifiers with digits like "100thMM"
And remove RSC_EXTRAMAPUNIT, which doesn't seem to be doing anything anymore.
Change-Id: I5187824aa87e30caf5357b51b5384b5ab919d224
Reviewed-on: https://gerrit.libreoffice.org/29096
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop')
4 files changed, 6 insertions, 6 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index fd15aae69031..553f1f5c1e88 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -184,7 +184,7 @@ void ExtBoxWithBtns_Impl::InitFromDialog(ExtMgrDialog *pParentDialog) m_pRemoveBtn->SetText( DialogHelper::getResourceString( RID_CTX_ITEM_REMOVE ) ); Size aSize = LogicToPixel( Size( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ), - MapMode( MAP_APPFONT ) ); + MapMode( MapUnit::MapAppFont ) ); m_pOptionsBtn->SetSizePixel( aSize ); m_pEnableBtn->SetSizePixel( aSize ); m_pRemoveBtn->SetSizePixel( aSize ); @@ -1574,7 +1574,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), MAP_APPFONT)); + Size aSize(m_pLicenseText->LogicToPixel(Size(290, 170), 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 375512bfc939..2eaef2913346 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -756,7 +756,7 @@ void ExtensionBox_Impl::Resize() Size ExtensionBox_Impl::GetOptimalSize() const { - return LogicToPixel(Size(250, 150), MAP_APPFONT); + return LogicToPixel(Size(250, 150), MapUnit::MapAppFont); } VCL_BUILDER_DECL_FACTORY(ExtensionBox) diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index caf95d46c575..85ae2a080748 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -510,7 +510,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), MAP_APPFONT)); + Size aSize(LogicToPixel(Size(240, 51), MapUnit::MapAppFont)); m_pUpdates->set_width_request(aSize.Width()); m_pUpdates->set_height_request(aSize.Height()); m_pUpdates->Show(); @@ -521,7 +521,7 @@ UpdateDialog::UpdateDialog( get(m_pReleaseNotesLabel, "RELEASE_NOTES_LABEL"); get(m_pReleaseNotesLink, "RELEASE_NOTES_LINK"); get(m_pDescriptions, "DESCRIPTIONS"); - aSize = LogicToPixel(Size(240, 59), MAP_APPFONT); + aSize = LogicToPixel(Size(240, 59), 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 e94db4bb5f6b..6540181139db 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -216,7 +216,7 @@ LicenseDialogImpl::LicenseDialogImpl( m_pArrow2->Show(false); get(m_pLicense, "textview"); - Size aSize(m_pLicense->LogicToPixel(Size(290, 170), MAP_APPFONT)); + Size aSize(m_pLicense->LogicToPixel(Size(290, 170), MapUnit::MapAppFont)); m_pLicense->set_width_request(aSize.Width()); m_pLicense->set_height_request(aSize.Height()); |