[Libreoffice-commits] core.git: Changes to 'private/jmux/libreoffice-4-1-6+all-no-merge'
Ignaz Forster
ignaz.forster at muenchen.de
Mon Oct 6 01:56:16 PDT 2014
New branch 'private/jmux/libreoffice-4-1-6+all-no-merge' available with the following commits:
commit 37b9f9a86378c8cec2c06fda8be87af1b9b79a3f
Author: Ignaz Forster <ignaz.forster at muenchen.de>
Date: Wed Jul 30 12:47:58 2014 +0200
Change submodules location to old new name
Change-Id: I62d1aa75330a134014809d04851f5172f73b0ff8
commit 0f631f2a0bffd7096940bfd8d456129bc3bfb25d
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Mon Jun 30 16:12:25 2014 +0200
proper relative submodule paths
commit 7964aa2c72a649981d7891f2165c11d665adc62b
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Mon Jun 30 13:29:11 2014 +0200
official locations for submodules
commit aae1bee2936dd6173d379e59ad6c8768af773a3b
Author: Ulrich Kitzinger <ulkitz at hotmail.de>
Date: Thu Jun 5 08:58:53 2014 +0200
Submodule auf Branch libreoffice-lhm-416 gesetzt
Change-Id: I106c5575b79d60615bf1502acef9f0958afbf11b
commit b2e2bc6cf9ba9a6a92d2c5ecec35acedb11c0058
Author: Ulrich Kitzinger <ulrich.kitzinger at muenchen.de>
Date: Thu Jan 30 09:18:40 2014 +0100
Branches von Submodulen auf libreoffice-lhm-41 gesetzt
commit 1996acce741fc6e5b7754ef731c2be30106ba9fc
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Tue Jan 28 16:20:48 2014 +0100
In Git die Submodule geändert
commit 080efa6ea51ce3d73909c48921e7af2716e15c30
Author: Florian Haftmann <florian.haftmann at 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 e060f738da695f0c999f1b9cfb680f963fcdf924
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Fri Aug 8 11:32:41 2014 +0200
downgrade required by windows build
commit a40de75b0b58813c0b9304d312b7a2d3e2a0285e
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Fri Aug 8 11:31:32 2014 +0200
factored out common option
commit b5a2f42bb4696e79e388c096520cbfdaa0d0a31b
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Fri Aug 8 11:31:03 2014 +0200
formal reorganisation of options
commit cfde7e835d3b213e01c2dd371ee320d51c32227c
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Thu Aug 7 16:02:23 2014 +0200
make 5afde3a0f81bb6704a162de8de766b25d43bac78 really effective
commit 98991f9ca419c6c76240d9a506c3fa19ebbd5122
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Tue Aug 5 17:17:47 2014 +0200
modernized windows settings
commit f127979a6845bda469301b92bfbdb54adca6e5b3
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Tue Aug 5 17:12:58 2014 +0200
factored out common version
commit 534a2c004e2112a61d608489cd214a1593c59261
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Tue Aug 5 17:07:40 2014 +0200
accumulation of configure options
commit 0e63242a18fb71365a3ed24454d0376937b72721
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Tue Aug 5 17:04:40 2014 +0200
more uniform apperance of options, with slight unification
commit 1b151d4f1781db66f5cde7ef9ac403a37db93c1f
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Tue Aug 5 17:02:38 2014 +0200
lexical sorting of options
commit 5a54288940809b4fabcaf36dd5cdcc9fab70e275
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Tue Aug 5 16:58:08 2014 +0200
tuned whitespace
commit 3a267b7863f89b238dfadee86b5b00b7714df61a
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Tue Aug 5 16:55:57 2014 +0200
dropped dead code
commit 2824f79d912cdbffd25120dcde3d65d23f5d7ec9
Author: Ignaz Forster <ignaz.forster at muenchen.de>
Date: Wed Jul 30 15:37:26 2014 +0200
Remove special handling of -ure- package
Change-Id: I22e8146c42f8e7e764377cfce4ef02fee6d976e7
commit 1e8280584f4ad3715deed86d856bfb692706851c
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Fri Jun 13 12:55:26 2014 +0200
recovered adjustment for windows from branch libreoffice-lhm-41
commit 3af22ee3a30c039fb39cc3c8e6d8ed6d32ea743f
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Fri Jun 13 12:36:55 2014 +0200
obsolete
commit 77544b3f0aa895f4b9b265b6abeddb56fb8a5c0e
Author: Ulrich Kitzinger <ulkitz at hotmail.de>
Date: Fri Jun 6 14:56:53 2014 +0200
patch-office-debs.sh-Skript an 4.1.6 angepasst
commit 39544c28b4b2a32a52fd4f255d759bc1f7a21305
Author: Felix Geyer <felix.geyer at 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 e611efb5d5e57874e82de92715945115422c3088
Author: Ulrich Kitzinger <ulrich.kitzinger at muenchen.de>
Date: Wed Mar 12 15:40:16 2014 +0100
Template-Pfad wird vorkonfiguriert (Trac 11902)
Change-Id: I849ba05f96dd34fc74e7d8f34c5c3cc192dfdc8a
commit 2e92db521ce5ea3e937f73eca34e7eb2971e1f53
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Thu Jan 9 12:37:26 2014 +0100
Änderungen am Build-Skript und Abhängigkeiten für Windows-Build
commit 320e32716c637cb93ec9bf32a2c49e9fe7bd6d02
Author: Ulrich Kitzinger <ulrich.kitzinger at 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 a822abd1603ce90ecb82129662b9e33acad7f784
Author: Ulrich Kitzinger <ulrich.kitzinger at muenchen.de>
Date: Wed Jan 8 11:31:10 2014 +0100
Build-Skript unterscheidet wieder zwischen kde und kde4
Change-Id: I015a4d4d1b2af1b4c2e3bcbab8ad546a13d367e6
commit d5a859fd236ab68b2e5248b4d0df732d0825a73f
Author: Ignaz Forster <ignaz.forster at 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 fadf942bfdc1ac2c251fcc8e1d2a8078532b96c6
Author: Ignaz Forster <ignaz.forster at muenchen.de>
Date: Fri Dec 6 14:08:27 2013 +0100
Bugfix: Move "cd" to correct position
commit ccdb72034ae0aa8382da9a96a117f1cc4d8bcf22
Author: Ignaz Forster <ignaz.forster at 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 75c657ffcd7b932f574f36d1c160d7dd508f2a82
Author: Ulrich Kitzinger <Ulrich.Kitzinger at 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 620b753ea32bb58a5a43ed772618c06821d0a371
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Tue Dec 3 15:41:38 2013 +0100
patch-office-Skript nochmal angepasst
commit b91b5fe8728d6f450f08cc5b49a3fde52cb55b1c
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Tue Dec 3 14:50:06 2013 +0100
patch-office-debs angepasst um tmp-Pfad zu setzen
commit f62eb7e68cbe188cd12500f00ed995926f4ee9c9
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Thu Nov 21 16:38:57 2013 +0100
Build-Skript um Hilfe ergänzt
commit fa40702400dd4f0cca395ec507e90312fec92391
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Fri Nov 15 13:52:43 2013 +0100
patch-office-debs.sh: Variable hinzugefügt
commit b3dbbd24f8003b907ec4be8ef2f8cdcb396248d3
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 8c6139f973a9b34112954f0d484ad7348e0099e1
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Fri Nov 8 09:47:40 2013 +0100
Build- und patch-office-Skripte hinzugefügt
commit 58ae3053c6f305c7e7da3364123dede03c65a2b7
Author: Jan-Marek Glogowski <glogow at 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 c272081ab4010e8c1bb073f14f62fa1a24ab64b4
Author: Michael Weghorn <m.weghorn at 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 2b1776ec3bd450db1efecc6f9c25d66a06811d1d
Author: Jan-Marek Glogowski <glogow at 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 af68a3fd5a249597b4a780ff92bdb4dc2c4c91bd
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Wed Aug 20 12:59:09 2014 +0200
Update to latest translations
Change-Id: I24d7d98ea52c930beb4c6b387414341439f34f19
commit e9f3f8dbcd6491a284884d3f269f911cc2972203
Author: Ulrich Kitzinger <ulrich.kitzinger at muenchen.de>
Date: Wed Apr 16 16:04:19 2014 +0200
Patch von Lanedo für #11826 integriert.
Change-Id: Ic0e2306bfa8e943220d2d23177c241169c94a790
commit b22bb599d703dad93801e881350c2a3029c694bf
Author: Ulrich Kitzinger <ulrich.kitzinger at muenchen.de>
Date: Mon Mar 17 15:13:14 2014 +0100
Auswahl von Papiergröße und -orientierung deaktiviert (Trac #11826)
Change-Id: If327010c6b2e88d5d638df5ce502e94f99355141
commit 14b159cabd30ad4ccae3b5a814b1c7e95639fdb3
Author: Ulrich Kitzinger <ulrich.kitzinger at muenchen.de>
Date: Thu Feb 27 18:15:06 2014 +0100
Zugriff auf static Variable synchronisiert (Trac 11400)
Change-Id: I623650afee10cc60b49067f4efbdc889b58007dc
commit c129eef2436d233a73acebfa12db8a90c7c262a9
Author: Ulrich Kitzinger <ulrich.kitzinger at muenchen.de>
Date: Thu Feb 13 15:12:42 2014 +0100
unopkg beschwert sich: 'unopkg: 69: [: =: unexpected operator'
Change-Id: I189eb1e44b3d31a30d1451ed8d6048f1bba285d7
commit e62fa332d19f9394b1be99b870d819826e82a332
Author: Noel Power <noel.power at 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.power at suse.com>
commit 3e27e8435d609f01734ed03fa65ec7b1ac80d40e
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Thu Jan 9 12:37:26 2014 +0100
Änderungen am Build-Skript und Abhängigkeiten für Windows-Build
commit 8405184b0bb2e0cf242940b232a1b67a203cff67
Author: Ulrich Kitzinger <ulrich.kitzinger at muenchen.de>
Date: Wed Jan 8 13:26:38 2014 +0100
Kde3-Pfade angepasst
Change-Id: Iafcd5ce09e9c700163d26110523211b273fb9d81
commit a129a75412807428799e18669dbe9486571a8afa
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Tue Nov 12 14:18:37 2013 +0100
Dialog 'Es ist kein Standarddrucker ausgewaehlt' unterdruecken
commit 646735a3efcc3368001afcb446e1457e16405d58
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Tue Nov 12 11:22:23 2013 +0100
Noch ein Compilefehler
commit 3ae68dd9f80ca0da2288562359e23de50ff383c8
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Mon Nov 11 17:57:42 2013 +0100
Fix für AO Bug 74651
commit 825ed7562530011277c336deca07b5cf4182952c
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Fri Nov 8 12:52:01 2013 +0100
In Paths.xcu Temp-Pfad angepasst
commit 2ca6c762505aca509e8f59105256f84a6ca4e6b9
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Fri Nov 8 11:52:37 2013 +0100
unopkg-Sript setzt Root-profil, wegen Trac #11013
commit 47184dd39047e0e7c7658b45df9044e11b3b4353
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Fri Nov 8 11:48:31 2013 +0100
Update-Button im Extension-Manager disabled
commit 775d851e9e5274daf0f988c9703daf1c38a21da0
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Fri Nov 8 11:26:06 2013 +0100
Änderung für Übernahme von Mail-Adressen aus Link, Trac #4335
commit 3766107e7271361e0dde1bd6e85ee95cfe959a5e
Author: Limux <limux at 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 1307cc546d13305cbdea0fe893ca4a90e4634f2b
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 ed3e9a4b5345f47e883e74903b8ca043c1a3492e
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 631364c7aedcf509ef41c5371a525b4f5b901004
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 35b852297c2cf34d6112538b94794988c073afb4
Author: Jan-Marek Glogowski <glogow at 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 96cf1ff01aa73e59ed2ea90a899b6b9a3040e5b0
Author: Jan-Marek Glogowski <glogow at 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 a26a516143762b4d6b53e05054f8725d8d9283a0
Author: Jan-Marek Glogowski <glogow at 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 afb2ea42e413ce328fd6bd06d0d3f3d8816c5887
Author: Jan-Marek Glogowski <glogow at 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 9f10d125f6dc622e7cd7f303e28ecf9efede0035
Author: Jan-Marek Glogowski <glogow at 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 89e516a2eb95d049f7647e4087774887e0ae021b
Author: Jan-Marek Glogowski <glogow at 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 5c6f5f798e9d8671ad1ca3057e62931130250c49
Author: Jan-Marek Glogowski <glogow at 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 f48e44a7bebe97ba3eefcdbf869c3fa4b6217a07
Author: Jan-Marek Glogowski <glogow at 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 5e460ad24f4d61b9f0870d7c8e60609b327a9ee1
Author: Jan-Marek Glogowski <glogow at 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 66fedbe557074d005101e732a5d39095c094844d
Author: Jan-Marek Glogowski <glogow at 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 04221432f265cace36f536bbe6cbfd25498b120f
Author: Jan-Marek Glogowski <glogow at 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 dd2aad957d1b65d9a3d0920ef558f0da071f9aa0
Author: Jan-Marek Glogowski <glogow at 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 868a72a9392789f78cd1bc5842d3847e803e5235
Author: Jan-Marek Glogowski <glogow at 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 234fbca684c4e355908cfa083eddf2be3d081cd1
Author: Jan-Marek Glogowski <glogow at 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 2a23c8d4366b9f4560c9b14c8ec562d8b5c4aa2c
Author: Jan-Marek Glogowski <glogow at 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 d2180aacc58112a6b41bb8ff93b382a735dc5aa4
Author: Jan-Marek Glogowski <glogow at 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)
More information about the Libreoffice-commits
mailing list