summaryrefslogtreecommitdiff
path: root/sw/source
AgeCommit message (Collapse)Author
2017-12-18convert SFXWB_ constants to scoped enumNoel Grandin
Change-Id: I63d442e51b7e22093da1c232e1b575bc961c0e69 (cherry picked from commit 0e04b531448d7915b40c59dccef7a9313bd28c11) (cherry picked from commit e14539d0ed367e377346cbc0247b4c3e3637c35e)
2017-12-18tdf#42949 Remove unused uno headers from /sw/source/uibaseBartosz Kosiorek
Change-Id: Iec10c5411814008f873868382faf245f38eeae1f Reviewed-on: https://gerrit.libreoffice.org/31097 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 9b2e69abfc6386578fe3313362f1bbfe74c36a14) (cherry picked from commit 5267ee6bb6eba9d026f6cf0564d2509604c322d2)
2017-12-18tdf#42949 Remove unused uno headers from /sw/source/coreBartosz Kosiorek
Change-Id: I0029144d049ad1c5ee3ff4d188ff969b6881712f Reviewed-on: https://gerrit.libreoffice.org/31095 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit c840c49b62b919ec4d0d947fe8cd530a785cf80d) (cherry picked from commit 4e10b49d74bedb12381c195fc53434237cd7dedb)
2017-12-18convert DecodeMechanism to scoped enumNoel Grandin
(cherry picked from commit bfde4866e07746eafa2f0d6173c29d805cc35ad0) (cherry picked from commit 3de922d4a695e253d4ca2d42b70e0b35b52e9b7c) Change-Id: I5c56634b1bca8e37fa73d02d2428645301b6c547
2017-12-18convert INetURLObject::EncodeMechanism to scoped enumNoel Grandin
(cherry picked from commit 803215142efa6437515348f63bd70ffdcf5d45f1) (cherry picked from commit 736cd289d4cdb0db61d92134bcc9d48aa7e79613) Change-Id: I50ea17c7779c7b5cacddf548f1773fd7d6c8bade
2017-12-10tdf#114338 don't crash on watermark insert w/ existing headerSzymon Kłos
Change-Id: I63abaf48c33d6660f1829b7d503de295e4a57f9c Reviewed-on: https://gerrit.libreoffice.org/46126 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/46156 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-12-10tdf#114308 Export Watermark size as isSzymon Kłos
* refactoring * removed size hack * export/import "trim" attribute * DOC: export set of parameters to fit shape & frame Change-Id: Ib00654626ae1e10ac5110d22eada7528e03357e7 Reviewed-on: https://gerrit.libreoffice.org/46036 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/46154 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-12-07tdf#113037 Watermark centered in DOCSzymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/45804 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> (cherry picked from commit 58784b89c22c6d63fff18fea0aa6636a1370044c) Change-Id: I3b0383ef85f82c3076331026a49c0005f920ea61 Reviewed-on: https://gerrit.libreoffice.org/45997 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-12-07tdf#113037 Unify Watermark in DOC & DOCXSzymon Kłos
* use correct font for calculations Reviewed-on: https://gerrit.libreoffice.org/45698 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> (cherry picked from commit 923ca4efe2095998e3da75c372cd7d716db9abb3) Change-Id: Idd370678c000bf22c460c3323bd55cd827ba7153 Reviewed-on: https://gerrit.libreoffice.org/45996 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-12-07tdf#113037 create Watermark with correct ratioSzymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/44228 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> (cherry picked from commit 1e6abe31eb8f7c12c725f7e1267a7cedfcd3d157) Change-Id: I17ab8d98a618cff6e38dad344f4096dc520cce43 Reviewed-on: https://gerrit.libreoffice.org/45994 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-12-05Fix typosAndrea Gelmini
Reviewed-on: https://gerrit.libreoffice.org/42726 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit e44c188a7353cc183fac8ece0cbf3611d842835e) Change-Id: I879a52820d78d9151ef64dd21612379f617f66e2 Reviewed-on: https://gerrit.libreoffice.org/45454 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com> (cherry picked from commit 50e37a41acae8597fdb097715f8b76b16bce9f31)
2017-12-05remove UL/L suffixes from integer constants on the RHS of expressionsNoel Grandin
Reviewed-on: https://gerrit.libreoffice.org/41237 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 2e8acde112e1c6754df26902e79a78346ba45a2d) Change-Id: I899a8126c9d971601fea6c77eca165718aea0ac5 Reviewed-on: https://gerrit.libreoffice.org/45452 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com> (cherry picked from commit 2887aefa4d4f60ba8b0cd7efd5d3a73ffb209781)
2017-12-05tdf#97087 GDB pretty print the Scheduler task listJan-Marek Glogowski
In addition to the GDB pretty printer, this annotates a lot more Timers and Idles. Change-Id: I5b93fab02161b23bb753e65ef92643a04fb0789c (cherry picked from commit 9e51007039770370182839846676b205f5c34c57) (cherry picked from commit a090e1e17962c5ca95f66c9d18fca6ac5dd4bca0)
2017-12-05vector::data seems more natural than &vector::frontCaolán McNamara
Change-Id: I0ce48075ad186cf1f9bd3e13fa76269fa9819af1 (cherry picked from commit 3a74745367a73ed9351379fc32bbe9253cdae697) (cherry picked from commit 3437713c11d60f99470fc1d0e2a8e5c56d5a6fe8)
2017-12-05loplugin:useuniqueptr extend to check local varsNoel Grandin
just the simple and obvious case for now, of a local var being allocated and deleted inside a single local block, and the delete happening at the end of the block Reviewed-on: https://gerrit.libreoffice.org/33749 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 2489000d3fd66319a8355fd4e37cfdfda47296d0) Change-Id: I3a7a094da543debdcd2374737c2ecff91d644625 (cherry picked from commit e540ccfb5eb43bd4a3d6920074dce8436720ba8e)
2017-12-05new loplugin useuniqueptrNoel Grandin
Change-Id: Ic7a8b32887c968d86568e4cfad7ddd1f4da7c73f Reviewed-on: https://gerrit.libreoffice.org/33339 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 98e4013c22c4ce63090a575e698cc2af82925e6b) (cherry picked from commit 051b2fbdad2a4b18f6d4b30134438e11fb9bec64)
2017-12-05new loplugin: useuniqueptr: vclNoel Grandin
Reviewed-on: https://gerrit.libreoffice.org/32948 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit e8b49f09074fe184374bee5062715357427ae044) Change-Id: Idcbc8655108ff57c06c33bbcabd652387bf3c4ec (cherry picked from commit fb68934e81bebdf1580d0fad25fad8912eaf3450)
2017-11-29Tile the writer surround rendering to avoid large image scaling.Michael Meeks
This also fixes a potentially large memory leak depending on zoom, and particularly with non-paginated rendering. Change-Id: Ia24e0b7baea725020f000a369708b0be3fc20c95 Reviewed-on: https://gerrit.libreoffice.org/45426 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com> (cherry picked from commit badd7363df0cdd95ddd9ab7f2008edd54dc0cbc9) Reviewed-on: https://gerrit.libreoffice.org/45427
2017-11-28sw 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> Reviewed-on: https://gerrit.libreoffice.org/44486 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-11-28lokdialog: Move the LOKWindowId <-> VclPtr<Window> mapping to Window.Jan Holesovsky
This allows registering & de-registering of non-sfx windows too, and makes the Calc autofilter popup to appear. Change-Id: I7cbbe94d208115aabcb6fa5f964646c7b7ce4c93
2017-11-28lokdialog: Move the painting down to Window, and enable Calc and Impress.Jan Holesovsky
Tested with .uno:FormatCellDialog in Calc, Impress not tested. Change-Id: I6d911c29616988db0625be9e2a63cf2172c69ee8
2017-11-28lokdialog: Move the Notifier down to vcl::Window.Jan Holesovsky
We need to tunnel more than just dialogs, so this is the 1st step to get the Autofilter popup rendered. Change-Id: I6523a39ddc7a6eb2a204e48ab364130a5822f548
2017-11-28lokdialog: Changed dialog painting to allow for modal dialogsPranav Kant
Split IDialogNotifier from IDialogRenderable and make SfxViewShell implement it. We now just send the dialog UNO command to the backend and wait for core to emit a 'created' dialog callback which signals dialog creation in the backend. The client is then supposed to send the paint commands for rendering the dialog. Change-Id: I1bfbce83c17955fa0212408376d6bcd1b2d2d1dd
2017-11-28tdf#104492: Fix bad docx opening and bad layoutDimitri Bouron
The problem seems to be the table's repeated rows value which is setted to max table rows in some docx file. Decreasing repeated rows value by one avoids loops but renders a bad layout. Table continuity is lost and lots of rows are hidden. So I set repeated rows value directly to one in order to avoid bad layout. Reviewed-on: https://gerrit.libreoffice.org/32349 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> (cherry picked from commit 91a176b864ac0492f5c0d2386292118dd3095df4) Change-Id: If4adc33febe088a866b704e87e49339710e5aaf5
2017-11-27ofz#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. Reviewed-on: https://gerrit.libreoffice.org/44392 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit f0074dd8c6e0040d7f331ba4a42ea6193c0eac99) Change-Id: I5c2f405cdae0b0c804ee7452629a14206516962d
2017-11-27ofz: returning SfxPoolItem belonging to localCaolán McNamara
Change-Id: Ib9760efb1231ef057dfd62d06095c15e3bf73a87 Reviewed-on: https://gerrit.libreoffice.org/43426 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit a2ca21fada002b895202abd2cbb4997b112627f8)
2017-11-24tdf#67207: export MERGEDIELD to DOCX and DOCMike Kaganski
Also removed a hack for i119803, because proper solution is implemented. This does not export data source information yet. Unit tests for DOC and DOCX are included. RTF export is already covered in testFdo80905. Change-Id: Id4f6d53344edf474add7e885e8ae6f36618e569f Reviewed-on: https://gerrit.libreoffice.org/45193 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/45243 Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-11-19tdf#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> Reviewed-on: https://gerrit.libreoffice.org/44772 Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-11-16lokdialog: Expose cursor visible statusPranav Kant
Change the notifyDialog API a bit. Use a std::vector to keep track of each payload item that needs to be fed to the resulting JSON. Change-Id: If3229a88d2df5368e14290a0e80ebe6206780639 Reviewed-on: https://gerrit.libreoffice.org/44722 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2017-11-15lokdialog: 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-15lokdialog: 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-15lokdialog: Tunnel dialog title to lokclient as outparamPranav Kant
Change-Id: I1beb5ab3f06debdca7ebf999af7ac879a41ea47e Reviewed-on: https://gerrit.libreoffice.org/43959 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: pranavk <pranavk@collabora.co.uk>
2017-11-15lokdialog: Use UNO name as dialog id when invoking lok callbacksPranav Kant
... not the frame id from the .ui file Remove temporary hacks introduced earlier in GTV also. Change-Id: I71290a5fac6547a5584094da21e2301ef8fbce0c Reviewed-on: https://gerrit.libreoffice.org/43957 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: pranavk <pranavk@collabora.co.uk>
2017-11-15Change CB_DIALOG_INVALIDATE to CB_DIALOGPranav Kant
We can specify whether it is an invalidation or something else in the payload. Change-Id: I95c5fc0a0a88b5277eaa93c8d1f9b937bddce7b3
2017-11-15lokdialog: Mouse events for dialog floating child windowsPranav Kant
Change-Id: I06a081835d246f752e57f8cc289162ed31fc91d4
2017-11-15lokdialog: Support for rendering floating window dialog widgetsPranav Kant
Now gtktiledviewer can show floating window dialog widgets when user clicks any of such widget in the dialog. Change-Id: I13d756f236379bc8b2041ed41cb7b502f7fd9b24
2017-11-15lokdialog: Register IDIalogRenderable with vcl::DialogPranav Kant
Change-Id: I344f5a9c7167abfde15dcd21c747819cc79b12b1
2017-11-15lokdialog: Handle key events in corePranav Kant
Change-Id: If84aaac87beebf69d92db5446fc713d8cc20421e
2017-11-15lokdialog: Forward mouse events to vcl; enable mouse movePranav Kant
The current implementation works well - the mouse events are properly handled by the opened dialog changing the dialog states. However, since the uno commands (dialog IDs) are different from what is returned by LOK_CALLBACK_DIALOG_INVALIDATE, the invalidation doesn't instantaneously, so one have to make the dialog window out-of-focus and then again back to focus to trigger the paint and see the updated dialog state. The mouse coordinates are forwarded in pixels as of now. Enable mouse GDK Motion mask too for mouse move operation. Change-Id: Ia915f734e8cbf4586da2b70da5840fe1568b39bd
2017-11-15lokdialog: Set up intial posting mouse events to dialogsPranav Kant
Events from the dialog in GTV are forwarded correctly, but the events are still not processed by the dialog in core. Change-Id: Ib95ac0a3cd23f6cc2763c21425a67402b15f2de2
2017-11-15lokdialog: Some checks if invalid uno command is providedPranav Kant
Change-Id: I914564f67716f4e218d42ac4f0545e46e9609389
2017-11-15lokdialog: Better dialog rendering APIPranav Kant
After painting the dialog, also write width and height of the rendered dialog. The dialog is rendered always on the top left of the given canvas, so client can crop the canvas accordingly. Change-Id: If052058a6db8a85d4e28ec88cffcca05564b17f0
2017-11-15Instantiate spell dialog and paint in a paintDialog callTomaž Vajngerl
Change-Id: I7bd7f9cb33cd79d1e55ce51fe39917c5741bdf18
2017-11-15Add IDialogRenderable interface for rendering of dialogsTomaž Vajngerl
Change-Id: I1d85729a1ac1a99d33ea2bde1b50ccf4c05ca9a9
2017-11-03tdf#103978 textboxhelper: syncProperty OPAQUE (wrap in background)Justin Luth
Although the containing shape is in the background (and thus the normal paragraph text is still visible), the shape's text was still painting over top of the normal paragraph text because the textbox was set as opaque and not transparent. Setting the textbox to sync the opacity value of its containing shape. Change-Id: I02477e2fa7def1f13590afcaa7c6564dd79d6406 Reviewed-on: https://gerrit.libreoffice.org/39672 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit cc438f60d6ad0855f754dd32da9c9a80c7cabf92)
2017-11-01Watermark: set Auto sizeSzymon Kłos
Change-Id: I8800094387ec5fdc49e21c7c02bfc419f13998ed Reviewed-on: https://gerrit.libreoffice.org/44105 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-11-01tdf#113548: another case of crash in GrabFocus during disposeAron Budea
Change-Id: I70776b80f70985a122e28854177c6d0c43839d65 Reviewed-on: https://gerrit.libreoffice.org/44113 Reviewed-by: Aron Budea <aron.budea@collabora.com> Tested-by: Aron Budea <aron.budea@collabora.com> (cherry picked from commit a83a0345e493b928b0b0b93bf106ddb71df69893) Reviewed-on: https://gerrit.libreoffice.org/44136 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-10-18ofz#3527 ofz#3532 Invalid read of size 8Caolán McNamara
use numrule name to look up numrule instead of cached numrule pointer in case it was deleted on failure to apply the numrule over an invalid range Invalid read of size 8 at 0x1E875132: rtl::OUString::OUString(rtl::OUString const&) (ustring.hxx:143) by 0x1EB33D93: SwWW8ImplReader::StartAnl(unsigned char const*) (ww8par2.cxx:1094) by 0x1EB33003: SwWW8ImplReader::Read_ANLevelNo(unsigned short, unsigned char const*, short) (ww8par2.cxx:910) by 0x1EBA375D: SwWW8ImplReader::ImportSprm(unsigned char const*, int, unsigned short) (ww8par6.cxx:6337) by 0x1EAEEA24: SwWW8ImplReader::ReadTextAttr(int&, long, bool&) (ww8par.cxx:3810) by 0x1EAEF15A: SwWW8ImplReader::ReadAttrs(int&, int&, long, bool&) (ww8par.cxx:3921) by 0x1EAEF6E0: SwWW8ImplReader::ReadText(int, int, ManTypes) (ww8par.cxx:4003) by 0x1EAF6DCE: SwWW8ImplReader::CoreLoad(WW8Glossary const*) (ww8par.cxx:5219) Address 0x31831158 is 200 bytes inside a block of size 248 free'd at 0x4C2F21A: operator delete(void*) (vg_replace_malloc.c:576) by 0x253BC1B5: SwDoc::DelNumRule(rtl::OUString const&, bool) (docnum.cxx:1033) by 0x25CB943D: SwFltControlStack::SetAttrInDoc(SwPosition const&, SwFltStackEntry&) (fltshell.cxx:609) by 0x1EAE5011: SwWW8FltControlStack::SetAttrInDoc(SwPosition const&, SwFltStackEntry&) (ww8par.cxx:1445) by 0x25CB8A9E: SwFltControlStack::SetAttr(SwPosition const&, unsigned short, bool, long, bool) (fltshell.cxx:457) by 0x1EAE420E: SwWW8FltControlStack::SetAttr(SwPosition const&, unsigned short, bool, long, bool) (ww8par.cxx:1185) by 0x1EAE5C12: SwWW8ImplReader::Read_Tab(unsigned short, unsigned char const*, short) (ww8par.cxx:1625) by 0x1EBA35F0: SwWW8ImplReader::EndSprm(unsigned short) (ww8par6.cxx:6321) by 0x1EAEEA44: SwWW8ImplReader::ReadTextAttr(int&, long, bool&) (ww8par.cxx:3813) by 0x1EAEF15A: SwWW8ImplReader::ReadAttrs(int&, int&, long, bool&) (ww8par.cxx:3921) by 0x1EAEF6E0: SwWW8ImplReader::ReadText(int, int, ManTypes) (ww8par.cxx:4003) by 0x1EAF6DCE: SwWW8ImplReader::CoreLoad(WW8Glossary const*) (ww8par.cxx:5219) Change-Id: Ia7ab67e42fc7a162d8089722e77841285f72a671 Reviewed-on: https://gerrit.libreoffice.org/43030 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 8580472270972733cda7fa6ecf23db73359d30bb)
2017-10-07tdf#112634 avoid crashSzymon Kłos
Change-Id: If4b8b24908eecc8267d7b74810f5afe4b1f79e4d Reviewed-on: https://gerrit.libreoffice.org/43139 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> (cherry picked from commit 75a881829f19439245cdb859fc16d59461992f79) Reviewed-on: https://gerrit.libreoffice.org/43153 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-09-29tdf#112679 sw: fix copying of fieldmarksMichael Stahl
Aha, now we know that the reason for the defensive programming in lcl_AssureFieldMarksSet() was that there are actually 2 different use-cases for it: usually a new mark is inserted, so there are no dummy characters and they must be inserted. However when copying text, the dummy characters are copied too, so they must not be inserted, or we get duplicate fieldmarks. This also reverts commit d4036d3a89b65a4912f62e3930eb1a31cd90a16b which fixed the problem only for CHECKBOX_FIELDMARK in a different way. (regression from bb069fe7b8b6a24f9ff4df4c7052961e17ea3a8c) (cherry picked from commit 421a23bb36bbf51edfabc58b7d2cd28ad37719d0) Change-Id: I3c99b8c6d720951655198e682018794337859373 Reviewed-on: https://gerrit.libreoffice.org/42938 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
generated by cgit (git 2.34.1) at 2024-08-04 20:02:40 +0000