summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2014-09-19consider following redline as wellCaolán McNamara
a) In word each range that character properties affect are just stored by their end. So the range is from the last end to the current one. b) In word the paragraph end marker is a real character, in writer it is not. c) So for redlining if a paragraph is redlined, but the previous one is not then the redlining propes of the 2nd para will affect the end marker of the previous one if the previous char properties do not include the para end mark. We were currently handing the case where a paragraph end mark *is* inside redlining and including it in the char property range, but we were not considering the case where the paragraph end mark is *not* inside redlining but the following paragraph *is* to get the end of the previous paragraph not part of the following paragraph character run, we emit an empty char section of it for this case. Change-Id: I816335067f60d1d9332bfdb1117fb1448b564972
2014-09-19refactor IsRedlineAtEndCaolán McNamara
should be no logic change, just added a comment as to what is going on here and ready for extension Change-Id: Ibf1a3893ece9a09ad342bb06f39e119c1340e0db
2014-09-19fdo#62947 make IDs unique, fixes, better namesTomaž Vajngerl
Change-Id: I6cbfd43f037fe89e0f753c67c9368b981b85bd35
2014-09-19fdo#83728 DOCX import: fix table alignmentMiklos Vajna
Regression from 614b31615e69b527e669635245cf59faf9c9e2fc (Use NS_ooxml::LN_Value_ST_Jc_{right,end} constants, 2014-09-05), one more remnant from doctok. Change-Id: Ibab68eada337a3fe1bc919987a09a8b146f86ac9
2014-09-19Missing dependenciesStephan Bergmann
Change-Id: I324da4e8ea3ae0a23cf25025fda9d316d2e6c007
2014-09-19Bug 62947 - UI Add.. in WriterBabu Vincent
Change-Id: I7eec133246f39ce1348eddf564f30c7b4adfe3cf Reviewed-on: https://gerrit.libreoffice.org/11545 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2014-09-19SwCursor::SelectWordWT: include comment anchor character of a commented wordMiklos Vajna
In case the user double-clicks on a word and exactly that word is commented, then we used to select only the word, but not its comment anchor character. So when the user deleted the selection, the comment left there. It is still possible to manually select only the word, but on double-click let's just select the comment anchor as well, so a simple double-click on the commented word will remove the comment as well. Change-Id: I7322af61c31e8aba108eef5596849d17d55fc7eb
2014-09-19Improve test for inlined html imageMatúš Kukan
Change-Id: I7063a50987b018b9a00bc542ae5ed1b963b17dd8
2014-09-18typo: wrong commit hashMatúš Kukan
Change-Id: If2e81662c9d83d14dccda13fa66e87898757ce96
2014-09-18CppunitTest_sw_ooxmlexport: unused includesMiklos Vajna
Change-Id: I0b53dabffe355c9070660a3d4048bd1624216399
2014-09-18DOCX import: fix handling of dropdown SDT around cellMiklos Vajna
There were two problems here: 1) The CT_SdtContentCell handlers didn't emit the usual NS_ooxml::LN_CT_SdtBlock_sdtContent / NS_ooxml::LN_CT_SdtBlock_sdtEndContent tokens, so the dropdown control was not created (and then was created with the wrong anchor). 2) In case the SDT was around the cell, the newline character was also added to the text of the currently selected entry, resulting in an invalid argument of SwXText::convertToTable(), so no table was created. Change-Id: I4806626181f40c6d26ff7b25f5dbb863967d8077
2014-09-18HTML import test for image inlined in 'src' attribute (related: fdo#50763)Matúš Kukan
Fixed in 72703173066a2db5c977d422ace59d60b998bbfc Unfortunately the test does not really ensure it works now :-/ but still probably better than nothing and can be fixed potentially. Change-Id: I563b46c62d256c58a63f36443a5431603169c3f6
2014-09-18HTML import: fix importing of inlined images (related: fdo#50763)Matúš Kukan
Regression from 3914a711060341345f15b83656457f90095f32d6 Change-Id: I0523d2b07dc33c74caa711cf7aae274c935f8eed
2014-09-18Remove special case which is handled differently nowMatúš Kukan
Since 3914a711060341345f15b83656457f90095f32d6 rGrfName is empty. It was added in 363f1c1462963f6f032de07649dc9c4d02b4e446 Change-Id: I4ec3b432399708db4acb6af1af69df4c0aaa181c
2014-09-18fdo#82577: Handle FontNoel Grandin
Put the VCL Font class in the vcl namespace. Avoids clash with the X11 Font typedef. Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537
2014-09-17TyposJulien Nabet
Change-Id: Icf850c4b7b146a82a5638a3cd88ad02f3171aff3
2014-09-17sw: html import test: local images shouldn't be file links (bnc#580834)Matúš Kukan
Change-Id: Id35e03a3f814609e40e4beea778e66cce39054d1
2014-09-17bnc#580834: HTML import: Embed images if source URL is a local file.Matúš Kukan
Use also INET_PROT_FILE to determine whether to import images as links. Change-Id: I072be21086505f6300463e4e3cfb276cbe506803
2014-09-17WaE: overriding virtual function declaration not marked 'override'Tor Lillqvist
Change-Id: Ic7f3e661a4824cca06fc16f2b1f23a2873ef4ecf
2014-09-17MSWordExportBase: ignore empty annotation marksMiklos Vajna
Change-Id: I182700a7b74aa65a1eeb39ff702f068a10dd3346
2014-09-17Fix Windows build - the same thing in Writer.Jan Holesovsky
Change-Id: Iba40d99dd6c162f20ca35e5a937b7c5ee3d2e126
2014-09-17callcatcher: update unused codeCaolán McNamara
Change-Id: I2ddda0600ee876e9886ee3221f0ac5ad515fbd22
2014-09-17SFX_ITEM_SET to SfxItemState::SETTomaž Vajngerl
Change-Id: I95dc8872d702cbe63d5fdab10a9ddd0e86d49e06
2014-09-17Remove redundant class SvxLineColorToolBoxControlKrisztian Pinter
Change-Id: I882ee959baae429307218d3076a2a198ff960ddd
2014-09-17Make it easier to add new color attributes to GetDocColorsKrisztian Pinter
Change-Id: I2098892fc44c7a8bde1eb30f6db1709e58925577
2014-09-17Fix build errorKrisztian Pinter
Change-Id: I5c992189dc21683fc9e5244f4824d7c42e4ed9cd
2014-09-17Get more color attributes for document colors in WriterKrisztian Pinter
Change-Id: I2005b434f20a56417105c7b26ce09155a7023023
2014-09-17Remove unnecessary includeKrisztian Pinter
Change-Id: I46c7af376aacb824a0d4298674423cc227b592f3
2014-09-17Add writer document font colors to color palettesKrisztian Pinter
Change-Id: If3fedc45586eee068c40e92da87d5d550a456a64
2014-09-16DOCX import: handle w:sdt around w:r followed by a fieldMiklos Vajna
Change-Id: Ic0cf71efc8d57a98e7cff050ce68a0c4303ca6b1
2014-09-16'Artur Dent' -> 'Arthur Dent'Caolán McNamara
Change-Id: Idbeac2925ce0f91075f3c4f5468574c62e29f420
2014-09-16Resolves: fdo#68967 looping layoutCaolán McNamara
RemoveFollowFlowLine() marks the layout invalid, but the next cycle through does everything exactly the same again. Try the same foul horror as nUnSplitted. But at least with a test-case that nails down reproducing the bug if a better fix is needed. Change-Id: Id6698bcb2364bd0253bedd4a7c313e25f705be8d
2014-09-16Try to fix MacOSX-10.8_21-10.7SDK buildMiklos Vajna
Change-Id: I459098f3a9eeef21f63b324fc600aa51c7acdb0b
2014-09-16-Werror,-Wunused-function, loplugin:bodynotinblockStephan Bergmann
Change-Id: I4bf0b36524d7372ab4b63b5646bead55a1b93122
2014-09-16-Werror,-Wsometimes-uninitializedStephan Bergmann
Change-Id: I24baf1f0e559c92dfac1337cd70feb737155fe3b
2014-09-16DOCX export: avoid inline shape inside shape textMiklos Vajna
Drawing objects inside text boxes are supported by Writer, but not by Word. Such a document model is still created by the DOCX import for floating tables. Till we recognize floating tables on export, at least make sure that inline shapes are delayed till the end of the floating table to avoid invalid output. That matches the behavior of handling anchored shapes inside shape text. Change-Id: I2fc4e2df009e0d70c369c1fea30b657af0697039
2014-09-16Remove superfluous merge function.Eilidh McAdam
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>
2014-09-16Make UNO and wizard mail merge use same function.Eilidh McAdam
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>
2014-09-16fdo#70346 MM: add mail merge data to condition dictJan-Marek Glogowski
Currently section hide conditions are just evaluated based on document field data. This adds the current mail merge dataset to the condition dictionary, so this can be used in the condition evaluation. The dataset values are named from their columns and added initially, therefore DB fields with identical names will overwrite the values in the dictionary! Change-Id: I82a5f9f6962628a76c836e8e2a7c9e264fdc16e0 Reviewed-on: https://gerrit.libreoffice.org/10978 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2014-09-16CppunitTest_sw_ooxmlsdrexport: clean up testLockedCanvas XPath expressionMiklos Vajna
Change-Id: I0b9373d4e523c7ef7f1f90d165702021528f21eb
2014-09-15CppunitTest_sw_odfexport: enable on WindowsMiklos Vajna
Change-Id: Ic0444a08eb4afce7d80ab5a9180d45ff8ec3b3c8
2014-09-15CppunitTest_sw_uiwriter: sal_Bool -> boolStephan Bergmann
Change-Id: I76199dbd781d228153bca015ac0b34d589276d85
2014-09-15sw: sal_Bool -> boolStephan Bergmann
Change-Id: I9eb9fa5a5a5af1add3af4c6ff6a331075bd5e78e
2014-09-14avoid possible NULL dereference (fdo#82777)Luboš Luňák
Change-Id: Ifec915d5b2c9e5f7558e7850eb44e44300c9b374
2014-09-13coverity#705042 Dereference after null checkCaolán McNamara
Change-Id: Iac532477802588333560497767a613bb0a55effe
2014-09-12MM: Don't adapt the view when saving dbg documentsJan-Marek Glogowski
DoSaveCompleted updates the SwViewShell and recent file lists after the document was saved via DoSaveAs. So we can simply drop the call and delete the SfxMedium to save a copy. Change-Id: I04a0710949ca60e1ff4cab24c6b504deb130db63 Reviewed-on: https://gerrit.libreoffice.org/10983 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-09-12MM: refactor cancel handling for dbui dialogsJan-Marek Glogowski
This simplifies the handling of CreateMonitor and PrintMonitor in the combined mail merge function. Change-Id: Iacf933ec1a6017949b29b3d5f62d5f55c4691053 Reviewed-on: https://gerrit.libreoffice.org/10984 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-09-12sw: rename SwDoc::Append to something uniqueMichael Stahl
Change-Id: Ibb9db5ecdea6439df20fc1ee609267dcdd864405
2014-09-12fdo#44984 RTF import: handle form fields inside tablesMiklos Vajna
Change-Id: I84b3d5186e99b8313cfb32398869de028a267b49
2014-09-12Turn SfxItemState into a C++11 scoped enumerationStephan Bergmann
...to gain further confidence in the claim "that none of the existing code tries to uses combinations of these enum values" (d92602c5b13d0a60439d86c5a033d124178726ca "more fixes for SfxItemState") Change-Id: I987922d945e8738e38adfde83b869adf3ff35b13 Reviewed-on: https://gerrit.libreoffice.org/11384 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
generated by cgit (git 2.34.1) at 2025-02-08 07:07:01 +0000