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 | d1bb71fa133c82868cba447e1a736db5292db39b (patch) | |
| tree | def9642c61b4d7585250eacb357e062ee3594368 /svx/sdi | |
| parent | 28687b22eef200c32a37f6901cd40c0328b8766d (diff) | |
| parent | 0de34b05f3c1a0409d23b63b9e69d4d7abbe1090 (diff) | |
cws tl74: merge with DEV300_m68; AND Unix LF conversion for some files!
Diffstat (limited to 'svx/sdi')
| -rw-r--r-- | svx/sdi/makefile.mk | 5 | ||||
| -rw-r--r-- | svx/sdi/svx.sdi | 2 | ||||
| -rw-r--r-- | svx/sdi/svxslots.sdi | 5 |
3 files changed, 6 insertions, 6 deletions
diff --git a/svx/sdi/makefile.mk b/svx/sdi/makefile.mk index 2ea64ddedbba..c86488daee1e 100644 --- a/svx/sdi/makefile.mk +++ b/svx/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,10 +47,11 @@ SDI1EXPORT=svx # --- Files -------------------------------------------------------- SVSDI1DEPEND= \ + $(SOLARINCXDIR)$/sfx2/sfx.sdi \ + $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \ svxitems.sdi \ fmslots.sdi \ svx.sdi \ - $(SOLARINCXDIR)$/sfxslots.ilb \ xoitems.sdi \ svxitems.sdi diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index c8f38bf98b55..5a248aa42d5e 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -6029,7 +6029,7 @@ SfxVoidItem InsertAnnotation SID_INSERT_POSTIT ] //-------------------------------------------------------------------------- -SfxBoolItem ShowAnnotation SID_SHOW_POSTIT +SfxBoolItem ShowAnnotations SID_SHOW_POSTIT () [ /* flags: */ diff --git a/svx/sdi/svxslots.sdi b/svx/sdi/svxslots.sdi index af1fb77adc2f..5b776c2e05d8 100644 --- a/svx/sdi/svxslots.sdi +++ b/svx/sdi/svxslots.sdi @@ -27,8 +27,6 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -import "sfxslots.ilb" - module "BD25A480-30AB-101C-A17D-000024021828" "C049C7E0-30AB-101C-A17D-000024021828" @@ -36,11 +34,12 @@ SvxItems [ HelpText( "Svx-Items" ) SlotIdFile( "svxslots.hrc" ) -TypeLibFile( "svxslots.tlb" ) ] { //========================================================================= + include "sfx2/sfxitems.sdi" + include "sfx2/sfx.sdi" include "svxitems.sdi" include "xoitems.sdi" include "svx.sdi" |