From 1500ec88195466d119d73bdf7b85e8f5526e81fc Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 24 Jan 2019 11:47:54 +0000 Subject: tdf#122904: missing images in the format->paragraph->border valuesets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit since... commit 41b8b8c5ede634774851b438a4c823962c14b611 Date: Fri Jan 18 11:06:53 2019 +0200 use Image(OUString) instead of Image(Bitmap(OUString)) Change-Id: I05c2f8fb8190e9dde12e69de0d875b7bcc1ea617 Reviewed-on: https://gerrit.libreoffice.org/66861 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- cui/source/dialogs/hldocntp.cxx | 2 +- cui/source/dialogs/hldoctp.cxx | 4 ++-- cui/source/dialogs/hlmailtp.cxx | 2 +- cui/source/dialogs/hltpbase.cxx | 2 +- cui/source/tabpages/align.cxx | 6 +++--- cui/source/tabpages/border.cxx | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'cui') diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 4246bfec636f..b60de28efffb 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -111,7 +111,7 @@ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( vcl::Window *pParent, IconChoiceDia get(m_pCbbPath, "path"); m_pCbbPath->SetSmartProtocol(INetProtocol::File); get(m_pBtCreate, "create"); - m_pBtCreate->SetModeImage(Image(RID_SVXBMP_NEWDOC)); + m_pBtCreate->SetModeImage(Image(StockImage::Yes, RID_SVXBMP_NEWDOC)); get(m_pLbDocTypes, "types"); m_pLbDocTypes->set_height_request(m_pLbDocTypes->GetTextHeight() * 5); diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 968c420211c2..17597ab9dd27 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -42,11 +42,11 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* p get(m_pCbbPath, "path"); m_pCbbPath->SetSmartProtocol(INetProtocol::File); get(m_pBtFileopen, "fileopen"); - m_pBtFileopen->SetModeImage(Image(RID_SVXBMP_FILEOPEN)); + m_pBtFileopen->SetModeImage(Image(StockImage::Yes, RID_SVXBMP_FILEOPEN)); get(m_pEdTarget, "target"); get(m_pFtFullURL, "url"); get(m_pBtBrowse, "browse"); - m_pBtBrowse->SetModeImage(Image(RID_SVXBMP_TARGET)); + m_pBtBrowse->SetModeImage(Image(StockImage::Yes, RID_SVXBMP_TARGET)); // Disable display of bitmap names. m_pBtBrowse->EnableTextDisplay (false); diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index b56f34ff41c9..89809a3b394a 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -42,7 +42,7 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog* get(m_pCbbReceiver, "receiver"); m_pCbbReceiver->SetSmartProtocol(INetProtocol::Mailto); get(m_pBtAdrBook, "adressbook"); - m_pBtAdrBook->SetModeImage(Image(RID_SVXBMP_ADRESSBOOK)); + m_pBtAdrBook->SetModeImage(Image(StockImage::Yes, RID_SVXBMP_ADRESSBOOK)); get(m_pFtSubject, "subject_label"); get(m_pEdSubject, "subject"); diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 0becb6f69590..be8bae72b516 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -176,7 +176,7 @@ void SvxHyperlinkTabPageBase::InitStdControls () get(mpEdIndication, "indication"); get(mpEdText, "name"); get(mpBtScript, "script"); - mpBtScript->SetModeImage(Image(RID_SVXBMP_SCRIPT)); + mpBtScript->SetModeImage(Image(StockImage::Yes, RID_SVXBMP_SCRIPT)); mpBtScript->SetClickHdl ( LINK ( this, SvxHyperlinkTabPageBase, ClickScriptHdl_Impl ) ); mpBtScript->EnableTextDisplay (false); diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 0b230fc4cd05..a3ed47d518a4 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -596,9 +596,9 @@ void AlignmentTabPage::InitVsRefEgde() // remember selection - is deleted in call to ValueSet::Clear() sal_uInt16 nSel = m_aVsRefEdge.GetSelectedItemId(); - Image aBottomLock(RID_SVXBMP_BOTTOMLOCK); - Image aTopLock(RID_SVXBMP_TOPLOCK); - Image aCellLock(RID_SVXBMP_CELLLOCK); + Image aBottomLock(StockImage::Yes, RID_SVXBMP_BOTTOMLOCK); + Image aTopLock(StockImage::Yes, RID_SVXBMP_TOPLOCK); + Image aCellLock(StockImage::Yes, RID_SVXBMP_CELLLOCK); m_aVsRefEdge.Clear(); m_aVsRefEdge.SetStyle(m_aVsRefEdge.GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER); diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index aa48782017c9..74be368ca8e3 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -294,7 +294,7 @@ SvxBorderTabPage::SvxBorderTabPage(TabPageParent pParent, const SfxItemSet& rCor }; for (size_t i = 0; i < SAL_N_ELEMENTS(pnBorderImgIds); ++i) - m_aBorderImgVec.emplace_back(pnBorderImgIds[i]); + m_aBorderImgVec.emplace_back(StockImage::Yes, pnBorderImgIds[i]); static const OUStringLiteral pnShadowImgIds[SVX_BORDER_SHADOW_COUNT] = { @@ -306,7 +306,7 @@ SvxBorderTabPage::SvxBorderTabPage(TabPageParent pParent, const SfxItemSet& rCor }; for (size_t i = 0; i < SAL_N_ELEMENTS(pnShadowImgIds); ++i) - m_aShadowImgVec.emplace_back(pnShadowImgIds[i]); + m_aShadowImgVec.emplace_back(StockImage::Yes, pnShadowImgIds[i]); assert(m_aShadowImgVec.size() == SVX_BORDER_SHADOW_COUNT); // this page needs ExchangeSupport -- cgit