#98405#: Slots reorganized

4 files changed, 74 insertions, 127 deletions

diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 387e9b5cfb86..d8a32925eb60 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cmdid.h,v $
  *
- *  $Revision: 1.28 $
+ *  $Revision: 1.29 $
  *
- *  last change: $Author: tl $ $Date: 2002-05-23 08:16:36 $
+ *  last change: $Author: mba $ $Date: 2002-05-27 14:30:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,6 +67,7 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #include <sfx2/sfx.hrc>
 #endif
 
+#include <unomid.h>
 /* Flags die mittels des Disable-Features in den Slot-Definitionen ausgenutzt
  * werden */
 #define SW_DISABLE_ON_PROTECTED_CURSOR  0x00000001
diff --git a/sw/sdi/switems.sdi b/sw/sdi/switems.sdi
index 28dddddf0b37..0103a6f31c90 100644
--- a/sw/sdi/switems.sdi
+++ b/sw/sdi/switems.sdi
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: switems.sdi,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2001-09-28 07:01:35 $
+ *  last change: $Author: mba $ $Date: 2002-05-27 14:31:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -58,6 +58,7 @@
  *
  *
  ************************************************************************/
+/*
 enum SwHoriOrient
 {
     HORI_NONE,
@@ -98,38 +99,41 @@ enum SwSurround
 
 struct FmtHoriOrient
 {
-    INT32               XPos            MID_1;
-    SwHoriOrient        HorzOrientation MID_2;
-    SwRelationOrient    HorzRelation    MID_3;
+    INT32               XPos            MID_HORIORIENT_POSITION;
+    SwHoriOrient        HorzOrientation MID_HORIORIENT_ORIENT;
+    SwRelationOrient    HorzRelation    MID_HORIORIENT_RELATION;
+    BOOL                PageToggle      MID_HORIORIENT_PAGETOGGLE;
 };
-
 item FmtHoriOrient SwFmtHoriOrient;
 
 struct FmtVertOrient
 {
-    INT32               YPos            MID_1;
-    SwVertOrient        VertOrientation MID_2;
-    SwRelationOrient    VertRelation    MID_3;
+    INT32               YPos            MID_VERTORIENT_POSITION;
+    SwVertOrient        VertOrientation MID_VERTORIENT_ORIENT;
+    SwRelationOrient    VertRelation    MID_VERTORIENT_RELATION;
 };
 item FmtVertOrient SwFmtVertOrient;
 
 struct FmtFrmSize
 {
-    UINT32  Width           MID_WIDTH;
-    UINT32  Height          MID_HEIGHT;
-    BYTE    WidthPercent    MID_1;
-    BYTE    HeightPercent   MID_2;
+    INT32  Width           MID_FRMSIZE_WIDTH;
+    INT32  Height          MID_FRMSIZE_HEIGHT;
+    INT16  WidthPercent    MID_FRMSIZE_REL_WIDTH;
+    INT16  HeightPercent   MID_FRMSIZE_REL_HEIGHT;
+    INT16  SizeType        MID_FRMSIZE_SIZE_TYPE;
 };
 item FmtFrmSize SwFmtFrmSize;
-
+*/
 struct Drop
 {
     BYTE    Lines       MID_LINES;
     BYTE    Count       MID_CHARS;
-    UINT16  Distance    MID_DIST;
+    INT16   Distance    MID_DIST;
+    BOOL    WholeWord   MID_DROPCAP_WHOLE_WORD;
 };
 item Drop SwFmtDrop;
 
+/*
 struct SwDocDisplay
 {
     BOOL    ParagraphEnd        MID_1;
@@ -148,9 +152,8 @@ struct SwDocDisplay
     BOOL    FieldName           MID_E;
     BOOL    Notes               MID_F;
     BOOL    ShowHiddenPara      MID_10;
+    sal_Int32 IndexBackGroundColor MID_11;
 }
-
-
 item SwDocDisplay SwDocDisplayItem;
 
 struct SwElem
@@ -166,7 +169,6 @@ struct SwElem
     BOOL    SolidHandles    MID_9;
     BOOL    SmoothScroll    MID_A;
 }
-
 item SwElem SwElemItem;
 
 struct SwPrintOpt
@@ -201,33 +203,6 @@ struct SwPageFtnInfo
 };
 item SwPageFtnInfo SwPageFtnInfoItem;
 
-item String     SvxBoxInfoItem; //! Dummy
-
-
-//umdefiniert wg. doppelter Benutzung
-
-struct SwPageLRSpace
-{
-    UINT16      PageLeftMargin      MID_LEFT_MARGIN;        // % or direct
-    UINT16      PageRightMargin     MID_RIGHT_MARGIN;       // % or direct
-};
-item SwPageLRSpace SwPageLRSpaceItem;
-
-struct SwPageULSpace
-{
-    UINT16              PageTopMargin           MID_UPPER;  // % or direct
-    UINT16              PageBottomMargin        MID_LOWER;  // % or direct
-};
-item SwPageULSpace SwPageULSpaceItem
-
-
-struct SwGraphicSize
-{
-    UINT32  GraphicWidth        MID_WIDTH;
-    UINT32  GraphicHeight       MID_HEIGHT;
-};
-item SwGraphicSize SwGraphicSizeItem;
-
 struct CropGrf
 {
     INT32   Left    MID_1;
@@ -253,7 +228,6 @@ struct FmtSurround
     BOOL            Contour     MID_4;
     BOOL            Outside     MID_5
 };
-
 item FmtSurround    SwFmtSurround;
 
 struct SwShadowCursor
@@ -263,3 +237,4 @@ struct SwShadowCursor
     INT32           ShadowCursorColor   MID_3;
 };
 item SwShadowCursor SwShadowCursorItem;
+*/
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 8f6e3f65ee45..94a1313a68dd 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -1,4 +1,29 @@
 //--------------------------------------------------------------------------
