sc/source/core/data/table2.cxx | 6 ++++++ sc/source/ui/view/viewfun3.cxx | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-)
New commits: commit 07a7f97b21a02284456e575fe4404f0d216a6723 Author: Markus Mohrhard <[email protected]> Date: Wed Apr 17 03:13:23 2013 +0200 replace one more auto_ptr Change-Id: I903be81ba3e23c43a481ba775d762c06557942db diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index a39be5b..9f091a6 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -1615,9 +1615,7 @@ bool ScViewFunc::PasteFromClipToMultiRanges( } } - SAL_WNODEPRECATED_DECLARATIONS_PUSH - std::auto_ptr<ScDocument> pMixDoc; - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr<ScDocument> pMixDoc; if (bSkipEmpty || nFunction) { if (nFlags & IDF_CONTENTS) commit 0216d0e1ff84ae8ebab3d40bf69bae605264e82b Author: Markus Mohrhard <[email protected]> Date: Wed Apr 17 03:05:16 2013 +0200 copy conditional formats correctly, fdo#63607 Change-Id: I80307944c5a9a873f972e6c349ec4fe48ae848e9 diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 5b024fd..5af802f 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -1128,6 +1128,12 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, if (bFlagChange) pDestTab->InvalidatePageBreaks(); + if(nFlags & IDF_ATTRIB) + { + pDestTab->mpCondFormatList->DeleteArea(nCol1, nRow1, nCol2, nRow2); + pDestTab->CopyConditionalFormat(nCol1, nRow1, nCol2, nRow2, 0, 0, this); + } + pDestTab->SetOutlineTable( pOutlineTable ); // auch nur wenn bColRowFlags } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
