From ab1ce9610fa399348a164fe1f8ed52919a0fe597 Mon Sep 17 00:00:00 2001 From: sb Date: Fri, 4 Sep 2009 12:24:40 +0200 Subject: merged in DEV300_m57 --- xmloff/inc/xmloff/txtparae.hxx | 14 +++++++++++--- xmloff/inc/xmloff/xmlimppr.hxx | 1 + xmloff/inc/xmloff/xmlmetai.hxx | 5 +++++ xmloff/inc/xmloff/xmltoken.hxx | 1 + 4 files changed, 18 insertions(+), 3 deletions(-) (limited to 'xmloff/inc') diff --git a/xmloff/inc/xmloff/txtparae.hxx b/xmloff/inc/xmloff/txtparae.hxx index 1ea068911236..a7c7df50ee64 100644 --- a/xmloff/inc/xmloff/txtparae.hxx +++ b/xmloff/inc/xmloff/txtparae.hxx @@ -123,7 +123,11 @@ class XMLOFF_DLLPUBLIC XMLTextParagraphExport : public XMLStyleExport protected: const ::rtl::OUString sActualSize; - const ::rtl::OUString sAlternativeText; + // --> OD 2009-07-22 #i73249# +// const ::rtl::OUString sAlternativeText; + const ::rtl::OUString sTitle; + const ::rtl::OUString sDescription; + // <-- const ::rtl::OUString sAnchorCharStyleName; const ::rtl::OUString sAnchorPageNo; const ::rtl::OUString sAnchorType; @@ -605,8 +609,12 @@ public: virtual void exportTextAutoStyles(); void exportEvents( const ::com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet > & rPropSet ); - void exportAlternativeText( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPropSet, - const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo ); + // --> OD 2009-07-22 #i73249# +// void exportAlternativeText( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPropSet, +// const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo ); + void exportTitleAndDescription( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPropSet, + const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo ); + // <-- // This method exports the given XText void exportText( diff --git a/xmloff/inc/xmloff/xmlimppr.hxx b/xmloff/inc/xmloff/xmlimppr.hxx index ff6d167e737c..4bf1a9865c85 100644 --- a/xmloff/inc/xmloff/xmlimppr.hxx +++ b/xmloff/inc/xmloff/xmlimppr.hxx @@ -80,6 +80,7 @@ class XMLOFF_DLLPUBLIC SvXMLImportPropertyMapper : public UniRefBase protected: UniReference< XMLPropertySetMapper > maPropMapper; + SvXMLImport& GetImport() const { return rImport;} public: diff --git a/xmloff/inc/xmloff/xmlmetai.hxx b/xmloff/inc/xmloff/xmlmetai.hxx index 9423b7424b73..7cc1c6b054ec 100644 --- a/xmloff/inc/xmloff/xmlmetai.hxx +++ b/xmloff/inc/xmloff/xmlmetai.hxx @@ -35,6 +35,7 @@ #include "xmloff/dllapi.h" #include +#include #include #include @@ -76,6 +77,10 @@ protected: void initDocumentProperties(); // set the BuildId property at the importer void setBuildId(const ::rtl::OUString & i_rBuildId); + +public: + static void setBuildId(const ::rtl::OUString & rGenerator, + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xImportInfo ); }; #endif // _XMLOFF_XMLMETAI_HXX diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx index 988614298fbb..66abd40a44f4 100644 --- a/xmloff/inc/xmloff/xmltoken.hxx +++ b/xmloff/inc/xmloff/xmltoken.hxx @@ -3074,6 +3074,7 @@ namespace xmloff { namespace token { XML_AT_LABELS, XML_AT_AXIS, XML_AT_LABELS_AND_AXIS, + XML_FILLED_RADAR, // MathML only XML_MATHVARIANT, -- cgit From b54c9639c577a87279316ee6384dd95ed4752d66 Mon Sep 17 00:00:00 2001 From: Cédric Bosdonnat Date: Tue, 17 Nov 2009 12:33:55 +0100 Subject: cbosdo02: field patch to upstream applied --- xmloff/inc/xmloff/ecmaflds.hxx | 68 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 xmloff/inc/xmloff/ecmaflds.hxx (limited to 'xmloff/inc') diff --git a/xmloff/inc/xmloff/ecmaflds.hxx b/xmloff/inc/xmloff/ecmaflds.hxx new file mode 100644 index 000000000000..a18bad1a4e91 --- /dev/null +++ b/xmloff/inc/xmloff/ecmaflds.hxx @@ -0,0 +1,68 @@ +/************************************************************************* + * + * 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: $ + * $Revision: $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +/* and also: + * Author: Florian Reuter + * Copyright 2008 by Novell, Inc. +*/ +#ifndef _ECMAFLDS_HXX +#define _ECMAFLDS_HXX + + +#define ECMA_FORMTEXT "ecma.office-open-xml.field.FORMTEXT" +#define ECMA_FORMTEXT_NAME "name" +#define ECMA_FORMTEXT_HELPTEXT "helpText" +#define ECMA_FORMTEXT_STATUSTEXT "statusText" +#define ECMA_FORMTEXT_DEFAULT "default" +#define ECMA_FORMTEXT_FORMAT "format" +#define ECMA_FORMTEXT_MAXLENGTH "maxLength" +#define ECMA_FORMTEXT_TYPE "type" + +#define ECMA_FORMCHECKBOX "ecma.office-open-xml.field.FORMCHECKBOX" +#define ECMA_FORMCHECKBOX_NAME "name" +#define ECMA_FORMCHECKBOX_HELPTEXT "helpText" +#define ECMA_FORMCHECKBOX_STATUSTEXT "statusText" +#define ECMA_FORMCHECKBOX_CHECKED "checked" +#define ECMA_FORMCHECKBOX_DEFAULT "default" +#define ECMA_FORMCHECKBOX_SIZE "size" +#define ECMA_FORMCHECKBOX_SIZEAUTO "sizeAuto" + + +#define ECMA_FORMDROPDOWN "ecma.office-open-xml.field.FORMDROPDOWN" +#define ECMA_FORMDROPDOWN_DEFAULT "default" +#define ECMA_FORMDROPDOWN_LISTENTRY "listEntry" +#define ECMA_FORMDROPDOWN_RESULT "result" + +#define ECMA_TOC "ecma.office-open-xml.field.TOC" + +#define ECMA_HYPERLINK "ecma.office-open-xml.field.HYPERLINK" + +#define ECMA_PAGEREF "ecma.office-open-xml.field.PAGEREF" + +#endif /* _ECMAFLDS_HXX */ -- cgit From 980cdfb7a0e847d5a1085b3bb63e7c06e6edf271 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 8 Dec 2009 17:15:57 +0100 Subject: cbosdo02: #i33737# removing unused defines, moving remaining ones into vnd.oasis.opendocument namespace ---------------- cbosdo02: #i33737# renaming defines from ECMA to ODF ---------------- cbosdo02: #i33737# removing ecma namespace ---------------- cbosdo02: #i33737# removing ecma var ---------------- cbosdo02: #i33737# ecma -> odf ---------------- cbosdo02: #i33737# ecma -> odf HG: Enter commit message. Lines beginning with 'HG:' are removed. HG: Remove all lines to abort the collapse operation. --- xmloff/inc/xmloff/ecmaflds.hxx | 68 ----------------------------------------- xmloff/inc/xmloff/odffields.hxx | 54 ++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 68 deletions(-) delete mode 100644 xmloff/inc/xmloff/ecmaflds.hxx create mode 100644 xmloff/inc/xmloff/odffields.hxx (limited to 'xmloff/inc') diff --git a/xmloff/inc/xmloff/ecmaflds.hxx b/xmloff/inc/xmloff/ecmaflds.hxx deleted file mode 100644 index a18bad1a4e91..000000000000 --- a/xmloff/inc/xmloff/ecmaflds.hxx +++ /dev/null @@ -1,68 +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: $ - * $Revision: $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -/* and also: - * Author: Florian Reuter - * Copyright 2008 by Novell, Inc. -*/ -#ifndef _ECMAFLDS_HXX -#define _ECMAFLDS_HXX - - -#define ECMA_FORMTEXT "ecma.office-open-xml.field.FORMTEXT" -#define ECMA_FORMTEXT_NAME "name" -#define ECMA_FORMTEXT_HELPTEXT "helpText" -#define ECMA_FORMTEXT_STATUSTEXT "statusText" -#define ECMA_FORMTEXT_DEFAULT "default" -#define ECMA_FORMTEXT_FORMAT "format" -#define ECMA_FORMTEXT_MAXLENGTH "maxLength" -#define ECMA_FORMTEXT_TYPE "type" - -#define ECMA_FORMCHECKBOX "ecma.office-open-xml.field.FORMCHECKBOX" -#define ECMA_FORMCHECKBOX_NAME "name" -#define ECMA_FORMCHECKBOX_HELPTEXT "helpText" -#define ECMA_FORMCHECKBOX_STATUSTEXT "statusText" -#define ECMA_FORMCHECKBOX_CHECKED "checked" -#define ECMA_FORMCHECKBOX_DEFAULT "default" -#define ECMA_FORMCHECKBOX_SIZE "size" -#define ECMA_FORMCHECKBOX_SIZEAUTO "sizeAuto" - - -#define ECMA_FORMDROPDOWN "ecma.office-open-xml.field.FORMDROPDOWN" -#define ECMA_FORMDROPDOWN_DEFAULT "default" -#define ECMA_FORMDROPDOWN_LISTENTRY "listEntry" -#define ECMA_FORMDROPDOWN_RESULT "result" - -#define ECMA_TOC "ecma.office-open-xml.field.TOC" - -#define ECMA_HYPERLINK "ecma.office-open-xml.field.HYPERLINK" - -#define ECMA_PAGEREF "ecma.office-open-xml.field.PAGEREF" - -#endif /* _ECMAFLDS_HXX */ diff --git a/xmloff/inc/xmloff/odffields.hxx b/xmloff/inc/xmloff/odffields.hxx new file mode 100644 index 000000000000..4416846f212f --- /dev/null +++ b/xmloff/inc/xmloff/odffields.hxx @@ -0,0 +1,54 @@ +/************************************************************************* + * + * 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: $ + * $Revision: $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +/* and also: + * Author: Florian Reuter + * Copyright 2008 by Novell, Inc. +*/ +#ifndef _ODFFIELDS_HXX +#define _ODFFIELDS_HXX + + +#define ODF_FORMTEXT "vnd.oasis.opendocument.field.FORMTEXT" + +#define ODF_FORMCHECKBOX "vnd.oasis.opendocument.field.FORMCHECKBOX" +#define ODF_FORMCHECKBOX_NAME "name" +#define ODF_FORMCHECKBOX_HELPTEXT "helpText" + +#define ODF_FORMDROPDOWN "vnd.oasis.opendocument.field.FORMDROPDOWN" +#define ODF_FORMDROPDOWN_LISTENTRY "listEntry" +#define ODF_FORMDROPDOWN_RESULT "result" + +#define ODF_TOC "vnd.oasis.opendocument.field.TOC" + +#define ODF_HYPERLINK "vnd.oasis.opendocument.field.HYPERLINK" + +#define ODF_PAGEREF "vnd.oasis.opendocument.field.PAGEREF" + +#endif /* _ODFFIELDS_HXX */ -- cgit From eec26ce8cf443fe6c272625d697c79e25c69a463 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 8 Dec 2009 18:27:46 +0100 Subject: cbosdo02: individual authors are not enumerated in OOo source files --- xmloff/inc/xmloff/odffields.hxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'xmloff/inc') diff --git a/xmloff/inc/xmloff/odffields.hxx b/xmloff/inc/xmloff/odffields.hxx index 4416846f212f..8e6e824e8bb7 100644 --- a/xmloff/inc/xmloff/odffields.hxx +++ b/xmloff/inc/xmloff/odffields.hxx @@ -27,10 +27,11 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -/* and also: - * Author: Florian Reuter + +/* * Copyright 2008 by Novell, Inc. -*/ + */ + #ifndef _ODFFIELDS_HXX #define _ODFFIELDS_HXX -- cgit From fecf6836305ed2b654420ea318f8d44cc47d8b7e Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 11 Dec 2009 16:20:25 +0100 Subject: cbosdo02: #i33737# odf export ---------------- cbosdo02: #i33737# odf export ---------------- cbosdo02: #i33737# odf import ---------------- cbosdo02: #i33737# fixing uno sequence for field parameters HG: Enter commit message. Lines beginning with 'HG:' are removed. HG: Remove all lines to abort the collapse operation. --- xmloff/inc/xmloff/odffields.hxx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'xmloff/inc') diff --git a/xmloff/inc/xmloff/odffields.hxx b/xmloff/inc/xmloff/odffields.hxx index 8e6e824e8bb7..2be06b578acd 100644 --- a/xmloff/inc/xmloff/odffields.hxx +++ b/xmloff/inc/xmloff/odffields.hxx @@ -39,12 +39,13 @@ #define ODF_FORMTEXT "vnd.oasis.opendocument.field.FORMTEXT" #define ODF_FORMCHECKBOX "vnd.oasis.opendocument.field.FORMCHECKBOX" -#define ODF_FORMCHECKBOX_NAME "name" -#define ODF_FORMCHECKBOX_HELPTEXT "helpText" +#define ODF_FORMCHECKBOX_HELPTEXT "Checkbox_HelpText" +#define ODF_FORMCHECKBOX_NAME "Checkbox_Name" +#define ODF_FORMCHECKBOX_RESULT "Checkbox_Checked" #define ODF_FORMDROPDOWN "vnd.oasis.opendocument.field.FORMDROPDOWN" -#define ODF_FORMDROPDOWN_LISTENTRY "listEntry" -#define ODF_FORMDROPDOWN_RESULT "result" +#define ODF_FORMDROPDOWN_LISTENTRY "Dropdown_ListEntry" +#define ODF_FORMDROPDOWN_RESULT "Dropdown_Selected" #define ODF_TOC "vnd.oasis.opendocument.field.TOC" -- cgit