summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2017-08-24tdf#108524 sw: allow move of frame inside section without columnsMiklos Vajna1-9/+6
The intention here is to deny the move of a frame that's inside a table inside a section. But the code also checked if there a column frame in-between, so it allowed the move for a frame in a section with 2 cols, but not without columns (which does not sound intentional, since that's a simpler case). So drop the requirement to have a column frame between the argument and the section frame, just check that there is no table frame in between. This is needed, but not enough to split the section in the bugdoc (but at least now the content of the section is marked as movable). Change-Id: I9155b291a19c692efc30f01f8e206fac5f1ccf81 Reviewed-on: https://gerrit.libreoffice.org/38858 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 6ade80cf142664e78954c7544534e9436ceb90c7)
2017-08-24tdf#108524 sw: try to split rows that contain 1-col sectionsMiklos Vajna1-1/+16
We used to not even attempt to split a row that contains sections. Relax this condition and try to split the row in case the table itself is not in a section (to avoid recursion) and the section has no columns. This is needed, but not enough to split the section in the bugdoc. Change-Id: I6ad0d6eb18611f108ae29e4feea7101ffe552c48 Reviewed-on: https://gerrit.libreoffice.org/38824 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 336ec28195da1917c22494a24dbaf10b846d3141)
2017-08-24Related: tdf#108524 sw: dump follow/precede of cell frames in layout xml dumpMiklos Vajna2-0/+11
These point to the other cell frame on the previous/next page (in case the cell frame is split across multiple pages). Change-Id: Ic03cf9a194a49320d84dbdb5176fa737e5d6520d Reviewed-on: https://gerrit.libreoffice.org/38818 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 835c1586f60e6bc03e045e8210e38876e0fe1abc)
2017-08-24sw: add new TextParagraph property to XTextRangeMiklos Vajna6-0/+39
A text range represents a selection or cursor position, so similar to sections or tables, it makes sense to expose the containing paragraph as well. This new property does exactly that. Reviewed-on: https://gerrit.libreoffice.org/40483 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 7ed402ba648dd0f3de3b0dadebc13403b2c0a620) Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx Change-Id: If92a3b5e61f13c7c14ca52bc8593a2b286a596cc
2017-08-24SwXDispatchProviderInterceptor: implement frame::XInterceptorInfoMiklos Vajna2-1/+16
With this, framework::InterceptionHelper can make a better decision what interceptor to call: it can avoid calling SwXDispatchProviderInterceptor when the sw code would just call the previous interceptor anyway. Change-Id: I92897f2c8baa264dc9ccbc11b63f415da30a910d Reviewed-on: https://gerrit.libreoffice.org/25961 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit b0d819ac5667a07f629f2acb5d3c542fa76d348b)
2016-08-24Resolves: tdf#100901 crash pressing tab in r-o document with hyperlinkCaolán McNamara1-1/+3
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/28243 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-08-09Resolves: tdf#101359 getBookmarksCount includes more than aTableBookmarksCaolán McNamara2-5/+8
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 Vajna2-0/+41
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 McNamara3-0/+7
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 Mohrhard1-4/+4
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 McNamara26-48/+47
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 McNamara1-9/+16
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 Glogowski2-22/+3
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 McNamara1-18/+0
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 McNamara1-1/+2
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 McNamara2-24/+3
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 McNamara3-2/+11
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 McNamara1-7/+12
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 McNamara1-2/+2
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>
2016-07-21Resolves: tdf#100731 include palette in checksumCaolán McNamara1-1/+1
Change-Id: I084d840b9fa078ebea3ff1471d8c8bc88171abc7 (cherry picked from commit 8624d2c8e3be89c794d3cfcfb72685fcb18e4d24) Reviewed-on: https://gerrit.libreoffice.org/27291 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-07-21tdf#61901 RTF export: fix implicit font name of non-ascii textMiklos Vajna3-0/+37
The problem was that in case we used \loch, then \f only had an affect on ascii characters, not on every other character range. Change-Id: I30a851fe28131f18f5c429273a24c1424d2cec22 Reviewed-on: https://gerrit.libreoffice.org/27310 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 43e049c32302620bbc134732286529496853d78a) Reviewed-on: https://gerrit.libreoffice.org/27383 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-07-21tdf#98798: MM Wizard should not leave MM toolbar visible when canceledBjoern Michaelsen1-27/+39
This remembers now the state of the MM toolbar before the MM wizard was started and reset the visiblity of the toolbar to that state when canceled. Change-Id: I390feae3287c10d3d0c93dbfa64037229c5327e2 Reviewed-on: https://gerrit.libreoffice.org/27359 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> (cherry picked from commit 20245ba9755e1c0199359c3462eff974f33c1bec) Reviewed-on: https://gerrit.libreoffice.org/27370 Tested-by: Jenkins <ci@libreoffice.org>
2016-07-15Resolves: tdf#100538 make searching in shape text a libreoffice-kit only thingCaolán McNamara1-22/+26
This effectively reverts for the normal-app commit bdc1824ea7acfa2fe9d71cdbe57882acce155577 Author: Miklos Vajna <vmiklos@collabora.co.uk> Date: Tue May 19 17:20:10 2015 +0200 SwPaM::Find: search in shapes anchored to the range The catches are that... writer will use SvxSearchCmd::Find and not SvxSearchCmd::Replace when Replacing text, and replacing it afterwards. So replace doesn't work. It might be possible to mitigate that by passing down the m_bReplace to SwPam::Find and do a SvxSearchCmd::Replace on the editeng SearchAndReplace in that case and then change the return code to not-found/found-in-writer/found-in-drawing to figure out what to do there. regexps are disabled in the ui for draw/impress, maybe because they seem not be fully implemented right wrt matching empty paragraphs, so using regexps in writer and letting them into editeng via this loophole is new territory for the editengine (cherry picked from commit 46b52c22bfb6b145af3c8407fd96321381e78d99) Change-Id: I2875b374a7ede8edd7f479254cbc2da36488abc8 Reviewed-on: https://gerrit.libreoffice.org/27154 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-07-15Resolves: tdf#100813 crash during pagination of particular docxCaolán McNamara1-0/+3
Change-Id: Id2c99cc6c5fe4c3a5bcf3c0b3f16b603cdd46239 (cherry picked from commit f374e01af32c7752b31455642e7d76f2056a2aeb) Reviewed-on: https://gerrit.libreoffice.org/27050 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-07-14tdf#99090 docx export page-break only inside a paragraphJustin Luth2-1/+19
If a paragraph hadn't been started yet, a w:r was being written directly in the /document/body which caused MSWord to complain about a corrupt document. Reviewed-on: https://gerrit.libreoffice.org/26771 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 07fb94655f4745eb4e80bf6e8d4cdd95371f23bb) Change-Id: Ie7f629869aab0f3d2405660a033c3f23bbd6baca Reviewed-on: https://gerrit.libreoffice.org/27116 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-07-13tdf#76349 writer: treat single-column break as page breakJustin Luth1-1/+4
Writerfilter imports docx-defined column breaks that exist without being in a column. Word treats these as if they were a page break. Writer basically just preserved and ignored them. I limited the fix to only consider SVX_BREAK_COLUMN_BEFORE since writerfilter is only given “column break” and treats it as column_before. Change-Id: I0d974441d53243c4426048dd7cb60b3897b803f6 Reviewed-on: https://gerrit.libreoffice.org/26181 Tested-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 2721111437706372eaac9bf1d748723196c573ac) Reviewed-on: https://gerrit.libreoffice.org/26786 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Jenkins <ci@libreoffice.org>
2016-07-09tdf#100820: missing nullptr check in writer's apphdl.cxxMarkus Mohrhard1-1/+1
Change-Id: I32c22b1e2c6ee23ca712bde7b7f86dada654b802 Reviewed-on: https://gerrit.libreoffice.org/27067 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 81889ab4ce49e83ef4914dbff403b839c718a08a) Reviewed-on: https://gerrit.libreoffice.org/27068 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-07-05re-enable unit tests accidentally disabled with HAVE_FEATURE_ATLMichael Stahl3-9/+9
Macro is only true on WNT, but the tests should be enabled then. Change-Id: Ife5657c8204c9906afd42b4b4671a7fa6356a748 (cherry picked from commit 110a500b68bbc9010cf1cf896ef611c397c27d6f) Reviewed-on: https://gerrit.libreoffice.org/26864 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-06-29tdf#100495 sw: Exchange Database shouldn't delete the created odb fileMichael Stahl1-1/+0
(regression from f01f31201f9b26b3071ab25f9a5a3a0311ff7423) Change-Id: Ie5b83a82711229bda045b7ef7a9167cfd873f616 (cherry picked from commit 5a042dad2779eefc76269e14b888bd84df590aac) Reviewed-on: https://gerrit.libreoffice.org/26722 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-06-24sw: fix STL asserts in lcl_MoveAllLowerObjs *again*Michael Stahl1-1/+3
Comment added in cf91483690291272f48ff95c1aebd165da8ae4f0 evidently insufficient. (regression from b415494bf0468b74318b61f114e2ff4ae68c00ee) Change-Id: I9a017aefc3a77b0760fcdc3b8e43ff7c6ac516ac (cherry picked from commit e7d8cb3ec22906d5d45ba65e0a0cfccd68d202e8) Reviewed-on: https://gerrit.libreoffice.org/26620 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-06-23sw: fix crash on pasting from an already closed documentMiklos Vajna1-1/+2
As pointed out by <http://crashreport.libreoffice.org/stats/signature/%60anonymous%20namespace'::lcl_checkClassification%28SwDoc%20*,SwDoc%20*%29+0x0>. Thanks to Michael Stahl for figuring out the list of steps to reproduce this bug: 1) Create a new Writer document 2) Type some text 3) Select all 4) Copy it 5) Close the document 6) Create a second Writer document 7) Paste -> crash (cherry picked from commit 1bc3c88bc9ed085bf7e173cb12f313934d92f309) Change-Id: I8cfcad465803e37ec9d01d035428c5ca953adf14 Reviewed-on: https://gerrit.libreoffice.org/26613 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-06-20tdf#95797: Don't jump to the cursor position after auto-save.Jan Holesovsky1-2/+2
Apparently the commit 07c7c88bc2d9d860ea92ab562ea0431ec1949b29 changed the condition; I suppose that not deliberately. Big thanks to raal for the bisect! Change-Id: I775e133396ceb763e31aca101d365880652e1ac8
2016-06-19tdf#91781 Move bookmark and cross-reference to root insert menuYousuf Philips1-6/+2
Change-Id: I06485c07e6c6fd3621fdfc99b7176107bb0ee999 Reviewed-on: https://gerrit.libreoffice.org/26418 Reviewed-by: Yousuf Philips <philipz85@hotmail.com> Tested-by: Yousuf Philips <philipz85@hotmail.com> (cherry picked from commit 42dc04de01cb937b5a64d23f54e8dfe5f4c9b35f) Reviewed-on: https://gerrit.libreoffice.org/26419 Tested-by: Jenkins <ci@libreoffice.org>
2016-06-17sw: speed up the navigatorMichael Stahl5-4/+71
The call to SwTextBoxHelper::findTextBoxes() in SwDoc::GetFlyNum() made this so unbelievably slow that in a dbgutil build opening the navigator on the bugdoc of tdf#94212 the UI freezes because getting all the fly frames takes longer than the 1 second timeout. Lets's not retrieve the flys one by one but instead all at once, which makes it usable again. Change-Id: Ic41c1648a82dcc3f758ae1b08bac6058f541f25e (cherry picked from commit 5593d9e1422cbf8a122fa612713a832274d30559) Reviewed-on: https://gerrit.libreoffice.org/26425 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-06-17tdf#91684 RTF import: handle fFlipH and fFlipV shape propsMiklos Vajna3-0/+583
Also: Related: tdf#91684 RTF import: fix scaling of group shape children It was assumed that the child size is in twips, but it's in relative coordinates. (cherry picked from commits c3acc06230169f141930945ebbff43b1a88dfdee and 63965d7dc571c7dce999980737f9d57a7c5151da) Change-Id: I930f99647de00c2e43ef94b1ac0320daa440eae9 Reviewed-on: https://gerrit.libreoffice.org/26430 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-06-17Resolves: tdf#100421, don't crash on deleting particular tableCaolán McNamara2-3/+6
Change-Id: I52a4cf0732240aa26147313ae6a52c4fd8d8933c (cherry picked from commit 4561119a8bab986df25a5ce2a544aa96394cbd5d)
2016-06-17Related: tdf#100421 crash in a11y on load of source odtCaolán McNamara1-6/+8
stldebug assert because end is before start and we can'g get to start from end in a std::set (cherry picked from commit e41a694c8b4fd1503b31f3a9da326e9f7ddd1b79) Change-Id: I0471220d3940e08b564f88841703a539aaf369d6
2016-06-16Resolves: tdf#100422 crash if you exit mail merge wizard...Caolán McNamara1-7/+10
after loading previous document or template Change-Id: I3bdd1159e367b0297aee84763bf5c4312e9e91fa (cherry picked from commit f04c48a7e764775bdd98715e5d17845f1786bd44)
2016-06-16tdf#98797 sw: try to fix crash in SwMailDispatcherListener_ImplMichael Stahl1-2/+4
Commit c48df7ad7d49ac093058ceb28d6d3f272f6e2e07 added a isDisposed() call in SwMailDispatcherListener_Impl::idle() and i can't see why that would not be necessary in the other functions that access m_pSendMailDialog if it is necessary in idle() - it's not obvious *why* it would be necessary in idle() in the first place but obviously i don't understand when SwSendMailDialog::dispose() is invoked (which is what deletes m_pStatus, dereferencing which the backtrace crashes). There is code in SwSendMailDialog::dispose() to handle the case that the xMailDispatcher thread is still running, and stop it without joining, which would obviously trigger this crash if it were ever executed. (Maybe i should actually try what happens at runtime, but these mail-merge dialogs are all scarily confusing.) Change-Id: I550f6107b064b0c97f3d33bed5bd3830fa2e86f4 (cherry picked from commit aa35f2981334ba2e5aed4269fe851054bbc584dc) Reviewed-on: https://gerrit.libreoffice.org/26353 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-06-15tdf#100105 sw: RTF export: fix empty hyperlinksMichael Stahl3-14/+33
For empty hyperlinks the EndURL() is called immediately after StartURL() Due to the way the various buffers are written, the group closing braces are written before the groups are opened, which is rather invalid. Using the m_aRun buffer instead of m_aStyles appears to fix the problem. (regression from b8907bf3d3b37c686a414ffbbd2d732348aab5b9) Change-Id: I6910e1afa0ee262ae0496cf1d3aa83ae3e537ad0 (cherry picked from commit b4855bd63c05096df1a2da339133f243bb30d902) Reviewed-on: https://gerrit.libreoffice.org/26336 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-06-15tdf#100275 sw: fix target node of bookmark copyMichael Stahl1-17/+28
Replaces the defensive programming band-aid of 5c1a1d1c66aff497702abc20df5832fa348f1008 with a real fix. The problem is that lcl_NonCopyCount() has some special case code to ignore the first node in the target document, which erroneously is executed for every bookmark, which results in the 2 bookmarks in the bugdoc being created with nDelCount 1 and 2 so they land on the same node, which is not allowed for cross-reference marks. Extract the adjustment into a separate function that is called once. (regression from 689962feae2054f965a7378c3408b0ccfad2bbd5) Change-Id: Ie14c650f7fdb259c13cb9048226da30971d2ab3c (cherry picked from commit bc387975b11d87868884ec770a2a42a4f7092b5f) Reviewed-on: https://gerrit.libreoffice.org/26292 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-06-15tdf#61396 Possibility to edit a template not in Template RepositoryAkshay Deep6-1/+13
Menu Sequence: Open Template... Save as Template... ---------------------- Manage Templates Change-Id: I0d0c8ca15d8dc38662e7f84a4f598933c13dd512 Reviewed-on: https://gerrit.libreoffice.org/26179 Reviewed-by: Akshay Deep <akshaydeepiitr@gmail.com> Tested-by: Akshay Deep <akshaydeepiitr@gmail.com> (cherry picked from commit 384c75b7e8b50a64a1c0e8fd1ffef1350e2522d2) Reviewed-on: https://gerrit.libreoffice.org/26314
2016-06-15/org.openoffice.Office.Writer/FormLetter/MailingOutput/Format is xs:intStephan Bergmann1-2/+8
...i.e., sal_Int32. Regression introduced with ba9acdf799bf556c8a20b1dc27eb116e23d481db "convert TXTFORMAT constants to scoped enum". (The problem with storing a sal_uInt8 in an Any is that sal_uInt8 == sal_Bool, so actually a Boolean Any is constructed---and configmgr will throw an exception when trying to set that value for the "Format" prop. The problem with extracting a sal_uInt8 from a sal_Int32 Any with getValue/static_cast is that it doesn't even read (only) the low order bits, but on big endian machines reads the high order bits.) This is a backported version of 25a60d19d56a4bdb4f1b6ef27d842f90617fcff8 "/org.openoffice.Office.Writer/FormLetter/MailingOutput/Format is xs:int" which uses o3tl::doAccess newly introduced on master. Change-Id: I654da713bbf78b3215de7a09056a5172fc204258 Reviewed-on: https://gerrit.libreoffice.org/26285 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2016-06-12tdf#92218 tweaks to single toolbar mode toolbarsYousuf Philips1-7/+8
Change-Id: Ia8311c48dfa116b4557880a48a7299659a10cb0e Reviewed-on: https://gerrit.libreoffice.org/26131 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Yousuf Philips <philipz85@hotmail.com> (cherry picked from commit f72270a6a23e2577cb3b67f154e1ec55df8afadd) Reviewed-on: https://gerrit.libreoffice.org/26192 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-06-12tdf#91781 tweak to Writer's insert menuYousuf Philips1-1/+1
Change-Id: Id099a1f393fa115faf53899f94db5d53f3daa849 Reviewed-on: https://gerrit.libreoffice.org/26062 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Yousuf Philips <philipz85@hotmail.com> (cherry picked from commit c8200675c7fd6550c78b20b7c87ebf03047bb6d4) Reviewed-on: https://gerrit.libreoffice.org/26132 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-06-10Resolves: tdf#100275 makeMark may return null under some circumstancesCaolán McNamara1-3/+6
Change-Id: If3b83413c028c6cd1c055e632b6f050ec7f2475d (cherry picked from commit 5c1a1d1c66aff497702abc20df5832fa348f1008)
2016-06-09tdf#96089 sw: fix scope of bBreakAfter in InsertCnt_()Michael Stahl1-1/+1
The problem is that bBreakAfter is passed by reference to SwLayHelper and stored as a reference member there, so it has to live at least as long as pPageMaker. (Unfortunately C++ can't statically check that.) This then somehow caused the number of pages created after initial load to be 812 instead of the correct 396 determined from the layout-cache in the bugdoc, and that then caused Drawing objects to move backward during the following re-pagination, and then SwDrawContact::Changed_() calls SetFlyFrmAttr() and that sets the document to modified, which triggers the AutoSave that was reported in the bug. (regression from b4b7703e4335460cf48bfd6440f116359994c8ff) Change-Id: I14dc4644c2e127b3c3ff0e6876eedcc534e1a68e (cherry picked from commit c488214817516c13603deb1c180fef02f4c700bf) Reviewed-on: https://gerrit.libreoffice.org/26120 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2016-06-08tdf#97103 sw: fix restoring of SetRedlineMode on DOCX/RTF exportMichael Stahl4-38/+67
In order to prevent ~SwIndexReg asserts, this was changed to restore the redline mode not in MSWordExportBase::ExportDocument() but in SwWriter::Write(). Unfortunately only the DOC export actually uses SwWriter::Write(), so fix the original problem differently by moving the cursors onto a EndNode. The m_pCurPam will be deleted anyway, and the m_pOrigPam usually also will be, and in the case it isn't deleted i hope it's not important :) (regression from 0b037361b890a83a735186b98d5a3cef124027f4) Change-Id: Ib3d0cc32862256fdc4363b6035c190cbbcfe5df3 (cherry picked from commit a59c4e26abbdd0720d24d3ddc0d6a05a67a31aaf) Reviewed-on: https://gerrit.libreoffice.org/26064 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-06-07tdf#50821 RTF import: fix handling of \trpaddf{b,l,r,t}Miklos Vajna2-0/+18
The width type is an attribute, not an sprm; this resulted in zero cell margin in the table -> the text overlapped with the border shape. (cherry picked from commit 279f1a204f8c5b5121e9f1f9c431d17bdab1f5bd) Change-Id: I611feb084a16c76faf281d376e1a4a31e162f53d Reviewed-on: https://gerrit.libreoffice.org/26027 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2016-06-07tdf#81475 Minor tweaks to writer toolbarsYousuf Philips2-3/+4
Change-Id: Ifdc1e7305dcd3db5a77f9d9f30094031c24b9460 Reviewed-on: https://gerrit.libreoffice.org/25894 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Yousuf Philips <philipz85@hotmail.com> (cherry picked from commit 33459c1b7c76f909ccdbaa707ef27d7e3be80550) Reviewed-on: https://gerrit.libreoffice.org/25953 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 20:45:27 +0000