#98951#: make sure that slot names are unique

8 files changed, 68 insertions, 82 deletions

diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index 1607f5871c25..d13c875015e1 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -3,7 +3,7 @@
  // StarCalc
  //
  // (C) 1994 StarDivision GmbH, Hamburg, Germany
- // $Author: mba $ $Date: 2002-06-04 07:56:02 $ $Revision: 1.9 $
+ // $Author: mba $ $Date: 2002-08-29 14:19:09 $ $Revision: 1.10 $
  // $Logfile:   T:/sc/sdi/cellsh.sdv  $ $Workfile:   cellsh.sdi  $
  //----------------------------------------------------------------------------
 
@@ -101,7 +101,7 @@ interface CellSelection : Selection
     FID_INS_CELL_CONTENTS   [ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
     SID_CELL_FORMAT_RESET   [ ExecMethod = Execute; StateMethod = GetBlockState; ]
 
-    SfxVoidItem Clear SID_DELETE
+    SfxVoidItem Delete SID_DELETE
     (
         SfxStringItem Flags SID_DELETE
     )
@@ -179,14 +179,14 @@ interface CellMovement : Selection
     uuid ( "FF2E35C0-137B-11D3-B25B-006097DA68F3" )
 ]
 {
-    SfxVoidItem JumpToNextTable SID_NEXT_TABLE ( )
+    SID_NEXT_TABLE
     [
         ExecMethod = ExecuteMove ;
         StateMethod = GetStateCursor ;
         Cachable ;
     ]
 
-    SfxVoidItem JumpToPrevTable SID_PREV_TABLE ( )
+    SID_PREV_TABLE
     [
         ExecMethod = ExecuteMove ;
         StateMethod = GetStateCursor ;
@@ -255,6 +255,7 @@ interface CellMovement : Selection
         StateMethod = GetStateCursor ;
         Cachable ;
     ]
+
     SID_CURSORRIGHT_SEL     [ ExecMethod = ExecuteCursorSel; StateMethod = GetStateCursor; ]
     SID_CURSORBLKRIGHT      [ ExecMethod = ExecuteCursor;    StateMethod = GetStateCursor; ]
     SID_CURSORBLKRIGHT_SEL  [ ExecMethod = ExecuteCursorSel; StateMethod = GetStateCursor; ]
@@ -380,6 +381,9 @@ shell ScCellShell : ScFormatShell
 
 /*------------------------------------------------------------------------
     $Log: not supported by cvs2svn $
+    Revision 1.9  2002/06/04 07:56:02  mba
+    #98570#: Recording of SearchDialog actions
+
     Revision 1.8  2002/04/10 15:38:05  nn
     #97777# keyboard shortcut for input line
 
diff --git a/sc/sdi/docsh.sdi b/sc/sdi/docsh.sdi
index 4446e3220650..84bcedcf510a 100644
--- a/sc/sdi/docsh.sdi
+++ b/sc/sdi/docsh.sdi
@@ -3,7 +3,7 @@
  // StarCalc
  //
  // (C) 1994 StarDivision GmbH, Hamburg, Germany
- // $Author: er $ $Date: 2001-04-25 14:01:57 $ $Revision: 1.2 $
+ // $Author: mba $ $Date: 2002-08-29 14:19:11 $ $Revision: 1.3 $
  // $Logfile:   T:/sc/sdi/docsh.sdv  $ $Workfile:   docsh.sdi  $
  //----------------------------------------------------------------------------
 
@@ -15,7 +15,6 @@ interface Name : Object
     uuid = "BA338A40-064E-11d0-89CB-008029E4B0B1" ;
 ]
 {
-    SID_SC_NAME_TITLE   [ ExecMethod = Execute; StateMethod = GetState; ] // ole() api(ply)
 }
 
 
@@ -115,6 +114,9 @@ shell ScDocShell : SfxObjectShell
 
 /*------------------------------------------------------------------------
     $Log: not supported by cvs2svn $
+    Revision 1.2  2001/04/25 14:01:57  er
+    ChangeTrack password protection (disables end, accept, reject)
+
     Revision 1.1.1.1  2000/09/18 16:44:52  hr
     initial import
 
diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi
index 2dbe0461913e..cadfd8e4ebfe 100644
--- a/sc/sdi/drawsh.sdi
+++ b/sc/sdi/drawsh.sdi
@@ -49,7 +49,7 @@ interface TableDraw : Selection
     SID_ATTR_TRANSFORM      [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ]
      // ---- Ausrichtungs - Funktionen:
      //!    PseudoSlots gibt Aerger mit Referenz-Dialogen ???
-    SvxDrawAlignItem ObjectAlign SID_OBJECT_ALIGN
+    SID_OBJECT_ALIGN
     [
          //     PseudoSlots = TRUE;
         PseudoSlots = FALSE ;
diff --git a/sc/sdi/editsh.sdi b/sc/sdi/editsh.sdi
index ea9c2343d89a..17ca37abbff7 100644
--- a/sc/sdi/editsh.sdi
+++ b/sc/sdi/editsh.sdi
@@ -4,7 +4,7 @@ interface TableText : Selection
 
     SID_ATTR_INSERT     [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
 
-    SfxVoidItem Delete SID_DELETE ( )
+    SID_DELETE
     [
         ExecMethod = Execute ;
         StateMethod = GetState ;
diff --git a/sc/sdi/prevwsh.sdi b/sc/sdi/prevwsh.sdi
index 1151779abafc..316780494154 100644
--- a/sc/sdi/prevwsh.sdi
+++ b/sc/sdi/prevwsh.sdi
@@ -13,7 +13,7 @@ interface TablePrintPreview : View
     SID_PREVIEW_FIRST       [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
     SID_PREVIEW_LAST        [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
 
-    SfxVoidItem CursorPageUp SID_CURSORPAGEUP
+    SfxVoidItem GoUpBlock SID_CURSORPAGEUP
     (
         SfxInt16Item By SID_CURSORPAGEUP
     )
@@ -25,7 +25,7 @@ interface TablePrintPreview : View
         Cachable ;
     ]
 
-    SfxVoidItem CursorPageDown SID_CURSORPAGEDOWN
+    SfxVoidItem GoDownBlock SID_CURSORPAGEDOWN
     (
         SfxInt16Item By SID_CURSORPAGEDOWN
     )
@@ -40,7 +40,7 @@ interface TablePrintPreview : View
     SID_CURSORHOME  [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
     SID_CURSOREND   [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
 
-    SfxVoidItem CursorDown SID_CURSORDOWN
+    SfxVoidItem GoDown SID_CURSORDOWN
     (
         SfxInt16Item By SID_CURSORDOWN
     )
@@ -51,7 +51,7 @@ interface TablePrintPreview : View
         GroupId = GID_INTERN ;
         Cachable ;
     ]
-    SfxVoidItem CursorUp SID_CURSORUP
+    SfxVoidItem GoUp SID_CURSORUP
     (
         SfxInt16Item By SID_CURSORUP
     )
@@ -62,7 +62,7 @@ interface TablePrintPreview : View
         GroupId = GID_INTERN ;
         Cachable ;
     ]
-    SfxVoidItem CursorLeft SID_CURSORLEFT
+    SfxVoidItem GoLeft SID_CURSORLEFT
     (
         SfxInt16Item By SID_CURSORLEFT
     )
@@ -74,7 +74,7 @@ interface TablePrintPreview : View
         Cachable ;
     ]
 
-    SfxVoidItem CursorRight SID_CURSORRIGHT
+    SfxVoidItem GoRight SID_CURSORRIGHT
     (
         SfxInt16Item By SID_CURSORRIGHT
     )
@@ -86,7 +86,7 @@ interface TablePrintPreview : View
         Cachable ;
     ]
 
-    SfxVoidItem PPage SID_PREV_TABLE ( )
+    SID_PREV_TABLE
     [
         ExecMethod = Execute ;
         StateMethod = GetState ;
@@ -95,7 +95,7 @@ interface TablePrintPreview : View
         Cachable ;
     ]
 
-    SfxVoidItem NPage SID_NEXT_TABLE ( )
+    SID_NEXT_TABLE
     [
         ExecMethod = Execute ;
         StateMethod = GetState ;
@@ -104,7 +104,7 @@ interface TablePrintPreview : View
         Cachable ;
     ]
 
-    SfxVoidItem FPage SID_CURSORTOPOFFILE ( )
+    SfxVoidItem GoToStart SID_CURSORTOPOFFILE ()
     [
         ExecMethod = Execute ;
         StateMethod = GetState ;
@@ -113,7 +113,7 @@ interface TablePrintPreview : View
         Cachable ;
     ]
 
-    SfxVoidItem LPage SID_CURSORENDOFFILE ( )
+    SfxVoidItem GoToEndOfData SID_CURSORENDOFFILE ()
     [
         ExecMethod = Execute ;
         StateMethod = GetState ;
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 69cdddb4ece6..9171dee1c41b 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -1847,31 +1847,6 @@ SfxVoidItem DeletePivotTable SID_PIVOT_KILL
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem DataPilotFilter SID_DP_FILTER
-()
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-        HasDialog = TRUE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    /* config: */
-    AccelConfig = FALSE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = GID_DATA;
-]
-
-//--------------------------------------------------------------------------
 SfxVoidItem DeletePrintArea SID_DELETE_PRINTAREA
 ()
 [
@@ -3581,7 +3556,7 @@ SfxVoidItem InsertColumns FID_INS_COLUMN
 
 //--------------------------------------------------------------------------
 SfxVoidItem InsertContents FID_INS_CELL_CONTENTS
-(SfxStringItem Flags FID_INS_CELL_CONTENTS, SfxUInt16Item FormulaCommand FN_PARAM_1, SfxBoolItem SkipEmptyCells FN_PARAM_2, SfxBoolItem Transpose FN_PARAM_3, SfxBoolItem AsLink FN_PARAM_4, SfxInt16Item MoveMode FN_PARAM_5)
+(SfxStringItem Flags FID_INS_CELL_CONTENTS,SfxUInt16Item FormulaCommand FN_PARAM_1,SfxBoolItem SkipEmptyCells FN_PARAM_2,SfxBoolItem Transpose FN_PARAM_3,SfxBoolItem AsLink FN_PARAM_4,SfxInt16Item MoveMode FN_PARAM_5)
 [
     /* flags: */
     AutoUpdate = FALSE,
@@ -3633,7 +3608,7 @@ SfxUInt16Item InsertCtrl SID_TBXCTL_INSERT
 
 //--------------------------------------------------------------------------
 SfxVoidItem InsertExternalDataSource SID_EXTERNAL_SOURCE
-( SfxStringItem FileName SID_FILE_NAME, SfxStringItem FilterName SID_FILTER_NAME, SfxStringItem Options SID_FILE_FILTEROPTIONS, SfxStringItem Source FN_PARAM_1, SfxUInt32Item Refresh FN_PARAM_2 )
+(SfxStringItem FileName SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem Options SID_FILE_FILTEROPTIONS,SfxStringItem Source FN_PARAM_1,SfxUInt32Item Refresh FN_PARAM_2)
 [
     /* flags: */
     AutoUpdate = FALSE,
@@ -5258,7 +5233,7 @@ SfxUInt16Item RowHeight FID_ROW_HEIGHT
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem SbaUpdate SID_SBA_IMPORT
+SfxVoidItem SbaImport SID_SBA_IMPORT
 (SfxStringItem Query SID_SBA_IMPORT,SfxStringItem Target FN_PARAM_1)
 [
     /* flags: */
@@ -6585,7 +6560,7 @@ SfxVoidItem TableOperationDialog SID_OPENDLG_TABOP
 
 //--------------------------------------------------------------------------
 SfxVoidItem RenameTable FID_TAB_MENU_RENAME
-( SfxStringItem Name FID_TAB_RENAME )
+(SfxStringItem Name FID_TAB_RENAME)
 [
     /* flags: */
     AutoUpdate = FALSE,
@@ -6738,33 +6713,6 @@ SfxStringItem TextValue SID_RANGE_TEXTVALUE
 ]
 
 //--------------------------------------------------------------------------
-SfxStringItem Title SID_SC_NAME_TITLE
-
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    Readonly = FALSE,
-
-    /* config: */
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = ;
-]
-
-//--------------------------------------------------------------------------
 SfxVoidItem ToggleAnchorType SID_ANCHOR_TOGGLE
 ()
 [
@@ -7145,6 +7093,8 @@ SfxBoolItem InputLineVisible FID_TOGGLEINPUTLINE
     RecordPerSet;
     Synchron;
 
+    Readonly = FALSE,
+
     /* config: */
     AccelConfig = TRUE,
     MenuConfig = TRUE,
@@ -7170,6 +7120,8 @@ SfxBoolItem ViewRowColumnHeaders FID_TOGGLEHEADERS
     RecordPerSet;
     Synchron;
 
+    Readonly = FALSE,
+
     /* config: */
     AccelConfig = TRUE,
     MenuConfig = TRUE,
@@ -7195,6 +7147,8 @@ SfxBoolItem ViewValueHighlighting FID_TOGGLESYNTAX
     RecordPerSet;
     Synchron;
 
+    Readonly = FALSE,
+
     /* config: */
     AccelConfig = TRUE,
     MenuConfig = TRUE,
@@ -7359,7 +7313,7 @@ SfxVoidItem ClosePreview SID_PREVIEW_CLOSE
 
 //--------------------------------------------------------------------------
 SfxVoidItem SelectTables SID_SELECT_TABLES
-( SfxIntegerListItem Tables SID_SELECT_TABLES )
+(SfxIntegerListItem Tables SID_SELECT_TABLES)
 [
     /* flags: */
     AutoUpdate = FALSE,
@@ -7382,6 +7336,32 @@ SfxVoidItem SelectTables SID_SELECT_TABLES
     GroupId = GID_EDIT;
 ]
 
+//--------------------------------------------------------------------------
+SfxVoidItem DataPilotFilter SID_DP_FILTER
+()
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = TRUE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Synchron;
+
+    /* config: */
+    AccelConfig = FALSE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = FALSE,
+    GroupId = GID_DATA;
+]
+
+//--------------------------------------------------------------------------
 ScProtectionAttr Protection SID_SCATTR_PROTECTION
 
 [
@@ -7398,6 +7378,8 @@ ScProtectionAttr Protection SID_SCATTR_PROTECTION
     RecordPerSet;
     Synchron;
 
+    Readonly = FALSE,
+
     /* config: */
     AccelConfig = FALSE,
     MenuConfig = FALSE,
@@ -7406,4 +7388,3 @@ ScProtectionAttr Protection SID_SCATTR_PROTECTION
     GroupId = GID_FORMAT;
 ]
 
-
diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi
index 12741287d7f7..7b1752790dc0 100644
--- a/sc/sdi/tabvwsh.sdi
+++ b/sc/sdi/tabvwsh.sdi
@@ -3,7 +3,7 @@
  // StarCalc
  //
  // (C) 1994 StarDivision GmbH, Hamburg, Germany
- // $Author: nn $ $Date: 2002-05-23 17:25:49 $ $Revision: 1.9 $
+ // $Author: mba $ $Date: 2002-08-29 14:19:17 $ $Revision: 1.10 $
  // $Logfile:   T:/sc/sdi/tabvwsh.sdv  $ $Workfile:   tabvwsh.sdi  $
  //----------------------------------------------------------------------------
 
@@ -60,7 +60,7 @@ interface BaseSelection : Selection
     SID_IMAP                    [ ExecMethod = ExecImageMap; StateMethod = GetImageMapState; ]
     SID_IMAP_EXEC               [ ExecMethod = ExecImageMap; StateMethod = GetImageMapState; ]
 
-    SfxVoidItem InsertObjectStarChart SID_INSERT_DIAGRAM
+    SfxVoidItem InsertObjectChart SID_INSERT_DIAGRAM
     (
         SfxBoolItem ColHeaders SID_ATTR_COLHEADERS,
         SfxBoolItem RowHeaders SID_ATTR_ROWHEADERS,
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index bc3e16e7f3e2..2556d31d1b69 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabvwsh3.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: mba $ $Date: 2002-07-18 11:04:11 $
+ *  last change: $Author: mba $ $Date: 2002-08-29 14:21:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -243,9 +243,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                 if ( pReqArgs->GetItemState( nSlot, TRUE, &pItem ) == SFX_ITEM_SET )
                     aAddress = ((const SfxStringItem*)pItem)->GetValue();
                 else if ( nSlot == SID_JUMPTOMARK && pReqArgs->GetItemState(
-                                            ID_VAL_DUMMY0, TRUE, &pItem ) == SFX_ITEM_SET )
+                                            SID_JUMPTOMARK, TRUE, &pItem ) == SFX_ITEM_SET )
                     aAddress = ((const SfxStringItem*)pItem)->GetValue();
-                //  SID_JUMPTOMARK steht in der IDL mit ID_VAL_DUMMY0 als Parameter
 
                 BOOL bUnmark = FALSE;
                 if ( pReqArgs->GetItemState( FN_PARAM_1, TRUE, &pItem ) == SFX_ITEM_SET )