From b0fa467ebb7c8c124ea433b3562fcbae0cbfe197 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 19 Sep 2009 00:02:22 +0200 Subject: better dependencies for sdi files --- sfx2/prj/d.lst | 4 +-- sfx2/sdi/sfxitems.sdi | 88 ++++++++++++++++++++++++++++++++++++++++++++++++ sfx2/sdi/sfxslots.sdi | 93 ++------------------------------------------------- svx/prj/d.lst | 5 +-- svx/sdi/makefile.mk | 5 +-- svx/sdi/svxslots.sdi | 5 ++- 6 files changed, 101 insertions(+), 99 deletions(-) create mode 100644 sfx2/sdi/sfxitems.sdi diff --git a/sfx2/prj/d.lst b/sfx2/prj/d.lst index 77acce9a7be9..fe71b1715769 100644 --- a/sfx2/prj/d.lst +++ b/sfx2/prj/d.lst @@ -3,8 +3,6 @@ mkdir: %COMMON_DEST%\res%_EXT% mkdir: %_DEST%\inc%_EXT%\sfx2 ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid -..\%__SRC%\inc\sfxslots.ilb %_DEST%\inc%_EXT%\sfxslots.ilb -..\%__SRC%\inc\sfxslots.ilb* %_DEST%\inc%_EXT%\sfxslots.ilb* ..\%__SRC%\lib\sfx.lib %_DEST%\lib%_EXT%\sfx.lib ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a @@ -26,6 +24,8 @@ mkdir: %_DEST%\inc%_EXT%\sfx2 ..\%__SRC%\misc\sfx2.csv %_DEST%\inc%_EXT%\sfx2.csv ..\inc\sfx2\dllapi.h %_DEST%\inc%_EXT%\sfx2\dllapi.h +..\sdi\sfx.sdi %_DEST%\inc%_EXT%\sfx2\sfx.sdi +..\sdi\sfxitems.sdi %_DEST%\inc%_EXT%\sfx2\sfxitems.sdi ..\inc\sfx2\app.hxx %_DEST%\inc%_EXT%\sfx2\app.hxx ..\inc\sfx2\basedlgs.hxx %_DEST%\inc%_EXT%\sfx2\basedlgs.hxx ..\inc\sfx2\bindings.hxx %_DEST%\inc%_EXT%\sfx2\bindings.hxx diff --git a/sfx2/sdi/sfxitems.sdi b/sfx2/sdi/sfxitems.sdi new file mode 100644 index 000000000000..c3c5bf6f4212 --- /dev/null +++ b/sfx2/sdi/sfxitems.sdi @@ -0,0 +1,88 @@ + item void SfxVoidItem; + item BOOL SfxBoolItem; + item INT32 SfxUInt16Item; + item INT16 SfxInt16Item; + item INT32 SfxUInt32Item; + item INT32 SfxInt32Item; + item String SfxStringItem; + item BYTE SfxByteItem; + item INT16 SfxEnumItem; + item INT16 SfxAllEnumItem; + item INT16 TbxImageItem; + + item String SbxItem; //! Dummy + item String SfxObjectItem; //! Dummy + item String SfxTemplateItem; //! Dummy + item String SfxMacroInfoItem; //! Dummy + item String SfxImageItem; //! Dummy + item String SfxFrameItem; //! Dummy + item String SfxObjectShellItem //! Dummy + item String SfxUsrAnyItem //! Dummy + + struct Point + { + INT32 X MID_X; + INT32 Y MID_Y; + }; + item Point SfxPointItem; + + struct Rectangle + { + INT32 Left MID_RECT_LEFT; + INT32 Top MID_RECT_TOP; + INT32 Width MID_WIDTH; + INT32 Height MID_HEIGHT; + }; + item Rectangle SfxRectangleItem; + + struct DocInfo + { + BOOL UseUserData MID_DOCINFO_USEUSERDATA; + BOOL DeleteUserData MID_DOCINFO_DELETEUSERDATA; + String Title MID_DOCINFO_TITLE; + String Subject MID_DOCINFO_SUBJECT; + String KeyWords MID_DOCINFO_KEYWORDS; + String Description MID_DOCINFO_DESCRIPTION; + BOOL AutoReload MID_DOCINFO_AUTOLOADENABLED; + INT32 AutoReloadTime MID_DOCINFO_AUTOLOADSECS; + String AutoReloadURL MID_DOCINFO_AUTOLOADURL; + String AutoReloadFrame MID_DOCINFO_DEFAULTTARGET; + }; + item DocInfo SfxDocumentInfoItem; + + struct SvxSearch + { + INT16 StyleFamily MID_SEARCH_STYLEFAMILY; + UINT16 CellType MID_SEARCH_CELLTYPE; + BOOL RowDirection MID_SEARCH_ROWDIRECTION; + BOOL AllTables MID_SEARCH_ALLTABLES; + BOOL Backward MID_SEARCH_BACKWARD; + BOOL Pattern MID_SEARCH_PATTERN; + BOOL Content MID_SEARCH_CONTENT; + BOOL AsianOptions MID_SEARCH_ASIANOPTIONS; + INT16 AlgorithmType MID_SEARCH_ALGORITHMTYPE; + INT32 SearchFlags MID_SEARCH_FLAGS; + String SearchString MID_SEARCH_SEARCHSTRING; + String ReplaceString MID_SEARCH_REPLACESTRING; + INT16 Locale MID_SEARCH_LOCALE; + INT32 ChangedChars MID_SEARCH_CHANGEDCHARS; + INT32 DeletedChars MID_SEARCH_DELETEDCHARS; + INT32 InsertedChars MID_SEARCH_INSERTEDCHARS; + INT32 TransliterateFlags MID_SEARCH_TRANSLITERATEFLAGS; + INT16 Command MID_SEARCH_COMMAND; + }; + item SvxSearch SvxSearchItem; + + struct SvxSize + { + INT32 Width MID_SIZE_WIDTH; + INT32 Height MID_SIZE_HEIGHT; + }; + item SvxSize SvxSizeItem; + + struct SfxScriptOrganizer + { + String Language MID_SCRIPT_ORGANIZER_LANGUAGE; + }; + item SfxScriptOrganizer SfxScriptOrganizerItem; + diff --git a/sfx2/sdi/sfxslots.sdi b/sfx2/sdi/sfxslots.sdi index 27336865be73..44cd45d00868 100644 --- a/sfx2/sdi/sfxslots.sdi +++ b/sfx2/sdi/sfxslots.sdi @@ -36,102 +36,15 @@ StarApplicationFrame [ HelpText( "StarDivision Application Framework" ), SlotIdFile( "sfx2/sfx.hrc" ) -TypeLibFile( "sfxslots.tlb" ) ] { - item void SfxVoidItem; - item BOOL SfxBoolItem; - item INT32 SfxUInt16Item; - item INT16 SfxInt16Item; - item INT32 SfxUInt32Item; - item INT32 SfxInt32Item; - item String SfxStringItem; - item BYTE SfxByteItem; - item INT16 SfxEnumItem; - item INT16 SfxAllEnumItem; - item INT16 TbxImageItem; - - item String SbxItem; //! Dummy - item String SfxObjectItem; //! Dummy - item String SfxTemplateItem; //! Dummy - item String SfxMacroInfoItem; //! Dummy - item String SfxImageItem; //! Dummy - item String SfxFrameItem; //! Dummy - item String SfxObjectShellItem //! Dummy - item String SfxUsrAnyItem //! Dummy - - struct Point - { - INT32 X MID_X; - INT32 Y MID_Y; - }; - item Point SfxPointItem; - - struct Rectangle - { - INT32 Left MID_RECT_LEFT; - INT32 Top MID_RECT_TOP; - INT32 Width MID_WIDTH; - INT32 Height MID_HEIGHT; - }; - item Rectangle SfxRectangleItem; - - struct DocInfo - { - BOOL UseUserData MID_DOCINFO_USEUSERDATA; - BOOL DeleteUserData MID_DOCINFO_DELETEUSERDATA; - String Title MID_DOCINFO_TITLE; - String Subject MID_DOCINFO_SUBJECT; - String KeyWords MID_DOCINFO_KEYWORDS; - String Description MID_DOCINFO_DESCRIPTION; - BOOL AutoReload MID_DOCINFO_AUTOLOADENABLED; - INT32 AutoReloadTime MID_DOCINFO_AUTOLOADSECS; - String AutoReloadURL MID_DOCINFO_AUTOLOADURL; - String AutoReloadFrame MID_DOCINFO_DEFAULTTARGET; - }; - item DocInfo SfxDocumentInfoItem; - - struct SvxSearch - { - INT16 StyleFamily MID_SEARCH_STYLEFAMILY; - UINT16 CellType MID_SEARCH_CELLTYPE; - BOOL RowDirection MID_SEARCH_ROWDIRECTION; - BOOL AllTables MID_SEARCH_ALLTABLES; - BOOL Backward MID_SEARCH_BACKWARD; - BOOL Pattern MID_SEARCH_PATTERN; - BOOL Content MID_SEARCH_CONTENT; - BOOL AsianOptions MID_SEARCH_ASIANOPTIONS; - INT16 AlgorithmType MID_SEARCH_ALGORITHMTYPE; - INT32 SearchFlags MID_SEARCH_FLAGS; - String SearchString MID_SEARCH_SEARCHSTRING; - String ReplaceString MID_SEARCH_REPLACESTRING; - INT16 Locale MID_SEARCH_LOCALE; - INT32 ChangedChars MID_SEARCH_CHANGEDCHARS; - INT32 DeletedChars MID_SEARCH_DELETEDCHARS; - INT32 InsertedChars MID_SEARCH_INSERTEDCHARS; - INT32 TransliterateFlags MID_SEARCH_TRANSLITERATEFLAGS; - INT16 Command MID_SEARCH_COMMAND; - }; - item SvxSearch SvxSearchItem; - - struct SvxSize - { - INT32 Width MID_SIZE_WIDTH; - INT32 Height MID_SIZE_HEIGHT; - }; - item SvxSize SvxSizeItem; - - struct SfxScriptOrganizer - { - String Language MID_SCRIPT_ORGANIZER_LANGUAGE; - }; - item SfxScriptOrganizer SfxScriptOrganizerItem; - + include "sfxitems.sdi" include "sfx.sdi" include "docslots.sdi" - include "frmslots.sdi" include "viwslots.sdi" + include "frmslots.sdi" include "mdislots.sdi" include "appslots.sdi" + } diff --git a/svx/prj/d.lst b/svx/prj/d.lst index 227dac4db601..ba4dee265ee5 100644 --- a/svx/prj/d.lst +++ b/svx/prj/d.lst @@ -7,8 +7,6 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator\en-US mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator\es ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid -..\%__SRC%\inc\svxslots.ilb %_DEST%\inc%_EXT%\svxslots.ilb -..\%__SRC%\inc\*.ilb* %_DEST%\inc%_EXT%\*.ilb* ..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.* ..\%__SRC%\lib\isvx*.lib %_DEST%\lib%_EXT%\isvx*.lib ..\%__SRC%\bin\gengal* %_DEST%\bin%_EXT%\gengal* @@ -20,6 +18,9 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator\es ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res mkdir: %_DEST%\inc%_EXT%\svx +..\sdi\svx.sdi %_DEST%\inc%_EXT%\svx\svx.sdi +..\sdi\svxitems.sdi %_DEST%\inc%_EXT%\svx\svxitems.sdi +..\sdi\xoitems.sdi %_DEST%\inc%_EXT%\svx\xoitems.sdi ..\inc\flagsdef.hxx %_DEST%\inc%_EXT%\svx\flagsdef.hxx ..\%__SRC%\inc\svxslots.hxx %_DEST%\inc%_EXT%\svx\svxslots.hxx ..\source\inc\fmresids.hrc %_DEST%\inc%_EXT%\svx\fmresids.hrc diff --git a/svx/sdi/makefile.mk b/svx/sdi/makefile.mk index 60f3cc3fb5c3..ab56159430cd 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 @@ -45,10 +45,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/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" -- cgit