AgeCommit message (Collapse)AuthorFilesLines
2014-04-10Version, tag libreoffice- Lohmaier3-0/+0
Change-Id: I579b9310322da89e474de9ad963822a42ddad877
2014-04-10bump product version to Lohmaier1-1/+1
Change-Id: I4be4c90774ab36d9911858730d84e2ef8833b12c
2014-04-10Branch libreoffice-4-1-6Christian Lohmaier4-1/+1
This is 'libreoffice-4-1-6' - the stable branch for the 4.1.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.1.x release, please use the 'libreoffice-4-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I95a364ebb32f7bf84f849a7fc53a0a1d6ea699d8
2014-04-09Updated coreChristian Lohmaier1-0/+0
Project: translations ca4af04812c1258d7285ed3071f00b39e0b2f0b7
2014-04-09fdo#71729: Fill the range edit boxes after the table is fully initialized.Kohei Yoshida4-14/+34
Otherwise the range formula expression would not be available yet. (cherry picked from commit ffaaf35206b8f049bb9e9ffd7a85c8ebd758a21c) Conflicts: sc/source/ui/namedlg/namedlg.cxx sc/source/ui/namedlg/namemgrtable.cxx Change-Id: If9c5040366f9038e8094fd5448ca5e4ee2e73edd Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>
2014-04-09Resolves: fdo#76930 explictly list common lang-independant template dirCaolán McNamara1-0/+1
(cherry picked from commit 6f48d0bb2d3f3b4e4d3e46d3a5cdeaa552df1933) Reviewed-on: Tested-by: Michael Stahl <> Reviewed-by: Michael Stahl <> (cherry picked from commit a5b68f520067219c5e571238eafe93d1d728ce38) Signed-off-by: Michael Stahl <> Conflicts: officecfg/registry/data/org/openoffice/Office/Paths.xcu Change-Id: I50d8efe46fc2eb3dfe615ad1f6eb7ee03cdcd29a
2014-04-09Updated coreAndras Timar1-0/+0
Project: dictionaries 04b990e92503bffcdfc03280d8cf910c192f3feb Updated pt_PT dictionary to Change-Id: I08e8377a23a7a2aa7709a0418476d872a476c6ca Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2014-04-07fdo#76298: sw: do not start up every OLE object on deletionMichael Stahl1-8/+9
First check if it's actually a Chart embedded object; starting up external processes on Windows for arbitrary OLEs is likely expensive. (regression from 1ba29be90f7141077f2d079d40dffc2efd4f1a2c) (cherry picked from commit 206848294f686a0ccf4c741d7e92a2314a88ea48) Conflicts: sw/source/core/ole/ndole.cxx Conflicts: sw/source/core/ole/ndole.cxx Change-Id: I3c64444b6cf4d4f791cafc77ec1f9b2b0150ad1b Reviewed-on: Tested-by: Caolán McNamara <> Reviewed-by: Caolán McNamara <>
2014-04-04accept proper number style condition != as not equal operator, fdo#76777Eike Rathke1-1/+8
ODF 1.2 specifies '!=' as not equal operator in <number:number-style> <style:map> style:condition attribute. So far '<>' is written, accept the correct operator. Change-Id: I6087992ee35fff5c7aa52b7cec2b83b0a78dbac1 (cherry picked from commit dfcc851d65c8d81988843ef31a75b5d30051ddfd) Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2014-04-04bnc#821208 DOC import: fix unwanted char background in numbering char styleMiklos Vajna3-1/+4
Word supports formatting the paragraph parker itself, and we import that as a formatting at a position after the last character (e.g. "foo" will have that formatting at char pos 3, which is ignored by the layout). In addition to this hack, commit 1c22545edf9085b9f2656ca92781158b6b123db3 (Fix issue #i119405: Numbering text style changed after importing the *.doc, 2012-08-24) added a SwTxtNode::TryCharSetExpandToNum() hack to Writer core, where in case such a paragraph marker attribute is set, and the SwTxtNode has a numbering, then also modify the associated character style as well. As that commit already noticed, there are attributes which should not be propagated to that character style. Extend this blacklist to ignore RES_CHRATR_BACKGROUND as well, as Word does. Change-Id: Idcb40d37d8688c76fbd61f28428f6e3bc995f799 (cherry picked from commit 5a5d948e230dfea61108452579b68da75706cad4) Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2014-04-03Support SmartTagRecognizers againStephan Bergmann1-1/+1
The XContentEnumerationAccess is at the service manager, not the component context. Regression introduced in LO 4.0 with 4381f3dd5ae9e042840a16f69d07267208160420 "fdo#46808, Use BreakIterator ::create method." Change-Id: Idb7d38b9c14beea9a9ad347e6cbc8190d7248b2d (cherry picked from commit d4c8325ea9cbffeff91de49d5e1f1f026be319de) Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2014-04-02init a few more stream-read svm elementsCaolán McNamara2-19/+22
(cherry picked from commit 67c6ea0c426c2796fc1b80cbe2cb0347686db90d) Conflicts: vcl/source/gdi/metaact.cxx Change-Id: I3dfa2485afbe66131b86764374d53181b55c2346 (cherry picked from commit 21212a65c5653bdc38cea426710e68ed40c66eb8)
2014-04-02valgrind: Conditional jump or move depends on uninitialised valueCaolán McNamara1-1/+1
Change-Id: I1939d376afe5dd5c67f378ffb2520a066dc99077 (cherry picked from commit 6efbc4598aea1e87c1569c7beef13d44b1a4202c) (cherry picked from commit 1742008dd0d83f3e69b6e09d9e3223d0c5d28096)
2014-04-02detect add to table beyond MAX_TABLE_SIZECaolán McNamara1-9/+33
Change-Id: I9b1357e583620c59898cd7a649a5b39a6d7e3739 (cherry picked from commit e326b5e06d74685b1853d61c465e5be0b5bf1595) (cherry picked from commit 4e2c5ffa89b77e4d6b0a1dc964d330d2ae3636d6)
2014-04-01valgrind: Conditional jump or move depends on uninitialised valueCaolán McNamara1-1/+1
(cherry picked from commit e3dad060929de9beeeed2978f1b1427a91152073) Conflicts: vcl/source/gdi/metaact.cxx Change-Id: Ia0b22f7c394d1c2387d1cad7e3d99c79eaeca81a (cherry picked from commit a37f474a2272c505778774cd1d92897d8a744863)
2014-03-31Resolves: fdo#76802 error msg in Web Page Wizard dialogJulien Nabet1-1/+1
Change-Id: I0fa0537a8726bbda182dea8c3a9014d77973edea Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2014-03-28Resolves: #i124453# check if the resulting polygon...Jürgen Schmidt1-0/+13
has already exceeded the number of points (2^16) that can be handled by a tools polygon (cherry picked from commit 804e547d70552fd64e1344d538427f8898824b43) Change-Id: I437a84493e264f7b650561599170e831da20c9aa (cherry picked from commit a9582c05f854cad02710178ab7fa79498573269e) (cherry picked from commit ab71a4512557b7290cd7b1b4923463052acf164e)
2014-03-28Related: #i124516# handle bad surrogate pairs gracefully on WindowsHerbert Dürr1-5/+12
When running into invalid Unicode surrogate pairs the text layout code on Windows ran into massive problems like crashes. This change detects the situation of an invalid surrogate pair and falls back to treat it as a simple character instead of requesting a complex glyph fallback. (cherry picked from commit 913f1fc4b1362f6e91595af5ae10c4cba79fd355) Change-Id: I2988f4b64061d0a5df211f6f0f04b1f235fcd6a5 (cherry picked from commit 67688d3118b1a361d5dbdaa78e918815c163d75c)
2014-03-27fdo#62155 - don't crash if we can't create an instance of a calc addin.Michael Meeks1-4/+12
Change-Id: I478d7777949683a91e7adf9fa6b54e9d01ced676 Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>
2014-03-25fdo#76568 remove BerkeleyDB from license textAndras Timar3-360/+161
Change-Id: I2cb20a50706d2bae158e9e04d21e357c51a2ad10 Signed-off-by: Michael Meeks <>
2014-03-24coverity#705969 Dereference before null checkCaolán McNamara1-1/+1
Change-Id: Icb19931bb529e6c2b98621a603cdb86011d68a9e (cherry picked from commit 51452b7afe858139076010decbe04758321a8396) Reviewed-on: Tested-by: Björn Michaelsen <> Reviewed-by: Björn Michaelsen <>
2014-03-21coverity#705966 Dereference before null checkCaolán McNamara1-1/+1
Change-Id: I74507ce67f928bdeb626d4070dbd2a45cc126521 (cherry picked from commit 511d8bbbec6bc95d92a3ac6bbac4c68622738706) Reviewed-on: Reviewed-by: Norbert Thiebaud <> Tested-by: Norbert Thiebaud <>
2014-03-21coverity#736084 Missing break in switchCaolán McNamara1-0/+2
Change-Id: I3c7a032441402455d0a6ed28fc2cd5ce958ead04 (cherry picked from commit 5c291a0287af46558d3ef96d18b114c371ddd31b) Reviewed-on: Reviewed-by: Matúš Kukan <> Tested-by: Matúš Kukan <>
2014-03-21fdo#51819: autorecovery: fix saving password in protected documents.Matúš Kukan1-3/+5
Thanks to for the idea. (cherry picked from commit ef87ff6680f79362a431db6e7ef2f40cfc576219) Conflicts: framework/source/services/autorecovery.cxx Change-Id: Ib79abafe3d4d3ba21f7914aeb284d86ce662824c Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2014-03-19Related: rhbz#1076264 intermittent a11y crash in calcCaolán McNamara1-27/+43 this crash refuses to be captured alive. But seeing as we sometimes check mpViewShell against NULL and sometimes check GetViewData against NULL its worth making those checks everytime for consistency see also... rhbz#923993 rhbz#896711 rhbz#602273 rhbz#577595 lp#811057 lp#760665 (cherry picked from commit fae1e19af05e664364c55d4f686aaab860fd538d) Conflicts: sc/source/ui/Accessibility/AccessibleDocument.cxx Reviewed-on: Tested-by: Markus Mohrhard <> Reviewed-by: Markus Mohrhard <> (cherry picked from commit d01abcc7beb215c7e425248f690db8a642f00c73) Conflicts: sc/source/ui/Accessibility/AccessibleDocument.cxx Change-Id: I5553848018f500b63ade60bcfc756a736b27c64f Reviewed-on: Reviewed-by: Andras Timar <> Tested-by: Andras Timar <>
2014-03-19n#821567: Import PPTX background images with table-name.Muthu Subramanian3-2/+21
Ported from 2ec4d410de5bd98527336a9dc49abb76656373df Change-Id: I50693f7fea8de4f1d3668378aa2334539dd80c42 Reviewed-on: Reviewed-by: Andras Timar <> Tested-by: Andras Timar <>
2014-03-19fdo#75460: sw: fix AutoScrollMichael Stahl1-10/+5
This reverts commit 5141201fba2d080841b81e02be92f4b47aae2684. which fixed a crash but unfortunately also prevents the m_pEditWin->HandleScrollCommand from being called, thus disabling AutoScroll. Fix the crash in the ugly way by another pWData check. (regression from 8880c773e779710dc0a08760e92afd709a73ca31) (cherry picked from commit 6795b251e2011cae945c6bb903de8053953b5e30) Conflicts: sw/source/ui/uiview/viewport.cxx Change-Id: I958f1403ad23d0c0631eca5dbbef977a9ca1210d Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2014-03-19workaround for rounding errors when handling merged cells (fdo#38414)Luboš Luňák1-3/+13
Change-Id: I4d36e4b86c77a7356a8c221cbfc5735e925392ba Signed-off-by: Andras Timar <>
2014-03-17part of "fix odf validation errors around new chart regression curves"Markus Mohrhard1-0/+1
need MAP_ENTRY_ODF_EXT_IMPORT definition from 4c7116413af091a30f5fa60c63d29bc694730518 Change-Id: I5bd4340186beca95eb3c615f713056007fcc5ee1 Reviewed-on: Reviewed-by: Michael Stahl <> Reviewed-by: Markus Mohrhard <> Tested-by: Markus Mohrhard <>
2014-03-17justify range to prevent negative tab span and memory alloc, rhbz#1057741Eike Rathke1-0/+1
I could not reproduce the crash of that bug (probably having more memory available), but the backtrace had nTabSpan = -2 implicitly casted to size_t leading to allocation of a huge amount of memory with vector::reserve(), which ScRange::Justify() exactly prevents. Change-Id: Idb79e1be62649922ba793cab01e00011479fade9 (cherry picked from commit a45fde7235f95792bf8e6f6979d0040637c5785d) Reviewed-on: Tested-by: Markus Mohrhard <> Reviewed-by: Markus Mohrhard <>
2014-03-17fix odf validation errorMarkus Mohrhard1-0/+1
This is the import only change for older release branches. New elements must not be exported into the chart namespace. Change-Id: I295d61224e255dff04ea8564b01a5a438876afc1 Reviewed-on: Tested-by: Michael Stahl <> Reviewed-by: Michael Stahl <>
2014-03-14fdo#68779: RTF import: set borders without explicit widthMichael Stahl1-1/+3
Word reportedly uses 0.75pt as a default if \brdrw is missing. (cherry picked from commit 84f4de3b65cd0f861e80c69b773004f28f9f8d9f) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I263c56f756c65ff6bb30870aa70806564d5826a6 Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2014-03-13bnc#865381 DOCX import: table cell btLr text direction fixesMiklos Vajna3-8/+26
(cherry picked from commit 48b5b7641d0df960558082e8948da8598f801264) (cherry picked from commit 970160f78ef6cc7abacfa252daa8451e1f0117bb) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx writerfilter/source/dmapper/DomainMapperTableManager.cxx writerfilter/source/dmapper/TablePropertiesHandler.cxx Change-Id: I527955671e1100f05da717bffe002131baaf0291 Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2014-03-12fdo#72481 drawingml import: don't set CharEscapementHeight unconditionallyBjörgvin Ragnarsson1-1/+1
Commit 840a8573c8cebe67ddd3c9fe106c7dbd789bb334 (Fix fdo#70220 Superscript not imported from pptx., 2013-10-07) made it possible to set CharEscapementHeight even if moBaseline is not set, but this causes problems in the docx importer + not necessary, according to the bugdoc; so just don't do that. Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Commit and message cherry picked from: commit 798a563db133ebed3876c245459d90ef54ee7c9a Author: Miklos Vajna <> Change-Id: Ib95ac449bd8fdf6376261ddc86108f0d23f2200e Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Andras Timar <> Reviewed-by: Andras Timar <>
2014-03-12Resolves: fdo#50855 Nimbus Sans L missing stylesCaolán McNamara1-1/+6
Change-Id: Ie8cdcf4ad0ffe52024fd5cfe33073abfc6aadca8 (cherry picked from commit 1e539dbf0fe3894bbf6bf1a0851163b56e37f090) Reviewed-on: Reviewed-by: Norbert Thiebaud <> Tested-by: Norbert Thiebaud <>
2014-03-12n#821567: Use BitmapURL only if its valid.Muthu Subramanian1-1/+3
Ported from: bf2ff0468e06770f9320c652a2332f7ec137d061 Change-Id: I7464fcba352798a686fc0563dd023feac5234dbf Reviewed-on: Reviewed-by: Norbert Thiebaud <> Tested-by: Norbert Thiebaud <>
2014-03-12n#862516: Remember slides sorter view setting.Muthu Subramanian1-0/+2
Keep the number of slides per row when moving across tabs. Change-Id: I316dac87c9dc8c88149b510f93be88940d91d98c Reviewed-on: Reviewed-by: Andras Timar <> Tested-by: Andras Timar <>
2014-03-11fix negative error bar range export, fdo#75510Markus Mohrhard1-1/+1
Change-Id: Icca2f9fc26b15b968a940e5c73f7ad3781f75e94 (cherry picked from commit 7470b3ef17570581fe590a4853de59cac1be6ea5) Reviewed-on: Reviewed-by: Kohei Yoshida <> Tested-by: Kohei Yoshida <>
2014-03-11Related: #i124106# correct handling of page break attributesOliver-Rainer Wittmann1-2/+5
i.e. those which are providing the default value explicitly (cherry picked from commit 5a15ef3da683566d7bd443f96eeec3a9a3f70aeb) Conflicts: writerfilter/source/dmapper/DomainMapper.cxx writerfilter/source/dmapper/PropertyMap.cxx (cherry picked from commit c30fb7d7269b5bdd1853ac22120f57aa2bfd13a5) Change-Id: Ib8721f2fce060d26ee75b0515b3bf62a603fd40c Signed-off-by: Miklos Vajna <>
2014-03-10coverity#708535 Uninitialized scalar fieldCaolán McNamara1-0/+1
Change-Id: Ife2acd5dd5193edd0ca34d85370885ee6865fadd (cherry picked from commit ecc6239f5b7decfc61b68e745175982fdeee931e) Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>
2014-03-09fdo#52547 SOT: Prefer embedding image data to embedding linked image.Andrzej Hunt1-9/+9
When copying an image from e.g. Firefox or Chromium the clipboard will contain both the image itself, and the url of the image -- presumably it makes more sense to store the image data itself if it is available -- the order of the items in the *_FREE_AREA_Copy defines the order of preference for which data in the clipboard should be used. Change-Id: Id8b862a9f2fce3a34adbb16509e9b7372500a239 Reviewed-on: Tested-by: Caolán McNamara <> Reviewed-by: Caolán McNamara <> (cherry picked from commit c47db038f98aaf7aec3cbe57c4e5683591afa23e) Reviewed-on: (cherry picked from commit 91a55de7be6a23685a875517495c1af67f3a8b60) Reviewed-on:
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: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2014-03-07fdo#60833 user's wordbook should be selected by defaultAndras Timar1-0/+1
Change-Id: Ic710f719df3ba71a8b71e6ef8afd54d60e73c5d9 Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
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: Tested-by: Kohei Yoshida <> Reviewed-by: Kohei Yoshida <>
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: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>
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: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>
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: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>
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: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2014-03-05fdo#59329 fix docked panels bordersAhmad H. Al Harthi1-37/+12
Change-Id: Ia918d644fb57d6fbaeef90c8c1a6806a8d7e589c Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
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: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>