diff options
| author | sb <sb@openoffice.org> | 2010-02-25 12:46:45 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-02-25 12:46:45 +0100 |
| commit | 87ec9c993b24c8171daf8d0b65868542381b24ae (patch) | |
| tree | f80d7ffa347e91fc9047745059c631cb21729c98 /cui/util | |
| parent | a66da9af323b3ca231c744c47961b24131e02208 (diff) | |
| parent | 97412488d9fcd77c21dbeb821dec122008cd2e32 (diff) | |
sb118: merged in DEV300_m72
Diffstat (limited to 'cui/util')
| -rw-r--r-- | cui/util/hidother.src | 7 | ||||
| -rw-r--r-- | cui/util/makefile.mk | 10 | ||||
| -rw-r--r-- | cui/util/makefile.pmk | 9 |
3 files changed, 7 insertions, 19 deletions
diff --git a/cui/util/hidother.src b/cui/util/hidother.src index 313161f7c3cd..ddce17eebb23 100644 --- a/cui/util/hidother.src +++ b/cui/util/hidother.src @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: hidother.src,v $ - * $Revision: 1.45 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -143,6 +140,8 @@ hidspecial HID_OFADLG_TREELISTBOX { HelpId = HID_OFADLG_TREELI hidspecial HID_OFAPAGE_AUTOCORR_CLB { HelpId = HID_OFAPAGE_AUTOCORR_CLB; }; hidspecial HID_OFAPAGE_AUTOFORMAT_CLB { HelpId = HID_OFAPAGE_AUTOFORMAT_CLB; }; hidspecial HID_OFAPAGE_MSFLTR2_CLB { HelpId = HID_OFAPAGE_MSFLTR2_CLB ; }; +hidspecial HID_OFAPAGE_QUOTE_CLB { HelpId = HID_OFAPAGE_QUOTE_CLB; }; +hidspecial HID_OFAPAGE_QUOTE_SW_CLB { HelpId = HID_OFAPAGE_QUOTE_SW_CLB; }; hidspecial HID_OFA_CONNPOOL_DRIVERLIST { HelpId = HID_OFA_CONNPOOL_DRIVERLIST; }; hidspecial HID_OFA_FONT_SUBST_CLB { HelpId = HID_OFA_FONT_SUBST_CLB; }; hidspecial HID_OPTIONS_COLORCONFIG_COLORLIST_WIN { HelpID = HID_OPTIONS_COLORCONFIG_COLORLIST_WIN ;}; diff --git a/cui/util/makefile.mk b/cui/util/makefile.mk index bedd1cee6407..cf2a6fcc3dc5 100644 --- a/cui/util/makefile.mk +++ b/cui/util/makefile.mk @@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.61 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -60,11 +56,11 @@ SHL1LIBS= \ SHL1STDLIBS= \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SVXLIB) \ $(AVMEDIALIB) \ $(SFX2LIB) \ - $(GOODIESLIB) \ $(BASEGFXLIB) \ $(BASICLIB) \ $(LNGLIB) \ diff --git a/cui/util/makefile.pmk b/cui/util/makefile.pmk index b2aae3329111..5d4fb6b9e517 100644 --- a/cui/util/makefile.pmk +++ b/cui/util/makefile.pmk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.pmk,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -29,9 +25,6 @@ # #************************************************************************* -# define SVX_DLLIMPLEMENTATION (see @ svxdllapi.h) -CDEFS += -DSVX_DLLIMPLEMENTATION - .IF "$(ENABLE_GTK)" != "" CFLAGS+=-DENABLE_GTK .ENDIF |