diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-12-02 08:06:44 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-12-02 08:08:08 +0100 |
| commit | d9a97d141e80d55f0f7aa3810cb4ce57a7781de5 (patch) | |
| tree | 89fd49f8c6f094a0f5ab981cf76fddfb4d0da48d | |
| parent | a14cfd3d77104aee3e3c3d981a135161295197df (diff) | |
don't use fixed size icon sets, fdo#62652
actually we should switch to svg as soon as it becomes possible
Change-Id: Ifbbe5befab94441f04fadb90b779e0bc8c15eda4
| -rw-r--r-- | sc/source/ui/view/output.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 089d4d8c07fb..71d469e780a1 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -890,11 +890,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, |