2010-10-27 13:11:31 +01:00
|
|
|
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
2012-11-12 17:21:24 +00:00
|
|
|
/*
|
|
|
|
|
* This file is part of the LibreOffice project.
|
|
|
|
|
*
|
|
|
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
|
*
|
|
|
|
|
* This file incorporates work covered by the following license notice:
|
|
|
|
|
*
|
|
|
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
|
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
|
|
|
* with this work for additional information regarding copyright
|
|
|
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
|
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
|
|
|
* except in compliance with the License. You may obtain a copy of
|
|
|
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
|
|
|
*/
|
2013-10-23 19:09:35 +02:00
|
|
|
#ifndef INCLUDED_XMLOFF_TXTIMP_HXX
|
|
|
|
|
#define INCLUDED_XMLOFF_TXTIMP_HXX
|
2007-04-11 12:30:01 +00:00
|
|
|
|
2013-11-09 15:30:56 -06:00
|
|
|
#include <sal/config.h>
|
|
|
|
|
#include <xmloff/dllapi.h>
|
|
|
|
|
#include <sal/types.h>
|
2007-04-11 12:30:01 +00:00
|
|
|
#include <com/sun/star/uno/Reference.h>
|
|
|
|
|
|
|
|
|
|
#include <map>
|
2015-02-15 20:41:33 +00:00
|
|
|
#include <memory>
|
2008-10-01 06:34:11 +00:00
|
|
|
|
2007-04-11 12:30:01 +00:00
|
|
|
#include <xmloff/xmltkmap.hxx>
|
2014-06-30 09:53:06 +02:00
|
|
|
#include <rtl/ref.hxx>
|
|
|
|
|
#include <salhelper/simplereferenceobject.hxx>
|
2007-04-11 12:30:01 +00:00
|
|
|
|
2008-06-13 08:17:20 +00:00
|
|
|
class XMLTextListsHelper;
|
2010-03-15 12:53:14 +01:00
|
|
|
class SvXMLImportContext;
|
|
|
|
|
class SvXMLTokenMap;
|
|
|
|
|
class SvXMLImportPropertyMapper;
|
|
|
|
|
class SvXMLNamespaceMap;
|
2007-04-11 12:30:01 +00:00
|
|
|
class SvXMLImport;
|
|
|
|
|
class SvXMLStylesContext;
|
|
|
|
|
class XMLTextListBlockContext;
|
|
|
|
|
class SvxXMLListStyleContext;
|
|
|
|
|
class XMLPropStyleContext;
|
|
|
|
|
class SvI18NMap;
|
|
|
|
|
class XMLSectionImportContext;
|
|
|
|
|
class XMLFontStylesContext;
|
|
|
|
|
template<class A> class XMLPropertyBackpatcher;
|
|
|
|
|
class XMLEventsImportContext;
|
|
|
|
|
|
2010-03-15 12:53:13 +01:00
|
|
|
namespace xmloff {
|
|
|
|
|
struct ParsedRDFaAttributes;
|
|
|
|
|
}
|
|
|
|
|
|
2007-04-11 12:30:01 +00:00
|
|
|
namespace com { namespace sun { namespace star {
|
2010-03-15 12:53:14 +01:00
|
|
|
namespace text {
|
|
|
|
|
class XText;
|
|
|
|
|
class XTextCursor;
|
|
|
|
|
class XTextRange;
|
|
|
|
|
class XTextContent;
|
|
|
|
|
class XFormField;
|
|
|
|
|
}
|
2007-04-11 12:30:01 +00:00
|
|
|
namespace frame { class XModel; }
|
|
|
|
|
namespace container { class XNameContainer; class XIndexReplace; class XNameAccess; }
|
|
|
|
|
namespace beans { class XPropertySet; }
|
|
|
|
|
namespace xml { namespace sax { class XAttributeList; } }
|
|
|
|
|
namespace util { struct DateTime; }
|
|
|
|
|
namespace lang { class XMultiServiceFactory; }
|
|
|
|
|
} } }
|
|
|
|
|
|
|
|
|
|
enum SwXMLTextElemTokens
|
|
|
|
|
{
|
|
|
|
|
XML_TOK_TEXT_P,
|
|
|
|
|
XML_TOK_TEXT_H,
|
|
|
|
|
XML_TOK_TEXT_LIST,
|
|
|
|
|
XML_TOK_TEXT_FRAME_PAGE,
|
|
|
|
|
XML_TOK_TABLE_TABLE,
|
|
|
|
|
XML_TOK_TEXT_VARFIELD_DECLS,
|
|
|
|
|
XML_TOK_TEXT_USERFIELD_DECLS,
|
|
|
|
|
XML_TOK_TEXT_SEQUENCE_DECLS,
|
|
|
|
|
XML_TOK_TEXT_DDE_DECLS,
|
|
|
|
|
XML_TOK_DRAW_A_PAGE,
|
|
|
|
|
XML_TOK_TEXT_SECTION,
|
|
|
|
|
XML_TOK_TEXT_TOC,
|
|
|
|
|
XML_TOK_TEXT_OBJECT_INDEX,
|
|
|
|
|
XML_TOK_TEXT_TABLE_INDEX,
|
|
|
|
|
XML_TOK_TEXT_ILLUSTRATION_INDEX,
|
|
|
|
|
XML_TOK_TEXT_USER_INDEX,
|
|
|
|
|
XML_TOK_TEXT_ALPHABETICAL_INDEX,
|
|
|
|
|
XML_TOK_TEXT_BIBLIOGRAPHY_INDEX,
|
|
|
|
|
XML_TOK_TEXT_INDEX_TITLE,
|
|
|
|
|
XML_TOK_TEXT_TRACKED_CHANGES,
|
|
|
|
|
XML_TOK_TEXT_CHANGE_START,
|
|
|
|
|
XML_TOK_TEXT_CHANGE_END,
|
|
|
|
|
XML_TOK_TEXT_CHANGE,
|
|
|
|
|
XML_TOK_TEXT_FORMS,
|
|
|
|
|
XML_TOK_TEXT_CALCULATION_SETTINGS,
|
|
|
|
|
XML_TOK_TEXT_AUTOMARK,
|
|
|
|
|
XML_TOK_TEXT_NUMBERED_PARAGRAPH,
|
|
|
|
|
XML_TOK_TEXT_ELEM_END=XML_TOK_UNKNOWN
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
enum XMLTextPElemTokens
|
|
|
|
|
{
|
|
|
|
|
XML_TOK_TEXT_SPAN,
|
|
|
|
|
XML_TOK_TEXT_TAB_STOP,
|
|
|
|
|
XML_TOK_TEXT_LINE_BREAK,
|
2007-07-06 11:08:57 +00:00
|
|
|
XML_TOK_TEXT_SOFT_PAGE_BREAK,
|
2007-04-11 12:30:01 +00:00
|
|
|
XML_TOK_TEXT_S,
|
|
|
|
|
XML_TOK_TEXT_FRAME,
|
|
|
|
|
XML_TOK_TEXT_HYPERLINK,
|
|
|
|
|
XML_TOK_TEXT_RUBY,
|
|
|
|
|
|
|
|
|
|
XML_TOK_TEXT_NOTE,
|
|
|
|
|
XML_TOK_TEXT_BOOKMARK,
|
|
|
|
|
XML_TOK_TEXT_BOOKMARK_START,
|
|
|
|
|
XML_TOK_TEXT_BOOKMARK_END,
|
|
|
|
|
XML_TOK_TEXT_REFERENCE,
|
|
|
|
|
XML_TOK_TEXT_REFERENCE_START,
|
|
|
|
|
XML_TOK_TEXT_REFERENCE_END,
|
|
|
|
|
|
|
|
|
|
XML_TOK_TEXT_TOC_MARK, // index marks
|
|
|
|
|
XML_TOK_TEXT_TOC_MARK_START,
|
|
|
|
|
XML_TOK_TEXT_TOC_MARK_END,
|
|
|
|
|
XML_TOK_TEXT_USER_INDEX_MARK,
|
|
|
|
|
XML_TOK_TEXT_USER_INDEX_MARK_START,
|
|
|
|
|
XML_TOK_TEXT_USER_INDEX_MARK_END,
|
|
|
|
|
XML_TOK_TEXT_ALPHA_INDEX_MARK,
|
|
|
|
|
XML_TOK_TEXT_ALPHA_INDEX_MARK_START,
|
|
|
|
|
XML_TOK_TEXT_ALPHA_INDEX_MARK_END,
|
|
|
|
|
|
|
|
|
|
XML_TOK_TEXT_SENDER_FIRSTNAME, // sender fields
|
|
|
|
|
XML_TOK_TEXT_SENDER_LASTNAME,
|
|
|
|
|
XML_TOK_TEXT_SENDER_INITIALS,
|
|
|
|
|
XML_TOK_TEXT_SENDER_TITLE,
|
|
|
|
|
XML_TOK_TEXT_SENDER_POSITION,
|
|
|
|
|
XML_TOK_TEXT_SENDER_EMAIL,
|
|
|
|
|
XML_TOK_TEXT_SENDER_PHONE_PRIVATE,
|
|
|
|
|
XML_TOK_TEXT_SENDER_FAX,
|
|
|
|
|
XML_TOK_TEXT_SENDER_COMPANY,
|
|
|
|
|
XML_TOK_TEXT_SENDER_PHONE_WORK,
|
|
|
|
|
XML_TOK_TEXT_SENDER_STREET,
|
|
|
|
|
XML_TOK_TEXT_SENDER_CITY,
|
|
|
|
|
XML_TOK_TEXT_SENDER_POSTAL_CODE,
|
|
|
|
|
XML_TOK_TEXT_SENDER_COUNTRY,
|
|
|
|
|
XML_TOK_TEXT_SENDER_STATE_OR_PROVINCE,
|
|
|
|
|
|
|
|
|
|
XML_TOK_TEXT_AUTHOR_NAME, // author fields
|
|
|
|
|
XML_TOK_TEXT_AUTHOR_INITIALS,
|
|
|
|
|
|
|
|
|
|
XML_TOK_TEXT_DATE, // date & time fields
|
|
|
|
|
XML_TOK_TEXT_TIME,
|
|
|
|
|
|
|
|
|
|
XML_TOK_TEXT_PAGE_NUMBER, // page number fields
|
|
|
|
|
XML_TOK_TEXT_PAGE_CONTINUATION_STRING,
|
|
|
|
|
|
|
|
|
|
XML_TOK_TEXT_VARIABLE_SET, // variable fields
|
|
|
|
|
XML_TOK_TEXT_VARIABLE_GET,
|
|
|
|
|
XML_TOK_TEXT_VARIABLE_INPUT,
|
|
|
|
|
XML_TOK_TEXT_USER_FIELD_GET,
|
|
|
|
|
XML_TOK_TEXT_USER_FIELD_INPUT,
|
|
|
|
|
XML_TOK_TEXT_SEQUENCE,
|
|
|
|
|
XML_TOK_TEXT_EXPRESSION,
|
|
|
|
|
XML_TOK_TEXT_TEXT_INPUT,
|
|
|
|
|
|
|
|
|
|
XML_TOK_TEXT_DATABASE_DISPLAY, // database fields
|
|
|
|
|
XML_TOK_TEXT_DATABASE_NEXT,
|
|
|
|
|
XML_TOK_TEXT_DATABASE_SELECT,
|
|
|
|
|
XML_TOK_TEXT_DATABASE_ROW_NUMBER,
|
|
|
|
|
XML_TOK_TEXT_DATABASE_NAME,
|
|
|
|
|
|
|
|
|
|
XML_TOK_TEXT_DOCUMENT_CREATION_AUTHOR, //document info fields
|
|
|
|
|
XML_TOK_TEXT_DOCUMENT_CREATION_DATE,
|
|
|
|
|
XML_TOK_TEXT_DOCUMENT_CREATION_TIME,
|
|
|
|
|
XML_TOK_TEXT_DOCUMENT_DESCRIPTION,
|
|
|
|
|
XML_TOK_TEXT_DOCUMENT_PRINT_AUTHOR,
|
|
|
|
|
XML_TOK_TEXT_DOCUMENT_PRINT_DATE,
|
|
|
|
|
XML_TOK_TEXT_DOCUMENT_PRINT_TIME,
|
|
|
|
|
XML_TOK_TEXT_DOCUMENT_TITLE,
|
|
|
|
|
XML_TOK_TEXT_DOCUMENT_SUBJECT,
|
|
|
|
|
XML_TOK_TEXT_DOCUMENT_KEYWORDS,
|
|
|
|
|
XML_TOK_TEXT_DOCUMENT_REVISION,
|
|
|
|
|
XML_TOK_TEXT_DOCUMENT_EDIT_DURATION,
|
|
|
|
|
XML_TOK_TEXT_DOCUMENT_SAVE_AUTHOR,
|
|
|
|
|
XML_TOK_TEXT_DOCUMENT_SAVE_DATE,
|
|
|
|
|
XML_TOK_TEXT_DOCUMENT_SAVE_TIME,
|
|
|
|
|
XML_TOK_TEXT_DOCUMENT_USER_DEFINED,
|
|
|
|
|
|
|
|
|
|
XML_TOK_TEXT_PLACEHOLDER, // misc. fields
|
|
|
|
|
XML_TOK_TEXT_CONDITIONAL_TEXT,
|
|
|
|
|
XML_TOK_TEXT_HIDDEN_TEXT,
|
|
|
|
|
XML_TOK_TEXT_HIDDEN_PARAGRAPH,
|
|
|
|
|
XML_TOK_TEXT_FILENAME,
|
|
|
|
|
XML_TOK_TEXT_CHAPTER,
|
|
|
|
|
XML_TOK_TEXT_TEMPLATENAME,
|
|
|
|
|
XML_TOK_TEXT_WORD_COUNT, // statistics/count fields
|
|
|
|
|
XML_TOK_TEXT_PARAGRAPH_COUNT,
|
|
|
|
|
XML_TOK_TEXT_TABLE_COUNT,
|
|
|
|
|
XML_TOK_TEXT_CHARACTER_COUNT,
|
|
|
|
|
XML_TOK_TEXT_IMAGE_COUNT,
|
|
|
|
|
XML_TOK_TEXT_OBJECT_COUNT,
|
|
|
|
|
XML_TOK_TEXT_PAGE_COUNT,
|
|
|
|
|
XML_TOK_TEXT_GET_PAGE_VAR,
|
|
|
|
|
XML_TOK_TEXT_SET_PAGE_VAR,
|
|
|
|
|
XML_TOK_TEXT_MACRO,
|
|
|
|
|
XML_TOK_TEXT_DDE,
|
|
|
|
|
XML_TOK_TEXT_REFERENCE_REF,
|
|
|
|
|
XML_TOK_TEXT_BOOKMARK_REF,
|
|
|
|
|
XML_TOK_TEXT_SEQUENCE_REF,
|
|
|
|
|
XML_TOK_TEXT_NOTE_REF,
|
|
|
|
|
XML_TOK_TEXT_SHEET_NAME,
|
2015-05-15 13:38:07 +02:00
|
|
|
XML_TOK_TEXT_PAGE_NAME,
|
2007-04-11 12:30:01 +00:00
|
|
|
XML_TOK_TEXT_BIBLIOGRAPHY_MARK,
|
|
|
|
|
XML_TOK_TEXT_ANNOTATION,
|
2012-07-20 14:27:07 +02:00
|
|
|
XML_TOK_TEXT_ANNOTATION_END,
|
|
|
|
|
XML_TOK_TEXT_NAME,
|
2007-04-11 12:30:01 +00:00
|
|
|
XML_TOK_TEXT_SCRIPT,
|
|
|
|
|
XML_TOK_TEXT_TABLE_FORMULA,
|
2014-11-11 13:58:15 +01:00
|
|
|
XML_TOK_TEXT_DROP_DOWN,
|
2007-04-11 12:30:01 +00:00
|
|
|
|
2008-07-01 15:01:22 +00:00
|
|
|
// RDF metadata
|
|
|
|
|
XML_TOK_TEXT_META,
|
|
|
|
|
XML_TOK_TEXT_META_FIELD,
|
|
|
|
|
|
2007-04-11 12:30:01 +00:00
|
|
|
// misc
|
2008-07-01 15:01:22 +00:00
|
|
|
XML_TOK_TEXTP_CHANGE_START, // TEXTP avoids clash with SwXMLTextElemTokens
|
|
|
|
|
XML_TOK_TEXTP_CHANGE_END,
|
|
|
|
|
XML_TOK_TEXTP_CHANGE,
|
2007-04-11 12:30:01 +00:00
|
|
|
XML_TOK_DRAW_A,
|
|
|
|
|
XML_TOK_TEXT_MEASURE,
|
|
|
|
|
|
|
|
|
|
XML_TOK_DRAW_HEADER,
|
|
|
|
|
XML_TOK_DRAW_FOOTER,
|
|
|
|
|
XML_TOK_DRAW_DATE_TIME,
|
2007-08-03 11:52:30 +00:00
|
|
|
XML_TOK_TEXT_PAGE_CONTINUATION,
|
2007-04-11 12:30:01 +00:00
|
|
|
|
2008-09-04 09:07:25 +00:00
|
|
|
XML_TOK_TEXT_FIELDMARK,
|
|
|
|
|
XML_TOK_TEXT_FIELDMARK_START,
|
|
|
|
|
XML_TOK_TEXT_FIELDMARK_END,
|
|
|
|
|
|
2007-04-11 12:30:01 +00:00
|
|
|
XML_TOK_TEXT_P_ELEM_END=XML_TOK_UNKNOWN
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
enum XMLTextPAttrTokens
|
|
|
|
|
{
|
2008-07-01 15:01:22 +00:00
|
|
|
XML_TOK_TEXT_P_XMLID,
|
CWS-TOOLING: integrate CWS odfmetadata2
2009-06-22 11:48:36 +0200 mst r273206 : - connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx:
+ add "include ustrbuf.hxx" to work around warning caused by
solaris <sys/kstat.h> declaring a global "long l ;"
2009-06-19 14:25:25 +0200 mst r273159 : - scp2/source/ooo/file_library_ooo.scp:
+ fix MinGW build
2009-06-08 12:52:33 +0200 mst r272727 : - redland/raptor-1.4.18.patch.mingw, redland/raptor/makefile.mk:
+ disable parsers that do not build on MinGW (thanks for patch by tono)
2009-05-15 17:31:07 +0200 mst r271957 : fix typos
2009-05-15 17:28:57 +0200 mst r271956 : #i101965#
- offapi/com/sun/star/text/TextPortion:
+ add missing properties:
SoftPageBreak, DocumentIndexMark, ReferenceMark, Footnote, TextField
+ fix read-only status of properties: Bookmark, IsStart, IsCollapsed
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
2009-05-07 14:41:38 +0200 mst r271669 : - sw/inc/{fmtftn.hxx,unocoll.hxx,doc.hxx,editsh.hxx,ftninfo.hxx},
sw/source/core/layout/{flowfrm.cxx,ftnfrm.cxx},
sw/source/core/doc/docftn.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/txtnode/atrftn.cxx, sw/source/core/unocore/unocoll.cxx,
sw/source/ui/fldui/fldref.cxx:
+ fix warning ... the hard way
+ also fix signature of SwDoc::SetCurFtn
2009-05-05 19:52:55 +0200 mst r271556 : - sw/inc/undobj.hxx:
+ make some members const
2009-05-05 19:34:40 +0200 mst r271555 : - sw/inc/rolbck.hxx, sw/source/core/undo/rolbck.cxx:
+ make some members const
2009-05-05 19:13:14 +0200 mst r271553 : - sw/inc/{undobj.hxx,rolbck.hxx},
sw/source/core/undo/{unbkmk.cxx,rolbck.cxx}:
+ fix rebase merge error
+ rename SwHstryBookmark to SwHistoryBookmark
+ clean up SwUndoBookmark
2009-05-05 19:05:53 +0200 mst r271552 : - sw/source/core/unocore/unoportenum.cxx:
+ fix annoying assertion
2009-05-05 15:34:48 +0200 mst r271522 : CWS-TOOLING: rebase CWS odfmetadata2 to trunk@271427 (milestone: DEV300:m47)
2009-05-04 12:37:01 +0200 mst r271444 : trivial
2009-04-22 13:30:37 +0200 mst r271102 : - sfx2/inc/sfx2/dinfdlg.hxx:
+ trivial change
2009-04-21 16:46:58 +0200 mst r271043 : - sw/inc/hintids.hxx:
+ introduce some predicates for the various hints, and use them
2009-04-21 16:19:03 +0200 mst r271041 : - sw/inc/undobj.hxx,
sw/source/core/doc/{docfly.cxx,docfmt.cxx,docftn.cxx,doctxm.cxx},
sw/source/core/undo/{unattr.cxx,unins.cxx}:
+ clean up unattr.cxx:
remove/fix casts, prefix members, use auto_ptr, etc.
2009-04-21 15:34:23 +0200 mst r271039 : - sw/inc/{rolbck.hxx,undobj.hxx},
sw/source/core/doc/docfmt.cxx,
sw/source/core/txtnode/{thints.cxx,txtedt.cxx},
sw/source/core/undo/{rolbck.cxx,undel.cxx,undobj.cxx,unins.cxx,unmove.cxx,
unovwr.cxx,unsect.cxx,unspnd.cxx,untbl.cxx,untblk.cxx,unattr.cxx}:
+ clean up SwHistory, SwRegHistory and SwHistoryHint etc.:
remove/fix casts, prefix members, remove wrong const annotations,
use auto_ptr, remove unused members, etc.
2009-04-20 19:17:36 +0200 mst r271013 : - sw/inc/ndhints.hxx,
sw/source/core/text/{itrtxt.cxx,txtftn.cxx,itratr.cxx,porfly.cxx,
txtfrm.cxx,txtdrop.cxx,frmform.cxx},
sw/source/core/txtnode/{ndtxt.cxx,ndhints.cxx,thints.cxx,txtedt.cxx},
sw/source/core/edit/acorrect.cxx,
sw/source/core/doc/{docedt.cxx,docfmt.cxx},
sw/source/filter/html/swhtml.cxx:
+ clean up SwHintsArray and its subclasses: remove/fix casts, prefix members
2009-04-20 18:42:07 +0200 mst r271007 : - sw/source/core/text/txtio.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/undo/rolbck.cxx:
+ remove JP_NEWCORE dead code
2009-04-20 18:38:09 +0200 mst r271006 : - sw/source/core/unocore/unochart.cxx:
+ silence unxlngi warning (debug=t)
2009-04-20 16:36:13 +0200 mst r270991 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx, sw/source/ui/fldui/flddinf.hxx:
+ trivial cleanups
2009-04-20 15:28:52 +0200 mst r270990 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx:
+ fix bug: replaying a macro with a DocumentInfoItem removes all
user-defined properties
2009-03-10 15:08:20 +0100 mst r269273 : - sfx2/source/doc/Metadatable.cxx:
+ add missing SolarMutex guards
2009-03-10 14:46:29 +0100 mst r269272 : - unoxml/source/rdf/librdf_repository.cxx:
+ never free rdf_world because that would call libxm2 xmlCleanupParser
(and, to add insult to injury, other libxml2 functions later...)
2009-03-06 19:02:44 +0100 mst r269041 : argh! undo...
2009-03-06 19:00:58 +0100 mst r269040 : fix #i99931#
- sw/source/ui/uno/unomod.cxx:
+ SwXViewSettings::_getSingleValue returns uninitialized memory
for the ZoomType property if the value is PAGE_WIDTH_EXACT
2009-03-06 18:59:28 +0100 mst r269039 : - sw/inc/ndtxt.hxx, sw/source/core/txtnode/ndtxt.cxx,
sw/source/core/unocore/unoportenum.cxx:
+ fix some more wntmsci12 warnings...
2009-03-06 18:56:46 +0100 mst r269038 : - sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx:
+ work around spurious warning on unxsoli4 debug=t
2009-03-05 14:02:01 +0100 mst r268902 : - sw/inc/txatbase.hxx:
+ back to c-style casts, they also compile on wntmsci12...
2009-03-05 10:23:25 +0100 mst r268882 : - comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ revert change of return type of comphelper_getProcessComponentContext
to Reference: does not build on wntmsci12
2009-03-04 19:08:09 +0100 mst r268861 : - sw/source/core/txtnode/{atrtox.cxx,ndtxt.cxx}:
+ fix initialization
2009-03-04 14:37:30 +0100 mst r268831 : - solenv/inc/target.mk:
+ fix CLASSPATH so complex tests run (fix by sb)
2009-03-04 14:36:30 +0100 mst r268830 : - sw/inc/unoobj.hxx,
sw/source/core/unocore/{unoparagraph.cxx,unoobj.cxx,unoobj2.cxx}:
+ SwXParaFrameEnumeration constructor now takes SwPaM, not SwUnoCrsr
+ move SwParaSelection into unoparagraph.cxx, as it is only used there
+ bugfix: replace SwUnoCrsrs on stack with SwCursors
2009-03-04 14:34:46 +0100 mst r268829 : - sw/inc/pam.hxx, sw/source/core/crsr/pam.cxx,
sw/source/core/edit/eddel.cxx, sw/source/core/doc/docredln.cxx,
sw/source/core/undo/{untbl.cxx,undel.cxx}, sw/source/filter/rtf/swparrtf.cxx:
+ clean up SwPaM: prefix members
+ new constructor SwPosition(SwCntntNode&, xub_StrLen)
+ fix several broken SwPosition and SwPaM constructors
+ SwPam::DeleteMark now actually resets the unused position to default
2009-03-02 12:07:09 +0100 mst r268646 : - sw/inc/fmtcol.hxx:
+ fix annoying warning (gcc 4)
2009-03-02 12:06:27 +0100 mst r268645 : - odk/util/check.pl, odk/examples/DevelopersGuide/Text/TextDocuments.java:
+ rename module from FieldMaster to fieldmaster
2009-02-27 19:49:56 +0100 mst r268614 : - sfx2/inc/sfx2/Metadatable.hxx, sfx2/prj/d.lst,
sfx2/source/doc/{Metadatable.cxx,makefile.mk},
sw/inc/{SwMetadatable.hxx,unoobj.hxx,undobj.hxx,ndtxt.hxx},
sw/source/core/doc/{SwMetadatable.cxx,makefile.mk,docnew.cxx},
sw/source/core/undo/{untbl.cxx,unins.cxx},
sw/source/core/unocore/unoparagraph.cxx, sw/source/ui/app/docsh.cxx:
+ move Metadatable implementation from sw to sfx2
2009-02-27 17:58:55 +0100 mst r268608 : - sw/inc/{SwMetadatable.hxx,undobj.hxx}, sw/source/core/doc/SwMetadatable.cxx,
sw/source/core/undo/{untbl.cxx,unins.cxx,undel.cxx}:
+ CreateUndo now returns an opaque MetadatableUndo object
2009-02-27 13:15:44 +0100 mst r268587 : - sw/inc/ndtxt.hxx, sw/source/core/doc/docfmt.cxx,
sw/source/core/text/{itratr.cxx,porlay.cxx},
sw/source/core/txtnode/{txtedt.cxx,ndtxt.cxx,thints.cxx}:
+ clean up SwTxtNode: fix casts, prefix members
+ factor out inline function SwTxtNode::TryDeleteSwpHints()
2009-02-27 13:14:30 +0100 mst r268586 : - svx/inc/svx/emphitem.hxx:
+ fix borken header guard
2009-02-27 13:13:56 +0100 mst r268585 : - sfx2/source/bastyp/progress.cxx:
+ fix use of compiler specific macro
2009-02-27 11:00:32 +0100 mst r268564 : - sw/inc/{txatbase.hxx,txtatr.hxx,txtinet.hxx,txtfld.hxx,txtftn.hxx,
txtflcnt.hxx,txttxmrk.hxx,txtrfmrk.hxx},
sw/source/core/txtnode/{atrtox.cxx,atrref.cxx,atrflyin.cxx,atrftn.cxx,
txtatr2.cxx,txatbase.cxx,atrfld.cxx,txtedt.cxx},
sw/source/core/text/atrstck.cxx, sw/source/core/access/acchyperlink.cxx,
sw/source/core/doc/visiturl.cxx, sw/source/ui/wrtsh/wrtsh2.cxx:
+ clean up SwTxtAttr and its subclasses: remove/fix casts, prefix members
+ SwTxtINetFmt: remove unused member bColor
- sw/source/core/text/txtfld.cxx:
+ move SwTxtFld methods to atrfld.cxx
2009-02-27 10:58:44 +0100 mst r268563 : - sfx2/inc/sfx2/sfxbasemodel.hxx:
+ don't privately inherit BaseMutex, ScModelObj wants to access it
2009-02-27 10:58:02 +0100 mst r268562 : - xmloff/source/core/{RDFaExportHelper.cxx,RDFaImportHelper.cxx}:
+ arrrgh!!! someone thought it would be a good idea to have 2 different
versions of boost in external! and they're NOT compatible!!!
insert an ugly fragile hack that maybe works with both...
2009-02-26 17:42:26 +0100 mst r268544 : - comphelper/inc/comphelper/storagehelper.hxx.
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ someone made IsValidZipEntryFileName a static method and didn't tell me
2009-02-26 15:52:56 +0100 mst r268529 : redland: split up patches
2009-02-26 13:17:56 +0100 mst r268509 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
#i95863#
- sw/inc/segdefs{,_}.hxx:
+ remove obsolete files
- sw/source/ui/inc/itemdef.hxx:
+ remove itemdef.hxx
- sw/source/ui/app/[apphdl.cxx,docsh.cxx}, sw/source/ui/misc/glshell.cxx,
sw/source/ui/shells/*.cxx, sw/source/ui/uiview/*.cxx, sw/source/ui/web/*.cxx:
+ use sfx2/msg.hxx instead of itemdef.hxx
- sw/source/core/edit/eddel.cxx:
+ @ JP: SwEditShell::Replace:
you're right, deleting the text to be replaced first, and then inserting
a space, and then replacing that space is unnecessary.
whew, i'm so happy that we finally answered that question after 11 years.
- sw/inc/edimp.hxx:
+ remove FOREACHCURSOR_START, FOREACHCURSOR_END
- sw/inc/{swcrsr.hxx,unocrsr.hxx,viscrs.hxx},
sw/source/core/crsr/{crsrsh.cxx,swcrsr.cxx,trvlreg.cxx,trvltbl.cxx,
unocrsr.cxx,viscrs.cxx},
sw/source/core/doc/{docbm.cxx,doccorr.cxx},
sw/source/core/docnode/{ndtbl.cxx,ndtbl1.cxx},
sw/source/core/edit/editsh.cxx,
sw/source/core/frmedt/{fefly1.cxx,fetab.cxx,tblsel.cxx},
sw/source/core/layout/trvlfrm.cxx,
sw/source/core/unocore/{unochart.cxx,unoobj2.cxx,unoparagraph.cxx,
unoportenum.cxx,unotbl.cxx},
sw/source/core/view/vprint.cxx:
+ remove the hideous virtual operator SwFooCursor*
+ make SwCursor::IsReadOnlyAvailable() virtual
+ make SwUnoCrsr::Clone() virtual
+ refactor SwCursor methods IsSelOver(), LeftRight(), UpDown(), GotoTable():
replace dynamic_cast<...>(this) with new virtual methods
2009-02-26 13:14:58 +0100 mst r268508 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
- sw/source/filter/xml/swxml.cxx:
+ XMLReader::Read: load RDF metadata of the ODF document
- sw/source/filter/xml/wrtxml.cxx:
+ SwXMLWriter::_Write: write RDF metadata of the ODF document if ODF >= 1.2
#i90620#: import xml:id in text tables (does not actually work yet)
- sw/source/filter/xml/xmltbli{.hxx,.cxx}:
+ SwXMLTableCellAttrTokens,aTableCellAttrTokenMap: add XML_TOK_TABLE_XMLID
+ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl: attribute xml:id
+ SwXMLTableCellContext_Impl::CreateChildContext: attribute xml:id
+ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl: attribute xml:id
+ SwXMLTableContext::SwXMLTableContext: attribute xml:id
fix #i98530#
- sw/inc/unoport.hxx, sw/source/core/unocore/unoport.cxx:
+ SwXTextPortion: make constructor params const&
- sw/source/core/unocore/unoportenum.cxx:
+ refactor to remove some code duplication
+ fix bug: paragraph w/out hints: bookmark before frame gets lost
#i97274# handle invalid tables
- sw/source/core/layout/tabfrm.cxx, sw/source/filter/xml/xmltbli.cxx:
+ SwXMLTableContext::MakeTable():
check that the table actually contains cells,
and abort (removing the inserted table nodes) if not
2009-02-26 13:11:48 +0100 mst r268507 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
refactor SwXTextRange and SwXParagraph
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoobj2.cxx:
+ remove 3 constructors of SwXTextRange
+ new method SwXTextRange::CreateParentXText
+ refactor SwXTextRange::CreateTextRangeFromPosition and
SwXTextRange::getText
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph no longer uses a cursor; it registers directly at SwTxtNode
+ replace SwXParagraph::GetCrsr with SwXParagraph::GetTxtNode
- sw/source/core/unocore/unotext.cxx, sw/source/ui/uno/unotxvw.cxx:
+ adapt to new SwXParagraph
#i90620#
- sw/inc/SwMetadatable.hxx,
sw/source/core/doc/SwMetadatable.cxx:
+ new files: base classes sw::Metadatable and sw::MetadatableMixin;
also, 2 implementations of IXmlIdRegistry:
sw::XmlIdRegistryDocument and sw::XmlIdRegistryClipboard
+ setMetadataReference: handle empty stream name as auto-detect
- sw/source/core/doc/makefile.mk:
+ add SwMetadatable
add a XmlIdRegistry to SwDoc
- sw/inc/doc.hxx:
+ SwDoc: add member m_pXmlIdRegistry, method GetXmlIdRegistry()
- sw/source/core/doc/docnew.cxx:
+ initialize XmlIdRegistry in SwDoc::GetXmlIdRegistry, not in constructor,
because the constructor is not told whether the SwDoc is a clipboard
- sw/inc/docsh.hxx, sw/source/ui/app/docsh.cxx:
+ SwDocShell: override GetXmlIdRegistry()
#i91563#: make the SwTxtNode metadatable
- sw/inc/ndtxt.hxx
+ SwTxtNode inherits sw::Metadatable
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph inherits sw::MetadatableMixin
#i91563#: handle SwTxtNode's metadata for delete
- sw/source/core/txtnode/ndtxt.cxx:
+ SwTxtNode::SplitCntntNode: handle XmlId
+ SwTxtNode::JoinNext: merge XmlIds
- sw/source/core/doc/docedt.cxx:
+ lcl_GetJoinFlags: document postcondition
+ SwDoc::Delete: remove XmlId only if SwTxtNode _becomes_ empty
#i91563#: handle SwTxtNode's metadata for delete with undo
- sw/inc/undobj.hxx
+ SwUndoDelete: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
- sw/source/core/undo/undel.cxx:
+ SwUndoDelete::SaveCntnt: save XmlIds for start and end SwTxtNode
+ SwUndoDelete::SaveCntnt: remove XmlId only if SwTxtNode _becomes_ empty
+ SwUndoDelete::Undo: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndcopy.cxx:
+ SwTxtNode::MakeCopy: register copy at XmlIdRegistry
#i91563#: handle SwTxtNode's metadata for find/replace with undo
- sw/source/core/undo/unins.cxx:
+ _UnReplaceData: rename members: add prefix m_
+ _UnReplaceData: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ _UnReplaceData::_UnReplaceData: save XmlIds for start and end SwTxtNode
+ _UnReplaceData::Undo: restore saved XmlIds for start and end SwTxtNode
#i91563#: handle SwTxtNode's metadata for table-to-text with undo
- sw/source/core/undo/untbl.cxx:
+ SwTblToTxtSave: rename members: add prefix m_
+ SwTblToTxtSave: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ SwTblToTxtSave::SwTblToTxtSave: save XmlIds for start and end SwTxtNode
+ SwTblToTxtSave::SwTblToTxtSave, SwNodes::UndoTableToText:
always store the index of the first SwTxtNode in the cell, instead of
the index of the first SwTxtNode in case of the first cell in a row,
and the cell start node in other cases
+ SwNodes::UndoTableToText: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndtbl.cxx:
+ lcl_DelBox: simplify for refactored start index handling in SwTblToTxtSave
2009-02-26 13:02:28 +0100 mst r268505 : migration of cws odfmetadata2 from CVS (resync to m42): module sd
- sd/source/ui/table/tableobjectbar.cxx,sd/source/ui/view/*.cxx:
+ remove invocations of SFX_DECL_TYPE
- sd/source/ui/slideshow/SlideShowRestarter.cxx,
sd/source/ui/toolpanel/LayoutMenu.cxx,
sd/source/ui/unoidl/DrawController.cxx,
sd/source/ui/view/{ViewShellBase.cxx,ViewTabBar.cxx,frmview.cxx}:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
2009-02-26 13:01:24 +0100 mst r268504 : migration of cws odfmetadata2 from CVS (resync to m42): module starmath
- starmath/source/document.cxx:
+ don't touch SfxObjectShell's privates
2009-02-26 13:00:37 +0100 mst r268503 : migration of cws odfmetadata2 from CVS (resync to m42): module sfx2
#i90620#
- sfx2/inc/sfx2/XmlIdRegistry.hxx:
+ new file: interfaces sfx2::IXmlIdRegistry and sfx2::IXmlIdRegistrySupplier
and a couple of utility functions
- sfx2/inc/sfx2/DocumentMetadataAccess.hxx,
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ new class sfx2::DocumentMetadataAccess, implements XDocumentMetadataAccess
+ the URI of the DocumentMetadataAccess is now the URI from which the
document was loaded; for a new document, use a vnd.sun.star.tdoc URI
+ add new function sfx2::createBaseURI()
+ prevent using reserved file names
+ try not to recurse into embedded subdocuments
- sfx2/source/doc/makefile.mk:
+ add DocumentMetadataAccess
- sfx2/util/makefile.mk:
+ link libsfx2 against libxml2 (needed for xmlValidateNCName)
- sfx2/source/doc/makefile.mk:
+ add LIBXML_CFLAGS to CFLAGS
- sfx2/prj/build.lst:
+ add dependence on libxml2
- sfx2/prj/d.lst:
+ add XmlIdRegistry.hxx, DocumentMetadataAccess.hxx
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objxtor.cxx:
+ make SfxObjectShell's members private
+ new method SfxObjectShell::GetAutoStyleFilterIndex
+ SfxObjectShell inherits sfx2::IXmlIdRegistrySupplier
- sfx2/source/dialog/templdlg.cxx, sfx2/source/doc/sfxbasemodel.cxx:
+ don't touch SfxObjectShell's privates
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ SfxBaseModel inherits BaseMutex instead of IMPL_SfxBaseModel_MutexContainer
+ SfxBaseModel implements additional interface XDocumentMetadataAccess
+ IMPL_SfxBaseModel_DataContainer has new member:
a sfx2::DocumentMetadataAccess
+ implementation of XDocumentMetadataAccess forwards to
the sfx2::DocumentMetadataAccess member
- sfx2/qa/complex/DocumentMetadataAccessTest.java,
sfx2/qa/complex/{tests.sce,makefile.mk},
sfx2/qa/complex/testdocuments/TESTRDFA.odt:
+ add complex test: DocumentMetadataAccessTest
+ add RDFa test document
#i95863#
- sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx:
+ refactor SfxDocumentItem so it no longer requires a XDocumentInfo
+ move struct CustomProperty to implementation file
+ remove class SfxDocumentUserPage
+ QueryValue,PutValue: remove MID_DOCINFO_FIELD*
- sfx2/source/doc/objserv.cxx:
+ adapt to SfxDocumentItem change
- sfx2/inc/sfx2/sfx.hrc, sfx2/sdi/sfxslots.sdi, sfx2/inc/sfx2/msg.hxx:
+ remove MID_DOCINFO_FIELD*
+ put all invocations of SFX_DECL_TYPE in msg.hxx, and undef SFX_DECL_TYPE
- sfx2/source/doc/objxtor.cxx:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
- sfx2/source/doc/docfile.cxx:
+ SfxMedium::SfxMedium: don't dereference NULL, throw exception instead
- sfx2/source/doc/objstor.cxx:
+ SfxObjectShell::DoLoad: fix bug: DocumentBaseURI is not initialized
2009-02-26 12:58:07 +0100 mst r268502 : migration of cws odfmetadata2 from CVS (resync to m42): module xmloff
#i90620#: implement RDFa import (interface change)
- xmloff/inc/xmloff/xmlimp.hxx. xmloff/source/core/xmlimp.cxx:
+ make SvXMLImport::GetAbsoluteReference() const
+ add SvXMLImport::GetComponentContext()
+ SvXMLImport::_InitCtor(): add RDFa namespace
+ add SvXMLImport::AddRDFa()
+ SvXMLImport::endDocument() inserts RDFa into document repository
- xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/xmltoken.cxx:
+ new tokens for RDFa: XML_ABOUT, XML_DATATYPE
- xmloff/inc/RDFaImportHelper.hxx, xmloff/source/core/RDFaImportHelper.cxx:
+ new class RDFaImportHelper
+ adapt the code to the bleak reality of broken C++ implementations
+ handle empty xhtml:about attributes properly, which are actually
valid relative URIs
+ work around broken SvXMLImport::GetAbsoluteReference
- xmloff/source/core/makefile.mk:
+ add RDFaImportHelper.cxx
#i90620#: implement RDFa export
- xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ add SvXMLExport::EnsureNamespace(), and a stack of namespace maps
+ add SvXMLExport::GetComponentContext()
+ add SvXMLExport::AddAttributesRDFa()
- xmloff/inc/RDFaExportHelper.hxx, xmloff/source/core/RDFaExportHelper.cxx:
+ new class RDFaExportHelper
+ don't use std::map::data_type, which is actually called
std::map::mapped_type by libstdc++
- xmloff/source/core/makefile.mk:
+ add RDFaExportHelper.cxx
#i91563#
- xmloff/inc/xmloff/txtimp.hxx, xmloff/source/text/txtimp.cxx:
+ XMLTextPAttrTokens: add RDFa tokens
- xmloff/source/text/txtparai{.hxx,.cxx}:
+ import RDFa for text:p
- xmloff/source/text/txtparae.cxx:
+ export RDFa for text:p
interface change: use XHTML namespace instead of RDFA
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlimp.cxx,xmlexp.cxx,RDFaExportHelper.cxx},
xmloff/source/text/txtimp.cxx:
+ use XHTML namespace instead of RDFA
#i91565#, #i91566#: (preliminary) import for text:meta, text:meta-field
- xmloff/source/text/txtparai.cxx:
+ new class XMLMetaImportContextBase with subclasses to import
text:meta and text:meta-field
- xmloff/source/text/XMLTextMarkImportContext.cxx:
+ change XMLTextMarkImportContext::CreateAndInsertMark to handle marks
with no name (text:meta)
#i91565#, #i91566#: (preliminary) export for text:meta, text:meta-field
- xmloff/inc/txtflde.hxx, xmloff/source/text/txtflde.cxx:
+ add FIELD_ID_META to FieldIdEnum
+ new method XMLTextFieldExport::ExportMetaField()
+ change XMLTextFieldExport::ExportField{,AutoStyle,Helper}
to take additional parameter for progress bar
- xmloff/inc/xmloff/txtparae.hxx, xmloff/source/text/txtparae.cxx:
+ make XMLTextParagraphExport::exportTextRangeEnumeration() public
+ new method XMLTextParagraphExport::exportMeta()
#i90620#
- xmloff/inc/xmloff/xmlimp.hxx, xmloff/source/core/xmlimp.cxx,
xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ rename SvXML{Im,Ex}port::GetStreamPath() to GetStreamName()
+ fix xml:id {im,ex}port for embedded documents and non-packages
+ adapt to API change: XMetadatable
#i90620# GRDDL
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlexp.cxx}:
+ add GRDDL namespace
+ add token XML_TRANSFORMATION
+ add grddl:transformation attribute to root elements for meta.xml,
content.xml and styles.xml
2009-02-26 12:54:40 +0100 mst r268501 : migration of cws odfmetadata2 from CVS (resync to m42): module unoxml
#i90620#
- unoxml/source/rdf/librdf_repository.cxx:
+ librdf_Repository::importGraph: allocate buffer sized length of stream
+ switch from one librdf_world per repository to a single static world
because redland has global variables with a brain-damaged life-cycle...
+ exportGraph: use new raptor 1.4.18 feature to disable writing
an xml:base attribute in RDF/XML files
- unoxml/source/rdf/librdf_repository.cxx:
unoxml/qa/complex/RDFRepositoryTest.java:
+ adapt to predicate is URI change
+ adapt to RDFa API change
+ adapt to API change: RDFa has multiple predicates...
+ adapt to API change: XMetadatable derives from XURI
+ allow xhtml:datatype without xhtml:content
+ adapt to API change: attribute MetadataReference is StringPair
- unoxml/source/rdf/CURI.cxx:
+ add some more URI constants
2009-02-26 12:53:32 +0100 mst r268500 : migration of cws odfmetadata2 from CVS (resync to m42): module package
- package/inc/ImplValidCharacters.hxx:
+ remove (moved to comphelper)
2009-02-26 12:52:49 +0100 mst r268499 : migration of cws odfmetadata2 from CVS (resync to m42): module comphelper
- comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ add getProcessComponentContext()
+ change return type of comphelper_getProcessComponentContext to Reference
- comphelper/inc/comphelper/stl_types.hxx:
+ add OUStringBufferAppender
+ add algorithm intersperse
- comphelper/source/misc/string.cxx:
+ rewrite convertCommaSeparated with intersperse and OUStringBufferAppender
- comphelper/inc/comphelper/stlunosequence.hxx:
+ fix bug: begin() on empty sequence != end()
2009-02-26 12:50:47 +0100 mst r268498 : migration of cws odfmetadata2 from CVS (resync to m42): module offapi
#i96209#
- offapi/com/sun/star/text/fieldmaster/*.idl:
+ rename module from FieldMaster to fieldmaster
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
#i90620#
- offapi/com/sun/star/rdf/{XMetadatable.idl,XDocumentMetadataAccess.idl}:
+ API change: XMetadatable derives from XURI
+ API change: replace XmlId (string) with MetadataReference (StringPair)
- offapi/com/sun/star/rdf/{Statement.idl,XDocumentRepository.idl,
XNamedGraph.idl,XRepository.idl}:
+ the predicate of a statement is a URI, not a Resource
- offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl:
+ rename: s/Package/Document/
+ remove uuid
+ remove everything related to mapping
+ graph names are now generated from base URI and file names
+ load methods: improve error handling with XInteractionHandler
- offapi/com/sun/star/rdf/XDocumentRepository.idl:
+ change: RDFa permits using multiple predicates in one attribute
+ setStatementRDFa: subject is now XResource, object is now XMetadatable
- offapi/com/sun/star/rdf/URIs.idl:
+ add some more URI constants
- offapi/com/sun/star/rdf:
+ fix @since tags and replace <method> with <member>
2009-02-26 12:47:24 +0100 mst r268497 : migration of cws odfmetadata2 from CVS (resync to m42): module redland
fix #i93768#
- redland/raptor-1.4.17.patch, redland/raptor/makefile.mk:
+ disable GRDDL parser to prevent call to libxslt
xsltSetDefaultSecurityPrefs, which breaks xmlhelp
- redland/raptor/makefile.mk, redland/raptor-1.4.17.patch,
redland/raptor-1.4.18.patch:
+ upgrade raptor to 1.4.18
+ deactivate serializer for RSS/Atom (does not build)
- redland/rasqal/makefile.mk, redland/rasqal-0.9.15.patch,
redland/rasqal-0.9.16.patch,
+ upgrade rasqal to 0.9.16
- redland/redland/makefile.mk, redland/redland-1.0.7.patch,
redland/redland-1.0.8.patch:
+ upgrade redland to 1.0.8
- redland/redlandversion.mk:
+ the librasqal SONAME has changed
2009-07-02 09:05:03 +00:00
|
|
|
XML_TOK_TEXT_P_ABOUT,
|
|
|
|
|
XML_TOK_TEXT_P_PROPERTY,
|
|
|
|
|
XML_TOK_TEXT_P_CONTENT,
|
|
|
|
|
XML_TOK_TEXT_P_DATATYPE,
|
2010-04-19 18:27:16 +02:00
|
|
|
XML_TOK_TEXT_P_TEXTID,
|
2007-04-11 12:30:01 +00:00
|
|
|
XML_TOK_TEXT_P_STYLE_NAME,
|
|
|
|
|
XML_TOK_TEXT_P_COND_STYLE_NAME,
|
|
|
|
|
XML_TOK_TEXT_P_LEVEL,
|
|
|
|
|
XML_TOK_TEXT_P_CLASS_NAMES,
|
|
|
|
|
XML_TOK_TEXT_P_IS_LIST_HEADER,
|
|
|
|
|
XML_TOK_TEXT_P_RESTART_NUMBERING,
|
|
|
|
|
XML_TOK_TEXT_P_START_VALUE,
|
|
|
|
|
XML_TOK_TEXT_P_END=XML_TOK_UNKNOWN
|
|
|
|
|
};
|
|
|
|
|
|
2008-10-01 06:34:11 +00:00
|
|
|
enum XMLTextNumberedParagraphAttrTokens
|
|
|
|
|
{
|
|
|
|
|
XML_TOK_TEXT_NUMBERED_PARAGRAPH_XMLID,
|
|
|
|
|
XML_TOK_TEXT_NUMBERED_PARAGRAPH_LIST_ID,
|
|
|
|
|
XML_TOK_TEXT_NUMBERED_PARAGRAPH_LEVEL,
|
|
|
|
|
XML_TOK_TEXT_NUMBERED_PARAGRAPH_STYLE_NAME,
|
|
|
|
|
XML_TOK_TEXT_NUMBERED_PARAGRAPH_CONTINUE_NUMBERING,
|
|
|
|
|
XML_TOK_TEXT_NUMBERED_PARAGRAPH_START_VALUE,
|
|
|
|
|
XML_TOK_TEXT_NUMBERED_PARAGRAPH_END=XML_TOK_UNKNOWN
|
|
|
|
|
};
|
|
|
|
|
|
2007-04-11 12:30:01 +00:00
|
|
|
enum XMLTextListBlockAttrTokens
|
|
|
|
|
{
|
2008-07-01 15:01:22 +00:00
|
|
|
XML_TOK_TEXT_LIST_BLOCK_XMLID,
|
2007-04-11 12:30:01 +00:00
|
|
|
XML_TOK_TEXT_LIST_BLOCK_STYLE_NAME,
|
|
|
|
|
XML_TOK_TEXT_LIST_BLOCK_CONTINUE_NUMBERING,
|
2008-06-13 08:17:20 +00:00
|
|
|
XML_TOK_TEXT_LIST_BLOCK_ID,
|
|
|
|
|
XML_TOK_TEXT_LIST_BLOCK_CONTINUE_LIST,
|
2007-04-11 12:30:01 +00:00
|
|
|
XML_TOK_TEXT_LIST_BLOCK_END=XML_TOK_UNKNOWN
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
enum XMLTextListBlockElemTokens
|
|
|
|
|
{
|
|
|
|
|
XML_TOK_TEXT_LIST_HEADER,
|
|
|
|
|
XML_TOK_TEXT_LIST_ITEM,
|
|
|
|
|
XML_TOK_TEXT_LIST_BLOCK_ELEM_END=XML_TOK_UNKNOWN
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
enum XMLTextFrameAttrTokens
|
|
|
|
|
{
|
|
|
|
|
XML_TOK_TEXT_FRAME_STYLE_NAME,
|
|
|
|
|
XML_TOK_TEXT_FRAME_NAME,
|
|
|
|
|
XML_TOK_TEXT_FRAME_ANCHOR_TYPE,
|
|
|
|
|
XML_TOK_TEXT_FRAME_ANCHOR_PAGE_NUMBER,
|
|
|
|
|
XML_TOK_TEXT_FRAME_X,
|
|
|
|
|
XML_TOK_TEXT_FRAME_Y,
|
|
|
|
|
XML_TOK_TEXT_FRAME_WIDTH,
|
|
|
|
|
XML_TOK_TEXT_FRAME_REL_WIDTH,
|
|
|
|
|
XML_TOK_TEXT_FRAME_HEIGHT,
|
|
|
|
|
XML_TOK_TEXT_FRAME_MIN_HEIGHT,
|
|
|
|
|
XML_TOK_TEXT_FRAME_REL_HEIGHT,
|
|
|
|
|
XML_TOK_TEXT_FRAME_NEXT_CHAIN_NAME,
|
|
|
|
|
XML_TOK_TEXT_FRAME_HREF,
|
|
|
|
|
XML_TOK_TEXT_FRAME_FILTER_NAME,
|
|
|
|
|
XML_TOK_TEXT_FRAME_Z_INDEX,
|
|
|
|
|
XML_TOK_TEXT_FRAME_TRANSFORM,
|
|
|
|
|
XML_TOK_TEXT_FRAME_CLASS_ID,
|
|
|
|
|
XML_TOK_TEXT_FRAME_CODE,
|
|
|
|
|
XML_TOK_TEXT_FRAME_OBJECT,
|
|
|
|
|
XML_TOK_TEXT_FRAME_ARCHIVE,
|
|
|
|
|
XML_TOK_TEXT_FRAME_MAY_SCRIPT,
|
|
|
|
|
XML_TOK_TEXT_FRAME_MIME_TYPE,
|
|
|
|
|
XML_TOK_TEXT_FRAME_APPLET_NAME,
|
|
|
|
|
XML_TOK_TEXT_FRAME_FRAME_NAME,
|
|
|
|
|
XML_TOK_TEXT_FRAME_NOTIFY_ON_UPDATE,
|
|
|
|
|
XML_TOK_TEXT_FRAME_MIN_WIDTH,
|
|
|
|
|
XML_TOK_TEXT_FRAME_END=XML_TOK_UNKNOWN
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
enum XMLTextHyperlinkAttrTokens
|
|
|
|
|
{
|
|
|
|
|
XML_TOK_TEXT_HYPERLINK_HREF,
|
|
|
|
|
XML_TOK_TEXT_HYPERLINK_NAME,
|
|
|
|
|
XML_TOK_TEXT_HYPERLINK_TARGET_FRAME,
|
|
|
|
|
XML_TOK_TEXT_HYPERLINK_SHOW,
|
|
|
|
|
XML_TOK_TEXT_HYPERLINK_STYLE_NAME,
|
|
|
|
|
XML_TOK_TEXT_HYPERLINK_VIS_STYLE_NAME,
|
|
|
|
|
XML_TOK_TEXT_HYPERLINK_SERVER_MAP,
|
|
|
|
|
XML_TOK_TEXT_HYPERLINK_END=XML_TOK_UNKNOWN
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
enum XMLTextPageMasterElemTokens
|
|
|
|
|
{
|
|
|
|
|
XML_TOK_TEXT_MP_HEADER,
|
|
|
|
|
XML_TOK_TEXT_MP_FOOTER,
|
|
|
|
|
XML_TOK_TEXT_MP_HEADER_LEFT,
|
|
|
|
|
XML_TOK_TEXT_MP_FOOTER_LEFT,
|
2012-07-05 11:37:26 +02:00
|
|
|
XML_TOK_TEXT_MP_HEADER_FIRST,
|
|
|
|
|
XML_TOK_TEXT_MP_FOOTER_FIRST,
|
2007-04-11 12:30:01 +00:00
|
|
|
XML_TOK_TEXT_MP_END=XML_TOK_UNKNOWN
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
enum XMLTextContourAttrTokens
|
|
|
|
|
{
|
|
|
|
|
XML_TOK_TEXT_CONTOUR_WIDTH,
|
|
|
|
|
XML_TOK_TEXT_CONTOUR_HEIGHT,
|
|
|
|
|
XML_TOK_TEXT_CONTOUR_VIEWBOX,
|
|
|
|
|
XML_TOK_TEXT_CONTOUR_POINTS,
|
|
|
|
|
XML_TOK_TEXT_CONTOUR_D,
|
|
|
|
|
XML_TOK_TEXT_CONTOUR_AUTO,
|
|
|
|
|
XML_TOK_TEXT_CONTOUR_END=XML_TOK_UNKNOWN
|
|
|
|
|
};
|
|
|
|
|
enum XMLTextType
|
|
|
|
|
{
|
|
|
|
|
XML_TEXT_TYPE_BODY,
|
|
|
|
|
XML_TEXT_TYPE_CELL,
|
|
|
|
|
XML_TEXT_TYPE_SHAPE,
|
|
|
|
|
XML_TEXT_TYPE_TEXTBOX,
|
|
|
|
|
XML_TEXT_TYPE_HEADER_FOOTER,
|
|
|
|
|
XML_TEXT_TYPE_SECTION,
|
|
|
|
|
XML_TEXT_TYPE_FOOTNOTE,
|
|
|
|
|
XML_TEXT_TYPE_CHANGED_REGION
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#define XML_TEXT_RENAME_TYPE_FRAME 10
|
|
|
|
|
#define XML_TEXT_RENAME_TYPE_TABLE 20
|
|
|
|
|
|
2015-02-17 13:43:17 +00:00
|
|
|
class XMLOFF_DLLPUBLIC XMLTextImportHelper : public salhelper::SimpleReferenceObject
|
2007-04-11 12:30:01 +00:00
|
|
|
{
|
2010-03-15 12:53:14 +01:00
|
|
|
private:
|
2015-02-17 13:43:17 +00:00
|
|
|
XMLTextImportHelper(const XMLTextImportHelper&) SAL_DELETED_FUNCTION;
|
|
|
|
|
XMLTextImportHelper& operator=(const XMLTextImportHelper&) SAL_DELETED_FUNCTION;
|
|
|
|
|
|
2010-03-15 12:53:14 +01:00
|
|
|
struct Impl;
|
2015-02-15 20:41:33 +00:00
|
|
|
std::unique_ptr<Impl> m_xImpl;
|
2010-03-15 12:53:14 +01:00
|
|
|
/// ugly, but implementation of this is in XMLPropertyBackpatcher.cxx
|
|
|
|
|
struct BackpatcherImpl;
|
2015-02-17 13:43:17 +00:00
|
|
|
std::shared_ptr<BackpatcherImpl> m_xBackpatcherImpl;
|
2015-04-02 14:07:31 +02:00
|
|
|
static std::shared_ptr<BackpatcherImpl> MakeBackpatcherImpl();
|
2008-09-04 09:07:25 +00:00
|
|
|
|
2007-04-11 12:30:01 +00:00
|
|
|
protected:
|
|
|
|
|
virtual SvXMLImportContext *CreateTableChildContext(
|
|
|
|
|
SvXMLImport& rImport,
|
2013-04-07 12:06:47 +02:00
|
|
|
sal_uInt16 nPrefix, const OUString& rLocalName,
|
2007-04-11 12:30:01 +00:00
|
|
|
const ::com::sun::star::uno::Reference<
|
|
|
|
|
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
|
|
|
|
|
|
|
|
|
|
// access, lazy initialization and destruction of backpatchers
|
|
|
|
|
// Code is implemented in XMLPropertyBackpatcher.cxx
|
|
|
|
|
inline XMLPropertyBackpatcher<sal_Int16>& GetFootnoteBP();
|
|
|
|
|
inline XMLPropertyBackpatcher<sal_Int16>& GetSequenceIdBP();
|
2013-04-07 12:06:47 +02:00
|
|
|
inline XMLPropertyBackpatcher< OUString> & GetSequenceNameBP();
|
2007-04-11 12:30:01 +00:00
|
|
|
|
|
|
|
|
public:
|
|
|
|
|
|
|
|
|
|
XMLTextImportHelper(
|
2010-03-15 12:53:14 +01:00
|
|
|
::com::sun::star::uno::Reference <
|
|
|
|
|
::com::sun::star::frame::XModel> const& rModel,
|
2007-04-11 12:30:01 +00:00
|
|
|
SvXMLImport& rImport,
|
2010-03-15 12:53:14 +01:00
|
|
|
bool const bInsertMode = false, bool const bStylesOnlyMode = false,
|
|
|
|
|
bool const bProgress = false, bool const bBlockMode = false,
|
|
|
|
|
bool const bOrganizerMode = false);
|
2007-04-11 12:30:01 +00:00
|
|
|
|
2014-04-01 19:18:35 +02:00
|
|
|
virtual ~XMLTextImportHelper();
|
2007-04-11 12:30:01 +00:00
|
|
|
|
|
|
|
|
void SetCursor(
|
|
|
|
|
const ::com::sun::star::uno::Reference <
|
|
|
|
|
::com::sun::star::text::XTextCursor >& rCursor );
|
|
|
|
|
void ResetCursor();
|
|
|
|
|
|
|
|
|
|
void SetAutoStyles( SvXMLStylesContext *pStyles );
|
|
|
|
|
|
|
|
|
|
SvXMLImportContext *CreateTextChildContext(
|
|
|
|
|
SvXMLImport& rImport,
|
2013-04-07 12:06:47 +02:00
|
|
|
sal_uInt16 nPrefix, const OUString& rLocalName,
|
2007-04-11 12:30:01 +00:00
|
|
|
const ::com::sun::star::uno::Reference<
|
|
|
|
|
::com::sun::star::xml::sax::XAttributeList > & xAttrList,
|
|
|
|
|
XMLTextType eType = XML_TEXT_TYPE_SHAPE );
|
|
|
|
|
|
2010-03-15 12:53:14 +01:00
|
|
|
SvXMLTokenMap const& GetTextElemTokenMap();
|
|
|
|
|
SvXMLTokenMap const& GetTextPElemTokenMap();
|
|
|
|
|
SvXMLTokenMap const& GetTextPAttrTokenMap();
|
|
|
|
|
SvXMLTokenMap const& GetTextFrameAttrTokenMap();
|
|
|
|
|
SvXMLTokenMap const& GetTextContourAttrTokenMap();
|
|
|
|
|
SvXMLTokenMap const& GetTextHyperlinkAttrTokenMap();
|
|
|
|
|
SvXMLTokenMap const& GetTextMasterPageElemTokenMap();
|
2007-04-11 12:30:01 +00:00
|
|
|
|
2008-10-01 06:34:11 +00:00
|
|
|
const SvXMLTokenMap& GetTextNumberedParagraphAttrTokenMap();
|
2007-04-11 12:30:01 +00:00
|
|
|
const SvXMLTokenMap& GetTextListBlockAttrTokenMap();
|
|
|
|
|
const SvXMLTokenMap& GetTextListBlockElemTokenMap();
|
|
|
|
|
const SvXMLTokenMap& GetTextFieldAttrTokenMap(); // impl: txtfldi.cxx
|
|
|
|
|
|
2010-03-15 12:53:14 +01:00
|
|
|
::com::sun::star::uno::Reference<
|
|
|
|
|
::com::sun::star::text::XText > & GetText();
|
|
|
|
|
::com::sun::star::uno::Reference<
|
|
|
|
|
::com::sun::star::text::XTextCursor > & GetCursor();
|
|
|
|
|
::com::sun::star::uno::Reference<
|
|
|
|
|
::com::sun::star::text::XTextRange > & GetCursorAsRange();
|
2007-04-11 12:30:01 +00:00
|
|
|
|
2010-03-15 12:53:14 +01:00
|
|
|
bool IsInsertMode() const;
|
|
|
|
|
bool IsStylesOnlyMode() const;
|
|
|
|
|
bool IsBlockMode() const;
|
|
|
|
|
bool IsOrganizerMode() const;
|
|
|
|
|
bool IsProgress() const;
|
2007-04-11 12:30:01 +00:00
|
|
|
|
2013-04-07 12:06:47 +02:00
|
|
|
OUString ConvertStarFonts( const OUString& rChars,
|
2014-03-28 14:13:18 +02:00
|
|
|
const OUString& rStyleName,
|
|
|
|
|
sal_uInt8& rFlags,
|
|
|
|
|
bool bPara,
|
|
|
|
|
SvXMLImport& rImport ) const;
|
2007-04-11 12:30:01 +00:00
|
|
|
// insert a string without special whitespace processing enabled
|
2013-04-07 12:06:47 +02:00
|
|
|
void InsertString( const OUString& rChars );
|
2007-04-11 12:30:01 +00:00
|
|
|
// insert a string with special whitespace processing enabled
|
2013-04-07 12:06:47 +02:00
|
|
|
void InsertString( const OUString& rChars,
|
2014-03-28 14:13:18 +02:00
|
|
|
bool& rIgnoreLeadingSpace );
|
2007-04-11 12:30:01 +00:00
|
|
|
// Delete current paragraph
|
|
|
|
|
void DeleteParagraph();
|
|
|
|
|
|
|
|
|
|
void InsertControlCharacter( sal_Int16 nControl );
|
|
|
|
|
void InsertTextContent( ::com::sun::star::uno::Reference <
|
|
|
|
|
::com::sun::star::text::XTextContent > & xContent);
|
|
|
|
|
|
2010-11-09 01:42:14 +05:00
|
|
|
// Add parameter <bOutlineLevelAttrFound> (#i73509#)
|
|
|
|
|
// Add parameter <bSetListAttrs> in order to suppress the handling of the list attributes (#i80724#)
|
2013-04-07 12:06:47 +02:00
|
|
|
OUString SetStyleAndAttrs(
|
2007-04-11 12:30:01 +00:00
|
|
|
SvXMLImport& rImport,
|
|
|
|
|
const ::com::sun::star::uno::Reference <
|
|
|
|
|
::com::sun::star::text::XTextCursor >& rCursor,
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString& rStyleName,
|
2014-03-28 14:13:18 +02:00
|
|
|
bool bPara,
|
|
|
|
|
bool bOutlineLevelAttrFound = false,
|
2007-08-28 11:25:10 +00:00
|
|
|
sal_Int8 nOutlineLevel = -1,
|
2014-03-28 14:13:18 +02:00
|
|
|
bool bSetListAttrs = true );
|
2007-04-11 12:30:01 +00:00
|
|
|
|
|
|
|
|
/** Find a suitable name for the given outline level.
|
|
|
|
|
* If rStyleName is empty, change it to a previously used or default style
|
|
|
|
|
* name for that level. Otherwise, leave rStyleName unmodified.
|
|
|
|
|
*/
|
2010-11-09 01:42:14 +05:00
|
|
|
// Adjust 2nd parameter (#i69629#)
|
2013-04-07 12:06:47 +02:00
|
|
|
void FindOutlineStyleName( OUString& rStyleName,
|
2007-04-11 12:30:01 +00:00
|
|
|
sal_Int8 nOutlineLevel );
|
|
|
|
|
|
2010-11-09 01:42:14 +05:00
|
|
|
// Change method name to reflect change of data structure (#i69629#)
|
2007-04-11 12:30:01 +00:00
|
|
|
void AddOutlineStyleCandidate( const sal_Int8 nOutlineLevel,
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString& rStyleName );
|
2010-11-09 01:42:14 +05:00
|
|
|
|
2014-03-28 14:13:18 +02:00
|
|
|
void SetOutlineStyles( bool bSetEmpty );
|
2007-04-11 12:30:01 +00:00
|
|
|
|
|
|
|
|
void SetHyperlink(
|
|
|
|
|
SvXMLImport& rImport,
|
|
|
|
|
const ::com::sun::star::uno::Reference <
|
|
|
|
|
::com::sun::star::text::XTextCursor >& rCursor,
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString& rHRef,
|
|
|
|
|
const OUString& rName,
|
|
|
|
|
const OUString& rTargetFrameName,
|
|
|
|
|
const OUString& rStyleName,
|
|
|
|
|
const OUString& rVisitedStyleName,
|
2007-04-11 12:30:01 +00:00
|
|
|
XMLEventsImportContext* pEvents = NULL);
|
|
|
|
|
void SetRuby(
|
|
|
|
|
SvXMLImport& rImport,
|
|
|
|
|
const ::com::sun::star::uno::Reference <
|
|
|
|
|
::com::sun::star::text::XTextCursor >& rCursor,
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString& rStyleName,
|
|
|
|
|
const OUString& rTextStyleName,
|
|
|
|
|
const OUString& rText );
|
2007-04-11 12:30:01 +00:00
|
|
|
|
|
|
|
|
/// return key appropriate for use with NumberFormat property
|
|
|
|
|
/// return -1 if style is not found
|
|
|
|
|
/// (may return whether data style uses the system language)
|
2013-04-07 12:06:47 +02:00
|
|
|
sal_Int32 GetDataStyleKey( const OUString& sStyleName,
|
2014-03-28 14:13:18 +02:00
|
|
|
bool* pIsSystemLanguage = NULL );
|
2007-04-11 12:30:01 +00:00
|
|
|
|
|
|
|
|
const SvxXMLListStyleContext *FindAutoListStyle(
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString& rName ) const;
|
2007-04-11 12:30:01 +00:00
|
|
|
XMLPropStyleContext *FindAutoFrameStyle(
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString& rName ) const;
|
2007-04-11 12:30:01 +00:00
|
|
|
XMLPropStyleContext* FindSectionStyle(
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString& rName ) const;
|
2007-04-11 12:30:01 +00:00
|
|
|
XMLPropStyleContext* FindPageMaster(
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString& rName ) const;
|
2007-04-11 12:30:01 +00:00
|
|
|
|
2010-03-15 12:53:14 +01:00
|
|
|
const ::com::sun::star::uno::Reference<
|
|
|
|
|
::com::sun::star::container::XNameContainer> & GetParaStyles() const;
|
|
|
|
|
|
|
|
|
|
const ::com::sun::star::uno::Reference<
|
|
|
|
|
::com::sun::star::container::XNameContainer> & GetTextStyles() const;
|
|
|
|
|
|
|
|
|
|
const ::com::sun::star::uno::Reference<
|
|
|
|
|
::com::sun::star::container::XNameContainer> &
|
|
|
|
|
GetNumberingStyles() const;
|
|
|
|
|
|
|
|
|
|
const ::com::sun::star::uno::Reference<
|
|
|
|
|
::com::sun::star::container::XNameContainer> & GetFrameStyles() const;
|
2007-04-11 12:30:01 +00:00
|
|
|
|
|
|
|
|
const ::com::sun::star::uno::Reference<
|
2010-03-15 12:53:14 +01:00
|
|
|
::com::sun::star::container::XNameContainer> & GetPageStyles() const;
|
|
|
|
|
|
|
|
|
|
const ::com::sun::star::uno::Reference<
|
|
|
|
|
::com::sun::star::container::XIndexReplace > &
|
|
|
|
|
GetChapterNumbering() const;
|
2007-04-11 12:30:01 +00:00
|
|
|
|
2014-03-28 14:13:18 +02:00
|
|
|
bool HasFrameByName( const OUString& rName ) const;
|
2013-04-07 12:06:47 +02:00
|
|
|
void ConnectFrameChains( const OUString& rFrmName,
|
|
|
|
|
const OUString& rNextFrmName,
|
2007-04-11 12:30:01 +00:00
|
|
|
const ::com::sun::star::uno::Reference <
|
|
|
|
|
::com::sun::star::beans::XPropertySet >& rFrmPropSet );
|
|
|
|
|
|
2014-06-30 09:53:06 +02:00
|
|
|
rtl::Reference< SvXMLImportPropertyMapper > const&
|
2010-03-15 12:53:14 +01:00
|
|
|
GetParaImportPropertySetMapper() const;
|
2014-06-30 09:53:06 +02:00
|
|
|
rtl::Reference< SvXMLImportPropertyMapper > const&
|
2010-03-15 12:53:14 +01:00
|
|
|
GetTextImportPropertySetMapper() const;
|
2014-06-30 09:53:06 +02:00
|
|
|
rtl::Reference< SvXMLImportPropertyMapper > const&
|
2010-03-15 12:53:14 +01:00
|
|
|
GetSectionImportPropertySetMapper() const;
|
2014-06-30 09:53:06 +02:00
|
|
|
rtl::Reference< SvXMLImportPropertyMapper > const&
|
2010-03-15 12:53:14 +01:00
|
|
|
GetRubyImportPropertySetMapper() const;
|
|
|
|
|
|
2007-04-11 12:30:01 +00:00
|
|
|
static SvXMLImportPropertyMapper *CreateShapeExtPropMapper(SvXMLImport&);
|
fix reading fonts from .odp using style::font-name (fdo#65338)
b40bcde076f9fabf24810d2520e878d604d99637 made writing .odp use style:font-name
and office:font-face-decls, instead of using fo:font-family . But the reading
back was broken, as xFontDecls is not set
in XMLTextImportPropertyMapper::handleSpecialItem(), so the font data was
ignored. And xFontDecls was not set because it's set while reading
office:font-face-decls, which is at the top of the xml document, but even
before the xml is parsed, the call to SdXMLImport::setTargetDocument() calls
GetShapeImport(), which creates XMLShapeImportHelper instance, which calls
XMLTextImportHelper::CreateParaExtPropMapper(), and XMLTextImportPropertyMapper
is created with rImport.GetFontDecls() still being NULL at that point.
And it actually doesn't seem to make any sense to just pass around all
the pointers to XMLFontStylesContext, as eventually it's always just the one
from SvXMLImport. So simply dump all that and make the one single place
that actually uses it (i.e. XMLTextImportPropertyMapper::handleSpecialItem())
refer directly to SvXMLImport::GetFontDecls().
Change-Id: Ib1b3e4b1bcaf87ca3e4703d1cc1563ad6b3f9ce7
2013-07-10 17:33:15 +02:00
|
|
|
static SvXMLImportPropertyMapper *CreateParaExtPropMapper(SvXMLImport&);
|
|
|
|
|
static SvXMLImportPropertyMapper* CreateParaDefaultExtPropMapper(SvXMLImport&);
|
|
|
|
|
static SvXMLImportPropertyMapper* CreateTableDefaultExtPropMapper(SvXMLImport&);
|
|
|
|
|
static SvXMLImportPropertyMapper* CreateTableRowDefaultExtPropMapper(SvXMLImport&);
|
2007-04-11 12:30:01 +00:00
|
|
|
|
|
|
|
|
SvI18NMap& GetRenameMap();
|
|
|
|
|
|
|
|
|
|
/// save the start of a range reference
|
|
|
|
|
void InsertBookmarkStartRange(
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString & sName,
|
2007-04-11 12:30:01 +00:00
|
|
|
const ::com::sun::star::uno::Reference<
|
2008-07-01 15:01:22 +00:00
|
|
|
::com::sun::star::text::XTextRange> & rRange,
|
2013-04-07 12:06:47 +02:00
|
|
|
OUString const& i_rXmlId,
|
2015-02-17 13:43:17 +00:00
|
|
|
std::shared_ptr< ::xmloff::ParsedRDFaAttributes > &
|
2010-03-15 12:53:13 +01:00
|
|
|
i_rpRDFaAttributes);
|
2007-04-11 12:30:01 +00:00
|
|
|
|
|
|
|
|
/// process the start of a range reference
|
2014-03-28 14:13:18 +02:00
|
|
|
bool FindAndRemoveBookmarkStartRange(
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString & sName,
|
2007-04-11 12:30:01 +00:00
|
|
|
::com::sun::star::uno::Reference<
|
2008-07-01 15:01:22 +00:00
|
|
|
::com::sun::star::text::XTextRange> & o_rRange,
|
2013-04-07 12:06:47 +02:00
|
|
|
OUString & o_rXmlId,
|
2015-02-17 13:43:17 +00:00
|
|
|
std::shared_ptr< ::xmloff::ParsedRDFaAttributes > &
|
2010-03-15 12:53:13 +01:00
|
|
|
o_rpRDFaAttributes);
|
2007-04-11 12:30:01 +00:00
|
|
|
|
2013-04-07 12:06:47 +02:00
|
|
|
OUString FindActiveBookmarkName();
|
2008-09-04 09:07:25 +00:00
|
|
|
|
2014-03-13 15:04:48 +02:00
|
|
|
void pushFieldCtx( const OUString& name, const OUString& type );
|
2008-09-04 09:07:25 +00:00
|
|
|
void popFieldCtx();
|
2014-03-13 15:04:48 +02:00
|
|
|
void addFieldParam( const OUString& name, const OUString& value );
|
2008-09-04 09:07:25 +00:00
|
|
|
void setCurrentFieldParamsTo(::com::sun::star::uno::Reference< ::com::sun::star::text::XFormField> &xFormField);
|
2013-04-07 12:06:47 +02:00
|
|
|
OUString getCurrentFieldType();
|
2008-09-04 09:07:25 +00:00
|
|
|
bool hasCurrentFieldCtx();
|
|
|
|
|
|
|
|
|
|
|
2007-04-11 12:30:01 +00:00
|
|
|
/// insert new footnote ID.
|
|
|
|
|
/// Also fixup open references from the backpatch list to this ID.
|
|
|
|
|
// Code is implemented in XMLPropertyBackpatcher.cxx
|
2013-04-07 12:06:47 +02:00
|
|
|
void InsertFootnoteID(const OUString& sXMLId, sal_Int16 nAPIId);
|
2007-04-11 12:30:01 +00:00
|
|
|
|
|
|
|
|
/// set the proper footnote reference ID,
|
|
|
|
|
/// or put into backpatch list if ID is unknown
|
|
|
|
|
// Code is implemented in XMLPropertyBackpatcher.cxx
|
|
|
|
|
void ProcessFootnoteReference(
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString& sXMLId,
|
2007-04-11 12:30:01 +00:00
|
|
|
const ::com::sun::star::uno::Reference<
|
|
|
|
|
::com::sun::star::beans::XPropertySet> & xPropSet);
|
|
|
|
|
|
|
|
|
|
/// insert new sequence ID
|
|
|
|
|
/// Also fixup open references from backpatch list to this ID.
|
|
|
|
|
// Code is implemented in XMLPropertyBackpatcher.cxx
|
2013-04-07 12:06:47 +02:00
|
|
|
void InsertSequenceID(const OUString& sXMLId,
|
|
|
|
|
const OUString& sName,
|
2007-04-11 12:30:01 +00:00
|
|
|
sal_Int16 nAPIId);
|
|
|
|
|
|
|
|
|
|
/// set sequence ID or insert into backpatch list
|
|
|
|
|
// Code is implemented in XMLPropertyBackpatcher.cxx
|
|
|
|
|
void ProcessSequenceReference(
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString& sXMLId,
|
2007-04-11 12:30:01 +00:00
|
|
|
const ::com::sun::star::uno::Reference<
|
|
|
|
|
::com::sun::star::beans::XPropertySet> & xPropSet);
|
|
|
|
|
|
2014-03-28 14:13:18 +02:00
|
|
|
bool IsInFrame() const;
|
|
|
|
|
virtual bool IsInHeaderFooter() const;
|
2007-04-11 12:30:01 +00:00
|
|
|
|
|
|
|
|
virtual ::com::sun::star::uno::Reference<
|
|
|
|
|
::com::sun::star::beans::XPropertySet>
|
|
|
|
|
createAndInsertOLEObject( SvXMLImport& rImport,
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString& rHRef,
|
|
|
|
|
const OUString &rStyleName,
|
|
|
|
|
const OUString &rTblName,
|
2007-04-11 12:30:01 +00:00
|
|
|
sal_Int32 nWidth, sal_Int32 nHeight );
|
|
|
|
|
|
|
|
|
|
virtual ::com::sun::star::uno::Reference<
|
|
|
|
|
::com::sun::star::beans::XPropertySet>
|
|
|
|
|
createAndInsertOOoLink( SvXMLImport& rImport,
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString& rHRef,
|
|
|
|
|
const OUString &rStyleName,
|
|
|
|
|
const OUString &rTblName,
|
2007-04-11 12:30:01 +00:00
|
|
|
sal_Int32 nWidth, sal_Int32 nHeight );
|
|
|
|
|
|
|
|
|
|
virtual ::com::sun::star::uno::Reference<
|
|
|
|
|
::com::sun::star::beans::XPropertySet>
|
|
|
|
|
createAndInsertApplet(
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString &rName,
|
|
|
|
|
const OUString &rCode,
|
2014-03-28 14:13:18 +02:00
|
|
|
bool bMayScript,
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString& rHRef,
|
2007-04-11 12:30:01 +00:00
|
|
|
sal_Int32 nWidth, sal_Int32 nHeight );
|
|
|
|
|
|
|
|
|
|
virtual ::com::sun::star::uno::Reference<
|
|
|
|
|
::com::sun::star::beans::XPropertySet>
|
|
|
|
|
createAndInsertPlugin(
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString &rMimeType,
|
|
|
|
|
const OUString& rHRef,
|
2007-04-11 12:30:01 +00:00
|
|
|
sal_Int32 nWidth, sal_Int32 nHeight );
|
|
|
|
|
|
|
|
|
|
virtual ::com::sun::star::uno::Reference<
|
|
|
|
|
::com::sun::star::beans::XPropertySet>
|
|
|
|
|
createAndInsertFloatingFrame(
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString &rName,
|
|
|
|
|
const OUString &rHRef,
|
|
|
|
|
const OUString &rStyleName,
|
2007-04-11 12:30:01 +00:00
|
|
|
sal_Int32 nWidth, sal_Int32 nHeight );
|
|
|
|
|
|
|
|
|
|
virtual void endAppletOrPlugin(
|
|
|
|
|
const com::sun::star::uno::Reference<
|
|
|
|
|
::com::sun::star::beans::XPropertySet> &rPropSet,
|
2013-12-05 18:34:54 +01:00
|
|
|
::std::map < const OUString, OUString > &rParamMap );
|
2007-04-11 12:30:01 +00:00
|
|
|
|
|
|
|
|
// applet helper methods
|
|
|
|
|
// implemented in sw/filter/xml/txtparai.hxx
|
|
|
|
|
|
|
|
|
|
// redlining helper methods
|
|
|
|
|
// (to be implemented in sw/filter/xml/txtparai.hxx)
|
|
|
|
|
|
|
|
|
|
virtual void RedlineAdd(
|
2013-04-04 18:05:24 +02:00
|
|
|
/// redline type (insert, del,... )
|
|
|
|
|
const OUString& rType,
|
|
|
|
|
/// use to identify this redline
|
|
|
|
|
const OUString& rId,
|
|
|
|
|
/// name of the author
|
|
|
|
|
const OUString& rAuthor,
|
|
|
|
|
/// redline comment
|
|
|
|
|
const OUString& rComment,
|
|
|
|
|
/// date+time
|
|
|
|
|
const ::com::sun::star::util::DateTime& rDateTime,
|
|
|
|
|
/// merge last paras
|
2014-03-28 14:13:18 +02:00
|
|
|
bool bMergeLastParagraph);
|
2013-04-04 18:05:24 +02:00
|
|
|
|
2007-04-11 12:30:01 +00:00
|
|
|
virtual ::com::sun::star::uno::Reference<
|
|
|
|
|
::com::sun::star::text::XTextCursor> RedlineCreateText(
|
2013-04-04 18:05:24 +02:00
|
|
|
/// needed to get the document
|
|
|
|
|
::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > & rOldCursor,
|
|
|
|
|
/// ID used to RedlineAdd() call
|
|
|
|
|
const OUString& rId);
|
|
|
|
|
|
2007-04-11 12:30:01 +00:00
|
|
|
virtual void RedlineSetCursor(
|
2013-04-04 18:05:24 +02:00
|
|
|
/// ID used to RedlineAdd() call
|
|
|
|
|
const OUString& rId,
|
|
|
|
|
/// start or end Cursor
|
2014-03-28 14:13:18 +02:00
|
|
|
bool bStart,
|
2013-04-04 18:05:24 +02:00
|
|
|
/// range is not within <text:p>
|
2014-03-28 14:13:18 +02:00
|
|
|
bool bIsOutsideOfParagraph);
|
2013-04-04 18:05:24 +02:00
|
|
|
|
2014-03-28 14:13:18 +02:00
|
|
|
virtual void RedlineAdjustStartNodeCursor( bool bStart );
|
|
|
|
|
virtual void SetShowChanges( bool bShowChanges );
|
|
|
|
|
virtual void SetRecordChanges( bool bRecordChanges );
|
2007-04-11 12:30:01 +00:00
|
|
|
virtual void SetChangesProtectionKey(
|
|
|
|
|
const ::com::sun::star::uno::Sequence<sal_Int8> & rProtectionKey );
|
|
|
|
|
|
2013-04-04 18:05:24 +02:00
|
|
|
/// get the last open redline ID
|
2013-04-07 12:06:47 +02:00
|
|
|
OUString GetOpenRedlineId();
|
2013-04-04 18:05:24 +02:00
|
|
|
/// modify the last open redline ID
|
2013-04-07 12:06:47 +02:00
|
|
|
void SetOpenRedlineId( OUString& rId);
|
2013-04-04 18:05:24 +02:00
|
|
|
/// reset the last open redline ID
|
2007-04-11 12:30:01 +00:00
|
|
|
void ResetOpenRedlineId();
|
|
|
|
|
|
|
|
|
|
// #107848#
|
2013-04-04 18:05:24 +02:00
|
|
|
/** redlining : Setter to remember the fact we are inside/outside
|
|
|
|
|
* a <text:deletion> element (deleted redline section) */
|
2010-03-15 12:53:14 +01:00
|
|
|
void SetInsideDeleteContext(bool const bNew);
|
2013-04-04 18:05:24 +02:00
|
|
|
/** redlining : Getter to know if we are inside
|
|
|
|
|
* a <text:deletion> element (deleted redline section) */
|
2010-03-15 12:53:14 +01:00
|
|
|
bool IsInsideDeleteContext() const;
|
2007-04-11 12:30:01 +00:00
|
|
|
|
2010-03-15 12:53:14 +01:00
|
|
|
SvXMLImport & GetXMLImport();
|
2008-06-13 08:17:20 +00:00
|
|
|
|
2010-03-15 12:53:14 +01:00
|
|
|
XMLTextListsHelper & GetTextListHelper();
|
2008-06-13 08:17:20 +00:00
|
|
|
|
2008-10-01 06:34:11 +00:00
|
|
|
// forwards to TextListHelper; these are used in many places
|
|
|
|
|
/// push a list context on the list context stack
|
|
|
|
|
void PushListContext(XMLTextListBlockContext *i_pListBlock = 0);
|
|
|
|
|
/// pop the list context stack
|
|
|
|
|
void PopListContext();
|
2007-04-11 12:30:01 +00:00
|
|
|
|
2013-04-07 12:06:47 +02:00
|
|
|
void SetCellParaStyleDefault(OUString const& rNewValue);
|
|
|
|
|
OUString const& GetCellParaStyleDefault();
|
2010-03-15 12:53:14 +01:00
|
|
|
};
|
2007-04-11 12:30:01 +00:00
|
|
|
|
|
|
|
|
#endif
|
2010-10-27 13:11:31 +01:00
|
|
|
|
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|