diff options
author | Thomas Lange [tl] <tl@openoffice.org> | 2010-01-06 12:22:41 +0100 |
---|---|---|
committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-01-06 12:22:41 +0100 |
commit | 8d5094ce291028a5296802fdd7a7be6cd334a15a (patch) | |
tree | eeeeeb1ab168030530bed5ecdc541c6748788477 /sw/sdi | |
parent | #i51258# thesaurus for right click context menu (diff) | |
parent | #i100000# corrected includes (diff) | |
download | core-8d5094ce291028a5296802fdd7a7be6cd334a15a.tar.gz core-8d5094ce291028a5296802fdd7a7be6cd334a15a.zip |
cws tl74: merge with DEV300_m68; AND Unix LF conversion for some files!
Diffstat (limited to 'sw/sdi')
-rw-r--r-- | sw/sdi/_docsh.sdi | 2 | ||||
-rw-r--r-- | sw/sdi/_viewsh.sdi | 2 | ||||
-rw-r--r-- | sw/sdi/docsh.sdi | 2 | ||||
-rw-r--r-- | sw/sdi/makefile.mk | 10 | ||||
-rw-r--r-- | sw/sdi/swslots.sdi | 9 | ||||
-rw-r--r-- | sw/sdi/viewsh.sdi | 6 | ||||
-rw-r--r-- | sw/sdi/wdocsh.sdi | 2 | ||||
-rw-r--r-- | sw/sdi/wviewsh.sdi | 6 |
8 files changed, 23 insertions, 16 deletions
diff --git a/sw/sdi/_docsh.sdi b/sw/sdi/_docsh.sdi index 9154e6ce2578..de0be1f9a5c1 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 ac6081637a91..a8d54140cc6a 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 25b75feea040..016b0df6cbb8 100644 --- a/sw/sdi/makefile.mk +++ b/sw/sdi/makefile.mk @@ -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\ @@ -97,8 +102,7 @@ SVSDI1DEPEND= \ annotsh.sdi\ swslots.hrc \ $(INC)$/globals.hrc \ - $(INC)$/cmdid.h \ - $(SOLARINCXDIR)$/svxslots.ilb + $(INC)$/cmdid.h .ENDIF # --- Targets ------------------------------------------------------- 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 05b41e6e7482..053c81b856aa 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" ] { SID_BROWSER_MODE @@ -325,7 +325,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 e2efd025c1df..711bb4620f03 100644 --- a/sw/sdi/wdocsh.sdi +++ b/sw/sdi/wdocsh.sdi @@ -47,7 +47,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 3eff3db1f4a0..31e5d791aeba 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() @@ -195,7 +195,7 @@ interface WebSourceView : View ] } -shell SwSrcView : SfxViewShell +shell SwSrcView { import WebSourceView [Automation]; |