sc/source/ui/view/output.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit a9d6a9c78cccaa5068a21b9b0e526ab60bbcfabf
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Mon Dec 2 08:06:44 2013 +0100
don't use fixed size icon sets, fdo#62652
actually we should switch to svg as soon as it becomes possible
Change-Id: Ifbbe5befab94441f04fadb90b779e0bc8c15eda4
Reviewed-on: https://gerrit.libreoffice.org/6890
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 5826efd..9bbfee8 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -882,11 +882,12 @@ BitmapEx& getIcon( ScIconSetType eType, sal_Int32 nIndex )
void drawIconSets( const ScIconSetInfo* pOldIconSetInfo, OutputDevice* pDev,
const Rectangle& rRect )
{
- long nSize = 16;
+ //long nSize = 16;
ScIconSetType eType = pOldIconSetInfo->eIconSetType;
sal_Int32 nIndex = pOldIconSetInfo->nIconIndex;
BitmapEx& rIcon = getIcon( eType, nIndex );
- pDev->DrawBitmapEx( Point( rRect.Left() +2, rRect.Top() + 2 ), Size(
nSize, nSize ), rIcon );
+ long aOrigSize = std::max<long>(0,std::min(rRect.GetSize().getWidth() - 4,
rRect.GetSize().getHeight() -4));
+ pDev->DrawBitmapEx( Point( rRect.Left() +2, rRect.Top() + 2 ),
Size(aOrigSize, aOrigSize), rIcon );
}
void drawCells(const Color* pColor, const SvxBrushItem* pBackground, const
Color*& pOldColor, const SvxBrushItem*& pOldBackground,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
