diff options
| author | Philipp Lohmann <Philipp.Lohmann@Sun.COM> | 2009-10-09 15:11:54 +0200 |
|---|---|---|
| committer | Philipp Lohmann <Philipp.Lohmann@Sun.COM> | 2009-10-09 15:11:54 +0200 |
| commit | e0d3874aec6ebdee32e3fae26f91596cc14f4f22 (patch) | |
| tree | c824676a1ad9b9c9b70e927a5ce99851fd7f40cd /sd/util | |
| parent | 27d7fbc408091cb0871ae9fa2e29e0334f473ca9 (diff) | |
| parent | cdc081ea0e30b4ffc1ad7cb8453c259fdf628eb0 (diff) | |
merge with m61
Diffstat (limited to 'sd/util')
| -rw-r--r-- | sd/util/hidother.src | 3 | ||||
| -rw-r--r-- | sd/util/makefile.mk | 39 | ||||
| -rw-r--r-- | sd/util/sdfilt.map | 8 |
3 files changed, 48 insertions, 2 deletions
diff --git a/sd/util/hidother.src b/sd/util/hidother.src index b6f427e9488a..898079e5c762 100644 --- a/sd/util/hidother.src +++ b/sd/util/hidother.src @@ -143,6 +143,7 @@ hidspecial HID_SD_ALL_MASTERS { HelpId = HID_SD_ALL_MASTERS; }; hidspecial HID_SD_SLIDE_LAYOUTS { HelpId = HID_SD_SLIDE_LAYOUTS; }; hidspecial HID_SD_CUSTOM_ANIMATIONS { HelpId = HID_SD_CUSTOM_ANIMATIONS; }; hidspecial HID_SD_SLIDE_TRANSITIONS { HelpId = HID_SD_SLIDE_TRANSITIONS; }; +hidspecial HID_SD_ANNOTATIONS { HelpId = HID_SD_ANNOTATIONS; }; hidspecial HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT { HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT; }; hidspecial HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT { HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT; }; @@ -204,3 +205,5 @@ hidspecial HID_SD_RULER_HORIZONTAL { HelpId = HID_S hidspecial HID_SD_RULER_VERTICAL { HelpId = HID_SD_RULER_VERTICAL; }; hidspecial HID_SD_TABLE_DESIGN { HelpId = HID_SD_TABLE_DESIGN; }; +hidspecial HID_SD_ANNOTATIONS { HelpId = HID_SD_ANNOTATIONS; }; + diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index 55c59f22aa13..9413519faf60 100644 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -56,6 +56,7 @@ RESLIB1SRSFILES=\ $(SRS)$/slideshow.srs \ $(SRS)$/uitable.srs \ $(SRS)$/view.srs \ + $(SRS)$/uiannotations.srs \ $(SOLARCOMMONRESDIR)$/sfx.srs # --- StarDraw DLL @@ -66,6 +67,7 @@ SHL1IMPLIB= sdi # dynamic libraries SHL1STDLIBS+= \ + $(SVXCORELIB) \ $(SVXLIB) \ $(SFXLIB) \ $(BASICLIB) \ @@ -119,10 +121,13 @@ LIB3FILES= \ $(SLB)$/dlg.lib \ $(SLB)$/core.lib \ $(SLB)$/undo.lib \ + $(SLB)$/annotations.lib \ + $(SLB)$/text.lib \ $(SLB)$/helper.lib \ $(SLB)$/xml.lib \ $(SLB)$/cgm.lib \ $(SLB)$/uitable.lib \ + $(SLB)$/uiannotations.lib\ $(SLB)$/grf.lib LIB5TARGET=$(SLB)$/sdraw3_2.lib @@ -130,7 +135,6 @@ LIB5FILES= \ $(SLB)$/html.lib \ $(SLB)$/filter.lib \ $(SLB)$/unoidl.lib \ - $(SLB)$/ppt.lib \ $(SLB)$/animui.lib \ $(SLB)$/accessibility.lib \ $(SLB)$/toolpanel.lib \ @@ -162,7 +166,7 @@ DEF2NAME= $(SHL2TARGET) SHL2STDLIBS= \ $(SFX2LIB) \ - $(SVXLIB) \ + $(SVXCORELIB) \ $(SVTOOLLIB) \ $(SVLLIB) \ $(VCLLIB) \ @@ -194,6 +198,7 @@ LIB4FILES= \ SHL4STDLIBS= \ $(ISDLIB) \ + $(SVXCORELIB) \ $(SVXLIB) \ $(SFXLIB) \ $(BASEGFXLIB) \ @@ -228,10 +233,40 @@ SHL4OBJS += $(SLO)$/pchname.obj \ # $(ISDLIB) is build in SHL1TARGET .IF "$(GUI)" == "UNX" SHL4DEPN=$(SHL1TARGETN) +SHL5DEPN=$(SHL1TARGETN) .ELSE SHL4DEPN=$(SHL1IMPLIBN) +SHL5DEPN=$(SHL1IMPLIBN) .ENDIF +# ppt import/export library +SHL5TARGET = sdfilt$(DLLPOSTFIX) +SHL5IMPLIB = sdfilti +SHL5VERSIONMAP= sdfilt.map +SHL5DEF = $(MISC)$/$(SHL5TARGET).def +SHL5LIBS = $(SLB)$/ppt.lib $(SLB)$/eppt.lib + +DEF5NAME=$(SHL5TARGET) + +SHL5STDLIBS = $(ISDLIB) \ + $(SVXCORELIB) \ + $(SVXMSFILTERLIB) \ + $(SFX2LIB) \ + $(SVTOOLLIB) \ + $(SOTLIB) \ + $(GOODIESLIB) \ + $(VCLLIB) \ + $(SVLLIB) \ + $(SOTLIB) \ + $(UNOTOOLSLIB) \ + $(TOOLSLIB) \ + $(UCBHELPERLIB) \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(SALLIB) \ + $(COMPHELPERLIB) \ + $(I18NISOLANGLIB) + # --- Targets ------------------------------------------------------------- .INCLUDE : target.mk diff --git a/sd/util/sdfilt.map b/sd/util/sdfilt.map new file mode 100644 index 000000000000..ac6b782f3145 --- /dev/null +++ b/sd/util/sdfilt.map @@ -0,0 +1,8 @@ +PPTEXPORTER_1_0 { + global: + ExportPPT; + ImportPPT; + + local: + *; +}; |