summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2016-03-20-Werror,-Wunused-private-fieldStephan Bergmann
Change-Id: If1eba07dcf5bb71c51db80ca7a5e6532bfcf2fbe
2016-03-20tdf#90834: Drop an 'in-line change log' style commentTor Lillqvist
Change-Id: I7eada6b0d422ff5934d9c21d8f2307017d93b559
2016-03-20tdf#90834 Turn in-line version control history comments to good comments.Muhammet Kara
Change-Id: I562b4310059e359c912dd2b4862539e9da28953a Reviewed-on: https://gerrit.libreoffice.org/23374 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2016-03-18sw: restore lost SwMMResultEmailDialog::SendAsHdl_Impl()Miklos Vajna
Adapt SwMailBodyDialog to not require a wizard at all, and similarly let SwGreetingsHandler work without a wizard when m_bIsTabPage is false. Do this by not calling m_pWizard->GetConfigItem() in SwMailBodyDialog and in the parent class, instead always work with a new m_rConfigItem, and let the subclasses decide if they obtain that from a wizard (tabpage case), or from the view (toolbar case). With this, it's again possible to add an inline message in case the real mail merge document is an email attachment (odt/pdf/doc case, does not affect html or plain text). Change-Id: I4bf68ac4c06772b50d468d6b30959c5970babcb3
2016-03-18tdf#44282 fix missing space for numbered lists in TOCMohamed Thabet
check if there is a number, if so add a space after it Change-Id: I1c9024aeda2048e60526f26b57a466fea90e56ec Reviewed-on: https://gerrit.libreoffice.org/23195 Tested-by: jan iversen <jani@documentfoundation.org> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-03-18convert SvButtonState to scoped enumNoel Grandin
Change-Id: I601f9e2fe33e85cf3f7dc52ee20d68202bd2b09d
2016-03-18sw: fix loplugin:staticmethods in SwMMResultEmailDialogMiklos Vajna
Change-Id: I1ed72bcf26429d9bc4c4036a56f1fbae6d90d15c
2016-03-18sw: fix loplugin:staticmethodsMiklos Vajna
Change-Id: Ideeb944b6803563ef766e9ef568546349db2e15e
2016-03-18-Werror,-Winconsistent-missing-overrideNoel Grandin
Change-Id: Ib71a0f2dbbc02a4caacda20561f352e4b7593cdb
2016-03-18sw: fix -Werror,-Winconsistent-missing-overrideMiklos Vajna
Change-Id: I96100de40fa4cef548633251c4be3a8502c64fc9
2016-03-18drop unused params from SvLBoxItem and all it's subclassesNoel Grandin
looks like this is fallout from commit ac7acb0a "Merged SvTreeListBox and SvLBox." (in year 2012) Change-Id: Iaebeae64fc7cd3ba11f5f45b53bcb65bf906e906
2016-03-18SwMMResultPrintDialog: disable from/to numeric fields by defaultMiklos Vajna
Again, same situation as in SwMMResultEmailDialog. Change-Id: Id26aa0601db712133147856dfe179415d579e75a
2016-03-18SwMMResultSaveDialog: disable from/to numeric fields by defaultMiklos Vajna
Same situation as in SwMMResultEmailDialog. Change-Id: I9205f8d62125b66012cd35e2bc25cf60834b11a5
2016-03-18SwMailDispatcherListener_Impl: guard against disposed m_pSendMailDialogMiklos Vajna
SwSendMailDialog normally creates its SwMailDispatcherListener_Impl in SwSendMailDialog::SendMails(), and SwMailDispatcherListener_Impl has a reference to its parent. Usually when the mail merge ends, the MailDispatcher thread invokes SwMailDispatcherListener_Impl::idle(), and that disables its parent dialog's stop button. However, once the mail merge ends, SwSendMailDialog also schedules a deletion of itself via SwSendMailDialog::RemoveThis(), and it may happen that by the time idle() is called, the dialog is already disposed. Fix the problem by only accessing the parent dialog if it's not disposed already. With this, we no longer crash from time to time when all mails are sent out. Change-Id: Ib36188b558e1b8a857462c26d49ff7ab1d29093a
2016-03-18SwMMResultEmailDialog: disable from/to numeric fields by defaultMiklos Vajna
In the old code these were hidden by default, and when the user clicked on "Send merged document as E-Mail", the click event handler disabled them. Now that there is a separate dialog for email sending, disabling has to happen in the dialog constructor. Change-Id: Ie0024a470e042e120ee424bf6a74dffa6f7a43a6
2016-03-18sw: add back lost tree model for sendas in mmresultemaildialogMiklos Vajna
These were part of mmoutputpage previously. With this, it's possible to send email with MM again, though we crash before the results (were the mails sent out successfully?) could be seen. Change-Id: I19724e829d50aafdd20198596422be1ff079b3f5
2016-03-18SwMailMergeWizardExecutor::EndDialogHdl: avoid accessing already deleted viewMiklos Vajna
Valgrind points out that SwView::GetMailMergeConfigItem() is called on a pointer that is already deleted. SwView gets deleted, because it is closed by SwMailMergeWizardExecutor::EndDialogHdl(). Since the new MM toolbar the source view is never closed (since the toolbar is part of the source view), so adapt code here to always show the source frame at the end of the wizard, instead of conditionally showing or closing it. With this, MM to a merged document or individual documents no longer crashes for me. Change-Id: If90302f0619f621420e832a1acc0a05865b8f87d
2016-03-18CppunitTest_sw_mailmerge: fix testMissingDefaultLineColorMiklos Vajna
SwDBManager::MergeMailFiles() assumes that there is a config item in a merge description all the time, but SwXMailMerge::execute() doesn't set one for the nCurOutputType == MailMergeType::FILE case, so don't rely on that. Especially given that MergeMailFiles() later explicitly handles the pTargetView == nullptr case. Change-Id: Ia46539c650885834d54c499fb63188d9bf9ac9ba
2016-03-18mailmerge: Create the documents for printing.Jan Holesovsky
Now the printing from the toolbar works. Change-Id: Id52deb78f0fcce96afc7727c63e6020f1743a430
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-18This assert is useless.Jan Holesovsky
Change-Id: I2a76f449d4fb3452583407dc3cbb73f10a3d1705
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: Create the layout when pressing Finish.Jan Holesovsky
Change-Id: Ifde5fcf29329c58be1a71cfbcf08f95c4516ca0d
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: Kill the "Personalize document" mail merge wizard page.Jan Holesovsky
The new workflow expects the user to use the "Edit individual documents" toolbar button instead, and then edit the newly created document as necessary. Change-Id: I3bda01a06f2e317a41ce0c766e35dfa361b45f91
2016-03-18mailmerge: Disable printing / email when they are not available.Jan Holesovsky
Change-Id: Id6ad5c5b5fa8ce3d39ca07da1430fd5aad1bc3c7
2016-03-18mailmerge: mmoutputpage.ui is not needed any more.Jan Holesovsky
Change-Id: If941292cb83b941d51bfca414ad63dc48fd07dff
2016-03-18mailmerge: Fix indentation.Jan Holesovsky
Change-Id: Id66c165adf27a49fc65877103339668f1276d336
2016-03-18mailmerge: Select the 1st radiobutton when opened.Jan Holesovsky
Change-Id: Ib99138e13861c386348c17f3c57e9cb149a75a45
2016-03-18mailmerge: Fix behaviour of radiobuttons in the new dialogs.Jan Holesovsky
Change-Id: I9694804392c16c7fe3a8bf76d59031995f1d990b
2016-03-18mailmerge: Close dialogs when the operation is completed.Jan Holesovsky
Change-Id: Ic7a1c95f78f1b71f785038636d2dd8f9fb37bae7
2016-03-18mailmerge: Create toolbar buttons for the Save/Print/Email dialogs.Jan Holesovsky
Change-Id: Ia983a313a02b470a23244b2844ff01b12593f723
2016-03-18mailmerge: Killed the 'Save, print or send' page.Jan Holesovsky
Introduced the appropriate dialogs instead; they are not accessible from the UI yet, though. Change-Id: I54a4af1980e3caa6683bc4406feeb08142c9b8f5
2016-03-18mailmerge: Implemented "Edit Individual Documents" toolbar button.Jan Holesovsky
Change-Id: Ia867e24a3a96b8a5d22a5c07a83e16b8b049fd60
2016-03-18mailmerge: Make the SwMailMergeConfigItem instance long-living.Jan Holesovsky
In order for the toolbar to work, we need the SwMailMergeConfigItem instance in the view living even when the mail merge wizard is not around. With this change, there's a small glitch that the SwMailMergeChildWindow sometimes stays open even when we leave the wizard, but I plan to remove this window / button anyway, so no real harm at the moment. Change-Id: I2bf0c49504b9cf2f17f6fce7ab4cab7cb5be6426
2016-03-18mailmerge: Decrease indentation level by an early return.Jan Holesovsky
Change-Id: I90dad46d9bced5e0faee4ab3adabc46d7e1bbc9f
2016-03-18mailmerge: Enable/disable the first/prev/next/last mailmerge entry buttons.Jan Holesovsky
Change-Id: I48f0972b52c0c39e3ba691f4037412622927638b
2016-03-18mailmerge: Introduce buttons for first/prev/next/last mailmerge entry.Jan Holesovsky
Change-Id: I3dc63d568dc4cd6f7e06b057ca4a387e4ad0677e
2016-03-18mailmerge: Don't hide the source document.Jan Holesovsky
Change-Id: Ie920ae1ea05ba81fb2da1198d9d79ba028e1e95a
2016-03-18mailmerge: Introduce a mailmerge toolbar.Jan Holesovsky
So far contains just a button to start the mailmerge wizard, and it is shown when the mailmerge wizard starts. The plan is that the last 3 steps (Edit document; Personalize document; Save, print or send) will be removed from the wizard, and instead introduced in the mailmerge toolbar. Change-Id: I3a55a5b3b8a73bc6775579ac42c4ae30c6c9bac6
2016-03-18mailmerge: Minor refactor.Jan Holesovsky
Change-Id: Ia92b624ee32349ab936ad1a6fc62b4489fd5cde7
2016-03-18tdf#97362: Convert Java unit test to Python(load_save_test.py)kadertarlan
Change-Id: I7c3f2e786f94137b850770c77fbd24578f56b0af Reviewed-on: https://gerrit.libreoffice.org/23254 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
2016-03-18loplugin:stringconstantTor Lillqvist
Change-Id: I644cf737d5021d6b395749fe97974626a2ca6d7f
2016-03-18loplugin:constantfunction in editengNoel Grandin
Change-Id: I8f8414b4867d3248e6d836ed8037de4da41b97f1 Reviewed-on: https://gerrit.libreoffice.org/23331 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-03-17getTypes/queryInterface/getEvents: remove superfluous getArray() and simplifyfeature/unostyles3Bjoern Michaelsen
Change-Id: I5b19d01d2760c95d9c52b15f8d6174dc4aafb4e3
2016-03-17GetItem/SetItem: use GetStyleSheetBase()Bjoern Michaelsen
Change-Id: I7c3b563c6bd095ac9305a5cffdda206c5de94926
generated by cgit (git 2.34.1) at 2025-03-01 15:34:51 +0000