summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2018-09-04tdf#109188 Always load documents read-only in SwOneExampleFrameSamuel Mehrbrodt
Should be no problem since 38a3743e0c5d52f9386f74097fd512d3133fbbe3 Reviewed-on: https://gerrit.libreoffice.org/40140 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit bde72cdae1e7e001d5089c5284672c976b8e43df) Conflicts: sw/source/uibase/utlui/unotools.cxx Change-Id: I0ce47bc2bdaa900559a16baf25305066977caa6d
2018-08-31sw: fix inconsistent bookmark behavior around at-char/as-char anchored framesSerge Krot
Added fix for Change-Id: Ic1f173c85d3824afabb5b7ebf3a8594311eb9007 Reviewed-on: https://gerrit.libreoffice.org/46889 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> The problem was (the same condition of the bOnlyFrameStarts parameter was used during output of Start and End bookmarks): if (BkmType::Start == pPtr->nBkmType && !bOnlyFrameStarts) ... if (BkmType::End == pPtr->nBkmType && !bOnlyFrameStarts) ... Should be: if (BkmType::Start == pPtr->nBkmType && bOnlyFrameStarts) ... if (BkmType::End == pPtr->nBkmType && !bOnlyFrameStarts) ... I assume this was a simple copy-paste bug. Reviewed-on: https://gerrit.libreoffice.org/59556 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Conflicts: sw/source/core/unocore/unoportenum.cxx It looks like you may be committing a cherry-pick. If this is not correct, please remove the file .git/CHERRY_PICK_HEAD and try again. sw: fix inconsistent bookmark behavior around at-char/as-char anchored frames Added unit test for Added fix for Change-Id: Ic1f173c85d3824afabb5b7ebf3a8594311eb9007 Reviewed-on: https://gerrit.libreoffice.org/59828 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx Changes to be committed: new file: sw/qa/extras/uiwriter/data/testInconsistentBookmark.ott modified: sw/qa/extras/uiwriter/uiwriter.cxx 38444587d00b96d52ff725dc7c5852e057bc6bd9 Reviewed-on: https://gerrit.libreoffice.org/59854 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Change-Id: I712a0dccc1638fed3b81c65628033a4dc06c1ca4
2018-08-29tdf#101856 Handle properties of nested bookmarksSerge Krot
Change-Id: I1a92d2001e58751c5bbe41f6480f4c46dcc8c9e7 Reviewed-on: https://gerrit.libreoffice.org/59704 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-08-14Disabled async/parallel chart loading for nowArmin Le Grand
Need to check deeper for circumstances leading to problems Change-Id: I58c9601008edc53c958d59d04a30d11bc0c1bba3 (cherry picked from commit be08f61d6f4121079c534af386139db23d0dd2c3)
2018-08-09Related: tdf#50613 use an own instance of ThreadPoolArmin Le Grand
Using the global ThreadPool (getSharedOptimalPool()) can lead to problems when more than one usage executes and one of them already calls waitUntilEmpty() what of course influences the other usage. Thus I added an own instance of ThreadPool for async loading of chart models in writer Change-Id: I4bea64af0d36e87081abec95c75574966d0fe5b9
2018-08-09sw: tdf#50613 fix async chart load handlingArmin Le Grand
Especially if synchronous loading is requested, an async worker is on the way and we would need to 'wait' for the data. Change-Id: I20f9938738c1b46bda6b9a7f5a761e82153aed3b
2018-08-09sw: tdf#50613 fix waitFinished into a loopArmin Le Grand
Change-Id: Ic8a720657c326d8d51bb3a73688b8f02b7096488
2018-08-09tdf#50613 add support to load charts asynchronouslyArmin Le Grand
Generating primitives for chart visualisation can be moved to a paralell executed task that loads the chart, thus speeding up initial visualization. This is not possible for e.g. PDF or print targets, only for edit visualization. On fallback, the replacement images of the charts are used which are metafiles and have less quality as primitives, but load quicker. Change-Id: I68caa9e1bec50832bce535b5f54633d53cdef037
2018-08-09tdf#50613 buffer OLE primitives for chartsArmin Le Grand
If OLE is a chart, buffer the primitives used for presentation as info at the SwOLEObj, after getting them the first time using the ChartHelper. Change-Id: I6d7486185f6eac450de9328d37ea800f424f351b
2018-07-13Refresh linked OLE representation when OLE updatedArmin Le Grand
Change-Id: If949778779f1a91901412938d0b0298e1d7cfc3e Reviewed-on: https://gerrit.libreoffice.org/57357 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
2018-07-05tdf#101856 sw: hidden bookmark portions in SwTextFormatter::NewTextPortion()Michael Stahl
All other hidden-text features already have a AUTOFMT hint or a TXTFIELD hint, so the SwAttrIter already creates new portions for them. The bookmarks aren't considered by SwTextFormatter currently, but SwScriptInfo already has all of the required info. Change-Id: I451ce331110aa58df8955e1a3ffa339e6f905b22 Reviewed-on: https://gerrit.libreoffice.org/56937 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-07-04tdf#86612: statusbar: hide some elements if width is not sufficientVasily Melenchuk
new statusbar element property mandatory=true/false to determine if this element can be hidden if total statusbar width is not enough to fit all elements. marked some calc, draw, writer and impress statusbar elements as not mandatory. Reviewed-on: https://gerrit.libreoffice.org/56443 Reviewed-on: https://gerrit.libreoffice.org/56719 Reviewed-on: https://gerrit.libreoffice.org/56859 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Conflicts: framework/source/fwe/classes/addonsoptions.cxx framework/source/uielement/statusbarmerger.cxx sc/uiconfig/scalc/statusbar/statusbar.xml sd/uiconfig/sdraw/statusbar/statusbar.xml sd/uiconfig/simpress/statusbar/statusbar.xml vcl/source/window/status.cxx Change-Id: I9a634fd7aa7cfa502e445aa3d8ef1c035c21cca8 Reviewed-on: https://gerrit.libreoffice.org/56932 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-06-27tdf#118322 Avoid blinking in Exporer for 'Section' partArmin Le Grand
When having entries in 'Section' part of the Explorer in Writer and there are invisible/hidden ones, the check for changes in visibility has to be done after the whole list is created since these Lists are sorted-lists. This was changed and worked before by directly comparing single list entries index-based with the old ones. Change-Id: I8e647cc9161d0555f84a028afbc6f37c716e8c9f Reviewed-on: https://gerrit.libreoffice.org/56296 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
2018-06-25tdf#113877 Insert doc: merge list into text with specifc styleSerge Krot
When inserting document, in the current position the text could have custom style but really it is the same Standard style. Therefore we should not merge first inserted node into the insert position and just overwrite style in the insert position with text style from the inserted node. Change-Id: Ib67c56bed3d30f356f83dc0b4d4a1710def10853 Reviewed-on: https://gerrit.libreoffice.org/56052 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/56408 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-06-18MM don't keep undo informationJan-Marek Glogowski
Doen't make much sense to store undo information for all merge based progress. Actually it even prevents crahes when undoing a merged ODT document. Conflicts: sw/source/uibase/dbui/dbmgr.cxx Change-Id: Ic3a3982f3e5eb4f6de9f027a6a5e376c2833e8a5 Reviewed-on: https://gerrit.libreoffice.org/56023 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-06-12tdf#118113 MM: Make sure page count is up to dateMichael Weghorn
Since the page layout may have changed, e.g. due to the visibility status of hidden sections having changed in the call to 'pWorkShell->SwViewShell::UpdateFields()', it's necessary to recalculate the layout to ensure that the correct page count is retrieved when calling 'pWorkShell->CalcLayout()'. This fixes a regression introduced by the performance optimization done in commit ae5afe9bcebdd220a457829d47882fe8a0cf69fd, while still avoiding to have to do the expensive layout for the target document. Change-Id: I46f1b68758e4df330c17358a8e852e8b040a9520 Reviewed-on: https://gerrit.libreoffice.org/55636 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 89f896d2cfd84b711583f98a6343e9835a9aed11) Reviewed-on: https://gerrit.libreoffice.org/55699 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-05-25set Referer on link mediadescriptorCaolán McNamara
to allow determining if the source document is from a trusted/untrusted location Reviewed-on: https://gerrit.libreoffice.org/53693 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit cd25a97bbadc0a5c1fd6b0e8603c8b6ebd051926) Reviewed-on: https://gerrit.libreoffice.org/53803 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 2d87c267267530077a94c894bc619831b01d1c04) Conflicts: sw/source/filter/xml/xmltexti.cxx Change-Id: I780568652d2ef0cc8543c27ba26289277b5d9d0c
2018-05-22remove page count check in a test (irrelevant and fragile)Luboš Luňák
If I load this document in LO, either my build or distro build, it has only one page, so the test fails for me only because of the 2-page check. The commit causing this, b904d639a8, has been in for quite a while, so it's apparently something special about my setup, but a) the test doesn't actually require 2 pages for anything, b) the commit mentions that the test is fragile, c) if I manually inspect the .rtf, there's an extra page that I do not see even in Word2013, so the document is possibly a bit broken. One way or another, the page check seems pointless. Change-Id: I18bdf25f71e8eb9225acd667e60f426fca008ee4 Reviewed-on: https://gerrit.libreoffice.org/53380 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 6154d04d90b7b4f68e6c3629bf0c6306ef64a937)
2018-05-17tdf#117668 Fix wrong number of sections in documentSerge Krot
Change-Id: Ia2b8a1376f4f2b4e790598255ae69fb6ee92d23d Reviewed-on: https://gerrit.libreoffice.org/54423 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 27c9370b5fd00b851582e4163907656286e8c581) Reviewed-on: https://gerrit.libreoffice.org/54485
2018-05-17tdf#117664: mailmerge: copy printer settings to new mailmerge documentVasily Melenchuk
Created mailmerge output document was not using current printer settings, which can be taken not only from settings, but overriden by currently opened template. Reviewed-on: https://gerrit.libreoffice.org/54358 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Conflicts: sw/source/uibase/dbui/dbmgr.cxx Change-Id: Ic127dcbfbe8f1e80073b06ecb399100344f4c01d
2018-04-30Fix: nNodeCnt could be set to negative valueSerge Krot
Change-Id: I82e9b150e97e733c4063f7498dc026e0c9f903c0 Reviewed-on: https://gerrit.libreoffice.org/53660 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-04-21forcepoint #28 missing cell on abw importCaolán McNamara
Change-Id: I7633a17afab5aa2eb9e47a552bd5d92c87d383c7 Reviewed-on: https://gerrit.libreoffice.org/51853 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-04-21forcepoint#36 avoid dangling SvTextShapeImportHelper in case of exceptionsCaolán McNamara
Change-Id: Ibdbc047029c31d2b06d2349d68e1cbd9b15fd514 Reviewed-on: https://gerrit.libreoffice.org/52137 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-04-21forcepoint #24 back() on empty vectorCaolán McNamara
Thanks to Antti Levomäki and Christian Jalio from Forcepoint. Change-Id: Idb6723b53a1ae8aaca80847bfe643bc4abaedd21 Reviewed-on: https://gerrit.libreoffice.org/51123 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-04-21forcepoint #17 nTextBreak is an index into pKernArray of len rInf.GetLen()Caolán McNamara
Change-Id: I3afeaf987cc5e75362560165fea7230904530933 Reviewed-on: https://gerrit.libreoffice.org/50630 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2018-04-21forcepoint #10 pop empty stackCaolán McNamara
Change-Id: I96452a86187a6b03251614625445d1b18a5ee218 Reviewed-on: https://gerrit.libreoffice.org/50359 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-04-21ofz#6173 check index before useCaolán McNamara
Change-Id: I09d15ab324af0a8b3566f11868eb3266a68c4afe Reviewed-on: https://gerrit.libreoffice.org/49500 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit e355d7d691cfe9719b06e15129d86ec22a2bd7a4)
2018-04-12tdf#50057 sw: fix duplication of at-paragraph anchored flysMichael Stahl
The problem is that the flys that are anchored to the first paragraph of a SwRedline do get copied by SwRangeRedline::CopyToSection(), but they don't get deleted by DelCopyOfSection(). Copying is enabled because the setting of the SetRedlineMove() was made conditional in commit 65de5382a389cc7edf1cdf506da4fb43a4d33a9f "#100619# fixed problem with hiding deleted graphics", which isn't justified in any way and which i can't imaginge a good reason for, given that the flys anchored in the first paragraph are all skipped in DelFlyInRange(), so why would you want to copy them; hence this reverts that commit. The interesting check for the redline_fly_duplication_at_para_end_inside case is actually the one that was added in commit 23e52c207760c596cc2f841ef59f3100c110d591 Change-Id: I96fb294a5456e7f1172a5f408ebcb21cf211c276 Reviewed-on: https://gerrit.libreoffice.org/52729 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 7db137e87177dbe381186491ca36e3e8fd62ddc2) Reviewed-on: https://gerrit.libreoffice.org/52733 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit e7b399c94317170e4f6551648f9bbcc5448fd920) Reviewed-on: https://gerrit.libreoffice.org/52773 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-04-03Update loop prevention in SwContentFrame::MakeAllVasily Melenchuk
In some cases there is an endless loop with just two states switchin one into another. To avoid such freeze now 2 last states are kept in loop prevention code. Reviewed-on: https://gerrit.libreoffice.org/51996 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Conflicts: sw/source/core/layout/calcmove.cxx Change-Id: I64fe8aecd5d972eecc9fde3a96d8729960a1998e
2018-03-13tdf#114552 Convert anchor toggle to anchor menuSamuel Mehrbrodt
Since we now have three, not two anchor types. Reviewed-on: https://gerrit.libreoffice.org/50987 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 1a7444ed69a68696b05feb3f3618b6704a140ba6) Change-Id: I9654de574a9d546d2191093cba9c192fac3cd3d7
2018-03-02tdf#109080 First page header/footer ODF (1/2)Luke Deller
The proposal to add <style:header-first> / <style:footer-first> to the ODF standard has not yet been accepted, so meanwhile we should be using an extension namespace for these elements. This first commit (intended for backport) adds support for reading <loext:header-first> / <loext:footer-first> Change-Id: I616b6a0acaead9d767ae7d119e539b865f3a6774 (cherry picked from commit bff8cd3d52223002263dcb8c09758c4fc753b6e3) Reviewed-on: https://gerrit.libreoffice.org/40227 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit c027764f94a1fc0a367e03b412d3c11d6c10769c)
2018-03-02tdf#101856 Fix crash in Insert Bookmark dialogSerge Krot
Change-Id: Idf892b9045429dc5826e995551b8e789c14600b8 Reviewed-on: https://gerrit.libreoffice.org/50616 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-03-01tdf#101856 Backport parsing of bookmark propertiesSerge Krot
Change-Id: I7654aa93d4d86a5d36201832ac3609b9f4c30e03 Reviewed-on: https://gerrit.libreoffice.org/50565 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-02-27Make shell stack more robust against rogue extensionsKatarina Behrens
It shouldn't happen that a view is placed above the shells it has spawned on sfx2 dispatcher's shell stack 'cause during dispose, such view gets deleted before the shells that still refer to it. Alas it does happen with Wollmux (which makes couple of Writer UNO API calls before SwView is activated) so guard against that Change-Id: Ic7f21992c5e55a48c63dffc733c8f5b0a59a9126 Reviewed-on: https://gerrit.libreoffice.org/50256 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit b7e3e73b8015e20f8303ea1f2a2156128ae411e2)
2018-02-21tdf#83260 editeng sw: avoid accessing dead nodes in AutoCorrectFyodor Yemelyanenko
When change tracking is ON (Redlining) and Edit->Change Tracking->Show==OFF Autocorrection and Undo operations crash LO. Change-Id: I616f2de143b78fc83483a6589cfa1dd1ab61675a Reviewed-on: https://gerrit.libreoffice.org/47686 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit aac475436271ddeabf6d9a4c3984ba77accf56ce) Reviewed-on: https://gerrit.libreoffice.org/49794 Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit aff321ae3c872ad881252979c9f10ab1a01c0ea0)
2018-02-20tdf#101856: disable a few tests until feature is finishedThorsten Behrens
Round-tripping in ODF not fully functional, disable some tests Change-Id: I36638b5d4144524ae04c1ce4c6e82b917c867251
2018-02-19tdf#115519: Handle rotation for WriterFlyFrames correctlyArmin Le Grand
Adapted due to no transformation is written here, but still controlling the values of persistent data is a good thing. Change-Id: I5f29b3640eaf24d63c64edfecd6732f336582640 Reviewed-on: https://gerrit.libreoffice.org/49826 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de> Reviewed-on: https://gerrit.libreoffice.org/49897 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-02-19tdf#101856: Use bookmark attributes at loadSerge Krot
Conflicts: sw/source/core/text/porlay.cxx Change-Id: I935c50f8b3a1d7179121b9230a7f7f25fa6aea22
2018-02-19tdf#101856 odt: write/read new bookmark attributes: unit testSerge Krot
Change-Id: I094f91c2af2d171067e3c37a8d52276835d36e9c
2018-02-19tdf#101856 add new checkbox/editfield for hidden/condition attrsBernhard Widl
Conflicts: sw/uiconfig/swriter/ui/insertbookmark.ui Change-Id: Ibf067f7862d9d70d00d2e45ab0fcf74ec2fe1175
2018-02-08Pull in corresponding changes from master's ooxmlexport10.cxxThorsten Behrens
Fixup for 4b282dc07884f39d31edffb256e608e91eb266b3 This is probably c829e01e973ac32fb625925ce83f843ad30d94db and 893698741a78e56d74b87caff24f67742ddd892b from master. Change-Id: I21b8de56c0b8fd1ebf20452e2cc018ef0176f3f5
2018-02-08Pull in rest of master fix for tdf#72942Thorsten Behrens
This is the part of deaa16bd24fba4a3a6b072ab2b94542a7dbd41c6 that touched sw/qa/extras/rtfexport/rtfexport2.cxx Change-Id: If27eb46b0acc48dfb368775224a72a8bbe63d96b
2018-02-06tdf#114306 fix crash caused by special document 2Manfred Blume
Regression from 18765b9fa739337d2d891513f6e2fb7c3ce23b50 Change-Id: Ic4205777077e4e3d93bdddf743c51abba8950eaf Reviewed-on: https://gerrit.libreoffice.org/49031 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit d30eefb677b446886f7b5bab6de93d489ba63529) Reviewed-on: https://gerrit.libreoffice.org/49309 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-02-02related to tdf#97417: fix unit test's early para numberingJustin Luth
The unit test's first blank page already started the paragraph numbering. Setting it so that a contentless, single paragraph section will not display numbering. In fact, no dummy paragraph should have numbering, but that would get complicated. This is in preparation for tdf#104710. Reviewed-on: https://gerrit.libreoffice.org/32235 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit c829e01e973ac32fb625925ce83f843ad30d94db) Reviewed-on: https://gerrit.libreoffice.org/32326 Reviewed-by: Justin Luth <justin_luth@sil.org> Change-Id: I98c9926cb3cd1e3fe3cd43bf46cab22bfbec7eba Reviewed-on: https://gerrit.libreoffice.org/49035 Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-01-30tdf#72942 Do not overwrite styles from the inserted docSerge Krot
During inserting of the text from the external document we should not change original default styles in currently opened document. Added unit test. Change-Id: Ida754a0da5efaaa043464cd807c0b52cfb0d5670 Reviewed-on: https://gerrit.libreoffice.org/48861 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-01-29BorderlineFix: Fix WriterPaint if scrolling CellTableBordersArmin Le Grand
Similar to CalcBorders in Writer the overlap regions for FrameBorders have to be taken into account when repainting the CellBordes of WriterTables Change-Id: I488ba158e1de579bfb06b9c8353adaa2cac706c6
2018-01-29BorderlineFix: Need to redesign Borderline paint for CalcArmin Le Grand
To fix some errors, need to change svx::frame::Array conversion to Primitives, especially regarding handling of merged cells. These make problems in the currtent form where the full extended merged cell tries to be converted. This is bad for cropped stuff and also wrong for double-line stuff attaching to a merged cell. The solution is to handle cells single and merge created primitives which is more expensive but will work. This will involve special handling for X-Ed (crossed) and 'roated' Cells. Also need to be very careful since all this is used in the meantime for all visualizations of Tables in multiple apps/situations. Change-Id: If0652a3ba97a6f27dd5d782ea22b1514303f3710
2018-01-27tdf#114306 fix crash caused by special documentManfred Blume
Regression from 18765b9fa739337d2d891513f6e2fb7c3ce23b50 chnage signature of static void lcl_RecalcRow( SwRowFrame& rRow, long nBottom ) to static void lcl_RecalcRow( SwRowFrame* pRow, long nBottom ) Reviewed-on: https://gerrit.libreoffice.org/48613 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit e4400f4c4e267f8528df3a7d5a09623c888bd10c) Conflicts: sw/source/core/layout/tabfrm.cxx Change-Id: Ie00435aa4bffa3d2e49896aea6894ae999a5536a
2018-01-26tdf#100033: Frames with the same name are removedTamás Zolnai
Allow to have frames with the same name. For removing real duplicated frames (generated by LO earlier) check other things also next to the frame name: position, size or whether the two frames are anchored to the same position. Reviewed-on: https://gerrit.libreoffice.org/37702 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 6952d696439981962ad378aa28b0d16ea6e48f0e) [This backported commit fixes Trac #23263.] Conflicts: sw/qa/extras/odfimport/odfimport.cxx xmloff/source/text/XMLTextFrameContext.cxx Change-Id: I191ae5128d0228eb85f78f065b44b1f0b3ba6dcf
2018-01-23We don't need thisThorsten Behrens
Change-Id: Ide67559b13016e764c6753b9f5a4ec237bc283f3
generated by cgit (git 2.34.1) at 2024-07-15 12:27:53 +0000