summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2017-11-07tdf#113550 RTF import: fix incorrect text indentMiklos Vajna
Left indent was set to non-zero in the style, but direct formatting set it back to zero. Teach deduplication to remove the NS_ooxml::LN_CT_PPrBase_ind SPRM itself in case the last attribute was removed. Change-Id: I01b202f0241b02816b2b392326737b1150caffc2 Reviewed-on: https://gerrit.libreoffice.org/44385 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-11-07tdf#112435 Scroll to navigated positionJim Raykowski
Force scroll to position of navigation when navigating to inactive document using Navigator. Change-Id: I8671973f5fdb5f4158a7795bf0b3381db867d57a Reviewed-on: https://gerrit.libreoffice.org/44330 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2017-11-07loplugin:constparams in swNoel Grandin
Change-Id: Ie7aac013db4116aa9bd2caa4fc6b4bfad5cea733 Reviewed-on: https://gerrit.libreoffice.org/44356 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-11-07Replace some lists by vectors (sw)Julien Nabet
Change-Id: I9fef822040403fc61d00240c07b63e9394cf069f Reviewed-on: https://gerrit.libreoffice.org/44379 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2017-11-07tdf#113619 prevent cores when there is no cursorAshod Nakashian
Change-Id: I508041b6dca4c4ed5be20d9ff8aa2ae72746e0d7 Reviewed-on: https://gerrit.libreoffice.org/44259 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2017-11-07TSCP: Restore paragraph signature when importing DOC(X)Ashod Nakashian
And wrap getStatements in try/catch, as it can throw in some cases with nasty consequences. Change-Id: I19b0d41188e8835ca4308bcef2f05907e98faf3d Reviewed-on: https://gerrit.libreoffice.org/44258 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2017-11-06sw: read both platform dependent binary table autoformatsMichael Stahl
The WriterSpecificAutoFormatBlock class actually writes a length into the file that covers the offending SwFormatVertOrient item. Put in a gross hack to read either 32-bit or 64-bit in SwFormatVertOrient::Store depending on that length. The length also covers another item, so we'll just hope nobody ever changes this stuff ever again! Change-Id: Idf2f05cc00c098571508adb849f60940966c3328 Reviewed-on: https://gerrit.libreoffice.org/44254 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-11-06Fix typosAndrea Gelmini
Change-Id: Id1cce482a05be3089093ad75d6a30da12084e338 Reviewed-on: https://gerrit.libreoffice.org/44288 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2017-11-06TSCP: Refactor and simplify paragraph signature helpersAshod Nakashian
Change-Id: I286c685aad38b850c3b988b7f9ba418092746d66 Reviewed-on: https://gerrit.libreoffice.org/44257 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2017-11-06TSCP: need to enumerate the marker and IPPart properties tooTomaž Vajngerl
Change-Id: Ibc8643667c3ae352107a93dcce2be02b1a9af06f Reviewed-on: https://gerrit.libreoffice.org/44344 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2017-11-06sw: prefix members of SwScannerMiklos Vajna
Change-Id: I441876e73793e07d78f1eadb2b21c282845298c3 Reviewed-on: https://gerrit.libreoffice.org/44345 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-11-06tdf#102466 Added unit test: ensure 1st page is not missingSerge Krot
Change-Id: Icbc97d6a69447575aa2980a700a663ece226f781 Reviewed-on: https://gerrit.libreoffice.org/44273 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Serge Krot (CIB) <Serge.Krot@cib.de>
2017-11-06tdf#58186 Update Navigator after promote/demote undoJim Raykowski
Change-Id: I736d9d2ed863e0978a9abfecdca7dbf7a30f5d81 Reviewed-on: https://gerrit.libreoffice.org/43407 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2017-11-06TSCP: put more duplicated methods to commonTomaž Vajngerl
Change-Id: Ic49e0dad1351684db3372214604d12b48d0be907 Reviewed-on: https://gerrit.libreoffice.org/44337 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2017-11-06RTF export: fix whitespaceMiklos Vajna
Change-Id: I47c3f2bf08622b386b6e782d60f6ae7765db814a
2017-11-06TSCP: Store paragraph signature RDF in the paragraphAshod Nakashian
Change-Id: Ic44e3238bd1c35445bc23d0cc1de07aa2bf4512c Reviewed-on: https://gerrit.libreoffice.org/44243 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2017-11-06tdf#107939 Fix case-insensitive filter in Field DialogVitaliy Anderson
Change-Id: I38e695b43ffa7b213e60993aed3ac1838548b33d Reviewed-on: https://gerrit.libreoffice.org/44307 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-11-05tdf#113037 create Watermark with correct ratioSzymon Kłos
Change-Id: I17ab8d98a618cff6e38dad344f4096dc520cce43 Reviewed-on: https://gerrit.libreoffice.org/44228 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2017-11-05ofz#4068 Integer-overflowCaolán McNamara
Change-Id: Id61f4f82b66e7efa4d3ef062d2756acddcee43b8 Reviewed-on: https://gerrit.libreoffice.org/44327 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-11-05Fix typosAndrea Gelmini
Change-Id: I6338ff36670b54ea69a959674239b4ba3029a5a3 Reviewed-on: https://gerrit.libreoffice.org/44328 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2017-11-05TSCP: refactor signature validation and simplifyAshod Nakashian
Change-Id: I20e2f2825c9bd19d76ab450ffa70aca72fbb8b9a Reviewed-on: https://gerrit.libreoffice.org/44146 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2017-11-04Related: tdf#113160 set parent of warning dialogs during loadCaolán McNamara
to the new window frame being constructed that (may) contain the progress bar, that way such modal dialogs affect the loading document window and not whatever window happens to be active Change-Id: I1c7d3185e47fa316eef003b80d18b31d341b79d6 Reviewed-on: https://gerrit.libreoffice.org/44269 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-11-04tdf#42346: DOCX export of cross-references to objectsTamás Zolnai
* Objects means tables, images, text frames and shapes * Implementation ** MSO uses simple bookmark references as cross-references to objects ** So generate bookmarks in export time if a caption is referenced ** In some cases we also need to split some of the runs ** Implemented all types of cross-references, except the chapter reference Change-Id: I3b17753123d94a04e4f28783ad5663831e7c6c84 Reviewed-on: https://gerrit.libreoffice.org/44294 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-11-04tdf#46938 ooxmlexport: override style tabstops when tabs removedJustin Luth
Having no tabs defined is the default value, so nothing generally needs to be written. But if the paragraph style defines tabstops, but the current paragraph doesn't have any, then those style tabstops need to be cleared. Change-Id: I7a818c658403cc683b0c5b7452b6c88ea00f771d Reviewed-on: https://gerrit.libreoffice.org/44244 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org>
2017-11-04TSCP: add a full text. value of the header/footer as doc. propertyTomaž Vajngerl
Change-Id: I4742066c34802017790c1c21ec04a7760d4fe1f7 Reviewed-on: https://gerrit.libreoffice.org/44279 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2017-11-03sw: ODF import: prevent shapes from inheriting paragraph default marginsMichael Stahl
The problem is that even with the vertical-pos default fix, we don't render ShapesWithWrapping.odt the same as Word does: https://beta.opendocumentformat.org/rendercompare/upload/223/86/191/1 The shape still has a spurious bottom margin, which should not exist. This has a surprising cause: the default-style family="paragraph" has the attribute fo:margin-bottom="0.1388in" on paragraph-properties, which gets imported as the pool's default item of RES_UL_SPACE; there is nothing that prevents the shape from using this pool default item if it doesn't have a margin set on itself. Prevent that by overriding the pool default in SwDoc::mpDfltFrameFormat, which already carries a XFillStyleItem for similar reasons. The mpDfltFrameFormat is used by a lot more than just shapes, but none of that stuff should inherit paragraph defaults. As an aside the fo:margin-* properties are also allowed on style:graphic-properties, but it turns out that the implementation of the default-style family="graphic", in SvxUnoDrawPool/SwSvxUnoDrawPool, does not have the corresponding properties, hence cannot import these. Not sure if it would be better to have multiple SvxULSpace items with different IDs, so the paragraphs and shapes and etc. can have separate defaults. Change-Id: Ie6a196db567beb7a48b4176f383c88490dcfb8e7
2017-11-03ofz#4042 Integer-overflowCaolán McNamara
Change-Id: Iccd150e8d704e065b8a3e060a1c9a2b6310e3641 Reviewed-on: https://gerrit.libreoffice.org/44265 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-11-03tdf#108124 fix: crash during redo, when document contains imagesFyodor Yemelyanenko
Redo action fixed to reinsert images to document correctly. For details, pls see https://bugs.documentfoundation.org/show_bug.cgi?id=108124 Change-Id: Ie20dfcc8b9bfd5096c3c9459446c2a972129f3bf Reviewed-on: https://gerrit.libreoffice.org/43862 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2017-11-03TSCP: Paragraph signature RDF namespace now urn:bailsAshod Nakashian
And remove PARAGRAPH entries from ClassificationResults to restore adding the parens correctly. Change-Id: Id0f07758e4daad8d0736800e211e35e9c7e026cf Reviewed-on: https://gerrit.libreoffice.org/44145 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2017-11-03TSCP: don't export metadata field text in DOCXAshod Nakashian
Change-Id: I28ae3e57d3766497077af091fe4721fe653def4b Reviewed-on: https://gerrit.libreoffice.org/44118 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2017-11-03tdf#38778 Fix output of the font in DOC runSerge Krot
The font information should be output before field declaration. Added unit test. Change-Id: I147dd8956fbd8e69c3a2e86aff01dc249f4fa815 tdf#38778 DOCX output: no double output of the font info Change-Id: Ia080f742cde88b914e146fe7a95b90bf1952c96a Reviewed-on: https://gerrit.libreoffice.org/44160 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-11-03TSCP: flesh out ClassificationResultAshod Nakashian
Change-Id: Ie6ee33cc21f6f27ae1d58a0e47f367b0539e4378 Reviewed-on: https://gerrit.libreoffice.org/44117 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2017-11-03TSCP: use the BAC identifier as the RDF keyAshod Nakashian
DOCX RDF -> SmartTag logic expects urn:bails namespace to dump the RDF, and it also needs to have the rdf file in tscp/bails.rdf, hence the move. Change-Id: I9ae496c97abe97d3596de46ffccd5f7c80e37d34 Reviewed-on: https://gerrit.libreoffice.org/44116 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2017-11-03ofz#2980 TimeoutCaolán McNamara
Change-Id: Ic5122524d06a1d5c5fccc98acbd5f8d472d39553 Reviewed-on: https://gerrit.libreoffice.org/44217 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-11-03Return new line symbol in unit testSerge Krot
For Win32 we cannot use directly "\n" symbol, instead SAL_NEWLINE_STRING should be used. Change-Id: Icf607fcc20086201fb34423f0a98d6817218bb0f Reviewed-on: https://gerrit.libreoffice.org/44207 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-11-03sw: clean up temporary debug code in itrform2Miklos Vajna
Change-Id: I817ea7abea99683f691b9fd363af7330ab975f87 Reviewed-on: https://gerrit.libreoffice.org/44234 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-11-03tdf#113597: Inserting table in header and saving crashesJulien Nabet
test xTextPortionEnumerationAccess before trying to use it bt: 0x00007fffca9201e6 in SwEditShell::CollectAdvancedClassification (this=this@entry=0x55555790c710) at /home/user/libreoffice/sw/source/core/edit/edfcol.cxx:804 804 uno::Reference<container::XEnumeration> xTextPortions = xTextPortionEnumerationAccess->createEnumeration(); 0 0x00007fffca9201e6 in SwEditShell::CollectAdvancedClassification() (this=this@entry=0x55555790c710) at /home/user/libreoffice/sw/source/core/edit/edfcol.cxx:804 1 0x00007fffca927e8c in SwEditShell::ClassifyDocPerHighestParagraphClass() (this=0x55555790c710) at /home/user/libreoffice/sw/source/core/edit/edfcol.cxx:1722 Regression from b480d5e4c03438487b645ae10347c5c22f36bb25 Change-Id: I255165ca2aa8e701fe011812165b32dd17e4e2ec Reviewed-on: https://gerrit.libreoffice.org/44240 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2017-11-02sw: ODF import: default as-char shapes to vertical-pos="top"Michael Stahl
The problem is that we don't render ShapesWithWrapping.odt the same as Word does: https://beta.opendocumentformat.org/rendercompare/upload/223/86/191/1 The first shape in the file is anchored "as-char" and has no style:vertical-rel or style:vertical-pos attribute affecting it. If Word would write either style:vertical-rel="baseline" or style:vertical-pos="top" explicitly, the rendering in LO would be the same. So the problem is that, for drawing shapes (note, text frames are images, embedded objects handled differently), LO's default vertical alignment is different, it is hard-coded in SwShapeDescriptor_Impl::GetVOrient() as SwFormatVertOrient(0, text::VertOrientation::NONE, text::RelOrientation::FRAME) This effectively positions as-char shapes *below* the baseline, which, while technically allowed, isn't really a good default. So fix this by making the default alignment dependent on the anchor type, so that as-char shapes sit on top of the baseline. The ODF filter sets the anchor type before inserting the shape in XMLTextShapeImportHelper::addShape(), however as it turns out the various MSO filters insert the shape before setting the anchor, which means the new default in SwXShape has an unwanted effect on them, as inserting the shape causes the default to be created. This requires changes to VML import to always set the VertOrient property, and to RTF import to set the anchor type before inserting. The DrawingML import is unaffected as it already sets VertOrient for every non-as-char shape. The testDmlTextshape "dml-textshape.docx" test still fails, but it turns out that the change in alignment for this test document is a bugfix, as it now has the same vertical alignment as in Word, so adapt the test. Change-Id: Ifcabd96a037515f7803f5474ec995f968b3b4de1
2017-11-02revert drop of SetBufferSizeCaolán McNamara
reported spike in load time, so still necessary I guess Change-Id: I38c139b85ed922af18674ac84263150407a3277f Reviewed-on: https://gerrit.libreoffice.org/44231 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-11-02ofz#3927 ensure same sort order cross platformsCaolán McNamara
annoyingly was getting different order on oss-fuzz vs normal case making things hard to reproduce Change-Id: Ie50a546946b2dfa89bc3af1b4a04a88217c1a668 Reviewed-on: https://gerrit.libreoffice.org/44212 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-11-02static_cast followed by dynamic_castCaolán McNamara
Change-Id: I722ba0ab1e056904c55b4ad6cdec6f26fa3b723d
2017-11-02writer notebookbar update tabbed compact toolbarandreas kainz
Change-Id: Id7be2fdd497b3c49005c50d4e990b0dd44e86d12 Reviewed-on: https://gerrit.libreoffice.org/44192 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2017-11-01threadmanager.hxx is only included from sw/source/core/docnodeStephan Bergmann
...but itself includes sw/source/core/docnode/cancellablejob.hxx, which only happens to work because of -I$(dir $(3)) in gb_CObject__command_pattern (in solenv/gbuild/platform/com_{GCC,MSC}_class.mk). Clean that up by moving the file. Change-Id: I69dfb80460edc66309cdb6f08427a47cc2420f34 Reviewed-on: https://gerrit.libreoffice.org/44173 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-11-01ofz#3945 Integer-overflowCaolán McNamara
Change-Id: I3cc8e91078289860d27ee77be3c24eabeb136909 Reviewed-on: https://gerrit.libreoffice.org/44163 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-11-01TSCP: simplify key creation and detectionTomaž Vajngerl
Change-Id: I5f87e77cf529d1c4d37ea55b8858c374a66ea9e4 Reviewed-on: https://gerrit.libreoffice.org/44018 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2017-11-01OUString: avoid temporaries, constifyMatteo Casalin
Change-Id: I595b90b16c2c2a60a61811878ad06ae729a8943c
2017-11-01sw: enable rtf export tests also for Win32Serge Krot
* seems they work fine * also one unit test was enhanced Change-Id: Id5de81460c1bff9afb648a6c7a940f2bdec938b1 Reviewed-on: https://gerrit.libreoffice.org/44141 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-11-01ofz#3934 Integer-overflowCaolán McNamara
Change-Id: I2c58cca6f01d7c50244dfec6acdfaa988cdbaa07 Reviewed-on: https://gerrit.libreoffice.org/44102 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-11-01ofz#3953 Integer-overflowCaolán McNamara
Change-Id: Iaf50389680926989170340982337d1e760a2ec3a Reviewed-on: https://gerrit.libreoffice.org/44120 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-11-01ofz: Integer-overflowCaolán McNamara
Change-Id: I29dbad16a8098ca93af0fda461d151cd310eef4c Reviewed-on: https://gerrit.libreoffice.org/44124 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>