diff options
| author | Niklas Nebel <nn@openoffice.org> | 2010-06-10 10:33:55 +0200 |
|---|---|---|
| committer | Niklas Nebel <nn@openoffice.org> | 2010-06-10 10:33:55 +0200 |
| commit | 88e530cb0c153655e43a5ee557421dc8dbdf2002 (patch) | |
| tree | 79e1db44b816aa0c5c94de31410ecd64b0f4c686 /framework/util/makefile.mk | |
| parent | a8edc64ce0b3e6238a704218b84247a5e63dedbb (diff) | |
| parent | e03596eaf693b9809cffe86c21658a5ce381d6c3 (diff) | |
calc55: merge with DEV300_m81
Diffstat (limited to 'framework/util/makefile.mk')
| -rw-r--r-- | framework/util/makefile.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk index b1b7c691d29f..55cb3c0aea3c 100644 --- a/framework/util/makefile.mk +++ b/framework/util/makefile.mk @@ -56,7 +56,6 @@ LIB1OBJFILES= \ $(SLO)$/rootitemcontainer.obj \ $(SLO)$/constitemcontainer.obj \ $(SLO)$/jobconst.obj \ - $(SLO)$/popupmenucontrollerbase.obj \ $(SLO)$/mischelper.obj \ $(SLO)$/propertysethelper.obj @@ -195,7 +194,8 @@ SHL3OBJS= $(SLO)$/mediatypedetectionhelper.obj\ $(SLO)$/dispatchrecorder.obj \ $(SLO)$/dispatchrecordersupplier.obj\ $(SLO)$/dispatchhelper.obj \ - $(SLO)$/popupmenudispatcher.obj \ + $(SLO)$/popupmenudispatcher.obj \ + $(SLO)$/popupmenucontroller.obj SHL3STDLIBS= \ $(FWILIB) \ |