summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-03-04getAny() is not a safe default, it assumes there is actually an AnyLionel Elie Mamane1-16/+16
at *m_aValue.m_pValue. But there could not even be a pointer there, e.g. if m_aValue.m_nIntXX is in use. Then the pointer dereference usually leads to a crash. Can e.g. be reproduced by calling getBytes() on an integer column of a RowSet. Change-Id: Ib5361d838d2869142fd797d4e3454e2562ea7acf Reviewed-on: https://gerrit.libreoffice.org/14720 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 998f8cf5419f3da086246094408a50ab1e9d61f3)
2015-03-04tdf#87820 Images not displayed properly in CalcHenry Castro1-0/+6
Fixed. After opening, images were not displayed properly in Calc 4.3 and 4.4 Change-Id: I1f0dd7e9d332889df81be84a6c1e28a09f509733 Reviewed-on: https://gerrit.libreoffice.org/14505 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com> (cherry picked from commit 6c84442f99de109b585d3ba8964deb8dcf261c0f) (cherry picked from commit e035a0775bd0a0cc14d64d7a0c0f265e9dcd4622)
2015-03-04in BITFIELDS mode (3) there are *3* pal entries not 12Caolán McNamara1-1/+1
There are 12 *bytes*, which presumably is the thinko there. But this nPalCount gets multiplied by 4 to convert it to bytes later. This is the source of the bad mask values found after "Use the cairo-compatible basebmp surface for headless" etc. Arbitrary values ended up being read as mask values. Change-Id: If5d93f74b1c58d3ecdb5186f93cb0215a556586a (cherry picked from commit 5e5b90c12862b522a4553337fbf6309bb8278b8c) Reviewed-on: https://gerrit.libreoffice.org/14660 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit f20197a5e6da7ab0b550bce7ef2e07b7f7b401d5)
2015-03-04sdbc:address:kab URLs don't have a trailing ":"Stephan Bergmann1-1/+1
broken since 4bf95c4c31dd871065d4042028a4b3ae476dab70 "make use of startsWith()" where the tricky !url.compareTo(::rtl::OUString("sdbc:address:kab:"), 16) was replaced with url.startsWith("sdbc:address:kab:") even though the original exempted the trailing ":" from the comparison (cherry picked from commit 27e85dd314e02dc97612bf1682fccacaf0244127) Conflicts: connectivity/source/drivers/kab/KDriver.cxx Change-Id: I45175b2669d61eb4cee36d4456ccb69d0f11ef63 Reviewed-on: https://gerrit.libreoffice.org/14673 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit d24f2d128f42a4252e5fe5d2bad135e0bc72d1db)
2015-03-04Adapt code to changed libkabdrv1lo.so nameStephan Bergmann1-1/+2
broken since LO 3.6, commit 07d512eff12fc89adbfb73e546b3946494f21472 "connectivity: convert kab to gbuild" (cherry picked from commit d8a2a0b84a9aa570116febf23a6f1d6430fec287) Conflicts: connectivity/source/drivers/kab/KDriver.cxx Change-Id: I65cc32fa55f1d5c0358585489b8b3dc3aaf8004b Reviewed-on: https://gerrit.libreoffice.org/14672 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit b9df2d7519ab1a36b00ce414ff8136b8bb11f7a8)
2015-03-04tdf#78148 Ordinal numbers should not be auto-capitalizedNiklas Johansson1-0/+1
FnChgOrdinalNumber should return true if it changes the ordinal number. This seems to be accentually removed when the function was internationalized and has always returned false since. Change-Id: I633058a99ec033e0c33f807776364a52e22e9c64 Reviewed-on: https://gerrit.libreoffice.org/14535 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 42ec6448f9acd474d8ec1a92d9362e1b38e13758) Reviewed-on: https://gerrit.libreoffice.org/14578 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit cbab46342e75a0bd8987620757bf67c4f68f8edd) Reviewed-on: https://gerrit.libreoffice.org/14683 (cherry picked from commit 4ab923b82008396f40b7137ae984a08c4175e28d)
2015-03-04tdf#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 (cherry picked from commit ce7a2502810615b64e83036211e6149313604fff)
2015-03-04fix 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> (cherry picked from commit 0ec8a13ed975be89098d31979c7b3e3794ca2aa6)
2015-03-04tdf#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> (cherry picked from commit c56abb3c952e3062099d32702719825ee55b5112)
2015-03-04Resolves: 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> (cherry picked from commit 58deeaea725eca0e8140b09420d5144d5d3f800c)
2015-03-04tdf#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> (cherry picked from commit 623f16d7a47020600e2b4ba03aa6a617545b0d93)
2015-03-04tdf#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> (cherry picked from commit 5e28588770fa27eb210d004aec2f56e28fe01252)
2015-03-04check 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> (cherry picked from commit f2d49715c176c80c4b0fa3a7799d610eb5afec88)
2015-03-04Fix 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> (cherry picked from commit 76f57ccc93558a2b6c6c734c0b5e3a51755136fd)
2015-03-04Resolves: 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> (cherry picked from commit b5339e73a52c2eb45f5eb4707ee846af4bab99ef)
2015-03-04file 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> (cherry picked from commit 8aeef8bcff2ed7ab873aa572728d266206dbcca5)
2015-03-04Resolves: 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> (cherry picked from commit a840857c2d2490ee8d1b0289df8d9bf588981c48)
2015-03-04Resolves: 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> (cherry picked from commit 8a0712e79a53c057e4a337c5b8570262dc5a33de)
2015-03-04tdf#89141: reverted a workaround for getting activity timeVasily Melenchuk1-10/+4
A workaround applied in #i99360 (sha:44e008b01f72c3f02ab3328cdc44f987617f272b) does not works always correctly. This workaround is required to avoid bug in X11 which is already fixed in 2009 (https://bugs.launchpad.net/ubuntu/+source/ekiga/+bug/322310). That fix should now be spread enough so there is no reason to keep it. Change-Id: Ied6fe8f32d2da5922092bd9ed47ee56c4f67a255 Reviewed-on: https://gerrit.libreoffice.org/14671 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 69a80316f7da33e90e1006624466f52af524f1dc)
2015-02-24Bump version to 4.3-3cp-4.3-3Andras Timar1-1/+1
Change-Id: I156f7a8565f930a3f0cc3de749e10243e82b48ab
2015-02-24dump ugly hack working around an ancient libxcb bug (tdf#89141)Luboš Luňák1-8/+1
According to the X protocol log in the bugreport, this timed function sometimes does time out, in which case the timestamp becomes 0, which as user timestamp is interpreted by window managers as "do not focus", which is indeed stupid to ask for just because a call timed out. Especially given that this is broken in principle, as the event is bound to come (barring the more than 5 years old libxcb bug, which must have been such a lame bug that it probably shouldn't even have been worked around, and definitely not unconditionally and permanently). Change-Id: I4d122ea038c0c56b1fda590df13bf119d746fd0a
2015-02-24Revert "fdo#68963 recognize __RefHeading__ bookmarks as TOC"Andras Timar2-17/+10
This reverts commit 2fd7f3ab66a5dca2adbe491b8f471470229ebe94.
2015-02-23Sun 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> (cherry picked from commit f081a415221bd8665cceebe91665e2253781b516)
2015-02-23tdf#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> (cherry picked from commit bf57bbef91bc40090561d614e4c2070c01aef7cb)
2015-02-23tdf#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 (cherry picked from commit 620df179e0cc1339017a36840e19280f133b2a1a)
2015-02-23tdf#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> (cherry picked from commit 5e6cd9b7a15e7e6a994e8f3e4fafed2928dbf42d)
2015-02-23Resolves: 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> (cherry picked from commit 5b952ced5b2ae6151079206c3e397de653f0ced2)
2015-02-23fix windows buildMarkus Mohrhard1-1/+1
Change-Id: Ifad245fac92e5e94347da3e5ac01ff3ba0a8c50b (cherry picked from commit 863c5e9e4b6ff1e4311665485d9e5ff2c08421d8)
2015-02-23tdf#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> (cherry picked from commit 4ea953b468995675f2bcac02e1d512228aa7bb6e)
2015-02-23tdf#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> (cherry picked from commit 9c0910765954fba7611611befc1d42ab19d010ef)
2015-02-23tdf#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> (cherry picked from commit c261beb79c56faf86dcae7d9cf092b11e1b8c66e)
2015-02-23tdf#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> (cherry picked from commit 14b76ff3a98898fcccfa6e48ca8ae1e7bea802e2)
2015-02-23Resolves: 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> (cherry picked from commit b273a7b723d95f5feabf79b6e8a83beead1ce1bf)
2015-02-23Resolves: 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> (cherry picked from commit a3c8e7deea306ba3efb513c8fa7311a995f7fc73)
2015-02-23Resolves: 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> (cherry picked from commit dd8a5ecbc0afd7646583fa56b8e6efc3f040012c)
2015-02-23fdo#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 (cherry picked from commit 8e89b2673af9e135b74ad93b08737962d6fee3d8)
2015-02-23Resolves: 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 (cherry picked from commit 0c2447648961bc8fa4776f996604fead893e3be4)
2015-02-23Resolves: 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> (cherry picked from commit cd1f5a81b7602040a7c88b30fd8dbde844fa2f71)
2015-02-23Query 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> (cherry picked from commit 97b11a21b64f4bac5af67819549f6e384d61c086)
2015-02-23tdf#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> (cherry picked from commit 120f748e81aefa863d6c425b85563dbbb70ae4c1)
2015-02-23tdf#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 (cherry picked from commit bd472c8a91976cda5fc5a45fccd2c782c6d44e73)
2015-02-23Resolves: 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> (cherry picked from commit d330d1cb36b81026e448dc371075b7bc8c75d33e)
2015-02-23Resolves: 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> (cherry picked from commit f45183c3c652b2c023d571ef56775ce5d3b27d2a)
2015-02-23tdf#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> (cherry picked from commit 605c8d7f4c7b5b431747ced10243e01529b31777)
2015-02-23sw: 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> (cherry picked from commit 7a046ddda3d8c7b8b94c6825349c7c143aafda68)
2015-02-23Resolves: 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> (cherry picked from commit 6aa163f33d48326905f47e1f37ea26f992f4235f)
2015-02-23tdf#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> (cherry picked from commit ccf8e201bd825df0227af8ab9161c11e9db05bc7)
2015-02-23Resolves: 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> (cherry picked from commit 9980636a5c3a499c299a8b6f4b93965f18bb4311)
2015-02-20LOfC MPL-only configAndras Timar1-0/+32
Change-Id: Ib680097315e59b1c31ba75352619f33151e176c2
2015-02-20webdav serf: remove SAL_OVERRIDE from destructorsAndras Timar2-2/+2
Change-Id: Id55b972dda34623eeb3e046a70757277377d3871