From 14c8f1311c985775806a93a41fa8cd8be40294aa Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Fri, 7 Dec 2007 09:40:37 +0000
Subject: INTEGRATION: CWS npower8 (1.28.4); FILE MERGED 2007/10/11 19:21:37
 npower 1.28.4.2: RESYNC: (1.28-1.29); FILE MERGED 2007/07/18 13:42:05 npower
 1.28.4.1: #i68902# all vba code to access a copy of SfxItemSet that hasn't
 had ClearInvalidItems called on it

---
 sc/inc/cellsuno.hxx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'sc/inc/cellsuno.hxx')

diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index a1afc0528c30..d4888fbe092b 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: cellsuno.hxx,v $
  *
- *  $Revision: 1.29 $
+ *  $Revision: 1.30 $
  *
- *  last change: $Author: vg $ $Date: 2007-05-22 19:37:43 $
+ *  last change: $Author: vg $ $Date: 2007-12-07 10:40:37 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -292,6 +292,8 @@ class SC_DLLPUBLIC ScCellRangesBase : public com::sun::star::beans::XPropertySet
 {
     friend class ScTabViewObj;      // fuer select()
     friend class ScTableSheetObj;   // fuer createCursorByRange()
+    friend class NumFormatHelper;   // VBA helper Class that helps manipulate format data
+    friend class ScVbaRange;    //Main VBA helper class for Range
 
 private:
     SfxItemPropertySet      aPropSet;
@@ -300,6 +302,7 @@ private:
     ScPatternAttr*          pCurrentFlat;
     ScPatternAttr*          pCurrentDeep;
     SfxItemSet*             pCurrentDataSet;
+    SfxItemSet*             pNoDfltCurrentDataSet;
     ScMarkData*             pMarkData;
     ScRangeList             aRanges;
     sal_Int64               nObjectId;
@@ -319,7 +322,7 @@ private:
 
     const ScPatternAttr*    GetCurrentAttrsFlat();
     const ScPatternAttr*    GetCurrentAttrsDeep();
-    SfxItemSet*             GetCurrentDataSet();
+    SfxItemSet*             GetCurrentDataSet(bool bNoDflt = false);
     const ScMarkData*       GetMarkData();
     void                    ForgetMarkData();
     void                    ForgetCurrentAttrs();
-- 
cgit