sc/inc/global.hxx | 2 +-
sc/qa/unit/ucalc.cxx | 5 +++++
sc/qa/unit/ucalc.hxx | 1 +
3 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit ac14ac29a4d069b3e85032237efed2f899a10c7b
Author: Michael Meeks <michael.me...@collabora.com>
Date: Fri Sep 27 15:59:32 2013 +0200
fdo#69450 - IDF_ATTRIB & IDF_CONTENTS must be disjoint.
Change-Id: Ib971824a7f274334012b872acec65310535ad767
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 180912b..ee9317a 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -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_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_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_ALL = IDF_CONTENTS | IDF_ATTRIB | IDF_OBJECTS;
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index b0b6f32..8d2266e 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -503,6 +503,11 @@ void Test::testInput()
m_pDoc->DeleteTab(0);
}
+void Test::testCopyAttributes()
+{
+ CPPUNIT_ASSERT_MESSAGE ("mashed up attributes", !(IDF_ATTRIB &
IDF_CONTENTS));
+}
+
void Test::testCopyToDocument()
{
CPPUNIT_ASSERT_MESSAGE ("failed to insert sheet", m_pDoc->InsertTab (0,
"src"));
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 3c46cab..d01714e 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -105,6 +105,7 @@ public:
void testFuncINDIRECT();
void testFuncIFERROR();
void testFuncGETPIVOTDATA();
+ void testCopyAttributes();
void testCopyToDocument();
/**
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
