cws tl74: merge with DEV300_m68; AND Unix LF conversion for some files!

7 files changed, 49 insertions, 12 deletions

diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index 3529b2763826..aa3f53935b44 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -52,6 +52,9 @@ interface CellSelection
     SID_OPENDLG_FUNCTION        [ ExecMethod = Execute; StateMethod = GetCellState; ]
     SID_INS_FUNCTION            [ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
 
+    // no Exec/StateMethod needed, but SfxDispatcher complains if the slot is not included in the shell
+    SID_VALIDITY_REFERENCE []
+
     // Datenbank-Operationen {
     SID_SORT_ASCENDING      [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
     SID_SORT_DESCENDING     [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
diff --git a/sc/sdi/docsh.sdi b/sc/sdi/docsh.sdi
index 5d8c1de7612d..5c6f9577cb08 100644
--- a/sc/sdi/docsh.sdi
+++ b/sc/sdi/docsh.sdi
@@ -69,7 +69,7 @@ interface TableSelection
 
 
  //============================================================================
-interface TableDocument : OfficeDocument
+interface TableDocument
 [
     uuid = "BA338A42-064E-11d0-89CB-008029E4B0B1" ;
 ]
@@ -116,7 +116,7 @@ interface TableDocument : OfficeDocument
 
 
  //============================================================================
-shell ScDocShell : SfxObjectShell
+shell ScDocShell
 [
     uuid ( "3F543FA0-B6A6-101B-9961-04021C007002" )
 ]
diff --git a/sc/sdi/makefile.mk b/sc/sdi/makefile.mk
index f0f7d12885d8..0ab1b486cd43 100644
--- a/sc/sdi/makefile.mk
+++ b/sc/sdi/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,12 @@ SDI1NAME=$(TARGET)
 SDI1EXPORT=scalc
 
 SVSDI1DEPEND= \
-    scalc.sdi \
+        $(SOLARINCXDIR)$/sfx2/sfx.sdi \
+        $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
+        $(SOLARINCXDIR)$/svx/svx.sdi \
+        $(SOLARINCXDIR)$/svx/svxitems.sdi \
+        $(SOLARINCXDIR)$/svx/xoitems.sdi \
+        scalc.sdi \
     app.sdi \
     auditsh.sdi \
     docsh.sdi \
@@ -66,8 +71,7 @@ SVSDI1DEPEND= \
     mediash.sdi \
     pgbrksh.sdi \
     scslots.hrc \
-    $(INC)$/sc.hrc \
-    $(SOLARINCXDIR)$/svxslots.ilb
+    $(INC)$/sc.hrc 
 .ENDIF
 
 # --- Targets -------------------------------------------------------
diff --git a/sc/sdi/prevwsh.sdi b/sc/sdi/prevwsh.sdi
index 70ca39a816c6..92add2aa2fd1 100644
--- a/sc/sdi/prevwsh.sdi
+++ b/sc/sdi/prevwsh.sdi
@@ -27,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-interface TablePrintPreview : View
+interface TablePrintPreview
 {
     //  von Basic aus nicht erreichbar, darum alles mit Export = FALSE
 
@@ -166,7 +166,7 @@ interface TablePrintPreview : View
 
 
  // ===========================================================================
-shell ScPreviewShell : SfxViewShell
+shell ScPreviewShell
 {
     import TablePrintPreview;
 }
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 8ed57a8dfc5d..de3e3fff56bd 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -2780,6 +2780,33 @@ SfxVoidItem SolverDialog SID_OPENDLG_OPTSOLVER
 ]
 
 //--------------------------------------------------------------------------
+//<!--Added by PengYunQuan for Validity Cell Range Picker
+SfxVoidItem ValidityReference SID_VALIDITY_REFERENCE
+()
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = TRUE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Synchron;
+
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
+    GroupId = GID_OPTIONS;
+]
+//-->Added by PengYunQuan for Validity Cell Range Picker
+
+//--------------------------------------------------------------------------
 SfxVoidItem GoDownToEndOfData SID_CURSORBLKDOWN
 (SfxInt16Item By FN_PARAM_1,SfxBoolItem Sel FN_PARAM_2)
 [
diff --git a/sc/sdi/scslots.sdi b/sc/sdi/scslots.sdi
index 3f1ff119873d..e50d282ab60d 100644
--- a/sc/sdi/scslots.sdi
+++ b/sc/sdi/scslots.sdi
@@ -27,7 +27,6 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-import "svxslots.ilb"
 
 module
 "ADC7D7A1-2341-101C-A55A-04021C007002"
@@ -36,7 +35,6 @@ StarCalc
 [
 HelpText( "StarDivision StarCalc" ),
 SlotIdFile( "scslots.hrc" )
-TypeLibFile( "scslots.tlb" )
 ModulePrefix( "Sc" )
 ]
 {
@@ -54,6 +52,11 @@ ModulePrefix( "Sc" )
 
     //----------------------------------------------------------
     // bei Problemen ggF. "von Hand" includen (=Copy/Paste)
+    include "sfx2/sfxitems.sdi"
+    include "sfx2/sfx.sdi"
+    include "svx/svxitems.sdi"
+    include "svx/xoitems.sdi"
+    include "svx/svx.sdi"
 
     include "scalc.sdi"
     include "docsh.sdi"
diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi
index 227d91b47998..8e075ee8166c 100644
--- a/sc/sdi/tabvwsh.sdi
+++ b/sc/sdi/tabvwsh.sdi
@@ -130,7 +130,7 @@ interface BaseSelection
 
 }
 
-interface TableEditView : View
+interface TableEditView
 [
     uuid ( "16D7E4A0-2FB4-11CF-89CB-008029E4B0B1" )
 ]
@@ -267,7 +267,7 @@ interface DataPilotField
 }
 
  // ===========================================================================
-shell ScTabViewShell : SfxViewShell
+shell ScTabViewShell
 {
     import TableSelection "ActiveDocument.ActiveTable";
     import TableOLEObject "SelectedObject";