AgeCommit message (Collapse)AuthorFilesLines
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: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-08-22deb#719941: use open() instead of file()Rene Engelhard1-1/+1
Change-Id: Ib9f06b2b5629d149e932fe37312fdf5e8448c39f Signed-off-by: Michael Stahl <>
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 <>
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: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
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: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
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: Reviewed-by: Petr Mladek <> Tested-by: Petr Mladek <>
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: Reviewed-by: Michael Stahl <> Tested-by: Michael Stahl <>
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: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
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: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
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: Reviewed-by: Petr Mladek <> Tested-by: Petr Mladek <>
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: Reviewed-by: Petr Mladek <> Tested-by: Petr Mladek <>
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: Reviewed-by: Petr Mladek <> Tested-by: Petr Mladek <>
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: Reviewed-by: Petr Mladek <> Tested-by: Petr Mladek <>
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: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <> Reviewed-on:
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 <> differentiated warning for symbol/AddIn pair insertion, fdo#59727 Change-Id: I371bca810c40d4cfab0b9fcd47a070b4e68ee768 (cherry picked from commit b24e3a6042ccfeee650664cc6fb244dfeea497cb) Signed-off-by: Eike Rathke <> (cherry picked from commit 27a5fa2c83c1acb119d5ae9000f040de3fb17c09) Signed-off-by: Eike Rathke <>
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: Reviewed-by: Petr Mladek <> Tested-by: Petr Mladek <>
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: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
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: Reviewed-by: Michael Stahl <> Tested-by: Michael Stahl <>
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: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2013-08-14fdo#59727 fix #NAME?-error with add-in functions on (re)open of xlsxWinfried1-0/+13
Change-Id: Ia3c452f21328e2d5773f245e729905a70d14c29e Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <> (cherry picked from commit 27aeea8e2bd374ec2f7317ac485315118ea1feee) Signed-off-by: Eike Rathke <>
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: Reviewed-by: Tor Lillqvist <> Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
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: Reviewed-by: Tor Lillqvist <> Tested-by: Tor Lillqvist <> Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
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: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2013-08-13WaE: Use BOOST_STATIC_ASSERTStephan Bergmann7-25/+29
(cherry picked from commit e4b99f5d445903e1309c301cc327d2dfb23d8d71) Change-Id: Ib9dc2541c3bf72ddd6094331297a91352138e5af Signed-off-by: Stephan Bergmann <>
2013-08-12gvfs UCP: silence -Werror=deprecated-declarationsMichael Stahl1-0/+2
Seems to me there's no point to that since GVFS itself is deprecated anyway. Change-Id: Ibceba3bbe33a3a37dd088d0f24bfdd4211095589 (cherry picked from commit ee860cbfc74f86ff3b7a9625997048f3357bb221) Signed-off-by: Eike Rathke <>
2013-08-10Revert "fdo#54320: VoiceOver does not follow keyboard focus"Boris Dušek1-1/+1
The code was correct (and docs confusing). The code did not work because 67410 was not fixed at that moment. With 67410 fixed, the code works as it was originally. Also in the meantime I discovered a comment in the NSAccessibility.h header telling that NSAccessibilityPostNotification should be passed the newly focused element and that the function itself will make sure to post the notification on the NSApp element instead. This reverts commit e9257fa0e642de2f1c79f2c80387334010812dab. Change-Id: I7f76ebde963cf57879273d9848ff195877759524 Reviewed-on: Reviewed-by: Norbert Thiebaud <> Tested-by: Norbert Thiebaud <>
2013-08-10fdo#67410: VoiceOver does not provide typing or cursor movement echo in textBoris Dušek1-0/+27
Change-Id: Ief39aecd247b612c52cd970b6c5911f34d8cb69e Reviewed-on: Reviewed-by: Luboš Luňák <> Tested-by: Luboš Luňák <> Reviewed-on: Reviewed-by: Norbert Thiebaud <> Tested-by: Norbert Thiebaud <>
2013-08-08fdo#63539 make SvTreeListBox::Select virtualLionel Elie Mamane1-1/+1
SvLBox was merged with SvTreeListBox; SvLBox had a virtual Select() and some derived classes override it. E.g. dbaui::DbaIndexList. Change-Id: I82b3718e72db5d320704e1e2871de86abc686441 Reviewed-on: Reviewed-by: Kohei Yoshida <> Tested-by: Kohei Yoshida <>
2013-08-08fdo#64117 *always* set the filter name to the correct nameLionel Elie Mamane1-2/+1
the removed test made absolutely no sense: aliasName is a fully-qualified name, but columns is indexed by column name. That is, schemaName.tableName.columnName as opposed to only columnName. Change-Id: I9066b5183298e3e6ab63c367594f92bb3e00979d Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2013-08-03hopefully fixed MSVC build breaker, ambiguous call to overloaded functionEike Rathke1-1/+1
Change-Id: I923846f8ea8d61547aab2aaeab2232439b5e4a72
2013-08-031st step fix for exporting SheetProtection fdo#64753 is to import correctlyNoel Power6-6/+117
(cherry picked from commit 016e18680e471d9f0cea8ee35f9716ae0f9baa11) 2nd step to export SheetProtection fdo#64753, actually export the data (cherry picked from commit 8ce1124359783df750d176b8390b4eb0f54fb6ba) unit test for fdo#64753 ( import/export of sheetprotection ) Change-Id: If420b386543c15c7b550a720b6e2db69bf372d7f conflict fix for test Change-Id: I3c996525b71509934c2d5ee274f9cd2dc1854f97 Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>
2013-08-02#i122752# check iterator in each iteration of ↵Herbert Dürr1-3/+4
CFormatEtcContainer::nextFormatEtc()'s loop Don't trust nextFormatEtc()'s aNum argument not to mislead the iterator beyond the container bounds. The comparable loop in CFormatEtcContainer::skipFormatEtc() already checks the iterator against the container end in each iteration. (cherry picked from commit a609daa146c5588c6a35c2c145e9573c625ec123) Signed-off-by: Jan Holesovsky <> Change-Id: Ie745497491679dfb172d78876c3a3731e153243e Reviewed-on: Reviewed-by: Petr Mladek <> Tested-by: Petr Mladek <>
2013-07-31fdo#67547 fix access to methods (getScript) of MasterScriptProvider from VBNoel Power1-1/+3
access to libreoffice objects ( and methods/properties of those objects ) from VB all goes through the ole automation bridge. There has been a long standing issue where the bridge falls over trying to access methods of the scripting framework MasterScriptProvider object. Change-Id: I3b9391286e1030bef2a12d6e546a5c47a4f68edb (cherry picked from commit 92500896a9d0ba873c06a4a2728eb5a1b9d8f68d) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-31fix for fdo#60883 ( macros disabled for documents opened from templates )Noel Power1-1/+4
Change-Id: I5d4478176bd18a5d7a08dd4472393ea56e1ea280 (cherry picked from commit 4bc42b6d7140144f5e17528276e8ddc80c033d6d) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-30bump product version to, reset number to 0Christian Lohmaier2-21/+21
Change-Id: I3a6d5add3937c16b6d0d077d4f5c5fd079ea14aa
2013-07-30fix for fdo#62729 reference pos can point to non existing tableNoel Power3-0/+31
there is an existing function ( called at least from uno names api also ) that updates the tab pos, calling that seems to fix this problem (cherry picked from commit b5fffdb8d0438a2fe933a5742d41fe50a14b71f3) with squash of unit test for fdo#62729 ( with tweak for 4.0 ) (cherry picked from commit 7b3d8e0a7dcf6ae05e1de5c33ed382822cf52cce) b9be75459aa49b8bab968dedae9e0760ccef9a26 Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <> (cherry picked from commit cb626d01772985bd0eed0f5963475d0e801379c8) Conflicts: sc/source/filter/xml/xmlexprt.cxx Change-Id: I6f6f31895eda9c338eeabd3f3285bf2c9eb23b7e Reviewed-on: Reviewed-by: Petr Mladek <> Tested-by: Petr Mladek <>
2013-07-30rhbz#989246: Honor user's JavaDriverClass override in mysql driverStephan Bergmann1-11/+25
(cherry picked from commit 63897351fc4fd31305bef43b649be74e2b6006c4) Conflicts: connectivity/source/drivers/mysql/YDriver.cxx Change-Id: Ic7dbddb5b17af0bd23864fd19ab2bd815969d008 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-30fdo#55955 select first column if possibleLionel Elie Mamane1-0/+6
Change-Id: I131cb0395c481d9cc1de210abc207221dab14bf4 Reviewed-on: Reviewed-by: Petr Mladek <> Tested-by: Petr Mladek <>
2013-07-29fdo#67467: fix crash when renaming table in AutoFormat dialogIvan Timofeev3-8/+6
this reverts 5031e17d4b11181be94448702b1026bd38e0b3c4 and uses ptr_vector::release instead of ptr_vector::erase to prevent object deletion. The use of "transfer" leads to "Assertion `(void*)&from != (void*)this' failed". Change-Id: I77467ce9e1d9dd4b833032ebbe920cbb34d36675 Reviewed-on: Reviewed-by: Michael Stahl <> Tested-by: Michael Stahl <> (cherry picked from commit 2f527be5513159c0aebd93f356cbd2b1dc04b253) Signed-off-by: Michael Stahl <>
2013-07-29fdo#66025: Improve accuracy of ImportError traceback and messageDavid Bolen1-9/+41
The ImportError raised on an import failure with the uno module loaded now includes a complete traceback and the original Python exception message text, combined with the most relevant (nearest to failure if imports are nested) uno lookup that also failed. Cherry-picked from 948b6ea02ea9de7fb4e1e2baf95ecae3ba1cd54e plus previous patches leading up to that, 7fd81244c21ad54a8b9766902fd7c34e8055b165 "fdo#66025: Improve ImportError raised from _uno_import," 329125abb63061214897e4f215d41cfa4b13b4b0 "fdo#66025: Minor clean-up of previous patch," and fbe28de6fbfdce41544e4e93168d32661add8285 "fdo#66025: Simplify new ImportError logic." Change-Id: I8c22f22c2d96bdd7fb99a87273ba574e22a86923 Signed-off-by: Stephan Bergmann <> (cherry picked from commit 52a533cc31f630ad482fe0fde8d925b459c787bf)
2013-07-28fdo#54320: VoiceOver does not follow keyboard focusBoris Dušek1-1/+1
The AXFocusedUIElementChanged notification must have the application object as its parameter, as it is the application object whose AXFocusedUIElement attribute value is changing (and because the docs say so). Change-Id: Ife63a1e59d8a24256ace38fb98b69fd1544f9c96 Reviewed-on: Reviewed-by: Norbert Thiebaud <> Tested-by: Norbert Thiebaud <>
2013-07-28fdo#67303: sw: speed up setting IsHidden property on stylesMichael Stahl3-3/+24
Importing an ODF document with 4089 styles is ridiculously slow, spending most of the time in SwStyleSheetIterator::First() to reset an existing iterator. Since the SwStyleSheetIterator can handle the case when First() has not been called anyway, just add a new method that resets the bFirstCalled flag, which takes next to no time. (regression from a0dcf961879ab644a52f801f65466756cb144b72) (cherry picked from commit 8fb210a2ddc0b09288316cf459bebfe196ea94fb) Conflicts: svl/inc/svl/style.hxx Change-Id: I8741b4c0cd51f8c244462ce28a754abc427d0df3 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-28fdo#61201: Don't forget to calculate row offset for external single ref.Kohei Yoshida1-0/+1
Change-Id: Ie3dbf2eeba98a60aa2426b1db35ac885102d3821 (cherry picked from commit 8b96cfd6caedbad7b3b79e57421a834f18c5c511) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-28fdo#60282 fdo#66745 i#122509 Corrected typo in basegfxArmin Le Grand1-1/+1
(cherry picked from commit cdf48cfdbdb5348b259f4632790ffd178fcad1f7) (cherry picked from commit 744244997da79ca95278249eeadf716730fffd82) Signed-off-by: Michael Stahl <> Change-Id: Iaa62acc4901c3edd31d0af7c642327dddf07f562 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-26fdo#33605: Handle http etc. URLs with no path but fragmentStephan Bergmann2-2/+24
Change-Id: I8c47cc55e7ad53e514c0bd46130cbbe6a1bb0357 (cherry picked from commit 44ddacb232c4fd5cbb28867aa28d7d855788a511) Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>
2013-07-26fdo#67258 catch error when calling mdfindChristian Lohmaier1-1/+6
This can be the case when spotlight is disabled. So just ignore any error when trying to locate installed versions and let the user continue with the manual selection instead of aborting. Change-Id: I2c4e12652b8cb3b43af3ca6d8d553f0558f91858 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <> Reviewed-on:
2013-07-25fdo#67269 adapt checkTable to getTableName changeLionel Elie Mamane1-3/+4
getTableName used to return schema.table; now it returns just table But tables are indexed by schema.table in getTables(), so reconstruct that for the lookup. Change-Id: I53da1e43762b3a470e34b5dfdb0e1bb3dc914780 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-25Use the WPX_SEEK_SET inconditionallyFridrich Štrba4-0/+30
(cherry picked from commit e4906561219fe88345ace8aa4d6f48cbb01262d8) Conflicts: libcdr/ libvisio/ Change-Id: I8d202d843b8ecf5a32131058ae1a5cd465e6069c Reviewed-on: Reviewed-by: David Tardon <> Tested-by: David Tardon <>
2013-07-25Use inconditionally the libwpd >= 0.9.5 pathFridrich Štrba2-5/+1
Since libwpd does not output the version number anymore (cherry picked from commit 93d0e38ccc06060f20073a9461c53f471a1b9c03) Conflicts: writerperfect/source/common/WPXSvStream.cxx Change-Id: I1bc3f7081552795fc2ed33f033a093fa5b40fda8 Reviewed-on: Reviewed-by: David Tardon <> Tested-by: David Tardon <>
2013-07-25fdo#33617 adapt report engine to incompatible BorderLine2 changeLionel Elie Mamane4-25/+31
Conflicts: reportdesign/source/core/api/ReportDefinition.cxx reportdesign/source/filter/xml/xmlHelper.cxx Change-Id: I482e4b7b9f056247de3dae247d9328eb672eeba8 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>