ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

fdo#39484 - don't loose outlines while trying to undo formulae changes.

Browse Source 
Change-Id: Ib3b2bab5beffb8164a8cd2c0b4db4c97f427507e
This commit is contained in:
Michael Meeks
2013-08-22 17:48:59 +01:00
parent 3f8c36caef
commit e851ea0ed3
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc/inc/global.hxx
+5 -4
View File
@@ -187,12 +187,13 @@ const sal_uInt16 IDF_HARDATTR = 0x0020; /// Hard cell attributes.
const sal_uInt16 IDF_STYLES = 0x0040; /// Cell styles.
const sal_uInt16 IDF_OBJECTS = 0x0080; /// Drawing objects.
const sal_uInt16 IDF_EDITATTR = 0x0100; /// Rich-text attributes.
const sal_uInt16 IDF_SPECIAL_BOOLEAN = 0x1000;
const sal_uInt16 IDF_ATTRIB = IDF_HARDATTR | IDF_STYLES;
const sal_uInt16 IDF_CONTENTS = IDF_VALUE | IDF_DATETIME | IDF_STRING | IDF_NOTE | IDF_FORMULA;
const sal_uInt16 IDF_ALL = IDF_CONTENTS | IDF_ATTRIB | IDF_OBJECTS;
const sal_uInt16 IDF_OUTLINE = 0x0800; /// Sheet / outlining (grouping) information
const sal_uInt16 IDF_NOCAPTIONS = 0x0200; /// Internal use only (undo etc.): do not copy/delete caption objects of cell notes.
const sal_uInt16 IDF_ADDNOTES = 0x0400; /// Internal use only (copy from clip): do not delete existing cell contents when pasting notes.
const sal_uInt16 IDF_SPECIAL_BOOLEAN = 0x1000;
const sal_uInt16 IDF_ATTRIB = IDF_HARDATTR | IDF_STYLES | IDF_OUTLINE;
const sal_uInt16 IDF_CONTENTS = IDF_VALUE | IDF_DATETIME | IDF_STRING | IDF_NOTE | IDF_FORMULA | IDF_OUTLINE;
const sal_uInt16 IDF_ALL = IDF_CONTENTS | IDF_ATTRIB | IDF_OBJECTS;
/// Copy flags for auto/series fill functions: do not touch notes and drawing objects.
const sal_uInt16 IDF_AUTOFILL = IDF_ALL & ~(IDF_NOTE | IDF_OBJECTS);
sc/source/core/data/table2.cxx
+2 -1
View File
@@ -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 );
}
sc/source/ui/view/viewfun3.cxx
+1 -1
View File
@@ -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 )
{