update ooo310-m15
[ooovba.git] / applied_patches / 0754-field-patch-split-build.diff
blob427157f25753a5e4333c28bcf9fb97baf4754249
1 --- /dev/null 2007-04-20 17:59:41.000000000 +0200
2 +++ xmloff/inc/xmloff/ecmaflds.hxx 2009-04-24 11:38:07.000000000 +0200
3 @@ -0,0 +1,68 @@
4 +/*************************************************************************
5 + *
6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
7 + *
8 + * Copyright 2008 by Sun Microsystems, Inc.
9 + *
10 + * OpenOffice.org - a multi-platform office productivity suite
11 + *
12 + * $RCSfile: $
13 + * $Revision: $
14 + *
15 + * This file is part of OpenOffice.org.
16 + *
17 + * OpenOffice.org is free software: you can redistribute it and/or modify
18 + * it under the terms of the GNU Lesser General Public License version 3
19 + * only, as published by the Free Software Foundation.
20 + *
21 + * OpenOffice.org is distributed in the hope that it will be useful,
22 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
23 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24 + * GNU Lesser General Public License version 3 for more details
25 + * (a copy is included in the LICENSE file that accompanied this code).
26 + *
27 + * You should have received a copy of the GNU Lesser General Public License
28 + * version 3 along with OpenOffice.org. If not, see
29 + * <http://www.openoffice.org/license.html>
30 + * for a copy of the LGPLv3 License.
31 + *
32 + ************************************************************************/
33 +/* and also:
34 + * Author: Florian Reuter <freuter@novell.com>
35 + * Copyright 2008 by Novell, Inc.
36 +*/
37 +#ifndef _ECMAFLDS_HXX
38 +#define _ECMAFLDS_HXX
41 +#define ECMA_FORMTEXT "ecma.office-open-xml.field.FORMTEXT"
42 +#define ECMA_FORMTEXT_NAME "name"
43 +#define ECMA_FORMTEXT_HELPTEXT "helpText"
44 +#define ECMA_FORMTEXT_STATUSTEXT "statusText"
45 +#define ECMA_FORMTEXT_DEFAULT "default"
46 +#define ECMA_FORMTEXT_FORMAT "format"
47 +#define ECMA_FORMTEXT_MAXLENGTH "maxLength"
48 +#define ECMA_FORMTEXT_TYPE "type"
50 +#define ECMA_FORMCHECKBOX "ecma.office-open-xml.field.FORMCHECKBOX"
51 +#define ECMA_FORMCHECKBOX_NAME "name"
52 +#define ECMA_FORMCHECKBOX_HELPTEXT "helpText"
53 +#define ECMA_FORMCHECKBOX_STATUSTEXT "statusText"
54 +#define ECMA_FORMCHECKBOX_CHECKED "checked"
55 +#define ECMA_FORMCHECKBOX_DEFAULT "default"
56 +#define ECMA_FORMCHECKBOX_SIZE "size"
57 +#define ECMA_FORMCHECKBOX_SIZEAUTO "sizeAuto"
60 +#define ECMA_FORMDROPDOWN "ecma.office-open-xml.field.FORMDROPDOWN"
61 +#define ECMA_FORMDROPDOWN_DEFAULT "default"
62 +#define ECMA_FORMDROPDOWN_LISTENTRY "listEntry"
63 +#define ECMA_FORMDROPDOWN_RESULT "result"
65 +#define ECMA_TOC "ecma.office-open-xml.field.TOC"
67 +#define ECMA_HYPERLINK "ecma.office-open-xml.field.HYPERLINK"
69 +#define ECMA_PAGEREF "ecma.office-open-xml.field.PAGEREF"
71 +#endif /* _ECMAFLDS_HXX */
72 --- xmloff/source/text/XMLTextMarkImportContext.cxx.old 2009-04-24 15:32:17.000000000 +0200
73 +++ xmloff/source/text/XMLTextMarkImportContext.cxx 2009-04-24 16:20:13.000000000 +0200
74 @@ -41,6 +41,7 @@
75 #include <xmloff/xmltoken.hxx>
76 #include <xmloff/xmlimp.hxx>
77 #include <xmloff/nmspmap.hxx>
78 +#include <xmloff/ecmaflds.hxx>
79 #include "xmlnmspe.hxx"
80 #include <com/sun/star/xml/sax/XAttributeList.hpp>
81 #include <com/sun/star/text/XTextContent.hpp>
82 @@ -50,7 +51,6 @@
84 #include <com/sun/star/text/XFormField.hpp>
86 -#include <../../../sw/inc/ecmaflds.hxx> // HACKYYYYYYYYY
88 using ::rtl::OUString;
89 using ::rtl::OUStringBuffer;