summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-03-25fix headless buildOliver Specht
disables OpenGL and glew usage, lets --without-gui do what --without-x did before and disables X related test Change-Id: I680b47c9962a0d43c8ece593db0b82e347ceebdb Reviewed-on: https://gerrit.libreoffice.org/23474 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de>
2016-03-25Updated coreStanislav Horacek
Project: help a367b5ee9d109a611f8684a46b9254de73ec4af8 tdf#92825 adjust menu path to Slide - New Page/Slide Change-Id: I2f34d6dc88a0337294c6aafe35e25e1a7d474bc8 Reviewed-on: https://gerrit.libreoffice.org/23418 Reviewed-by: Olivier Hallot <ohallot@collabora.co.uk> Tested-by: Olivier Hallot <ohallot@collabora.co.uk>
2016-03-25tdf#90855 Improve the 'Insert Bookmark' dialogJakub Trzebiatowski
implemented: - display page number - displaying bookmark text - goto (button and table doubleclick) - help - rename - selecting multiple bookmarks in TableView or in EditField by ";" - sorting by any column Change-Id: I7523dc066380bc360bd484c88a6f4ba45e867320 Reviewed-on: https://gerrit.libreoffice.org/23156 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-03-25loplugin:defaultparams,staticcall,literaltoboolconversionStephan Bergmann
Change-Id: Ie758fc9d7d8546f7631bb865b307be56386a2057
2016-03-25Upgrade libxmlsec to 1.2.17Miklos Vajna
So we can drop xmlsec1-configure-libxml-libxslt.patch.1, as upstream commit be72c468dfd3165105ed5cdc949493332c4d3064 (fixed configure issue with emapty --with-libxml/libxsl and config scripts in /bin directory, 2010-07-19) fixes the same problem. Change-Id: Ibb01fb2c5e4074d39168df487180fa88c7bb8035 Reviewed-on: https://gerrit.libreoffice.org/23498 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-03-25tdf#96484: Missing Icons in Find Toolbar with Icon Style GalaxyBjoern Michaelsen
- add the relevant links to galaxys link.txt - reportedly a regression from b6d1a5f0, though I cant see how that commit might be guilty here Change-Id: Ibfb0a2c9fe5db51297b4c697ce81394f9327fb89
2016-03-25fix another involuntary behaviour change from 0c5cbcd7Bjoern Michaelsen
Change-Id: Idd8e48777b2a5e8e91754ec0afa9dd5b50d8bf00
2016-03-25tdf#94734: fix icon in sidebar disappears when changing font colourBjoern Michaelsen
- properly initalize maImageOriginal along with maImage in various places - this is a regression from 27d94c482e82ea5d4f202109614c6fb3578fb0a4 - that commit is mostly innocent in itself though, only exposing omissions from b8f21298288890d52c06fef6c84441634c56c986 - having both maImage and maImageOriginal is extremely fragile as-is -- likely I'd be helpful to have them private in ImplToolItem and then a SetImage accessor with a tristate eOriginal/eCached/eBoth enum parameter to prevent oversights like this in the future ... Change-Id: I294d7ed8e07be5cadec0ae251cc08c8d089bd059
2016-03-25use the ScRefCellValue that is already available, tdf#93405Markus Mohrhard
Change-Id: I68a2ddbe5049d10b5c11c2d77b26dce8dc55ab28
2016-03-25we already pass the ScRefCellValue as parameter, tdf#93405Markus Mohrhard
Change-Id: I27f7e8ffe93545fe872a0c5b64f26dc90cb70e6f
2016-03-25these two methods are identical copies, related tdf#93405Markus Mohrhard
This already gives a 15% improvement as we now only query the cell twice instead of three times. Change-Id: I2e0533f05ace6773ad0710b2c586ca325aeae91b
2016-03-24vcl: let's try to convert that to an assertMichael Stahl
Change-Id: I41867f0d18e604ffb67a37ba3ab3a08a59749c13
2016-03-24vcl: tdf#98812: acquire reference count of WinFontInstancesMichael Stahl
... when they are inserted in WinSalGraphics::mpWinFontEntry. Not sure why one of these drops to 0 but is not removed from the WinSalGraphics when formatting this particular bugdoc. Acquiring the instances when retaining pointers to them should make the life cycle a little less insane. Change-Id: If1404f46a13736b2a226e198bdf0c3ca8e09bb38
2016-03-24unordf: replace boost::shared_array with std::shared_ptrMichael Stahl
It was using a custom deleter anyway. Change-Id: I700b7cf314b7f837a7143206ba42e412c5a1670d
2016-03-24unordf: replace boost::noncopyable with C++11 deleteMichael Stahl
Change-Id: I996ca0589db8b73db045c87bbecfab03be9dbaef
2016-03-24filter: [loplugin:simplifybool]Michael Stahl
Change-Id: I491708d12c0c220705fe79a16ca85cf874692b77
2016-03-24MM: fix debug document dumpingJan-Marek Glogowski
Previously the debug documents were dumped to the temporary mail merge directory, which is removed at the end of MM. So this dumps the document to an extra directory. Also fixes the broken reinterpret_cast "env" => "int" conversation to get the real number of documents, which work with multi-digit numbers. Change-Id: I456b506e9a70cffdfc93cb3eadd39c454a536343
2016-03-24MM: remove lock from saved documentsJan-Marek Glogowski
Actually we have to call DoSaveCompleted to get rid of the locking. Instead this adds a parameter to skip the recent file registration used in non bCreateSingleFile modes. Change-Id: I57151f08ad8d737007da84c4566685cc37612dfb
2016-03-24MM: remove multiple unneeded indention levelsJan-Marek Glogowski
Change-Id: Ia363904d3c3fbabdb7aa0dd9aa0715d7d6982f85
2016-03-24MM: rename MergeNew => MergeJan-Marek Glogowski
Since all old code from the original Merge function is gone, just do the rename. Change-Id: I7cc1b4b58cc73bea83a723b2478a8b4bf59a382f
2016-03-24MM: don't try to save the source MM documentJan-Marek Glogowski
Just create in internal copy, if the source document is modified. Change-Id: I4587b3df5ff0b42c98f1b69fe18b4f11f5c9b8e4
2016-03-24MM: just show the print progress dialog for printJan-Marek Glogowski
Change-Id: I75a33c14f4a2b5ab404ce937e5d23392f6021a1b
2016-03-24MM: fix silent mode on merge startJan-Marek Glogowski
We currently don't handle the change of silent mode during a running mail merge job correctly, so don't allow it. Change-Id: I2cb8cc1c737e93e8b2a90a6e73fb3e49008fe91d
2016-03-24MM: move mail creation into a local functionJan-Marek Glogowski
And also use C++11 range-based for loop loops. Change-Id: I7bafc419a21cdd6bb7aaed7d67b640409d308f79
2016-03-24MM: don't register files in recently used...Jan-Marek Glogowski
... in email and !bCreateSingleFile file mode. Also saves a bunch of instructions. For my simple document it was ~10% of the save time and 75% is the creation of the preview thumbnails... Change-Id: I14f7092007b1acfed6cbe0f2f4cd6eaecd32b514
2016-03-24MM: use working doc DB manager on saveJan-Marek Glogowski
This is related to tdf#97318 but doesn't fix it, as the wizard works with a single merged document, which is split later. When saving the working document in !bCreateSingleFile mode, we have to restore the documents DB manager for two reasons: 1. We otherwise would save the whole database content. 2. We crash with embedded databases of the original DB manager. Change-Id: I9b209854703ec95c2c63c83019e857f2d26f753d
2016-03-24MM: correctly handle directory in dialogJan-Marek Glogowski
For convenience we present file URLs in the systems local file notation. But the directory selection dialog expects an URL, so we have to convert the local notation from the edit entry to a file URL. Change-Id: Idff6f7d4b135eef087c61560b0603b9a6669dbf7
2016-03-24tdf#96914 MM: don't round trip the source documentJan-Marek Glogowski
To get a unmodified document, the mail merge via File -> Print used to write a document and reload it. This is not a problem with normal documents, but with embedded databases this results in a second database with the same name, which disposes the first registered database and the xResultSet from the mail merge dialog. As a workaround this just creates an internal copy, sets the correct database settings and resets the modified status. We still need a more general solution to handle documents with the same embedded DB name in a sane way, probably by making the embedded database a private object of the documents database manager. We also need to keep the IsLabelDoc information, otherwise cloning label documents breaks MM due to undetected, existing section links. This is currently handled MM internal when creating a document clone, but probably a reset function for the rest of the document settings should be created and used. Change-Id: I20ddea30196d65cb89f69977867f012816ec6001
2016-03-24tdf#95292 MM: cleanup bEndOfDB handlingJan-Marek Glogowski
bEndOfDB was handled inconsistently in ToNextRecord for record selections and normal record iteration. The new unified semantics are defined to set bEndOfDB for the first failing record fetch. This includes a rename of the function ExistsNextRecord, which did never check for a next record, but just verified the current record set to be valid. This way we can also drop the bAfterSelection selection, which was just needed for the inconsistent bEndOfDB handling. Change-Id: Ibbd7ae95e5969b51e32f44b442e5dc778655e8a9
2016-03-24MM: move SwPageDesc handling into SwDoc::AppendDocJan-Marek Glogowski
If you append a doc, you want to handle styles correctly. So it's actually the correct way to handle the styles in AppendDoc. The nDocNo is used instead of a boolean to speed up finding better unique names in the mail merge case. Change-Id: I4b16e89588164b9e0763759c7d719dfc204b63a1
2016-03-24MM: merge cancel and error variableJan-Marek Glogowski
An error always includes the "cancel", while a cancel doesn't have to be an error. So merge handling by using an enum. Change-Id: I154dccbd3063d7ce37ee3cb90b4f193cb1edd466
2016-03-24MM: cleanup of comments and assertsJan-Marek Glogowski
Also adds a README to explain some of the code flow of MM. Change-Id: I363fdd73824a8d41f7073b6de2e9c24184005397
2016-03-24MM: a failing print job is an errorJan-Marek Glogowski
Change-Id: I0476d0084d6f7e70b123dbb25927822053ca4e1a
2016-03-24MM: don't send email if document generation failedJan-Marek Glogowski
Change-Id: I91d13d0694c0586a2dbc159f7ba9d53086b6746c
2016-03-24MM: some assertion on MM inputJan-Marek Glogowski
Change-Id: Id29ede49acf86ad6109eab88fbae5d9bbb2d8720
2016-03-24MM: abort email MM without an email DB columnJan-Marek Glogowski
Change-Id: Ia35a64d08f47af577426749712fa37c3b3b0b6e6
2016-03-24MM: move email subject and address into descriptorJan-Marek Glogowski
Both are not related to the DBManager, but the mail merge job. While at it, also drop the insane bSubjectIsFilename handling, add an independent sPath, rename sAddressFromColumn to a more general sDBcolumn, as it's also used for file name lookup in FILE mode, and unify the DB column data handling. Change-Id: I1b583f4a67279a229329ba7cd15fb8d2c215737c
2016-03-24MM: cleanup bCreateSingleFile finishJan-Marek Glogowski
Took me a while to realize most of the post-mm finalization code actually depends on bCreateSingleFile. This allows us to simplify the code structure. Change-Id: Ifd8a8a882d9902bedd40c8b1d1e4a8507b5877fe
2016-03-24MM: rename and constify variablesJan-Marek Glogowski
Instead of the huge comparisons (in terms of text space), this deconstructs the mail merge type into smaller uppercase variables. bCancel is renamed to m_bCancel to especially distinguish it from the bNoError local variable, as both are supposed to be handled together. Otherall this should improve the readability of the code. Change-Id: I51ab17f7cd90a9e195d09dfcf37a0d194aa9fbbd
2016-03-24MM: refactor DBManager related duplicated codeJan-Marek Glogowski
Moves the duplicated code for saving documents, configuring the printer and DB cursor forwarding (next record) into static local functions. Change-Id: I75f183a2a515ecbae276461613a05ab50c56e600
2016-03-24tdf#93236 Revert "support fast MM printing in...Jan-Marek Glogowski
non-single-file mode only for CUPS" This reverts commit 138d29aa09417eba4d15ade4c9f4dab2620b6326. The patch breaks all print opions affecting multiple pages, i.e. page range selection, pages per sheet, blank pages, reverse page order and copies. Conflicts: configure.ac sw/source/uibase/dbui/dbmgr.cxx vcl/inc/cupsmgr.hxx vcl/unx/generic/printer/cupsmgr.cxx Change-Id: I8c39e7f0e71ef9688254c0a0dba049e1836b733c
2016-03-24Revert "tdf93236 N-UP printing in combination 1/4"Jan-Marek Glogowski
Whole subject was: "tdf93236 N-UP printing in with mailmerge broken file-print 1/4" This reverts all dbmgr.cxx changes, which were a result of this commit. This patch merges the reverts for the following patches: * "sw: remove include of sw/source/inc/uibase/dbui.hxx from dbmgr.hxx" commit 4b01af28e6fee1ec3096ed713d1db832b3508420 * "coverity#1346891 Unused value" commit 1876d9a807ee0b3480ab108273930897cc697d88 * "tdf93236 N-UP printing in combination with mailmerge broken file-print 1/4" commit d8ff907197037045fd0cb173e341f515968b65b1 Change-Id: Ic51230c484fb9ee5dba2331c51ced1d20a787afa
2016-03-24cid#1357166 null pointer dereferenceMiklos Vajna
Change-Id: Id1db85f7f52c2b35e069a0252457959b16a2fd02
2016-03-24cid#1357167 missing breakMiklos Vajna
Change-Id: I847106a409035b6432c799994008cd2dc7c05de0
2016-03-24cid#1357171 uninitialized membersMiklos Vajna
Change-Id: I8be96ed9ff66c9790b75e59fba17dd54eb12b7a2
2016-03-24cid#1357170 uninitialized membersMiklos Vajna
Change-Id: Iccf20a4889c1b7598ef83f927844b9a0ddef7ee4
2016-03-24Revert "Text General inconsistent with cell formatting dlg", tdf#95385Eike Rathke
This reverts commit 547617955af87640b46211b6715032bc6576279a. Modifying locale datas' number format is a wrong approach.
2016-03-24tdf#88453 sw layout, nested table split: shrink inner tables as wellMiklos Vajna
Commit b4b5dbee1ec7770ed64d7270de46d5cfc06b87b6 (tdf#88453 sw layout: fix split of nested tables with large amount of rows, 2016-03-23) took care of two similar problems when splitting tables which has nested ones (setting cell height to 0 when its content height is 0, and setting row height to 0 when its cells' height are zero). Turns out there is a third aspect of the same problem: when row heights are set to 0 during shrinking for table split purposes, the table height has to be set to 0 as well, in case the table contains only 0-height rows. With this, the original bugdoc's layout is the expected one. Change-Id: I3f5392eb914a60e9caa5182dc6d44bd3a93f41d6 Reviewed-on: https://gerrit.libreoffice.org/23497 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-03-24const as const canEike Rathke
Change-Id: I6826c2f12d601a91462af454b90272ea7a7e932f
2016-03-24sw: replace boost::noncopyable with C++11 deleteMichael Stahl
Change-Id: I67d8d06012ac8835d957c77b122c8f0cda84a712
generated by cgit (git 2.34.1) at 2025-01-23 02:46:29 +0000