summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2013-09-25Resolves: fdo#69220 crash in doc (ww6)Caolán McNamara
Change-Id: I5a09d121a0b0342f28ba5d2d39027b27e9c9eba2 (cherry picked from commit 2e93541d00f9d4aaa6ad2aeb35ee0c901d216cc0) Reviewed-on: https://gerrit.libreoffice.org/5991 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-09-03bDel is unused uninitializedCaolán McNamara
Change-Id: Idac3a6805700d896b8569d1df79d32ca493c48b3 (cherry picked from commit 91a557561c24c7532c525692f279b1fcfd520f92) Reviewed-on: https://gerrit.libreoffice.org/5764 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-09-03n#816593: docx consecutive tables with different tblpPr needs to be splitCédric Bosdonnat
When importing docx with 2 <w:tbl> following each other, we have 2 possible behaviors: either merge them as one table as we did before or split them into two tables. The tables need to be split if they have different floating position properties. This required the ooxml tokenizer to repeat the table properties for each row of the table: or how would we know we don't need to split the table? The basic idea behind this hack is to temporarily store the table position and table properties before saving them. Thus we can compare them at the end of the row and decide to split the table or not. (cherry picked from commit 173d24a7316fccf0e838f71b92c10a772b19298d) Signed-off-by: Miklos Vajna <vmiklos@suse.cz> Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I2e3e70dfe7386090fe356575ee9d0e81aa031dc4
2013-09-03n#816593: Floating table width import fix: adjust the frame widthCédric Bosdonnat
(cherry picked from commit 9f4c8a8bca06b4c2a916a51909367b453fc41a8b) Change-Id: I8212bc5981418f6cbd514bf5002e6a5dbdf53152 Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2013-08-29fdo#66215: sw: fix clicking on text above background flyMichael Stahl
SwPageFrm::GetCrsrOfst() tries to compare the distance to the closest text vs. fly but does not do it right because GetCharRect() returns just a line of width 1 on the left edge of the character; try to figure out the entire area covered by the character via 2 calls to GetCrsrOfst(), which gives much better clickability. (regression from e8fbe97900f13305b17015d9044993bde4adab36) Change-Id: I825e86daf65692dfb962ad576772c5f543d02d19 (cherry picked from commit edd2db1c783bd571ff796a5298385cacc91877b9) Reviewed-on: https://gerrit.libreoffice.org/5660 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-08-29fdo#67358: sw: "fix" line painting artifacts when resizing columnsMichael Stahl
SwEditWin::MouseButtonDown(): for unknown reasons invalidating the window here causes the column resizing lines to not be removed after the resize is done, so disable it. (regression from 289185fd02d6d9734b6dbde01f15c4e6c5beacbb) Change-Id: If3ba0a72c53c5c2734fb905ae35d62f6a3e8938b (cherry picked from commit a2c67975c03010b90c706523293f180c1f29e229) Reviewed-on: https://gerrit.libreoffice.org/5661 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-08-27Fix iterator managementJulien Nabet
Change-Id: Ifb230525d3f5462553a3e78bb4ee740f6a7cc5c2 Reviewed-on: https://gerrit.libreoffice.org/5629 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/5638 Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Tested-by: Thorsten Behrens <tbehrens@suse.com>
2013-08-27fdo#66145 DOCX export: fix not-well-formed outputAdam Co
Reviewed-on: https://gerrit.libreoffice.org/5002 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> (partially cherry picked from commit 2d5978b22b402dea9dee5b468d2044ccc1208a15) Change-Id: Id8cc3829ccd5806295b0f240a570dc1d66ed0c87 Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2013-08-26Resolves: fdo#59048 crash on text-to-table undoCaolán McNamara
Delete the SwCellFrms attached to the layout of this SwTableNode early, otherwise the SwCellFrms will dereference the SwTableNode after it is deleted in _DeleteBox during the DelFrms of the DeleteSection in _DeleteBox when invalidating following SwFrms. SwUndoInsTbl::UndoImpl calls SwTableNode::DelFrms so presumably this is the right way to go about it. Change-Id: I6e088a30500d721bd18c57ced5c8ec331bb567eb Reviewed-on: https://gerrit.libreoffice.org/5634 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 34f09dadd99a15aaad7fc8b982e01d6ec764c74c) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2013-08-26bnc#834035 DOCX export: fix hyperlinks of illustration indexMiklos Vajna
We used to export raw Writer bookmarks, but that's not valid in OOXML. Instead, it has normal bookmarks around the sequence fields, so use them if they are available. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx sw/source/filter/ww8/docxattributeoutput.cxx (cherry picked from commits 750f0ebf97d19d1cf305dabe72d52ad6e90adf70, e9275c08acc2f4f1c925f78b56a1089515cd9a37 and 8f146a8042dd8f3c88f39f8317372cd9c02ce4ad) Change-Id: I0ef2ff7967c2802b53752c9505ef6db4cc2b8265 Reviewed-on: https://gerrit.libreoffice.org/5635 Reviewed-by: Jan Holesovsky <kendy@suse.cz> Tested-by: Jan Holesovsky <kendy@suse.cz>
2013-08-26fdo#33960: sw: fix cross reference fields some moreTroy Rollo
Change-Id: I46f9cf4132835c10ad82c9b014e5e8647902ab5e Signed-off-by: Michael Stahl <mstahl@redhat.com>
2013-08-24fdo#68319: sw: fix Chinese ConversionMichael Stahl
... and perhaps other things too: the SwScriptIterator constructor gets passed a temporary String created by implicit conversion from OUString and retains a reference to that; don't convert it to OUString like on master but just cast to String. (regression from 0295c8a34e39326414c1b98cf4da905802f061b0) Change-Id: I30c7309c14ec8f9e41ee5fe89eed513ddad154fe Reviewed-on: https://gerrit.libreoffice.org/5600 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-08-22fdo#66145: revert change to CopyMasterHeaderMichael Stahl
Not copying the nodes for first page is not an option; the real problem with the fdo45183.rtf is that flys in the header are not copied along with the nodes, like it is done in SwDoc::CopyPageDescHeaderFooterImpl. Also, the same problem may occur for footers too (CopyMasterFooter). Conflicts: sw/source/core/doc/docdesc.cxx The comment above is for the master commit, but copyting the flys is actually necessary with e1a9a348a519a69f898c9c1e6d87a5837b8267f9 too, since that copying code is now executed when changing sharing flags in the UI so withtout this commit you lose any flys anchored in the header/footer. (cherry picked from commit bf206549228685a68e1504db05119d8fa1d354b3) Change-Id: I985a6b89f8cde96dc0fa0b489c44d77987f91a8a Reviewed-on: https://gerrit.libreoffice.org/5541 Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-08-22fdo#66145: fix copying of header/footer when un-sharingMichael Stahl
SwDoc::CopyMasterHeader/Footer(): this could result in sharing the first-page header/footer with the left-page (!) when un-sharing via the dialog; the reason is that what actually happens here is that the left-page header/footer was never changed but the master one was copied in SwDocStyleSheet::SetItemSet(), so it sort of worked by accident before the first-page header/footer was added... Change-Id: Ia24df6ad59cda484559f2ca48ecaa7563878120b (cherry picked from commit e1a9a348a519a69f898c9c1e6d87a5837b8267f9) Reviewed-on: https://gerrit.libreoffice.org/5532 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
2013-08-22fdo#66145: fix Undo invalidation in SwDoc::ChgPageDesc()Michael Stahl
SwDoc::ChgPageDesc(): make the invalidation of the Undo stack on change of IsFirstShared work by delaying ChgFirstShare() until after the check. Change-Id: Ifbefe446df8b6d785ed1bb6394ec5beb803fb1fe (cherry picked from commit 0b7a823bb6df79384939dda4de3b7f28e5e52758) Reviewed-on: https://gerrit.libreoffice.org/5531 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
2013-08-22fdo#66145: do not check IsFirstShared() in SwPageDesc::GetLeftFmt()Michael Stahl
... and GetRightFmt(). If the first format is requested it must be returned; the sharing works by copying the SwFmtHeader/Footer from aMaster to the other members. (regression from 4dc78aee9bcdb6ea5e9dc47ebb4a4b9e590c725a) Change-Id: I1708f01c18b155ae75c14fc407e52ccd2bd798d7 (cherry picked from commit 4df438c9a9d5e698c47c1e85903eb81880a5e6fa) Reviewed-on: https://gerrit.libreoffice.org/5530 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
2013-08-22fdo#68076 RTF import: default font had priority over the specified oneMiklos Vajna
Regression from 60c17b2873506ed8b068b34840aecda0c1d9bd65. (cherry picked from commit f1e5e271f9aadc2c5e5af3ffae410b6c598e5398) Change-Id: Ie16d611622e6a814d5cbea00c3f992cd9ecba027 Reviewed-on: https://gerrit.libreoffice.org/5579 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-08-20fdo#68219: Parent style text attributes missing in accessibilityBoris Dušek
Thanks to Niklas Johansson for testing. Change-Id: I550076e7d62f8db389cdbf902fce0ff7f8f98165 Reviewed-on: https://gerrit.libreoffice.org/5499 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
2013-08-18fdo#44715 RTF import: reset styles in tables on RTF_PARDMiklos Vajna
Commit 4a507f732d82c188ad81b022cbe3037951e58ac3 added an exception to RTF_PARD (reset paragraph properties) handling: when we're inside a table, it should not reset the fact that we're inside a table (which is a paragraph property). However, instead of just re-adding that property, it disabled resetting for all properties, and we had a growing list of exceptions since then. The next thing to add there would be the paragraph attributes, which contains the style information. Instead of growing that ad-hoc list, reset everything again and just re-add the "in table" SPRM. This makes the second and later paragraphs in the A1 cell of the bugdoc have proper font size. (cherry picked from commit b9c1a9b9aa41dbbb6bed0c77f4370ab6105c7fb1) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: I2de80894fcd5da3bf45d221af9a04a307c70a29b Reviewed-on: https://gerrit.libreoffice.org/5471 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-08-17fdo#66827 sw: rename SID_ATTR_FILL_GRADIENT to SID_SW_ATTR_FILL_GRADIENTMiklos Vajna
Change-Id: Ieff7fc6a5b718e11de7d1e4ec2087d64a8a13cae (cherry picked from commit f694f14ab64f48e40365fd877e201a0382297368) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2013-08-16sw: do non-incremental word count in one stepMichael Stahl
Not sure if it solves a real problem, but seems sensible. Change-Id: I3a75da924aaffb452da158a6e5c0b3465fe5687b (cherry picked from commit 3f66fadc2ddbec42a5fd7ee34b18826ef4ede503) Reviewed-on: https://gerrit.libreoffice.org/5410 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-08-15Resolves: fdo#67554 avoid ooxml import crashCaolán McNamara
check if the endrange is empty before dereferencing while I'm at it, don't copy the entire vector and make it a little more readable Change-Id: I1f2a0096791ca0ef51aad595f71e1a18aa448c3b (cherry picked from commit ce791697cbf260b592f7cad095539a414888823f) Reviewed-on: https://gerrit.libreoffice.org/5435 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-08-14WaE: variable 'res' set but not usedTor Lillqvist
Change-Id: I3fc3f55d10dad177451100affacfff74d04a1fe8 (cherry picked from commit f115934e0a9146c0adf115abcb99e048c530349d) Signed-off-by: Eike Rathke <erack@redhat.com>
2013-08-14fdo#68064: Do not insert aTempEntry multiple timesStephan Bergmann
...and do not let it go out of scope before being used in BigPtrArray::Remove. (And, en passant, avoid use of reserved identifier, starting with an underscore followed by a capital letter.) Change-Id: Ic5730f707601a2070f2eed3ba017650026657df3 (cherry picked from commit ebc81f19ef4ffe8d54f83c019ea80d10c98647d7) Reviewed-on: https://gerrit.libreoffice.org/5406 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-08-14fdo#58040: sw: fine tune async word countMichael Stahl
- count characters instead of paragraphs to better account for large or small paragraphs - start out with a relatively small value (5k chars) on the first run to quickly show something to the user Change-Id: Ic4013545692f267aab39e084415d5d794bb5a4ca (cherry picked from commit 91c8008051c0bb7905a6acd822d022e144f2941f) Reviewed-on: https://gerrit.libreoffice.org/5391 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
2013-08-12fdo#63428 writerfilter: fix paste of commented text rangesMiklos Vajna
There were multiple problems here: - xFoo->createTextCursorByRange() got a text range argument, where the text range wasn't from the xFoo text - it was assumed that all XText implements text::XParagraphCursor as well, but this is not true for e.g. comment text - commented text ranges were pasted as normal comments (once again, the insert position wasn't passed around) (cherry picked from commit c73b8072a1732f829d3d6ba6c1172d96d55b1c4f) Change-Id: I9a975a08b08a7f32b1ee71e42f58736cc0dbb09d Reviewed-on: https://gerrit.libreoffice.org/5368 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
2013-08-11fdo#53556 RTF import: fix visibility and text wrapping issuesMiklos Vajna
This is a backport of 6 commits from master: - the first 3 are earlier fixes on master, without them the test doc has only 1 shape imported out of 3 (on master, this was already fine) - the next 2 are the real fixes - the last one is the testcase (cherry picked from commits 9d640dc6ad0f0b58fa62b70f78478e2bc8796e69, 2fc088afdf6dcb2defbd462a9e64ba7e53ba5caf, 4ab658b56f5c6ff0082d38d8ace1924d11e30e96, 03f0cbd354646733977e4dec754c0113a5cbc3c9, 9f1f7199736e2ae07b34849ba66f61a1ef5782e8 and aa6959ba2c4ef1b718d8249fd47faaf677b16111) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx writerfilter/source/rtftok/rtfdocumentimpl.cxx writerfilter/source/rtftok/rtfdocumentimpl.hxx writerfilter/source/rtftok/rtfsdrimport.cxx Change-Id: If58376aec31ab00cab19221beed73e8275a834d2 Reviewed-on: https://gerrit.libreoffice.org/5328 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-08-10fdo#67799 read ending item also when assert is noopMatúš Kukan
Change-Id: I056212d0a01f7a647e846bbd1b605c04e1798a14 Reviewed-on: https://gerrit.libreoffice.org/5336 Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-08-09bnc#823651 WW8 import: fix paragraph style in empty first page headerMiklos Vajna
The problem was that the first page SwFmtHeader / SwFmtFooter wasn't created in case the header/footer text was empty, even if fTitlePage was set. (cherry picked from commit 4bc063090c06f0c34980a3852f684b42ab25c501) Change-Id: I5e58419161bcc663e2beb0338b95877469e0fd3c Reviewed-on: https://gerrit.libreoffice.org/5314 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
2013-08-08fdo#47440 import RTF_SHPBX/YPAGE for Writer pictures, tooMiklos Vajna
Previously this was only handled for drawinglayer shapes. (cherry picked from commit b755df14a431543f1b70246a5e58830a0a480602) Change-Id: I7ce440a27ebe44fc867b8a7f4ee62217076677f0 Reviewed-on: https://gerrit.libreoffice.org/5303 Reviewed-by: Luboš Luňák <l.lunak@suse.cz> Tested-by: Luboš Luňák <l.lunak@suse.cz>
2013-08-08fdo#67817: GetParent returns a VclGrid instance after conversion to .uiIvan Timofeev
Change-Id: Ib37e2de784823fec209c195963d925748412c692 (cherry picked from commit a0bbc768a5fac2c3d27cd70877961561fe7f0ffa) Reviewed-on: https://gerrit.libreoffice.org/5310 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-08-07fdo#67498 RTF import: fix missing margins vs continuous section breaksMiklos Vajna
The document had 3 sections, separated by continuous section breaks. Previously only margins from the last section were imported, this way the first page had default margins. Now margins are also applied when we hit continuous section breaks. This way margin values from the last section break affecting the page wins. A later commit could improve this further by setting the minimum of these and setting a section margin for each non-minimal sections. (cherry picked from commit c7884509a84d46a9d99b2950159d949589862f3a) Conflicts: writerfilter/source/dmapper/PropertyMap.cxx Change-Id: I4d9a4585e795220533909bd1d467d933caaa0d71 Reviewed-on: https://gerrit.libreoffice.org/5286 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-08-06fdo#67639 Rotate crop area when the image is rotated.Tomaž Vajngerl
Change-Id: Ifdd0080f278b67b815f15c71523497de59e615bd Reviewed-on: https://gerrit.libreoffice.org/5235 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-07-30Resolves: rhbz#989686 Fix crash with ooo120774-1.docFridrich Štrba
Do not try to remove line breaks from empty string Reviewed-on: https://gerrit.libreoffice.org/4114 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> (cherry picked from commit 2cb9aaf44dc589af79d62d7b1136b5d65e9f47d4) Change-Id: Ieb12c541d42944aac813cee10ce479207b1c674b Reviewed-on: https://gerrit.libreoffice.org/5195 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-29fdo#67467: fix crash when renaming table in AutoFormat dialogIvan Timofeev
this reverts 5031e17d4b11181be94448702b1026bd38e0b3c4 and uses ptr_vector::release instead of ptr_vector::erase to prevent object deletion. The use of "transfer" leads to "Assertion `(void*)&from != (void*)this' failed". Change-Id: I77467ce9e1d9dd4b833032ebbe920cbb34d36675 Reviewed-on: https://gerrit.libreoffice.org/5172 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 2f527be5513159c0aebd93f356cbd2b1dc04b253) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2013-07-28fdo#67303: sw: speed up setting IsHidden property on stylesMichael Stahl
Importing an ODF document with 4089 styles is ridiculously slow, spending most of the time in SwStyleSheetIterator::First() to reset an existing iterator. Since the SwStyleSheetIterator can handle the case when First() has not been called anyway, just add a new method that resets the bFirstCalled flag, which takes next to no time. (regression from a0dcf961879ab644a52f801f65466756cb144b72) (cherry picked from commit 8fb210a2ddc0b09288316cf459bebfe196ea94fb) Conflicts: include/svl/style.hxx Change-Id: I8741b4c0cd51f8c244462ce28a754abc427d0df3 Reviewed-on: https://gerrit.libreoffice.org/5136 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-28fdo#67365 fix RTF import of inherited row props wrt unusual group stackMiklos Vajna
Inheriting row properties (in particular, the number of cells) should be independent from the RTF parser stack, but they were not. Also fix two more problems once the lost rows reappeared: - unequal cell widths were equal - some cells were aligned to center instead of to left (cherry picked from commits 494937776956370eda868f91922c4cff34656050, 986ebb668d45a42bc1e8b744980619857e891ef5, 165cd8332a0844314e698cf59936799676257ea1 and 83e0489217fd4b0fcf3ab62d002257b47e7a6459) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I273d89a0708601a38dd8bda734a72b4c92da2cc4 Reviewed-on: https://gerrit.libreoffice.org/5137 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-26targetted clean of redundant header piece from 62badf3828Michael Meeks
Change-Id: Ic1240114d667fb7797afae4847427cc889f3cb48 (cherry picked from commit 03993b47c522dcc71f7cd73ee21df3de9650080d)
2013-07-25Resolves: fdo#67113 split insert autotext and field controlsCaolán McNamara
autotext is a modal dialog and insert field is a modeless dialog so I don't want autotext to show a toggle in insert->autotext At the same time we want the autotext entry in the insert toolbar to have a dropdown and we appear to want to be able to close the insert field dialog from the toolbar. So split the combined handler class into two and remove the other if/else branch in each with the insert field a SfxBoolItem and the insert autotext an SfxVoidItem. Change-Id: I3d59052ee70a00d63f7706166290b00ad9ae22c0 (cherry picked from commit bb98778dbf761a0c88c96117add00a66e5cc6c95) Reviewed-on: https://gerrit.libreoffice.org/5112 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-25Related: fdo#67113 restore some code, it has side effectsIvan Timofeev
these lines were removed in 8275c8fc33b63aa40a0a8a8c215f32b9986edab6 fixes missing AutoText menu entries and AutoText insertion via menu Change-Id: Ifa498d1cbfc096cca7751de9c9667fda6f1b3b48 (cherry picked from commit a645a14cf46a1160c426052823772ad117f0bd8b) Reviewed-on: https://gerrit.libreoffice.org/5111 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-25fdo#60990 VML export: handle paragraph/run properties of shape textMiklos Vajna
(cherry picked from commits 1753c4f9f1713ca4a9a1ac3a145269c850eef6fb, 0ffed545adbb8a27a024d4d6a74dcaa8a87ba66a and 94b3ec0597ee21b933d02496402ff0f3a416e6a3) Change-Id: Iaeb7f9826308ea94a036cb4bfa87bf65f0cfe22f Reviewed-on: https://gerrit.libreoffice.org/5094 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-23fdo#64637 RTF import: handle multiple RTF_COMPANYMiklos Vajna
Instead of unconditionally calling addProperty(), first check the existence with hasPropertyByName() and call setPropertyValue() instead, if necessary. (cherry picked from commit bb67e709b70919efb41ec41e93dd92953dc6a003) Change-Id: Ie0a075bbfe6eaa1f66726c456105dcdef9001d30 Reviewed-on: https://gerrit.libreoffice.org/5049 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-22n#825976: Table of Illustration has hyperlinks by default like TOCCédric Bosdonnat
...and that fixes the formatting of hyperlinks in docx Tableoof Illustrations. (cherry picked from commit c1fac43432891bf9f396ff1ec7a1c2ed042bce54) (cherry picked from commit 49d077b80c15ec9d069435da08bbfe38cdd57c5a) Change-Id: I990f31a8c9d0d56f58b7b87e368010576d8c8c0d (cherry picked from commit fb7b24dc5affb4f29f61a8716c97370951ccba80) Reviewed-on: https://gerrit.libreoffice.org/5028 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-22fdo#65632 RTF import: send NS_ooxml::LN_trackchange only once for one rangeMiklos Vajna
The problem was that in case we had {\deleted foo\b bar} then both "foo" and "bar" triggered a trackchange, but "}" only ended one, resulting in overlapping redline ranges. This was cought by core, but caused a performance problem. For the first bugdoc, before: real 3m57.803s after: real 0m3.072s (cherry picked from commits 7c0a1557406ffffbb8145f8035ce86d31e927667, ed187fcbd457d01be6ac382d61b493039a5af7d5 and 54518a209d0ffe00f8e391472da92e398c474392 and 9f7676033585ab3bf352d5dc2ef43a3a9d8d5c46) Conflicts: writerfilter/source/rtftok/rtfdocumentimpl.cxx writerfilter/source/rtftok/rtfdocumentimpl.hxx Change-Id: Ibf6f2db30109f0b9a2571d2e4fb3cc76294f68d1 Reviewed-on: https://gerrit.libreoffice.org/4964 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-17fdo#39904, n#825976: implement hyperlinks for Illustrations indexCédric Bosdonnat
(cherry picked from commit 8bb2c7f1556c10508c8ac451c579539ccf5dacfb) Conflicts: sw/inc/swtypes.hxx Change-Id: I6f682c382e7ab0e06259b335247fdcebd7412942 (cherry picked from commit 2c10d784deb86501b5488044a61d9fc2efc6321a) Reviewed-on: https://gerrit.libreoffice.org/4957 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-16fdo#63273 sw: let word count not update stat. fieldsMiklos Vajna
Updating fields would generate loads of selection change events and it's not what we asked for. Regression from ce14342c4292628a641a72d4f63d9c048e030c6a. (cherry picked from commit e2484e3998f2c5036fb8e3584d4b1c72db19bfd3) Change-Id: If237df1f31436357022ca8d77b924681e403abd8 Reviewed-on: https://gerrit.libreoffice.org/4943 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-07-15i#108348 API CHANGE: add IsUTC to css.util.DateTime etc.Michael Stahl
Add IsUTC member to: com.sun.star.util.DateTime com.sun.star.util.DateTimeRange com.sun.star.util.Time Add new stucts with explicit time zones: com.sun.star.util.DateTimeWithTimezone com.sun.star.util.DateWithTimezone com.sun.star.util.TimeWithTimezone Adapt the sax::Converter to read/write timezones, and fix the unit test. Everything else just uses default (no time zone), this commit is just to fix the API. STRUCT: /UCR/com/sun/star/util/DateTime nFields1 = 7 != nFields2 = 8 Registry2 contains 1 more fields STRUCT: /UCR/com/sun/star/util/DateTimeRange nFields1 = 14 != nFields2 = 15 Registry2 contains 1 more fields STRUCT: /UCR/com/sun/star/util/Time nFields1 = 4 != nFields2 = 5 Registry2 contains 1 more fields Conflicts: sc/source/filter/oox/unitconverter.cxx Reviewed-on: https://gerrit.libreoffice.org/4833 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 652ccbdf3111766fadc379a8cf4650b744e1e19c) i#108348: fix TimeZone -> Timezone in struct names (cherry picked from commit 604aae1fd240254fe851d93dc35b5408bd13296c) Signed-off-by: Michael Stahl <mstahl@redhat.com> Signed-off-by: Lionel Elie Mamane <lionel@mamane.lu> Signed-off-by: Michael Meeks <michael.meeks@suse.com> Conflicts: forms/source/xforms/convert.cxx offapi/type_reference/offapi.rdb reportdesign/source/core/sdr/RptObject.cxx sc/source/filter/oox/unitconverter.cxx
2013-07-15fdo#54900 RTF import: support setting para align after textMiklos Vajna
Both Word and Writer typically write all paragraph properties before the first text in each paragraph, but at least for paragraph alignment, it's valid to write them at the end. (cherry picked from commit 431853bfae7dccd139804caf7ac2505a7c283e63) Change-Id: I0337e63678ad45c662a204ab2fc59378607abe74 Reviewed-on: https://gerrit.libreoffice.org/4913 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-07-12bnc#828598 fdo#59643 SwFormatClipboard: fix undo of paragraph attributesMiklos Vajna
Paragraph attributes were set directly on the SwTxtNodes, instead of going through SwWrtShell::SetAttr(), which handles undo/redo. Regression from 357fac9713875302d30185feabaf5c165e040ca4. (cherry picked from commit b1cd73d3e62c5192bc3d77f5ecd1036ff42bde61) Change-Id: I5dc86e20e3c006dab60a075355ce9ad1f1b67bb6 Reviewed-on: https://gerrit.libreoffice.org/4868 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-07-11fdo#58577 DOCX export: handle multiple textframes anchored to the same paraMiklos Vajna
Also fixes ~SwIndexReg assertion on closing the document. (cherry picked from commit e5b145a46cd29c9428e6e1894f7b0bb8248a412f) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I7c1a9d3d646f2dacdbced2af355c076c1a1063ec Reviewed-on: https://gerrit.libreoffice.org/4826 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
generated by cgit (git 2.34.1) at 2024-06-18 01:13:37 +0000