summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2016-10-06tdf#103025 sw: don't format header/footer in SwPageFrame::PreparePage()Michael Stahl
This has always been dead code because it used wrong constants FRMTYPE_HEADER|FRMTYPE_FOOTER which is actually Page|Column and SwPageFrame and SwColumnFrame are not direct children of SwPageFrame. Then commit 901e5c3a21a1299d10c44bc844246fe8c329bb82 fixed the constants but somehow the early formatting of header/footer results in wrong expansion of variable text fields, so just remove this code. (cherry picked from commit f933da55797566cf725e35ab0df17e91c7d5598f) Change-Id: I0af13168970f26355a1b247e071235166d08b7a4 Reviewed-on: https://gerrit.libreoffice.org/29557 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-10-06Resolves: tdf#102334 Some hidden text not imported as hidden correctlyCaolán McNamara
began to be a problem since.. commit 705a8c226aee3e68db492083b7cf8b704335328b Author: Caolán McNamara <caolanm@redhat.com> Date: Tue Sep 23 20:35:50 2014 +0100 WW8PLCFMan::AdjustEnds deeply flawed concept wrt change tracking but underlying problem is... commit b3cee382f449aa69213dc21f7b1ba6a5356d2865 Author: Caolán McNamara <caolanm@redhat.com> Date: Mon Jun 27 14:52:41 2011 +0100 Related: #i76955# make this 4+ times faster Change-Id: I1cd42a0f51599efab9352c960a5f496626af7ac0 (cherry picked from commit 04f571349c1b540900fc5cebfa6a10904e349a75) Reviewed-on: https://gerrit.libreoffice.org/29386 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-10-06Resolves: tdf#102358 writer cannot save 3d shape inserted from drawCaolán McNamara
because SwXShape::supportsService always returned true for com.sun.star.drawing.Shape I surmise that getSupportedServiceNames should always list com.sun.star.drawing.Shape as a supported service This went awry with... commit 2f50ce6cfab2871cd879c1429e1938d3642616ef Author: Marcos Paulo de Souza <marcos.souza.org@gmail.com> Date: Thu Dec 5 19:17:18 2013 -0200 fdo#54938: Convert sw to use cppu::supportsService Change-Id: Ic27bf31e5eb991ccceb8b97713d1e50a736709c8 Signed-off-by: Stephan Bergmann <sbergman@redhat.com> Change-Id: I9821a620da8bac3b6b59da976a8c25bb2deafcf1 (cherry picked from commit 5345b1562066d61b9ed79f072f8a953c67f847ed) Reviewed-on: https://gerrit.libreoffice.org/29360 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-09-29tdf#102073: sw: do not create SwFootnoteNumPortion inside tableMichael Stahl
The SwTextFormatter::WhichFirstPortion() wants to create a new SwFootnoteNumPortion for the first paragraph in every cell, because it doesn't have mpPrev set and SwTextFrame::IsFootnoteNumFrame() is true, and somehow this even causes an infinite loop in the bugdoc because initially nothing more than the footnote number fits inside a line. Just detect that it's inside a table and return false then. Change-Id: I1f010f1242d53d9f99a4d3a4f6fc3cee65aa3958 (cherry picked from commit ebcbc970f8d0ecbba8c6d7e7c2a1b977d63bc2fb) Reviewed-on: https://gerrit.libreoffice.org/29362 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-09-22tdf#101164 sw: Insert Database Columns dialog: expect selectionMichael Stahl
... as bookmarks, not raw row indexes. Bookmarks is what FmXGridPeer::getSelection() / FmGridControl::getSelectionBookmarks() always produce, and it's unclear to me if there even is a case where something other than a bookmark ends up pasted into Writer. The only case where dbaccess creates a selection that doesn't contain bookmarks is in SbaGridControl::implTransferSelectedRows() if no rows are selected but i haven't figured out how to reach that state. (regression in OOo 3.3) Change-Id: Ib45787bc002447338df775102790843f2cb1dd3b (cherry picked from commit bb0e9dd57e7ca0f346ac1102139edaec4e6b3790) Reviewed-on: https://gerrit.libreoffice.org/29090 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
2016-09-21tdf#101359 Really walk the document mark listJan-Marek Glogowski
In both functions we want to walk the current mark list and act on the MarkType::BOOKMARK, so mimic the behaviour of PopulateTable in HaveBookmarksChanged. My previous commit 96454829f7dc6480f9ddd4262bc03d5ccabadea4 is broken and just works out of luck... It also contains commit adfb650bec005a46c2192852a8f5801497a19611, which handles the case with less bookmarks then expected. (cherry picked from commit ccb979c53931ab3f4712d0a3f7d0f844dcfc5c5d) Change-Id: I2f53b775208cad7e83992d1ae4fb67a41588cb92 Reviewed-on: https://gerrit.libreoffice.org/29098 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-09-21tdf#102233: avoid infinite loop recursion in IsProtect node methodJulien Nabet
See https://bugs.documentfoundation.org/show_bug.cgi?id=102233#c5 Change-Id: Ic985662011b33d4b20b7c60df33c9ecc97326e85 Reviewed-on: https://gerrit.libreoffice.org/28972 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit cd72269a6a2c85ae9dd4552aa4808ef4fd1f6c0e) Reviewed-on: https://gerrit.libreoffice.org/29152 Tested-by: Jenkins <ci@libreoffice.org>
2016-09-21tdf#90597 Revert "Jump to next change when accepting or rejecting a change"Yousuf Philips
This reverts commit 1deaa9d304239b2d603cc85bbcb8b8f50d8714da. Change-Id: Id7b73d68e1dfb5fc15397af8e66574485a0bfd86 Reviewed-on: https://gerrit.libreoffice.org/28979 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2016-09-21tdf#81345 docx import fix default page break regressionJustin Luth
"regression" from 4e653d15eff26aa5283d8ba20611893f4c573f57 If there are new style elements, then don't treat a default break in columns as a continuous break. This fixes both round-tripping, and initial import of columns and headers on this particular document. Since MS and LO treat sections so differently, it is a balancing act of what to change. Change-Id: I9c79bc1246108da6a5ebbf744acbcfcbb9d33d48 Reviewed-on: https://gerrit.libreoffice.org/28728 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit 3870c0555aa461268a6d056543f4545d562769ce) Reviewed-on: https://gerrit.libreoffice.org/28855 Tested-by: Yousuf Philips <philipz85@hotmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-09-21tdf#84684 RTF import: fix ZOrder of child shapes inside group shapeMiklos Vajna
Both ODF and OOXML's drawingML seem to just not write ZOrder for child shapes (instead they just describe them in a bottom-up order), but RTF does use dhgt, it seems. Given that ZOrder has different meaning inside and outside a group shape use a stack of GraphicZOrderHelpers to get the correct result. Change-Id: I68dbd9f0ae59a1759da14bf414dc1d277d1c927d (cherry picked from commit 5edebdf67720ac0867b088400e2b31806138dc25) Reviewed-on: https://gerrit.libreoffice.org/29091 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-09-21tdf#101164 sw: Insert Database Columns dialog: ensure one of ...Michael Stahl
... the radio buttons is active by default, in case there's no configuration to read the state from yet. Change-Id: If1c0462eb5cb9ea5177f1d5a8953b34fabd0829c (cherry picked from commit 984790f15d935f986fd0f5ed92f6a63c17eace35) Reviewed-on: https://gerrit.libreoffice.org/29089 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-09-21tdf#101536 sw: do load Insert Index dialog's document ReadOnlyMichael Stahl
Turns out SwOneExampleFrame is used for different things, so load doc read-only only if it's an existing document. (regression from 6a8407d82d71083c8bdec6a106ba9092a5196cbe) (cherry picked from commit b7faef01678573f7b060ad26798aa841689ce3e6) Change-Id: I0a1ab0725ed9dccca23742c9d83cd9635a188edf Reviewed-on: https://gerrit.libreoffice.org/29100 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-09-19tdf#101359 Just advance list box for BOOKMARKsJan-Marek Glogowski
Since the list box just contains MarkType::BOOKMARK, just advance the list box position for marks of this type. Change-Id: I7b8743abb1ffb2fda2242c5e7301b3ff15ae355b (cherry picked from commit 96454829f7dc6480f9ddd4262bc03d5ccabadea4) Reviewed-on: https://gerrit.libreoffice.org/28971 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-09-16disable generation of ole previews in ODF format until after loadCaolán McNamara
so the user update links dialog can control their generation SdrEmbedObjectLink becomes exposed to calc so it can detect if the link dialog needs to be used to update ole links. Reviewed-on: https://gerrit.libreoffice.org/28879 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 74844277cc2194c9e43f5bd7a6f78a9603da32f3) Change-Id: Id1dd7ea17342140eab9307d546528747e3a98090 detangle gadzillion checks into something readable no logic change intended Change-Id: Ib6af93afc1f80b7fc36239c96d5e0a71fcbcb789 (cherry picked from commit fad9786b06d188ba6e354620f57176f3d94a6637) Unmodified default SdrOle2Obj size is 101x101 svx/source/unodraw/unoshape.cxx sets a css::awt::Size maSize to 100, 100 svx/source/unodraw/unopage.cxx increases that by 1, 1 awt::Size aSize = xShape->getSize(); aSize.Width += 1; aSize.Height += 1; to call SdrObjFactory::MakeNewObject with 101, 101 so default size is 101x101 (getWidth() vs GetWidth() confusion ?) Change-Id: I4d4375dff64d7b8e236d1a24322e749e04ee530f Reviewed-on: https://gerrit.libreoffice.org/28895 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 7f0a219c9ad38ae33b51ff69d545f69659691c1e) Reviewed-on: https://gerrit.libreoffice.org/28926 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2016-09-13avoid crash with nullptr accessMarkus Mohrhard
e.g. http://crashreport.libreoffice.org/stats/crash_details/7d19c6e6-19cb-4ba0-a51f-7b7eef514ae1 Change-Id: Ia27780d6fa29a7e4b0665192844afbd8a7471721 Reviewed-on: https://gerrit.libreoffice.org/28854 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-09-13sw: partially revert commit d0b09f41efe938e94a84e783c9ff5742edcbfba8Michael Stahl
These still trigger sometimes in JunitTest_toolkit_unoapi_1 and i haven't had time to track that down, so back to SAL_WARN for now... Change-Id: I4d9f653ffddc7c704d33950d847345f4895d3f87 (cherry picked from commit 2934f6bcc75c781cdf9e614b9d7d8533eb680b3f) Reviewed-on: https://gerrit.libreoffice.org/28862 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-09-12tdf#101566 Remove untranslatable labels from changes toolbarYousuf Philips
Change-Id: I62cb3b8d0f57f7fd79cffce3b5aed5e384390e24 Reviewed-on: https://gerrit.libreoffice.org/28814 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Yousuf Philips <philipz85@hotmail.com> (cherry picked from commit f37d6837bf864a08f567c10c5f5bc0d4e4b5f9f7) Reviewed-on: https://gerrit.libreoffice.org/28822 Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
2016-09-12fftester: break as soon as an exception is requiredCaolán McNamara
Change-Id: Ia787c42f484c00242f1bcaca8ea7459890ec5745 Reviewed-on: https://gerrit.libreoffice.org/28829 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-09-10tdf#78727 sw: fix missing textbox text when anchored inside flying tableMiklos Vajna
It was missing as the shape text range was deleted twice, as DelFlyInRange() thought both the fly and the draw frame format own its contents range, while only the fly one does (when called by SwDoc::MakeFlyAndMove(), called by SwXText::convertToTextFrame()). Thanks Red Hat for the pizza! (cherry picked from commit 9d9e5b40c1a6d91323564e60b25ccf04df86db4b) Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx Change-Id: I26e23550df085511e0e87f593f1a461057413d0e Reviewed-on: https://gerrit.libreoffice.org/28776 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-09-09tdf#44986 RTF import: handle \trwWidthA by faking cellsMiklos Vajna
The DOCX import handles this at a tokenizer level, so let's do the same in the RTF case as well. (cherry picked from commit 0f2d5db38bac64b665c6e4a127bbbd63a7ed9af5) Change-Id: Id7ff43fa9e9bcd05b13d187623d39fb072758057 Reviewed-on: https://gerrit.libreoffice.org/28748 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-09-06Related: tdf#44986 DOCX import: handle w:gridAfter by faking cellsMiklos Vajna
This is similar to the w:gridBefore handling code introduced in commit cf33af732ed0d3d553bb74636e3b14c55d44c153 (handle w:gridBefore by faking cells (fdo#38414), 2014-04-23), except that the fake cells here are inserted after the real ones, not before. Change-Id: I4c03bd49e52016a58e0e002ae85dede6a96e5f55 Reviewed-on: https://gerrit.libreoffice.org/28487 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 1d1748d143ab4270a2ca1b5117852b1b1bb4c526) Reviewed-on: https://gerrit.libreoffice.org/28624 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
2016-09-06if we throw in sw on HoriOrientation::NONE then don't pass it in from rtfCaolán McNamara
Change-Id: Ie01cca9b7cc432fc1fe14bb600af5083d6ca6a0d Reviewed-on: https://gerrit.libreoffice.org/28688 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
2016-09-06Make character dialog's hyperlink tab accessibleYousuf Philips
Change-Id: I6b2351b5a46562236dc93c6de3daa185e2a72fb2 Reviewed-on: https://gerrit.libreoffice.org/28653 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 62fdfdded30e3e7507590a07791cc78e6b2b1d80) Reviewed-on: https://gerrit.libreoffice.org/28695 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
2016-09-02Resolves: tdf#101681 set hyperlink tooltip for the full hyperlink areaCaolán McNamara
not just a single point in it. This way gtk3 knows the successive tooltip hints for the positions along the hyperlink are for the same tooltip (cherry picked from commit 84e8e11dc3c73bcfe63f5e9c6cc49ee18a511a9b) Change-Id: I46a8c960e528f6a9aaab5bea145c6870f22e46c5 Reviewed-on: https://gerrit.libreoffice.org/28622 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-09-02pTemplate can probably be null hereStephan Bergmann
Observed with "make clean && make CppunitTest_sw_filters_test" (which misses a dependency, a bug to be fixed next, so happens to not set up m_pTemplate in SwHTMLWriter::WriteStream, so dereferences a null pTemplate here. Don't know whether there's also legitimate scenarios that can lead to a null pTemplate here, but at least the code in SwHTMLWriter::WriteStream setting up m_pTemplate takes into account that it can be set up as null, and the code in the called SwHTMLWriter::GetTemplateFormat takes into account that the passed in pTemplate (which used to be the same object as the outer pTemplate/pDoc, before breaking IDocumentStylePoolAccess out of SwDoc, see below) can be null. Regression introduced with 535971f3a166da6c0e44a6b7211c7f8c298f388f "Refactored IDocumentStylePoolAccess out of SwDoc." Change-Id: Iabb4ae2ca018ce3a19756d62b9002b245cb409cd (cherry picked from commit bf3c6237bb110d3eb84970e44593a7880e2e8536) Reviewed-on: https://gerrit.libreoffice.org/28589 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-09-02tdf#101361: Fix cursor key movement in RTL textKhaled Hosny
Revert "tdf#32531 Fix for key movement in table cell of different directionality" This reverts commit a215cec969f7401b08cabb686c5b2b1d803399d0. This seems like the wrong fix for the original issue, as it breaks how “visual” cursor movement works in RTL text. (cherry picked from commit 67192b3cfa54be7b0b60d450783ac2ac4c38bbc6) Change-Id: Ifa90f361f90d04b06fa012164995769627298ecb Reviewed-on: https://gerrit.libreoffice.org/28597 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-09-01let's make Impress crash less - SfxStyleFamily editionMichael Stahl
Commit bcb41235deaf4b7ca90522bda3ba21a686819e6e - in addition to introducing the enum SfxStyleFamily - inconsistently converted one call of DrawDocShell::SetStyleFamily to use enum SfxStyleFamily instead of a mysterious "5", but did not adapt all of the code that extracts the SfxUInt16Item that subsequently extracts this value and expects a number 0-5. Since it's clearly inexcusably stupid to have 2 different public sets of integers identifying styles, make the usage of the second "array index" integers private to templdlg.cxx; the SfxUInt16 item now always contains enum SfxStyleFamily. (regression from bcb41235deaf4b7ca90522bda3ba21a686819e6e) (cherry picked from commit 75c39b903f06b656293edf20ec4a5173a0755fb6) sfx2: SfxCommonTemplateDialog_Impl can't even decide if... ...no family selection should be represented as "0" or "0xffff". (cherry picked from commit 813a8944bdb337a0018208381aa30118151872ff) Change-Id: I333575c504277c2046f8f5a6b36ae3f86b3b3201 Reviewed-on: https://gerrit.libreoffice.org/28569 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-09-01Resolves: tdf#100094 hyperlink tabpage put hyperlink name in wrong fieldCaolán McNamara
mismerge of commit 74593273655e475017bb2bd45aba3c6b132e372d Date: Thu Jan 9 12:59:28 2014 +0000 Resolves: #i123988# assure that hyperlink attribute... Change-Id: I45391b112666a07a0edfa49b2a8682c446a92cf4 (cherry picked from commit 98294d715c72751d9dd47fd1995865e04b2bdf5a) Reviewed-on: https://gerrit.libreoffice.org/28548 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-08-31tdf#76349 writer: make 1column-as-page break a compatibility optionJustin Luth
Reviewed-on: https://gerrit.libreoffice.org/28501 Reviewed-by: Michael Stahl <mstahl@redhat.com> master commit: 93d7fc90b57bb08052299c94fa0a28bb8f494a9c Change-Id: I3135565ea6b3463d3854206cd221d73be3650468 Reviewed-on: https://gerrit.libreoffice.org/28534 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-08-31Revert "fftester: non-contiguous cells"Michael Stahl
This reverts commit 9accbfa0a52433cf03fe186fc69334d387981eb9. ... and the code change of "avoid crashing on load of fdo54724-1.rtf" commit 4ee3eabd0f058b26544c84b2b5aaf5478d921817. It's much simpler to detect early in convertToTable that there is a row with no cells in it, which should not be allowed. Change-Id: Iff6d235b29514edd57cc55addeefb24242595d88 (cherry picked from commit dc83b3ae470914dbcb08fe1f0a4a4e1a1d3d8e19) Reviewed-on: https://gerrit.libreoffice.org/28512 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-08-30fftester: empty tabbox protectionCaolán McNamara
Change-Id: I56b0845205d6968355b3327721bf9ca0930903e1 (cherry picked from commit b3533883fd0397dbe9110145d62ef35944b64f69) Reviewed-on: https://gerrit.libreoffice.org/28424 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2016-08-30tdf#101589 MS export: use dont-split-row for 1-row tableJustin Luth
.doc and .docx do not have a setting for "do not split table" so it was being emulated by "keep paragraph with next" for all but the last table-row. That means that a single-row table with lots of content might be split. There is a setting to prevent a row from splitting, so use that instead in this corner case. It needs to be separate from the other function in order to be set in time for docx to write w:cantSplit w:val="true" before the row contents. For some reason it did not work to move the whole function here. Change-Id: Idc11626e0e2cf1706b87a83f2bd4a802348cb633 Reviewed-on: https://gerrit.libreoffice.org/28352 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 8fcb00173737f6243e459c9d7a80bf29b95c4839) Reviewed-on: https://gerrit.libreoffice.org/28457 Reviewed-by: Justin Luth <justin_luth@sil.org>
2016-08-23tdf#90697 docx - don't change continuous break into page breakJustin Luth
As soon as you set PROP_PAGE_DESC_NAME, you are inserting that style as a page break. Setting a pagebreak via a continous break was first introduced in commit 50cb1667020494906afaacb68d4163d1eda527cf but the unittest for that commit no longer uses this code. I'm suggesting it be reverted. It really messes up round-tripping when continuous breaks are removed/replaced with hard page breaks. There are a few odd cases where the very first section needs to set the page break via the continuous break, so it hasn't been eliminated completely. Change-Id: I5b0e4bb7612ee9df47e5c49b8c2316dc001b5238 Reviewed-on: https://gerrit.libreoffice.org/26662 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-on: https://gerrit.libreoffice.org/28252 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de>
2016-08-23Resolves: tdf#100901 crash pressing tab in r-o document with hyperlinkCaolán McNamara
rather odd union in use here. Trying to call SwTextField::GetStart on SwTextINetFormat blows up under visual studio. Change-Id: Ic8145d7645bd6a68ef19e018311a4de6e6958bcb (cherry picked from commit 3196e949bb23a33bdb8700dbe27782e0e6c8f1e6) Reviewed-on: https://gerrit.libreoffice.org/28242 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2016-08-17tdf#100507 RTF import: don't set default para style to the 0th char styleMiklos Vajna
Regression from commit 1be0a3fa9ebb22b607c54b47739d4467acfed259 (n#825305: writerfilter RTF import: override style properties like Word, 2014-06-17), the problem was that the RTF_PARD handler wanted to set a default paragraph style, but it didn't check if the 0th style is actually a paragraph one. This resulted in using a character style name as a paragraph one, throwing in SwUnoCursorHelper::SetTextFormatColl() -> all paragraph properties were lost, including the left indent. Fix this by tracking the style type, and filtering out character styles when looking up a default paragraph style. Change-Id: I41faab0e72667b89ec9a507014b395a675847abf (cherry picked from commit 2de168e99ba9cd2539f1ddbeffad7e3eb71a7b1b) Reviewed-on: https://gerrit.libreoffice.org/28167 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-08-17tdf#91832: ensure GETLINK reports proper contents for reverse selections tooBjoern Michaelsen
Change-Id: I4e77a55de012b5edd0d922b5e534e4dd6bb714b6 Reviewed-on: https://gerrit.libreoffice.org/28088 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-08-16tdf#97090 writerfilter - don't fill_SOLID with auto colorJustin Luth
fixes a regression from 24077b2d52ab3d0fd0db5afb25d8b94b62386e3e <w:shd w:val="clear" w:color="auto" w:fill="auto"> seems to be the default "fill disabled" state, so don't force a solid white fill in that case. Change-Id: Ia421e52e228bbf0d3a2cd9af72e0a580042e5dcd Reviewed-on: https://gerrit.libreoffice.org/27915 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 2a174c2f6fd58a31eb150b84de83e5ba1c4d3fed) Reviewed-on: https://gerrit.libreoffice.org/28155
2016-08-09Resolves: tdf#101359 getBookmarksCount includes more than aTableBookmarksCaolán McNamara
aTableBookmarks is just "BOOKMARK"s while getBookmarksCount() includes two extra types. So cache the result of getBookmarksCount when filling aTableBookmarks to compare if the count from the time of filling aTableBookmarks is unchanged. Change-Id: I69fedab613f23e4e2b30498e4620a370d92272e0 (cherry picked from commit cdb708291b59ac89b43c24154f0edc77f237eadd) Reviewed-on: https://gerrit.libreoffice.org/27992 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-08-05tdf#78506 RTF import: fix handling of invalid \levelnumbersMiklos Vajna
In case ';' is written in \u form in \levelnumbers, then Word ignores the whole \levelnumbers contents, do the same. (cherry picked from commit 428a1da60b88415e7db21353a42bed85b8b76ed9) Change-Id: I93ce5810af2b5ed703e804199c0b236d2c4c36b5 Reviewed-on: https://gerrit.libreoffice.org/27873 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-08-04Resolves: tdf#101269 cannot click/edit text inside a frameCaolán McNamara
regression from... commit b0c0a074a2318a231f3f635784da494f1b713c53 Date: Mon Apr 18 11:03:43 2016 +0200 clang-tidy clang-analyzer-deadcode.DeadStores suspect that some of these may reveal latent bugs.... and restore method then removed by commit 47f62540bd2c2f107313bb0c6f141cd4460b6379 Date: Thu May 19 10:31:47 2016 +0200 loplugin:unusedmethods in sw Change-Id: I14826eecadbc1a74e408f8907eea8746debe4db4 (cherry picked from commit 24c009de4d6d27233027e9bcd86ea181d230be8f) pPos can never be null Change-Id: Ib7b57d628fbd80a1d2214917cd439e09d4803d91 (cherry picked from commit 2702796806cae2b28ae78e78d29c3559bf97607e) SwLinePortion::GetCursorOfst is const and its ret is ignored here so nOfst is unnecessary Change-Id: I27f73057b55ebdf30eb69a19ee1b0647ba25583e (cherry picked from commit 35f4248206e844cabd83757ec57ddde1c2ef66b4) only called if !bDraw Change-Id: I7310b5f8cbbc4176e76d92ce2bcd49168470843c (cherry picked from commit cc7a55450658696009fe01e94632e80bb3785d5b) the sole caller is ok with rPoint being modified, so change to non-const arg Change-Id: I40a24502e2e8ad312e13e0c47ee1fde3118d2251 (cherry picked from commit 2b3112b30a8dea8a009c11ddb209e12697f72e32) Reviewed-on: https://gerrit.libreoffice.org/27865 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-08-04add more nullptr checks, related tdf#100820Markus Mohrhard
See http://crashreport.libreoffice.org/stats/crash_details/8569250c-b04a-43b0-b4b8-4b3a94daffe1 Change-Id: I9070be3db57e77befe70c0a32ef6aa54c6c1cf85 Reviewed-on: https://gerrit.libreoffice.org/27842 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 626a1aa960ed36f5c3370e2aab1e72d41df875cf) Reviewed-on: https://gerrit.libreoffice.org/27859 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-08-03masses of MessBoxes not being disposed promptlyCaolán McNamara
since... commit ba81e5c6bd420b41a84ade6ccd774011a8089f7f Date: Thu May 28 21:35:43 2015 +0100 tdf#91702 - fix stack-based MessBox allocation. There is no special ScopedVclPtr<X>::Create or ScopedVclPtrInstance<X>::Create just VclPtr<X>::Create and a raw VclPtr<X>::Create()->foo doesn't call dispose on the owned X (cherry picked from commit a860df25dd7bf62ecb6b3d3ed38803b981f56d52) Change-Id: Ifacc8d5e742820701307c3c37b9b86487667d84f Reviewed-on: https://gerrit.libreoffice.org/27537 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-08-03Resolves: tdf#57978 don't show duplicate index keys in dropdown listCaolán McNamara
Change-Id: I25e25157063ea4424f770b397d879cb7bfd46bcb (cherry picked from commit c755336853f20c7b2dd14e9c56eeb441d831be2c) Reviewed-on: https://gerrit.libreoffice.org/27576 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-08-02tdf#95251 MM just allow print as single documentJan-Marek Glogowski
Remove kept block from revert of 138d29aa09417eba4d15ade4c9f4dab2620b6326 After this revert MM just supports pinting via a single merged document. Printing as inidividual files should have still worked, but as a workaround we remove this functionality, until the print backend can handle multiple-file print jobs correctly. Reviewed-on: https://gerrit.libreoffice.org/27721 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit b6a698b093f78dc90836d502db3d0276f335fbfe) Conflicts: sw/source/uibase/dbui/dbmgr.cxx Change-Id: I70d0852cdcc369b0fc9f344086830f15d8dea451 Reviewed-on: https://gerrit.libreoffice.org/27722 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-08-02Resolves: tdf#101241 Revert "fix paint table border in DOUBLE_THIN style"Caolán McNamara
because of the never-ending invalidate and paint of tdf#101241 there was no bug or route to reproduce the original problem so can't try to solve it a different way. This reverts commit 9a95520948de1d92c55252aa5f90606b01d6ac9e. (cherry picked from commit 772191616a0cceebf91a9674ce7417d5cad0050f) Change-Id: Ib3c0421247a20f047d396b13ec17dbfe27cb780c Reviewed-on: https://gerrit.libreoffice.org/27789 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-07-28Resolves: tdf#63662 'Manual Column Break' always visible...Caolán McNamara
even when non-printing chars is off. I think this began as an intermediate step for both page and column breaks to the header/footer overlay we now have for page breaks. Leaving this just for column breaks. It may have been set to always on with page-breaks in mind. Change-Id: I1617683e2bb8c1f9229e9c2313e7817e184fa5ea (cherry picked from commit 9e63e60d6f00ee690fafb9f21f2cafb08a6ad92e) Reviewed-on: https://gerrit.libreoffice.org/27579 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-07-25Resolves: tdf#101058 crash on deleting certain table rowCaolán McNamara
regression from... commit 15d8b51bf82610c663f80fe552a1c0315e137ad3 Author: Caolán McNamara <caolanm@redhat.com> Date: Tue Feb 5 17:33:49 2013 +0000 Resolves: rhbz#907933 crash on removing second last para in cell... if (basically) the last para is on next page so revert that and try a different fix which now works to keep the original problem crash-free and fix this one too (cherry picked from commit e22122e20ca69d0f2b0e8831e9ebf3afd2064329) Change-Id: Ia6b3ef48c43ceceb7ee7cc2b8b803314349f3785 Reviewed-on: https://gerrit.libreoffice.org/27480 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-07-25Resolves: tdf#59896 ww6 plcf generation reversed checkCaolán McNamara
regression since... commit 69e040a59e1c6497b606da8a27e8f605edd041bb Author: Caolán McNamara <caolanm@redhat.com> Date: Sun Jul 17 00:19:00 2011 +0100 check seeks, check available size, pointers to ref Change-Id: Idfcde46959e5693d200a91a619e7196f00f40ca0 (cherry picked from commit 99833c2d6c9882bfad17e3e7fb659f5a81184a3f) Reviewed-on: https://gerrit.libreoffice.org/27430 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-07-25Resolves: tdf#95340 orig lcl_ChkUnoCrsrPaM had reversed 'set' to lcl_ChkPaMCaolán McNamara
restore lcl_ChkUnoCrsrPaM (cherry picked from commit 133ad42956ff38fe94020cd9aab316c9dfceff60) update to new naming and casting (cherry picked from commit dcae0b482ca78fc9cd6f8523f53aad8c8b486b0f) bChkSelDirection is always false (cherry picked from commit 12d9292cd948dbf78bdcab4a46694563b3cce3cf) rename lcl_ChkUnoCrsrPaM and split it up to be like lcl_ChkPaM[Both] (cherry picked from commit a3094a1f898b9efb765fe822fc507d3be4369361) merge lcl_ChkUnoCrsrPaM and lcl_ChkPaM keeping the original logic, turns out they differed in how they swapped the mark and point (cherry picked from commit a58e46482c2af06ee9be26313db3513f906d6c0b) Change-Id: Iab155151226f3a7f00ca649bd690c4391ade8a52 389efc2f45f3110932318882faea82ab8565f89a 1aaf2c17d76ac1d69dfcc268ae1b689c0f1c3fa2 8850031da3901fb3d828c3af20f98ca741fc2a4a d2575c9690442494c3286a26ab099e8c4c62f884 Reviewed-on: https://gerrit.libreoffice.org/27382 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-07-21Related: tdf#100813 crash in this doc on scrolling past page 44Caolán McNamara
Change-Id: Ib9f1f6f43229ce29e7db7e3fcdacaa10fb692ca4 (cherry picked from commit e1b90609d50b9b8bb48e7c6548b197ed7de77253) Reviewed-on: https://gerrit.libreoffice.org/27362 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
generated by cgit (git 2.34.1) at 2024-06-17 03:45:59 +0000