summaryrefslogtreecommitdiff
path: root/sw/inc
AgeCommit message (Collapse)Author
2016-04-12Avoid reserved identifiersStephan Bergmann
Change-Id: Ib8cbcdff79ad8d621b8e9567df0afe32e9501279
2016-04-12Avoid reserved identifierStephan Bergmann
Change-Id: Ie3e28611003ae51ba4d0278cec41744f2ca08223
2016-04-12clang-tidy performance-unnecessary-value-param in swNoel Grandin
Change-Id: I3e030743b640d5a5f6b3bf4a4e9ba50ccd001287
2016-04-07sw: replace boost::noncopyable with C++11 deleteMichael Stahl
Change-Id: Iac20763c7d1db467420f9c2fbb3cd636839d4c80
2016-04-07sw: replace boost::noncopyable with C++11 deleteMichael Stahl
Change-Id: I5c97c500096dee70bf9208daae38c3f042ac57d3
2016-04-07tdf#99120 DOC import: fix lack of first share after odd section breakMiklos Vajna
Commit 848b1a05c5c41b5e7ff19c984f60c297a8143990 (fix for bnc#659631, 2011-02-04) made wwSectionManager::InsertSegments() use SwPageDesc::WriteUseOn() directly, instead of going via SwPageDesc::SetUseOn() that takes care of not throwing away the higher share bits of the bitfield. This way the "is first shared" flag of the bitfield got cleared, even when the input document had no title page declared, so first header/footer must be shared. Fix the problem by using SetUseOn() in the DOC import as well when it comes to handling odd/even page section breaks. Change-Id: If167f4582919fa177840ed81e0a53aa379485598 Reviewed-on: https://gerrit.libreoffice.org/23885 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-04-06Indentation fixesMiklos Vajna
Change-Id: Ieba9dfed344e04067278300365172162d6d44aae
2016-04-05tdf#84695 sw: make TextBox in shape accessible without mouseMiklos Vajna
F2 or Enter can now switch to text edit mode. Change-Id: I1aea09bd2fc4fa64db49b2037894082fe33af934 Reviewed-on: https://gerrit.libreoffice.org/23836 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-04-02cleanup: remove unused Reference.h(xx) includesJochen Nitschke
and unused using-declarations from Reference.h Change-Id: I297a7ae6044fa329d245ecf08fd5c4cb930f5b19 Reviewed-on: https://gerrit.libreoffice.org/23735 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-04-01tdf#99004 SwAnchoredObjectPosition: handle textboxes when determining surroundMiklos Vajna
Writer TextBoxes are always wrapped "through", so that they can appear inside their shapes. However, the surround of the shape may influence its position. So when surround is asked for anchor position purposes, take the surround of the TextBox's "parent" shape instead of the one of the TextBox directly. With this, the TextBox in the bugdoc is properly positioned inside its parent shape as expected. (The problem only happens when at least two shapes are anchored to the same paragraph.) Change-Id: I0cf8a41080e6759aa395c119d862c4be79574d66 Reviewed-on: https://gerrit.libreoffice.org/23720 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-04-01loplugin:constantparam in swNoel Grandin
Change-Id: I68f1594ca3f647d055f5087def74452452f86910 Reviewed-on: https://gerrit.libreoffice.org/23718 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-03-31tdf#98987 sw: add AddVerticalFrameOffsets compat modeMiklos Vajna
The situation is the following: we have a text frame, with at least two anchored objects: one is wrapped not-wrap-through, the other is. In case the non-wrap-though one shifts the text content of the text frame right or down, then layout may or may not want to re-consider what is the top left corner of the text frame for anchoring purposes. Regarding the x position, sw layout repositioned the anchor point depending on the AddFrameOffsets compat mode: it's enabled for documents imported from Word, disabled otherwise. Regarding the y position, no repositioning was done, however the bugdoc shows that Word does the same repositioning on the vertical axis as well. Add a new AddVerticalFrameOffsets compat mode that enables vertical repositioning as well, and enable that mode for documents imported from DOCX. Change-Id: Idc5cad7d86662008a92ff3bf5fbb3806aa2c7b07 Reviewed-on: https://gerrit.libreoffice.org/23702 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-03-31tdf#90855 add table header entries to resourcesJakub Trzebiatowski
removed hardcoded table header entries Change-Id: Ib0268421d1b0035e7764555054377d08ee47a29d Reviewed-on: https://gerrit.libreoffice.org/23520 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2016-03-31tdf#84938 convert DLG_CHAR_ constants to scoped enumNoel Grandin
Change-Id: Ia58860f3f106d332596d2a682638edae6a270213
2016-03-31tdf#84938 convert VIEWOPT_ constants to scoped enumNoel Grandin
Change-Id: I7d72ed66ea2cf920a0a03a2aa71b5de079f0cf6e
2016-03-31tdf#97525 vcl: make DeletionListener internalJochen Nitschke
move include/vcl/impdel.hxx to vcl/inc/ include impdel.hxx in salframe.hxx remove vcl/impdel.hxx includes in pch add missing <list> includes Change-Id: Id146363b2e20ce0238542929c26a83efb1e8c4bd Reviewed-on: https://gerrit.libreoffice.org/23664 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-03-31loplugin:constantparam in swNoel Grandin
Change-Id: I2d99ff8149f6348a3781e01e9b3079f6c2505d6a
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-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: some assertion on MM inputJan-Marek Glogowski
Change-Id: Id29ede49acf86ad6109eab88fbae5d9bbb2d8720
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: 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-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-23sw: replace boost::noncopyable with C++11 deleteMichael Stahl
Change-Id: I672b187c92ccb71a6c4b9bc5e1169970fb61aa7d
2016-03-23tdf#63211: saving embedded images to HTML optionalOliver Specht
This change re-introduces linked images in HTML export but keeps embedded image export in mailmerge e-Mail function Change-Id: I9e956b590f4c675b5954e19e4d3948c36b55f1e6 Reviewed-on: https://gerrit.libreoffice.org/23359 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de>
2016-03-22loplugin:constantparam in swNoel Grandin
Change-Id: I56925a8fd776b3ee787cc26adbaa08c58dd022c0
2016-03-18mailmerge: Create the target view independantly of the mailmerge execution.Jan Holesovsky
Change-Id: Ib6a53b89b0fe2a30eac104afd1c8fe75d2348edd
2016-03-18mailmerge: nStartingPageNo and sStartingPageDesc shouldn't be return values.Jan Holesovsky
Change-Id: I86a049411c2ec461e66009e6dc54d8ea086e7f12
2016-03-18mailmerge: bPageStylesWithHeaderFooter should not be a return value.Jan Holesovsky
Change-Id: I8d39b6b031b543e4cc6a31cf57d207b04a19ba38
2016-03-18mailmerge: Kill SwMailMergeChildWindow.Jan Holesovsky
It was used to return to the Mail Merge wizard after pressing the [Edit Document] button in the wizard. The wizard pages that had such a button are gone now, so the childwindow for returning to the wizard can go too. Change-Id: I53284633979179fd67ed6fd21a2188aa859a8a22
2016-03-18mailmerge: Remove "Edit document" page, fuctionality available via toolbar.Jan Holesovsky
Change-Id: I0a5d1ed6703871dc5e90acf5e1119e0126755282
2016-03-18mailmerge: Toolbar edit box to show or change the current entry number.Jan Holesovsky
Change-Id: I935c059da44f2309c3cb1a8b2e93341c353bee01
2016-03-18mailmerge: Implement toolbar controller to exclude entries.Jan Holesovsky
This can be used as a "How to implement a custom widget / control in the toolbar" example: * the Controller.xcu change introduces a .uno:MailMergeExcludeEntry command so that it can be added in the toolbar .xml description (in this case mailmerge.xml) * the swriter.sdi introduces the .uno:MailMergeExcludeEntry command for the sfx2 handling - so that it can get notifications about enable/disable changes, invalidates, etc. * wrtapp.sdi + associated apphdl.cxx change make it possible to forward command invalidates (the rBindings.Invalidate(FN_MAILMERGE_EXCLUDE_ENTRY);) to the MMExcludeEntryController::statusChanged() for further handling (in this case setting the checked state according to the current data) * MMExcludeEntryController::createItemWindow() implements the custom widget itself (in this case a checkbox, but can be any VCL widget, even a custom one) * the rest (sw.component and the associated getImplementationName(), supportsService(), etc.) takes care of the instantiation of the controller. Change-Id: I68269538f779a6680b0ba98395b7985d3f1ab95a
2016-03-18mailmerge: Create toolbar buttons for the Save/Print/Email dialogs.Jan Holesovsky
Change-Id: Ia983a313a02b470a23244b2844ff01b12593f723
2016-03-18mailmerge: Implemented "Edit Individual Documents" toolbar button.Jan Holesovsky
Change-Id: Ia867e24a3a96b8a5d22a5c07a83e16b8b049fd60
2016-03-18mailmerge: Introduce buttons for first/prev/next/last mailmerge entry.Jan Holesovsky
Change-Id: I3dc63d568dc4cd6f7e06b057ca4a387e4ad0677e
2016-03-17loplugin:constantparam in sfx2Noel Grandin
Change-Id: I53e690ab8d50fb3ce43ba633fc018e7b66e591cd Reviewed-on: https://gerrit.libreoffice.org/23321 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-03-15loplugin:constantparamNoel Grandin
Change-Id: I270e068b3c83e966e741b0a072fecce9d92d53f5
2016-03-11work on sane lifecylce for SfxFilterMarkus Mohrhard
all SfxFilter instances should now be hold inside of a std::shared_ptr. This fixes a number of huge memory leaks in the test framework and removes one huge source of memory issue in sfx2. SfxMedium contains a pointer to the SfxFilter but does not own. Therefore it is required that any SfxFilter belonging to a SfxMedium lives longer. However this seems to work mostly by hoping that all SfxFilter instances are stored in a global array. As we have seen with the tests this is not true (there are also some cases inside of sd that seem to not follow that pattern as well). Change-Id: I12fd04a504cc4efc0a94967abd91c6fe2c6a8ce8 Reviewed-on: https://gerrit.libreoffice.org/23140 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-03-10sw: make metadata available in copy resultMiklos Vajna
The "copy" part of copy&paste works in sw by creating a separate SwDoc, then copying the selection of the original SwDoc into it, so filters can easily just export the whole clipboard document. A side effect of this is that the clipboard document has no documnent shell, that would contain the metadata. Add a new member to MetaFieldManager that can store metadata in the clipboard case, let SwTransferable::GetData() write metadata there, and finally adapt the RTF export to look for metadata there as well. Change-Id: Icfe32abca4290af8bf5b24a34160c43d4c87c04a
2016-03-09Indentation fixesMiklos Vajna
Change-Id: I536ab12cfedb6dae605af2f29a7a9b34fad06ba0
2016-03-09loplugin:constantparam in sfx2Noel Grandin
Change-Id: I50a2d8221f907f0e844e558f3dbdd0346c010201
2016-03-09loplugin:constantparam in swNoel Grandin
Change-Id: I8fa1af4a34770b71f6f4bb28b3313edf4875322b
2016-03-07loplugin:unuseddefaultparamsNoel Grandin
Change-Id: Ia414f7845425ef73859ed04853378e96cc738795 Reviewed-on: https://gerrit.libreoffice.org/22971 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-03-04loplugin:unuseddefaultparam in swNoel Grandin
Change-Id: I1a8a25c09ae0c8ba39fcedb032562df93fdd6ba4
generated by cgit (git 2.34.1) at 2024-12-28 19:47:55 +0000