From 954f752cf10fc6a8777af2a6a93e496688464687 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 20 Sep 2016 16:41:39 +0200 Subject: 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 Tested-by: Noel Grandin --- xmlsecurity/source/dialogs/certificatechooser.cxx | 2 +- xmlsecurity/source/dialogs/certificateviewer.cxx | 2 +- xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 2 +- xmlsecurity/source/dialogs/macrosecurity.cxx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'xmlsecurity/source/dialogs') diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index 499ad49f5063..f7ba620b7577 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -57,7 +57,7 @@ CertificateChooser::CertificateChooser(vcl::Window* _pParent, uno::Reference("signatures"); pSignatures->set_width_request(aControlSize.Width()); pSignatures->set_height_request(aControlSize.Height()); diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 9f42cd127970..df1b985e18e2 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -363,7 +363,7 @@ CertificateViewerCertPathTP::CertificateViewerCertPathTP( vcl::Window* _pParent, maCertImage = get("imgok")->GetImage(); maCertNotValidatedImage = get("imgnotok")->GetImage(); - Size aControlSize(LogicToPixel(Size(251, 45), MAP_APPFONT)); + Size aControlSize(LogicToPixel(Size(251, 45), MapUnit::MapAppFont)); mpCertPathLB->set_width_request(aControlSize.Width()); mpCertPathLB->set_height_request(aControlSize.Height()); mpCertStatusML->set_width_request(aControlSize.Width()); diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index ca33f875b38b..0a74f2993c7a 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -131,7 +131,7 @@ DigitalSignaturesDialog::DigitalSignaturesDialog( Size aControlSize(275, 109); const long nControlWidth = aControlSize.Width(); - aControlSize = LogicToPixel(aControlSize, MAP_APPFONT); + aControlSize = LogicToPixel(aControlSize, MapUnit::MapAppFont); SvSimpleTableContainer *pSignatures = get("signatures"); pSignatures->set_width_request(aControlSize.Width()); pSignatures->set_height_request(aControlSize.Height()); diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index b5771f4b3b78..62f67cbfd31e 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -357,7 +357,7 @@ public: { const long nControlWidth = GetSizePixel().Width(); long aTabLocs[] = { 3, 0, 35*nControlWidth/100, 70*nControlWidth/100 }; - SvSimpleTable::SetTabs(aTabLocs, MAP_PIXEL); + SvSimpleTable::SetTabs(aTabLocs, MapUnit::MapPixel); } } }; -- cgit