New branch 'private/jmux/libreoffice-4-1-6+backports' available with the
following commits:
commit ec3e220fe215b21df16294daf88426b23f3ab7b3
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Sat Aug 9 00:22:00 2014 +0200
fdo#78611 Don't create automatic rules on reset
As we reset all styles, there shouldn't be any unknown automatic
SwNumRules, because all should have been created by the style
copying! And in this case we also have to overwrite the existing
automatic SwNumRules to get a consistent copy.
In case of unknown automatic SwNumRules we just warn and ignore
any inconsistence.
Change-Id: I26e25bccc9a8c7be74f3dceb2e1f91894eac1d0a
Reviewed-on: https://gerrit.libreoffice.org/10988
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
(cherry picked from commit 9fd7ca788bc8fd88b048c544edb0dc6518010e11)
commit 2a76e7d6a871685458e4b074e2af10bd40466b64
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Sun Aug 3 12:10:40 2014 +0200
fdo#81782 MM: copy most document properties
Mail merge wasn't copying the document properties into the target
document. It also has to copy most document properties into the
working copy, as ConvertFieldsToText is called just there.
Change-Id: I7e07fec712c225f667d960a94f4eb3fd0b83f041
Reviewed-on: https://gerrit.libreoffice.org/10987
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
(cherry picked from commit cde554a731596f1ca53a911656b6503c96dadcc7)
Conflicts:
sw/inc/doc.hxx
sw/source/core/doc/docglos.cxx
sw/source/uibase/dbui/dbmgr.cxx
commit 699070c073804505496f1bf944baca15fe995e10
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jul 29 15:38:32 2014 +0200
MM: restore the non-saving wizard behaviour
The wizard didn't save the MM source document, even if it was modified.
Change-Id: I0c7fb6abd31934bab7a33d7a9c93222af3e35ee5
Reviewed-on: https://gerrit.libreoffice.org/10986
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
(cherry picked from commit 3930c14be021e325c1efdb3fa7858069085286f8)
Conflicts:
sw/source/uibase/dbui/dbmgr.cxx
commit 855f5bc2e020d877c2931c47ffca41ec9bc6c67c
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jul 29 15:36:51 2014 +0200
MM: add missing CreateMonitor handling
The mail merge wizard uses a different progress dialog
(CreateDialog) then the UNO functions (PrintDialog).
This moves the "CreateDialog" code from the old mail merge function
and unifies some of the dialog handling.
This implements bc998e5e2cf43678462c8d7da8a9d6b1425ec492 without
all the reverts.
Change-Id: I06088140f604893a33f3ee37507e551b043a193d
commit a23a9b548f388c15342febc148043b9601180a61
Author: Eilidh McAdam <eilidh.mca...@gmail.com>
Date: Fri Jul 25 20:38:08 2014 +0100
Remove superfluous merge function.
The only caller of MergeDocuments now uses MergeMailFiles instead,
so MergeDocuments can be removed.
Change-Id: I03903a7f85c8328ab3f28cb1d23130557a1be7b4
Reviewed-on: https://gerrit.libreoffice.org/10982
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
(cherry picked from commit 126b4407bade85298f983f545d6f507534fab61d)
Conflicts:
sw/source/uibase/dbui/dbmgr.cxx
commit 139221df5e020fb4ec7a8192e6d908b713a448e7
Author: Eilidh McAdam <eilidh.mca...@gmail.com>
Date: Fri Jul 25 20:35:43 2014 +0100
Make UNO and wizard mail merge use same function.
Instead of MergeDocuments and MergeMailFiles duplicating largely the
same functionality, the only user of MergeDocuments (MM wizard) now
uses MergeMailFiles.
Change-Id: Ifad183bdeabf5ca1eb08b4b1df557404a54a9fdd
Reviewed-on: https://gerrit.libreoffice.org/10981
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
(cherry picked from commit 636718c960a36bc28d37a69ac102dd6cb696bfba)
Conflicts:
sw/inc/dbmgr.hxx
sw/source/ui/dbui/mailmergewizard.cxx
sw/source/uibase/dbui/dbmgr.cxx
commit ed4dccedea55582daf4d21e93eeee9169b717023
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jul 29 14:26:40 2014 +0200
MM: detect save error based on the return value
There is actually GetError() and GetErrorCode(). While the error
code can also be a warning, which isn't reported by GetError(),
this detects the error based on the DoSaveAs return value (actually
I got warnings in case of save failures in my MM unit tests).
Change-Id: I3db749c798ad80336ee7ada9eaa71177e8ffb248
Reviewed-on: https://gerrit.libreoffice.org/11456
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
(cherry picked from commit 2916dfdb2361e68a6bbbcb0b0e9e114e052cb6d5)
Conflicts:
sw/source/uibase/dbui/dbmgr.cxx
commit 2c5177113dc1ec700ae8c4f4768f296bea017c49
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Sat Jul 12 23:17:31 2014 +0200
fdo#70346 MM: add mail merge data to condition dict
Currently section hide conditions are just evaluated based on
document field data.
This adds the current mail merge dataset to the condition
dictionary, so this can be used in the condition evaluation.
The dataset values are named from their columns and added initially,
therefore DB fields with identical names will overwrite the values
in the dictionary!
Change-Id: I82a5f9f6962628a76c836e8e2a7c9e264fdc16e0
Reviewed-on: https://gerrit.libreoffice.org/10978
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
(cherry picked from commit 4851cde7b98226b0f82ae2b191c290173e9b06c6)
Conflicts:
sw/inc/dbfld.hxx
sw/inc/dbmgr.hxx
sw/source/core/doc/DocumentFieldsManager.cxx
sw/source/core/fields/dbfld.cxx
sw/source/uibase/dbui/dbmgr.cxx
commit a5169a1e7ed69c2ce8798ad2866ef78970397d2f
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jul 29 14:26:40 2014 +0200
MM: Don't adapt the view when saving dbg documents
DoSaveCompleted updates the SwViewShell and recent file lists after
the document was saved via DoSaveAs. So we can simply drop the
call and delete the SfxMedium to save a copy.
Change-Id: I04a0710949ca60e1ff4cab24c6b504deb130db63
Reviewed-on: https://gerrit.libreoffice.org/10983
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit a65459eae58f342787abe4c766912f964a8383be)
Conflicts:
sw/source/uibase/dbui/dbmgr.cxx
commit 5fc1238af0239a35f3b0c6f5ff4ecb1c1cd6ae3b
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jul 29 15:31:00 2014 +0200
MM: refactor cancel handling for dbui dialogs
This simplifies the handling of CreateMonitor and PrintMonitor in
the combined mail merge function.
Change-Id: Iacf933ec1a6017949b29b3d5f62d5f55c4691053
Reviewed-on: https://gerrit.libreoffice.org/10984
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit 57d7802145befa4ebc191cc646069aefb58f5c32)
Conflicts:
sw/source/ui/dbui/mmoutputpage.cxx
sw/source/uibase/dbui/dbmgr.cxx
sw/source/uibase/dbui/dbui.cxx
sw/source/uibase/inc/dbui.hxx
commit e1840939dcfce9808a5d14c0ed7a6a3af2148ce1
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Sat Jul 12 19:27:11 2014 +0200
Invalidate rect cache before moving object
Otherwise I get sw/source/core/layout/anchoredobject.cxx:582:
<SwAnchoredObject::GetObjRectWithSpaces> - cache for object
rectangle inclusive spaces marked as valid, but it couldn't be.
Missing invalidation of cache. Please inform OD.
Change-Id: I3f315b15fca6e2480c11183269be5583e6aea123
Reviewed-on: https://gerrit.libreoffice.org/10977
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
(cherry picked from commit 5dc8691e0909654c68eb0dcbc6d787701d02839b)
commit ea863faba3e36c90f910159d81a6ff2757663de4
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Sun Jul 13 20:15:55 2014 +0200
fdo#80926 Don't move anchors of invalid pages
If the anchor is valid, check if its page is valid too,
before moving anchors on view change.
Change-Id: Idffdfdb786cb29a105c06d652e6ad7315abfb4c5
Reviewed-on: https://gerrit.libreoffice.org/10976
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
(cherry picked from commit 508d2d2b1a6a23043c8c0f0d3fea4ec033ac2684)
commit 7859a43777b8433a95d1c1a376dc829632aeaada
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jul 1 15:45:47 2014 +0200
Fix single node CopyRange
Previously there was a restriction for the range to contain at
least two nodes.
Change-Id: Iadf21d3928303c2ab8df0d93dabd969ed1ff7e09
Reviewed-on: https://gerrit.libreoffice.org/10972
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
(cherry picked from commit 9099e21b89184bd4e39def497e483cac4a77ec5a)
Conflicts:
sw/inc/IDocumentContentOperations.hxx
sw/source/core/doc/DocumentContentOperationsManager.cxx
sw/source/core/inc/DocumentContentOperationsManager.hxx
commit 36cc533817365265232ce42fb3e9f57075820035
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jul 1 13:02:58 2014 +0200
Refactor NumRule handling in CopyImpl
The bug fix for i#86492 added a lot of duplicated code. This moves
the code into their own functions and uses macros to make the
resulting code even more readable.
Change-Id: Ifa0ece26f3152f1f8d8c65173b459e8c14c5b43a
Reviewed-on: https://gerrit.libreoffice.org/10968
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 2f5e266e978a6c9142e8a154ccddb2a07146ed42)
Conflicts:
sw/source/core/doc/DocumentContentOperationsManager.cxx
commit a827c065c84951444a106392283e190212e448dc
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jul 1 21:42:30 2014 +0200
Normalize SwDBManager::Merge{MailFiles,Documents}
There is still a difference, if run mail merge throught one or
the other function (MM wizard or UNO).
Change-Id: Ia372bd3edea4c8dfb58e045fc8fed2efcb2a4fde
Reviewed-on: https://gerrit.libreoffice.org/10971
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
(cherry picked from commit 65981011d84fdcf90533b59f25f01a7f734d6c5e)
Conflicts:
sw/source/uibase/dbui/dbmgr.cxx
commit 87d1697a7e0a2bd9962b507ec4c556acfac84d4b
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jul 1 21:31:35 2014 +0200
Add debug documents to SwDBManager::MergeMailFiles
Just like the debug documents in SwDBManager::MergeDocuments.
Change-Id: I275575853c80d4e19d6df5ba9d8dc689353d7c85
Reviewed-on: https://gerrit.libreoffice.org/10970
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
(cherry picked from commit 74458301569bc9c0e7619e68be85e716d7b6f9f7)
Conflicts:
sw/source/uibase/dbui/dbmgr.cxx
commit fbce0d897ec46bec21512d73ea62e6c59190e76a
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jul 1 15:48:01 2014 +0200
Add debug messages for sw.{createcopy,docappend}
This adds a lot of SAL_INFO messages to SwDoc::CreateCopy and
SwDoc::Append.
Change-Id: Ie924e20698bec84482fcc5496175a9e29245729e
Reviewed-on: https://gerrit.libreoffice.org/10969
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
(cherry picked from commit 3b9361a930d62430044ea0b746f4b5751dbb8d88)
Conflicts:
sw/source/core/doc/docnew.cxx
commit 36e84bbe8fddec800b3b456c7a482b26f42dff0c
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Sat Jun 28 01:41:17 2014 +0200
MM: introduce SwDoc::Append helper function
This drops all the specialized, workaround code from MM, introduced
to use the SwFEShell::Paste function and additionally merges
and renames SwDoc::Paste into SwDoc::Append.
There is still a little common codepath, therefore this adds
comments to always update both functions.
Change-Id: I704b3ef3257dd977dac95e16e25049ff8ade97ed
Reviewed-on: https://gerrit.libreoffice.org/10967
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
(cherry picked from commit c808802e94eba48dc23d7fca133ed35c17feb163)
Conflicts:
sw/inc/doc.hxx
sw/source/core/doc/DocumentContentOperationsManager.cxx
sw/source/core/doc/docnew.cxx
sw/source/uibase/dbui/dbmgr.cxx
commit 4b2e33e14654651630281999b7d343b5f2110cab
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Mon Jun 23 09:27:27 2014 +0200
MM: always copy the internal document
There is really no need to create the first document via UNO
createClone(), which is also slower then the internal copy.
Actually createClone also calls createCopy, but without
initializing the document.
Change-Id: I2d1ee6e12e37caf1b0d9bfa393fb4240516628e9
Reviewed-on: https://gerrit.libreoffice.org/10966
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
(cherry picked from commit 660349579d282bcc62f5eb8b777a78c7fadf8b1c)
Conflicts:
sw/source/uibase/dbui/dbmgr.cxx
commit e5da198776ecfcea6ff2f4ceed466fc0206a1ccb
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Mon Jun 23 09:16:18 2014 +0200
Replace the whole content for copied documents
If the document is initialized in CreateCopy, it already contains
the initial empty paragraph. So we have to delete the content from
initial document, as we're going to replace the whole content with
the pasted document.
Change-Id: Ie6a64dcb070f7d611dfde97f2c1a721834b4167b
Reviewed-on: https://gerrit.libreoffice.org/10963
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
(cherry picked from commit ddffb797904c5ae1a5ab3bc66eeb9bfc168a0148)
Conflicts:
sw/inc/IDocumentContentOperations.hxx
commit 9b83dcd9f593950e41b9f3036f10c76de8d1c5d1
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Sat Jul 12 13:35:54 2014 +0200
Fix moving out-of-bounds draw / fly objects
Actually move the object in the right direction, if it's outside
of the document boundaries.
Fixes the mysterious effect, that negative y-offset in fdo#80926
changed the objects x-offset values.
Change-Id: If88cf2a07fb44537b2e047e77c5e009664db94af
Reviewed-on: https://gerrit.libreoffice.org/10975
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 5a107d3fdc069fdf95b7ab9a24fd84accf4160ae)
commit 2e4c3841e8f36fe58aeca4f785c2862d6c3f2887
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Fri Jun 27 14:58:24 2014 +0200
Some minor MM related refactoring
Refactors some code of SwFEShell::Paste and
SwDBManager::MergeDocuments to make it more readable.
Change-Id: Ifd78d6a44fa78eaf1f4fca63f4bbd3ee43ca129d
Reviewed-on: https://gerrit.libreoffice.org/10965
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 8a798ef5582e91ca51ffc835f6b8c8521bee3174)
Conflicts:
sw/source/core/frmedt/fecopy.cxx
sw/source/uibase/dbui/dbmgr.cxx
commit 8ca8c81a6677bd0228d0d4b07de0a8919cd2659d
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Fri Jun 27 11:28:02 2014 +0200
MM: fix workaround for single paragraph docs
There is already a workaround for pasting a document with a single
paragraph by appending a dummy empty paragraph to the working copy.
This patch removes the dummy paragraph from the target document.
Change-Id: I288d35264bf6f1a5f92c50d6a309e3bdd4ab5836
Reviewed-on: https://gerrit.libreoffice.org/10964
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 01e5ff37499d115e652ddab793488a54174fb4a9)
Conflicts:
sw/source/uibase/dbui/dbmgr.cxx
commit 1e3575f9f8254a16f4ec11c54b19f88ccc36f701
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Sat Jul 12 13:34:01 2014 +0200
Better variable naming in SwViewImp::NotifySizeChg
Make it obvious, which variable contains the document boundaries and
which the draw / fly object boundaries.
Change-Id: I0bc2bcb5515e317c7a204b3458b92c61482e1a5c
Reviewed-on: https://gerrit.libreoffice.org/10974
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 2d66f9dc4723fdbccf4bd64edcc66bf31df078fa)
commit a935187b2e01293c6d0ba38f46bb5b597ccbb575
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Sun Jul 13 20:18:56 2014 +0200
Refactor a tiny bit of SwLayAction::IsShortCut
Change-Id: I13d4fbebec02bddaa27e8929188d497dde715730
Reviewed-on: https://gerrit.libreoffice.org/10980
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 7fc5207ebe57a2b88e2ba7ab45e4ce3f6c049df3)
commit 05ff9aafeb3f68fa0f70f8b14571bdec789628a6
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Mon Jun 23 08:43:08 2014 +0200
Save debug mail merge documents
This saves the first three mail merge documents, the source and
the corresponding working documents.
For convenience all saved document URIs printed to the console.
Change-Id: Ice86bf59fc519cfab170ff0956559dc9373d5a26
Reviewed-on: https://gerrit.libreoffice.org/9860
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 212dce21b62a4cfb85406bebe54ee07545516e21)
Conflicts:
sw/source/uibase/dbui/dbmgr.cxx
commit cbbcb3b4d9c58cbb49112bd1a49f894d8986cb05
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Mon Jun 23 09:10:22 2014 +0200
Update SwDoc::Paste from SwFEShell::Paste
SwDoc::Paste is already an minimal version of SwFEShell::Paste.
Update the code based on the changes made in
commit 4580094d2d9d5b952c4526ee23204f75a5bb2f1b
Change-Id: I4d784f393952374e2a174510f9378b05cfdb78eb
Reviewed-on: https://gerrit.libreoffice.org/9861
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit d3070bc5f9a7b1b93223c97c7167806f3b41b9fc)
commit e16caff3bbea319e4c86990df523351d9a7c4e42
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Aug 5 22:50:23 2014 +0200
fdo#69282: sw: fix updating of page styles via SwDocShell::_LoadStyles()
SwDoc::CopyPageDesc() only copies master and left SwFrmFmt attributes,
but not first-master and first-left. They will contain exactly the same
attributes as master and left but they still need to be copied...
(see also: that FIXME in pagedesc.hxx)
(regression from 75084f6c42c27dc95418df9cefed2fddfb26000e)
Change-Id: I3dcc3627708b5d6a477eb7fef76cf6c42c95c004
(cherry picked from commit 5c1cc92ee09f9fcc99077cacd3fc55640f03b7b2)
commit b5af9ed3551781c0496777bbf51c8f597633891d
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Wed Feb 26 17:02:38 2014 +0200
KDE: don't throw on TemplatePathVariable
This is required after commit
838b77f5f3d6d8fd98891e99a23ff78a6a357cb2.
Actual functionality is still missing.
Change-Id: Ib94d8a982609de730d9c61bf7bf9886093c51f5b
Reviewed-on: https://gerrit.libreoffice.org/8367
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit e44a7eefb7f632977b4c8c91ad14244372c6e04d)
commit 081db1b20583053db6bd199260e2f327a381f37e
Author: Audrey Tang <audr...@audreyt.org>
Date: Tue Aug 5 09:56:53 2014 +0200
fdo#81516 Support fonts like Source Han Sans with > 16 FDArray elements
Change-Id: I3f82574f434060d62dc3faeb730341c5b169ce9f
(cherry picked from commit 3b38a2342e48a2aec3c2e4f5aebf883db4b84101)
commit b94bfc0de30ad193711559dd324f4048652fbe7f
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Feb 24 11:38:13 2014 +0000
Resolves: rhbz#1065807 use xdg ~/Templates for default Template location
(if it exists)
(cherry picked from commit 838b77f5f3d6d8fd98891e99a23ff78a6a357cb2)
Conflicts:
shell/source/backends/gconfbe/gconfaccess.cxx
Change-Id: I98fc9fd54d1f56c8bed24ce4d2ebf53756ded2cc
commit a831d694bc42a41be40a09b4215befe9ec5ac258
Author: Armin Le Grand <a...@apache.org>
Date: Mon Jul 1 10:43:33 2013 +0000
Resolves: #i120559# Corrected load for charts without RangeString...
but with local row-oriented data
(cherry picked from commit 855d5e3bc075e516edf1dc7e844924bbf9ab590c)
Conflicts:
chart2/source/tools/ChartModelHelper.cxx
Change-Id: I4979b639f5652a1c27b640b6b469f66c65a888aa
commit d8da9dc0c606d6bd7a27e65287859fac71e656f3
Author: Jan Holesovsky <ke...@collabora.com>
Date: Tue Jun 24 17:32:28 2014 +0200
pagedesc: Consolidate FindPageDescByName() and FindPageDesc().
(cherry picked from commit c1be76ec98cb465e07df961843134147100beaa9)
Conflicts:
sw/inc/doc.hxx
sw/source/core/doc/docdesc.cxx
sw/source/filter/ww8/rtfexport.cxx
sw/source/uibase/app/docstyle.cxx
Change-Id: I18d570509cd3f3b65a19a12a9df0b1d5db901d04
commit 55ed342c133fc117899be0d8bd288c66498fa448
Author: Jan Holesovsky <ke...@collabora.com>
Date: Tue Jun 24 13:09:14 2014 +0200
pagedesc: It's better when MakePageDesc returns a pointer.
This removes many uses of GetPageDesc(sal_uInt16).
(cherry picked from commit f246ac13bd1a12e11eba03cbe3c62ea77293e02e)
Conflicts:
sw/inc/doc.hxx
sw/source/core/doc/docdesc.cxx
sw/source/core/doc/poolfmt.cxx
sw/source/filter/ww1/fltshell.cxx
sw/source/filter/ww8/ww8par.cxx
sw/source/uibase/app/docstyle.cxx
sw/source/uibase/dbui/dbmgr.cxx
Change-Id: I9660e30d7fccd4336422ba03b19087321a7ae973
commit a2e757810a6afa10c3041c2c577a3b34f8904bb8
Author: Matteo Casalin <matteo.casa...@yahoo.com>
Date: Sat Aug 17 01:16:25 2013 +0200
String to OUString
Change-Id: Idaf974536036d40d60a43b32a7104e2ead075b48
Reviewed-on: https://gerrit.libreoffice.org/5466
Reviewed-by: Matteo Casalin <matteo.casa...@yahoo.com>
Tested-by: Matteo Casalin <matteo.casa...@yahoo.com>
(cherry picked from commit 077c80b9d2ed863d881627a1e14ae5b6f84277b8)
commit 92e75bde8ea2c3aaccbb5babd068fa14a572914d
Author: LuboÅ¡ LuÅák <l.lu...@collabora.com>
Date: Fri May 23 18:48:53 2014 +0200
force posted events before timer timeouts in KDE4 event loop (bnc#467278)
In this particular case, basctl::Shell::onDocumentCreated() and pretty much
everything in basctl/ it seems operate on the current window. The "OnNew"
event that triggers this comes from a timeout generated who knows where
for whatever reason. However, the code "knows" what the current window
is by having basctl::Shell::SetCurWindow() react on events about the current
window changing ... which come from posted events.
So, unless it's defined somewhere that an ordering here must exist, this
is inherently racy. At least generic and Gtk event loops appear to always
deliver the posted event first, so force the same ordering in the KDE
event loop handling.
Change-Id: Ia098f6b45e6b5a5133a12a9172eb09069e6362f9
(cherry picked from commit 8100131214ac2ee46b632703d8ba2babeaf3b5f6)
commit 405fff8eebe4dfe5f3fc8da1313dee76ebf0701c
Author: LuboÅ¡ LuÅák <l.lu...@collabora.com>
Date: Tue Apr 29 13:06:58 2014 +0200
prevent deadlocks between main thread and other thread processing a Qt event
This part of 13a34f4c6307d1bd2443cbf3fbd83bfdd8cdbafb was correct. The main
thread will deadlock on the yield mutex if the calling thread does not
release
it before waiting on the main thread.
Change-Id: I6692473457258b791c131e8bdb459b06b01550f7
(cherry picked from commit f09d4bc2853be2fa3faa0502b8efe94ad9719731)
commit c3325f7ca35684a80a0699433037b5b67a759efc
Author: LuboÅ¡ LuÅák <l.lu...@collabora.com>
Date: Sun Apr 27 00:56:00 2014 +0200
avoid several 200ms delays in Qt tests
Since the tests are run during LO startup, this is not such a good idea.
Also redo the socket notifier test which seems a bit of an overkill
when a mere pipe will do (and I'm not sure TCP sockets would have
the data available the moment it's written to).
(cherry picked from commit 145f2e970f46a3a3e5456b122d71f17c3abe878f)
Conflicts:
vcl/unx/kde4/tst_exclude_socket_notifiers.hxx
Change-Id: I6a436b286d20ceecf859f9028af98da03c2561b7
commit 87b2d9020fe66444badf0eff30b8a97a482ab670
Author: LuboÅ¡ LuÅák <l.lu...@collabora.com>
Date: Sat Apr 26 17:54:37 2014 +0200
work around LO blocking when asking for QClipboard's contents, helps
fdo#35950
Specific to KDE4 vclplug and just a bit of a hack, but it's at least
something.
(cherry picked from commit 9aa32a34c7c7a2ee4da5f01983a0ed224c38c875)
Conflicts:
vcl/unx/kde4/VCLKDEApplication.hxx
Change-Id: I4bf0f9c8e0b4f7faebaf010a06fcc4ff2e44fa6b
commit 4cd59fe822960592f6c6ecfbe3d80fd1f236f517
Author: LuboÅ¡ LuÅák <l.lu...@collabora.com>
Date: Fri Apr 25 14:06:57 2014 +0200
add better info on the Qt patches needed for KFileDialog
Change-Id: I1902f962ac03b171c5e7a45d9c8e59450b04418f
(cherry picked from commit 508337db0c53caa5fb43ef26f781df159497a482)
commit 13dc0141316ef51990fa84c792c519d906a904af
Author: LuboÅ¡ LuÅák <l.lu...@collabora.com>
Date: Fri Apr 25 13:08:23 2014 +0200
disable KFileDialog usage if QClipboard can recurse
Change-Id: If23a365b96c1634c2f8940f6ece973089dc3151f
(cherry picked from commit 65a3622148ea67744c9c1fc18c2b8d48e5f1c79f)
commit ae293e22fa5b67f24a541d25415a33a311ddd681
Author: LuboÅ¡ LuÅák <l.lu...@collabora.com>
Date: Fri Apr 25 13:05:43 2014 +0200
fix Qt4 QSocketNotifier configure check
When built as a part of the configure check, this doesn't know SAL_OVERRIDE.
Change-Id: I1420dd50efdd6666f246884f286a3f29e0b56a2c
(cherry picked from commit e809aa1e916e0f6d1a849d0374f59ef9619b1db7)
commit 3726471fb6d00a6a7dce25e2ce3df4b4b36c1dbe
Author: LuboÅ¡ LuÅák <l.lu...@collabora.com>
Date: Fri Apr 25 08:57:42 2014 +0200
make sure KFileDialog does not leave the SolarMutex released
Change-Id: I806bf5fe1cd1871de499ceeeadf36de539e9d637
(cherry picked from commit 474ad6b0e2fb18370be9d228456a2abbfc15bad2)
commit 75c3131474d000e6f12e95f58b95b8e4dcc82b65
Author: LuboÅ¡ LuÅák <l.lu...@collabora.com>
Date: Fri Mar 28 15:09:13 2014 +0100
Revert "Rewrite Qt4 based nested yield mutex locking."
In a dbgutil build LO aborts on an assertion failure the moment
KFileDialog is open. It's definitely on okay to release SolarMutex just
like that, since the Qt event loop is integrated with LO's, it'll call
back to LO code without the mutex held.
This reverts commit 13a34f4c6307d1bd2443cbf3fbd83bfdd8cdbafb.
Conflicts:
vcl/unx/kde4/KDE4FilePicker.cxx
vcl/unx/kde4/KDEXLib.cxx
Change-Id: Idfa27fbb4728b529c37c25f710ea208fdaa4455c
(cherry picked from commit 2cd8a1e0f1e81efd15979953d7f274ab8a6806d6)
commit 7a6fd60734b8e6ffbb78e5c765038197ba5e4df9
Author: LuboÅ¡ LuÅák <l.lu...@collabora.com>
Date: Fri Mar 28 08:06:19 2014 +0100
menu(bar) uses window text and background color, not button (fdo#50921)
Change-Id: I13adebd09746d21e7456927e14dcdc3efb2c723b
(cherry picked from commit 5e7aad393c0c3fab20c8298697ca96563caa7afe)
commit e0e1821c5a3f409dd4c0bdcb1e94d64d1b78195a
Author: LuboÅ¡ LuÅák <l.lu...@collabora.com>
Date: Tue Mar 25 12:20:16 2014 +0100
prevent KDE/Qt from interfering with the session manager
I occassionally get lockups in IceProcessMessages() called from QtCore,
I'm actually not exactly sure why, as theoretically two connections
from one app shouldn't be a problem, but since LO does its own
session handling, there's no need to the KDE/Qt code to be involved,
so prevent it from connecting to the session manager altogether.
Change-Id: Iebe20d4cb5403e5fea8bd5d8c1f69b62d1c2907b
(cherry picked from commit 71f2aff7a56cef4e133abad3c2e447c76c5ee1fe)
commit 56923b68beeecb06e79e517997cba1d57145ebf4
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Fri Mar 14 21:02:16 2014 +0100
KDE4: prevent blocking in Display::Yield
SalX11Display registers a Yield handler, which splits check and
and processing into two functions, which both lock the yield mutex.
Normally this no problem, but during a Drag'n'Drop operation the
D'n'D thread also checks and processes XEvents (for D'n'D). So the
XNextEvent in Display::Yield will actually block, if the seen XEvent
was for D'n'D and was already processed.
Change-Id: I9f8d96d4f9986997cbe150a2b66bc767b4bbc2f1
(cherry picked from commit 6c7374f071d998f726cd4a5b67baf54e357d096b)
commit 964cf9fe635efee42cbf1c5f57dc2d5fb23342b8
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Mon Mar 10 15:05:22 2014 +0000
KDE4: add Qt4 glib ExcludeSocket runtime check
Add a runtime check and configure warning to disable KDE4 native
file pickers, if the Qt4 glib dispatcher doesn't honor the
QEventLoop::ExcludeSocketNotifiers flag.
This way polling the QClipboard using the event loop won't
crash LibreOffice with recursive paint events,
See https://bugreports.qt-project.org/browse/QTBUG-37380
(cherry picked from commit cc8d566d74a2e0b969b92d9cf22cc95a3bf31a98)
Conflicts:
configure.ac
Change-Id: I5cad30ead74571e49a075c084cca7a19acff7523
commit 6518ec78bd57aba92fd5f1d49f05dc5e1191c7cb
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Fri Mar 14 15:16:11 2014 +0100
KDE4: change eventLoopType enum to glib bool
Just check for glib; it's the default in later Qt4 versions on unix.
Change-Id: Ia99466e9010eb835bea0c3c4420da3c8b3cd4671
(cherry picked from commit 516a8dedac9c3cb77cd26a740cf793b1cab920d0)
commit 78b591faa2b0c85bef0b98acbfcd9580dc8b72e8
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Thu Mar 13 21:55:31 2014 +0100
Revert "Rewrite Qt4 based nested yield mutex locking."
This reverts the unx/kde4/KDEXLib.cxx part of
commit 13a34f4c6307d1bd2443cbf3fbd83bfdd8cdbafb.
Conflicts:
vcl/unx/kde4/KDE4FilePicker.cxx
vcl/unx/kde4/KDEXLib.cxx
Change-Id: Ica8a0f678f080ae7d763bb7da7761d20ceec328c
(cherry picked from commit daf011870efae282244c0298494820d9a0c6d3bc)
commit eeae1447d07e7f6479ce5e890a5595140f660924
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Mon Mar 10 14:44:05 2014 +0000
fdo#73115: Always run timeouts as events
Right-click popup menus run click events throught the LO main loop.
In case of KDE4 the LO main loop is run by a timer in the main thread,
with Qt::DirectConnection execution.
If the timeout actually starts a nested event loop for a new dialog,
the timer is blocked, the nested mainloop detects it was started
from the timeout and drops the blocked timout from polling, which
blocks any further LibreOffice event loop processing.
This changes the timers to Qt::QueuedConnection, so they always
generate an event and are processed by the Qt event loop.
Change-Id: Ie626b22be3d8f9b8934bcc5e9e0e67a365549cfc
(cherry picked from commit aeda478a02523cec146f6af69710f0391061db56)
commit 59fb7599f1737dd129b5f254996cf1f3d47dd7ce
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Thu Feb 27 08:54:57 2014 +0000
fdo#45935: try hard to paint a frame for menus
Current Oxygen theme doesn't draw frames for menus, but uses shaped
and "colored" background images. This workaround paints the window
and menu frame for menus. Any frame seems to be better then no frame
at all.
Change-Id: I4d553ea58cac2729826f8395cb2597fa200187b6
(cherry picked from commit e72849cd435cc50a744dcbcfb422f5600dd0cce9)
commit 3c8f5d101cdc4bc4a50d7ad3b0c9c052649f0c7e
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Thu Feb 27 20:34:00 2014 +0000
KDE4: evaluate frameWidth in the Qt thread
When opening a document via Java UNO without a running LO instance, one
gets the following Qt error messages:
CE> QObject: Cannot create children for a parent that is in a different
thread.
CE> (Parent is Oxygen::WidgetStateEngine(0x8deb878), parent's thread is
QThread(0x8d6cf70), current thread is QThread(0xa8fa7fc8)
CE> QObject::installEventFilter(): Cannot filter events for objects in a
different thread.
CE> QObject::installEventFilter(): Cannot filter events for objects in a
different thread.
CE> QObject::installEventFilter(): Cannot filter events for objects in a
different thread.
This happens, because the Java UNO call is processed in the first /
Qt thread while document loading happens in a second thread.
Document loading actually just calls getNativeControlRegion, which
should not involve any drawing. But the KDE4 backend does some style
processing to get the correct frame width (QWidget::ensurePolished(),
which uses GUI based events and need to be processed in the Qt
thread.
Change-Id: I344d5089d958963c48a9a8a84bfa9fe8f092b75a
(cherry picked from commit 7163d64b90ac4d4259b1d0379cfca348dd30601c)
commit 3da40d1cf37c9ee72f126f5530ee703b87be8cf1
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Thu Feb 27 08:51:00 2014 +0000
KDE4: Report correct check and radio item sizes
Use the correct sizs from the current style.
Change-Id: I7e163bdc8d467baf2d6e3d0d2bc3e1da7558cf42
(cherry picked from commit c11deb60cabfa8e7ee511b94abb0e19601b42fe6)
commit 0c92a5a8fd739b3cad0a4213b8c5d8a971633581
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Wed Feb 26 17:02:38 2014 +0200
KDE4: Drop Qt 4.9 support
I don't think there will ever be any 4.9 release, so drop all the
unused code.
Change-Id: I4b72de96e6064240582cd83d4e45547096a2efb0
(cherry picked from commit 7b083444942b1d5890b51a1f4a8560ba4e411e46)
commit 18c918e4d789f9e3e460bd49de194462d85c47f1
Author: LuboÅ¡ LuÅák <l.lu...@suse.cz>
Date: Mon Jun 10 15:26:40 2013 +0200
fix and simplify getting files from the KDE4 file dialog
- Fix multiple selection handling.
- The "double click selection KDE4 bug" does not exist (anymore?) as far
as I can tell.
- Apparently it's not true that multiselect needs the first item in the list
to be the directory.
- KFileDialog can already give full URLs.
(cherry picked from commit 03f666103d80f7a0c79150dae2367079b80e50a6)
Conflicts:
vcl/unx/kde4/KDE4FilePicker.cxx
Change-Id: I5bb651902fb6c1d75af40b78bf32c79b004b7358
commit e029c3535c6c6a1ee01f1f6397abfae2f8c5bb0d
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Wed Feb 19 08:45:05 2014 +0000
Fix minimal VCL menu item height with icons
Don't reset the calculated minimal menu item height to the icon
height, if the minimal height is already larger then the icon height.
Change-Id: Ifcd6c750352c4d3f754a693df7254a4654a8afe6
(cherry picked from commit 56bea42176e5f0b850da0bab410dda560fc89255)
commit a51b25a7931d8f389aa5893d883dabb0dafb8e55
Author: Jan-Marek Glogowski <glo...@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 28c27928687616b81ce70852d9a2bd64301b0445
Author: Jan-Marek Glogowski <glo...@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 af93dfa35b0163241ddb987597bb37ed08128b5e
Author: Maxim Monastirsky <momonas...@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 <glo...@fbihome.de>
Tested-by: Jan-Marek Glogowski <glo...@fbihome.de>
(cherry picked from commit a62a80ac6cc0e337f4ff6d862bccc13c720d41ac)
commit ddc90477e1e399cb890f801269e62f3501199f34
Author: Jan-Marek Glogowski <glo...@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.me...@collabora.com>
Reviewed-by: Thorsten Behrens <t...@documentfoundation.org>
Tested-by: Thorsten Behrens <t...@documentfoundation.org>
(cherry picked from commit 13a34f4c6307d1bd2443cbf3fbd83bfdd8cdbafb)
commit 646332b084005ffd1a79ec5ae1a60dd1e8cd5481
Author: Jan-Marek Glogowski <glo...@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.me...@collabora.com>
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
(cherry picked from commit fa8b5ae8e24fe26de7b26eff8a4a523ab22408fa)
Conflicts:
vcl/unx/kde4/KDE4FilePicker.cxx
vcl/unx/kde4/KDE4FilePicker.hxx
Change-Id: If6ec2d205af5a883df35fddb44a12ac43e3560f0
commit 91500c7adb375182bbe6cb0a44d709c0ee3c163c
Author: Jan-Marek Glogowski <glo...@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 <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit bee6b3e6dad729263d10daf1550826871c57fe05)
commit 218476e69277f09882fd63316593fe15da847c00
Author: Jan-Marek Glogowski <glo...@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 <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
(cherry picked from commit 2e6a17ac88e89d4db8491605ac4dd6ea249b5d01)
commit 3016ebc072273232b77cdb76c8bad53937e2bf53
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue May 20 18:07:54 2014 +0200
fdo#60338: Introduce osl_createDirectoryWithFlags
...so that utl::TempFile can pass osl_File_OpenFlag_Private and doesn't
have to
resort to umask (the calls to umask around Directory::create had somewhat
erroneously been removed recently with
1d72a0262c4570631d0aa8f98e34e21fb9d6ae42
"Related fdo#60338: Create missing temp file dir with user's original
umask,"
mistaking this for creation of intermediate directories in the hierarchy).
On Windows, the flags argument to osl_createDirectoryWithFlags is ignored
completely for now.
(cherry picked from commit f65de4feee506b80be0986ce28f7a2311e4fbe2c)
Conflicts:
include/osl/file.hxx
sal/osl/unx/file_misc.cxx
sal/util/sal.map
Change-Id: Iac56a5049d579be729a3f338aa62105123edb6cb
commit 7fb510c36f4978b8c125f85618664d170db6a981
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon May 19 11:44:24 2014 +0200
fdo#60338: Add osl_File_OpenFlag_Private to avoid umask
(cherry picked from commit f67702e709a9049042fdd456d2456d35055a935d)
Conflicts:
unotools/source/ucbhelper/tempfile.cxx
Change-Id: I293295244d1b089d747548c5025cb73b8ec428a4
commit 6f4c230912801f7cbddf27fce263219975dacdf8
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue May 13 14:33:16 2014 +0200
Related fdo#60338: Create missing temp file dir with user's original umask
For one, that is consistent with how ensuredir (in the same .cxx) has always
worked, and for another saves us from trouble with umask, cf.
034d4c111976f337877e5954c6cc95ed9f90a343 "Related fdo#60338: Setting umask
for
osl::Directory::open is useless."
Change-Id: Ic3fb5bb29ca3031d257067a514cb9f5bccfbfe4f
(cherry picked from commit 1d72a0262c4570631d0aa8f98e34e21fb9d6ae42)
commit fcb3bae5d9f4c2a9eb1c3e6c96f013ce5193cffa
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue May 13 14:29:56 2014 +0200
Related fdo#60338: Setting umask for osl::Directory::open is useless
Maybe 39c58e416252571a04b8ebbb56c9fa012b117993 "INTEGRATION: CWS
olefix: #i46469# use correct umask on unix" had intended to put it around
the
osl::Directory::create call instead, but given the trouble of calling
umask(3)
in a MT program at all, it is probably better to keep creating any missing
directories with the user's original umask anyway.
(cherry picked from commit 034d4c111976f337877e5954c6cc95ed9f90a343)
Conflicts:
unotools/source/ucbhelper/tempfile.cxx
Change-Id: Idfddfdab05373a3c395daba635fddcc054f3f215
commit 6aa4a5a85a1ccc1714a76f4c3c3f008ec3b975e3
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue May 13 14:16:10 2014 +0200
Related fdo#60338: Restrictive open mode flags for tempfile w/o calling
umask
(cherry picked from commit 533237fec4b91fb5f871e0b5028586516dd8c0be)
Conflicts:
sal/osl/unx/file.cxx
sal/osl/unx/file_impl.hxx
sal/osl/unx/tempfile.cxx
Change-Id: Ia83cbe4c9352eb2a2cf317dd1fc5771ddc12c993
commit bbbb77ea4813e29e4e5f611525f7f3dd64bc246a
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue May 13 12:38:55 2014 +0200
Related fdo#60338: do not call umask(3) in a MT program
...and it is unclear what this call was supposed to help for; if a user
deliberately sets its umask too strong, then better live with the
consequences
than to silently "fix" it.
Change-Id: I0d84a7d1bd6f007794a65e1f7cc4ea09ebd9d4af
(cherry picked from commit d62b6d845c75e9c6074d821b425035fbee9c1559)
commit a7e06939e90153884437075cd7d42b6e89dece98
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue May 13 11:39:30 2014 +0200
Related fdo#60338: Do not use umask(3) in a MT program
Change-Id: Ie515201e44ad58faf623a04981e891c0b3f4a19d
(cherry picked from commit 8fd54c107a01f98cf9c731104b0d3eaa2b85bfa4)
commit c64d028bd0f977260a7ed753983281c7269c8695
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Feb 19 21:46:11 2014 +0100
fdo#75118: sw: do not paint zero-width lines
Since commit 6a3fb868b2b8af21f7b6140424b6f8377599a786 zero-width
BorderLinePrimitive2D will actually be painted as hairlines by
VclPixelProcessor2D::tryDrawBorderLinePrimitive2DDirect(), so don't
create such pointless primitives.
(cherry picked from commit 128d3d51c208ec5c37a105ea5c751530bd017d4b)
fdo#75118: actually these are floats, compare with approxEqual
(cherry picked from commit 9fb9fc301502c2762ad4a8059d8d1c818d2843db)
Change-Id: I4c2404b73f106156b83a6d72efa3c8991e5d659e
Reviewed-on: https://gerrit.libreoffice.org/8144
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 1639e174ebb3945f4fda08c30f535f98d3e54d7e)
commit d94adafa6bbfb61864e38940fed2d42f6cf34050
Author: Ulrich Kitzinger <ulk...@hotmail.de>
Date: Fri May 23 09:10:57 2014 +0200
fdo#58187 Expand and Collapse should be virtual
regression from ac7acb0ab1329913b0cec79790adcde0263960be
(cherry picked from commit 6eaad9e41ae95a3d973e72439ef580349e3e8e4b)
Conflicts:
include/svtools/treelistbox.hxx
sw/source/core/uibase/inc/conttree.hxx
Change-Id: I773871f08f43a8abadfc5ef9b641db722deb7d20
commit dffda37f83b8b2d0d51c5de3e2d90a02ec2757fa
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Wed Mar 19 17:15:10 2014 +0100
fdo#75577: Add and use $helppackaddon variable
It was removed by a previous commit, because the code used the wrong,
non-existing variable $helppackpackaddon.
Reviewed-on: https://gerrit.libreoffice.org/8662
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 0a841226089679d2fed752607ce157ad0f5af330)
Conflicts:
solenv/bin/modules/installer/globals.pm
Change-Id: I00ca05ee07585ffd4fbdc75f881749098e6d5329
commit cf436071d857eabd9d815f947673a77809fa97d8
Author: Kohei Yoshida <kohei.yosh...@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 d6cb19cb6590ba8d75889b02b115baceb9f5825b
Author: Kohei Yoshida <kohei.yosh...@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 254e91a465daee42718d3b3fff93afa43a3271dd
Author: Kohei Yoshida <kohei.yosh...@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 24d0f248136e8e442cc3cc087e6889a487aa525a
Author: Jan-Marek Glogowski <glo...@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 <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit 1a12777f46954045afbe8fffa6dd199b4b338762)
Conflicts:
sw/inc/dbmgr.hxx
sw/source/ui/inc/unomailmerge.hxx
Change-Id: I007cc23fdf04ccfca7d3cd6180b0e17e99f53061
commit dbb1d7c5603affbf65b84077f02450f1be9f9c6d
Author: Jan-Marek Glogowski <glo...@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 <mst...@redhat.com>
Reviewed-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit 8d11531565d746dd6a7938c4f3536ad34698092d)
Conflicts:
sw/source/ui/dbui/dbmgr.cxx
Change-Id: I6929ba371f81c3ea1f26ea3a25e7751bc53256e3
commit 43d96f279a8f7626bcc145ff1938d02f85ff0791
Author: Jan-Marek Glogowski <glo...@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 <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit 5da974369d01760b336de34e68c03d7268d2d330)
Conflicts:
sw/source/ui/dbui/dbmgr.cxx
Change-Id: Iba688ed0fb40c0c3947da1b21beb00c67a10ff09
commit 671482310c3b6de4df8757618192d57a93d25ae4
Author: Jan-Marek Glogowski <glo...@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 <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit e3e6ad0e5c36531d8002c24c5e41a99ff597c095)
Conflicts:
sw/inc/dbmgr.hxx
Change-Id: Ic8c52e6171f122d3837d9f2de81053e30ac8f5b7
commit 16804430f4f768b4ad6a583c23ff2223d27d6ca9
Author: Jan-Marek Glogowski <glo...@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 <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit a5504e49dba07f7217ad3c0980d8c0f21f9f646c)
Conflicts:
sw/source/ui/uno/unomailmerge.cxx
Change-Id: I7317deae43abf6a9e865c66969cb39a4b69de826
commit 769446699d4e4d9293ff299fdad60f52b4c7b459
Author: Ulrich Kitzinger <ulk...@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 <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 2f2d9e3799d041381565ac1ef6e7a8c8a065871b)
commit ffe6d484fb90e047fd144384cc460f7c2535bd7b
Author: Michael Stahl <mst...@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 dd8f831e494542aa24b4963bc88008a424fe8ccd
Author: Michael Stahl <mst...@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 cfdc049f9840c25a76ab3904979f7e01355690a1
Author: Michael Stahl <mst...@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 f089aac5001cb9d3c0b1a7531009d7a879c64c96
Author: Stephan Bergmann <sberg...@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 2575e207b2ffdc28a45aa85697eca3b2fcecc2d7
Author: Jan-Marek Glogowski <glo...@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.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
(cherry picked from commit 13a8fac05425f9d66c643f25faa49c1f17c62474)
Conflicts:
sw/source/core/layout/newfrm.cxx
Change-Id: Ia779705cfb107383341f946542d28434c986591a
commit 1884c1a1585dbd2f0d2dab78c83da5acb26cf61c
Author: Jan Holesovsky <ke...@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 a249a794b81814edf5c48ad4e0c38e2bf36ea5a2
Author: Jan Holesovsky <ke...@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 8aa5c54028512f940774fce6e1a2c349ee1c2fc1
Author: Adam Co <rattles2...@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 5934a5a523b0be090a934902816ccd0f968dd12a
Author: Eilidh McAdam <eil...@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 <er...@redhat.com>
Reviewed-by: Eike Rathke <er...@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 5ca0de83d0ef05444a27551683fd4afa3a9c82ce
Author: Pierre-Eric Pelloux-Prayer <pierre-e...@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 <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit eb42610c43b1011cde0af8b03d20ec70e4e789b5)
Conflicts:
sw/inc/swabstdlg.hxx
sw/source/ui/dialog/swdlgfact.cxx
Change-Id: I9e132a109cba3127b934a3baecbf445a2bde1377
commit 3377861c738060a9c28f5f0d5971ffcf6988aebd
Author: Pierre-Eric Pelloux-Prayer <pierre-e...@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 <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 4e0656ac0bc5be3306ad016a1a494577ad2ef8b8)
commit 1d97a3abb178833207ae304cf183edd8fd436b5c
Author: Pierre-Eric Pelloux-Prayer <pierre-e...@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 <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 788fa63351c00bce83b485fa1725e36a57336ab3)
commit 62c90d33f29aa7b4977b575c36c0c2ce1a6f6757
Author: Pierre-Eric Pelloux-Prayer <pierre-e...@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 <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit a4688cde5b7295ca5f5f1ff2fc6e615139c467cf)
commit 24d786fc245965929396af8a09989c8037e1f935
Author: Pierre-Eric Pelloux-Prayer <pierre-e...@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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
