summaryrefslogtreecommitdiff
path: root/sc/source
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2013-08-22 17:45:18 +0100
committerMichael Meeks <michael.meeks@suse.com>2013-08-22 17:48:59 +0100
commite851ea0ed30e9bb95c273a29aeab7f48f606145f (patch)
treee5b34bcd060e1051e27032167f1c78da073ada0a /sc/source
parent3f8c36caef76ee1f688d35d39ac5bffe5d0f8319 (diff)
fdo#39484 - don't loose outlines while trying to undo formulae changes.
Change-Id: Ib3b2bab5beffb8164a8cd2c0b4db4c97f427507e
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/core/data/table2.cxx3
-rw-r--r--sc/source/ui/view/viewfun3.cxx2
2 files changed, 3 insertions, 2 deletions
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 349f9ac2444e..da3d42317669 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1265,7 +1265,8 @@ void ScTable::CopyToTable(
pDestTab->CopyConditionalFormat(nCol1, nRow1, nCol2, nRow2, 0, 0, this);
}
- pDestTab->SetOutlineTable( pOutlineTable ); // auch nur wenn bColRowFlags
+ if(nFlags & IDF_OUTLINE) // also only when bColRowFlags
+ pDestTab->SetOutlineTable( pOutlineTable );
}
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index afc2831dd798..ec7497044331 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -1161,7 +1161,7 @@ bool ScViewFunc::PasteFromClip( sal_uInt16 nFlags, ScDocument* pClipDoc,
// all sheets - CopyToDocument skips those that don't exist in pUndoDoc
SCTAB nTabCount = pDoc->GetTableCount();
pDoc->CopyToDocument( nStartCol, nStartRow, 0, nUndoEndCol, nUndoEndRow, nTabCount-1,
- nUndoFlags, false, pUndoDoc );
+ nUndoFlags, false, pUndoDoc );
if ( bCutMode )
{