diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-07 10:29:02 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2018-12-10 11:09:00 +0100 |
| commit | 89161e4d5835b93f0942e960a116a0d3863cc55c (patch) | |
| tree | 5c614702f3f553bd41f8082e48b841cf9db4c2e9 /formula | |
| parent | 3f4874dcff0423e045151eb8f435b2b1d057733b (diff) | |
use Image(OUString) instead of Image(Bitmap(OUString))
which benefits LOOL since we can delay creating the image until
we know the dpi setting of the display we are going to write to.
Achieved by
perl -pi -w -e "s/\bImage\s*\(\s*BitmapEx\s*\((\w+)\s*\)\s*\)/Image\(\1\)/g" $( git grep -lw "BitmapEx" )
followed by
git grep -nP '\bImage\s*\(\s*BitmapEx\s*\('
followed by commenting out the BitmapEx(OUString) constructor and seeing
what needed adjusting.
Change-Id: I3224e11937d720fa484b0d659d25673a9e809267
Reviewed-on: https://gerrit.libreoffice.org/64760
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/64860
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/ui/dlg/parawin.cxx | 8 | ||||
| -rw-r--r-- | formula/source/ui/dlg/structpg.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index e78adcc99bee..150da94f1d75 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -57,13 +57,13 @@ ParaWin::ParaWin(vcl::Window* pParent,IControlReferenceHandler* _pDlg): m_pFtArgDesc->SetText(""); get(m_pBtnFx1, "FX1"); - m_pBtnFx1->SetModeImage(Image(BitmapEx(BMP_FX))); + m_pBtnFx1->SetModeImage(Image(StockImage::Yes, BMP_FX)); get(m_pBtnFx2, "FX2"); - m_pBtnFx2->SetModeImage(Image(BitmapEx(BMP_FX))); + m_pBtnFx2->SetModeImage(Image(StockImage::Yes, BMP_FX)); get(m_pBtnFx3, "FX3"); - m_pBtnFx3->SetModeImage(Image(BitmapEx(BMP_FX))); + m_pBtnFx3->SetModeImage(Image(StockImage::Yes, BMP_FX)); get(m_pBtnFx4, "FX4"); - m_pBtnFx4->SetModeImage(Image(BitmapEx(BMP_FX))); + m_pBtnFx4->SetModeImage(Image(StockImage::Yes, BMP_FX)); get(m_pFtArg1, "FT_ARG1"); get(m_pFtArg2, "FT_ARG2"); diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx index 8f42601f5c53..addd5e4a795f 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -92,8 +92,8 @@ StructPage::StructPage(vcl::Window* pParent): WB_HASBUTTONS|WB_HSCROLL|WB_NOINITIALSELECTION); m_pTlbStruct->SetNodeDefaultImages(); - m_pTlbStruct->SetDefaultExpandedEntryBmp(Image(BitmapEx(BMP_STR_OPEN))); - m_pTlbStruct->SetDefaultCollapsedEntryBmp(Image(BitmapEx(BMP_STR_CLOSE))); + m_pTlbStruct->SetDefaultExpandedEntryBmp(Image(StockImage::Yes, BMP_STR_OPEN)); + m_pTlbStruct->SetDefaultCollapsedEntryBmp(Image(StockImage::Yes, BMP_STR_CLOSE)); m_pTlbStruct->SetSelectHdl(LINK( this, StructPage, SelectHdl ) ); |