[Libreoffice-commits] core.git: Changes to 'private/jmux/libreoffice-4-1+kde4+fixes'
Kohei Yoshida
kohei.yoshida at collabora.com
Mon Mar 10 12:36:36 PDT 2014
New branch 'private/jmux/libreoffice-4-1+kde4+fixes' available with the following commits:
commit 2589dd55d377eb4f34647f733857a1e48fbec399
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Wed Jan 22 09:01:04 2014 -0500
fdo#73886: Let's keep the "left" border outer and "right" inner.
This reduces the complexity a bit.
Change-Id: Ieefb57be86e5b66f319920fa61c88d0027c38164
(cherry picked from commit 3205bbedfbc8cc76125eb53acc1e6281748f5876)
commit 530e81ae717e03c9e02faa509d5462c641da0c9d
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Sat Jan 18 18:17:52 2014 -0500
fdo#73487: Better pixelization of lines for on-screen rendering.
Conflicts:
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
Change-Id: I95d087a1f4841bfb7f665bcfebecd4c22c817958
(cherry picked from commit ac40f13eebde508cce14b67d59dd36c2c18ccf7b)
commit 7d61dba8aa4bbb8f76b9dab1b02b89aff74a92e1
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Mon Jan 13 13:18:25 2014 -0500
fdo#73487: Overhaul cell borders to make them look sane.
Change-Id: I207db352e017214f61baa947ef8f34662c724087
(cherry picked from commit 98633cd8fc3fe7e2e5176c3329cf287c913471d7)
commit c281d3af8cb5e3a66c1aedfe9563756682f1aa94
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Sun Dec 22 17:42:20 2013 +0100
Export MailMerge cancel functionality via UNO.
If you start a mail merge jobs via UNO, there is no way to cancel
it. But the functionality is already implemented and used by the
LO internal mail merge dialogs.
This patch adds an optional XCancellable interface to the MailMerge
service and implements it in the SwXMailMerge class.
As the XJob::execute function already uses the SolarMutex to
prevent parallel runs, XCancellable::cancel can be implemented by
storing the SwNewDBMgr in the private variable m_pMgr, protected by
a mutex.
The bCancel member has to be converted from a bitfield value to a
real boolean, because otherwise all bitfield values would have to
be protected by a mutex. Bitfield assignments aren't atomic as you
always have to replace at least a byte.
Reviewed-on: https://gerrit.libreoffice.org/7190
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
(cherry picked from commit 1a12777f46954045afbe8fffa6dd199b4b338762)
Conflicts:
sw/inc/dbmgr.hxx
sw/source/ui/inc/unomailmerge.hxx
Change-Id: I007cc23fdf04ccfca7d3cd6180b0e17e99f53061
commit 8cf93b5a65d69572778b07c0e9851f5ca4462000
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Thu Dec 26 23:15:24 2013 +0100
Copy mail merge source instead of loading
Currently a mail merge loads the styles from the source document
and also loads the original source per mail merge dataset.
The new code is based on the MergeDocuments function and swaps the
loading with an internal document copy to improve mail merge
throughtput.
For a mail merge with 99 datasets and a two pages document,
callgrind shows an improvement from routhly 44 to 31 billion
inclusive instructions for the single SwXMailMerge::execute call.
Reviewed-on: https://gerrit.libreoffice.org/7433
Tested-by: Michael Stahl <mstahl at redhat.com>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
(cherry picked from commit 8d11531565d746dd6a7938c4f3536ad34698092d)
Conflicts:
sw/source/ui/dbui/dbmgr.cxx
Change-Id: I6929ba371f81c3ea1f26ea3a25e7751bc53256e3
commit 81f634ae89330a91c685c1ca41b1c15cd1bf3c76
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 8b82413219e6f9e9d7d53baff942ff34d30b1ac5
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 4748e3a7cf988b734f05af55d71c74a183b3338e
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 5634fd8bf5a1fbc601fa1e0abdc0054583ff3cb7
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 2f77276d0e7b307422f3456bdfd958087a1558c4
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 a807d343238783291c8ca2ab8bbf3200e8caccce
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 ef1f065d6753f5fb9693f5a82e02ebf9ffbf6db1
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 1dd5dfdc367d878c7a1fd154cdb3bf59c1390b5c
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 b67c953c1e22dee027b0f27d7b57bdbb83d0c0bc
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 d572bcadb631bbc910dd3e2fbe23302cc853639f
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 a64e96a69879e6755f9f23ac4ba95f2fa3f9749f
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 c318b78f67642e1c4bc2f9f3c89888fc98debce5
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 90480f8d2e98a4561181e7a66cd624bce5bbe8a5
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 63fbb5d0505fc5044c22077559a4f2507444168f
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 d19cfed7e99e092b63879cbf245c62394ad48974
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 7f3d17b90c714423c93c0642e82a5bb80f96433a
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 32f8346e4ecfeac7e237b3c4acd71d75b407532b
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 4dbabcfb69156285177d2db7ba0c649edc534254
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 9f99ddb61d3696f3b37774828522235931686f1f
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 432a869306735bdea0b5f320a91c60e88dec2a10
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 bac89141aa335420cfa804bdcbef3c3ea90374db
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)
More information about the Libreoffice-commits
mailing list