sc/source/core/data/table2.cxx | 2 +- sc/source/ui/view/output.cxx | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)
New commits: commit b86eb5b3c776573713ae07a274a77e528fc33e22 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 diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 089d4d8..71d469e 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, commit bc31db3f3315e7b80118f2070270769dd226de78 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Mon Dec 2 06:05:19 2013 +0100 we want to delete anytime that attribs are overwritten, fdo#72149 Change-Id: I1ed50e6daf5b363c46e31d1a0efacf7728621b1a diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index d7fca4f..30771ab 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -662,7 +662,7 @@ void ScTable::CopyFromClip( for ( SCCOL i = nCol1; i <= nCol2; i++) aCol[i].CopyFromClip(rCxt, nRow1, nRow2, nDy, pTable->aCol[i - nDx]); // notes are handles at column level - if (rCxt.getInsertFlag() == IDF_ATTRIB) + if (rCxt.getInsertFlag() & IDF_ATTRIB) { // make sure that there are no old references to the cond formats sal_uInt16 nWhichArray[2]; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits