better dependencies for sdi files

11 files changed, 39 insertions, 25 deletions

diff --git a/starmath/sdi/makefile.mk b/starmath/sdi/makefile.mk
index a10a81adaec9..098f1bc74f32 100644
--- a/starmath/sdi/makefile.mk
+++ b/starmath/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
@@ -46,8 +46,12 @@ SVSDIINC=$(PRJ)$/inc
 SDI1NAME=$(TARGET)
 
 SVSDI1DEPEND= \
-    $(SOLARINCDIR)$/svxslots.ilb \
-    smath.sdi \
+        $(SOLARINCXDIR)$/sfx2/sfx.sdi \
+        $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
+        $(SOLARINCXDIR)$/svx/svx.sdi \
+        $(SOLARINCXDIR)$/svx/svxitems.sdi \
+        $(SOLARINCXDIR)$/svx/xoitems.sdi \
+        smath.sdi \
     smslots.sdi \
     $(SVSDIINC)$/starmath.hrc
 
diff --git a/starmath/sdi/svxitems.sdi b/starmath/sdi/smitems.sdi
index ddbf0f2fc185..ddbf0f2fc185 100644
--- a/starmath/sdi/svxitems.sdi
+++ b/starmath/sdi/smitems.sdi
diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi
index 40b9da78d7ff..88bd108bddff 100644
--- a/starmath/sdi/smslots.sdi
+++ b/starmath/sdi/smslots.sdi
@@ -28,8 +28,6 @@
  *
  ************************************************************************/
 
-import "svxslots.ilb"
-
 module
 "312C4240-35E7-101C-B12A-04021C007002"
 "58216740-35E7-101C-B12A-04021C007002"
@@ -39,9 +37,13 @@ StarMath
     SlotIdFile ( "starmath.hrc" )
     SlotIdFile ( "sfx2/sfxsids.hrc" )
     SlotIdFile ( "svx/svxids.hrc" )
-    TypeLibFile ( "smslots.tlb" )
 ]
 {
+    include "sfx2/sfxitems.sdi"
+    include "sfx2/sfx.sdi"
+    include "svx/svxitems.sdi"
+    include "svx/xoitems.sdi"
+    include "svx/svx.sdi"
     include "smath.sdi"
     interface StarMath
     [
@@ -59,7 +61,7 @@ shell SmModule
     import StarMath[Automation];
 }
 
-interface FormulaDocument : OfficeDocument
+interface FormulaDocument
 [
     uuid ( "815CBB20-2FC3-11CF-89CA-008029E4B0B1" )
 ]
@@ -149,13 +151,13 @@ interface FormulaDocument : OfficeDocument
     ]
 }
 
-shell SmDocShell : SfxObjectShell
+shell SmDocShell
 {
     import FormulaDocument[Automation];
 }
 
 
-interface FormulaView : View
+interface FormulaView
 [
     uuid ( "CE1A6C00-2FC3-11CF-89CA-008029E4B0B1" )
 ]
@@ -323,7 +325,7 @@ interface FormulaView : View
         ]
 }
 
-shell SmViewShell : SfxViewShell
+shell SmViewShell
 {
     import FormulaView[Automation];
 }
diff --git a/sw/sdi/_docsh.sdi b/sw/sdi/_docsh.sdi
index 6dfd2c78bd47..43ccd4dd2acb 100644
--- a/sw/sdi/_docsh.sdi
+++ b/sw/sdi/_docsh.sdi
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-interface BaseTextDocument : OfficeDocument
+interface BaseTextDocument
 [
     Automation = FALSE;
 ]
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index 7623da2c3ff0..5fa9dab613af 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 
-interface BaseTextEditView : View
+interface BaseTextEditView
 [
     Automation = FALSE;
 ]
diff --git a/sw/sdi/docsh.sdi b/sw/sdi/docsh.sdi
index 2901795a0c9a..d1619df2f1ff 100644
--- a/sw/sdi/docsh.sdi
+++ b/sw/sdi/docsh.sdi
@@ -68,7 +68,7 @@ interface TextDocument : BaseTextDocument
     ]
 }
 
-shell SwDocShell : SfxObjectShell
+shell SwDocShell
 {
     import TextDocument[Automation];
 }
diff --git a/sw/sdi/makefile.mk b/sw/sdi/makefile.mk
index 1a3f17a6c69d..3128e229cdba 100644
--- a/sw/sdi/makefile.mk
+++ b/sw/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
@@ -53,7 +53,12 @@ SDI1EXPORT=swriter
 # --- Files --------------------------------------------------------
 
 SVSDI1DEPEND= \
-        switems.sdi\
+        $(SOLARINCXDIR)$/sfx2/sfx.sdi \
+        $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
+        $(SOLARINCXDIR)$/svx/svx.sdi \
+        $(SOLARINCXDIR)$/svx/svxitems.sdi \
+        $(SOLARINCXDIR)$/svx/xoitems.sdi \
+                switems.sdi\
         swriter.sdi\
         _docsh.sdi\
         docsh.sdi\
diff --git a/sw/sdi/swslots.sdi b/sw/sdi/swslots.sdi
index 0cfa6bd8277e..8eea2b690396 100644
--- a/sw/sdi/swslots.sdi
+++ b/sw/sdi/swslots.sdi
@@ -28,8 +28,6 @@
  *
  ************************************************************************/
 
-import "svxslots.ilb"
-
 module
 "9F76B581-23DD-101C-80B6-000024021835"
 "A1810F00-23DE-101C-80B6-000024021835"
@@ -37,10 +35,15 @@ StarWriter
 [
 HelpText( "StarWriter Application" )
 SlotIdFile( "swslots.hrc" )
-TypeLibFile( "swslots.tlb" )
 ModulePrefix( "Sw" )
 ]
 {
+    include "sfx2/sfxitems.sdi"
+    include "sfx2/sfx.sdi"
+    include "svx/svxitems.sdi"
+    include "svx/xoitems.sdi"
+    include "svx/svx.sdi"
+
     item String TbxDummyItem;
 /*
     item String XFillAttrSetItem;
diff --git a/sw/sdi/viewsh.sdi b/sw/sdi/viewsh.sdi
index 18d537144c5b..3b2853e24780 100644
--- a/sw/sdi/viewsh.sdi
+++ b/sw/sdi/viewsh.sdi
@@ -145,7 +145,7 @@ interface TextEditView : BaseTextEditView
 }
  //=========================================================================
 
-shell SwView : SfxViewShell
+shell SwView
 
 {
     import TextEditView [Automation];
@@ -155,7 +155,7 @@ shell SwView : SfxViewShell
 //  import ReplaceAttributes;
 }
 
-interface TextPrintPreview : View
+interface TextPrintPreview
 [ uuid = "1622A480-111A-101D-9757-6E74207A7520" ]
 {
     FN_REFRESH_VIEW // status(final|play)
@@ -317,7 +317,7 @@ interface TextPrintPreview : View
 
  //=========================================================================
 
-shell SwPagePreView : SfxViewShell
+shell SwPagePreView
 {
     import TextPrintPreview[Automation];
 }
diff --git a/sw/sdi/wdocsh.sdi b/sw/sdi/wdocsh.sdi
index fb704c8c19b4..2f76cc356c6f 100644
--- a/sw/sdi/wdocsh.sdi
+++ b/sw/sdi/wdocsh.sdi
@@ -48,7 +48,7 @@ interface WebDocument : BaseTextDocument
     ]
 }
 
-shell SwWebDocShell : SfxObjectShell
+shell SwWebDocShell
 {
         import WebDocument[Automation];
 }
diff --git a/sw/sdi/wviewsh.sdi b/sw/sdi/wviewsh.sdi
index e38e99246a36..b06b460fa472 100644
--- a/sw/sdi/wviewsh.sdi
+++ b/sw/sdi/wviewsh.sdi
@@ -63,7 +63,7 @@ interface WebEditView : BaseTextEditView
     ]
 }
 
-shell SwWebView : SfxViewShell
+shell SwWebView
 {
     import WebEditView [Automation];
 //  import SearchSettings;
@@ -73,7 +73,7 @@ shell SwWebView : SfxViewShell
 
 }
 
-interface WebSourceView : View
+interface WebSourceView
 [ uuid = "95069CE0-69D8-101D-9757-C667E8298000"]
 {
     SID_TABLE_CELL // status()
@@ -189,7 +189,7 @@ interface WebSourceView : View
     ]
 }
 
-shell SwSrcView : SfxViewShell
+shell SwSrcView
 
 {
         import WebSourceView [Automation];