summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2018-02-09 11:22:41 +0200
committerCaolán McNamara <caolanm@redhat.com>2018-02-13 21:58:41 +0100
commit9cb3b0f5cbf7d35342ed2d5c5c1130f63ef050e3 (patch)
treed2f4d19443938df50fba3d8fed3f543b7916fc2e
parent973338389732d6da9c21288b3f3455fc35b9fe0a (diff)
tdf#107403 Don't scale frame icons twice
It's already done by ImplImageTree, see loadImageFromStream function in ImplImageTree.cxx. Change-Id: I5aa7439876037fb0168f6c1da264af9697788ef0 Reviewed-on: https://gerrit.libreoffice.org/49478 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> (cherry picked from commit 273d0ee7b7edb24c2c9e15e9f4337f71c175801a) Reviewed-on: https://gerrit.libreoffice.org/49549 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx8
1 files changed, 0 insertions, 8 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index efd6c4861f4e..997520fd5e32 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1967,14 +1967,6 @@ void SvxFrameWindow_Impl::InitImageList()
aImgVec.emplace_back(RID_SVXBMP_FRAME10);
aImgVec.emplace_back(RID_SVXBMP_FRAME11);
aImgVec.emplace_back(RID_SVXBMP_FRAME12);
-
- if (GetParent()->GetDPIScaleFactor() > 1)
- {
- for (size_t i = 0; i < aImgVec.size(); ++i)
- {
- aImgVec[i].Scale(GetParent()->GetDPIScaleFactor(), GetParent()->GetDPIScaleFactor());
- }
- }
}
static Color lcl_mediumColor( Color aMain, Color /*aDefault*/ )