summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2016-01-12tdf#61511 RTF export: handle page background solid color fillMiklos Vajna
Change-Id: I562419b6d4fb791ef5b255effe9a4510d930bdbc
2016-01-12loplugin:unusedmethods unused return value in include/editengNoel Grandin
Change-Id: I1314480950b0d3a3e5ed066d71c175604dd41970 Reviewed-on: https://gerrit.libreoffice.org/21361 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2016-01-11tdf#66822 - refactor HTML export of image bullet listsusobhang70
removed garbage in svg-base64, added svg close tag, fixed ul tag. Added test case for the added code. Change-Id: I4f07036300031e1e97b118466ebf75d8b9c46e01 Reviewed-on: https://gerrit.libreoffice.org/21218 Tested-by: jan iversen <jani@documentfoundation.org> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-01-11loplugin:privatebase: Publicly derive from UNO interfacesStephan Bergmann
Somewhat arbitrarily prefer public over private derivation; the former is what is used by default across the code base. Change-Id: I936c1b0d3231ac97015863f396a5af49f6c9647b
2016-01-11loplugin:privatebase: Make derivation from noncopyable explicitly privateStephan Bergmann
Change-Id: Ia410950353aec0106ea82d025ed3ee89c79ca127
2016-01-10crashtesting: fix assert on re-export of ooo74510-1.odt to docxCaolán McNamara
Change-Id: Id66ab14772b002b140ba6bbfd098c19aeb1a537f
2016-01-10Fix typosAndrea Gelmini
Change-Id: I9a5940027423ff0791fa7da0b79b617412ce6b86 Reviewed-on: https://gerrit.libreoffice.org/21209 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-09crashtesting: ooo104626-3.odt assert on reexport to odtCaolán McNamara
try setting DefaultParentBaseURL based on the parent BaseURL for objects created this way Change-Id: I8cb1e9692cc4255c0a0b11b6df4bacee737ae184
2016-01-09OSL_ENSURE on p followed by deref -> assertCaolán McNamara
Change-Id: I4021053efbdaf1c04a9eb4c8fa52ef3da7b98b67
2016-01-09crashtesting: fdo85994-1.doc assert on reexport to docCaolán McNamara
try setting DefaultParentBaseURL based on the parent BaseURL for objects created this way Change-Id: I1a660ff6e4874321e0308d556c7ce0e10a2605fe
2016-01-08tdf#96480: ODF import: eliminate duplicate cross reference heading bookmarksMichael Stahl
7c3c3006deaaaf1bb3f2f4eeeaf11da3bcebe53c is apparently worse than it appeared at first glance since there are numerous assumptions about bookmarks, such as that if they were inserted successfully they may be copied successfully, which isn't the case for duplicate cross reference bookmarks. So fix this differently, by eliminating the duplicates and mapping all reference fields to refer to the surviving bookmark. It was not possible to do this in SwXBookmark by checking the makeMark() return as that would raise interesting problems such as it's currently guaranteed to have 1:1 SwXBoomarks to core Marks so we can't just connect 2 SwXBookmarks to the same core Mark, and we also can't leave the SwXBookmark unconnected after attach. Another alternative would be to temporarily allow inserting the duplicate bookmarks and then eliminate them after the import, but what is implemented now is to check from xmloff for duplicates, which is reasonably simple. Change-Id: I7ee4854d1c9d8bf74201089cbb7287b1bd8ee3b9
2016-01-08tdf#96961 sw Hide Whitespace: still show whitespace on the last pageMiklos Vajna
Mainly to match Word's hide whitespace behavior. Change-Id: Ica09bca5004adbfa14d1c9aca04079129f8a1a68
2016-01-08CppunitTest_sw_uiwriter: don't assert the size of the last pageMiklos Vajna
The size of the last page will change in a bit in Hide Whitespace mode, the intention of the test is to check the behavior of the normal (non-last) pages. Change-Id: I69b9072c59b6ca4dc5d93062c21726a0f5c03c05
2016-01-08Use public derivation, and remove then-unnecessary downcastsStephan Bergmann
...the implicitly-private derivation was presumably introduced by accident in 23fd991fda81668b3998b21b0131dda77965e405 "separate the sane from the less sane in SwClient" Change-Id: I30ec84b6a30c029cfbeb848ad37c9a532fec0a96
2016-01-08tdf#95463 Fixed floating navigator default size, now size is increasedkumar
Change-Id: I8a1112fa94295c99870d50cb7147582d5eaf9630 Reviewed-on: https://gerrit.libreoffice.org/21079 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
2016-01-08tdf#93640 Fix import of linked left page header/footerLuke Deller
In a docx section, any header/footer which is not defined in the section is considered to be linked to the previous section. In the Word UI this is shown as an option named "Link to Previous", and editing the header/footer in either section affects both sections. LO imports this by copying the header/footer contents from the previous section, but it did not handle the case where a section had different headers for left pages vs right pages. Fix this, which involved changing the mechanism used to detect whether a section has defined a certain header/footer (which unlinks it from the previous section): rather than trying to figure it out from the converted LO page styles, explicitly track which headers/footers have been defined using boolean member variables on the SectionPropertyMap instance. Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: Ic43a867356c2cd5df09d39f2a3ddefa584b6765c
2016-01-08tdf#96308 RTF import: fix tab stop inheritance inside table cellsMiklos Vajna
The tab stop list is a paragraph property, and RTF requires to repeat it after \s as direct formatting, otherwise the parser should be assumed that the tab stop list is cleared as a direct formatting. Non-buffered text handles that in getDefaultSPRM(), handle it directly in the RTF_PARD code for buffered text. Change-Id: I16b09bc4c177df5a74d16653b829b198aa1a800f
2016-01-08lool - page border shadow can be disabledMarco Cecchetti
Support for text documents and presentations. Added a command line option for gtktiledviewer: --hide-page-shadow. Reviewed on: https://gerrit.libreoffice.org/21210 Change-Id: I1e427693d7af40cb5731d1730ac5b7c486d45c29
2016-01-08Related: tdf#96308 RTF import: fix RTF_DEFTAB handlingMiklos Vajna
Change-Id: Ia2655bf5748ea62155613a222d0cb17b678196c5
2016-01-07svx: fix windows build, rename SvxEscapementItem::GetProp()Michael Stahl
90e07dd6f5d64a0d0041361c1592a6cd93ff2ac0 introduced a new unit test which calls SvxEscapementItem::GetProp(), and apparently the unit test also #includes windows.h somehow, so GetProp macro is defined to GetPropA and that fails to link since SvxEscapementItem doesn't have this member function. Thank you, C preprocessor, you barbarous relic. Change-Id: I6fd8e9d832ed5e1ce1a4fa7f1516c55d51a3283b
2016-01-07Related: tdf#96943 sw Hide Whitespace: add HandleWhitespaceHiddenDiff()Miklos Vajna
To have the "we want the difference vs the nominal size, not the actual size" code at a single place. Change-Id: I9b4b9a33d5d2da825c5da93e69790277eba8d0b3
2016-01-07tdf#96943 sw Hide Whitespace: don't create pages for widow / orphan ...Miklos Vajna
... paragraphs that would otherwise fit nominal size of the page frame Change-Id: I90c3de9150b17c951e1ac4158babb7a71afee9ee
2016-01-07BASIC : use std::vector instead of SbArray for Modules.Arnaud Versini
Change-Id: I9594efb13b3dccc637ccd61eea4b42255c2a775c Reviewed-on: https://gerrit.libreoffice.org/20817 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-01-07tdf#95213 DOCX import: don't reuse list label stylesMiklos Vajna
We used to optimize the creation of these styles, so in case two list label had the same character properties, then we could avoid creating two styles for those. This isn't correct though: it means if the style is changed later by the user, then unexpected other places in the document will change as well. Do what the binary DOC filter does: create one character style for each level of a numbering separately. Change-Id: I967b30fc078b1be30f7ef81b2706df2962fc3fb0 Reviewed-on: https://gerrit.libreoffice.org/21191 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-01-06sw: remove include of sw/source/inc/uibase/dbui.hxx from dbmgr.hxxMichael Stahl
Quite unnecessary, just remove the implementation details from the header. Change-Id: I5712ff32756bb1d31ff7701424b85a323438cced
2016-01-06WIP: Fix build with --disable-atl on WindowsTakeshi Abe
This avoids finding emboleobj's component in such case. Change-Id: Ie1bdef629a55b4ddb6be2538939867c182c184b3 Reviewed-on: https://gerrit.libreoffice.org/21075 Reviewed-by: Matúš Kukan <matus@libreoffice.org> Tested-by: Matúš Kukan <matus@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-01-06tdf#92045 DOCX import: <w:effect w:val="none"/> doesn't mean blinkingMiklos Vajna
Regression from commit eeb8297e47bae11f2aeaa7bae6e51eee921e9e58 (Use constants for ST_TextEffect values, 2014-09-22), the problem was that while the tokenizer stopped using hardcoded token values, the matching dmapper code wasn't adapted. Change-Id: Id61912e9c9458efc87e0a6f8e461663942c555f0
2016-01-06disable test on OSXMarkus Mohrhard
The table seems to be on page 4 on OSX and not page 5. This makes the xpath expression fail. Change-Id: Ife16b25923041c66b2d9f352dbd3cfb6893f4ef5 Reviewed-on: https://gerrit.libreoffice.org/21139 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-01-05tdf#93565 Use multiple docs for individual PDF MMJan-Marek Glogowski
There is actually a comment in the mail merge code: // convert fields to text if we are exporting to PDF // this prevents a second merge while updating the fields // in SwXTextDocument::getRendererCount() This was included to fix i#93714. But the reference to 2005-05-23 #122919# in the actual code doesn't help to understand, why the original code is needed. I would like to get rid of it, but currently don't have time for tests. So the optimization to skip ConvertFieldsToText() and use a single working document for individual document mail merge breaks for PDF, as the working document won't contain any fields after the first document is written. This uses multiple working documents for PDF export again. Change-Id: I0cf1c64da27863fc5fb4bb6c7812fed90b737d13
2016-01-05tdf#90187 Added uno command for track changes bar.Gulsah Kose
v2: Solved dimmed button problem and changed controller class for listen trackchangesbar button. Change-Id: I5a921ad9bb6c8e53d3043e86492d0923a998f3d2 Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/21064 Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
2016-01-05Make SotFactory private to sot/ and clean a bitMatúš Kukan
Change-Id: Ia683280a3e95eee995e036db6bde5d28852f92ff
2016-01-05sw: revert use of invalid (erased) iteratorMichael Stahl
(regression from commit d75b9fd582f0aa83bd2fc99028b3f83eb7171d61) Change-Id: I6e67ebfbac20b42c0ff8580b575793daec46b68d
2016-01-05tdf#94205: Use o3tl::make_unique insted of new+std::move.Sheikha AL-Hinai
Change-Id: I9ff14760479d2ac882546e2e5b74ab750ba2fa4b Reviewed-on: https://gerrit.libreoffice.org/20984 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2016-01-05CppunitTest_sw_uiwriter: tolerate lower than 276 in testTdf96536()Miklos Vajna
Seen on an OS X tinderbox from time to time, but not always. Change-Id: Ie6796de5095a6d3b583fa8494444f4d662db8b12
2016-01-05new loplugin rangedforcopy - use reference in range based forAndrzej Hunt
Inspired by 6e6ae9803796b120e95f6e89575e03c5fd0ed3c2 Change-Id: Ia0f264d3a6bbf076aa5080e3398683e50bc6ef01 Reviewed-on: https://gerrit.libreoffice.org/20190 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-01-05tdf#96674 drawingML import: fix handling of zero width/height linesMiklos Vajna
Change-Id: If3d9f6272031e08ab228cfa58963d60ceede2498
2016-01-05tdf#69640: Treat errors opening OLE stream gracefullyMike Kaganski
The testcase for tdf#69640 includes links (relations) to external pptx files. It demonstrates two non-fatal reasons for failure opening OLE stream: 1. it fails OStorageHelper::IsValidZipEntryFileName check, because the file path contains ":\"; 2. even if that were not the case, the required file can be absent from user's system. I suppose that intercepting the failure at the level of OOXMLOLEHandler::attribute() is the best option, because at the lower level it's unknown if this failure is fatal or not. I suppose that it could be also useful to intercept specifically failures in OStorageHelper::IsValidZipEntryFileName, checking if the file exist externally, and asking users if they want to update external links (as MSO does). Possibly it should be discussed with UX team if that should be done, and if so, do it in separate commit. Change-Id: I240a6f69abe236eb790bb406c79f3b761fb4638a Reviewed-on: https://gerrit.libreoffice.org/19963 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2016-01-04DOC(X) filter: BAF -> BAILS in the smart tag mappingMiklos Vajna
The filters map between a common subset of Word smart tags and Writer RDF annotations, and when doing so, they need to know what path to use for a smart tag namespace and also the other way around: what RDF types are interesting for smart tag purposes. It turns out there is BAILS specification at <http://www.tscp.org/wp-content/uploads/2013/08/TSCP_BAILSv1.pdf> that describes how to refer to BAF objects, so use that instead of our custom RDF statement / document metadata key names. Change-Id: Iac569608b05aa61547f664f2a5df7d46fe46da76
2016-01-04these fields can be static constantsNoel Grandin
Change-Id: Id56e219782d7f858cdeb26232c7aabd4f643c9d9 Reviewed-on: https://gerrit.libreoffice.org/21020 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2016-01-04sw: prefix members of SwAttrSetChgMiklos Vajna
Change-Id: Ie24194fe04dafbc447cf8a8a015316e9ba6e9ac9 Reviewed-on: https://gerrit.libreoffice.org/21071 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-01-03cppcheck: passedByValueCaolán McNamara
Change-Id: Id8b2db3b824ea40345aba99a5f24f2579c0ad630
2016-01-03loplugin:stringconstantStephan Bergmann
Change-Id: I588a9c0205e03f701b617fd1775e7f9b9b88c6b0
2016-01-04Cleanup after removing vcl::FontInfo classChris Sherlock
Change-Id: I544eac439cb7277e47a23a90c6fbc45496161c3b
2016-01-03loplugin:stringconstantStephan Bergmann
Change-Id: I60ee2ccc6090c305ade4ba16d3d298866cf89c4e
2016-01-03vcl: Excise vcl::FontInfo classChris Sherlock
This may sound crazy, but literally vcl::FontInfo serves no purpose that I can see. The inheritance chain is like this: ┌────────────────────────┐ │ │ │ vcl::Font │ │ │ └────────────────────────┘ ^ ╱ ╲ │ │ ┌────────────────────────┐ │ │ │ vcl::FontInfo │ │ │ └────────────────────────┘ ^ ╱ ╲ │ │ ┌────────────────────────┐ │ │ │ FontMetric │ │ │ └────────────────────────┘ vcl::FontInfo (which, incidentally, needs to be put into the vcl namespace due to collisions with poppler!) literally does nothing and is acting as a bridge between FontMetric and vcl::Font. Unlike a bridge though, this bridge doesn't actually *do* anything. So I'm removing it, which means one less class to deal with in the vcl fonts world. Change-Id: I32725669c9bca7fbb0846b6a062135464046e4f6 Reviewed-on: https://gerrit.libreoffice.org/21058 Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com> Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
2016-01-02tdf#92623 MM: add unit testJan-Marek Glogowski
Adds the missing unit test to the bugfix. Actually the original bug was a crash, so this just does some test on the resulting MM document. Change-Id: I4c9f031e57157fe5744aa8290b7503b7e1990fc7
2016-01-02tdf#96479 workaround bookmark end pos handling...Jan-Marek Glogowski
... when inserting text into a text node. Seems SwTextNode::InsertText doesn't handle bookmark end positions correctly. This is just handled correctly, if it also contains the bookmark start. This workaround simply concats the three strings to be inserted in advance, so we just have to call SwTextNode::InsertText once for the whole string. Change-Id: Iab7708b4cc4df406bdbc3a685c7410e0e797fdc4
2016-01-02fix indentBjoern Michaelsen
Change-Id: I79623024b008b60a33935942986e8a98fccc3d8d
2016-01-02make this temp override of ItemSet more explicit and scopedBjoern Michaelsen
Change-Id: I8a02be2772b8f7c0d1b13556d0c49f1b00bcc1aa
2016-01-02trying to chip away some of the memory mgmt madness hereBjoern Michaelsen
- mpItemSet is assumed to be owned by SwStyleBase_Impl - yet it can be external set to any naked pointer - ... and is (temporary, at least that is the hope) set to ItemSets owned by others Change-Id: I0cd56f5bb9f58a2e5ab09f49f66faf8a63c69f37