summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-06-24Version 3.6.7.1, tag libreoffice-3.6.7.1libreoffice-3.6.7.1Christian Lohmaier0-0/+0
Change-Id: I3eefaf96ebd0dcd44a86a0fc0c8b8061fcc51f64
2013-06-24bump product version to 3.6.7.1, release number to 1Christian Lohmaier2-25/+25
Change-Id: I263527a3568a375aeeb6d3b89ab4bce02af27f3c
2013-06-24convert the right number of elementsDavid Tardon1-1/+1
(cherry picked from commit e3a8e4f221fca5f67f4d6caf17f3bec39b13e3d5) Signed-off-by: David Tardon <dtardon@redhat.com> Conflicts: include/oox/helper/binaryoutputstream.hxx Change-Id: I375d03ad880d348be64a04613e612e19bf2f4e1c Reviewed-on: https://gerrit.libreoffice.org/4478 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-06-23fdo#64652 remove length restriction of Replace edit boxAndras Timar1-1/+0
Reviewed-on: https://gerrit.libreoffice.org/3986 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Conflicts: cui/source/tabpages/autocdlg.cxx Change-Id: I0141dc06d940e64244909ddcb8b7e5bb797c337f Reviewed-on: https://gerrit.libreoffice.org/4440 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-19fdo#62617 display groups on multiple layers correctlyDavid Tardon4-1/+27
It is possible to group objects from different layers, so it is an error to rely on layer ID when checking visibility of a group. This problem was partially obscured by the fact that SdrObjGroup::GetLayer() returns 0 if its subobjects are on different layers and 0 is a valid layer ID. (cherry picked from commit 09d4525b11f396a68ca7c5cbb1ae3462db40c77c) Change-Id: I0ef75544a26817154642185864cafd4e6734fa38 Signed-off-by: David Tardon <dtardon@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/4357 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2013-06-19fix rtf import on big endianDavid Tardon1-27/+15
(cherry picked from commit fa2363344cbf85af17a80c4757b226ab43391af6) Signed-off-by: David Tardon <dtardon@redhat.com> Conflicts: writerfilter/source/rtftok/rtffly.hxx Change-Id: Ia9f589752176849f7f6700483e933767e509edf3 Reviewed-on: https://gerrit.libreoffice.org/4356 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-06-18resolved fdo#65082 RATE function should not find roots <= -1Eike Rathke1-13/+46
Limit RATE to roots > -1.0, which is what also Excel and now Gnumeric do. If the Newton goal seek fails for the default guess value 0.1 try other values. This now also calculates the few remaining error cases of i#15090 attachment https://issues.apache.org/ooo/attachment.cgi?id=6528 correctly. Change-Id: Ic62cc807626b4715035c3076f58f303b9020db5a (cherry picked from commit 9ee7be4efb494351c4be096ffa04cdbd85cdc3d4) Reviewed-on: https://gerrit.libreoffice.org/4328 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2013-06-06add some checks against NULL derefsCaolán McNamara2-0/+6
Change-Id: I85fbf279991ee361ea081d92d9acc84d36677af1 (cherry picked from commit fa671cecd4bb2f38a0a9171cfdbb56efddda1cfa) Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2013-06-06rhbz#908819: Don't call code in UNO object ctor that throws UNO exceptionsStephan Bergmann1-4/+5
...with Context set to this, that leads to refcounting bugs. This is a backport of the relevant parts of 4e42ce3271154904b7478b9ed5e6e6856b9235c2 "Don't call code in UNO object ctor that throws UNO exceptions." Change-Id: Ie6fdf92fdf537b752cd05ed69c3b59f2c7795e28 Reviewed-on: https://gerrit.libreoffice.org/4173 Reviewed-by: Luboš Luňák <l.lunak@suse.cz> Tested-by: Luboš Luňák <l.lunak@suse.cz>
2013-06-03fdo#56583 - avoid setting user time on unrealized windows.Michael Meeks1-2/+10
Change-Id: Iab776088b1d168295d636069e1a92ba948241653 Reviewed-on: https://gerrit.libreoffice.org/4142 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-05-28fdo#65039 UI: Oxygen theme has wrong icon for Power regressionAndras Timar1-0/+0
Change-Id: I86b927d5c2e6a643beac8b9a151f572c028c18f3 Reviewed-on: https://gerrit.libreoffice.org/4064 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-27fix build error, OUString->rtl::OUStringNoel Power1-1/+1
Change-Id: I7635b20af0fa5c52c38b01fbfff824e98809b7b8
2013-05-27remove chart listener when chart is deleted, fdo#64639Markus Mohrhard3-0/+8
Change-Id: I7ebf75f49c89edcb0bba3a597ba24ac1c0a655ef Reviewed-on: https://gerrit.libreoffice.org/4046 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2013-05-24rhbz#961460: Don't needlessly pass URLs through INetURLObjectStephan Bergmann1-3/+6
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.") (cherry picked from commit 3f5c45b70864af95a6362acf4684fb57eb85e348) Conflicts: sfx2/source/doc/docfile.cxx Change-Id: Ifd396852b211cab1d29575da7fccb32306479f93 Reviewed-on: https://gerrit.libreoffice.org/4021 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
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: https://gerrit.libreoffice.org/2133 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
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<tmyl2010@gmail.com> Suggested by: Wang Zhe <kingwisemmx@gmail.com> Found by: Tang Meng <tmyl2010@gmail.com> Review by: Wang Zhe <kingwisemmx@gmail.com> (cherry picked from commit 58b6a6161e7edd10d33fdb67510e7d68440128f9) Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
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: https://gerrit.libreoffice.org/3963 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-21fdo#47951 flat text table: update m_nRowPos when moving by bookmarkLionel Elie Mamane1-0/+14
Change-Id: Iac154020b4b6309f92b1f68fa5bf79611dfcc91b Reviewed-on: https://gerrit.libreoffice.org/3962 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
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: https://gerrit.libreoffice.org/3947 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
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: https://gerrit.libreoffice.org/3941 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
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: https://gerrit.libreoffice.org/3940 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-17resolved fdo#63805 max day of month of the intended monthEike Rathke3-12/+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 tools/source/datetime/tdate.cxx Change-Id: Ia6b007675104f8e134b278f216c3bb48b72f061c Reviewed-on: https://gerrit.libreoffice.org/3939 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
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). (cherry picked from commit 38b06c661559e6eca60e2c4a4a3637b8293307b2) Conflicts: sw/inc/crsrsh.hxx Change-Id: Ia88b3c8958798fd9c64ee75b56c61d787079133e Reviewed-on: https://gerrit.libreoffice.org/3927 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
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: https://bugs.freedesktop.org/show_bug.cgi?id=34666 https://bugs.freedesktop.org/show_bug.cgi?id=36080 https://bugs.freedesktop.org/show_bug.cgi?id=36390 Change-Id: I2b3190d297a35ee3dfda95f9a4841f7c53ed4a92 (cherry picked from commit bb7360ca9929e9b395b3c903f460c9ed5efdce4d) Reviewed-on: https://gerrit.libreoffice.org/3926 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-16fdo#48056 treat report chart as draw chartLionel Elie Mamane2-1/+8
Change-Id: I0a716b4339747f1994e5c8710e15474807aea4a2 Reviewed-on: https://gerrit.libreoffice.org/3770 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-05-16fdo#48056 revert part of return "correct name for shapetype"Lionel Elie Mamane6-4/+23
Keep hardcoded values as *fallback* only, but trust m_aProps.aComponent.m_xShape->getShapeType when present. Change-Id: I5a024a9bc5f87d226ab3c857817dfe91ad975acb Reviewed-on: https://gerrit.libreoffice.org/3769 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-05-15resolved fdo#60468 no special tab case workaround for CSV importEike Rathke1-13/+0
This reverts 322cbc3818b0553254aab2dfb3c5b196fe814097 "Import mal-formed csv files gracefully." (code now moved to a different location) which was a workaround for a specific situation that breaks things with other documents. With the rework of CSV import for 3.6 the import of the one failing document https://bugzilla.novell.com/attachment.cgi?id=294589 from https://bugzilla.novell.com/show_bug.cgi?id=507322 works almost fine without this workaround, with one difference in row 1805 where data is completely broken and parts of two rows end up in one cell P1805. That row wasn't correct with the workaround either, see also cell P1805 in earlier versions. As a result now without that workaround there is one data row less for the broken document but correct data for correct documents. Change-Id: Iacf56993619cd92c1df81f0c49de0eeb04c2e4e4 (cherry picked from commit a883783c2a1b0e7a8ee5b46387d1e1e3bc5e19bd) Reviewed-on: https://gerrit.libreoffice.org/3906 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-13resolved fdo#64384 check subtotal row filtered also for single referenceEike Rathke1-0/+4
(cherry picked from commit 3c2d0acc871057573fe9ab45b8161fce70190e80) Conflicts: sc/source/core/tool/interpr1.cxx Change-Id: Ic00b9135021f2c5f76755efbe88fc1f12e655320 Reviewed-on: https://gerrit.libreoffice.org/3848 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-13adapt to ICU patch https://ssl.icu-project.org/trac/ticket/10107Eike Rathke1-3/+10
do not call LayoutEngine::reset() Calling reset() disposes everything the LayoutEngine knows in its current state. While this may have prevented some obscure crash during exit in the past (call was added 2003-03-27), it definitely leads to a crash if the updated LayoutEngine "patch" http://download.icu-project.org/files/icu4c/51.1/icu-51-layout-fix-10107.tgz is applied as that sets fGlyphStorage=NULL (it doesn't delete LEGlyphStorage though and thus may leak, but that patch is in the wild now) and a later call to mpIcuLE->layoutChars() tries to access fGlyphStorage->...() if mpIcuLE is reused. For the patch mentioned see http://site.icu-project.org/download/51#TOC-Known-Issues and http://bugs.icu-project.org/trac/ticket/10107 Change-Id: I1b8f5c446c174d7d12b896b3ecd2a266645e8abc (cherry picked from commit 7de7267f4cfcb455aabb09053c7ed681d4591867) implemented IcuFontFromServerFont::getFontTable(LETag,size_t&) so that ICU versions trying to call LEFontInstance::getFontTable(LETag,size_t&) actually call it instead of IcuFontFromServerFont::getFontTable(LETag) See http://site.icu-project.org/download/51#TOC-Known-Issues "NOTE: Applications must implement LEFontInstance::getFontTable(LETag, size_t &length) in their LEFontInstance subclasses, so that ICU can properly bounds-check font tables." See also https://ssl.icu-project.org/trac/ticket/10107 (cherry picked from commit 428bde3591ff2fd2195097040dbe1480f1f4210f) Conflicts: vcl/generic/glyphs/gcach_layout.cxx Change-Id: Ic20b7e8dda4e84734eb6de0ccba82b0dea481d55 Reviewed-on: https://gerrit.libreoffice.org/3756 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-13fdo#59850: Resolves invalid date changing by ICU's timezone detection bug.Isamu Mogi2-0/+27
This is a backport of 263ab3f14bbb8cea9f5a1b8ea7496f6a23e6c547 . Patch was also submitted with https://ssl.icu-project.org/trac/ticket/10129 of which the outcome should be monitored. u_strFromWCS() returns a wrong destination length for u_austrncpy() if apiTZI.StandardName is multibyte string. Therefore apiStdName will be incomplete string, and timezone detection (using apiStdName) returns invalid result. This will fix destination length for u_austrncpy() enough to write multibyte string. Change-Id: I859f322d952f4ceaf9f97c2bace71e3bb3dfb468 Reviewed-on: https://gerrit.libreoffice.org/3800 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-06fdo#54087 refactor/fix browser plugin detection on WindowsAndras Timar1-26/+5
Former code did not find the Firefox plugin, if it was registered under HKEY_CURRENT_USER. Therefore the checkbox state was not preserved in Tools - Options - Internet - Browser Plug-in. Change-Id: I9ae2a7dae1501500d7ea7cb42517605219450af3 Reviewed-on: https://gerrit.libreoffice.org/3785 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-05-06Related: rhbz#862467 band-aid when creating embedded object failsCaolán McNamara1-0/+3
Change-Id: Ie5ecc8f56636e692a6e17a2e8fab0cefd46cdfb4 (cherry picked from commit 0f3f9cb63056715845d9c3565bde69470c73efb2) Signed-off-by: David Tardon <dtardon@redhat.com>
2013-05-05fdo#64150 don't segfault when there is no lineLionel Elie Mamane1-1/+2
Change-Id: Iab36de3d407925cdb0e092afae457907f0261b3e Reviewed-on: https://gerrit.libreoffice.org/3768 Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com> Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com>
2013-05-03fdo#54087 link the correct resource file to npsoplugin.dllAndras Timar5-8/+18
I had to add a new function to gbuild system: set_nativeres, because the trick in extensions/Library_npsoplugin.mk did not work. It linked the default.res, and that made the plugin unusable under Windows. Also, one export was missing compared to LibreOffice 3.5. Conflicts: solenv/gbuild/Library.mk solenv/gbuild/platform/com_MSC_class.mk Change-Id: Ib91fa2a3b72b15912587f22becccb0aebc2aa390 Reviewed-on: https://gerrit.libreoffice.org/3750 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-04-30fdo#53163 fix hatching for objects with curvesDavid Tardon1-1/+1
B2DPolyPolygon can contain Bezier curves, but that is not taken into account when drawing the hatching in OutputDevice::ImplDrawHatch. The poly-polygon is adapted already when creating metafile, because the information about the poly-polygon containing curves is then lost somewhere in the process. At least, when I do the adaptation in OutputDevice::ImplDrawHatch, it has no effect and the hatching in the produced PDF is still wrong. Change-Id: Ibec9d6aceb23da986fe2d2414dc2e7fd4bf835b4 (cherry picked from commit 092fa33f22bbdcb74c3533750158db1724971878) Reviewed-on: https://gerrit.libreoffice.org/3661 Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Tested-by: Thorsten Behrens <tbehrens@suse.com>
2013-04-23fdo#62288 fix RTF import of table paragraph marginsMiklos Vajna1-0/+9
Regression from 4a507f732d82c188ad81b022cbe3037951e58ac3. The problem was that in some cases \pard can't reset all paragraph properties. The original commit just made this keyword a noop when it occurred between \cell and \row, but this is too much. At least margins do need resetting. (cherry picked from commit 24d5261f5a122e22675210445056cdf67663237b) Change-Id: I5cbb1df72bf1211f85ef69ab64d5b46cbce5c742 Reviewed-on: https://gerrit.libreoffice.org/3572 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-22Missing rtl:: in previous commitStephan Bergmann1-1/+1
Change-Id: If2acffedaa2c828e438893bb2b055c1b9bd5ee0e
2013-04-22rhbz#954991 Avoid static data (causing trouble at exit)Stephan Bergmann2-2/+10
(cherry picked from commit aa1aedb2a0ef97cb6110f18a1de86abc8dbcd304) Conflicts: vcl/inc/unx/salinst.h vcl/unx/generic/dtrans/X11_service.cxx Change-Id: Ifc8275276811ba24b62f93096e7cb98a5dbf658c Reviewed-on: https://gerrit.libreoffice.org/3557 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-04-22resolved rhbz#919020 Basic CDbl() and CSng() scan localized numberEike Rathke1-81/+121
Code wrongly replaced decimal separator with '.' and used atof() to scan the number string which itself may be localized on *iX systems but not on Windows. Hence on *iX the numbers may had been truncated where on Windows they were not. Additionally made this work with Unicode separators if defined for the locale, removed the awkward conversion to ASCII byte string and eliminated use of toupper() and isdigit() calls. Also eliminated a possible buffer overflow. (cherry picked from commit 9e9f39d171cafa035d7b8e74187e25c3581cb89d) Conflicts: basic/source/sbx/sbxscan.cxx replace decimal separator at correct position, rhbz#919020 (cherry picked from commit e96c7a60c88bc1e3008ebdeafd59327933d6707f) Reviewed-on: https://gerrit.libreoffice.org/2859 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com> (cherry picked from commit 96b079e24f86f7f49a624573783c6e103012f942) Conflicts: basic/source/sbx/sbxscan.cxx Change-Id: I35d82e8f267ecb925783bf6f2de044a29c08f688 Reviewed-on: https://gerrit.libreoffice.org/3486 Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-19fdo#63693 Do not force java -d32 for a 64-bit SDKStephan Bergmann1-0/+2
The test to determine JAVA_OPTIONS was already cheesy (e.g., it does not catch java-1.7.0-openjdk-1.7.0.9-2.3.8.0.fc18.x86_64, as there "java -version" outputs "OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode)" with "64-Bit" in the second instead of the third field), so make it a bit more cheesy still (i.e., just cover the case to not set -d32 for x86_64). Change-Id: Ib10a16fb3f8104875bfda7de0e8bce59b9c3b06a (cherry picked from commit 391477d40ea718c46089e16484726dba085a6ad8) Reviewed-on: https://gerrit.libreoffice.org/3481 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-18Let juhx.dll export undecorated symbols on WindowsStephan Bergmann5-22/+122
...otherwise preload.cxx in juh.dll will not be able to find them via osl_getFunctionSymbol. What apparently happens is that JNICALL expanding to __stdcall decorates symbol names with _...@NN. This likely was hidden in pre-gbuild times thanks to the use of def files. (On a side note, the JVM appears to contain special code to find syms for native methods in both decorated and undecorated form; that explains why it picks up the decorated symbols from juh.dll just fine.) There is no need for the functions in juhx.dll (called from the juh.dll wrapper) to adhere to JNICALL (in fact, things would likely be easier to maintain if the juhx.dll functions also used different names than their juh.dll wrappers). However, what complicates this patch is that for DISABLE_DYNLOADING, the juh wrapper and its preload.cxx is elided, and the code that would normally go into the juhx library goes into the juh library (and thus needs to stick to JNICALL, and also needs to use the right function names). (cherry picked from commit 96488510c006785bba22c1039885c03e95ac4832) Conflicts: javaunohelper/source/bootstrap.cxx javaunohelper/source/javaunohelper.cxx javaunohelper/source/preload.cxx Change-Id: I66611648f1f79f57f0c1b23fb7a801da2d7b86c5 Reviewed-on: https://gerrit.libreoffice.org/3459 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-18resolved rhbz#918544 do not attempt to access non-existing formatEike Rathke1-2/+5
Removing the last condition removes the conditional format, don't use the null pointer. Change-Id: Icb3e01ccbf8182bdf8eed1d52263ab34c9b297ff Reviewed-on: https://gerrit.libreoffice.org/3460 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2013-04-16rhbz#867808 Do not throw RuntimeException by pointerStephan Bergmann9-22/+20
(cherry picked from commit e46564a0a6a74da90785a1b910d33e2b5bfdcfd9, plus 63b4633cf7b0da9eba63e752cec72cb10ed9d93e "Related: rhbz#867808 if one person threw by pointer..." and 336353a87e6003e685aab87ea74a158546e1f297 "Related rhbz#867808: More apparently bogus 'throw new ...' in C++ code") Conflicts: bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx sdext/source/presenter/PresenterController.cxx stoc/source/registry_tdprovider/functiondescription.cxx stoc/source/registry_tdprovider/methoddescription.cxx toolkit/source/awt/vclxwindow1.cxx Change-Id: I22b7d3d642e7ee0488d6b726a331d328065bbee7 Reviewed-on: https://gerrit.libreoffice.org/3420 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-04-16Resolves: fdo#47209 and rhbz#927223 syntax highlighter crashCaolán McNamara1-0/+4
when trying to parse empty lines looking for the matching bracket Change-Id: I3961a3d0e804d136de286e21934c6ba5ab0496cf (cherry picked from commit 02917cb57e2c2e9fcab2db8f72960023f3e4edaf) Reviewed-on: https://gerrit.libreoffice.org/3415 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-04-16Related: rhbz#924515 valgrind: uninitialized valueCaolán McNamara1-0/+1
(cherry picked from commit 7093b2418d036b47ed706464956f330cfb89707a) Change-Id: I405733a77a721f3d5562782e654a1942fe3b073e Reviewed-on: https://gerrit.libreoffice.org/3412 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-15fdo#52179 on copy kb-shortcut, from *current* row, not last painted row (!)Lionel Elie Mamane1-1/+1
Change-Id: I39be862abb7c72234adad9c517d4a0570a1d71ae Reviewed-on: https://gerrit.libreoffice.org/3379 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-15resolved fdo#63421 crash in pivot table with accessibilityEike Rathke1-27/+64
The scenario of fdo#63421 (loading data and re-dragging the same field) is not needed, simple data is sufficient and crash happened also when dragging (removing) a field from a pane and dropping it anywhere else. Multiple errors: * getAccessibleChildCount() must return the real current count of children, not what mpFieldWindow says; AtkListener::updateChildList() uses this value to repopulate its own list; a child is added after it is added to mpFieldWindow but removed before it is removed from mpFieldWindow; * LostFocus() uses an index of -1 if the last child was already removed and the field was dropped after dragging it away from a pane, handle that but it still does not look right * RemoveField() called CommitChange() with AccessibleEventObject::NewValue set instead of OldValue, leading to AtkListener::handleChildAdded() being called instead of handleChildRemoved() Apparently this never worked since 2002. (cherry picked from commit 26114dcdf9d55a5a2490de6de619337e9733b0e2) Conflicts: sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx Change-Id: Idfb59d947002d2212bc67b414daecb65c55edae8 Reviewed-on: https://gerrit.libreoffice.org/3374 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-13Resolves: fdo#48039 use same algorithm for assigning get/set replacement idsCaolán McNamara1-9/+4
i.e. use the same algorithm for assigning replacement ids for both get and set exp fields. Otherwise, consider for ex. 1. fields exists with ids of 1 and 2 in master document 2. a field exists with id of 1 in subdocument and must be reassigned a new id to not collide with the pre existing master ids In get orig algorithm assigned first unused slot of master to subdocument field i.e. 0 unused in master, so subdocument:1 converted to master:0 In set orig algorithm sorted all used master slots and assigned largest used id plus 1 (therefore unused) to subdocument field i.e. largest id used in master is 2, so subdocument:1 converted to master:3 so get can't find set and error's out with: Error: Reference source not found Change-Id: Ie8758dc22cf8deeeeff079532284e57eeaf4a9bd (cherry picked from commit 74d942fb2396a268adfcc915e75b8b32fae851dc) Reviewed-on: https://gerrit.libreoffice.org/3347 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-11prevent vector and sequence out of bounds access, fdo#60300Eike Rathke1-12/+42
This fixes the symptom of the crash but not the underlying cause why a subtotal count would be wrong. (cherry picked from commit 8bd3be9915ff28458d010fc8f0a1a1ab66d730b0) Conflicts: sc/source/core/data/dpoutput.cxx Change-Id: I3782b5e39f18bc65ffe510b847ffa7969a26cd37 Reviewed-on: https://gerrit.libreoffice.org/3344 Reviewed-by: Kohei Yoshida <kohei.yoshida@gmail.com> Tested-by: Kohei Yoshida <kohei.yoshida@gmail.com>
2013-04-11prevent out of bounds vector access in ooo62493-1.xls recalculationEike Rathke1-0/+2
The document https://issues.apache.org/ooo/attachment.cgi?id=34418 attached to https://issues.apache.org/ooo/show_bug.cgi?id=62493 crashes in a dbgutil build due to an invalid subtotal count that leads to an out of bounds access in a vector, in this case with offset -1 This fixes the symptom, not the cause why the subtotal count would be wrong. Change-Id: If96c2eadba8753ea3e3166db0a81441818c89b2d (cherry picked from commit 58885eda4f15913fc46243dab726632f5904aab5) Reviewed-on: https://gerrit.libreoffice.org/3339 Reviewed-by: Kohei Yoshida <kohei.yoshida@gmail.com> Tested-by: Kohei Yoshida <kohei.yoshida@gmail.com>