#100962#: some attributes added for recording

3 files changed, 27 insertions, 37 deletions

diff --git a/sc/sdi/formatsh.sdi b/sc/sdi/formatsh.sdi
index 404c8cda3f34..198dfa9d81ab 100644
--- a/sc/sdi/formatsh.sdi
+++ b/sc/sdi/formatsh.sdi
@@ -3,7 +3,7 @@
  // StarCalc
  //
  // (C) 1994 StarDivision GmbH, Hamburg, Germany
- // $Author: nn $ $Date: 2002-05-02 11:38:41 $ $Revision: 1.3 $
+ // $Author: mba $ $Date: 2002-07-03 17:01:01 $ $Revision: 1.4 $
  // $Logfile:   T:/sc/sdi/formatsh.sdv  $ $Workfile:   formatsh.sdi  $
  //----------------------------------------------------------------------------
 
@@ -52,6 +52,11 @@ interface FormatForSelection : Selection
     // } Slot's die in der DrawShell disabled werden.
 
     SID_BACKGROUND_COLOR    [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]
+    SID_ATTR_BRUSH      [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]
+    SID_ATTR_CHAR_STRIKEOUT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]
+    SID_ATTR_CHAR_CONTOUR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]
+    SID_ATTR_CHAR_SHADOWED [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]
+    SID_ATTR_CHAR_RELIEF [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]
     SID_ALIGNLEFT       [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ]
     SID_ALIGNRIGHT      [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ]
     SID_ALIGNTOP        [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ]
@@ -66,6 +71,7 @@ interface FormatForSelection : Selection
         SID_TEXTDIRECTION_LEFT_TO_RIGHT [ ExecMethod = ExecuteTextDirection; StateMethod = GetTextDirectionState; ]
         SID_TEXTDIRECTION_TOP_TO_BOTTOM [ ExecMethod = ExecuteTextDirection; StateMethod = GetTextDirectionState; ]
 
+    SID_ATTR_NUMBERFORMAT_VALUE       [ ExecMethod = ExecuteNumFormat; StateMethod = GetNumFormatState;]
     SID_NUMBER_FORMAT       [ ExecMethod = ExecuteNumFormat; StateMethod = GetNumFormatState;]
     SID_NUMBER_TWODEC       [ ExecMethod = ExecuteNumFormat;]
     SID_NUMBER_SCIENTIFIC   [ ExecMethod = ExecuteNumFormat;]
@@ -79,7 +85,8 @@ interface FormatForSelection : Selection
 
     SID_ATTR_BORDER             [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]   //XXX
     SID_ATTR_BORDER_INNER       [                           StateMethod = GetBorderState; ] // status()
-//  SID_ATTR_BORDER_OUTER       [ ExecMethod = ExecuteAttr; StateMethod = GetBorderState; ] // status()
+    SID_ATTR_BORDER_OUTER       [ ExecMethod = ExecuteAttr; StateMethod = GetBorderState; ]
+    SID_ATTR_BORDER_SHADOW      [ ExecMethod = ExecuteAttr; StateMethod = GetBorderState; ]
     SID_ATTR_ALIGN_LINEBREAK    [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]
     SID_FRAME_LINESTYLE         [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]
     SID_FRAME_LINECOLOR         [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]
@@ -96,6 +103,9 @@ shell ScFormatShell
 
 /*------------------------------------------------------------------------
     $Log: not supported by cvs2svn $
+    Revision 1.3  2002/05/02 11:38:41  nn
+    #99070# removed special names and flags from common slots
+
     Revision 1.2  2002/04/03 15:11:42  dr
     #98410# Asian vertical writing
 
diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx
index 8604b5b307bf..116c7c2da204 100644
--- a/sc/source/ui/app/typemap.cxx
+++ b/sc/source/ui/app/typemap.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: typemap.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: nn $ $Date: 2001-04-23 11:43:01 $
+ *  last change: $Author: mba $ $Date: 2002-07-03 17:01:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,7 +62,6 @@
 #pragma hdrstop
 
 #include <svx/svxids.hrc>
-//#include <svx/hlnkitem.hxx>
 #include "scitems.hxx"
 
 #define ITEMID_ADJUST           0
@@ -138,42 +137,19 @@
 #include <svx/xftsfit.hxx>
 #include <svx/langitem.hxx>
 #include <svx/grafctrl.hxx>
+#include <svx/shdditem.hxx>
+#include <svx/shaditem.hxx>
+#include <svx/cntritem.hxx>
+#include <svx/crsditem.hxx>
+#include <svx/brkitem.hxx>
+#include <svx/charreliefitem.hxx>
 
 #include "attrib.hxx"
 
-#define CharSetItem                 SfxUInt16Item
-#define FontFamilyItem              SfxUInt16Item
-#define FontPitchItem               SfxUInt16Item
-#define FontAlignItem               SfxUInt16Item
-#define FontWeightItem              SfxUInt16Item
-#define FontUnderlineItem           SfxUInt16Item
-#define FontStrikeoutItem           SfxUInt16Item
-#define FontItalicItem              SfxUInt16Item
-#define SvxShadowedItem             SfxUInt16Item
-#define SvxContourItem              SfxUInt16Item
-#define SvxCrossedOutItem           SfxUInt16Item
-#define SvxDbTypeItem               SfxUInt16Item
-#define SvxLineSpaceItem            SfxUInt16Item
-#define SvxInterLineSpaceItem       SfxUInt16Item
-#define SvxBreakItem                SfxUInt16Item
-#define BrushStyleItem              SfxUInt16Item
-#define SvxNumTypeItem              SfxUInt16Item
-#define SvxShadowLocationItem       SfxUInt16Item
-#define SvxDbTypeItem               SfxUInt16Item
-#define SvxChooseControlEnumItem    SfxUInt16Item
-#define SvxDrawToolEnumItem         SfxUInt16Item
-
-//#define SvxChooseControlItem      SfxUInt16Item
-//#define SvxDrawToolItem               SfxUInt16Item
-#define SvxDrawToolItem             SfxEnumItem
+#define SvxDrawToolItem             SfxUInt16Item
 #define SvxDrawAlignItem            SfxEnumItem
 #define SvxChooseControlItem        SfxEnumItem
 
-#define SvxCellHorJustifyEnumItem   SfxUInt16Item
-#define SvxCellVerJustifyEnumItem   SfxUInt16Item
-#define SvxCellOrientationEnumItem  SfxUInt16Item
-#define SvxLanguage                 SfxUInt16Item
-
 #define SFX_TYPEMAP
 #include "scslots.hxx"
 
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index a8d0639dcd02..8e1c31acab9e 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: formatsh.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: nn $ $Date: 2002-05-03 11:58:47 $
+ *  last change: $Author: mba $ $Date: 2002-07-03 17:01:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1285,8 +1285,12 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
 
         switch ( nSlot )
         {
+            case SID_ATTR_CHAR_STRIKEOUT:
             case SID_ATTR_ALIGN_LINEBREAK:
             case SID_ATTR_CHAR_COLOR:
+            case SID_ATTR_CHAR_CONTOUR:
+            case SID_ATTR_CHAR_SHADOWED:
+            case SID_ATTR_CHAR_RELIEF:
                 pTabViewShell->ApplyAttr( pNewAttrs->Get( pNewAttrs->GetPool()->GetWhich( nSlot ) ) );
                 rBindings.Invalidate( nSlot );
                 rBindings.Update( nSlot );