diff options
author | Kurt Zenker <kz@openoffice.org> | 2009-01-28 18:41:04 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2009-01-28 18:41:04 +0000 |
commit | 7dfcf07e83cc8a1e02f4e041d9ddad2c2436de7c (patch) | |
tree | 51be9abd0d6f3bb99d52e9eea062bdc841d20b88 | |
parent | a9b2cc7e9ac46bd37e60a525443426334d3e9d2d (diff) |
CWS-TOOLING: integrate CWS rt37
2009-01-22 17:00:00 +0100 rt r266743 : Clean up.
2009-01-22 15:05:47 +0100 rt r266718 : #i98313# Add 'officecfg', because component-update.dtd is needed.
2009-01-21 17:50:11 +0100 rt r266696 : Avoid creating unneeded directories.
2009-01-21 13:47:02 +0100 rt r266665 : #i98313# Nothing needed from 'goodies'.
2009-01-21 12:52:06 +0100 rt r266659 : #i98313# Nothing needed from 'svtools' nor 'xmloff'.
2009-01-21 12:15:57 +0100 rt r266650 : #i98313# Nothing needed from 'jvmaccess' nor 'svx'.
2009-01-21 12:03:45 +0100 rt r266648 : #i98313# 'canvas' not needed either.
2009-01-21 11:54:47 +0100 rt r266647 : #i98313# We do not need anything from 'slideshow' here. slideshow.rdb is not needed; it does not even exist.
2009-01-20 17:47:27 +0100 rt r266611 : #i98248# With all checkout action gone we do not need perl modules 'Cws' and 'CwsConfig' any more.
2009-01-20 14:27:49 +0100 rt r266579 : #i98248# Remove remaining, now obsolete cvs related code. In case someone wants to undo any of the previous changes on this CWS, he also has to get back this.
2009-01-20 10:11:42 +0100 rt r266555 : #i98248# if a module explicitly specified in '--since <module>' or '--all:<module>' does not exist, not even linked, it's an error. Give an error message and exit.
2009-01-19 18:11:37 +0100 rt r266517 : #i98248# This version of build.pl is for svn hosted workspaces. No need to check for 'is_svn'.
2009-01-19 18:03:40 +0100 rt r266516 : #i98248 # Do not checkout missing modules.
2009-01-19 18:00:22 +0100 rt r266515 : #i98248 # Do not try to cvs checkout a module when it's build list cannot be found.
2009-01-19 17:17:06 +0100 rt r266512 : #i98248 # No need to check out '.lnk' linked modules. Just rename the link.
2009-01-19 16:43:45 +0100 rt r266511 : #i98248 # No need to check out '.lnk' linked modules. Just rename the link.
-rw-r--r-- | sdext/inc/filter.hrc | 56 | ||||
-rw-r--r-- | sdext/prj/build.lst | 2 | ||||
-rw-r--r-- | sdext/source/presenter/makefile.mk | 7 |
3 files changed, 1 insertions, 64 deletions
diff --git a/sdext/inc/filter.hrc b/sdext/inc/filter.hrc deleted file mode 100644 index 5cd68a1..0000000 --- a/sdext/inc/filter.hrc +++ /dev/null @@ -1,56 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: filter.hrc,v $ - * $Revision: 1.2 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _FILTER_HRC -#define _FILTER_HRC - -// include --------------------------------------------------------------- - - -#ifndef _SOLAR_HRC -#include <svtools/solar.hrc> -#endif - -// Help-Ids -------------------------------------------------------------- - -#define RID_PDF_DIALOG_START (RID_FILTER_START + 0) -#define RID_PDF_DIALOG_END (RID_FILTER_START + 19) -#define RID_XSLT_DIALOG_START (RID_FILTER_START + 20) -#define RID_XSLT_DIALOG_END (RID_FILTER_START + 69) -#define RID_PDF_OLD_EXPORT_DLG (RID_FILTER_START + 70) - -// warning, next range is RID_FILTER_START + 100 ! - - -#define HID_FILTER_XSLT_START (HID_FILTER_START + 0) // see source/xsltdialog/xmlfilterhelpids.hrc for range -#define HID_FILTER_XSLT_END (HID_FILTER_START + 99) -#define HID_FILTER_PDF_OPTIONS (HID_FILTER_START + 100) -#endif - diff --git a/sdext/prj/build.lst b/sdext/prj/build.lst index e4e7e90..abac0eb 100644 --- a/sdext/prj/build.lst +++ b/sdext/prj/build.lst @@ -1,4 +1,4 @@ -dx sdext : offuh comphelper unotools readlicense_oo slideshow svtools goodies xmloff cppu tools cppuhelper sal svx javaunohelper XPDF:xpdf jvmaccess canvas LIBXSLT:libxslt NULL +dx sdext : offuh comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg XPDF:xpdf LIBXSLT:libxslt NULL dx sdext usr1 - all sdext_mkout NULL dx sdext\prj get - all sdext_prj NULL dx sdext\source\minimizer nmake - all sdext_minimizer sdext_minimizer_rdoooe sdext_minimizer_rdooo sdext_minimizer_rdooou sdext_inc NULL diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index 9b3e725..083db8e 100644 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -51,13 +51,6 @@ ENABLE_EXCEPTIONS=TRUE DLLPRE= common_build_zip= -PRIVATERDB = slideshow.rdb -UNOUCRRDB = $(SOLARBINDIR)$/$(PRIVATERDB) -UNOUCRDEP = $(UNOUCRRDB) -UNOUCROUT = $(OUT)$/inc - -CPPUMAKERFLAGS += -C -X$(SOLARBINDIR)$/types.rdb - # --- Files ------------------------------------- SLOFILES= \ |