diff options
author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-07-13 14:36:24 +0200 |
---|---|---|
committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-07-13 14:36:24 +0200 |
commit | c939a66ccb5bfe0c84992a6fab09aa7df46e76cd (patch) | |
tree | 7c5cf25a0e0de3c17dab416f0cc37f092c7eda15 /sc/util | |
parent | 5608bf958fa280a16391ca8123b549e0769c3ee9 (diff) | |
parent | 686b7955271806e65222a3a4bfe97365cab33a06 (diff) |
CWS gnumake2: resync to DEV300_m84
Diffstat (limited to 'sc/util')
-rw-r--r-- | sc/util/hidother.src | 1 | ||||
-rw-r--r-- | sc/util/makefile.mk | 8 | ||||
-rw-r--r-- | sc/util/sc.map | 8 | ||||
-rw-r--r-- | sc/util/scd.map | 8 | ||||
-rw-r--r-- | sc/util/scfilt.map | 2 | ||||
-rw-r--r-- | sc/util/scui.map | 2 | ||||
-rw-r--r-- | sc/util/vbaobj.map | 9 |
7 files changed, 7 insertions, 31 deletions
diff --git a/sc/util/hidother.src b/sc/util/hidother.src index 48dfebdf5c2c..ffdb5c329399 100644 --- a/sc/util/hidother.src +++ b/sc/util/hidother.src @@ -81,6 +81,7 @@ hidspecial HID_SC_APPEND_NAME { HelpID = HID_SC_APPEND_NAME; }; hidspecial HID_SC_AUTOFMT_NAME { HelpID = HID_SC_AUTOFMT_NAME; }; hidspecial HID_SC_ADD_AUTOFMT { HelpID = HID_SC_ADD_AUTOFMT; }; hidspecial HID_SC_REN_AFMT_NAME { HelpID = HID_SC_REN_AFMT_NAME; }; +hidspecial HID_SC_REN_AFMT_DLG { HelpID = HID_SC_REN_AFMT_DLG; }; hidspecial HID_SC_RENAME_AUTOFMT { HelpID = HID_SC_RENAME_AUTOFMT; }; hidspecial HID_PASSWD_TABLE { HelpID = HID_PASSWD_TABLE; }; hidspecial HID_PASSWD_DOC { HelpID = HID_PASSWD_DOC; }; diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk index e25db69173b4..735ccaf35c85 100644 --- a/sc/util/makefile.mk +++ b/sc/util/makefile.mk @@ -71,7 +71,6 @@ SHL1IMPLIB= sci # dynamic libraries SHL1STDLIBS= \ - $(VBAHELPERLIB) \ $(BASICLIB) \ $(SFXLIB) \ $(SVTOOLLIB) \ @@ -139,7 +138,7 @@ LIB4FILES= \ SHL2TARGET= scd$(DLLPOSTFIX) SHL2IMPLIB= scdimp -SHL2VERSIONMAP= scd.map +SHL2VERSIONMAP=$(SOLARENV)/src/component.map SHL2DEF=$(MISC)$/$(SHL2TARGET).def DEF2NAME= $(SHL2TARGET) @@ -256,6 +255,7 @@ LIB8OBJFILES = \ $(SLO)$/attrdlg.obj \ $(SLO)$/scuiimoptdlg.obj \ $(SLO)$/strindlg.obj \ + $(SLO)$/tabbgcolordlg.obj \ $(SLO)$/shtabdlg.obj \ $(SLO)$/scendlg.obj \ $(SLO)$/pvfundlg.obj \ @@ -288,7 +288,7 @@ TARGET_VBA=vbaobj SHL9TARGET=$(TARGET_VBA)$(DLLPOSTFIX).uno SHL9IMPLIB= i$(TARGET_VBA) -SHL9VERSIONMAP=$(TARGET_VBA).map +SHL9VERSIONMAP=$(SOLARENV)/src/component.map SHL9DEF=$(MISC)$/$(SHL9TARGET).def DEF9NAME=$(SHL9TARGET) .IF "$(VBA_EXTENSION)"=="YES" @@ -315,7 +315,7 @@ SHL9STDLIBS= \ $(ISCLIB) \ $(VCLLIB) \ $(TKLIB) \ - $(SVXMSFILTERLIB) \ + $(MSFILTERLIB) \ $(FORLIB) SHL9DEPN=$(SHL1TARGETN) $(SHL8TARGETN) diff --git a/sc/util/sc.map b/sc/util/sc.map deleted file mode 100644 index bfd1401a7685..000000000000 --- a/sc/util/sc.map +++ /dev/null @@ -1,8 +0,0 @@ -SC_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/sc/util/scd.map b/sc/util/scd.map deleted file mode 100644 index bfd1401a7685..000000000000 --- a/sc/util/scd.map +++ /dev/null @@ -1,8 +0,0 @@ -SC_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/sc/util/scfilt.map b/sc/util/scfilt.map index 589736f24eb1..642b8db15088 100644 --- a/sc/util/scfilt.map +++ b/sc/util/scfilt.map @@ -1,4 +1,4 @@ -SCFILT_1_0 { +UDK_3_0_0 { global: ScFilterCreate; local: diff --git a/sc/util/scui.map b/sc/util/scui.map index f40bd255fe1d..ad5e33836c7c 100644 --- a/sc/util/scui.map +++ b/sc/util/scui.map @@ -1,4 +1,4 @@ -SWUI_1_0 { +UDK_3_0_0 { global: CreateDialogFactory; local: diff --git a/sc/util/vbaobj.map b/sc/util/vbaobj.map deleted file mode 100644 index 737cddbfe3df..000000000000 --- a/sc/util/vbaobj.map +++ /dev/null @@ -1,9 +0,0 @@ -OOO_1.1 { - global: - component_getImplementationEnvironment; - component_getFactory; - component_writeInfo; - - local: - *; -}; |