+SfxVoidItem CreateSWDrawView SID_CREATE_SW_DRAWVIEW
+()
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = TRUE,
+    HasCoreId = FALSE,
+    HasDialog = FALSE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Synchron;
+
+    /* config: */
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = FALSE,
+    GroupId = GID_INSERT;
+]
+
+//--------------------------------------------------------------------------
 SfxBoolItem AcceptRedlining FN_REDLINE_ACCEPT
 ()
 [
@@ -619,6 +644,7 @@ SfxVoidItem BulletsAndNumberingDialog FN_NUMBER_BULLETS
     RecordPerSet;
     Asynchron;
 
+    ImageRotation = TRUE;
     /* config: */
     AccelConfig = TRUE,
     MenuConfig = TRUE,
@@ -1067,31 +1093,6 @@ SfxVoidItem CreateAbstract FN_ABSTRACT_NEWDOC
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem CreateSWDrawView SID_CREATE_SW_DRAWVIEW
-()
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = TRUE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    /* config: */
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = GID_INSERT;
-]
-
-//--------------------------------------------------------------------------
 SfxVoidItem DecrementIndentValue FN_DEC_INDENT_OFFSET
 ()
 [
@@ -1133,6 +1134,7 @@ SfxVoidItem DecrementLevel FN_NUM_BULLET_DOWN
     RecordPerSet;
     Synchron;
 
+    ImageRotation = TRUE;
     /* config: */
     AccelConfig = TRUE,
     MenuConfig = TRUE,
@@ -1158,6 +1160,7 @@ SfxVoidItem DecrementSubLevels FN_NUM_BULLET_OUTLINE_DOWN
     RecordPerSet;
     Synchron;
 
+    ImageRotation = TRUE;
     /* config: */
     AccelConfig = TRUE,
     MenuConfig = TRUE,
@@ -2155,33 +2158,6 @@ SfxVoidItem FrameDialog FN_FORMAT_FRAME_DLG
 ]
 
 //--------------------------------------------------------------------------
