Commit graph

567 commits

Author SHA1 Message Date
Miklos Vajna
e20a75a4f3 dmapper: implement PAGEREF field 2011-08-10 16:15:23 +02:00
Miklos Vajna
ed7b24e4d5 Fix page numbers
I broke that in commit 5338fee30b
2011-08-10 11:44:04 +02:00
Miklos Vajna
9d4f6c02b1 dmapper: paragraph vertical alignment support 2011-08-08 17:26:28 +02:00
Miklos Vajna
57a189d7f9 DomainMapper_Impl::AddBookmark: missing empty stack check 2011-08-08 16:18:56 +02:00
Miklos Vajna
5338fee30b dmapper: more null pointer checks for the unit test 2011-08-08 16:15:58 +02:00
Miklos Vajna
957a48e650 dmapper: m_xText may be null 2011-08-04 00:57:24 +02:00
Miklos Vajna
6353ccd87f couple of null pointer checks for the unit test 2011-08-03 19:02:44 +02:00
Troy Rollo
a197cee991 Import of xrefs to numbered paragraphs from docx
The first part of this patch adds importing of cross-references to numbered
paragraphs from docx file.

The second part provides a fix to imports of bookmarks from docx, which in
the test files I have end up importing with an empty bookmark name. The
problem is that for each bookmark, DomainMapper_Impl::AddBookmark is called
twice - once with an empty string for rBookmarkName, and once for the
string that is in the file. The fix I have used is to ensure the passed in
name is used if the bookmark has presiously been added, and the old one has
an empty string as the name. This works, but I am not sure it is correct -
I have not investigated why it is called with an empty string in the first
place.

Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
2011-08-01 17:22:51 +02:00
Troy Rollo
295185572f Fix parent level count in numbering from docx
Before this patch, when importing from docx, if there were no parent
numbering levels in the number formats for outline numbered paragraphs, the
import would include all parent levels back to the second numbering level,
in the third and subsequent numbering levels.

Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
2011-08-01 16:40:03 +02:00
Miklos Vajna
e8b50bde72 dmapper: handle redline authors inside annotation fields 2011-07-29 17:32:40 +02:00
Miklos Vajna
8891e4a4ee dmapper: handle redline dates inside annotation fields 2011-07-29 17:32:39 +02:00
Miklos Vajna
856071a7aa fix for CVE-2005-2972-1.rtf 2011-07-29 17:32:39 +02:00
Miklos Vajna
94855fbbb9 dmapper: remove last paragraph of footnotes
This is the same trick as with headers/footers: the footnote always ends
with an empty paragraph, but in Writer we need to remove this.
2011-07-29 17:32:37 +02:00
Miklos Vajna
f9e0f09696 dmapper: no last paragraph on shapes
Just like with headers, shapes don't have a last empty paragraph,
either.
2011-07-29 17:32:36 +02:00
Miklos Vajna
946482802f dmapper: don't set default style for shapes, they do not support that 2011-07-29 17:32:36 +02:00
Luboš Luňák
48b12f56b0 proper #ifdef for dumpXml() 2011-07-27 17:42:01 +02:00
Luboš Luňák
6910b10a8b #if -> #ifdef for conditional compilation 2011-07-27 17:41:43 +02:00
Luboš Luňák
b8b044af4d avoid iterator retreating before the start of an empty list 2011-07-27 17:41:31 +02:00
Marc-Andre Laverdiere
e7e4552e63 Removed dead code 2011-07-22 14:54:34 +05:30
Miklos Vajna
2fa6086450 Revert "dmapper: spelling fix in DomainMapper_Impl::handleToc"
This reverts commit 2ffbb1dda9234690233f48b2bc521c97d1335237.
2011-07-01 17:20:01 +02:00
Miklos Vajna
65f918d8c9 Merge remote-tracking branch 'origin/master' 2011-06-26 00:39:17 +02:00
David Tardon
6e7add3703 rhbz#667082 do not crash importing section containing just an empty paragraph 2011-06-18 16:58:08 +02:00
Noel Power
cd1c434c4b another partial fix for bnc#693238 2011-06-17 16:00:19 +01:00
Miklos Vajna
0d1867d379 dmapper: rtf is not binary doc in DomainMapperTableManager 2011-06-16 17:42:34 +02:00
Julien Nabet
5cfb91df40 Some cppcheck cleaning 2011-06-12 23:01:56 +02:00
Miklos Vajna
52f51f5728 dmapper: fix NS_sprm::LN_CFDStrike with zero nIntValue 2011-06-08 19:47:31 +02:00
Miklos Vajna
ef82c0b9d8 dmapper: ListsManager::lcl_entry: rtf is not binary doc 2011-06-07 00:30:36 +02:00
Miklos Vajna
daba468cd0 dmapper: rtf is not a binary format 2011-06-03 15:43:16 +02:00
Miklos Vajna
56c1ad7536 dmapper: add IsRTFImport() method
it's not too elegant, but unavoidable at the moment, given the already
existing "if ooxml: ... else: assume binary doc" approach.
2011-06-03 15:22:05 +02:00
Luboš Luňák
a1df4f039f fix w:tblInd to work 2011-06-02 16:36:59 +02:00
Miklos Vajna
252f847fd5 dmapper: spelling fix in DomainMapper_Impl::handleToc 2011-06-02 12:10:41 +02:00
Miklos Vajna
18922bb10d dmapper: fix character pair kerning
PROP_CHAR_AUTO_KERNING is the default in Writer, ignoring the parameter
rendered this sprm a noop.
2011-06-02 11:57:20 +02:00
Miklos Vajna
ddbd00ddf2 dmapper: Fix underlying color, no need to convert anything
That case was not used so far and it was buggy, so I just went ahead and
fixed for RTF.
2011-06-01 16:25:12 +02:00
Jan Holesovsky
e959581b2d Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
	filter/source/graphicfilter/epict/epict.cxx
	filter/source/svg/svgexport.cxx
	filter/source/svg/svgfontexport.cxx
	filter/source/svg/svgwriter.cxx
	lotuswordpro/source/filter/lwpchartstreamtools.cxx
	lotuswordpro/source/filter/lwpfrib.cxx
	lotuswordpro/source/filter/lwpgrfobj.cxx
	lotuswordpro/source/filter/lwpidxmgr.cxx
	lotuswordpro/source/filter/lwpobjid.cxx
	lotuswordpro/source/filter/lwpparaproperty.cxx
	lotuswordpro/util/makefile.mk
	oox/prj/d.lst
	oox/source/drawingml/chart/chartdrawingfragment.cxx
	oox/source/drawingml/makefile.mk
	oox/source/drawingml/shape.cxx
	oox/source/ppt/slidepersist.cxx
	oox/source/token/namespaces.hxx.tail
	oox/source/xls/drawingfragment.cxx
	oox/source/xls/excelfilter.cxx
	oox/source/xls/makefile.mk
	oox/source/xls/workbookhelper.cxx
	writerfilter/source/ooxml/makefile.mk
	writerfilter/source/resourcemodel/makefile.mk
