summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-09-03Resolves: rhbz#993963 NULL m_pWindow on firefox deleted pluginCaolán McNamara1-1/+1
(cherry picked from commit 4a4ed52e57b540167c3ca45e6e762b9e21e874de) Conflicts: vcl/unx/gtk/window/gtksalframe.cxx Change-Id: Idb12b12e4313668bf3390a97551c688ee0dcde67 Reviewed-on: https://gerrit.libreoffice.org/5774 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-09-03odbc insert: adjust buffer size *after* it is written toLionel Elie Mamane1-1/+1
the buffer (aBookmark) is written to by SQLBulkOperations or SQLSetPos, not by SQLBindCol, which merely sets up the instruction that the next call should write there. So its finak size is known only *after* the call that makes the write, obviously. Change-Id: I4faaaeffc060433645188f0eda3d9958b087cf6c Reviewed-on: https://gerrit.libreoffice.org/5651 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-09-03fdo#68315 odbc update *reads* a bookmark, not *writes* a bookmarkLionel Elie Mamane1-21/+39
This code was completely inverted. The row update operation *reads* a bookmark (that is, what row to update), not *writes* a bookmark. So we were passing an empty bookmark, and thus the update was failing because we were refering to a non-existent row. Change-Id: I676b1a7727a88e13a3e465bd96cbbaf18dad2fa6 Reviewed-on: https://gerrit.libreoffice.org/5649 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-09-03stop annoying temp full screen windows appearing on insert->index entryCaolán McNamara1-0/+8
Change-Id: I730617f5ce28149f79d1d22efbfb7eab22e5840d (cherry picked from commit 8f6b90a80c7b6e1c19422e944ca49657581e1042) Reviewed-on: https://gerrit.libreoffice.org/5766 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-09-03bDel is unused uninitializedCaolán McNamara1-0/+1
Change-Id: Idac3a6805700d896b8569d1df79d32ca493c48b3 (cherry picked from commit 91a557561c24c7532c525692f279b1fcfd520f92) Reviewed-on: https://gerrit.libreoffice.org/5765 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-09-02Updated coreAndras Timar1-0/+0
Project: translations 83cf8a270e2e6b2dabecb9eee97faa879542787c
2013-09-01Revert "fdo#42434: swap flipvertical and fliphorizontal icons in some themes"Ivan Timofeev20-0/+0
This reverts commit 178d86a99820c5e0b9ca668c49300d468ab70e10. Turns out it's not needed in this branch. The bug version is 3.4.3, so I thought that all versions 3-4..4-2 are broken. Surprisingly 4-0 was already fixed, and 4-1 is broken again... Change-Id: I48bc00d72e360073db3c4e1cd9d14dd5fcb5ebf6 Reviewed-on: https://gerrit.libreoffice.org/5744 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-09-01fdo#42434: swap flipvertical and fliphorizontal icons in some themesIvan Timofeev20-0/+0
(cherry picked from commit 07aefbe310cad43bf9a71ba073486cddd7e062f2) Conflicts: icon-themes/tango_testing/cmd/lc_fliphorizontal.png icon-themes/tango_testing/cmd/lc_fliphorizontal.svg icon-themes/tango_testing/cmd/lc_flipvertical.png Change-Id: I037b55811bf7f14a7aadcb85ae700516022896ce Reviewed-on: https://gerrit.libreoffice.org/5727 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-09-01fdo#67358: sw: "fix" line painting artifacts when resizing columnsMichael Stahl1-1/+3
SwEditWin::MouseButtonDown(): for unknown reasons invalidating the window here causes the column resizing lines to not be removed after the resize is done, so disable it. (regression from 289185fd02d6d9734b6dbde01f15c4e6c5beacbb) Change-Id: If3ba0a72c53c5c2734fb905ae35d62f6a3e8938b (cherry picked from commit a2c67975c03010b90c706523293f180c1f29e229) Reviewed-on: https://gerrit.libreoffice.org/5663 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-09-01fdo#66215: sw: fix clicking on text above background flyMichael Stahl2-4/+43
SwPageFrm::GetCrsrOfst() tries to compare the distance to the closest text vs. fly but does not do it right because GetCharRect() returns just a line of width 1 on the left edge of the character; try to figure out the entire area covered by the character via 2 calls to GetCrsrOfst(), which gives much better clickability. (regression from e8fbe97900f13305b17015d9044993bde4adab36) Change-Id: I825e86daf65692dfb962ad576772c5f543d02d19 (cherry picked from commit edd2db1c783bd571ff796a5298385cacc91877b9) Reviewed-on: https://gerrit.libreoffice.org/5662 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-08-30TPropertyValueLessFunctor must actually compare for "<"Stephan Bergmann1-1/+1
Change-Id: I584a410d90531a0f7b784e62f94c39e715713cf1 (cherry picked from commit 2410b3c3ddc6fea02dadd56b39bb1181312c383a) Reviewed-on: https://gerrit.libreoffice.org/5686 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-08-29make the tinderbox information more reliable in the about dialog (fdo#58034)Petr Mladek6-8/+22
Pass the information via config/config_buildid.h. Then cui/source/dialogs/about.cxx will get rebuilt also in the incremental build. Also allow to set EXTRA_BUILDID also via environment variable. This is much easier with tinderboxed that work with static autogen.input. Change-Id: Ic0b0d13f031c988c096bfd4533e650e245a0ad74 Reviewed-on: https://gerrit.libreoffice.org/5680 Reviewed-by: Luboš Luňák <l.lunak@suse.cz> Tested-by: Luboš Luňák <l.lunak@suse.cz>
2013-08-29fdo#63273 sw: let word count not update stat. fieldsMiklos Vajna4-15/+21
Updating fields would generate loads of selection change events and it's not what we asked for. Regression from ce14342c4292628a641a72d4f63d9c048e030c6a. (cherry picked from commit e2484e3998f2c5036fb8e3584d4b1c72db19bfd3) Change-Id: If237df1f31436357022ca8d77b924681e403abd8 Reviewed-on: https://gerrit.libreoffice.org/4943 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> (cherry picked from commit 699b7626222ea8be1c9713a7f5e274dbfbc029ff) This also fixes fdo#67223. Signed-off-by: Michael Stahl <mstahl@redhat.com> Conflicts: sw/inc/doc.hxx sw/source/core/doc/doc.cxx
2013-08-29Resolves: fdo#68192 always recode from trad symbol to apple symbolCaolán McNamara1-10/+11
Even if the symbol font bit isn't set, the oox import route lacks the ability to state that the bullet font is a font of symbol encoding. If the font is not available on the system we go into fallback logic to state that famous symbol fonts are in symbol encoding. But there is a symbol font on mac so its not unknown and that doesn't happen. And the mac symbol font is not actually in symbol encoding (seeing as it's all rearranged into the correct unicode positions) so the recode logic is skipped in this special case to map the microsoft/adobe private use area chars to the modern code points where they were moved in the apple font. I guess one alternative possible solution is to lookup all the fonts used in a openxml doc using the fonttable stream where the charset info is available. But seeing as it should only affect one particular font lets just move the encoder test outside the issymbol block. (cherry picked from commit b129867306ce918f4f8fbf9ec5f7dce86e52c9d2) Conflicts: vcl/source/gdi/outdev3.cxx Change-Id: Ic5bd3ec15c8d8d99e2cab0fb67cc4bc33081c756 Reviewed-on: https://gerrit.libreoffice.org/5670 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-08-28Uploading libvisio 0.0.31, fixing fdo#68477Fridrich Štrba4-33/+2
Base64 decoding in some boost versions throws on padding characters (cherry picked from commit 710eb05b0fe7a4396dcec169d15c337d1664e9d4) Conflicts: download.lst libvisio/UnpackedTarball_libvisio.mk Change-Id: I9a9a43c2a7e55b6a6fca085302eae223bc8c1b13 Reviewed-on: https://gerrit.libreoffice.org/5658 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-08-26fdo#39484 - don't loose outlines while trying to undo formulae changes.Michael Meeks3-6/+8
Reviewed-on: https://gerrit.libreoffice.org/5592 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Conflicts: sc/source/core/data/table2.cxx Change-Id: Ib3b2bab5beffb8164a8cd2c0b4db4c97f427507e
2013-08-26rhbz#1000150: Do not call exit upon XIOErrorStephan Bergmann2-21/+16
...as done in _XIOError (libX11-1.6.0/src/XlibInt.c) after calling the XIOError handler function (either the one supplied with XSetIOErrorHandler or _XDefaultIOError), as that calls the atexit handlers, which can wreak havoc in unrelated threads that happen to be running in parallel, leading to arbitrary crashes. So avoid that by always calling _exit already from our XIOError handler. The old code was careful to /not/ call _exit when the XIOError happened on any thread but the main one, but I do not see the sense of that---after all, _XIOError will inevitably call exit afterwards, so this cannot be a way to "ignore" XIOErrors from special threads (that are set up say for the sole purpose of trying out "known-shaky" activities without affecting the stability of the whole process). And findings like comment 12 to <https://bugzilla.redhat.com/show_bug.cgi?id=831628#c12> "[abrt] libreoffice-core-3.5.4.2-1.fc17: ICEConnectionWorker thread still running during exit" ("it is very likely that this is not a normal exit from reaching the end of main, but rather some explicit call to exit from some error handling code") make it clear that we apparenly do suffer from such calls to _XIOError -> exit on non-main threads. I have no idea why vcl/unx/gtk has its own XIOErrorHdl that is substantially different from the vcl/unx/generic one, though. cherry picked from commit ffea65915b9cc6d4f3c01f829552702654a040f9, plus follow-up b240a1c188b58e3e717335339bfc3f5e20bb2bf4: rhbz#1000150: Do not call exit upon XIOError, take two The _XDefaultIOError handler (libX11-1.6.0/src/XlibInt.c) already calls exit (even though _XIOError calling _XDefaultIOError would call exit afterwards, too), so our XIOError handler must not call aOrigXIOErrorHandler. Change-Id: Ida7d407cf5f0fa4e719118cab5e725144ceb3a35 Reviewed-on: https://gerrit.libreoffice.org/5596 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-08-26Updated coreAndras Timar1-0/+0
Project: translations 0bdd23ed769be53974c9f545b70fe9de1d1bec7d
2013-08-24fdo#68440 update Italian autocorrectionAndras Timar1-0/+31
Change-Id: I7f0dcccc5abf3ba0d0969973c4d0800095bfcca7 Reviewed-on: https://gerrit.libreoffice.org/5594 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-08-23use GLIB_CHECK_VERSION instead of GLIB_VERSION_X_XXIvan Timofeev4-4/+4
Michael Meeks pointed out that the latter can cause problems. Change-Id: I68e7f8c6dcfae52305738b2a8cdee72e9c2c7f93 (cherry picked from commit 9dd52eb86a9122e34c307a9160ae3ccd5706c94e)
2013-08-23WaE: g_type_init has been deprecated since GLib 2.36Ivan Timofeev4-2/+8
Change-Id: Ied9b2c2424d780d589cb1b07df0ec38107d49829 Reviewed-on: https://gerrit.libreoffice.org/3434 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 025857d81d4781a95cda4e790808b05b97eb97d9)
2013-08-23-Werror=unused-local-typedefs (GCC 4.8)Stephan Bergmann2-3/+0
(cherry picked from commit 52c5eb20fd96d63e17cb9cd18912030131bcc787) Conflicts: sd/source/ui/toolpanel/controls/MasterPageObserver.cxx Change-Id: Ib1dedbe8e273463fa47573486d67dc9d509953db
2013-08-23-Werror,-WuninitializedStephan Bergmann1-1/+1
Change-Id: I885851dd3121e34a3f860a449d4d23d185a4d278 (cherry picked from commit 150a965248da361440b5cc195c810751ab11e92e)
2013-08-23Work around -Werror=unused-local-typedefs from comphelper/stl_types.hxxStephan Bergmann9-37/+48
Change-Id: Id9f588e551b40a64bc86cae7c6d50f99659f94ab (cherry picked from commit 3912e47044f753f82c63ac11e803be5fb756c14f)
2013-08-23-Werror=unused-local-typedefs (GCC 4.8)Stephan Bergmann1-0/+202
Change-Id: I873813e30e44712d6793bad91938eb847b55a7bb (cherry picked from commit 72c62e0e83598862e1c6e00e4264d7720aa94e41)
2013-08-23Work around GCC 4.8 -Werror=unused-local-typedefs in boostStephan Bergmann2-0/+26
(cherry picked from commit 6bea5311d70f518444fe3218cf0b6f49bd93cc34) Conflicts: boost/UnpackedTarball_boost.mk Change-Id: Ib137c5c5764333d7a878c5e996e6983a277d3856
2013-08-23fdo#68076 RTF import: default font had priority over the specified oneMiklos Vajna3-2/+30
Regression from 60c17b2873506ed8b068b34840aecda0c1d9bd65. (cherry picked from commit f1e5e271f9aadc2c5e5af3ffae410b6c598e5398) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: Ie16d611622e6a814d5cbea00c3f992cd9ecba027 Reviewed-on: https://gerrit.libreoffice.org/5581 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-08-22Resolves: fdo#68275 Grayscale TIFF is imported as whiteCaolán McNamara1-14/+6
this reverts 6c719c1585eb1a2dbab86cc73ff871da41765981 "n#615223 local nbyte1 should have been class-level nByte1" which was to fix the use seen in valgrind og the uninitialized nByte1 So additionally remove the use of the uninit nByte1 entirely Change-Id: I5b3f4fa00d74e545f207a11a5e90935f14a23a8e (cherry picked from commit 98a61a2ae109f3d72940274ceafcf3e84d79aa0b) Reviewed-on: https://gerrit.libreoffice.org/5585 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-08-22deb#719941: pythonscript.py: use open() instead of file()Rene Engelhard1-1/+1
Change-Id: Ib9f06b2b5629d149e932fe37312fdf5e8448c39f Signed-off-by: Michael Stahl <mstahl@redhat.com>
2013-08-22deb#719941: unbreak python script provider debug logging on Python 3Michael Stahl1-1/+1
Don't mess with encoding in Logger.log, since sys.stdout.write() accepts str (in python3) and both str/unicode (in python2) anyway. Change-Id: Ib0339b7fd882a7654cc24c38efdaf67f519663ff Signed-off-by: Michael Stahl <mstahl@redhat.com>
2013-08-21fdo#66145: revert change to CopyMasterHeaderMichael Stahl1-0/+4
Not copying the nodes for first page is not an option; the real problem with the fdo45183.rtf is that flys in the header are not copied along with the nodes, like it is done in SwDoc::CopyPageDescHeaderFooterImpl. Also, the same problem may occur for footers too (CopyMasterFooter). Conflicts: sw/source/core/doc/docdesc.cxx The comment above is for the master commit, but copyting the flys is actually necessary with e1a9a348a519a69f898c9c1e6d87a5837b8267f9 too, since that copying code is now executed when changing sharing flags in the UI so withtout this commit you lose any flys anchored in the header/footer. (cherry picked from commit bf206549228685a68e1504db05119d8fa1d354b3) Change-Id: I985a6b89f8cde96dc0fa0b489c44d77987f91a8a Reviewed-on: https://gerrit.libreoffice.org/5542 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-08-21fix undetected(?) merge conflictMichael Stahl1-2/+0
commits 49e308ce893e461a121ea7d90ec9514f05bf62aa and f7433971d901f8f66538ef8df3e7729b0047ca2c were pushed out-of-order and as a result the "pDesc->ChgFirstShare( rChged.IsFirstShared() );" somehow managed to get duplicated, which makes f7433971d901f8f66538ef8df3e7729b0047ca2c ineffective for footers; remove the duplicate. Change-Id: Ia61690c2f0714f9e381cd86d50e139f0ccb85a88 Reviewed-on: https://gerrit.libreoffice.org/5544 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-08-20unopkg: use default umask when installing shared extensionsBjörgvin Ragnarsson1-0/+4
This makes sure shared extensions are readable by users when root's umask has been set to a value such as 0027. Change-Id: I338ceb404466c3adfd4a7bb152cd2c5912ca7e7e Reviewed-on: https://gerrit.libreoffice.org/5522 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-08-20fdo#43807: Fix import of drop caps character styleZolnai Tamás1-1/+1
Export works and import has just a little typo. Change-Id: I570d70423b5a626f21117971fb7eff030eae20af (cherry picked from commit 932901224ea8473bbcae6feced953340d489bcc5) Reviewed-on: https://gerrit.libreoffice.org/5487 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-08-20fix for fdo#62323 bad conversion of Hex strings for certain valuesNoel Power5-1/+75
Basic hex literals are basic Integer ( e.g. 4 byte ) types with -2,147,483,648 through 2,147,483,647 range. Interally the scanner was using a long to form/scan the literal, this led to bad behaviour on 64bit linux ( where normally long -> 8 bytes ) (cherry picked from commit 4c9a08e78b6e2c5d19628281bd4141c268299bea) and squash of fix for fdo#62323 fix duplicated and wrong tests Change-Id: I73dc238f7de59367a0a9d00e5421ea6675b4f556 (cherry picked from commit fbf8ae82411d56189f844f9f00ccc6cf6b0827bf) Reviewed-on: https://gerrit.libreoffice.org/5527 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-08-20Always try to mount in gio::Content::getGFileInfoStephan Bergmann1-16/+26
...and not only if the caller happens to pass in non-null ppError. Otherwise, calling soffice with a document URL handled by the gio UCP that is not yet gio-mounted would silently do nothing and exit with EXIT_SUCCESS, as the first thing the type detection code does on the URL is execute "getPropertyValues" for "IsDocument", which calls getGFileInfo with null ppError, so a void instead of a boolean value is returned, which then derails the type detection code to silently fail (which is another problem that needs fixing). Change-Id: I48a84428cdee5caead02909abc2efd3ae3722052 (cherry picked from commit 4d8bf09305fc4e4bd652187aac0a02398413ba65) Reviewed-on: https://gerrit.libreoffice.org/5537 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-08-20fdo#66145: fix Undo invalidation in SwDoc::ChgPageDesc()Michael Stahl1-3/+3
SwDoc::ChgPageDesc(): make the invalidation of the Undo stack on change of IsFirstShared work by delaying ChgFirstShare() until after the check. Change-Id: Ifbefe446df8b6d785ed1bb6394ec5beb803fb1fe (cherry picked from commit 0b7a823bb6df79384939dda4de3b7f28e5e52758) Reviewed-on: https://gerrit.libreoffice.org/5535 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-08-20fdo#66145: fix copying of header/footer when un-sharingMichael Stahl1-2/+12
SwDoc::CopyMasterHeader/Footer(): this could result in sharing the first-page header/footer with the left-page (!) when un-sharing via the dialog; the reason is that what actually happens here is that the left-page header/footer was never changed but the master one was copied in SwDocStyleSheet::SetItemSet(), so it sort of worked by accident before the first-page header/footer was added... Change-Id: Ia24df6ad59cda484559f2ca48ecaa7563878120b (cherry picked from commit e1a9a348a519a69f898c9c1e6d87a5837b8267f9) Reviewed-on: https://gerrit.libreoffice.org/5536 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-08-20fdo#66145: do not check IsFirstShared() in SwPageDesc::GetLeftFmt()Michael Stahl1-2/+2
... and GetRightFmt(). If the first format is requested it must be returned; the sharing works by copying the SwFmtHeader/Footer from aMaster to the other members. (regression from 4dc78aee9bcdb6ea5e9dc47ebb4a4b9e590c725a) Change-Id: I1708f01c18b155ae75c14fc407e52ccd2bd798d7 (cherry picked from commit 4df438c9a9d5e698c47c1e85903eb81880a5e6fa) Reviewed-on: https://gerrit.libreoffice.org/5534 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-08-19fix for bnc#834705 missing drop downs for autofilterNoel Power3-4/+32
After commit fc861c7088e9b639a1c2c80f8ba4535c798aeb34 there is now an order dependency, between any ScPatternAttr flags indirectly set and SheetDataBuffer::finalizeImport which sets the attributes directly for a column So the ATTR_MERGE_FLAG that has ScMergeFlagAttr ( and associated SC_MF_AUTO flag ) is scrubbed when by the direct writting of the attribute from SheetDataBuffer::finalizeImport -> Document::SetAttrEntries I've reordered that Table import here and split the finalize ( which happens before heetDataBuffer::finalizeImport ) so that the databaseranges which were created before sheet import still happens, the autofilter part of the import is now deferred ( until after SheetDataBuffer::finalizeImport ) Change-Id: I11bb45ee7b330760fd93ecca30b23399414ac3a7 Reviewed-on: https://gerrit.libreoffice.org/5448 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-08-17Avoid crash on OS X: guarded fd exceptionTor Lillqvist1-1/+4
On OS X, a file descriptor that shows up as being of type "KQUEUE" in lsof output is apparently created behind the scenes when starting a thread. (Related to BSD kernel event queues: see man kqueue.) When we re-exec ourselves on OS X, and then close all file descriptors >= 3, closing such a KQUEUE fd causes a crash. Guard against this by closing only regular files. (cherry picked from commit 73a508f574995f09559c003cb810e5d2ff2691c2) Change-Id: I5011bfbaed156b04248b6bddb2a1a58624bee3d4 Reviewed-on: https://gerrit.libreoffice.org/5173 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-on: https://gerrit.libreoffice.org/5470
2013-08-16import .xlsx files saved by Calc before fdo#59727 was patchedWinfried Donkers2-3/+22
Change-Id: Id1eedc86056f7de24913f8156a819f8a0695fd59 (cherry picked from commit 78c995a184115ef4ec1c348bd9b910a3791de550) Signed-off-by: Eike Rathke <erack@redhat.com> differentiated warning for symbol/AddIn pair insertion, fdo#59727 Change-Id: I371bca810c40d4cfab0b9fcd47a070b4e68ee768 (cherry picked from commit b24e3a6042ccfeee650664cc6fb244dfeea497cb) Signed-off-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 27a5fa2c83c1acb119d5ae9000f040de3fb17c09) Signed-off-by: Eike Rathke <erack@redhat.com>
2013-08-16fdo#68084: OOXML import: handle exceptions if stream is missingMichael Stahl2-3/+16
The bugdoc does not have a styles.xml but a stylesWithEffects.xml, whatever that may mean. (the app.xml contains "Microsoft Macintosh Word") Change-Id: If3d11c5d166dcaf3d94129339559787c20e6db46 (cherry picked from commit 6e3ac01f850228afb5c6cb1a33b101693aea8712) Reviewed-on: https://gerrit.libreoffice.org/5450 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-08-15Resolves: fdo#67554 avoid ooxml import crashCaolán McNamara1-10/+9
check if the endrange is empty before dereferencing while I'm at it, don't copy the entire vector and make it a little more readable Change-Id: I1f2a0096791ca0ef51aad595f71e1a18aa448c3b (cherry picked from commit ce791697cbf260b592f7cad095539a414888823f) Reviewed-on: https://gerrit.libreoffice.org/5434 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-08-15intermittent crash with failed empty response during update checkCaolán McNamara1-2/+2
version1 is empty and version2 is not, so on second segment of version2 the i1 is already -1 from the first segment check -> kaboom (cherry picked from commit 3bb28b5aaef5e85a981dc9411db1f05524aeedf6) Change-Id: Ic19511a3b150f40d3cd9cf66bf9d86c94f3f9187 Reviewed-on: https://gerrit.libreoffice.org/5437 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-08-14fdo#66071: SfxUndoManager: allow Writer to set modified status properlyMichael Stahl1-0/+2
If Undo actions are removed due to max undo limit, invalidate the current empty mark so it is different from sw::UndoManager::m_UndoSaveMark. Change-Id: I20415f42a77b67e9935c75b12df675ba1c5ef5ec (cherry picked from commit 1ff7dfa533b473d721c372ae801a46ecd513b32f) Reviewed-on: https://gerrit.libreoffice.org/5380 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-08-14fdo#59727 fix #NAME?-error with add-in functions on (re)open of xlsxWinfried1-0/+13
Change-Id: Ia3c452f21328e2d5773f245e729905a70d14c29e Reviewed-on: https://gerrit.libreoffice.org/5312 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 27aeea8e2bd374ec2f7317ac485315118ea1feee) Signed-off-by: Eike Rathke <erack@redhat.com>
2013-08-14fdo#51688 fdo#66745: drawinglayer: properly restore anti-aliasing modeMichael Stahl2-4/+21
VclPixelProcessor2D: the constructor changes the anti-aliasing mode of the given output device, and the destructor restores a hard-coded mode instead of what was there before. Due to this commit 5913506b2193e93ca2767ab7365ab2e76ed7848f turned off anti-aliasing for FontWork objects simply by creating a temporary VclPixelProcessor2D. Change-Id: I7f7fcbf86b0dd425f599cd8e62fce3c69a2744bb (cherry picked from commit 420aa16af0bbab4bdef80ceeb8d44cabe65840e0) Reviewed-on: https://gerrit.libreoffice.org/5393 Reviewed-by: Tor Lillqvist <tml@iki.fi> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-08-14fdo#58040: sw: fine tune async word countMichael Stahl2-10/+12
- count characters instead of paragraphs to better account for large or small paragraphs - start out with a relatively small value (5k chars) on the first run to quickly show something to the user (cherry picked from commit 91c8008051c0bb7905a6acd822d022e144f2941f) Conflicts: sw/inc/doc.hxx sw/source/core/doc/doc.cxx Change-Id: Ic4013545692f267aab39e084415d5d794bb5a4ca Reviewed-on: https://gerrit.libreoffice.org/5392 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-08-14fdo#68064: Do not insert aTempEntry multiple timesStephan Bergmann1-4/+8
...and do not let it go out of scope before being used in BigPtrArray::Remove. (And, en passant, avoid use of reserved identifier, starting with an underscore followed by a capital letter.) Change-Id: Ic5730f707601a2070f2eed3ba017650026657df3 (cherry picked from commit ebc81f19ef4ffe8d54f83c019ea80d10c98647d7) Reviewed-on: https://gerrit.libreoffice.org/5407 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>