summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-02-11Resolves: tdf#83073 use loaded graphic's width/height as defaultsCaolán McNamara1-25/+38
(cherry picked from commit 4327ee505f8507f653c8f4db9ac7503db2e15c3a) Conflicts: sw/source/filter/html/htmlgrin.cxx Change-Id: Idad25f82d884c40c55b886fd7634a6c6e51693c4 Reviewed-on: https://gerrit.libreoffice.org/14394 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-11fix liborcus build with gcc 5David Tardon2-0/+1802
(cherry picked from commit 8b68841c1482d98bee98de0a60910b93feb8f8b6) How is that supposed to ever work? (cherry picked from commit a5ec343f6cb522f4d41e097eda48042bf85c4578) ...next attempt at getting this through both GCC 5 and MSVC (cherry picked from commit cdd8ab7e0caa5b6845581afd5fc69bc69b5589df) Change-Id: I38b2ecf86d4334d0179362079a216df4301bf184 Reviewed-on: https://gerrit.libreoffice.org/14416 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-11Related: tdf#88583 RTF export: need to take care of fill attributes when ...Miklos Vajna3-0/+16
.. building the color table (cherry picked from commit 87a5cf7db1f070cbc4a674a1c12c805a2c950856) Change-Id: I8a74640e0d51d76b910394be5210c18d89818edd Reviewed-on: https://gerrit.libreoffice.org/14392 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-11Resolves: tdf#89179 fix Undo of Numbering Level change crashCaolán McNamara1-2/+2
regression from long paras presumably Change-Id: Ib89169e52e42fcbe6f8e1ab0a2eb9871d38ff06d (cherry picked from commit 29d2666d92e1105473f339609ba59e54a286b71c) Reviewed-on: https://gerrit.libreoffice.org/14420 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-10Don't call clReleaseProgram() on the same program twiceTor Lillqvist1-0/+1
If the clBuildProgram() failed, the lastSecondProgram variable kept as its value the already released program handle, and later we called clReleaseProgram() on it again. This is certainly wrong, and caused a crash at least with my OpenCL implementation. As such I am not sure if that lastOneProgram, lastSecondProgram etc dance is sane... Change-Id: Ic3454338a431ac49fafc11d0157609bc9ecd4d10 Reviewed-on: https://gerrit.libreoffice.org/14406 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2015-02-10Handle (or not) string arguments better when using OpenCL for math opsTor Lillqvist5-287/+325
This is a combination of four commits from master. 9429cf24675ae6b3a954db560ca567c9413d0ab6: We need ScCalcConfig also for formula groups The settings for interpretation of text (string) cells as numbers affect whether OpenCL can be used or not to get expected results, when operating on vectors that contain also text cells. 6dd1025ccf2bcbd2035ab141054950263c638747: Add ScCalcConfig field to DynamicKernelArgument It is needed to be able to adapt OpenCL code generation to the text-to-number conversion settings. To get the document-specific ScCalcConfig into the DynamicKernelArgument, we have to pass it along in lots of places to constructors of various DynamicKernelArgument subclasses. Originally it comes from the maCalcConfig field of FormulaGroupInterpreterOpenCL, inherited from FormulaGroupInterpreter. dcee6c01206cedf035db175c481cc5fe378bee3f: If a function/operator that takes numeric arguments but not string arguments is passed string arguments anyway, handle that with OpenCL only if the (document-specific!) setting for text-to number conversion is ZERO (treat strings as zero, which is how our OpenCL code for such functions/operators works). Otherwise let the code fall back to the traditional interpreter. 867cd1de71c774066e72fd30b4d6cde56c598d36: If a function takes numeric arguments but there are only string arguments, but the settings say strings are to be treated as zero anyway, we can go the OpenCL path. Also add a few informative comments. Change-Id: I2c5769c4ae157561c0a3b267d8e1c92795963732 Reviewed-on: https://gerrit.libreoffice.org/14405 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2015-02-10Avoid OpenCL compilation error in some casesTor Lillqvist1-5/+5
We do need to use GenSlidingWindowDeclRef(). We can't assume it is always a vector element that is taking part in the calculation. Change-Id: Iec3be0477f52c995ec77c8c6aca57365c965ab09 Reviewed-on: https://gerrit.libreoffice.org/14407 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2015-02-10On Mac OS X, directly name the executable "unopkg"Stephan Bergmann3-15/+2
Change-Id: I5f846d7f7c5ed54179504f551e19227f7283bda2 (cherry picked from commit 57e6d742a9e2aeb11b179122991e7d35ca54543c) Reviewed-on: https://gerrit.libreoffice.org/14397 Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2015-02-10Attempt at fixing Mac OS X code signingStephan Bergmann4-35/+28
...so that LibreOffice.app dmgs built with --enable-macosx-code-signing with an appstore-enabled identity will hopefully no longer be rejected on Mac OS X >= 10.9.5 as "'soffice' can't be opened because the identity of the developer cannot be confirmed." (Which I cannot verify for lack of an appstore-enabled certificate, though.) First of all, do not ignore errors from calls to codesign utitlity. Really. That reveals that soffice cannot be signed as soon as it is linked, as it requires all the other stuff in the app to be already signed. So just don't sign it after linking, it will be signed last step in macosx-codesign-app-bundle anyway. Second, --resource-rules exemptions are no longer allowed per <https://developer.apple.com/library/mac/technotes/tn2206/_index.html> "OS X Code Signing In Depth." Third, the handful of remaining shell scripts in MacOS/ need to be signed too. (Signing them adds extended attributes to the files.) Unfortunately, as discussed at <http://porkrind.org/missives/mac-os-x-codesigning-woes/> "Mac OS X codesigning woes," "hdiutil makehybrid" drops extended attributes from the generated dmg (so the dmg's LibreOffice.app would no longer be considered properly signed, as the shell scripts would no longer be signed). So switch from "hdiutil makehybrid" to "hdiutil create." Change-Id: I4b587f87d504666f7a1d0e3a24a8be76f22014c5 (cherry picked from commit 615fae2f67028f3c5c51c70c77dbaa9b9f3856d6) Reviewed-on: https://gerrit.libreoffice.org/14398 Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2015-02-10Handle zero or empty cells properly when using OpenCL for divisionTor Lillqvist5-12/+85
This is a combination of 4 commits from master: 4f4daf163e92d113b62cc19fb0b7f5ec05dce48a: Introduce SetResultError() f7c6089c0f5ac7976149d270f6d9694ef8ed7cfd: Be prepared to handle error codes encoded in NaNs ("double error") f6dfb3b4098f4554782e35fdb471ef69f2f53386: Create proper error when dividing by zero. Create a so-called "double error", i.e. a NaN with a error code payload. f5e7207053b857b6903a0ab9c161bed9ad7bcee9: Handle zero and empty cells (which also means zero) in OpenCL for division. Not sure if it makes sense to keep having OpDiv a subclass of Reduction. There is no DIV() function that would take a range of cells, so it isn't really comparable to the other Reducion subclasses. But let's keep hat as it is for now. We need to handle three cases specially in the OpenCL: Dividing by an empty cell which should produce an #DIV/0! error, dividing an empty cell by zero which also should produce #DIV/0!, and dividing an empty cell with anything else number which should produce 0. Change-Id: I86d86f652047d6f9e3c095c3ef135a8f5396b000 Reviewed-on: https://gerrit.libreoffice.org/14395 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2015-02-10svtool/GraphicManager: properly decrease mnUsedSize on unregister opsPierre-Eric Pelloux-Prayer1-2/+3
mnUsedSize was never decreased causing the cache to pretending to be full, which caused lots of needless work (image loading, id creation (which are basically a crc of all bytes of an image, ...)) Change-Id: I1e0a6a07631435346c3509822fae43a067d33303 Reviewed-on: https://gerrit.libreoffice.org/14389 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com> (cherry picked from commit c7e907f58f8d0791ee304b42de769f43102522e9)
2015-02-09bump product version to 4.4.2.0.0+Christian Lohmaier1-1/+1
Change-Id: Icfb523b90b731edda7e3b5e6f2e4a94647aadc4e
2015-02-09Updated coreChristian Lohmaier1-0/+0
Project: translations 03885753ab69e3a883fa8c9d2bd658bffc728d3b
2015-02-09Resolves: tdf#88933 Labeling of images impossible without categoryCaolán McNamara2-4/+11
(cherry picked from commit 1fac71668ac8a32633a7ee31698c0f4fe78e4d31) Change-Id: I8b618d5cd6b3e9d5e42e04e215592a7b748dbb9f Reviewed-on: https://gerrit.libreoffice.org/14383 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-09Related: tdf#88583 writerfilter: import paragraph color as fill attributesMiklos Vajna5-9/+23
In theory this is to be in sync with the ODF import. In practice the old UNO property seems not to have a proper fallback to populate the doc model with the fillattributes, so without this even if the import result is visible, it would be lost on ODF export. Additionally, this detected a bug in SwUnoCursorHelper::makeRedline(), where paragraph format redline tried to use the map of a text portion instead of a paragraph. (cherry picked from commit 24077b2d52ab3d0fd0db5afb25d8b94b62386e3e) Change-Id: I026e38e1990ed2a460624a8d967a16ae3fb6c512 Reviewed-on: https://gerrit.libreoffice.org/14353 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-09tdf#47577 Zoom slider should only react to full clickRodolfo Ribeiro Gomes2-2/+14
Change-Id: If859754c956a634a96066ac407b70d6dd2759d53 Signed-off-by: Rodolfo Ribeiro Gomes <libo@rodolfo.eng.br> Reviewed-on: https://gerrit.libreoffice.org/14265 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 53740bd71a0ae569da36b9293ef22842a0b53f1e) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2015-02-09fix buildCaolán McNamara1-2/+2
Change-Id: I797e2a4feb240c463bd34c9699c945d6df72bb55
2015-02-09tdf#73059 isDBReadOnly ensure connection before trying to retrieve itLionel Elie Mamane1-0/+1
Change-Id: I03f9b8ea72bd6906df61ccf05ead3670d7f90eb7 Reviewed-on: https://gerrit.libreoffice.org/14178 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2015-02-09Resolves: fdo#87876 full text of war and peace used as checkbox labelCaolán McNamara2-1/+12
Change-Id: I016975123c0f277b4e4c8c8097e89fd84d93530a (cherry picked from commit 081f3c0f70a9aa4d9f1f72bfbdb838bbd2dc993e) Reviewed-on: https://gerrit.libreoffice.org/14379 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2015-02-09tdf#88836: UI: in-form navigation bar icons goneZolnai Tamás6-9/+20
Regression from: 6419c745e5e9802da264250d5e131fb9a3b6e4de Revert it and use IsEmpty() instead of operator!(). (cherry picked from commit 905d4db48a0b98f540c8abc3e12fb80be4826029) Conflicts: vcl/source/gdi/impgraph.cxx Change-Id: Icc4f5dbba848a1d4ef807e598f0aa3b940459c82 Reviewed-on: https://gerrit.libreoffice.org/14357 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2015-02-09Resolves: tdf#83461 do not override MatColsRows if already setEike Rathke1-1/+1
ScMatrixFormulaCellToken::SetMatColsRows() via ScFormulaCell::SetMatColsRows() is used during document import and preselected cell area input of an array formula. Do not override existing values with subsequent result matrix dimensions. Change-Id: I9e844b5064ea276f3cbcb680eb1127c344328e00 (cherry picked from commit e32eff2bb4c12fdc33e476b9f12bb4bb71d22ebc) Reviewed-on: https://gerrit.libreoffice.org/14354 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2015-02-09tdf#89070 Table filter dialog: properly initialise OTableTreeListBoxLionel Elie Mamane1-0/+1
regression from .ui conversion: commit 5c72a213c7c4b588d0c1e0884ff2c46c22425faf Author: Caolán McNamara <caolanm@redhat.com> Date: Tue Jan 21 14:41:16 2014 +0000 convert table filter page to .ui Change-Id: I7bfb7698e2a5303b492766fba564c7b9033bcc52 Change-Id: Ic7d41d64d4c15eabf7b7f83a17482c473154434a Reviewed-on: https://gerrit.libreoffice.org/14342 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2015-02-09not all OrCriteria have three childrenLionel Elie Mamane1-1/+3
and some contain a column in the second child Change-Id: I60aca574815251902aa7dd1056903bdade9e21a1 Reviewed-on: https://gerrit.libreoffice.org/14340 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2015-02-09Resolves: tdf#85004 Crash when clicking the Reminder icon...Caolán McNamara2-6/+13
on the Navigation toolbar the Parent window isn't a SwScrollNaviPopup anymore (cherry picked from commit 535f34bba60e06d390a6f3802072b16a9841bc4e) Conflicts: sw/source/uibase/ribbar/workctrl.cxx Change-Id: I5c539d125aac28bfee0beb842ff2df001e19c945 Reviewed-on: https://gerrit.libreoffice.org/14326 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2015-02-09Updated coreAndras Timar1-0/+0
Project: translations 724226857e74c149cbefbcb2dfa1ea0bc50884cf
2015-02-09Avoid OpenCL compilation error when multiple RAND() calls in a formulaTor Lillqvist1-0/+5
Simply surround the Random123 code snippet with an ifdef guard. Change-Id: I370a3c37226d31bfbe703e5b7936b2180aee1784 Reviewed-on: https://gerrit.libreoffice.org/14366 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-02-07tdf#76291 adapt unit test to libreoffice-4-4Andras Timar1-2/+3
Change-Id: I12c74380b65e463be352825c7f1459393883283b
2015-02-07tdf#76291 unit test for html export href encodingVasily Melenchuk2-0/+9
Change-Id: I273af8b570adfcb7bfb784495bc31d2f4f1ee00b Reviewed-on: https://gerrit.libreoffice.org/14333 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 675e1fe198298702ced8eab02a7df5164d66a8f0) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2015-02-07tdf#76291 write encoded URL as href in html outputVasily Melenchuk1-1/+3
INetURLObject class is used to create correctly encoded URL Change-Id: Icc9e71e848fd8a0b487f74232b9ad3e7ddde50b4 Signed-off-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 0706b5756e06b7773a78e3046a47efc2c81d92b1) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2015-02-06During DocumentRedlineManager::SetRedlineMode the array becomes unsortedCaolán McNamara5-56/+55
so GetPos cannot be used safely, so pass down the known index of the redline and propogate it everywhere the redline goes This reverts commit 36e158ce7a0effb130936ba4598a193102faa6a1 Author: Caolán McNamara <caolanm@redhat.com> Date: Mon Jan 19 12:09:17 2015 +0000 if we change the keys we have to resort based on the new keys which tried to keep the table sorted, but thats no use because DocumentRedlineManager::SetRedlineMode loops over by index so sorting the table during the process busts that. Taking a copy of the entries and looping over that shows another gadzillion problems. So try this approach instead. I imagine it should be possible to calculate the correct current index of pRedl in DocumentRedlineManager::AppendRedline but for now assume that we are sorted correctly at that point and can use GetPos Change-Id: If092dce185e3b36fd256db390132358cba155847 (cherry picked from commit a5a20187c3a5e5956492f932c49501f9547e4915) Reviewed-on: https://gerrit.libreoffice.org/14260 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-02-06Resolves: tdf#82942 updating field contents with incorrect attribute positionsCaolán McNamara1-6/+20
Updating a SwTxtInputFld requires expanding the contents of the node. Expanding the contents of the node requires all the positions of fields in the node to be correct in order to expand them to the right place. So on updating a SwTxtNode wait until all the attributes positions are adjusted to be correct before expanding the SwTxtInputFlds in that node Change-Id: I76500239a103e56be412707a708a303a58236070 (cherry picked from commit 95f4b2f4a6dfe47842336116d94edd175a6da960) Reviewed-on: https://gerrit.libreoffice.org/14253 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-06fix tdf#88855: GetEnglishSearchFontName() returns incorrect value.Tomofumi Yagi1-2/+2
GetEnglishSearchFontName() returns incorrect value for specific localized font name as parameter(ex."HGS Gothic M"). Because, the conversion table "aImplLocalizedNamesList[]" is wrong. http://opengrok.libreoffice.org/xref/core/unotools/source/misc/fontdefs.cxx#181 This causes the assertion from vcl/source/font/PhysicalFontFamily.cxx(line:297), and more problems, probably. This patch fixes two entries in the conversion table. One fixes the assertion, another fixes typo. Change-Id: I3141bbbb7956608cc59f20ad42c76ef97a42189d Reviewed-on: https://gerrit.libreoffice.org/14244 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit c8c4e766643c8ad0a3d6d48e5105518ef5f66250) Reviewed-on: https://gerrit.libreoffice.org/14256 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-06fdo#85825 incorrectly used 'vertically' for 'horizontally' (4.4)Yousuf Philips1-1/+1
Change-Id: I704e7d0ca6422f1388cd111c6998ba6ceb48d2bf Reviewed-on: https://gerrit.libreoffice.org/14311 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 530226ca69f58bdb780a6864372f9de329c93e5b) Reviewed-on: https://gerrit.libreoffice.org/14334 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-06cppcheck: Returning/dereferencing 'pEntry' after it is deallocated / releasedJulien Nabet1-0/+1
Cherry-picked from c20a2234c5cb9cb89611de8a8a34e9d1e7c7a972 Change-Id: If96b66d5bbfcf4426bb602909599cd36e1f3c994 Reviewed-on: https://gerrit.libreoffice.org/14350 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-06tdf#88854 crash on opening drop capsCaolán McNamara1-1/+3
Change-Id: I3ab56e4909d2a20dc8f0bafe0273e81065296f17 (cherry picked from commit 727c3e088698dfd21cf4beaa5455d4c4d5b495fb) Reviewed-on: https://gerrit.libreoffice.org/14320 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-06Resolves: tdf#68137 crash in traversing script fieldsCaolán McNamara1-0/+5
use the same guards as the SwFldEditDlg does (cherry picked from commit 38a65f76bc944ea730ebac7640dc135248ec3da0) Conflicts: sw/source/ui/fldui/javaedit.cxx Change-Id: I7d135cf969d9925cec57a90ef0fba8fe40f664eb Reviewed-on: https://gerrit.libreoffice.org/14323 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-06Resolves tdf#89129: crash when defining a specific relationshipJulien Nabet1-5/+3
Returns early if comparison matches so you can reduce iterator scope and avoid last test for logging. Cherry-picked from 30f6ec7cfdf63cea265148bbe3a07d8df34e96d5 /usr/include/c++/4.9/debug/safe_iterator.h:168:error: attempt to copy- construct an iterator from a singular iterator. Objects involved in the operation: iterator "this" @ 0x0x7fffffff3a30 { type = N11__gnu_debug14_Safe_iteratorIN9__gnu_cxx17__normal_iteratorIPPvNSt9__cxx19986vectorIS3_SaIS3_EEEEENSt7__debug6vectorIS3_S7_EEEE (mutable iterator); state = past-the-end; references sequence with type `NSt7__debug6vectorIPvSaIS1_EEE' @ 0x0x7fffffff4088 } iterator "other" @ 0x0x7fffffff3a90 { type = N11__gnu_debug14_Safe_iteratorIN9__gnu_cxx17__normal_iteratorIPPvNSt9__cxx19986vectorIS3_SaIS3_EEEEENSt7__debug6vectorIS3_S7_EEEE (mutable iterator); state = singular; references sequence with type `NSt7__debug6vectorIPvSaIS1_EEE' @ 0x0x7fffffff4088 } 4 0x00002aaab193d6e9 in boost::void_ptr_iterator<__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<void**, std::__cxx1998::vector<void*, std::allocator<void*> > >, std::__debug::vector<void*, std::allocator<void*> > >, ImplBtnDlgItem>::base (this=0x7fffffff3a90) at /home/julien/compile-libreoffice/libreoffice/workdir/UnpackedTarball/boost/boost/ptr_container/detail/void_ptr_iterator.hpp:121 5 0x00002aaab193d269 in boost::operator==<__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<void**, std::__cxx1998::vector<void*, std::allocator<void*> > >, std::__debug::vector<void*, std::allocator<void*> > >, ImplBtnDlgItem, __gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<void**, std::__cxx1998::vector<void*, std::allocator<void*> > >, std::__debug::vector<void*, std::allocator<void*> > >, ImplBtnDlgItem> (l=..., r=...) at /home/julien/compile-libreoffice/libreoffice/workdir/UnpackedTarball/boost/boost/ptr_container/detail/void_ptr_iterator.hpp:179 6 0x00002aaab193c2ca in ButtonDialog::RemoveButton (this=0x7fffffff3d90, nId=1) at /home/julien/compile-libreoffice/libreoffice/vcl/source/window/btndlg.cxx:340 7 0x00002aaad8ed109b in dbaui::ORelationTableView::lookForUiActivities (this=0x317ef30) at /home/julien/compile-libreoffice/libreoffice/dbaccess/source/ui/relationdesign/RelationTableView.cxx:342 Change-Id: Ied45c222c94d2a362075a3b1550b6092aad77c62 Reviewed-on: https://gerrit.libreoffice.org/14325 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu> Reviewed-on: https://gerrit.libreoffice.org/14348
2015-02-05Resolves: tdf#88825 absent datasource causes exception / abortCaolán McNamara1-14/+21
::dbtools::ensureRowSetConnection throws on failure, and it can fail of course if the database doesn't exist its not generally useful to throw through a vcl event handler as that just leads back to the dispatch loop. (cherry picked from commit 863122b9adecedfcf35ffac1354ef8a85d5b6827) Conflicts: dbaccess/source/ui/browser/sbagrid.cxx Change-Id: I8e8f4cff06de5684f163ed1b658a8794f54a7df2 Reviewed-on: https://gerrit.libreoffice.org/14329 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
2015-02-05Revert "ODF export: don't write invalid "group-name" attribute"Lionel Elie Mamane5-12/+10
This reverts commit 2d4b87f0c1bfd97185a89c18d5b7680d11a958d6. The reverted commit leads to the following regressions: - Basic dialogs (which were not targeted, but impacted, by the reverted commit) with several RadioButtons sharing a group-name (as they will have a tendency to do) cannot be loaded anymore, since the implementation assumes (and checks) that names are unique. - Even in forms, where a RadioButton had both a form:name and a form:group-name attribute, the form:name attribute wins and thus RadioButtons that has the same group-name but different form:name (as they will tend to do) will not anymore be mutually exclusive, which defeats their point. Additionally, since it did not change the UI parts (property editor window), the user was still presented with two different editable properties "Name" and "Group Name", where "Group Name" was empty... Change-Id: I1bff532a5a7336cf2eb0579bcd4e2d16be6480fe Reviewed-on: https://gerrit.libreoffice.org/14338 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2015-02-05Revert "xmloff: dead code gives MSVC fits"Lionel Elie Mamane1-0/+30
This reverts commit 29e1b2f1ca6e2dcbf9a04c63a3ac1d554cfdcb52. in preparation for reverting 2d4b87f0c1bfd97185a89c18d5b7680d11a958d6 Change-Id: I9a262bf136b239c9f737f1d5523543ff425885ff Reviewed-on: https://gerrit.libreoffice.org/14337 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2015-02-05sw: fix ASAN detected error in RtfSdrExport::Commit()Michael Stahl1-1/+2
EscherPropertyContainer may allocate a 1-byte buffer if there are no vertices / segments. (happens in sw_filters_test) in EscherPropertyContainer::CreateCustomShapeProperties(MSO_SPT, com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&) filter/source/msfilter/escherex.cxx:3853:25 Change-Id: I56dedbd57d38cd017183060e924cb1340ea58ebf (cherry picked from commit e73799f8a9310f04074bc0dd88d9092094338576) Reviewed-on: https://gerrit.libreoffice.org/14335 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-02-05tdf#88583 MSWordExportBase: fix handling of paragraph background colorMiklos Vajna3-0/+15
Regression from 7d9bb549d498d6beed2c4050c402d09643febdfa (Related: i#124638 Second step of DrawingLayer FillAttributes..., 2014-06-02), the problem was that exporters still expect an SvxBrushItem for the para background color, while doc model was changed to have an XFillStyleItem / XFillColorItem pair instead. (cherry picked from commit 60cdeb2d441a6bf5c55f511f574b2b9dd598fbb8) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: Ib94fda103ec35a6f087307aafdd890183d9d935f Reviewed-on: https://gerrit.libreoffice.org/14328 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-02-05Resolves: tdf#50640 make sure we don't move away from the current fieldCaolán McNamara2-25/+44
by accident by trying to select the entire field if its inside an invisible area where WrtShell::Right will skip automatically to the next visible area (cherry picked from commit d04540a55f533279d2b404223cc625fa251a6ea2) Change-Id: Iafe9ebd1430db8e6022fec89729d0abb62dad0bb Reviewed-on: https://gerrit.libreoffice.org/14229 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-02-04Check number of cells referenced by group instead of group sizeTor Lillqvist4-1/+46
Put using it in #if 0 for now, though. This reverts commit 1fd902d4b851c534cf7473dd13983fc2c46500ed Change-Id: I7bb3efdc594bf7f1a61b037bf3488dae4ca119c9 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-02-03tdf#88824: Remove FactoryLoader threads causing deadlock on WindowsStephan Bergmann1-86/+0
...and assumed to be merely performance optimizations (so removing them should hopefully not break any functionality). Change-Id: I9f40118f5a4bd1526e0cfbf74715455d543bfd54 (cherry picked from commit 75509c995bd51275d39cfd8fd2bd747b0f619b1c) Reviewed-on: https://gerrit.libreoffice.org/14294 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
2015-02-03tdf#89048 Macab initialize record list even for never-match condition.Norbert Thiebaud2-1/+6
Change-Id: I323f6532d00f30cde50616e9399cad6bbe00cb8c Reviewed-on: https://gerrit.libreoffice.org/14309 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
2015-02-03tdf#77241: sw: fix creation of field data source stringMichael Stahl1-1/+2
SwChangeDBDlg::UpdateFlds() depends on undefined behaviour in constructing sTemp, because the call to GetDBName initializes local variables that are already used in other sub-expressions of the statement. (regression from 8a7a9992906ba59d575ca9e4441b3e84fea5fae0) Change-Id: Ibf8c0091da672e133d7a35bc61c059eaf65a3bc2 Reviewed-on: https://gerrit.libreoffice.org/14304 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
2015-02-03fdo#67534 Fix "Property Handler" shared lockMaxime de Roucy1-0/+18
As explained in the following link, access mode should be set to "EnableShareDenyNone" to avoid blocking others process to access the file opened by the Property Handler. http://msdn.microsoft.com/en-us/library/windows/desktop/dd894084%28v=vs.85%29.aspx Change-Id: I61cc251078c20f6a8cf7fa052c222a86e4e383b3 Reviewed-on: https://gerrit.libreoffice.org/13596 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/14301 Reviewed-by: Andras Timar <andras.timar@collabora.com>
2015-02-03Resolves: rhbz#1179642 crash in GetFocus with empty mpPreviouslyFocusedListBoxCaolán McNamara1-2/+3
Change-Id: I7559067c00617482d34e7cbdd177202868cbfc76 (cherry picked from commit dae7d2089516d9cf014b9fad0adb484f19282a29) Reviewed-on: https://gerrit.libreoffice.org/14161 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2015-02-03Resolves: fdo#75565 reduce block on pasting rtf like we do for htmlCaolán McNamara1-1/+2
Change-Id: I74a9748a2e4981dc5d1677f06db7eceed9e4b108 (cherry picked from commit 0efbd9931ea854cf71c4c54ca3f3d55d6db1fa13) Reviewed-on: https://gerrit.libreoffice.org/14144 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>