New branch 'private/jmux/libreoffice-4-1-6+all' available with the following
commits:
commit 32fbf5475594c22005f2e39d1f03e16def4d038b
Merge: ae4406f 0da5615
Author: Christoph Lutz <christoph.lutz...@cib.de>
Date: Wed Apr 8 17:08:32 2015 +0000
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into
private/jmux/libreoffice-4-1-6+all
commit 0da561509c5fd5f359e7e0694cdf644b5cbb592e
Author: Christoph Lutz <christoph.lutz...@cib.de>
Date: Wed Apr 8 14:57:28 2015 +0000
MM: fixed invalid UNO-Reference as return value of UNO MailMergeService
This fix is regarding 9835bb562 "MM: export the SwDocShell mail merge via
UNO":
In case of using the new output type MailMergeType.SHELL, the UNO
MailMergeService returned a XTextDocument instance that was not
correctly initialized. In particular after calling
doc.getCurrentController()
(with doc = the returned instance) we recieved NULL. The reason was, that
the
previous implementation used to create a new SwXTextDocument instance
instead of just returning the BaseModel that is already associated with
the internal SwDocShell. This is fixed in this patch.
I also tested this patch with the unit test sw/CppunitTest_sw_mailmerge
and everything seems to be fine now. doc.getCurrentController() no longer
returns NULL.
Change-Id: Ic116f8f25ab9686ef56950e97ba202a55ab81fb8
Reviewed-on: https://gerrit.libreoffice.org/15207
Tested-by: Michael Stahl <mst...@redhat.com>
Reviewed-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit 098d08d6af951afa4f20f6f7883f6c9d34e87e11)
Conflicts:
sw/source/uibase/uno/unomailmerge.cxx
commit ae4406f7c5fdebfbee49e2bba1c4b321f140dbb9
Merge: 3c39430 743966c
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Wed Mar 25 14:18:57 2015 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into
private/jmux/libreoffice-4-1-6+all
commit 3c394300cffe07a850e41047edf374d6fcc5bb65
Merge: 1880810 6a568ab
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Mon Feb 23 14:37:31 2015 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into
private/jmux/libreoffice-4-1-6+all
commit 1880810b68a872476f3c63eb9563e7b9a7dc0c0a
Merge: 1c40ae1 75055ee
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Wed Feb 18 18:36:59 2015 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into
private/jmux/libreoffice-4-1-6+all
commit 1c40ae183a895325b7e9473efdac83f4c62ef00d
Merge: 9d31c1e 7bdab66
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Feb 17 11:26:25 2015 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+lhm' into
private/jmux/libreoffice-4-1-6+all
commit 7bdab66a4b413a586c9780248687ea213f88c0aa
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Feb 17 11:25:23 2015 +0100
Update translations
Change-Id: Ie34c9be2159ae64e18776a27de8e2f791e51d1d3
commit 9d31c1e5857ebdf56da328be4af954237a702c9d
Merge: 6a34fb0 a0fbb74
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Feb 17 11:02:48 2015 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into
private/jmux/libreoffice-4-1-6+all
commit 6a34fb0fa12dcbe7dcc71bb973637a25a638c3b5
Merge: c92aa54 b30fb95
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Mon Feb 16 13:07:15 2015 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into
private/jmux/libreoffice-4-1-6+all
commit c92aa542a0a52519cdcc7c6a478574670e9e4325
Merge: 2e585b0 936ab16
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Mon Feb 2 17:19:28 2015 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into
private/jmux/libreoffice-4-1-6+all
commit 2e585b05bf3c667eb638b3e57ae1b8504cf1f789
Author: Andras Timar <andras.ti...@collabora.com>
Date: Tue Jun 10 22:30:07 2014 +0200
openssl-0.9.8za -- fixes multiple CVEs
Change-Id: Id4a2d2af49518317511da194a582d3bb18c346f7
(cherry picked from commit 2f926a476b73a7c06a4579f422a4458ac3e789a1)
commit 5121a992d9db9b253757d1129ef898f77ee1b34d
Merge: 3413bc7 e7a5986
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Fri Dec 12 16:43:48 2014 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+build' into
private/jmux/libreoffice-4-1-6+all-new2
commit 3413bc771307dceec16ce43df56faa4ebbac1213
Merge: 8f93a73 ec45c7a
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Fri Dec 12 16:43:40 2014 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+lhm' into
private/jmux/libreoffice-4-1-6+all-new2
commit 8f93a737f358acf20ad63e33a5fa490f05f27a84
Merge: 505f1c9 f604b7a
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Fri Dec 12 16:43:26 2014 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+sorted-vectors' into
private/jmux/libreoffice-4-1-6+all-new2
commit 505f1c9ad4d02d59f44ec72c88b8d2a90db21f28
Merge: 8d1f528 1db2b31
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Fri Dec 12 16:43:06 2014 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into
private/jmux/libreoffice-4-1-6+all-new2
commit e7a5986c377be2f8b780456b6bf8b1b831bfa269
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Wed Nov 19 12:47:22 2014 +0100
Adapt (Jenkins) build script
Windows
-------
* Build multiple languages (same a linux)
* Force disabling of ccache
* Save external downloads to /cygdrive/c/sources/lo-external
Linux
-----
* Use system libldap
* Use system libpng
* Save external downloads to "$HOME/lo-external"
All
---
* Use JUnit
For whatever reasons the impress unit tests on Windows fail with
pre-compiled headers (PCH) enabled.
Change-Id: I7a125b0e5835a9a121f53dd03f022e0628905875
commit 81898e1a4c04a74903b1a155c4a0eaa4882dc059
Author: Ignaz Forster <ignaz.fors...@muenchen.de>
Date: Wed Jul 30 12:47:58 2014 +0200
Change submodules location to old new name
Change-Id: I62d1aa75330a134014809d04851f5172f73b0ff8
commit 02c973bdf3bdd2e816c31b04cc428b967b468e8f
Author: Florian Haftmann <florian.haftm...@muenchen.de>
Date: Mon Jun 30 16:12:25 2014 +0200
proper relative submodule paths
commit 4267230bf586da3e127bf0c767091cbaf1373468
Author: Florian Haftmann <florian.haftm...@muenchen.de>
Date: Mon Jun 30 13:29:11 2014 +0200
official locations for submodules
commit a9705ede5f31a95cbc834b37760f9c8f1467138d
Author: Ulrich Kitzinger <ulk...@hotmail.de>
Date: Thu Jun 5 08:58:53 2014 +0200
Submodule auf Branch libreoffice-lhm-416 gesetzt
Change-Id: I106c5575b79d60615bf1502acef9f0958afbf11b
commit ea3ce05abc7d0c22654a5c64077243b61cfcb119
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Thu Jan 30 09:18:40 2014 +0100
Branches von Submodulen auf libreoffice-lhm-41 gesetzt
commit be6930be115fefe4e466787ec779098a68b84d9b
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Tue Jan 28 16:20:48 2014 +0100
In Git die Submodule geändert
commit 9834d459de8212352cb697b58c771d51484e7404
Author: Florian Haftmann <florian.haftm...@muenchen.de>
Date: Fri Aug 8 11:36:05 2014 +0200
restrict to single language on windows, where multi language support has
been reported to make problems
commit f081c55a352b6162c3d17ed0a1da3e7e757109f7
Author: Florian Haftmann <florian.haftm...@muenchen.de>
Date: Fri Aug 8 11:32:41 2014 +0200
downgrade required by windows build
commit e1f6e71fa0d527bd169591aafc4b3b99f7cf6db9
Author: Florian Haftmann <florian.haftm...@muenchen.de>
Date: Fri Aug 8 11:31:32 2014 +0200
factored out common option
commit d00da440f76e89d100000e60aa57aecff340b761
Author: Florian Haftmann <florian.haftm...@muenchen.de>
Date: Fri Aug 8 11:31:03 2014 +0200
formal reorganisation of options
commit a8bcd3db764597b74066bc6c8a6ae1dcc841ae57
Author: Florian Haftmann <florian.haftm...@muenchen.de>
Date: Thu Aug 7 16:02:23 2014 +0200
make 5afde3a0f81bb6704a162de8de766b25d43bac78 really effective
commit 2aea65d2fb2f5a157d7f21ef7cb5064b9f9b386d
Author: Florian Haftmann <florian.haftm...@muenchen.de>
Date: Tue Aug 5 17:17:47 2014 +0200
modernized windows settings
commit ced4df11d0dc24598167de8e4215bd8391e08499
Author: Florian Haftmann <florian.haftm...@muenchen.de>
Date: Tue Aug 5 17:12:58 2014 +0200
factored out common version
commit b294619f22763c3b9868d6d48ac309c01d954072
Author: Florian Haftmann <florian.haftm...@muenchen.de>
Date: Tue Aug 5 17:07:40 2014 +0200
accumulation of configure options
commit ef93d00c24ab0a0ea40a849f87b278305596f2ca
Author: Florian Haftmann <florian.haftm...@muenchen.de>
Date: Tue Aug 5 17:04:40 2014 +0200
more uniform apperance of options, with slight unification
commit ce34965cf813f760822902058bcb701851d477cd
Author: Florian Haftmann <florian.haftm...@muenchen.de>
Date: Tue Aug 5 17:02:38 2014 +0200
lexical sorting of options
commit 94411ec6bea74308f7c559ede65f941531d898e6
Author: Florian Haftmann <florian.haftm...@muenchen.de>
Date: Tue Aug 5 16:58:08 2014 +0200
tuned whitespace
commit d17c97455a1d9031fff77f5370a42691198de266
Author: Florian Haftmann <florian.haftm...@muenchen.de>
Date: Tue Aug 5 16:55:57 2014 +0200
dropped dead code
commit bf29d3abbd23964fa15483658016e4b6ca3fd4dd
Author: Ignaz Forster <ignaz.fors...@muenchen.de>
Date: Wed Jul 30 15:37:26 2014 +0200
Remove special handling of -ure- package
Change-Id: I22e8146c42f8e7e764377cfce4ef02fee6d976e7
commit 0aaab94b4529e26297622770eaae396db60d2f17
Author: Florian Haftmann <florian.haftm...@muenchen.de>
Date: Fri Jun 13 12:55:26 2014 +0200
recovered adjustment for windows from branch libreoffice-lhm-41
commit d449ee168a9d5a19a018023c76825c102e8a7f8a
Author: Florian Haftmann <florian.haftm...@muenchen.de>
Date: Fri Jun 13 12:36:55 2014 +0200
obsolete
commit f10ad8216e242567177dcc23660b59666164e84e
Author: Ulrich Kitzinger <ulk...@hotmail.de>
Date: Fri Jun 6 14:56:53 2014 +0200
patch-office-debs.sh-Skript an 4.1.6 angepasst
commit 915ffaa0ac4ef8dd76a16cd98ed4240aa3515bd8
Author: Felix Geyer <felix.ge...@dev-volker.tvc.muenchen.de>
Date: Wed Apr 9 14:19:32 2014 +0200
Create libreoffice-<APP>.png symlinks.
This is needed so the window icon is correctly displayed.
TRAC: #12093
Change-Id: If5cddb9da1d5187f774ec8a14cfbefee3ea80aa3
commit c437b43c9f0e07e979f7839168d89fcd0aa27181
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Wed Mar 12 15:40:16 2014 +0100
Template-Pfad wird vorkonfiguriert (Trac 11902)
Change-Id: I849ba05f96dd34fc74e7d8f34c5c3cc192dfdc8a
commit 0d4dcf30d99eee35c69126ad622c93ca1dcab2f0
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Thu Jan 9 12:37:26 2014 +0100
Ãnderungen am Build-Skript und Abhängigkeiten für Windows-Build
commit 4d0098e64d58b1073aeb1a23267cd44544aada51
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Wed Jan 8 14:17:13 2014 +0100
Im Skript patchoffice-debs Source von ooo-orig auf lo-orig geändert
Change-Id: I9ef23dfd4ee5619b5e3030b8e8697bc6b0cd34a6
commit 294f36a377be7b1f07f6e34fb74447a045ed4f01
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Wed Jan 8 11:31:10 2014 +0100
Build-Skript unterscheidet wieder zwischen kde und kde4
Change-Id: I015a4d4d1b2af1b4c2e3bcbab8ad546a13d367e6
commit ea50aef9da94c9844b6e1b4b283d292dd11c6b6b
Author: Ignaz Forster <ignaz.fors...@muenchen.de>
Date: Fri Dec 6 16:32:51 2013 +0100
Bugfix: Don't move upload dir
The modified .deb files are referenced as links in the uploads dir, so don't
move it away...
commit 2b5fe385d4965a1b5a72b8ec6eee2fd1b39427c1
Author: Ignaz Forster <ignaz.fors...@muenchen.de>
Date: Fri Dec 6 14:08:27 2013 +0100
Bugfix: Move "cd" to correct position
commit 2dab65c106ad34a88153f9f644ab4538a8b53f9c
Author: Ignaz Forster <ignaz.fors...@muenchen.de>
Date: Fri Dec 6 10:23:35 2013 +0100
genchanges-lo.sh Hinzugefügt
Dieses Skript erstellt die für den Repository-Upload benötigten .orig und
.changes Dateien und wird aus dem Jenkins-Build heraus aufgerufen.
commit 45950fe074ae567d2647ae20aa4967418253e76b
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Wed Dec 4 17:46:24 2013 +0100
patch-office-debs funktioniert zu gut, Open-Symbol Paket ist noch nicht da
=> auskommentiert
commit bce991c8893687f9f0c208e6feccff40e4acef9b
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Tue Dec 3 15:41:38 2013 +0100
patch-office-Skript nochmal angepasst
commit ea8cbe4dffa4efb4c08c0d3c2dcaed71643643d3
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Tue Dec 3 14:50:06 2013 +0100
patch-office-debs angepasst um tmp-Pfad zu setzen
commit 56f58b980fc446c75da58a36ce5fbe4cc8b972b6
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Thu Nov 21 16:38:57 2013 +0100
Build-Skript um Hilfe ergänzt
commit 7487bb4cae2dff6dfe2425c4b060edc50d5e0278
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Fri Nov 15 13:52:43 2013 +0100
patch-office-debs.sh: Variable hinzugefügt
commit 9e437442b084554caf86dda3ae2d5110632e238d
Author: Simona Loi <simona.loi@>
Date: Wed Nov 13 14:51:46 2013 +0100
added function patch-tmp-path in patch-office-debs.sh
commit 4d640bd636c6ba57e9e8da487715ca9f35c712bf
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Fri Nov 8 09:47:40 2013 +0100
Build- und patch-office-Skripte hinzugefügt
commit ec45c7acab7c68b5798590f71f1358eda22252df
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Thu Sep 25 18:14:47 2014 +0200
i#101283 Fix collapsed bookmark handling
Correctly position the insert cursor in the case of a collapsed
bookmark.
Change-Id: I46707ab0e019aec1050864c9cb404a834e9a67fe
commit 4c298d6cb928ce1aaab2e6f7880de78f4eeed4b9
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Wed Sep 10 14:56:25 2014 +0200
fdo#83753: consider JAVA_HOME and PATH when selecting JRE
adapted algorithm that selects the Java runtime to be used so that
Java installations associated with the JAVA_HOME and PATH
environment variables are preferred over others
Java installations are now analysed in the following order:
* installation that the JAVA_HOME environment
variable refers to (if it is set)
* Java installations in PATH
* other Java installation (algorithm that was used before)
Change-Id: I3a3ade25322def0c0432b369848f13a6b82034a1
Conflicts:
include/jvmfwk/framework.h
jvmfwk/source/framework.cxx
commit 3462867e4dcd39dc205fac210c8b9ad9483b5210
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Thu Aug 21 10:42:07 2014 +0200
fdo75996 Check search result for bookmark undo
This is quite probably not the correct fix, but it - at least -
stops LO from crashing when undoing bookmark changes.
Has to be tested to ensure LO actually correctly undoes the
bookmark change.
Change-Id: Id482943161079cf8a09799da9e67f4f4f4efb7e0
commit 7ef0fb915a157f4ab361430c2df553d9bb828c96
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Wed Aug 20 12:59:09 2014 +0200
Update to latest translations
Change-Id: I24d7d98ea52c930beb4c6b387414341439f34f19
commit cf644323043d5439b350371965d5cdffb82c9bf7
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Wed Apr 16 16:04:19 2014 +0200
Patch von Lanedo für #11826 integriert.
Change-Id: Ic0e2306bfa8e943220d2d23177c241169c94a790
commit 22a99b059a0d7655e74b65441c706102be8d6896
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Mon Mar 17 15:13:14 2014 +0100
Auswahl von PapiergröÃe und -orientierung deaktiviert (Trac #11826)
Change-Id: If327010c6b2e88d5d638df5ce502e94f99355141
commit 76d02d660afe98b0ed1524eca1d8ade69ce60adc
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Thu Feb 27 18:15:06 2014 +0100
Zugriff auf static Variable synchronisiert (Trac 11400)
Change-Id: I623650afee10cc60b49067f4efbdc889b58007dc
commit c94c3de02601ec0ce8d5e736a08e6329908d67ca
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Thu Feb 13 15:12:42 2014 +0100
unopkg beschwert sich: 'unopkg: 69: [: =: unexpected operator'
Change-Id: I189eb1e44b3d31a30d1451ed8d6048f1bba285d7
commit 582fb01f213f6f99cc87a29d6be5ad1623315469
Author: Noel Power <noel.po...@suse.com>
Date: Mon Feb 3 11:04:10 2014 +0000
Revert "fix Worksheet.Cells by now allowing TableSheet..." fdo#70079
This reverts commit 70aff4a7f7abe0c768238733ca8900b746e60189.
Change-Id: I8f8b423353ae1a825be91bd94308e87844948525
Signed-off-by: Noel Power <noel.po...@suse.com>
commit 5570a926b4ca72d99ea518552d14ef06538a930c
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Thu Jan 9 12:37:26 2014 +0100
Ãnderungen am Build-Skript und Abhängigkeiten für Windows-Build
commit 7a440a444c0d055f227df7a9e1b7db330f56fa40
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Wed Jan 8 13:26:38 2014 +0100
Kde3-Pfade angepasst
Change-Id: Iafcd5ce09e9c700163d26110523211b273fb9d81
commit af3918aebd881a15ce614d775f0330c66a2b8a0c
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Tue Nov 12 14:18:37 2013 +0100
Dialog 'Es ist kein Standarddrucker ausgewaehlt' unterdruecken
commit fcb38c6c6aec8552d189e0be7f99af9f71a3ba83
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Tue Nov 12 11:22:23 2013 +0100
Noch ein Compilefehler
commit 437eba28048a5f74f46b802371233c70926cf704
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Mon Nov 11 17:57:42 2013 +0100
Fix für AO Bug 74651
commit de9dd81f3c772afb28e9208d02d363a5cd1d3912
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Fri Nov 8 12:52:01 2013 +0100
In Paths.xcu Temp-Pfad angepasst
commit 1637281fac1951f5ba14524683231ac4ef898894
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Fri Nov 8 11:52:37 2013 +0100
unopkg-Sript setzt Root-profil, wegen Trac #11013
commit 0bf0a12873d2a7b59f26a0f44f13ee062342088a
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Fri Nov 8 11:48:31 2013 +0100
Update-Button im Extension-Manager disabled
commit 841ce3da9a9adc7d9ba8c3772c416cbfc5846e33
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Fri Nov 8 11:26:06 2013 +0100
Ãnderung für Ãbernahme von Mail-Adressen aus Link, Trac #4335
commit 3373f6ca0583e8c973115e57f1106c9656741d1f
Author: Limux <li...@muenchen.de>
Date: Fri Sep 7 13:01:58 2012 +0200
ExtensionUpdateURL empty
Update-URL für Extensions auf Leerstring gesetzt.
Change-Id: I136c53baffdd84ad10c644fc304d8b7a60df3b99
commit b002226b5c9a970960de39be535e97e861860866
Author: Jan-Marek Glogowski <glo...@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 df99eedf567d80bb52842114fc5c43c1906c3463
Author: Ulrich Kitzinger <ulrich.kitzin...@muenchen.de>
Date: Mon Dec 16 21:17:49 2013 +0100
Add sub-menu to open templates.
Change-Id: I8039419b3a4a41321f00d24ce80366a42cff171d
commit eea94337c247f1044d13329c07ba05fb18be3322
Author: Jan-Marek Glogowski <glo...@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 f604b7a7f98f20d2366b9b5a750374a59433f3e4
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jun 10 12:32:32 2014 +0200
Optimize lcl_GetUniqueFlyName
(cherry picked from commit 403b074a707b2f13e8fb814f537ffb08d7f9b3ed)
Conflicts:
sw/source/core/doc/docfmt.cxx
sw/source/core/doc/doclay.cxx
Change-Id: Ic894ee471982496ac82dc426c803aba92b8554c2
commit 982b25ffe4d9f32bfed0187278a0a26a5a7e1632
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jun 10 11:40:43 2014 +0200
Optimize FindFlyByName
(cherry picked from commit 695c52c7a7dba92ae2129c520c53b2055e948f8d)
Conflicts:
sw/source/core/doc/doclay.cxx
Change-Id: I004226f8aded4e7909a104ec0ba405223f2d7e0e
commit c891dfba7544cb4f936b1e9f2c0d0303c2524a99
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Sun Jun 8 19:41:53 2014 +0200
Convert SwFrmFmts to a o3tl::sorted_vector
(cherry picked from commit ec88c524a764b89c034d9347926ba903d6a24402)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I6ca87d3dd9a3b7067380bb7ebaef306b87516dfb
commit b4ba309d99f5a0ec4f3fdcaaccaf43b970c8bfe0
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Sun Jun 8 01:59:29 2014 +0200
Change SwFrmFmts to o3tl::sorted_vector like API
This changes the SwFrmFmts class std::vector inheritance to private
and extends the class to a o3tl::sorted_vector compatible API.
This should just be a cleanup patch and is a preparation for the
change of SwFrmFmts from vector to o3tl::sorted_vector.
For simple list cases, this also adds a SwFrmFmtsV, a std::vector
version of SwFrmFmts.
(cherry picked from commit 1eee8d38ee5107ff6c3aaa2583854a88c1e8bb0e)
Conflicts:
sw/inc/format.hxx
sw/inc/frmfmt.hxx
sw/source/core/doc/CntntIdxStore.cxx
sw/source/core/doc/DocumentLinksAdministrationManager.cxx
sw/source/core/doc/docnew.cxx
sw/source/core/doc/textboxhelper.cxx
sw/source/core/layout/atrfrm.cxx
sw/source/filter/basflt/shellio.cxx
Change-Id: I2e91cb4d650b1c46c531885869d201edba84e5a6
commit 973258dfd41f6226f7b3fb7083c36bbd8c31c19a
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Sun Jun 8 01:57:54 2014 +0200
Add sorted vector special case for delete all
Specializes DeleteAndDestroyAll() to optionally keep the default
item.
Change-Id: I570fc6614a59fcf08c4569d44873ed79f4af5eda
(cherry picked from commit f4efc9051a25f52ed218c515dc8c5a75f54c8fbd)
commit 53eeb6a0ae256f69a40eb49a0bd619955fcc0a64
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Thu May 22 14:25:32 2014 +0200
Merge common code of sw format lists
Moves the common code into an intermediate template class, which
still provides an SwFmtsBase interface.
The only changes are some dropped explicit "const" casts.
(cherry picked from commit 146439e1167c8dd4edd245b9b100af4b5442158d)
Conflicts:
sw/inc/docary.hxx
sw/source/core/docnode/section.cxx
sw/source/core/tox/tox.cxx
Change-Id: I8894fbc53e7b1ac1b1e590bba932a9f9cc33f448
commit dc1212e036d7b1db61cde93623bfb78927cbb4d6
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Mon Jun 2 17:46:39 2014 +0200
Optimize AppendAllObjs for vectors
Removing items from large vectors, especially from the front, is
very expensive. For a large mail merge job it took most of the time
to memmove the descending vector items.
Instead of remove, this simply overwrites the current with the last
element.
Change-Id: I12395388f4e315009602984acb443382fcce9f44
(cherry picked from commit a196a7575c48aaf6b5904565e18d31eacc80c855)
commit 5039393f717da2e927b51cb536ee5d6c24dfaaa2
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Fri Jun 6 09:44:34 2014 +0200
Directly convert frame name tails to Int32
This is a little optimization for large mail merge jobs with many
frames. The current alorithm doesn't only try to produce unique but
also reasonable names for the frames.
Per se the algorithm is horrible ineffective for large numbers of
frames, but this is impossible to fix without changing the
underlying vector of frames to a sorted one to find and check just
the correctly prefixed frames.
This patch directly converts the frame names tail instead of
creating substring of the number tail, which saves billions of
malloc and free calls seen with my sample document.
(cherry picked from commit 5f6db9260ec42a040a4ce21e93af2f1e18746fe6)
Conflicts:
sw/source/core/doc/doclay.cxx
Change-Id: Iefdee4053480f40f106c49867bc5a64ec207ba1b
commit 2db7feefb9d0d3af12b2f898a2e0e7054c2410ad
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Fri May 16 23:42:32 2014 +0200
Convert SwPageDescs to a o3tl::sorted_vector
Originally I planned to use a boost::container::flat_map, but there
seem to be no way to directly access the indexed vector.
And since this already needs the "first item is default" special
handling, o3tl::sorted_vector is used with the offset.
Change-Id: Idfb79af8ddfd5f5e2e6ca312b46d30e3ddc166d9
(cherry picked from commit 014cb3c9598f10bd316a7df8aa1e66ddb20b9b5e)
commit 7aa88604e3d4f66f2223b19a9bed25334ce1aad1
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jul 22 12:45:47 2014 +0200
Fix broken sorted vector usage
Fixes and optimizes a few places, which will fail in case of the
sorted_vector conversation.
This drops a simple optimization from the ww8 filter. I'm not
sure it's worth to memorize and just update the new styles.
(cherry picked from commit a5ff456973e97508f6c926ec889dea2f9b4fe666)
Conflicts:
sw/inc/fesh.hxx
sw/source/core/frmedt/fedesc.cxx
sw/source/filter/inc/fltshell.hxx
sw/source/filter/ww1/fltshell.cxx
sw/source/filter/ww8/rtfexport.cxx
sw/source/uibase/app/appenv.cxx
Change-Id: I7a444013f59e81c81049cd40b9d9cfa0e29623c0
commit 03e2a6ee6c2ac556b4f196a39135de2d6569f361
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Wed May 14 15:03:53 2014 +0200
Optimize SwPageDesc lookup by pool ID
There are just ten default page pool style IDs.
So instead of walking the whole style list to find the matching
style ID, this introduces an additional index / array for faster
lookup.
(cherry picked from commit 3cd2f4c974f9119e920a75a00d194641c2808c94)
Conflicts:
sw/source/core/doc/docdesc.cxx
sw/source/core/doc/poolfmt.cxx
sw/source/core/layout/pagedesc.cxx
sw/source/filter/html/htmlcss1.cxx
Change-Id: Iacfa40c76e5502dc90665be0a96388de50d5ec16
commit f8202145464c7dbb3758e780dee038582d54ac01
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jul 22 13:01:36 2014 +0200
Drop local FindPageDescByName implementations
There are quite some place, which manually walk the vector of
SwPageDesc to find the named item. Replace all of them.
(cherry picked from commit feb3b0c0b1d7fe2cce55954895a8f7cdccc61605)
Conflicts:
sw/source/core/doc/docfmt.cxx
sw/source/core/unocore/unosett.cxx
sw/source/core/unocore/unostyle.cxx
Change-Id: I7ade35b78d8208dc00ee56a8f83c3ebadaebb8af
commit f806f27dd6d7fae8cf723b0a6a815f64cf2ffd8b
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jul 22 12:39:51 2014 +0200
Introduce SwDoc::DelPageDescP and ChgPageDescP
Variants of DelPageDesc and ChgPageDesc, which work with the
SwPageDesc pointers instead of the names.
This moves all the code from the "name" to the "pointer" functions
and just adds a FindPageDescByName to the old functions before
calling the pointer variants.
(cherry picked from commit 41f386877a4c71295c3264720cbefd51d9bb7266)
Conflicts:
sw/inc/doc.hxx
sw/source/core/doc/docdesc.cxx
Change-Id: Ife03986ec2a3897273edd64b8136474441b6b771
commit a06e9c3e9924b83b0414348057ece5f1892d8f17
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jul 15 19:28:17 2014 +0200
Rename SwDoc::FindPageDesc to FindPageDescByName
Both functions were consolidated in
commit c1be76ec98cb465e07df961843134147100beaa9
Now re-rename it to introduce FindPageDescByPoolId later.
(cherry picked from commit 3a696e7af2ed8bef1cc2be9a731fe2bd92e87aa7)
Conflicts:
sw/source/core/layout/pagedesc.cxx
sw/source/core/unocore/unostyle.cxx
sw/source/filter/ww8/rtfexport.cxx
sw/source/uibase/app/docstyle.cxx
Change-Id: I6b96b322eb133615e3a2c692fb7f655d6f22fc8f
commit d5e2372812473067696dac081c4c7d8471fbe297
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Mon May 12 16:00:02 2014 +0200
Change SwPageDescs to o3tl::sorted_vector like API
This moves the SwPageDescs class to pagedesc.hxx, changes the
std::vector inheritance to private and extends the class to a
o3tl::sorted_vector compatible API.
The insert internally still uses push_back.
This should just be a cleanup patch and is a preparation for the
change of SwPageDescs from vector to o3tl::sorted_vector.
(cherry picked from commit 07cc52be8746eff7e77cb31f507fe0a847157f82)
Conflicts:
sw/inc/doc.hxx
sw/inc/pagedesc.hxx
sw/source/core/doc/docdesc.cxx
sw/source/core/layout/pagedesc.cxx
Change-Id: I08561c139d1af9bad6ca68be27466fac33fab384
commit 5ac1bf85763a957c043aace76ce2be92bfdaf7eb
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Mon May 12 10:20:00 2014 +0200
Sorted vector special case: default first element
A lot of code using vectors in LO relies on the fact, that the
first entry in the vector contains the default value.
Therefore this adds a boolean to the constructor, which leaves
the first entry unsorted in the vector and special cases find
and insert.
Additionally lower_bound, upper_bound and Resort will skip
the first element.
Change-Id: I9603f47be4fb56d991f42066ce9f5ad0ab6ffdf8
(cherry picked from commit 3f1c34cd231bcb7067ccb0d4e64d5ab5cdab4879)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
