mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#69450 - IDF_ATTRIB & IDF_CONTENTS must be disjoint.

Browse Source 
Change-Id: Ib971824a7f274334012b872acec65310535ad767
This commit is contained in:
Michael Meeks
2013-09-27 15:59:32 +02:00
parent d5ad8ec23e
commit ac14ac29a4
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sc/inc/global.hxx
View File

@@ -187,7 +187,7 @@ const sal_uInt16 IDF_OUTLINE = 0x0800; /// Sheet / outlining (grouping) inf
const sal_uInt16 IDF_NOCAPTIONS = 0x0200; /// Internal use only (undo etc.): do not copy/delete caption objects of cell notes. 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_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_SPECIAL_BOOLEAN = 0x1000;
const sal_uInt16 IDF_ATTRIB = IDF_HARDATTR | IDF_STYLES | IDF_OUTLINE; const sal_uInt16 IDF_ATTRIB = IDF_HARDATTR | IDF_STYLES;
const sal_uInt16 IDF_CONTENTS = IDF_VALUE | IDF_DATETIME | IDF_STRING | IDF_NOTE | IDF_FORMULA | 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; const sal_uInt16 IDF_ALL = IDF_CONTENTS | IDF_ATTRIB | IDF_OBJECTS;

5
sc/qa/unit/ucalc.cxx
View File

@@ -503,6 +503,11 @@ void Test::testInput()
m_pDoc->DeleteTab(0); m_pDoc->DeleteTab(0);
} }
void Test::testCopyAttributes()
{
CPPUNIT_ASSERT_MESSAGE ("mashed up attributes", !(IDF_ATTRIB & IDF_CONTENTS));
}
void Test::testCopyToDocument() void Test::testCopyToDocument()
{ {
CPPUNIT_ASSERT_MESSAGE ("failed to insert sheet", m_pDoc->InsertTab (0, "src")); CPPUNIT_ASSERT_MESSAGE ("failed to insert sheet", m_pDoc->InsertTab (0, "src"));

1
sc/qa/unit/ucalc.hxx
View File

@@ -105,6 +105,7 @@ public:
void testFuncINDIRECT(); void testFuncINDIRECT();
void testFuncIFERROR(); void testFuncIFERROR();
void testFuncGETPIVOTDATA(); void testFuncGETPIVOTDATA();
void testCopyAttributes();
void testCopyToDocument(); void testCopyToDocument();
/** /**