summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-03-07rhbz#988516: DOCX import: fix context stack when importing header/footerMichael Stahl3-1/+17
When a header/footer substream is parsed, a ParagraphGroup is started, but not ended; so the properties of the last paragraph in the header/footer are applied to a paragraph in the body. The obvious fix to add a call to endParagraphGroup() at the end of w:p element breaks table cells. So add a call to endParagraphGroup() at the end of the "hdr"/"ftr" element. (The problem in the bugdoc became much more visible with commit ca555c596043c88894b964ac5e21f5a7271d5f3b, but was there before) (cherry picked from commit 2b78f2cd7b9e4bab0f3b3b9119238f36a1bbc7b2) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: Ib054f1882793049b39424c1076ba5d4b319cd027 Reviewed-on: https://gerrit.libreoffice.org/8476 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-03-07fdo#60833 user's wordbook should be selected by defaultAndras Timar1-0/+1
Change-Id: Ic710f719df3ba71a8b71e6ef8afd54d60e73c5d9 Reviewed-on: https://gerrit.libreoffice.org/8494 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-03-06resolved fdo#61520 do not add multiple empty strings to the validation listEike Rathke1-0/+12
(cherry picked from commit 7122ef19847b26529ed1d5bad40df869e91a8495) Backported. Change-Id: I4f6180b2f8c914a965965ca362e1670e8b434d37 Reviewed-on: https://gerrit.libreoffice.org/8470 Tested-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2014-03-06fdo#72491: Always set input as text when that's requested.Kohei Yoshida1-5/+20
Even when the text begins with '='. (cherry picked from commit ca50752c34de4477c696471b707e1b8136e27661) Conflicts: sc/source/core/data/column3.cxx Change-Id: I6e0a995f3042240b9f78068b5d0b9b758eb253ed Reviewed-on: https://gerrit.libreoffice.org/8123 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-03-06fdo#72691: Allow overwriting of string value with numeric one.Kohei Yoshida1-0/+3
This can legitimately happen when you have a matrix with a reference to another cell inside, and the referenced cell originally contained a string value then later overwritten by a numeric value. Example. Put a "Text" in A1, and in B1 put a 1x1 matrix {=A1}. It displays "Text" in B1. Then put 11 in A1. Prior to this change, B1 would become blank. With this change, B1 will display 11. Change-Id: I3feba3a8658e1a5ebf6f9e5ac34de2d579464ddb (cherry picked from commit 9bf907a8278cecd816368db7b8c4ab745a914a59) Reviewed-on: https://gerrit.libreoffice.org/8066 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-03-06fdo#72390: Let's not skip auto styles from unmodified sheets.Kohei Yoshida1-7/+0
We do re-use sheet XML stream for unmodified sheets on re-save, which is okay. But skipping auto style population from unmodified sheets is not okay because autostyles are shared across all sheets and written outside the sheet XML streams. Skipping styles from unmodified sheets could potentially fail to export used styles, not to mention could cause a crash as reported in the bug. Change-Id: I73e439f7354e341c2c07e28ecca5452193985860 (cherry picked from commit 5000e64ecc55efd47d92714cf6db375ff37aac4b) (cherry picked from commit 47e540d8323e8ea2db5e7aae455503b32f306ca3) Reviewed-on: https://gerrit.libreoffice.org/8051 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-03-05fdo#59329 Fix docked window border linesAhmad H. Al Harthi1-14/+38
This patch completes the missing border lines. This is intended for versions 4.1 and 4.2 only. Change-Id: Ib15cb3b01dca4631f643a0036475cf684793d256 Reviewed-on: https://gerrit.libreoffice.org/8413 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-05fdo#59329 fix docked panels bordersAhmad H. Al Harthi1-37/+12
Change-Id: Ia918d644fb57d6fbaeef90c8c1a6806a8d7e589c Reviewed-on: https://gerrit.libreoffice.org/8412 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-05bnc#821208 DOC import: don't overwrite WW8Num* character stylesMiklos Vajna3-0/+16
In general we're overwriting styles on import in case we're not pasting. But these WW8Num* character styles are in general not from the document, they are created because Writer needs a character style for each numbering level to handle what's in the DOC file. So, in case there is a character style with the same name as our "character style for numbering" styles, prefer the later ones, as that's intended most likely. (cherry picked from commit e88ee8aa307ecec1cc22cda56b97dcfd8b838ce8) Conflicts: sw/qa/extras/ww8import/ww8import.cxx Change-Id: I675f867722360aca765bb96b0b43ea47deab9847 Reviewed-on: https://gerrit.libreoffice.org/8449 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-05filter: make LibXSLTTransformer init backward compatibleMichael Stahl5-1/+256
As reported by Fernand Vanrie, initializing the XSLT service can fail because the LibXSLTTransformer::initialize was changed to require the parameters as a nested Sequence; accept previous parameter convention as a fall-back. (regression from ca0ea73a4ab104031a16b5bac7a9bb6e57c77ba0) (cherry picked from commit 6967da019b69767a15116de101d33a16b95c8a44) filter: and we learn that BootstrapFixture requires boost headers (cherry picked from commit bfdd18eb35f5c8bf7f713910ec35b853c7456969) filter: don't wait forever if the xslt test fails (cherry picked from commit 8af7a8953248dd184cd620b934ee6abc147f4076) I imagine this should have a SAL_CALL decoration (cherry picked from commit 62d6252d2cde33f6ef0e627c3192a63d43ba2a87) filter: sigh... fix the xslt test to run on WNT too (cherry picked from commit 4fcd5534348adcb61ab85b93478c272b8d9e8f8c) Change-Id: I136e6e6338f11ffecf9f856f0736d1d0e6b17c3f Reviewed-on: https://gerrit.libreoffice.org/8456 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-04fdo#65655 : fix for Different_Odd_And_Even_Pages flag ignoredAdam Co3-2/+24
Signed-off-by: Miklos Vajna <vmiklos@suse.cz> Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx (cherry picked from commit db23f89b76cb61b215bcae5495eadba2b5ceace2) Signed-off-by: Michael Stahl <mstahl@redhat.com> Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: Icf9949bb00aa905d22aedfd8f2b297dfa89dfedb
2014-03-03Resolves: rhbz#1007697 Update on a Window triggering delete on windowCaolán McNamara2-18/+83
Reviewed-on: https://gerrit.libreoffice.org/8396 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 1ec2880679d88c89901ce00fe30dd78e584f6960) Conflicts: svx/source/svdraw/sdrpaintwindow.cxx vcl/source/window/window.cxx Change-Id: Ic6374ce45e3a3ba97217ae77e91f9143f46e277b Reviewed-on: https://gerrit.libreoffice.org/8400 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-02-27fdo#73159 Make border dialog work againZolnai Tamás2-4/+4
It seems converting to SfxSingleTabDialog makes it work. Similar conversions were made on master branch. Change-Id: I49985bed56f12460d289c7f0d4e1c1435aa4674e Reviewed-on: https://gerrit.libreoffice.org/8377 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-25Resolves: #i118640# force early destruction of last FragmentHandler...Armin Le Grand1-0/+13
to not let it use an already destroyed RelationsMap instance (cherry picked from commit 190444f7fd3fa9cfcd1955b3f5dcd916184d02f4) Conflicts: oox/source/core/xmlfilterbase.cxx Change-Id: Ibd09ff9fcba8f919df0704c8e3a64423518b932f (cherry picked from commit b071ce32befcc84a57a7ecd39667cb6658c0c866)
2014-02-24my upc router automatically adds .net to the domain search pathCaolán McNamara1-1/+1
i.e. I get handed an /etc/resolv.conf of domain net search net ... and so "nohost" resolves to "nohost.net" which actually exists, so I get an authentication request which is unexpected by this test which therefore falls over. "nohost.invalid.net" also exists btw, as are other various foo.net forms where foo is one of the reserved tld which don't themselves exist. So lets shove a "*" into the name which is definitely invalid, sigh. Change-Id: I8627ced9199f339ad6cca8f27752d883ebe74aad (cherry picked from commit b3d153528a13807d2f5347ec83c7a8d483454a75) Reviewed-on: https://gerrit.libreoffice.org/8181 Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
2014-02-24n#834720: Labels wrongly interpreted as dates.Muthu Subramanian1-3/+1
If the numFormat is available we should probably use that.
2014-02-24we only support simple labels in the InternalDataProvider, bnc#864396Markus Mohrhard1-0/+28
Change-Id: Ie31c5c73bb5185125fd4493c4e476997e2e9bc63 Reviewed-on: https://gerrit.libreoffice.org/8190 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-02-24OOXML chart import: ignore rot values outside the valid rangeAndras Timar1-0/+5
Change-Id: I506a78a024d761d1d263a7bb1dcbf09a4bbcf4ef
2014-02-24fix for bnc#819865 itemstate in parent style incorrectly reported as setNoel Power2-15/+12
Problem occurs because attrs set with default values are reported as set when queried Change-Id: I89d6c3b09312fb78052d87ff20aa12c6fbe7bc98 (cherry picked from commit bf8e9b29aaebcbdd8f2f06b42ac97b8d9f8f4503) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-02-23fdo#74357 DOCX import: fix nested tables anchored inside tablesMiklos Vajna3-1/+15
Regression from bbef85c157169efa958ea1014d91d467cb243e6f (bnc#779620 DOCX import: try harder to convert floating tables to text frames, 2013-10-01), the conversion of nested tables is delayed by default till we know the page size. However, in case the anchor is in a table, we should convert it right away, because the conversion of the parent table would invalidate our XTextRange references. (cherry picked from commit e5fd7c2dacf3c128cdc62622e736ce8abbc578a5) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: Id41556e721c6e1c7239e4ea25abd57c999d2219b
2014-02-20Resolves: fdo#69925 Wiki Publisher Extension is not workingJulien Nabet1-2/+2
Regression from http://cgit.freedesktop.org/libreoffice/core/commit/?id=b80d8c695e6b6ded231e67ed9a80bcd1f1250c03 "compareTo" has been replaced by "==", so we compared the equality ot the pointers on the objects instead of the content of the strings To make it simple and since we compare String objects, let's simply use "equals" method Change-Id: I65bc1a87751297411fdbe722d3f49bce5e291638 (cherry picked from commit 9e2d1d21f9a58e320444f6eaea2f006530bbd2cb) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2014-02-18Updated coreOlivier R1-0/+0
Project: dictionaries 7fafdbb2982433e8a9d53a50c6f214fbbaa70663
2014-02-18fdo#73773: Check if the *document* is closing, not the *app*.Kohei Yoshida3-1/+13
Otherwise it would crash if the app has multiple document instances open and only one of them is being closed. (cherry picked from commit 76bdf523981d2bd983dac4e01bc5cc934118a73f) Conflicts: sc/source/ui/app/inputhdl.cxx Change-Id: Ib6e370037ab6097c9c6eff8035249663944b3a6c Reviewed-on: https://gerrit.libreoffice.org/8055 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2014-02-18rhbz#1065629: RTF import: don't drop nested cells if not enough \cellxMichael Stahl4-0/+118
In this document written by "XMLmind XSL-FO Converter" there are less \cellx than \cell and thus when reading \nestrow/\row a whole buffered nested table \cell is lost and then subsequently the rest of the nested table too. Try to fix that by counting both \cell and \cellx and replaying until the maximum of those. Cannot count \intbl since we synthesize that in various places. (regression in LO 3.5) (cherry picked from commit 07ef4cf096015f0e427ffd17cd26bb6837e75481) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I3b64ad94af842e076611418589a0c83bd18841c6 Reviewed-on: https://gerrit.libreoffice.org/8101 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-18Fix crash in css rgb color handling.Jan Holesovsky1-1/+1
Crashing since 2000 (or earlier). Change-Id: I9f91d56f380be2421370b0acbee351461e1f0973 Reviewed-on: https://gerrit.libreoffice.org/8092 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2014-02-17Resolves: fdo#72233 too long style names over-stretch dialogCaolán McNamara2-7/+8
Change-Id: Id6f102a3def1928ad8f6b4d27eb32f8c69bdba49 (cherry picked from commit a95888e6e62a702f4b9af4a68c44339b51dc283e) Reviewed-on: https://gerrit.libreoffice.org/8085 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-02-14fdo#73800 fix incorrect separator in function description in CalcWinfried Donkers1-2/+2
Depending on locale, the function description with arguments did show incorrect separator(s) for functions with PAIRED_VAR_ARGS. Reviewed-on: https://gerrit.libreoffice.org/8052 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us> (cherry picked from commit f38aa72c1d8f9e535d2b5cefbb2af7f6f37b81a8) Conflicts: sc/source/core/data/funcdesc.cxx Reviewed-on: https://gerrit.libreoffice.org/8057 Tested-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Conflicts: sc/source/core/data/funcdesc.cxx Change-Id: Ie493a77285360a099e5b07e8360ecb5c6c6c1aec Reviewed-on: https://gerrit.libreoffice.org/8059 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-02-12Do not reference a dangling OUStringStephan Bergmann1-1/+1
(cherry picked from commit 151f3d665581d887cda1e36b817afb124c5c789e) Conflicts: sw/source/core/unocore/unostyle.cxx Change-Id: I0908d1300d0d1acb515345ccbdf6cdc2bf44d6a5 Reviewed-on: https://gerrit.libreoffice.org/8008 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-12nPDescPos is never readStephan Bergmann1-13/+1
...since b48f4e99e1d2935f84bc2fac1e6670dd83939673 "#86296# use page descriptor only if necessary", and this nicely removes the odd for(i = 0; i < nPDescCount + 1; i++) loop that read past the end of the maPageDescs vector. (cherry picked from commit 7fb6ae28ae7bebd67c2b9bf2cf517f1f7bb2777e) Conflicts: sw/source/core/unocore/unostyle.cxx Change-Id: I9b0f24231774eef7231eff4b053fd56c020c6e69 Reviewed-on: https://gerrit.libreoffice.org/8007 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-12fdo#73363: sd: fix mis-detection of Visio files as PPTMichael Stahl1-0/+8
SdFilterDetect::detect() erroneously detects all binary MSO files, and because the Visio types would be checked after PPT, Visio is pre-empted. Change-Id: I6ec3647a508dc8d79b47bfff6de35ccae39416ee (cherry picked from commit e62339f856efa0b8ef03df3bf8b93e098c4ac0d3) Reviewed-on: https://gerrit.libreoffice.org/7977 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-02-12cp#100030: Use internal API to fill dxf styles during xlsx import.Kohei Yoshida3-15/+38
It's faster, and it actually prevents a bug where styles fail to get set when the document contains at least one protected sheet. Change-Id: I9a5d7250ca44dd46364ab62f2e0130e967427c66 (cherry picked from commit d12c0e5d36cc106cb4f9a27dba2f29c10b5d6f93) Reviewed-on: https://gerrit.libreoffice.org/7983 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-02-11edit->changes->show has empty filter settingsCaolán McNamara1-1/+4
Change-Id: I98999c0f402cf84d89b3a1167480dc27fdbc2be9 (cherry picked from commit 55c413b9cb2692b784c6c43a519be08146438237) Reviewed-on: https://gerrit.libreoffice.org/7995 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-02-10fdo#46707: Don't bother with synonyms for text with mixed script types.Kohei Yoshida1-0/+23
Change-Id: I7922905523406d05f864b10e1ecfd27f3fb5f9d6 (cherry picked from commit 49341001e76389f11bf67d756f4742275bc9dcd9) Reviewed-on: https://gerrit.libreoffice.org/7963 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-02-10related fdo#65430: forgot to 'unlink' setOpenTemplateHdlJoren De Cuyper1-0/+1
This was introduced in 96e7225260aac0815643a4043f4ddb4e6b5764a1 Conflicts: sfx2/source/doc/templatedlg.cxx Change-Id: I9bb8abbc9e9167b1e43bebf4477cf73010bf2d92 Reviewed-on: https://gerrit.libreoffice.org/7960 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-07fdo#65430 add OnItemDblClicked and setOpenTemplateHdl in templateSearchViewJoren De Cuyper3-0/+19
Currently only templateAbstractView had such handler, which are templateLocalView and templateRemoteView are based on. Change-Id: I6694d0804a8b7e58abc0ddc970e811d053394d6f Reviewed-on: https://gerrit.libreoffice.org/7918 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 96e7225260aac0815643a4043f4ddb4e6b5764a1) Reviewed-on: https://gerrit.libreoffice.org/7924
2014-02-07fdo#56511 Don't unduly delay Bridge terminationStephan Bergmann3-4/+14
When terminate is called from the Reader or Writer thread, the final terminate was delayed until disposal of the BridgeFactory, as an unfortunate consequence of always trying to join on the Reader and Writer. Instead, forgo the join in such a case and rely on the underlying osl::Thread becoming detached after calling termiante. Change-Id: Ifba788c4d0d2e9b14b4f7f6b5f0f1380b712ce36 (cherry picked from commit f6245d5bcb18dff2721d5975cd84711559cefe65) Reviewed-on: https://gerrit.libreoffice.org/7926 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-07Updated coreOlivier R1-0/+0
Project: dictionaries 45b4fce2df346ca5f80560017485a40e9c2b977b
2014-02-06fdo#33852 do not remove too much from the pathDavid Tardon1-1/+4
Change-Id: I1cf89f300530e761df5a287097d05f95d8af2017 (cherry picked from commit eba6a6789c8832f961ac7054588ed84d04b65480) Reviewed-on: https://gerrit.libreoffice.org/7900 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2014-02-06rhbz#1017379 do not remove too much from the pathDavid Tardon1-1/+4
Change-Id: Ibffa7f2fbe91be9b95217ce36999e286ef444a37 (cherry picked from commit 5b35f21f1c69239d0605b0751bed87a410fbffee) Reviewed-on: https://gerrit.libreoffice.org/7897 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2014-02-05Resolves: fdo#69271 i#123510 changed priority in style preparationArmin Le Grand1-12/+11
(cherry picked from commit 86459550d81c3eae067e89d9af1b6e872215a588) (cherry picked from commit 8b2fb0e153fa846a171105b7801c398ffbe3d595) Change-Id: Ia567666cd76dce646479003a830d969f4962da71 Signed-off-by: Michael Stahl <mstahl@redhat.com>
2014-02-05fdo#69652 Default(Date|Time) is a UNO struct nowLionel Elie Mamane1-5/+41
Changed to UNO struct from integer by fdo#67235 adapt form control code to time nanosecond API change Change-Id: I5817d44438d70a0da534c03afd22d74a311252f5 Reviewed-on: https://gerrit.libreoffice.org/7882 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-05fdo#69873 FixedText (label) is implemented as no valueLionel Elie Mamane1-2/+3
And the actual label is put as *body* of the cell. I'd prefer that the value be put as string-value attribute of the cell, but since in the report definition the label is as body (as opposed to as an attribute), it is easier that way. We could move (actually *copy* for backwards compatibility reasons) the label to an attribute of the rpt:fixed-content element (similar to the rpt:formula attribute of rpt:formatted-text) but it is not obvious this is completely desirable: Indeed it would keep us from putting anything more complex than a string there (which we don't do anyway now, but thinking of future extensibility here); I'll leave the exploration of that idea to the indefinite future. Change-Id: Ia0f7460718ee35a971117e2f79c0997e17e1095e Reviewed-on: https://gerrit.libreoffice.org/7866 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-04fdo#74519 - don't drag around and use an uninitialized variable.Michael Meeks2-6/+1
Change-Id: I08b43a6658a600398b434a0c90e0e16863402b33 Reviewed-on: https://gerrit.libreoffice.org/7857 Reviewed-by: Ahmad Harthi <aalharthi@kacst.edu.sa> Tested-by: Ahmad Harthi <aalharthi@kacst.edu.sa>
2014-02-04resolved fdo#74493 do not trust aCell.maBaseCellEike Rathke1-2/+1
Regression introduced with 70c61a549184cf8611f7890ac31b0ba4c460cdec on 4-1 and 68a753b6a36560eb83ba6ebe4fe9897a8759d265 on 4-1-5 Apparently aCell.maBaseCell does not always follow the current cell position, so do not trust it. Always explicitly obtain the correct cell. Change-Id: Ib88de44a326be75c13d37538b8ae56d265b60ee5 Reviewed-on: https://gerrit.libreoffice.org/7843 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-02-04fdo#73300: sw: don't swap in all images when loading filesMichael Stahl2-0/+6
(regression from bd55f05b332c1573bd410fd9e21ea7fcf977e1b0) (cherry picked from commit 9b9eb2e4f619c63eabdc54b5d749ac55d8eaf333) Conflicts: svx/source/svdraw/svdograf.cxx Change-Id: I55532ac0fe983461e961a61149479343d2b879a1 Reviewed-on: https://gerrit.libreoffice.org/7812 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2014-02-04fdo#63433 fdo#74435: SdrPageView::DrawLayer(): avoid spuriously visible imagesMichael Stahl1-1/+10
In the TestBook2.odt of fdo#73300 it happens that at some particular points when scrolling down, the ViewObjectContactOfPageHierarchy::getPrimitive2DSequenceHierarchy() will determine that > 200 images are visible; most likely this is due to an empty ObjectContactOfPageView::maViewInformation2D::getViewport(). Loading this many images may need more RAM than is available on 32bit platforms. That appears to happen only (but not always) if somehow (not sure how exactly) the rectangle passed to SdrPageView::DrawLayer() and the existing GetRedrawRegion() do not overlap at all. (regression from commit 8af09bf33291df2fb2bfbbd6e42f9bf074fcc4fc) (cherry picked from commit 66f8b54931f193bdc844c6bca388d9bde98779cd) Change-Id: Iafc595241df05204bccec1f2336014fc471b6602 Reviewed-on: https://gerrit.libreoffice.org/7813 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-02cairo canvas: Zero font's width means "the same as height".Jan Holesovsky1-1/+5
Change-Id: I1d24b2039fb3c615e672189d12c77e960cc858ee Reviewed-on: https://gerrit.libreoffice.org/7764 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-30EMF+: Only draw endcap outline if not filled, fix endcap scaling.Andrzej Hunt1-17/+32
Change-Id: I4520eea08e43ccd657c1db03b258ef84612da971 Reviewed-on: https://gerrit.libreoffice.org/7726 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit 8d1ca883b119857daa3b8d0ece9da90917589040) Reviewed-on: https://gerrit.libreoffice.org/7742 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-30fdo#63553: sw: fix copy/paste of cross referencesMichael Stahl1-5/+13
If one of aIds or aDestIds contains nSeqNo then adding an identity mapping for it will actually re-define a previous mapping. Likely this can only happen when clipboard document is the source. (regression from 44f971506c0ed37928c48e55d8007f24b0c43a5f) (also it looks like 4b0b0a5b3045902d9a6b95510ec30a3027181e29 has subtly changed what the "else" branch does when it is erroneously taken - results are differently wrong) Change-Id: I34e2979e45cffeb62ebf3d7b3e5ac6d2afff0c2b (cherry picked from commit bb665affbd8870652ade3951d626d76e99143f67) Reviewed-on: https://gerrit.libreoffice.org/7730 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-01-29Presumably "eType ==" is missing hereStephan Bergmann1-1/+1
Change-Id: I7af8cabac09369a9be605413b799289d48cb3f57 (cherry picked from commit d18827e266d1bf44b0bac02ed486d2cdccba9c8a) Reviewed-on: https://gerrit.libreoffice.org/7724 Tested-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>