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 /formula | |
| 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 'formula')
| -rw-r--r-- | formula/source/ui/dlg/formula.cxx | 2 | ||||
| -rw-r--r-- | formula/source/ui/dlg/funcpage.cxx | 2 | ||||
| -rw-r--r-- | formula/source/ui/dlg/structpg.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index b758523ae951..913106c07500 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -272,7 +272,7 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent m_pFtFuncName->SetText(""); pParent->get(m_pMEFormula, "ed_formula"); - Size aSize(pParent->LogicToPixel(Size(203, 43), MAP_APPFONT)); + Size aSize(pParent->LogicToPixel(Size(203, 43), MapUnit::MapAppFont)); m_pMEFormula->set_height_request(aSize.Height()); m_pMEFormula->set_width_request(aSize.Width()); pParent->get(m_pBtnMatrix, "array"); diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index 42dd5adc1656..9a20545c9228 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -65,7 +65,7 @@ FuncPage::FuncPage(vcl::Window* pParent,const IFunctionManager* _pFunctionManage get(m_pLbCategory, "category"); get(m_pLbFunction, "function"); m_pLbFunction->SetStyle(m_pLbFunction->GetStyle() | WB_SORT); - Size aSize(LogicToPixel(Size(86 , 162), MAP_APPFONT)); + Size aSize(LogicToPixel(Size(86 , 162), MapUnit::MapAppFont)); m_pLbFunction->set_height_request(aSize.Height()); m_pLbFunction->set_width_request(aSize.Width()); m_aHelpId = m_pLbFunction->GetHelpId(); diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx index 7b5c4bcd7ca0..f60862c5c6b5 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -87,7 +87,7 @@ StructPage::StructPage(vcl::Window* pParent): pSelectedToken ( nullptr ) { get(m_pTlbStruct, "struct"); - Size aSize(LogicToPixel(Size(86, 162), MAP_APPFONT)); + Size aSize(LogicToPixel(Size(86, 162), MapUnit::MapAppFont)); m_pTlbStruct->set_height_request(aSize.Height()); m_pTlbStruct->set_width_request(aSize.Width()); m_pTlbStruct->SetStyle(m_pTlbStruct->GetStyle()|WB_HASLINES|WB_CLIPCHILDREN| |