-SfxBoolItem Gallery SID_GALLERY
-
-[
-    /* flags: */
-    AutoUpdate = TRUE,
-    Cachable = Cachable,
-    FastCall = TRUE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = FALSE,
-    Toggle = TRUE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Asynchron;
-
-    Readonly = FALSE,
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_OPTIONS;
-]
-
-//--------------------------------------------------------------------------
 SfxBoolItem GoDown FN_LINE_DOWN
 ()
 [
@@ -3679,6 +3655,7 @@ SfxVoidItem IncrementLevel FN_NUM_BULLET_UP
     RecordPerSet;
     Synchron;
 
+    ImageRotation = TRUE;
     /* config: */
     AccelConfig = TRUE,
     MenuConfig = TRUE,
@@ -3704,6 +3681,7 @@ SfxVoidItem IncrementSubLevels FN_NUM_BULLET_OUTLINE_UP
     RecordPerSet;
     Synchron;
 
+    ImageRotation = TRUE;
     /* config: */
     AccelConfig = TRUE,
     MenuConfig = TRUE,
@@ -4159,6 +4137,7 @@ SfxBoolItem InsertField FN_INSERT_FIELD
     RecordPerSet;
     Synchron;
 
+    ImageRotation = TRUE;
     Readonly = FALSE,
 
     /* config: */
@@ -4598,6 +4577,7 @@ SfxVoidItem InsertNeutralParagraph FN_NUM_BULLET_NONUM
     RecordPerSet;
     Synchron;
 
+    ImageRotation = TRUE;
     /* config: */
     AccelConfig = TRUE,
     MenuConfig = TRUE,
@@ -5865,6 +5845,7 @@ SfxVoidItem MoveDown FN_NUM_BULLET_MOVEDOWN
     RecordPerSet;
     Synchron;
 
+    ImageRotation = TRUE;
     /* config: */
     AccelConfig = TRUE,
     MenuConfig = TRUE,
@@ -5890,6 +5871,7 @@ SfxVoidItem MoveDownSubItems FN_NUM_BULLET_OUTLINE_MOVEDOWN
     RecordPerSet;
     Synchron;
 
+    ImageRotation = TRUE;
     /* config: */
     AccelConfig = TRUE,
     MenuConfig = TRUE,
@@ -5915,6 +5897,7 @@ SfxVoidItem MoveUp FN_NUM_BULLET_MOVEUP
     RecordPerSet;
     Synchron;
 
+    ImageRotation = TRUE;
     /* config: */
     AccelConfig = TRUE,
     MenuConfig = TRUE,
@@ -5940,6 +5923,7 @@ SfxVoidItem MoveUpSubItems FN_NUM_BULLET_OUTLINE_MOVEUP
     RecordPerSet;
     Synchron;
 
+    ImageRotation = TRUE;
     /* config: */
     AccelConfig = TRUE,
     MenuConfig = TRUE,
@@ -6245,6 +6229,7 @@ SfxBoolItem NumberingStart FN_NUMBER_NEWSTART
     RecordPerSet;
     Asynchron;
 
+    ImageRotation = TRUE;
     Readonly = FALSE,
 
     /* config: */
@@ -6838,6 +6823,7 @@ SfxVoidItem Remove FN_NUM_BULLET_OFF
     RecordPerSet;
     Synchron;
 
+    ImageRotation = TRUE;
     /* config: */
     AccelConfig = TRUE,
     MenuConfig = TRUE,
@@ -7106,7 +7092,7 @@ SfxVoidItem ScrollNextPrev FN_SCROLL_NEXT_PREV
 [
     /* flags: */
     AutoUpdate = FALSE,
-    Cachable = Cachable,
+ICachable = Cachable,
     FastCall = FALSE,
     HasCoreId = FALSE,
     HasDialog = FALSE,
@@ -8947,6 +8933,7 @@ SfxBoolItem WrapContour FN_FRAME_WRAP_CONTOUR
     RecordPerSet;
     Synchron;
 
+    ImageRotation = TRUE;
     /* config: */
     AccelConfig = TRUE,
     MenuConfig = TRUE,
@@ -9022,6 +9009,7 @@ SfxBoolItem WrapOff FN_FRAME_NOWRAP
     RecordPerSet;
     Synchron;
 
+    ImageRotation = TRUE;
     /* config: */
     AccelConfig = TRUE,
     MenuConfig = TRUE,
@@ -9047,6 +9035,7 @@ SfxBoolItem WrapOn FN_FRAME_WRAP
     RecordPerSet;
     Synchron;
 
+    ImageRotation = TRUE;
     /* config: */
     AccelConfig = TRUE,
     MenuConfig = TRUE,
@@ -9097,6 +9086,7 @@ SfxBoolItem WrapThrough FN_FRAME_WRAPTHRU
     RecordPerSet;
     Synchron;
 
+    ImageRotation = TRUE;
     /* config: */
     AccelConfig = TRUE,
     MenuConfig = TRUE,
@@ -9129,9 +9119,10 @@ SfxBoolItem WrapThroughTransparent FN_FRAME_WRAPTHRU_TRANSP
     ToolBoxConfig = TRUE,
     GroupId = GID_FRAME;
 ]
+
 //--------------------------------------------------------------------------
 SfxVoidItem Insert FN_INSERT_STRING
-( SfxStringItem StringName FN_INSERT_STRING )
+(SfxStringItem StringName FN_INSERT_STRING)
 [
     /* flags: */
     AutoUpdate = FALSE,
@@ -9141,16 +9132,10 @@ SfxVoidItem Insert FN_INSERT_STRING
     HasDialog = FALSE,
     ReadOnlyDoc = FALSE,
     Toggle = FALSE,
-    Synchron;
-
-    /* plugin: */
     Container = FALSE,
-
-    /* api: */
-    Export = TRUE,
-    IsCollection = FALSE,
     RecordAbsolute = FALSE,
     RecordPerSet;
+    Synchron;
 
     /* config: */
     AccelConfig = FALSE,
diff --git a/sw/sdi/swslots.sdi b/sw/sdi/swslots.sdi
index ca5e551b9554..b085f20b3649 100644
--- a/sw/sdi/swslots.sdi
+++ b/sw/sdi/swslots.sdi
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: swslots.sdi,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mba $ $Date: 2002-03-28 16:25:00 $
+ *  last change: $Author: mba $ $Date: 2002-05-27 14:31:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,15 +72,8 @@ TypeLibFile( "swslots.tlb" )
 ModulePrefix( "Sw" )
 ]
 {
-    item String SfxTemplateItem;
-    item String SvxColumnItem;
-    item String SvxLineItem;
-    item String SfxSetItem;
-
     item String TbxDummyItem;
-
-    item String SvxBoxItem;
-
+/*
     item String XFillAttrSetItem;
     item String XFillBitmapItem;
     item String XFillColorItem;
@@ -98,14 +91,7 @@ ModulePrefix( "Sw" )
     item String XLineStartCenterItem;
     item String XLineStyleItem;
     item String XLineWidthItem;
-
-    enum Language
-    {
-        LANGUAGE_DONTKNOW,
-        LANGUAGE_SYSTEM
-    };
-    item Language SvxLanguageItem;
-
+*/
     include "switems.sdi"
     include "swriter.sdi"