summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2017-11-14tdf#113037 DOCX Watermark correct ratioSzymon Kłos
Import and export Watermark with padding like MSO does. Shape is scaled to save correct ratio. Change-Id: Iebd8eb5f168e0030320406d4fd6b287e451267bd Reviewed-on: https://gerrit.libreoffice.org/44319 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2017-11-14tdf#113790: skip charfmt grabbag items existing in autofmt grabbagMike Kaganski
Change-Id: Icc0065c1da9471cb36bfef0da45e2f67381a1a31 Reviewed-on: https://gerrit.libreoffice.org/44706 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-11-14Fix typosAndrea Gelmini
Change-Id: I53b47cab5cbc603bf11adcda8ac2a8373eef26a8 Reviewed-on: https://gerrit.libreoffice.org/44695 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2017-11-14RTF import: add odd section break testcaseMiklos Vajna
lcov points out this was not covered so far. Change-Id: I7c5047b75f6548e7738e6118f8d3c0eb9ed76045 Reviewed-on: https://gerrit.libreoffice.org/44702 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-11-13More proper construction of vnd.sun.star.pkg URLMike Kaganski
See commit bff8d843bd4e5dcca5dc1a60c2c7852b1b72a00b The SwUiWriterTest::testEmbeddedDataSource unit test is adjusted to test the paths with "#". Change-Id: I8d85147128915c7100ab9cc2888eb73c94fe6486 Reviewed-on: https://gerrit.libreoffice.org/44678 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-11-13sw: prefix members of SwLabRecMiklos Vajna
Change-Id: I5a2f882a51c60229414bc29522d27adbbe37fd62 Reviewed-on: https://gerrit.libreoffice.org/44663 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-11-13Fix typosAndrea Gelmini
Change-Id: Ia544298334364ece3b3963a4adc00c5e01189b91 Reviewed-on: https://gerrit.libreoffice.org/44654 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mark Page <aptitude@btconnect.com>
2017-11-13Replace list by vector vRedlines (sw)Julien Nabet
Change-Id: I4c5ca9dc59a08343fdbd2c2237f8346572f26011 Reviewed-on: https://gerrit.libreoffice.org/44659 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2017-11-12use copy constructor to clone PoolItemsJochen Nitschke
Change-Id: I2a45a62fd56cc5a768406c7a6e4c72456f962367 Reviewed-on: https://gerrit.libreoffice.org/44648 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-11-11RDF: support cloning of all entries for a given typeAshod Nakashian
This is currently unused, but can come in handy later on when we implement copy/pasting of metadata fields. Change-Id: Idd4d6c186fa5c75e06f0ab1b0dfcbc85b6343116 Reviewed-on: https://gerrit.libreoffice.org/44602 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2017-11-11TSCP: Remember the origin and on save, act accordinglyTomaž Vajngerl
If we created the document classification via pop-up (BAF policy) then the highest classification needs to apply the classification from the BAF policy. In other case the classification was set via the advanced classification dialog, we only need to reset the document properties. Change-Id: I0aa0c010e8de3c16920b64a97e5e4dd2e643c2cd Reviewed-on: https://gerrit.libreoffice.org/44576 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2017-11-11A user object id is *NOT* a SotClipboardFormatIdEike Rathke
Do not try to squeeze it into such.. especially if SotClipboardFormatId::... enum identifiers are used in a user object id context that is completely not related to the identifier name this is totally confusing. commit fb14be5f8f74f83ba89e15f891ddf1f753dcc62f Date: Thu Mar 12 14:53:28 2015 +0200 create new 'enum class' SotClipboardFormatId to unify types overdid with that. Change-Id: I34b570be9f52b7b94ca8af6b23983393ac3a3a55 Reviewed-on: https://gerrit.libreoffice.org/44612 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2017-11-11TSCP: simplify setting the highest classificationTomaž Vajngerl
No need to check the document header for the current document classification category. It is right there in the document properties. Change-Id: I46d31fe2ead034b591ea10b478e7cc9e3ef410ef Reviewed-on: https://gerrit.libreoffice.org/44575 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2017-11-11TSCP: use classification key creator instead of stringsTomaž Vajngerl
Change-Id: I2bc224aa0e290b0fab1c989834e5d79a72de35aa Reviewed-on: https://gerrit.libreoffice.org/44574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2017-11-11TSCP: bail out quickly in paragraph classification check on saveTomaž Vajngerl
Before saving a document we need to check that the document level classification is at the higher or same level as the individual paragraph level classification is. The trouble here is tha this can be quite a costly operation, so bail out quickly if we don't detect that no paragraph classification has been applied to the content by checking if we have the RDF metadata present or not. Change-Id: Iaef29de7e138937a5c1881cf34c9075fb37ba87d Reviewed-on: https://gerrit.libreoffice.org/44573 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2017-11-10TSCP: strip metadata fields when copyingAshod Nakashian
Since the RDF entries are not copied (due to limitations in the clipboard doc), metadata fields become inconsistent upon copying. This is especially problematic for signatures and classification as they are no longer maintainable or verifyable (which is a particularly critical issue for crypto signatures of paragraphs). Change-Id: I5468a961ed43befdc48fcea8be00734453917c1f Reviewed-on: https://gerrit.libreoffice.org/43631 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2017-11-10rework tdf#113647 solution to be safeCaolán McNamara
rather than passing the pointer around, tragic use of uno apis means monstrous awt::Window thingy has to be passed around and still smuggled through the dispatch arguments to get through the eye of the XDispatch::dispatch needle Change-Id: I353f8a3b0bb698bb58f75576e49efd701f3db8bf Reviewed-on: https://gerrit.libreoffice.org/44585 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-11-10Translate German comment to EnglishSamuel Mehrbrodt
Change-Id: Ia7970d9318c0e9f738d7cdf646de2dd38f869a3c Reviewed-on: https://gerrit.libreoffice.org/42847 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2017-11-10Properly construct vnd.sun.star.pkg URLStephan Bergmann
...in SwDBManager::LoadAndRegisterEmbeddedDataSource. For example, when the authority encodes a file URL whose path contains '%23' (because one of the pathname segments encoded in the file URL contains a '#' character), the original code would have left it as %23 in the vnd.sun.star.pkg URL, instead of encoding it as %2523. That lead to bad file URLs being recovered from the vnd.sun.star.pkg URL in dbaccess. (And 03f58aa36c5150ea305b5fd0023e0ec53a334051 "dbaccess: properly encode path to prevent stripping 'fragment' from it", which this commit reverts, wrongly tried to address that on the consuming instead of the producing side.) Change-Id: I17d2dc9e6306d006361fbcb63d77e93a9e20bf31 Reviewed-on: https://gerrit.libreoffice.org/44569 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-11-10sw: remove temporary debug code in txttab that no longer builds anywayMiklos Vajna
Change-Id: I40dfa40dd157046aa5c1285b1855fb8c100fc315 Reviewed-on: https://gerrit.libreoffice.org/44577 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-11-10tdf#113647 bullet dialog has wrong modal parentCaolán McNamara
Change-Id: Ia2e6171a1aeb3b8ad679a547a63ccaeac20481df Reviewed-on: https://gerrit.libreoffice.org/44554 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-11-10This aEndCps variable can be localTamás Zolnai
Change-Id: I61ed4b5fcac6b12e7d3c1b4eab61ccff1e207c5f Reviewed-on: https://gerrit.libreoffice.org/44503 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-11-10Fix typosAndrea Gelmini
Change-Id: I2b6f476122a1991b77e7831da225f7dc17d4061c Reviewed-on: https://gerrit.libreoffice.org/44570 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-11-10tdf#43017: Support for DOCX hyperlinks character propertiesVasily Melenchuk
Here goes a bunch of related changes: 1. Create new character style based on current character properties 2. Apply created style to hyperlink object 3. Fixes to predefined style names usage in w:rPr 4. Disable style usage for hyperlinks in TOC: they will receive later anoter styles Change-Id: I1a228992eb7c1e259a6a811aa7f959debaae4f35 Reviewed-on: https://gerrit.libreoffice.org/41784 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-11-09tdf#42346: DOC export of cross-references to objectsTamás Zolnai
Same solution which was used for DOCX export: 98bc7215935f1eb2e0dc6f1db826d8e729430c13 Change-Id: I8af46db003a6192c6adaae1a35dff58744919eee Reviewed-on: https://gerrit.libreoffice.org/44502 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-11-09Revert "tdf#108947 Added Unittest."Thorsten Behrens
Seems the test doc is fragile under font replacement. This reverts commit 743efc3d4b086d20abd1449bcb73e9bce506c083.
2017-11-09tdf#108947 Added Unittest.Thomas Beck
Added different branches for Windows/Linux because of differences in linebreaks. Change-Id: I17397155292e173bf698fa2680aaaf2711c064cf Reviewed-on: https://gerrit.libreoffice.org/44358 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-11-09TSCP: restore paragraph classification from DOC(X)Ashod Nakashian
Change-Id: I81f9a98f618b32e13c5ce92489846a4e20cc23d7 Reviewed-on: https://gerrit.libreoffice.org/44325 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2017-11-09ofz#4144 Null-dereference READCaolán McNamara
Change-Id: I480551482dbda02d86c533c5705c9c896f269450 Reviewed-on: https://gerrit.libreoffice.org/44525 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-11-09new loplugin simplifydynamiccastNoel Grandin
simplify dynamic_cast followed by static_cast Change-Id: I965afcf05d1675094cfde53d3590a0fd00f26279 Reviewed-on: https://gerrit.libreoffice.org/44460 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-11-09loplugin:unnecessaryvirtualNoel Grandin
Change-Id: I5696c853daa16c9e55ff046d67102ba3042bfea8 Reviewed-on: https://gerrit.libreoffice.org/44459 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-11-09tdf#112352 ooxmlimport: ALWAYS treat 1st nextpage w/cols as contJustin Luth
fix 5.4 regression from 4605bd46984125a99b0e993b71efa6edb411699f. When there are columns, if a nextpage section doesn't contain any other "page style" details we treat it as a continuous break, If we don't, the column info becomes part of the style itself, and not just a section property. However, the very first section is troublesome - by definition it DOES contain page style details, and so if the document starts with columns, the default style would gain the column attribute. Usually that results in a mess, so lets make sure that we avoid that also in the case where headers/footers are defined. Change-Id: I7e08a9218e4304206579ed064bc92c9604d4470e Reviewed-on: https://gerrit.libreoffice.org/44505 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Justin Luth <justin_luth@sil.org>
2017-11-09lokdialog: Move getting dialog information in separate LOK callPranav Kant
Using outparameters to get the dialog information with the paintDialog call was quite confusing. Change-Id: Ief331b251dc66e66084b827ce5b025ba6c9ce7d2 Reviewed-on: https://gerrit.libreoffice.org/44473 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: pranavk <pranavk@collabora.co.uk>
2017-11-09lokdialog: Support painting parts of the dialogPranav Kant
Pass the dimensions of the region to the paintDialog call to paint only that much of the region in the dialog. The DIALOG_INVALIDATE callback also returns a 'rectangle' field now in the payload that tells the region of the dialog invalidated. It can be used in combination with the new paintDialog call then to paint only the invalidated region in the dialog. Change-Id: Iebb228865c71684e0f75dd01271b71ae41a0f906 Reviewed-on: https://gerrit.libreoffice.org/44472 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: pranavk <pranavk@collabora.co.uk>
2017-11-09related tdf#66401 docx Combined Characters roundtrip unit testAndreas Brandner
Change-Id: Ibe11882ab24e9161a36d195497b0a430497d7f79 Reviewed-on: https://gerrit.libreoffice.org/43953 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-11-09tdf#66401 don't lose docx-combined-characters' font props on roundtripAndreas Brandner
Change-Id: Idbdb5bf3066e2ed86b494255d72d66eebf72f755 Reviewed-on: https://gerrit.libreoffice.org/44336 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-11-09rename AvoidConfig to FuzzingCaolán McNamara
cause that's what its really used for and a couple of cases are not specifically about avoiding config but avoiding uninteresting disk acccess and what not Change-Id: I4c6454f98388579fcd0bf9798321d30408ab65ee Reviewed-on: https://gerrit.libreoffice.org/44491 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-11-08crashtesting: assert on re-export of fdo55459-1.docx to docxCaolán McNamara
since... commit 3f2e84b4bd0bbd936e0af845ba7cbf68cb2803d6 Date: Tue Oct 31 23:39:26 2017 +0100 tdf#38778 Fix output of the font in DOC run The font information should be output before field declaration. Added unit test. tdf#38778 DOCX output: no double output of the font info need to also not double output the complex script font info as well as the western and asian info Change-Id: I7de098dff0b787b9825a509cec19d0161a3a0d8a Reviewed-on: https://gerrit.libreoffice.org/44465 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-11-08tdf#101977: remove accept/reject all from context menusHenry Castro
Change-Id: I359986b0c135065cd471b2ba549fbae1131b650d Reviewed-on: https://gerrit.libreoffice.org/44466 Reviewed-by: Henry Castro <hcastro@collabora.com> Tested-by: Henry Castro <hcastro@collabora.com>
2017-11-08tdf#107554 New default table styleYousuf Philips
Change-Id: I7811ac11c0a92f85698fc5cd43016d85f4661b98 Reviewed-on: https://gerrit.libreoffice.org/44363 Reviewed-by: Heiko Tietze <tietze.heiko@googlemail.com> Tested-by: Heiko Tietze <tietze.heiko@googlemail.com>
2017-11-08tdf#99027 Use 0.5pt border size with toolbar controlYousuf Philips
Change-Id: Ie04195b5d3cfc03ccb863d5450f9a4c86d24d962 Reviewed-on: https://gerrit.libreoffice.org/44369 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jim Raykowski <raykowj@gmail.com> Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
2017-11-08SwXFlatParagraph: check some positions before blindly using themMichael Stahl
Change-Id: Ic33b7a4b87120bd01b56737ded0411651306098d
2017-11-08sw: document SwRectFnCollection instancesMiklos Vajna
GCC would allow these to be non-comments according to <https://gcc.gnu.org/onlinedocs/gcc/Designated-Inits.html#Designated-Inits>, but still have them as comments for the sake of other compilers. Change-Id: I4e615a41062edcc563b109753af8c2c457ee4503 Reviewed-on: https://gerrit.libreoffice.org/44443 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-11-08TSCP: Fix crash when no header/footer is present yetTomaž Vajngerl
Change-Id: I681920347e01ccbc1e18348d00c1e29dac5a8e64 Reviewed-on: https://gerrit.libreoffice.org/44441 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2017-11-08sw lok: add Accept/Reject All tracked changes, tdf#101977Henry Castro
Change-Id: I04d747343e24cb498a621c965d034d0791411d83 Reviewed-on: https://gerrit.libreoffice.org/44311 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Henry Castro <hcastro@collabora.com>
2017-11-07ofz#4066 Bad-castCaolán McNamara
and a cluster of others around here. This pRedl has been deleted at this point. This doesn't matter for most users, seeing as !LibreOfficeKit::isActive() is the usual case so the deleted pRedl isn't fully accesssed. Because the deleted pRedl won't be found in GetRedlineTable when deleted, rework this a little to avoid the problem. Change-Id: I5c2f405cdae0b0c804ee7452629a14206516962d Reviewed-on: https://gerrit.libreoffice.org/44390 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-11-07tdf#113686 sw: handle sections when counting height of first content lineMiklos Vajna
When moving back a row that has a single text frame, it should not matter if that text frame is in a section frame or not. The problem was that the bugdoc has a split (outer) table, the follow's ShouldBwdMoved() returned false, as SwTabFrame::CalcHeightOfFirstContentLine() returned USHRT_MAX, as it had no idea how to calc the height of a text frame in a section frame. Fix this by looking "through" the section frame, and handling "text frame" and "text frame in section frame" the same way. Change-Id: Ic3605a1e2d28bfaa69bf18f31cfbf1e6e681c04f Reviewed-on: https://gerrit.libreoffice.org/44393 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
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>