summaryrefslogtreecommitdiff
path: root/svx/util
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2009-10-31 00:36:06 +0100
committerMathias Bauer <mba@openoffice.org>2009-10-31 00:36:06 +0100
commitbe3ac782e544a45fedcbd1c241656890b29a0dbd (patch)
treec040bef998793d5073962c7bf7eefb3040533f05 /svx/util
parent8744578b99ab60f90174ae3b00e3a3fd7bb05788 (diff)
#i106421#: move svx/source/cui to cui
Diffstat (limited to 'svx/util')
-rw-r--r--svx/util/cui.map7
-rw-r--r--svx/util/hidother.src1
-rw-r--r--svx/util/makefile.mk48
3 files changed, 3 insertions, 53 deletions
diff --git a/svx/util/cui.map b/svx/util/cui.map
deleted file mode 100644
index b43a11bd5096..000000000000
--- a/svx/util/cui.map
+++ /dev/null
@@ -1,7 +0,0 @@
-CUI_1_0 {
- global:
- CreateDialogFactory;
- GetSpecialCharsForEdit;
- local:
- *;
-};
diff --git a/svx/util/hidother.src b/svx/util/hidother.src
index 6ef00e2640a2..2b7ce76e4dab 100644
--- a/svx/util/hidother.src
+++ b/svx/util/hidother.src
@@ -33,6 +33,7 @@
#include "../inc/fmhelp.hrc"
#include "../source/cui/svuidlg.hrc"
+hidspecial HID_GALLERY_PREVIEW { HelpID = HID_GALLERY_PREVIEW; };
hidspecial SID_GALLERY_IMPORTTHEME { HelpID = SID_GALLERY_IMPORTTHEME; };
hidspecial HID_GALLERY_NEW_THEME { HelpID = HID_GALLERY_NEW_THEME; };
hidspecial HID_GALLERY_WINDOW { HelpID = HID_GALLERY_WINDOW; };
diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk
index 67b8e9f3b39e..1dffe3a953c8 100644
--- a/svx/util/makefile.mk
+++ b/svx/util/makefile.mk
@@ -110,8 +110,8 @@ LIB6FILES=\
$(SLB)$/properties.lib \
$(SLB)$/svdraw-core.lib \
$(SLB)$/svxlink.lib \
- $(SLB)$/svxrtf-core.lib \
- $(SLB)$/svxrtf.lib
+ $(SLB)$/svxrtf-core.lib \
+ $(SLB)$/svxrtf.lib \
$(SLB)$/table-core.lib \
$(SLB)$/tbxctrls-core.lib \
$(SLB)$/toolbars.lib \
@@ -198,52 +198,10 @@ SHL2DEF= $(MISC)$/$(SHL2TARGET).def
DEF2NAME= $(SHL2TARGET)
DEFLIB2NAME=$(TARGET) $(TARGET)_2 $(TARGET)_3 $(TARGET)_4
-# cui
-SHL3TARGET= cui$(DLLPOSTFIX)
-SHL3VERSIONMAP= cui.map
-SHL3IMPLIB=icui
-SHL3DEPN=$(SHL2TARGETN)
-
-SHL3DEF= $(MISC)$/$(SHL3TARGET).def
-DEF3NAME= $(SHL3TARGET)
-
-SHL3LIBS= $(SLB)$/cui.lib
-
-SHL3STDLIBS= \
- $(SVXCORELIB) \
- $(SVXLIB) \
- $(AVMEDIALIB) \
- $(SFX2LIB) \
- $(GOODIESLIB) \
- $(BASEGFXLIB) \
- $(BASICLIB) \
- $(LNGLIB) \
- $(SVTOOLLIB) \
- $(TKLIB) \
- $(VCLLIB) \
- $(SVLLIB) \
- $(UNOTOOLSLIB) \
- $(TOOLSLIB) \
- $(I18NISOLANGLIB) \
- $(COMPHELPERLIB) \
- $(UCBHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(VOSLIB) \
- $(SALLIB) \
- $(JVMFWKLIB) \
- $(ICUUCLIB)
-
.IF "$(debug)$(dbgutil)"!=""
SHL2STDLIBS += $(CPPUHELPERLIB)
.ENDIF # "$(debug)$(dbgutil)"!=""
-.IF "$(GUI)"=="WNT"
-SHL3STDLIBS+= \
- $(SHLWAPILIB) \
- $(ADVAPI32LIB)
-.ENDIF # WNT
-
# ------------------------------------------------------------------------------
# Resource files
@@ -252,9 +210,7 @@ SRSFILELIST=\
$(SRS)$/editeng.srs \
$(SRS)$/outliner.srs \
$(SRS)$/dialogs.srs \
- $(SRS)$/cui.srs \
$(SRS)$/drawdlgs.srs \
- $(SRS)$/cuidrawdlgs.srs \
$(SRS)$/mnuctrls.srs \
$(SRS)$/stbctrls.srs \
$(SRS)$/tbxctrls.srs \