summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-12-10do not save UNO marks in undo historyprivate/llunak/mailmerge_03Luboš Luňák1-4/+6
These are usually very short-lived marks that are used for various internal purposes or by UNO interfaces, so restoring them from undo history does not make any sense. It can in fact lead to a crash on undo if the mark has been already deleted (which is usually the case with UNO marks) but the restoring still refers to it (this is not a problem with other mark types since those should be deleted only when they are no longer in the document, in which case they are saved in undo history by content positions rather than mark references). (cherry picked from commit 1ecf9ed3fc33c984890848eacbecad5e009eb33d) Conflicts: sw/source/core/undo/undobj.cxx Change-Id: Id707dc3d2b888b5c96a974d04a0ef17b22fc024c
2014-10-07use -> with pointersprivate/llunak/mailmergeLuboš Luňák1-5/+5
Change-Id: I0df4775931e8e0b289a63afd501efaaf079302fe
2014-10-07error: comparison between pointer and integerLuboš Luňák1-1/+1
Change-Id: Id8a4bb17bb742524012d44abdb6c24b8fe739329
2014-10-06error: comparison between pointer and integer (Clang trunk towards 3.4)Stephan Bergmann5-8/+6
...the check in itga.cxx was useless anyway, as new[] does not return null. Change-Id: I4de5a46e14a83ab134d0a098a62748e909dc9c00
2014-10-06error: friend declaration specifying a default argument must be a definitionStephan Bergmann6-6/+6
...(Clang trunk towards 3.4); this appears to be specific to C++11, which added at the end of 8.3.6/4 [dcl.fct.default]: "If a friend declaration specifies a default argument expression, that declaration shall be a definition and shall be the only declaration of the function or function template in the translation unit." Change-Id: I750c60a2206d7af41322ebb31aa6deca2491067f
2014-10-06...and similarly for __cxa_allocate_exception and __cxa_throwStephan Bergmann4-17/+44
Conflicts: configure.ac Change-Id: I87ae299aac97180f0587c553d85b051decca155c
2014-10-06Clean up declaration of __cxa_get_globalsStephan Bergmann5-9/+54
At least Clang trunk towards 3.4 now rejects incompatible declarations of the same extern "C" function in different namespaces, so that trick of getting at the function that is exported by libstdc++ but only rudimentarily if at all exposed in cxxabi.h no longer worked. TODO: This change should be reflected in any other bridges where it is relevant, too. Conflicts: configure.ac Change-Id: Ie3ccbdb7d75cc98636d02c0435958532620724f2
2014-10-06i#101283 Fix collapsed bookmark handlingJan-Marek Glogowski1-4/+10
Correctly position the insert cursor in the case of a collapsed bookmark. Change-Id: I46707ab0e019aec1050864c9cb404a834e9a67fe
2014-10-06fdo#83753: consider JAVA_HOME and PATH when selecting JREMichael Weghorn2-156/+253
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
2014-10-06fdo75996 Check search result for bookmark undoJan-Marek Glogowski1-7/+13
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
2014-10-06Patch von Lanedo für #11826 integriert.Ulrich Kitzinger1-5/+20
Change-Id: Ic0e2306bfa8e943220d2d23177c241169c94a790
2014-10-06Auswahl von Papiergröße und -orientierung deaktiviert (Trac #11826)Ulrich Kitzinger2-6/+13
Change-Id: If327010c6b2e88d5d638df5ce502e94f99355141
2014-10-06Zugriff auf static Variable synchronisiert (Trac 11400)Ulrich Kitzinger1-0/+7
Change-Id: I623650afee10cc60b49067f4efbdc889b58007dc
2014-10-06unopkg beschwert sich: 'unopkg: 69: [: =: unexpected operator'Ulrich Kitzinger1-1/+1
Change-Id: I189eb1e44b3d31a30d1451ed8d6048f1bba285d7
2014-10-06Revert "fix Worksheet.Cells by now allowing TableSheet..." fdo#70079Noel Power2-12/+1
This reverts commit 70aff4a7f7abe0c768238733ca8900b746e60189. Change-Id: I8f8b423353ae1a825be91bd94308e87844948525 Signed-off-by: Noel Power <noel.power@suse.com>
2014-10-06Änderungen am Build-Skript und Abhängigkeiten für Windows-BuildUlrich Kitzinger5-2/+201
2014-10-06Kde3-Pfade angepasstUlrich Kitzinger1-2/+2
Change-Id: Iafcd5ce09e9c700163d26110523211b273fb9d81
2014-10-06Dialog 'Es ist kein Standarddrucker ausgewaehlt' unterdrueckenUlrich Kitzinger1-2/+2
2014-10-06Noch ein CompilefehlerUlrich Kitzinger1-1/+1
2014-10-06Fix für AO Bug 74651Ulrich Kitzinger3-11/+38
2014-10-06In Paths.xcu Temp-Pfad angepasstUlrich Kitzinger1-1/+1
2014-10-06unopkg-Sript setzt Root-profil, wegen Trac #11013Ulrich Kitzinger1-0/+5
2014-10-06Update-Button im Extension-Manager disabledUlrich Kitzinger1-3/+3
2014-10-06Änderung für Übernahme von Mail-Adressen aus Link, Trac #4335Ulrich Kitzinger1-2/+2
2014-10-06ExtensionUpdateURL emptyLimux1-1/+1
Update-URL für Extensions auf Leerstring gesetzt. Change-Id: I136c53baffdd84ad10c644fc304d8b7a60df3b99
2014-10-06Handle fixed page size printer option.Jan-Marek Glogowski1-3/+18
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
2014-10-06Add sub-menu to open templates.Ulrich Kitzinger5-0/+42
Change-Id: I8039419b3a4a41321f00d24ce80366a42cff171d
2014-10-06fdo#64146: change file merge of numbered lists.Jan-Marek Glogowski1-4/+43
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
2014-09-30Optimize lcl_GetUniqueFlyNameJan-Marek Glogowski3-29/+100
(cherry picked from commit 403b074a707b2f13e8fb814f537ffb08d7f9b3ed) Conflicts: sw/source/core/doc/docfmt.cxx sw/source/core/doc/doclay.cxx Change-Id: Ic894ee471982496ac82dc426c803aba92b8554c2
2014-09-30Optimize FindFlyByNameJan-Marek Glogowski3-6/+72
(cherry picked from commit 695c52c7a7dba92ae2129c520c53b2055e948f8d) Conflicts: sw/source/core/doc/doclay.cxx Change-Id: I004226f8aded4e7909a104ec0ba405223f2d7e0e
2014-09-30Convert SwFrmFmts to a o3tl::sorted_vectorJan-Marek Glogowski5-76/+78
(cherry picked from commit ec88c524a764b89c034d9347926ba903d6a24402) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I6ca87d3dd9a3b7067380bb7ebaef306b87516dfb
2014-09-30Change SwFrmFmts to o3tl::sorted_vector like APIJan-Marek Glogowski19-91/+239
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
2014-09-30Add sorted vector special case for delete allJan-Marek Glogowski2-3/+14
Specializes DeleteAndDestroyAll() to optionally keep the default item. Change-Id: I570fc6614a59fcf08c4569d44873ed79f4af5eda (cherry picked from commit f4efc9051a25f52ed218c515dc8c5a75f54c8fbd)
2014-09-30Merge common code of sw format listsJan-Marek Glogowski10-171/+85
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
2014-09-30Optimize AppendAllObjs for vectorsJan-Marek Glogowski1-7/+16
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)
2014-09-30Directly convert frame name tails to Int32Jan-Marek Glogowski1-1/+1
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
2014-09-30Convert SwPageDescs to a o3tl::sorted_vectorJan-Marek Glogowski2-60/+61
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)
2014-09-30Fix broken sorted vector usageJan-Marek Glogowski10-64/+56
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
2014-09-30Optimize SwPageDesc lookup by pool IDJan-Marek Glogowski7-37/+110
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
2014-09-30Drop local FindPageDescByName implementationsJan-Marek Glogowski6-79/+41
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
2014-09-30Introduce SwDoc::DelPageDescP and ChgPageDescPJan-Marek Glogowski2-22/+28
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
2014-09-30Rename SwDoc::FindPageDesc to FindPageDescByNameJan-Marek Glogowski11-26/+26
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
2014-09-30Change SwPageDescs to o3tl::sorted_vector like APIJan-Marek Glogowski6-51/+196
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
2014-09-30Sorted vector special case: default first elementJan-Marek Glogowski2-11/+161
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)
2014-09-30fdo#78611 Don't create automatic rules on resetJan-Marek Glogowski1-5/+13
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.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> (cherry picked from commit 9fd7ca788bc8fd88b048c544edb0dc6518010e11)
2014-09-30fdo#81782 MM: copy most document propertiesJan-Marek Glogowski3-52/+129
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.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> (cherry picked from commit cde554a731596f1ca53a911656b6503c96dadcc7) Conflicts: sw/inc/doc.hxx sw/source/core/doc/docglos.cxx sw/source/uibase/dbui/dbmgr.cxx
2014-09-30MM: restore the non-saving wizard behaviourJan-Marek Glogowski1-2/+3
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.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> (cherry picked from commit 3930c14be021e325c1efdb3fa7858069085286f8) Conflicts: sw/source/uibase/dbui/dbmgr.cxx
2014-09-30MM: add missing CreateMonitor handlingJan-Marek Glogowski1-18/+50
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
2014-09-30Remove superfluous merge function.Eilidh McAdam2-256/+0
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.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> (cherry picked from commit 126b4407bade85298f983f545d6f507534fab61d) Conflicts: sw/source/uibase/dbui/dbmgr.cxx
2014-09-30Make UNO and wizard mail merge use same function.Eilidh McAdam3-13/+42
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.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> (cherry picked from commit 636718c960a36bc28d37a69ac102dd6cb696bfba) Conflicts: sw/inc/dbmgr.hxx sw/source/ui/dbui/mailmergewizard.cxx sw/source/uibase/dbui/dbmgr.cxx
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-21 16:51:58 +0000