[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-2' - sc/inc

[Michael Meeks]

 sc/inc/global.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9f5228cfbf9c6dde54215f75faccacb28abf67c0
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Sep 27 15:59:32 2013 +0200

    fdo#69450 - IDF_ATTRIB & IDF_CONTENTS must be disjoint.
    
    Change-Id: Ib971824a7f274334012b872acec65310535ad767
    Signed-off-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Signed-off-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Signed-off-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 69c33d7..a3f89fb 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -191,7 +191,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;