2011-05-27 20:45:30 +02:00
Noel Power
170b20ed0c Revert "fix for fod#37367 ( docx import of hyperlinks )"
This reverts commit ac80fce47404c0843c372336ab700d62297f1647.

contains stray debug commits
2011-05-19 17:25:12 +01:00
Noel Power
accf94cab8 fix for fod#37367 ( docx import of hyperlinks )
this fix is a companion fix for the change made below
http://cgit.freedesktop.org/libreoffice/filters/commit/?id=cdd636907675d538ca10d479afc538ce3800e729http://cgit.freedesktop.org/libreoffice/filters/commit/?id=cdd636907675d538ca10d479afc538ce3800e729
previously OOXMLHyperlinkHandler::~OOXMLHyperlinkHandler()'s call to resulted in the OOXMLFastContextHandlerStream::lcl_character method getting called which in turn called the OOXMLFastContextHandler::text method. This no longer happen so we call the text method directly now
2011-05-19 16:07:43 +01:00
Christian Lohmaier
632922d451 WaE - add explicit casting (decimal-types → integer types) 2011-05-16 22:44:28 +02:00
Luboš Luňák
fc21951901 start/end for tblBorders (17.4.13/37), rtl detection missing 2011-05-16 18:54:14 +02:00
Luboš Luňák
ff19ab5a45 implement start/end for TblCellMar (17.4.11/35), no rtl detection 2011-05-13 19:41:56 +02:00
Luboš Luňák
5b65f1bbc1 implement 17.4.12/17.4.34 (tcborders start/end), rtl detection missing 2011-05-13 19:41:40 +02:00
Luboš Luňák
8fa1a08747 read wp:positionOffset, wp:alignV and wp:alignH properly (bnc#513579)
A pretty hackish way (see the comment), but I haven't managed to find
out if there's a proper way to read it.
2011-05-04 14:35:28 +02:00
Noel Power
f433a86839 some docx field import/export tweaks
import/export ( USERNAME / USERINITIALS ) - supported now and alligned with binary import
import/export ( AUTHOR / DocumentProperty.Author ) - AUTHOR is now imported as DocumentInfo.Created, DocProperty.Author is imported as a custom property, DocumentInfo.Created is exported as AUTHOR
fix docx export of COMMENTS
fix docx import of CREATEDATE,
fix docx import of DocProperty.CreateTime
fix docx import of DocProperty.LastSavedTime
fix docx import of DocProperty.TotalEditingTime ( format still not right )
2011-04-20 13:02:39 +01:00
Kayo Hamid
1954366d17 prefer prefix ++/-- operators 2011-04-19 10:43:16 +01:00
David Tardon
cdd440e965 initialize the member 2011-04-18 12:11:59 +02:00
David Tardon
fd5a147a63 gbuildize writerfilter 2011-04-14 16:15:22 +02:00
Petr Mladek
ab8961db6f Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
Conflicts:
	oox/prj/d.lst
	unoxml/source/xpath/nodelist.cxx
	unoxml/source/xpath/nodelist.hxx
	unoxml/source/xpath/xpathobject.cxx
	writerfilter/source/dmapper/DomainMapper_Impl.cxx
	writerfilter/source/filter/ImportFilter.cxx
2011-04-05 18:54:48 +02:00
Cédric Bosdonnat
00dc32c0eb make writerfilter build again with debug=t: missing include 2011-03-29 18:14:43 +02:00
Cédric Bosdonnat
87c81ba999 Docx import filter now working with new borders and width 2011-03-19 17:56:50 +01:00
Jan Holesovsky
62abc84216 Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
	binfilter/bf_forms/source/component/forms_Filter.cxx
	binfilter/bf_sw/source/core/inc/node2lay.hxx
	binfilter/bf_sw/source/filter/xml/sw_swxml.cxx
	binfilter/inc/bf_sw/swdbtoolsclient.hxx
	filter/source/xsltdialog/xmlfileview.cxx
	oox/source/ole/axcontrol.cxx
	oox/source/vml/vmlformatting.cxx
	oox/source/xls/autofiltercontext.cxx
	oox/source/xls/externallinkfragment.cxx
	oox/source/xls/formulaparser.cxx
	oox/source/xls/pivotcachebuffer.cxx
	oox/source/xls/pivotcachefragment.cxx
	oox/source/xls/sheetdatacontext.cxx
	writerfilter/source/dmapper/GraphicImport.cxx
	writerfilter/source/dmapper/SettingsTable.cxx
	writerfilter/source/ooxml/model.xml
2011-03-18 15:38:26 +01:00
Thomas Arnhold
9a5c32ff8c Remove dates from comments 2011-03-14 21:39:05 +01:00