Commit graph

2072 commits

Author SHA1 Message Date
Miklos Vajna
473dea9279 parse all properties before resolving pib 2011-07-29 17:32:35 +02:00
Miklos Vajna
fef435dbbd no need to delay the resolution of shape properties 2011-07-29 17:32:34 +02:00
Miklos Vajna
0a34e36558 resolvePict should know nothing about special rtf chars 2011-07-29 17:32:34 +02:00
Miklos Vajna
14814a9bb5 send initial paragraph before trying to close it 2011-07-29 17:32:34 +02:00
Miklos Vajna
821fade8f9 implement RTF_ANNOTATION 2011-07-29 17:32:34 +02:00
Luboš Luňák
a1f516893b remove duplicate definitions for w:sdt and w:sdtContent (bnc#705949)
The duplicates are merged somehow (and thus it doesn't work).
2011-07-27 17:42:08 +02:00
Luboš Luňák
48b12f56b0 proper #ifdef for dumpXml() 2011-07-27 17:42:01 +02:00
Luboš Luňák
ee81d8d813 export needed symbols from a lib 2011-07-27 17:41:53 +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
Thomas Arnhold
ee0bbef103 callcatcher: remove unused methods 2011-07-26 23:38:20 +02:00
Norbert Thiebaud
f0119ed6a8 typo doctoc for doctok whichprevented the proper inclusion of libxml2 2011-07-24 19:29:08 -05:00
Bjoern Michaelsen
7fde1f54e9 Merge branch 'master' into feature/gnumake4 2011-07-24 19:22:59 +02:00
Bjoern Michaelsen
2d02fa31d1 remove superfluous include paths 2011-07-23 15:53:00 +02:00
Bjoern Michaelsen
969003ef69 use gb_Library_use_external in writerfilter 2011-07-23 14:11:23 +02:00
Bjoern Michaelsen
4608deb5d9 merge junittests from feature/gnumake4_writerfilter_head (e0ac3ddd8a3602490854829107908abefc3eaf2f) 2011-07-23 13:58:45 +02:00
Bjoern Michaelsen
2c7baf6f2c merge cppunittest from feature/gnumake4_writerfilter_head (e0ac3ddd8a3602490854829107908abefc3eaf2f) 2011-07-23 13:55:28 +02:00
Michael Stahl
0efb060f68 add unittests from gnumake4 2011-07-23 13:36:46 +02:00
Bjoern Michaelsen
a531694236 switch to CostumTarget-based code generation from gnumake4 2011-07-23 13:29:59 +02:00
Michael Stahl
17a7059012 reintroduce CustomTarget from gnumake4
Authors: Michael Stahl <mst@openoffice.org>, Henning Brinkmann <hbrinkm@openoffice.org>
2011-07-23 11:03:35 +02:00
Bjoern Michaelsen
88efc04329 revert to old writerfilter gbuilization
* gnumake4's writerfilter gbuildization got pushed in a seperate branch
 * it might or might not be merged to master later
2011-07-23 03:12:47 +02:00
Bjoern Michaelsen
e0b4860fb1 postmerge fixes for gnumake4 2011-07-22 21:22:43 +02:00
Marc-Andre Laverdiere
e7e4552e63 Removed dead code 2011-07-22 14:54:34 +05:30
Bjoern Michaelsen
112be98c92 resyncing to master 2011-07-21 18:38:50 +02:00
Marc-Andre Laverdiere
dc3578dc76 Removed dead code listed in unusedcode.easy 2011-07-21 15:56:03 +05:30
Matúš Kukan
a9137707c4 Remove component_getImplementationEnvironment 2011-07-12 17:58:59 +02:00
Miklos Vajna
d2f3e45d5c rtftok: '>>' should be '> >' within a nested template argument list 2011-07-02 13:54:42 +02:00
Miklos Vajna
990f7bcd3d get rid of m_pCurrentKeyword 2011-07-01 18:22:54 +02:00
Miklos Vajna
39756b2a78 implement RTF_LBRACE and RTF_RBRACE 2011-07-01 18:11:25 +02:00
Miklos Vajna
3ee782f1a0 use the destination buffer for levelnumbers 2011-07-01 18:04:07 +02:00
Miklos Vajna
5ae58540fe accents in bookmarks 2011-07-01 17:54:38 +02:00
Miklos Vajna
bc7bad9a8c accents in shape properties 2011-07-01 17:39:44 +02:00
Miklos Vajna
a357b70e85 unify strip of table entries 2011-07-01 17:28:09 +02:00
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
1e126219f2 accents in style names 2011-07-01 17:15:13 +02:00
Miklos Vajna
62e2e3f491 accents in font names 2011-07-01 17:10:40 +02:00
Miklos Vajna
289267a43a handle accents in revision entries 2011-07-01 17:02:08 +02:00
Miklos Vajna
4f17810e9b resolveChars: make calling text() the default
Ideally we should always call that, since that handles unicode
characters.
2011-07-01 16:56:23 +02:00
Miklos Vajna
de429ef373 add license headers 2011-07-01 16:39:26 +02:00
Miklos Vajna
77a23c681b implement RTF_REVAUTH, RTF_REVDTTM and RTF_DELETED 2011-07-01 15:48:48 +02:00
Miklos Vajna
47e1270aa4 implement RTF_REVDTTMDEL 2011-07-01 15:44:14 +02:00
Miklos Vajna
b5109a0b1a implement RTF_DELETED 2011-07-01 15:18:19 +02:00
Miklos Vajna
61d4b05622 parse revtbl 2011-07-01 14:52:22 +02:00
Miklos Vajna
0fe9aeb4ac No need to cache field instructions
dmapper can receive them incrementally without problems.
2011-07-01 13:13:27 +02:00
Miklos Vajna
6d383611ec RTF_LINEX: ignore zero parameter
It appears where line numbering is not enabled.
2011-07-01 12:54:48 +02:00
Miklos Vajna
abfed1ce77 handle groups inside fldrslt 2011-07-01 12:47:18 +02:00
Miklos Vajna
05c74d41f1 ignore RTF_LISTTEMPLATEID for now 2011-07-01 12:09:50 +02:00
Miklos Vajna
052a353d06 leveltext can be an empty string 2011-07-01 11:19:08 +02:00
Miklos Vajna
4536f47a4c make sure we are in a paragraph when handling bookmark starts 2011-06-30 16:52:33 +02:00
Miklos Vajna
30b95cafd4 asHex: method -> local 2011-06-30 13:10:52 +02:00
Miklos Vajna
7b642490e9 NS_rtf::LN_BOOKMARKNAME should be before NS_rtf::LN_IBKL 2011-06-30 13:00:33 +02:00
Miklos Vajna
b35152b6cb RTFReferenceProperties: make second ctor argument optional
Like we have with RTFValue already.
2011-06-30 12:49:37 +02:00
Miklos Vajna
478d0aee72 implement bookmarks 2011-06-30 12:43:33 +02:00
Miklos Vajna
7befe15b02 implement RTF_LINEPPAGE and RTF_LINESTARTS 2011-06-30 10:36:22 +02:00
Miklos Vajna
4c1cba2845 implement line numbering 2011-06-30 10:29:38 +02:00
Miklos Vajna
8adfe7f13c add support for endnotes 2011-06-29 17:38:12 +02:00
Miklos Vajna
fbdc984899 RTF_FOOTNOTE: support custom marks 2011-06-29 17:01:21 +02:00
Miklos Vajna
d68c6b5414 implement RTF_FOOTNOTE 2011-06-29 10:22:35 +02:00
Miklos Vajna
ba082513c9 implement RTF_SUPER / RTF_SUB 2011-06-29 10:00:38 +02:00
Miklos Vajna
77354635bf colums can use the border accessor as well 2011-06-28 00:13:17 +02:00
Miklos Vajna
e1c8813213 introduce lcl_getBordersAttributes to avoid code duplication 2011-06-28 00:08:00 +02:00
Miklos Vajna
486e5c0c81 implement section borders 2011-06-28 00:04:07 +02:00
Miklos Vajna
c2026fa9a8 introduce RTFBorderState 2011-06-27 23:40:14 +02:00
Miklos Vajna
2cad2a5fa0 implement RTF_DEFTAB 2011-06-27 23:20:49 +02:00
Miklos Vajna
1de245a2cb implement RTF_TITLEPG 2011-06-27 22:13:23 +02:00
Miklos Vajna
85289e8a63 RTF_PGNDEC stub 2011-06-27 22:07:53 +02:00
Miklos Vajna
30805d7e0b implement other header / footer keywords 2011-06-27 21:21:15 +02:00
Miklos Vajna
e8bb4a301e mark local functions as static 2011-06-27 18:35:29 +02:00
Miklos Vajna
b41267fb0a multiple tabs per paragraph: clean up and fix 2011-06-27 18:31:15 +02:00
Miklos Vajna
3777088037 Handle empty fldrslt groups
We used to end the field in a text group, but this won't work for empty
contents.
2011-06-27 18:00:14 +02:00
Miklos Vajna
d16338cdaf substreams can live without section properties 2011-06-27 17:28:14 +02:00
Miklos Vajna
a59b6aba72 output headers/footers at the end of the section 2011-06-27 17:21:28 +02:00
Miklos Vajna
826203a2de explicitly end last section 2011-06-27 17:17:26 +02:00
Miklos Vajna
5d8fc66e8d introduce lcl_TableBreak 2011-06-27 17:06:52 +02:00
Miklos Vajna
371cc95968 convert section break to a method 2011-06-27 17:04:32 +02:00
Miklos Vajna
a9c29d5211 these are attributes 2011-06-27 15:25:22 +02:00
Miklos Vajna
59c0c19ea5 add RTFSprm::erase 2011-06-27 14:04:41 +02:00
Miklos Vajna
27c5340ae1 send section properties to the substream 2011-06-27 12:47:27 +02:00
Miklos Vajna
200cb887aa RTFDocumentImpl::resolveSubstream to avoid code duplication 2011-06-27 11:58:11 +02:00
Miklos Vajna
70c20482f0 avoid duplicated margin attributes 2011-06-27 11:38:11 +02:00
Miklos Vajna
8c1951cf6b lcl_putNested*: support overwrite 2011-06-27 11:32:36 +02:00
Miklos Vajna
0e856ae2c5 these are attributes 2011-06-27 11:25:12 +02:00
Miklos Vajna
27f477c834 implement RTF_HEADERY and RTF_FOOTERY 2011-06-27 11:20:33 +02:00
Miklos Vajna
8268ca0b75 Enable rtftok on experimental mode only 2011-06-27 11:06:04 +02:00
Miklos Vajna
65f918d8c9 Merge remote-tracking branch 'origin/master' 2011-06-26 00:39:17 +02:00
Miklos Vajna
c9c7859798 implement RTF_FOOTER 2011-06-24 13:01:55 +02:00
Miklos Vajna
193c84c49f Call dmapper's substream() method
With this, a simple header is imported properly.
2011-06-24 12:51:50 +02:00
Miklos Vajna
1cf3877e0b substream: parse the current group only 2011-06-24 12:39:23 +02:00
Miklos Vajna
e029b7445d skip the header in the main parser 2011-06-24 12:39:12 +02:00
Miklos Vajna
29041d47d2 initial header substream support 2011-06-24 12:35:02 +02:00
Miklos Vajna
583cae3868 store if this is a substream 2011-06-24 11:43:11 +02:00
Miklos Vajna
704ff47030 store xFrame, needed for substreams 2011-06-24 11:38:30 +02:00
Miklos Vajna
332f0332b9 revert header changes, it's a substream 2011-06-24 11:32:01 +02:00
Miklos Vajna
9f2d7cefbe allow parBreak() to call itself 2011-06-24 11:15:44 +02:00
Miklos Vajna
56958bdc61 paragraph break is now a method, so it can read buffers 2011-06-24 11:03:28 +02:00
Miklos Vajna
076eb49d4c introduce lcl_TableBreak for more readable code 2011-06-24 10:58:16 +02:00
Miklos Vajna
930fd02cbd Fix header buffer writing
- reset table buffers at the end of the row
- set the destination state of inner header groups to normal
2011-06-24 10:41:45 +02:00
Miklos Vajna
fa44765290 don't write to m_aTableBuffer, but to m_pActiveBuffer 2011-06-24 10:24:10 +02:00
Miklos Vajna
36564528c4 enter RTF_HEADER 2011-06-24 09:48:51 +02:00
Miklos Vajna
269e128740 m_aBuffer -> m_aTableBuffer
We'll likely need multiple buffers (for headers, etc.)
2011-06-23 16:45:32 +02:00
Miklos Vajna
7b8f997cc7 implement section and row text direction 2011-06-23 12:49:06 +02:00
Miklos Vajna
95e1b67ea8 implement RTF_ASPALPHA 2011-06-23 12:33:50 +02:00
Miklos Vajna
504ee5c6c3 implement RTF_LOCH, RTF_HICH and RTF_DBCH 2011-06-23 12:18:29 +02:00
Miklos Vajna
b29622fba5 implement page margins 2011-06-23 11:36:40 +02:00
Miklos Vajna
70d8d50e1d implement RTF_PGHSXN and RTF_PGWSXN 2011-06-23 11:23:53 +02:00
Miklos Vajna
44cbdc68f9 RTFDocumentImpl::dispatchValue: introduce pIntValue 2011-06-23 11:20:18 +02:00
Miklos Vajna
5e21f16b2d implement RTF_PAPERH and RTF_PAPERW 2011-06-23 10:54:06 +02:00
Miklos Vajna
b8d60986fe use SAL_N_ELEMENTS 2011-06-23 00:22:57 +02:00
Miklos Vajna
d71f6330fc implement a bunch of trivial symbols 2011-06-23 00:03:45 +02:00
Miklos Vajna
892d33c8d5 close last section at the document end if necessary 2011-06-22 22:57:31 +02:00
Miklos Vajna
b601cffbc6 implement simple page break 2011-06-22 21:58:01 +02:00
Miklos Vajna
8141daf8ae a column can have only two properties, handle together 2011-06-22 21:51:32 +02:00
Miklos Vajna
93f01242ba implement RTF_COLSR 2011-06-22 21:25:47 +02:00
Miklos Vajna
4ff26f5289 non-balanced columns 2011-06-22 21:17:57 +02:00
Miklos Vajna
fe553af4f7 implement RTF_COLSX 2011-06-22 20:48:26 +02:00
Miklos Vajna
a92a870720 implement column break 2011-06-22 19:03:32 +02:00
Miklos Vajna
c4f66a6891 Don't send section properties early
We don't need the trick of paragraph properties here.
2011-06-22 18:58:29 +02:00
Miklos Vajna
53cf30bde8 implement RTF_COLS 2011-06-22 18:49:08 +02:00
Miklos Vajna
98d0937a16 Section properties are a paragraph sprm 2011-06-22 18:44:29 +02:00
Miklos Vajna
5e95fe795a implement RTF_SECTUNLOCKED (dmapper ignores it, though) 2011-06-22 18:15:42 +02:00
Miklos Vajna
57932727d0 implement section breaks 2011-06-22 18:07:10 +02:00
Miklos Vajna
3430986b5c implement RTF_SECT and RTF_SECTD 2011-06-22 17:54:21 +02:00
Miklos Vajna
ffddfa7c55 these are never read 2011-06-22 17:27:20 +02:00
Miklos Vajna
b99c3e551c remove never written nTableCellPops 2011-06-22 15:48:08 +02:00
Miklos Vajna
f2b3903f95 BUFFER_NESTCELLEND is not necessary 2011-06-22 15:46:49 +02:00
Miklos Vajna
2037021fb8 buffer RTF_PAR in tables 2011-06-22 15:34:29 +02:00
Miklos Vajna
b4b86b7fcc Buffer non-nested table cells as well
This is required as Word writes table properties at the end of a row.
2011-06-22 14:52:07 +02:00
Miklos Vajna
37da7aa99a RTF_CELL should alter the cell definition list outside its current group 2011-06-22 13:12:28 +02:00
Miklos Vajna
61f9a54b21 reset cell definition list on trowd 2011-06-22 13:12:00 +02:00
Miklos Vajna
ec22bf47b1 send table width to dmapper 2011-06-22 11:29:13 +02:00
Miklos Vajna
10493b75a3 RTFDocumentImpl: no longer necessary debug message 2011-06-22 11:17:52 +02:00
Miklos Vajna
639732f50e introduce lcl_Break 2011-06-21 00:15:15 +02:00
Miklos Vajna
18df7b6b5a avoid unnecessary OUString 2011-06-21 00:10:22 +02:00
Miklos Vajna
2b0526cf4f buffering row ends is not necessary 2011-06-20 22:05:56 +02:00
Miklos Vajna
53561d51c7 Nested tables: buffer cell contents till cell definitions
This is necessary as nested cells' RTF_CELLX definition hits the parser
later, than the actual \nestcell cell contents.
2011-06-20 22:02:56 +02:00
Bjoern Michaelsen
ff2f7926a5 gnumake4: switching gbuildization
* mostly switching to gnumake4/writerfilter10 gbuild implementation (thanks mst, hb)
2011-06-20 20:38:45 +02:00
Miklos Vajna
944c242048 Initial nested table support
Implement RTF_NESTTABLEPROPS, RTF_NONESTTABLES, RTF_NESTCELL,
RTF_NESTROW and RTF_ITAP.
2011-06-20 16:53:00 +02:00
Miklos Vajna
7d954792ff cell borders are sprms 2011-06-20 13:54:30 +02:00
Miklos Vajna
ac6f0ff1f8 implement RTF_TRRH 2011-06-20 13:46:01 +02:00
Miklos Vajna
9443bff00d implement RTF_TRKEEP 2011-06-20 13:17:59 +02:00
Miklos Vajna
951b737566 Reset cell properties on RTF_CELLX
This fixes import of tables when the first cell has no properties
2011-06-20 12:51:07 +02:00
Miklos Vajna
2ce5dbe263 RTF_CELLX: fix assignment of previous cell abs width 2011-06-20 11:18:26 +02:00
Bjoern Michaelsen
6f7b36ecd8 remove merge trash 2011-06-20 09:54:52 +02:00
Bjoern Michaelsen
ae2ebf8fac Merge branch 'master' into feature/gnumake4
Conflicts:
	filter/source/config/cache/filtercache.cxx
	filter/source/odfflatxml/makefile.mk
	oox/Library_oox.mk
	oox/Makefile
	oox/Module_oox.mk
	oox/Package_generated.mk
	oox/Package_inc.mk
	oox/prj/build.lst
	oox/prj/d.lst
	oox/prj/makefile.mk
	oox/source/dump/makefile.mk
	unoxml/Library_unordf.mk
	unoxml/Library_unoxml.mk
	writerfilter/CppunitTest_writerfilter_doctok.mk
	writerfilter/Library_writerfilter.mk
	writerfilter/Module_writerfilter.mk
	writerfilter/Package_inc.mk
	writerfilter/inc/resourcemodel/TagLogger.hxx
	writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
	writerfilter/prj/build.lst
	writerfilter/prj/makefile.mk
	writerfilter/qa/complex/ooxml/makefile.mk
	writerfilter/qa/cppunittests/doctok/makefile.mk
	writerfilter/qa/cppunittests/doctok/testdoctok.cxx
	writerfilter/qa/cppunittests/xxml/testXXML.cxx
	writerfilter/source/dmapper/DomainMapper.cxx
	writerfilter/source/dmapper/DomainMapperTableHandler.cxx
	writerfilter/source/dmapper/DomainMapperTableManager.cxx
	writerfilter/source/dmapper/DomainMapper_Impl.cxx
	writerfilter/source/dmapper/FontTable.cxx
	writerfilter/source/dmapper/GraphicHelpers.cxx
	writerfilter/source/dmapper/PropertyIds.cxx
	writerfilter/source/dmapper/PropertyMap.cxx
	writerfilter/source/dmapper/SettingsTable.cxx
	writerfilter/source/dmapper/StyleSheetTable.cxx
	writerfilter/source/dmapper/TablePropertiesHandler.cxx
	writerfilter/source/dmapper/TblStylePrHandler.cxx
	writerfilter/source/dmapper/ThemeTable.cxx
	writerfilter/source/doctok/WW8DocumentImpl.cxx
	writerfilter/source/doctok/resourcesimpl.xsl
	writerfilter/source/filter/WriterFilter.cxx
	writerfilter/source/generated.mk
	writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
	writerfilter/source/ooxml/OOXMLFactory.cxx
	writerfilter/source/ooxml/OOXMLFactory.hxx
	writerfilter/source/ooxml/OOXMLStreamImpl.cxx
	writerfilter/source/ooxml/RefAndPointer.hxx
	writerfilter/source/resourcemodel/TagLogger.cxx
	writerfilter/unocomponent/component.cxx
	writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
	writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
2011-06-19 20:09:46 +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
Bjoern Michaelsen
6e135ba19a fixing rebase errors 2011-06-18 14:12:16 +02:00
David Tardon
c25e9282ad remove all traces of offuh from makefiles 2011-06-18 11:26:56 +02:00
Miklos Vajna
217b9e6f40 implement RTF_CLVERTAL* 2011-06-17 23:38:15 +02:00
Miklos Vajna
5710898ee7 introduce lcl_putNestedAttribute 2011-06-17 22:12:56 +02:00
Miklos Vajna
4df4955319 implement RTF_CLCBPAT 2011-06-17 21:51:03 +02:00