From 81d6b090a680d432e33e4de4be9906043eed1139 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Fri, 19 Jun 2009 19:51:20 +0000 Subject: #i100619# initial commit of patches from ooo-build that implement new datapilot field popup window. --- sc/util/makefile.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'sc/util/makefile.mk') diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk index fe2bf6bc636d..0a47fee22e1a 100644 --- a/sc/util/makefile.mk +++ b/sc/util/makefile.mk @@ -58,6 +58,7 @@ RESLIB1LIST=\ $(SRS)$/formdlgs.srs \ $(SRS)$/pagedlg.srs \ $(SRS)$/navipi.srs \ + $(SRS)$/cctrl.srs \ $(SOLARCOMMONRESDIR)$/sfx.srs RESLIB1NAME=sc -- cgit From b559137b68a273ef543711995ebf4f140cfe9149 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Mon, 27 Jul 2009 11:41:15 -0400 Subject: #i102141# initial port of patches from ooo-build, to implement a new HTML option dialog & associated changes in the core. --- sc/util/makefile.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'sc/util/makefile.mk') diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk index 3fc0712cd996..a7c981a11a95 100644 --- a/sc/util/makefile.mk +++ b/sc/util/makefile.mk @@ -277,6 +277,7 @@ LIB8OBJFILES = \ $(SLO)$/dapidata.obj \ $(SLO)$/crdlg.obj \ $(SLO)$/scuiasciiopt.obj \ + $(SLO)$/langchooser.obj \ $(SLO)$/scuiautofmt.obj \ $(SLO)$/dpgroupdlg.obj \ $(SLO)$/editfield.obj -- cgit From feeb99de89fc888b9397ddca882d121bdec2bef4 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Thu, 6 Aug 2009 14:58:06 -0400 Subject: Change the identity of the import option dialog. Change the identity of the import option dialog from lang chooser to text import options, since the dialog now contains more than just the language option. --- sc/util/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sc/util/makefile.mk') diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk index a7c981a11a95..144c60731970 100644 --- a/sc/util/makefile.mk +++ b/sc/util/makefile.mk @@ -277,7 +277,7 @@ LIB8OBJFILES = \ $(SLO)$/dapidata.obj \ $(SLO)$/crdlg.obj \ $(SLO)$/scuiasciiopt.obj \ - $(SLO)$/langchooser.obj \ + $(SLO)$/textimportoptions.obj \ $(SLO)$/scuiautofmt.obj \ $(SLO)$/dpgroupdlg.obj \ $(SLO)$/editfield.obj -- cgit From 827fecf84fa219a630e7481a717a733d22634b70 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 15 Dec 2009 21:55:40 +0100 Subject: #i107706#: liquidate goodies module --- sc/util/makefile.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'sc/util/makefile.mk') diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk index 11a5150d2784..4cf9a078cc0e 100644 --- a/sc/util/makefile.mk +++ b/sc/util/makefile.mk @@ -85,7 +85,6 @@ SHL1STDLIBS= \ $(SVLLIB) \ $(SVXCORELIB) \ $(SVXLIB) \ - $(GOODIESLIB) \ $(BASEGFXLIB) \ $(DRAWINGLAYERLIB) \ $(VCLLIB) \ -- cgit From bf5462ddf65df9392780b29bbe96597190e55f76 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 8 Jan 2010 18:32:51 +0100 Subject: #i107450#: build all other modules with new editeng lib --- sc/util/makefile.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'sc/util/makefile.mk') diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk index 4cf9a078cc0e..cfaba59c10b4 100644 --- a/sc/util/makefile.mk +++ b/sc/util/makefile.mk @@ -84,6 +84,7 @@ SHL1STDLIBS= \ $(SVTOOLLIB) \ $(SVLLIB) \ $(SVXCORELIB) \ + $(EDITENGLIB) \ $(SVXLIB) \ $(BASEGFXLIB) \ $(DRAWINGLAYERLIB) \ @@ -189,6 +190,7 @@ SHL6STDLIBS= \ $(SVTOOLLIB) \ $(SVLLIB) \ $(SVXCORELIB) \ + $(EDITENGLIB) \ $(MSFILTERLIB) \ $(SVXLIB) \ $(BASEGFXLIB) \ @@ -217,6 +219,7 @@ DEF8NAME=$(SHL8TARGET) SHL8STDLIBS= \ $(ISCLIB) \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SVXLIB) \ $(SFX2LIB) \ @@ -311,6 +314,7 @@ SHL9STDLIBS= \ $(SALLIB)\ $(BASICLIB) \ $(SFXLIB) \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SVTOOLLIB) \ $(SVLLIB) \ -- cgit From 4573ccfffda4c2bea55d1da2ac1357bcde91e67a Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Fri, 12 Feb 2010 15:01:35 +0100 Subject: changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) --- sc/util/makefile.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'sc/util/makefile.mk') diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk index 44d2ad9b490d..1c3e8777438e 100644 --- a/sc/util/makefile.mk +++ b/sc/util/makefile.mk @@ -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.mk,v $ -# -# $Revision: 1.49 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify -- cgit