summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-02-27tdf#89679 - fix incorrect mapping of font-family-complex and CharFontNameAsianMark Hung1-1/+1
Change-Id: I4adad1675f2a880e14ed870a3c74e43e8898c371 Reviewed-on: https://gerrit.libreoffice.org/14663 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit cda9ae79e58d861a85128d6a37587b633b956aae) Reviewed-on: https://gerrit.libreoffice.org/14668
2015-02-27fix linker errorDavid Tardon1-2/+2
/builddir/build/BUILD/libreoffice-4.4.1.1/workdir/CxxObject/svtools/source/misc/imageresourceaccess.o: In function `com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>::Reference(com::sun::star::io::XOutputStream*)': /builddir/build/BUILD/libreoffice-4.4.1.1/include/com/sun/star/uno/Reference.hxx:137: undefined reference to `non-virtual thunk to utl::OSeekableOutputStreamWrapper::acquire()' (cherry picked from commit 8bb0446974282b32d06cdbd35af83f91e033b4af) see also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64812 Change-Id: Ic644a8299cf2f79f02c1e3ca0de9687520f402a9 Signed-off-by: Michael Stahl <mstahl@redhat.com>
2015-02-27tdf#88811 SwXText::convertToTextFrame: handle shapes anchored to usMiklos Vajna3-3/+44
(cherry picked from commit 38f2b8b3b16aab19a2564ec699d253d3dccecc3c) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: Iedf8eacd37b8ed8e307a10e8ade32f53c7417c4a Reviewed-on: https://gerrit.libreoffice.org/14629 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2015-02-27Resolves: tdf#81659 handle expand reference edge correctlyEike Rathke3-6/+158
split formula grouping for reference edge expansion, tdf#81659 related Edge expansion may change expressions individually, which must be split off the group. (cherry picked from commit 0cd15b4494f8e8abe67a258fb10189135bf5a8ac) tdf#81659 check that references are at least 2 cols/rows to expand edge Needs also 0cd15b4494f8e8abe67a258fb10189135bf5a8ac if edges are to be expanded and formula grouping is affected. (cherry picked from commit 23b0112ecea2f8796a4e237e9061de1a36997a30) Backported. b3cee8dd214d216907248316a2ac5a290399b169 Change-Id: Id4328bd8c42f2ff9f83d2edc845537971f3a39d3 Reviewed-on: https://gerrit.libreoffice.org/14656 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-02-27tdf#89666: vcl: speed up HbLayoutEngine line layout for large paragraphsMichael Stahl1-1/+1
When formatting a 180k char Writer paragraph, most of the time is spent in vcl::ScriptRun::next(), which is called twice per line from SwTxtGuess::Guess(), once via GetTxtBreak() and once via GetTxtSize(). In the second call, from GetTxtSize(), the end position of the line is known, and passed to vcl, and iterating beyond that position seems pointless. This reduces vcl::ScriptRun::next() from 24 to 11 billion callgrind cycles when built with GCC 4.9.2 -m32 -Os. (cherry picked from commit 7fde44c85620f8079bc4863fe3f7ea1f69a0f88c) Conflicts: vcl/generic/glyphs/gcach_layout.cxx Change-Id: Ia23fcccaf5ef9c9ecdcb54bfc8f0f8a043c8711e Reviewed-on: https://gerrit.libreoffice.org/14645 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-02-26tdf#89665: i18npool: fix pathological transliterate slow-pathMichael Stahl1-1/+9
TransliterationImpl::transliterate() has a slow-path for the case when more than one trasliteration module is cascaded which swaps 2 uno::Sequence. This is unbelievably slow because non-const Sequence::operator[] does a function call into cppu to check whether COW has to be done. This speeds up transliterate() from 344 billion to 101 billion callgrind cycles when built with GCC 4.9.2 -m32 -Os. Commit d2771b63b94a8aae3c25c83e9dae9f83242f46c1 added a second transliteration module that is enabled by default, making the problem visible, especially with long paragraphs in Writer. Change-Id: I2799df9173ac73aab8c4eb4cc6f592976b06c8da (cherry picked from commit 88d4b2fb08b983531b1e0abc71b07f4bdecdc925) Reviewed-on: https://gerrit.libreoffice.org/14644 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2015-02-26check if reads were successfulCaolán McNamara12-271/+478
Reviewed-on: https://gerrit.libreoffice.org/14631 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f974db5d89eacf0c23e303c22c62972014e9db16) Conflicts: hwpfilter/source/hiodev.cxx hwpfilter/source/hiodev.h hwpfilter/source/hwpfile.cxx Change-Id: I69ab0ca9c017c9a1c10d18fd850f32a92c641d12 Reviewed-on: https://gerrit.libreoffice.org/14654 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-25Fix dangling pointerStephan Bergmann1-2/+4
(cherry picked from commit 1c4e95db104cd5f732bc41a539a7dc5fd9269ef6) Conflicts: sw/source/core/doc/doctxm.cxx Change-Id: I352702ac50708a8f8c40e2752821178223052b7c Reviewed-on: https://gerrit.libreoffice.org/14633 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-02-25Resolves: tdf#89500 catch ISO 8601 datetime in all localesEike Rathke1-7/+26
Change-Id: I906ebdc6aa5c365df98a29e9e0f319f89f6833c6 (cherry picked from commit 5d572e673dec3396487b14bb1f9e86aa8ab86786) Reviewed-on: https://gerrit.libreoffice.org/14566 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-02-25file UCP: Ensure myLocalTime is initializedStephan Bergmann2-1/+9
When a file's time is epoch (1970-01-01 00:00:00, i.e., TimeValue temp is all zero) and the TZ is UTC or westward, osl_getLocalTimeFromSystemTime returns false and leaves myLocalTime uninitialized. That e.g. confuses getModuleByUrl (scripting/source/pyprov/pythonscript.py), potentially re-loading a Python script with epoch time (as happens e.g. for the share/Scripts/python/ files in an xdg-app installation of LO) every time it is accessed, falsely assuming it has changed on disk since last load. Change-Id: I8d4228feb28e2697a7021e3488ae2c09e8439ed8 (cherry picked from commit 94c9206399954d018aae8a1bd4e4b33354b9cdaf) Reviewed-on: https://gerrit.libreoffice.org/14588 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-02-25Resolves: tdf#89227 if no SwView then disable accept/reject change buttonsCaolán McNamara1-4/+14
e.g. if the context is an embedded draw ole then we don't have a SwView (cherry picked from commit 25dd3d277e9b90a59e7b2a03202ef0cba7799b68) Conflicts: sw/source/uibase/misc/redlndlg.cxx Change-Id: I6ba07f0ecf1c419e45f7e0ac628a82e6bd486668 Reviewed-on: https://gerrit.libreoffice.org/14455 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-02-25Resolves: tdf#89484 check that sheet reference is within selected sheetsEike Rathke1-0/+4
Change-Id: I88f1d0a134ffa3fbb9a5b5abdabbd4774f457e81 (cherry picked from commit 5803c76f318b2a8b655bf83a8257f60cd112ac71) Reviewed-on: https://gerrit.libreoffice.org/14610 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2015-02-19Sun ld doesn't support -O1 optimize flagRichard PALO1-4/+1
reported by Gabriele Bulfon (gbulfon@sonicle) Change-Id: Ie0ff8fe296054a7a266b4c73c30938bb2b7353ea Reviewed-on: https://gerrit.libreoffice.org/14484 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 34a167e1bf9b478069c290dbf977c68639149852) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2015-02-19tdf#89460 test pChangeTrack before using itLaurent Godard1-2/+5
Reviewed-on: https://gerrit.libreoffice.org/14553 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit bf5c5f359cf4eb36a0a9a1110ec2aa3393bb87df) Conflicts: sc/source/ui/docshell/docsh4.cxx Change-Id: Ic02351c448929daa7d4c5a9a00df9842c2c5aa91 Reviewed-on: https://gerrit.libreoffice.org/14558 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2015-02-17tdf#89105: sw: Remove unnecessary downcastMatteo Casalin1-2/+2
This fixes an infinite loop in SwPaM::DoSearch() that can happen with 32-bit paragraphs now. (cherry picked from commit dd9972f5f37063f5fe3eb5e011d2adc73f44d305) Signed-off-by: Michael Stahl <mstahl@redhat.com> Change-Id: I7511862ddf6ed672ba4f09ef6729fb1fa7c1d355
2015-02-17tdf#78174: toolkit: work around GCC 4.9 -Os link failureMichael Stahl3-9/+20
A build with gcc (GCC) 4.9.2 20141101 (Red Hat 4.9.2-1) for 32-bit x86 fails because of these undefined symbols: > nm --demangle workdir/CxxObject/svx/source/fmcomp/fmgridif.o | grep \\bWindowListenerMultiplexer::acquire U non-virtual thunk to WindowListenerMultiplexer::acquire() They should probably be generated inline. Work around by out-lining the definition of the methods. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64812 (cherry picked from commit 6b3aa0fe4094e87290bd33a30bd6cd99ee78ce38) toolkit: export some ListenerMultiplexer types These are used from svx and apparently some (buggy?) toolchains fail with fmgridif.cxx:: undefined reference to `non-virtual thunk to WindowListenerMultiplexer::acquire()' (cherry picked from commit bb182b47ca7362b05c03d583d3547643d9a99562) Change-Id: I318f7c39bdf1243be385bc6dc0a47862b22e92c5 Reviewed-on: https://gerrit.libreoffice.org/14510 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-02-16Resolves: tdf#39316 add matrix empty cells to ScInterpreter::QueryMatrixType()Eike Rathke3-7/+35
(cherry picked from commit eccbc97c7c224269fe261b8924e7866c3758ec91) add ScMatrix::IsEmptyResult() for tdf#39316 fix preparation (cherry picked from commit cf3f1d8dfeb45249eb60a30dba3243fe9a4a65e5) 9f2a3e6fa9f4ef43df672661afef996269b90a7a Change-Id: Ifa5d59e90afcfff66f2e8683fac2a9090ed615da Reviewed-on: https://gerrit.libreoffice.org/14430 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2015-02-14fix windows buildMarkus Mohrhard1-1/+1
Change-Id: Ifad245fac92e5e94347da3e5ac01ff3ba0a8c50b
2015-02-14tdf#88624 set DocumentBaseURL when saving reportLionel Elie Mamane1-1/+4
regression from 1d38cb365543924f9c50014e6b2227e77de1d0c9 Change-Id: Ia8cfe47b9d92889b3724f394db5090a59e69dd48 Reviewed-on: https://gerrit.libreoffice.org/14495 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2015-02-14tdf#68117 Partially fix boolean labels in XLSXUrsache Vladimir1-1/+1
Change-Id: I731a58c7749e157f6b40c60808687ce629683742 Reviewed-on: https://gerrit.libreoffice.org/14410 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2015-02-13tdf#89330 preserve file name case in an unresolvable external named rangeJan Kantert4-4/+40
Reviewed-on: https://gerrit.libreoffice.org/14474 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 0a9e7293a570da8a36b2ac4fd1c4a22d6bc084f2) add unittest for tdf#89330 Reviewed-on: https://gerrit.libreoffice.org/14473 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit e4882717f3dc0375e113ed692374870ab8302a16) 4c5c65733700e7e7245e96f85714221acf23bcfb Change-Id: Ib8728a4a9c793b162de07a0cef66e242879f2aa1 Reviewed-on: https://gerrit.libreoffice.org/14483 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2015-02-13tdf#88576 fix handling of empty arguments in IF(), IFERROR() and IFNA()Winfried Donkers2-3/+8
Reviewed-on: https://gerrit.libreoffice.org/14415 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 0b75eda1090f92adc678ceff2565da2dc7d9328c) tdf#88576 check that two parameters are given for IFERROR() and IFNA() Otherwise the functions failed only for the error case resulting in #NULL! error. (cherry picked from commit 6583f4e30015164af4972921b5bb7880dfb65f65) eb987637698ab418fc0a60cd873e23878c9f497b Change-Id: I8acca26cf7398768a9e25f97f3a9e61754ab2179 Reviewed-on: https://gerrit.libreoffice.org/14423 Tested-by: Eike Rathke <erack@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com>
2015-02-13Resolves: tdf#79569 crash undoing tricky cell mergeCaolán McNamara1-12/+13
Change-Id: I68d774d0d3758cdb67864d7939a7e1167dd9a7df (cherry picked from commit 21796a5fb92fd9773017b782a654a8b5a190cc66) Reviewed-on: https://gerrit.libreoffice.org/14468 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2015-02-13Resolves: tdf#76636 crash on merging certain cells imported from a .docCaolán McNamara1-1/+1
Change-Id: I61d5088a6f2e0b444b2943a2f9ce9feeb2e09c11 (cherry picked from commit e1f4022b9ea7ae99a31773c445d8229ba3bdea93) Reviewed-on: https://gerrit.libreoffice.org/14464 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2015-02-13Resolves: tdf#81429 select corresponding listbox entry if not currentEike Rathke1-8/+16
Change-Id: Ib475a43601ee22d33677ac45cd6ef9dba7e7c431 (cherry picked from commit a448f1bb9221f30f73574c580b506e00bf2ae61a) Reviewed-on: https://gerrit.libreoffice.org/14458 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-02-12fdo#87534 fix HYPERLINK behaviour when used in namesWinfried Donkers1-0/+2
When using HYPERLINK() in names, the hyperlink was set to disabled on copying token. After fix, behaviour is consistent. Note: reducing the fix to 1 line does not work, a set hyperlink is only to be copied when applicable. Change-Id: I27ad24ed8912afa548f08d249ad51d18a792c275 Reviewed-on: https://gerrit.libreoffice.org/13920 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 944886f6d96843ca4f5833ecca48a693c81abc3b) Reviewed-on: https://gerrit.libreoffice.org/14449
2015-02-12Resolves: tdf#89252 Fix bold, regular font spacing bug for Graphite fontsMartin Hosken2-9/+13
Change-Id: I31a09fa753ed15e302e5407ce8a0c46f3b13e099 Reviewed-on: https://gerrit.libreoffice.org/14380 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 0ed14401925d16932ed98bc418d395adac047b39) Reviewed-on: https://gerrit.libreoffice.org/14439
2015-02-12Resolves: 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/14355 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-02-12Query Design: use correct name for columns that come from another query.Lionel Elie Mamane3-4/+21
Change-Id: I25b4ccdc2f50ba89687e1f4c871f286251a28e21 Reviewed-on: https://gerrit.libreoffice.org/14344 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-02-12tdf#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/14343 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-02-11tdf#79239: make the dialog closable with 'X' button againKatarina Behrens2-2/+8
that one of window manager, top-right corner mostly. We need to reimplement Close() method for this class - I don't quite get why this has to be the case, but all classes derived from ScAnyRefDlg do it as well. Change-Id: I3e94b7ee09f9b3581d054818d36ea4fb0fd55f78
2015-02-11Resolves: tdf#83073 use loaded graphic's width/height as defaultsCaolán McNamara1-28/+42
(cherry picked from commit 4327ee505f8507f653c8f4db9ac7503db2e15c3a) Conflicts: sw/source/filter/html/htmlgrin.cxx Change-Id: Idad25f82d884c40c55b886fd7634a6c6e51693c4 Reviewed-on: https://gerrit.libreoffice.org/14402 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/14419 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
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/14345 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-09Resolves: fdo#88784 crash on loading certain docxMiklos Vajna3-4/+32
was/also: fdo#82114 RTF import: fix handling of first page in non-first section (cherry picked from commit 04fe5e6a31c9701177a744bbc8a53b2f664fe71c) Change-Id: If06c6bcdda97447e6014223d997c7ff8abd64b48 Reviewed-on: https://gerrit.libreoffice.org/14377 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-06sw: 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/14336 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/+22
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 (cherry picked from commit 95f4b2f4a6dfe47842336116d94edd175a6da960) Conflicts: sw/source/core/txtnode/ndtxt.cxx Change-Id: I76500239a103e56be412707a708a303a58236070 Reviewed-on: https://gerrit.libreoffice.org/14254 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/14319 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-2/+7
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/14324 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-06Resolves: fdo#84887 TabBar::ImplShowPage crashCaolán McNamara3-5/+407
(cherry picked from commit ff7c2cd0dc89f0ffa6742f1f5dcf89f5a6f03839) Signed-off-by: Stephan Bergmann <sbergman@redhat.com> Change-Id: I84250c6a40baeabd0d12958dfe0aea346d2b4fc8
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/14349
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/14330 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
2015-02-05fix 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/14317 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
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/14310 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/14305 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 Reviewed-on: https://gerrit.libreoffice.org/13596 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> Conflicts: scp2/source/winexplorerext/registryitem_winexplorerext.scp Change-Id: I61cc251078c20f6a8cf7fa052c222a86e4e383b3 Reviewed-on: https://gerrit.libreoffice.org/14300 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-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/14162 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> (cherry picked from commit a0ef7698b7df63b8befe274305051063425f8eb6)
2015-02-03Related: fdo#88455 crash using delete in available fieldsCaolán McNamara2-8/+12
Change-Id: I4ac5fe6f42b425ee96124b2dde39ff397a081638 (cherry picked from commit 1746c886362b8525b04365dd6b7203b8098b99ba) Reviewed-on: https://gerrit.libreoffice.org/14291 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2015-02-03tdf#88051 fix Graphite layout at Linux Libertine G ligature followed by tabLászló Németh1-1/+1
Change-Id: Iecedb87f6329c1cddcaa4cd939b349924e58d256 Reviewed-on: https://gerrit.libreoffice.org/14201 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>