[Libreoffice-commits] core.git: Changes to 'private/jmux/libreoffice-4-1+fixes'
Jan-Marek Glogowski
glogow at fbihome.de
Fri Feb 7 06:27:37 PST 2014
New branch 'private/jmux/libreoffice-4-1+fixes' available with the following commits:
commit 50b7eb974ebdfabafe33b5893eae1663843b10be
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Thu Feb 6 16:05:37 2014 +0000
fdo#72187 Implement KDE4 picker notifications
This notifies the XFilePickerListener of filter changes and file
selection changes.
(cherry picked from commit a8d102c2406b8c027afb32d61271e0a2c301f133)
Conflicts:
vcl/unx/kde4/KDE4FilePicker.cxx
Change-Id: I749c5f7420f020a3a2fbb764acb5c45d40972cf1
commit 9ae4ce3c8f057d042b2bb4cca6962424ecfc3cfd
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Thu Feb 6 15:32:42 2014 +0000
Simplify control item switch statements
Just check the dynamic_cast result to verify check boxes.
Change-Id: I5f370e337e12719eb7ef0dd3512a0f46c76a981e
(cherry picked from commit 24e8b90d8a2864cfb60d3a5046be39410efe5c51)
commit 981cfc5eedecdeaaabffa84bbd1073bb5a64a30f
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Tue Dec 24 19:47:30 2013 +0100
Rename some mail merge variables
Fixes the variable name typo pSourrceDocSh and renames bLoop to
bNoError to represent the variables function.
Reviewed-on: https://gerrit.libreoffice.org/7431
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
(cherry picked from commit 5da974369d01760b336de34e68c03d7268d2d330)
Conflicts:
sw/source/ui/dbui/dbmgr.cxx
Change-Id: Iba688ed0fb40c0c3947da1b21beb00c67a10ff09
commit 77be2cf7b0541b8747e7eabd217575ef11418d97
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Fri Jan 10 23:36:52 2014 +0100
Drop unused nMergeType from SwNewDBMgr
All code uses the nMergeType from the SwMergeDescriptor. Actually
there is just code setting the nMergeType in the SwNewDBMgr but
none reading or comparing it.
I don't know if the removed assignments actually should work on a
SwMergeDescriptor object, so some parts of mail merge may already
have been broken.
Reviewed-on: https://gerrit.libreoffice.org/7432
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
(cherry picked from commit e3e6ad0e5c36531d8002c24c5e41a99ff597c095)
Conflicts:
sw/inc/dbmgr.hxx
Change-Id: Ic8c52e6171f122d3837d9f2de81053e30ac8f5b7
commit 1f10d10ddecade6b04657302ec230580ccce1df4
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Sun Dec 22 17:37:28 2013 +0100
Cleanup SwXMailMerge constructor.
Move all fixed initializers into constructor definition.
Reviewed-on: https://gerrit.libreoffice.org/7189
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit a5504e49dba07f7217ad3c0980d8c0f21f9f646c)
Conflicts:
sw/source/ui/uno/unomailmerge.cxx
Change-Id: I7317deae43abf6a9e865c66969cb39a4b69de826
commit 0be0802eb276c955030806dcd72ff39d4ec4d97a
Author: Ulrich Kitzinger <ulkitz at hotmail.de>
Date: Mon Jan 13 11:13:52 2014 +0100
Let the list of bookmarks in the 'Edit bookmarks' dialog be resizable
Change-Id: I09279f4d35238e6ab2d7b3e27e711dfe7fd74211
Reviewed-on: https://gerrit.libreoffice.org/7399
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit 2f2d9e3799d041381565ac1ef6e7a8c8a065871b)
commit 019656ebc1f36d2d57b3b7997c5ba6ca2ad177c7
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Tue Jan 7 13:03:14 2014 +0200
fdo#72521 fdo#73103 Fix editable combo-boxes behavior under KDE4
Change-Id: I92a781a1e0f0adcb779155f8c477595e0dd762b1
Reviewed-on: https://gerrit.libreoffice.org/7287
Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
Tested-by: Jan-Marek Glogowski <glogow at fbihome.de>
(cherry picked from commit a62a80ac6cc0e337f4ff6d862bccc13c720d41ac)
commit b5eab40e1d710add882a7d54bca52bf962b0d001
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Jan 9 12:32:59 2014 +0100
librdf_Repository: make older compilers happy
Change-Id: Ide4df8f621f810b20be811db06d46edd5a9dc5f8
(cherry picked from commit d3aad81268298c05163136e2e953e1dfe0728d9e)
commit aa45103063f8a5c7edc70358c9c21e7311fa78b6
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Jan 9 00:10:02 2014 +0100
librdf_Repository: fix missing mutex lock in various destructors
Change-Id: I5756ab6ff6de0b2532bef9866063f361e330a009
(cherry picked from commit 62fd1aa382c75feaa72f8aa09af4d3fc0b387dcc)
commit 6a987d27dc339948d1be69e662b16e95b3954225
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jan 8 23:43:03 2014 +0100
fdo#72928: fix deadlocks in librdf_Repository
Refactor to do all calls on parameters before locking the mutex.
This requires splitting up some librdf_TypeConverter methods into an
extract function and a make function, with an intermediate
representation between.
Also rename some internal functions to make it clear which are called
with Lock and which with NoLock.
(cherry picked from commit 7db6b2f7968d8063b12312737136f09cb7549805)
Conflicts:
unoxml/source/rdf/librdf_repository.cxx
Change-Id: Iddc42461d95351785578ef6a80fbf5d056356c16
commit 283b674a8bac49caaa88f98c7525e839aab3e9f0
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Mon Dec 16 21:11:14 2013 +0100
Handle fixed page size printer option.
Correctly handle the printer option "fixed page size". If set,
pages are centered and trimmed onto the fixed page, regardless
of the page size option.
Change-Id: I10f6f5a10268c452847f032e204df8f363be99a1
commit 354aa992031c00bf516ebd60ae27eeaebb3975a5
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 1 11:03:34 2013 +0100
fdo#71005 Remove odd "Workaround for automated testing"
...that got added by 62ee5e1a752033344c172ad2380a5f1e2492330a "INTEGRATION: CWS
calcshare2: #i85794# workaround for automated testing" but does not make much
sense, esp. as all our (subsequent-)checks each use a dedicated, throwaway
UserInstallation anyway.
Change-Id: I64ca47a7d7ee3c2eb2ab33eebcec5a79a7e3d0df
(cherry picked from commit 2c2ff538908e4c61987469c9e09325c2b479b185)
commit d79cdbc5cc28a548ac49218966e3626b8011d9ff
Author: Ulrich Kitzinger <ulrich.kitzinger at muenchen.de>
Date: Mon Dec 16 21:17:49 2013 +0100
Add sub-menu to open templates.
Change-Id: I8039419b3a4a41321f00d24ce80366a42cff171d
commit 613e88e34e5de5bef971100f362fc515ef5c8655
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Wed Nov 20 10:39:49 2013 +0100
fdo#56355: Freeze layout / page format normalization.
For single-file mail merge this skips the page format normalization,
which would be run during each document / page append.
Instead the normalization and checks are run for the whole document
at the end of the generation, changing this code from O(n2) to
O(n). This way each mail merge generated document uses the same
time, because the target document isn't completely traversed for
each page change.
With my test document this produces the same output, save some
changed internal document IDs.
Reviewed-on: https://gerrit.libreoffice.org/6733
Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
(cherry picked from commit 13a8fac05425f9d66c643f25faa49c1f17c62474)
Conflicts:
sw/source/core/layout/newfrm.cxx
Change-Id: Ia779705cfb107383341f946542d28434c986591a
commit 3b3de401d4dc49dda6f6ae1227c9c4eb8d27b00e
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Mon Dec 16 20:42:48 2013 +0100
fdo#64146: change file merge of numbered lists.
Have a more sane handling of inserting a file, which starts with
a list into an already exiting file at a list position.
Change-Id: I062a876b758a0673a10a5f4b2675430cf1477a79
commit e210d04f8ad66aea7b3b54be4a7b1a12d61ae61b
Author: Jan Holesovsky <kendy at collabora.com>
Date: Tue Oct 8 13:50:42 2013 +0200
DOCX export: Export run properties defaults in docDefaults.
The paragraph properties still need some work, so that part is disabled in
order not to break the unit tests.
(cherry picked from commit 62ceeb1d1a0ff32e1be615f78da796aa13aaa06c)
Conflicts:
sw/source/filter/ww8/docxattributeoutput.cxx
Change-Id: I06e55a5345d4fe08b14b8a260ab774b38770bf7b
commit 6b26ad0101ea63dd83b8917a92b69c22ad324579
Author: Jan Holesovsky <kendy at collabora.com>
Date: Fri Oct 4 20:10:01 2013 +0200
DOCX styles: Output real rPrDefault's.
Not complete - to be checked which of the properties are we supposed to
output; so far we support only w:rFont and w:lang.
Change-Id: I142dd075735ba2c5cb1022768bfecf793148078f
(cherry picked from commit 9f8fb9fce00caf1672844444a737a6477e34c9cb)
commit 01bac96615ac06a73ee6c0bba14229b870ad52d6
Author: Adam Co <rattles2013 at gmail.com>
Date: Wed Jul 10 16:43:51 2013 +0300
fdo#66773: fix for line spacing default
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed-on: https://gerrit.libreoffice.org/4810
(cherry picked from commit 5bb9b70a66d7818844abfaa297893c095e03d24c)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I7dafa709fd7dcd3df445277505468386c3f1cef2
commit fdede1698afa4bddc30148e78ae13daefc325a88
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Mon Dec 16 20:10:06 2013 +0100
i#74651: Allow undo of image removal.
This fixes the original error to set the modified flag for the
document.
Change-Id: Ife77def6a3064432725b0b1202144994ca574351
commit 09cb626eeda99e5497aaf068373f707da189ac29
Author: Eilidh McAdam <eilidh at lanedo.com>
Date: Sat Nov 2 20:35:44 2013 +0000
fdo#40788: Allow manual breaks in Calc to be forced
If the scale settings specify that the print ranges must be scaled
across a specific number of pages, the default behaviour is to ignore
breaks to avoid the case where breaks force more pages than specified.
Here, an option under Calc -> Print -> Pages is added so that the user
can specify that manual row and column breaks should be forced.
Reviewed-on: https://gerrit.libreoffice.org/6531
Tested-by: Eike Rathke <erack at redhat.com>
Reviewed-by: Eike Rathke <erack at redhat.com>
(cherry picked from commit 7e4f8eb5eff642c7fc8bfa665289d55a1c5b054b)
Conflicts:
sc/source/ui/inc/tpprint.hxx
sc/source/ui/optdlg/tpprint.cxx
sc/source/ui/src/optdlg.src
sc/uiconfig/scalc/ui/optdlg.ui
Change-Id: I445cd7ce9e16e4ec2d0c320f059edad62b40f22d
commit 2bfeb0ab35366f7ec10714115c62093220032d9f
Author: Pierre-Eric Pelloux-Prayer <pierre-eric at lanedo.com>
Date: Wed Oct 16 10:07:08 2013 +0200
sw: clone InputField dialog on input-field removal
Setup a listener on RES_FIELD_DELETED event, and cancel dialog if
a field is deleted. Add Cancellable capability to Input dialog too.
Fixes a crasher that occurs when fields are removed (e.g: by an
extension) while the InputField dialog is running.
Reviewed-on: https://gerrit.libreoffice.org/6261
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit eb42610c43b1011cde0af8b03d20ec70e4e789b5)
Conflicts:
sw/inc/swabstdlg.hxx
sw/source/ui/dialog/swdlgfact.cxx
Change-Id: I9e132a109cba3127b934a3baecbf445a2bde1377
commit 60eb21e165de8b8dcbc29275242ecc28a9a1575d
Author: Pierre-Eric Pelloux-Prayer <pierre-eric at lanedo.com>
Date: Thu Jul 11 17:22:09 2013 +0200
Add PrintName to PrintOptions.idl
Change-Id: If023204f44a4b1180ea747686356c2a8a7aaf288
Reviewed-on: https://gerrit.libreoffice.org/4859
Tested-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit 4e0656ac0bc5be3306ad016a1a494577ad2ef8b8)
commit 3ff1c7a864cbc2683d0c95e094e52c25bae9021e
Author: Pierre-Eric Pelloux-Prayer <pierre-eric at lanedo.com>
Date: Wed Jun 12 13:03:25 2013 +0200
mail merge: forward PrinterName property to ExecPrint method
Otherwise, there's no way to select the printer to use (from an
extension)
Change-Id: Iee59f9de38547a8edb0419cf4d2df3c1ce2d7999
Reviewed-on: https://gerrit.libreoffice.org/4858
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit 788fa63351c00bce83b485fa1725e36a57336ab3)
commit 13818c7c922ebbd2ac7ce87fd678a095971bf973
Author: Pierre-Eric Pelloux-Prayer <pierre-eric at lanedo.com>
Date: Wed Jun 12 13:01:20 2013 +0200
mail merge: properly increment indexing counter (was const)
Change-Id: I1d780a5369c04a93e7fe16b41bff5f37d641e60c
Reviewed-on: https://gerrit.libreoffice.org/4857
Tested-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit a4688cde5b7295ca5f5f1ff2fc6e615139c467cf)
commit 635d069df1c55be7093c6e07e43d2cc7c565cd6b
Author: Pierre-Eric Pelloux-Prayer <pierre-eric at lanedo.com>
Date: Mon May 27 10:45:08 2013 +0200
fdo#57874: verify GetRedlinePos return value before usage
Make sure return value of GetRedlinePos is checked each time
before usage.
Fix crash in Redline dialog.
Change-Id: I5586d8ddc1a7905c524a522addc89969e704048d
(cherry picked from commit 1fadebef054b811d8d6487d45d76dea1990e1268)
commit f489bcc9d23628046261f93fb2e5f83013036da7
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Thu Nov 21 12:40:57 2013 +0100
fdo#67011: Run Display::Yield through KDEXLib::Yield.
Drag'n'Drop is handled in a second thread, which tries to "yield
the display" while the main Qt thread probably is already
yielding. Both need the YieldMutex, which freezes the application
until the D'n'D thread times out.
Trying to yield the display throught the application yield
results in a recursive loop.
So this catches and breaks the recursion, but just inside the Qt
thread, so other processes can "yield on the display", instead
of simply disabling the Display::Yield.
Change-Id: Ifba91aa89fe5b0a89cc94820935dc996a065112f
Reviewed-on: https://gerrit.libreoffice.org/6750
Tested-by: Jan-Marek Glogowski <glogow at fbihome.de>
Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
(cherry picked from commit 95f60222e75486336b6569afa8f34d60b51c94ad)
commit 4c4ed357ac72f67771500570a185a15edbeb6ffb
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Fri Nov 15 14:42:15 2013 +0100
Rewrite Qt4 based nested yield mutex locking.
The Qt event loop may start a nested event loop, when checking for
clipboard and Drag'n'Drop events.
Previously this was handled by running this nested yield loop
inside the main glib loop using
qApp->clipboard()->property( "useEventLoopWhenWaiting" );
But this results in nested paint events which crash LO:
QWidget::repaint: Recursive repaint detected
To prevend yield mutex deadlocks, check for nested event loops
and always release the yield lock before starting the nested Yield
event loop.
This fixes fdo#69002.
Change-Id: I7e827abd3489783053ec7123372742a32555875d
Reviewed-on: https://gerrit.libreoffice.org/6685
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
Reviewed-by: Thorsten Behrens <thb at documentfoundation.org>
Tested-by: Thorsten Behrens <thb at documentfoundation.org>
(cherry picked from commit 13a34f4c6307d1bd2443cbf3fbd83bfdd8cdbafb)
commit a9885b3e2c4eb5dfac08a9eff8c1e1f629093df3
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Thu Nov 14 11:29:15 2013 +0100
Redirect file picker UI processing to GUI thread.
If a KDE4FilePicker is opened via an remote UNO call, e.g. via
a RPC Java call, a JVM is started in a new thread to handle the
call.
This was creating the KDE4FilePicker in the non-UI JVM process,
which crashes LibreOffice.
Therefore we redirect the processing of all FilePicker calls to
the main thread.
This fixes fdo#71145.
Reviewed-on: https://gerrit.libreoffice.org/6683
Tested-by: Michael Meeks <michael.meeks at collabora.com>
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
(cherry picked from commit fa8b5ae8e24fe26de7b26eff8a4a523ab22408fa)
Conflicts:
vcl/unx/kde4/KDE4FilePicker.cxx
vcl/unx/kde4/KDE4FilePicker.hxx
Change-Id: If6ec2d205af5a883df35fddb44a12ac43e3560f0
commit 4fea8a81f5d6c05fda080eba8a83db5b587ef4b3
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Thu Nov 14 11:31:39 2013 +0100
Drop processYield return type.
The virtual Yield function has no return type, and the result of
processYield is actually never used => drop it.
Change-Id: I3da7bc99fd8f56301da37ca196b03b34cdc84a40
Reviewed-on: https://gerrit.libreoffice.org/6684
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit bee6b3e6dad729263d10daf1550826871c57fe05)
commit 031f63d2f016dc041e11dac3557833806dd46e62
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Thu Nov 14 11:24:59 2013 +0100
Use Q_* macros.
This way we won't conflict with boosts signals and slots.
Change-Id: Ia92b283a5b47b7bc8c2bec2c6be664c9b7f1bed8
Reviewed-on: https://gerrit.libreoffice.org/6682
Reviewed-by: Tor Lillqvist <tml at collabora.com>
Tested-by: Tor Lillqvist <tml at collabora.com>
(cherry picked from commit 2e6a17ac88e89d4db8491605ac4dd6ea249b5d01)
More information about the Libreoffice-commits
mailing list