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 /fpicker | |
| 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 'fpicker')
| -rw-r--r-- | fpicker/source/office/PlacesListBox.cxx | 2 | ||||
| -rw-r--r-- | fpicker/source/office/iodlg.cxx | 4 | ||||
| -rw-r--r-- | fpicker/source/office/iodlgimp.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx index c146c5756c06..e3a832bc7a09 100644 --- a/fpicker/source/office/PlacesListBox.cxx +++ b/fpicker/source/office/PlacesListBox.cxx @@ -28,7 +28,7 @@ PlacesListBox_Impl::PlacesListBox_Impl( PlacesListBox* pParent, const OUString& mpHeaderBar->SetPosSizePixel( Point( 0, 0 ), Size( 600, 16 ) ); long pTabs[] = { 2, 20, 600 }; - SetTabs( &pTabs[0], MAP_PIXEL ); + SetTabs( &pTabs[0], MapUnit::MapPixel ); mpHeaderBar->InsertItem( COLUMN_NAME, rTitle, 600, HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER ); Size aHeadSize = mpHeaderBar->GetSizePixel(); diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 9eab3c15cd6f..10140e0d371d 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -603,7 +603,7 @@ void SvtFileDialog::Init_Impl _pImp->_bMultiSelection = true; _pContainer.reset(VclPtr<CustomContainer>::Create(get<vcl::Window>("container"))); - Size aSize(LogicToPixel(Size(270, 85), MAP_APPFONT)); + Size aSize(LogicToPixel(Size(270, 85), MapUnit::MapAppFont)); _pContainer->set_height_request(aSize.Height()); _pContainer->set_width_request(aSize.Width()); _pContainer->set_hexpand(true); @@ -2542,7 +2542,7 @@ void SvtFileDialog::AddControls_Impl( ) _pImp->_pPlaces = VclPtr<PlacesListBox>::Create(_pContainer, this, SVT_RESSTR(STR_PLACES_TITLE), WB_BORDER); _pImp->_pPlaces->SetHelpId("SVT_HID_FILESAVE_PLACES_LISTBOX"); - Size aSize(LogicToPixel(Size(50, 85), MAP_APPFONT)); + Size aSize(LogicToPixel(Size(50, 85), MapUnit::MapAppFont)); _pImp->_pPlaces->set_height_request(aSize.Height()); _pImp->_pPlaces->set_width_request(aSize.Width()); _pImp->_pPlaces->SetSizePixel(aSize); diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index 9cee811117a2..7d07f6e620f7 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -199,7 +199,7 @@ void SvtUpButton_Impl::Click() Size SvtUpButton_Impl::GetOptimalSize() const { - return LogicToPixel(Size(12, 12), MAP_APPFONT); + return LogicToPixel(Size(12, 12), MapUnit::MapAppFont); } // SvtExpFileDlg_Impl |