AgeCommit message (Collapse)AuthorFilesLines
2013-06-11bump product version to, release number to 2libreoffice-4-0-4Petr Mladek2-22/+22
Change-Id: Ic4f0891d41930df7a066b9f72c04f48b4ca745d8
2013-06-11Revert "fix fdo#60533, Set TEXT_LAYOUT_BIDI_STRONG flag."Petr Mladek2-7/+15
It caused some regressions. For example, see fdo65414 and fdo65562 This reverts commit 6708ad7f1baa8d4cef1718bdef1d26fb5d8510f3. Change-Id: I0108463c78bbcb48a4c218d78e51deaa39caec0c Reviewed-on: Reviewed-by: David Tardon <> Tested-by: David Tardon <> Reviewed-by: Miklos Vajna <> Reviewed-by: Jan Holesovsky <> Tested-by: Jan Holesovsky <>
2013-06-10Updated coreAndras Timar1-0/+0
Project: translations f274c16fc9b7d59bfc3c527afbb08c319dec1a58
2013-06-07Transform the clipping polygon before using itFridrich Štrba1-0/+1
(cherry picked from commit abdbb847fa135dd758ef3ef99db4c07a2671ca47) Change-Id: I71a00f7d4b80ef41b637889e51a414fac6883ba1 Signed-off-by: Thorsten Behrens <> Reviewed-on: Reviewed-by: Fridrich Strba <> Reviewed-by: Michael Meeks <> Tested-by: Michael Meeks <> Reviewed-by: Kohei Yoshida <> Tested-by: Kohei Yoshida <>
2013-06-05Uploading libvisio-0.0.28 fixing fdo#64797 regressionFridrich Štrba1-2/+2
(cherry picked from commit 9b4ea9fdfc0c780bead46fde74a71078e542c493) (cherry picked from commit c44e55aac0dc0685c7bf3f313f4b3e6c65aaa6c6) Conflicts: download.lst Change-Id: Ia35a92dae0a3102bf549df1733c7e202c7ed665e Reviewed-on: Reviewed-by: David Tardon <> Tested-by: David Tardon <> (cherry picked from commit 875effcdc7cfe38f8d41aac31f8d603ac114be5a) Reviewed-on: Reviewed-by: Thorsten Behrens <> Tested-by: Thorsten Behrens <>
2013-05-31Fix crash with fdo60063-1.docxFridrich Štrba1-28/+13
Compared to the original version, this one tries hard not to produce empty keywords. Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <> (cherry picked from commit b2f97d77237cde249b4c40acc8ad3f7f8755e768) (cherry picked from commit 693707e338922d8dc7578975a1990e8a1cba6a53) Conflicts: oox/source/docprop/docprophandler.cxx Change-Id: I11d036c2d54cde2d3c311a77c115011246f38d0a Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <> (cherry picked from commit d60f81a3e9d020ff1ae0db2e73551bff45c43256) Reviewed-on: Reviewed-by: Luboš Luňák <> Reviewed-by: David Tardon <> Tested-by: David Tardon <>
2013-05-30Accept even more corrupted zip documents as long as we can read themFridrich Štrba1-1/+0
Change-Id: I8d039664d6c33d978b9addc3f35cbeae86d6c710 (cherry picked from commit 1b049bd2dae52dc154ea6bee075a254a9b6cc318) (cherry picked from commit d360333f83e3115219c3928525060c6c2a8711db) (cherry picked from commit 0ed9f3a30ae2069d88d6a45d4f73817aa8596fbf) Reviewed-on: Reviewed-by: Michael Meeks <> Tested-by: Michael Meeks <>
2013-05-28bump product version to, release number to 1Petr Mladek2-22/+22
Change-Id: Ib998c94965971a104f94fe54fa5593a6643c7418
2013-05-28Branch libreoffice-4-0-4Petr Mladek3-0/+0
This is 'libreoffice-4-0-4' - the stable branch for the 4.0.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.0.x release, please use the 'libreoffice-4-0' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ifdaec4b88e2dd741bfbf4de79a81735fbf643367
2013-05-28Updated coreAndras Timar1-0/+0
Project: dictionaries 0ec408b2cd85a4462939ac32e5cace87c76c4c92
2013-05-28restore old behavior for external references, fdo#64229Markus Mohrhard1-1/+1
Change-Id: Iae160607447ff6e1133f9e1e6f9c6a9f1e7bd7ab Reviewed-on: Reviewed-by: Petr Mladek <> Tested-by: Petr Mladek <>
2013-05-28correctly delete note captions, fdo#64068Markus Mohrhard1-1/+3
This fixes fdo#64068 and correctly without reintroducing the crash with Undo/Redo. Change-Id: I9ad48f6dbb7f1587985f8da9eba3886dfd4068de Reviewed-on: Reviewed-by: Petr Mladek <> Tested-by: Petr Mladek <>
2013-05-28fdo#63254 UI:Horizontal scroll bar isn't displayed when RTL tabAbdulaziz A Alayed1-2/+3
opened with LTR UI. Change-Id: Iff6899539fe0b1788df7b09f91f850b91bcdb811 Reviewed-on: Reviewed-by: Stephan Bergmann <> Tested-by: Stephan Bergmann <> Signed-off-by: Petr Mladek <>
2013-05-28fdo#65039 UI: Oxygen theme has wrong icon for Power regressionAndras Timar1-0/+0
Change-Id: I86b927d5c2e6a643beac8b9a151f572c028c18f3 Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2013-05-27we need a reference to the DifParser.aData, fdo#64920Markus Mohrhard2-26/+12
regression from 6191fa0847ac5b27083efe1a8c6cd84d080a638c Change-Id: If7fc18e7d0bcbf1075a0ecdb1c0dcf3d207f1bda Reviewed-on: Reviewed-by: Petr Mladek <> Tested-by: Petr Mladek <>
2013-05-27Updated coreAndras Timar1-0/+0
Project: translations 13c35052f95c82d80f0751d80c4b9c03f488b5de
2013-05-27range names need to be checked upper case, fdo#64031Markus Mohrhard1-2/+3
Change-Id: I540821fd7058bf0da27d955c9d966a10dd21ec94 Reviewed-on: Reviewed-by: Noel Power <> Tested-by: Noel Power <>
2013-05-27fix fdo#64872 infinite loop saving as docLuke Deller2-21/+7
When loading from odt, table cells which are covered (due to merging of cells) are replaced with an empty cell by SwXMLTableContext::ReplaceWithEmptyCell. However if there is a sequence of cells covered from above then their replacements are accidentally inserted in reverse order, which produces this infinite loop problem when saving as doc. The reverse ordering in SwXMLTableContext::ReplaceWithEmptyCell was because the insert position came from SwXMLTableContext::GetPrevStartNode which was very careful to skip previous covered cells. However those cells have already been replaced with an empty cell so they should not be skipped. Change-Id: I6a022cd1490afa181dbc3e4b2d6ed4af3077b363 Signed-off-by: Miklos Vajna <>
2013-05-27remove chart listener when chart is deleted, fdo#64639Markus Mohrhard3-0/+8
Change-Id: I7ebf75f49c89edcb0bba3a597ba24ac1c0a655ef Reviewed-on: Reviewed-by: Noel Power <> Tested-by: Noel Power <>
2013-05-27fix backport (OUString::number -> valueOf)Luboš Luňák1-1/+1
Change-Id: I19920a19543a5dde1761711a736090e56c3254f6
2013-05-27Missing include in liborcus when building against Boost 1.53.0Stephan Bergmann2-0/+30
Change-Id: Ie6c944d53d6e2fcdd161f674e32c9fbfd761d844
2013-05-27fdo#64671 Some special RTF characters were not skipped correctlyUrmas3-1/+12
Some special characters, like { and }, were not skipped when they occured as a replacement character for \uN keyword. (cherry picked from commits bfb93ffc6d72d22a833acf9d8c9d166153dad7c0 and ec8e012e980c88c8f24a7de44e44d0319bae2801) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Signed-off-by: Miklos Vajna <> Change-Id: I19b66a290cd9880924774fa89bb29df280e44a3c
2013-05-27Fix style renaming confusion in ww8 filter (solves fdo#63603)Luke Deller2-2/+28
(cherry pick my fix from master 2d3d942683d1cce738eab09b58e4fd693d5e7241) - Mapping LO default style to Word "Normal" style for docx output used a hard coded style name, so it broke when LO's default style was renamed in 4.0 (plus it would never have worked for non-English languages) - This renaming did not cater for nameclashes, leading to fdo#63603 - Similar renaming when importing doc styles did cater for nameclashes, but had a minor bug in that Change-Id: Icd4f27fb1760f0c1ca068c742c48ebcd71d1eb15 Reviewed-on: Reviewed-by: Luboš Luňák <> Tested-by: Luboš Luňák <>
2013-05-27Add Corel Draw and MS Publisher MIME Types to DrawSamuel Mehrbrodt1-1/+1
Change-Id: Idbaa8cea7427db3103954c6c60aa7caa6784a3ba Reviewed-on: Reviewed-by: David Tardon <> Tested-by: David Tardon <> (cherry picked from commit aa360797608efd5b03e9eccf0ab934410e042734) Signed-off-by: David Tardon <>
2013-05-26Updated coreAndras Timar1-0/+0
Project: translations d60616b0e1715918e68b7bb3a26a7f901599185b
2013-05-24rhbz#961460: Don't needlessly pass URLs through INetURLObjectStephan Bergmann1-8/+7
The WebDAV UCP uses https/davs URLs that may contain a userinfo (cf. RFC 3986) part, and INetURLObject does not support that (in accordance with RFCs 2818 and 2616) and thus creates an empty INET_PROT_NOT_VALID INetURLObject for such a URL, leading to failure when trying to save a document to such a URL. (Regression introduced with 966d20e35d5a2be2fce6c204af5c156c3ead7063 "CMIS ucp: write documents back to CMIS server.") Change-Id: Ifd396852b211cab1d29575da7fccb32306479f93 (cherry picked from commit 3f5c45b70864af95a6362acf4684fb57eb85e348) Reviewed-on: Tested-by: Caolán McNamara <> Reviewed-by: Caolán McNamara <>
2013-05-24fdo#63311: Unable to delete text from Shape.Muthu Subramanian1-7/+4
This avoids setting null as text to the shape. [empty_text seems to be the initial value of text for shape rather than null - something recent? We also seem to export empty <text> entries because of this] (cherry picked from commit 19b217505d094577392d8712b9d07f29b3de2081) Signed-off-by: David Tardon <>
2013-05-24fdo#43105: apply old sw-nested-positionned-tables-ww8-import-fix.diffBjoern Michaelsen1-84/+88
- replaced the really ugly goto hack though (cherry picked from commit ee1db992b98378b5e2f5e9aa8af0e36c375e582f) Change-Id: I14dfbe414dc16b634fbaca0a365e2e9ec37ab08e Reviewed-on: Reviewed-by: Björn Michaelsen <> Tested-by: Björn Michaelsen <> Signed-off-by: Miklos Vajna <>
2013-05-24WaE: signed/unsigned comparisonCaolán McNamara1-1/+1
Change-Id: Iaa439c268eda24d700471560927d8f4c0f2e017b (cherry picked from commit 6a0a33444255fcdbe16500de24fc5bfd74adca4b)
2013-05-23fdo#33281, i#120627 [From Symphony]the text on the Y axis is reversed when ↵Zhe Wang1-1/+6
export ppt file to PDF format. * subversion/main/vcl/source/gdi/pdfwriter_impl.cxx []Change nXOffset value from the distance of axis Y between two points to the distance between two points. Patch by: Tang Meng<> Suggested by: Wang Zhe <> Found by: Tang Meng <> Review by: Wang Zhe <> (cherry picked from commit 58b6a6161e7edd10d33fdb67510e7d68440128f9) Signed-off-by: Miklos Vajna <>
2013-05-22fdo#52540 fix hyphenation of Graphite ligaturesLászló Németh1-0/+1
Change-Id: I3c6aef6d845a7494d54b3c902654b21f3939e8cf Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-05-22fdo#64011 fix the position and the drawing from left to right in RTL sheetFaisal M. Al-Otaibi1-0/+7
this will fix the start position for drawing and you can draw shapes from left to right when the Sheet are RTL Change-Id: I5cc8eabf474918968bea026dba9c5add2bb4f28e Reviewed-on: Reviewed-by: Ahmad Harthi <> Tested-by: Ahmad Harthi <> (cherry picked from commit 3661c3eb0124d6f4799fe7c4393d4576e1613bfb)
2013-05-22fdo#63878 fix the zoom bug on RTL sheetFaisal M. Al-Otaibi1-0/+3
fix the X position after check if the sheet are RTL Change-Id: Icbb9ce44508698e0f03898b202e033c07ae2de70 Reviewed-on: Reviewed-by: Noel Power <> Tested-by: Noel Power <> (cherry picked from commit a53efad8dea0b0d78a5ff2b84aa2f09a4c178fd6)
2013-05-21fdo#62483 missing default button in format -> aligment dialog at mathJoren De Cuyper1-2/+2
The default button was missing because the dialog was to small (it "fell off"). Also the default button was placed a bit to far from the help button IMHO. Change-Id: I05a079cacf6e5ac73861aff4a7dab7a455f3f181 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-05-21fdo#47951 work around underlying causeLionel Elie Mamane1-8/+8
The true cause is that the flat text file database driver mishandles the case of two ResultSets being open on the same table: the moving commands of one impact the other. Since in this case: - one ResultSet is open by the dispatch of ".component:DB/DataSourceBrowser", that is the grid UI shown to the user, and that ResultSet is kept open to serve requests by the user to scroll; - the second ResultSet is opened by the call to pNewDBMgr->GetColumnNames and that ResultSet is closed by the time GetColumnNames returns We just swap the order of these calls to work around the underlying driver bug. Change-Id: I628d9b870df2bbc402637818f987637d3bd62897 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-05-21fdo#47951 flat text table: update m_nRowPos when moving by bookmarkLionel Elie Mamane1-0/+14
Change-Id: Iac154020b4b6309f92b1f68fa5bf79611dfcc91b Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-05-21make 64-bit shell extensions work, put 64-bit VC runtime in the same dirAndras Timar7-37/+58
Unlike in case of msvcr90.dll, which went to WinSxS, msvcr100.dll is installed to the "system32" folder. Windows installer automatically replaces it to SysWOW64. The problem is that this way 64-bit dlls end up in the wrong directory. They conflict with the 32-bit dlls, and will not be installed. Therefore 64-bit shell extensions will not work, unless the 64-bit VC runtime is installed from other source. It is not possible to install both 32-bit and 64-bit VC Runtime with merge modules in case of VS 2010 and VS 2012. For the 64-bit shell extensions, we can install the runtime dlls next to the files. Conflicts: scp2/source/ooo/vc_redist.scp Change-Id: I47060f8ff764ca1156596139ecbec003f964bc60 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-05-21fdo#46553 Update embedded manifest on win32 builds to declare dpiAwareAndras Timar2-0/+8
Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <> Conflicts: solenv/gbuild/platform/ Change-Id: I71a3960b21f2c996b97e1a5707f20b30819fd6bd Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-05-21fdo#64652 remove length restriction of Replace edit boxAndras Timar1-1/+0
Change-Id: I0141dc06d940e64244909ddcb8b7e5bb797c337f Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-05-20fix wildcard handling regression( for basic functions like Dir ) fdo#64536Noel Power1-1/+1
Tweak another fallout from String->OUString Change-Id: I3932bdb441fe6b08cefa6331870956664ade77bd (cherry picked from commit 175509176433cf5df2d98718e1a6f9cf5bbe9658) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-05-17obtain days in month from non-normalized date, fdo#63805 relatedEike Rathke1-1/+1
Change-Id: I05cefb96d7d6290ff7e1a89fa88b21da7a6c82a2 (cherry picked from commit 59d6bde4045e928b5d68fb23e3340fa0e48f3e33) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-05-17Silence a bit libcdr buildFridrich Štrba2-0/+695
Change-Id: I9bae7d0ea71072168ba53d7376e816bcd05722fa (cherry picked from commit 6389bf38961d84fd3e1c8fbdc78040e1b1be3ba9) Reviewed-on: Reviewed-by: David Tardon <> Tested-by: David Tardon <>
2013-05-17Make libcdr build a little bit less verboseFridrich Štrba1-0/+1
(cherry picked from commit 4c3ad94c70f98f5062bf96a6f1339992b7ec2bd1) Conflicts: libcdr/ Change-Id: I8e70cd72e8c7934b2a04fbe6b9ed5f662c494960 Reviewed-on: Reviewed-by: David Tardon <> Tested-by: David Tardon <>
2013-05-17Uploading new libcdr 0.0.14Fridrich Štrba4-24/+6
(cherry picked from commit 0f28a2a5e29499b62074dad4442fafa57858677d) Conflicts: download.lst libcdr/ libcdr/libcdr-0.0.13.patch Change-Id: Ifb3f8a7b0e40ee8b33fab4dded3f75f040e75f72 Reviewed-on: Reviewed-by: David Tardon <> Tested-by: David Tardon <>
2013-05-17fdo#57079: SvxSuperContourDlg: unregister configuration listenerMichael Stahl1-0/+2
... in destructor. Otherwise it will access freed memory when eventually called. This crashes since OOo 3.2 but no idea why it would appear to not crash in earlier versions. Change-Id: Ie3ab7ddf19fb1086f0b7d824555ab6b063e2b9ad (cherry picked from commit fc63700181ab0f42eab5f98328074fe1682344f8) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-05-17fdo#62965: fix crash in Edit Contour dialogMichael Stahl1-1/+1
The pObjList is 0, so use pObj's GetModel() which should be the same. (regression from 115054fef08998c56cba8f14472df1d15007f635) Change-Id: Ib20e1806518f7b3b33d3fb4472d79d531ea9f1de (cherry picked from commit 71f990d286c603b3bf220c8d93af69f04a45dd7a) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-05-17resolved fdo#63805 max day of month of the intended monthEike Rathke3-11/+28
Since 6619955e72c1c2f29a32e82478d19147c0d7610a Date::GetDaysInMonth() operates on the normalized value that corresponds to the actual values set at the Date instance, obtain and set number of days for the intended month instead of using the rolled-over date. (cherry picked from commit cd9d1bdf5e3351c929d5b651c009ee17b4d962c4) Conflicts: sc/source/core/data/table4.cxx Change-Id: Ia6b007675104f8e134b278f216c3bb48b72f061c Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-05-17Revert "fdo#63878 fix the zoom problem when the sheet are RTL"Noel Power1-3/+0
This reverts commit 9411d4d56374a55777019d58c1e7f45767662707. Change-Id: I1165ab1a2c0059e40c4963c99cabfcadb7d0bcb4 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-05-17fdo#60967: re-enable deletion of paragraph following tableMichael Stahl3-1/+40
This was actually a documented feature, so removing it just because it only happened to work sometimes by accident was a bad idea :) (regression from f4b6c94c68b5f67b931cde8d0acda6ec8b288bb) So implement this in a less accidental way, so that Ctrl+Shift+Del at the last position inside a table will delete the following paragraph. Do not implement the weird "only delete first sentence and merge rest of paragraph into cell" behavior, because i don't think it makes sense; much better to just delete the whole paragraph, that is also the most likely use-case for this (with table in frame/header/footer). Change-Id: Ia88b3c8958798fd9c64ee75b56c61d787079133e (cherry picked from commit 38b06c661559e6eca60e2c4a4a3637b8293307b2) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-05-17resolved fdo#56772 keep track of HTML ON/OFF tokensEike Rathke2-4/+20
Regression introduced with 11cbcb8b08b540b144a5df744e9fba0b6ba8144a followed by 56d6589368c2e88cffec0c2e518f7c90863eeae6 Deep from svtools/source/svhtml/parhtml.cxx HTMLParser::_GetNextToken() only a HTML_TABLEDATA_OFF was generated for <td .../> without a matching HTML_TABLEDATA_ON (actually same for all <XXX/> ON/OFF tokens). This confuses a state machine that doesn't keep track of such unexpected closures and also expects all attributes of an element at an ON token. Only the parser knows this is actually one token but needs to generate separate ON/OFF tokens. These bugs mentioned in the original code and commits are still fixed with this change: Change-Id: I2b3190d297a35ee3dfda95f9a4841f7c53ed4a92 (cherry picked from commit bb7360ca9929e9b395b3c903f460c9ed5efdce4d) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>