diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-12-02 08:06:44 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-12-02 05:10:49 -0600 |
commit | a9d6a9c78cccaa5068a21b9b0e526ab60bbcfabf (patch) | |
tree | aa8e8a038add2347a7fe843dc084c5af7af276ee | |
parent | 3b6ac4f3416b2542208745033aaecb3c7a520656 (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
Reviewed-on: https://gerrit.libreoffice.org/6890
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-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 5826efde66dc..9bbfee80f38d 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, |