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 /sw/source/ui/dbui/mmaddressblockpage.cxx | |
| 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 'sw/source/ui/dbui/mmaddressblockpage.cxx')
| -rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 5d92cec760b0..cbb93621468c 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -64,14 +64,14 @@ SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage( SwMailMergeWizard* _pP get(m_pSettingsFI, "settingsft"); get(m_pAddressCB, "address"); get(m_pSettingsWIN, "settingspreview"); - Size aSize(LogicToPixel(Size(164 , 45), MAP_APPFONT)); + Size aSize(LogicToPixel(Size(164 , 45), MapUnit::MapAppFont)); m_pSettingsWIN->set_width_request(aSize.Width()); m_pSettingsWIN->set_height_request(aSize.Height()); get(m_pSettingsPB, "settings"); get(m_pHideEmptyParagraphsCB, "hideempty"); get(m_pAssignPB, "assign"); get(m_pPreviewWIN, "addresspreview"); - aSize = LogicToPixel(Size(176, 46), MAP_APPFONT); + aSize = LogicToPixel(Size(176, 46), MapUnit::MapAppFont); m_pPreviewWIN->set_width_request(aSize.Width()); m_pPreviewWIN->set_height_request(aSize.Height()); get(m_pDocumentIndexFI, "documentindex"); @@ -322,7 +322,7 @@ SwSelectAddressBlockDialog::SwSelectAddressBlockDialog( , m_rConfig(rConfig) { get(m_pPreview, "preview"); - Size aSize(m_pPreview->LogicToPixel(Size(192, 100), MAP_APPFONT)); + Size aSize(m_pPreview->LogicToPixel(Size(192, 100), MapUnit::MapAppFont)); m_pPreview->set_width_request(aSize.Width()); m_pPreview->set_height_request(aSize.Height()); get(m_pNewPB, "new"); @@ -858,7 +858,7 @@ SwAssignFieldsControl::SwAssignFieldsControl(vcl::Window* pParent, WinBits nBits Size SwAssignFieldsControl::GetOptimalSize() const { - return LogicToPixel(Size(248 , 120), MAP_APPFONT); + return LogicToPixel(Size(248 , 120), MapUnit::MapAppFont); } void SwAssignFieldsControl::Init(SwMailMergeConfigItem& rConfigItem) @@ -1163,7 +1163,7 @@ SwAssignFieldsDialog::SwAssignFieldsDialog( get(m_pPreviewFI, "PREVIEW_LABEL"); get(m_pOK, "ok"); get(m_pPreviewWIN, "PREVIEW"); - Size aSize(LogicToPixel(Size(248 , 45), MAP_APPFONT)); + Size aSize(LogicToPixel(Size(248 , 45), MapUnit::MapAppFont)); m_pPreviewWIN->set_width_request(aSize.Width()); m_pPreviewWIN->set_height_request(aSize.Height()); get(m_pFieldsControl, "FIELDS"); @@ -1327,7 +1327,7 @@ void AddressMultiLineEdit::dispose() Size AddressMultiLineEdit::GetOptimalSize() const { - return LogicToPixel(Size(160, 60), MAP_APPFONT); + return LogicToPixel(Size(160, 60), MapUnit::MapAppFont); } VCL_BUILDER_DECL_FACTORY(AddressMultiLineEdit) |