summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
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>
2014-09-11fdo#82114 RTF import: fix handling of first page in non-first sectionMiklos Vajna
Change-Id: If06c6bcdda97447e6014223d997c7ff8abd64b48
2014-09-11fix corner case crash in xhtml headless export as pdfCaolán McNamara
Change-Id: I255504e2c84783387d2fc308800812bef5e82734
2014-09-11create a master document template typeCaolán McNamara
of application/vnd.oasis.opendocument.text-master-template with suffic otm https://lists.oasis-open.org/archives/office-comment/201002/msg00042.html desktop/icons/oasis-master-document-template.icns is just a copy of desktop/icons/oasis-master-document.icns because I can't draw Change-Id: I0d18c79c4c893e97505052884ee8be97d0f117a1 Reviewed-on: https://gerrit.libreoffice.org/11350 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-09-11sw: actually check that iterator is validMichael Stahl
Change-Id: Icefedf1d3fe09ed6670481dcdc4c5e745e816b1b
2014-09-11sw: factor out a function to encapsulate object lifetimesMichael Stahl
Change-Id: Ie49cb4729d70f2b1fee9a2b7bd4ac095732a3d58
2014-09-11loplugin:bodynotinblockStephan Bergmann
Change-Id: I7fa377b37e4985196ad25da0ff3d116aff36ab01
2014-09-10Invalidate rect cache before moving objectJan-Marek Glogowski
Otherwise I get sw/source/core/layout/anchoredobject.cxx:582: <SwAnchoredObject::GetObjRectWithSpaces> - cache for object rectangle inclusive spaces marked as valid, but it couldn't be. Missing invalidation of cache. Please inform OD. Change-Id: I3f315b15fca6e2480c11183269be5583e6aea123 Reviewed-on: https://gerrit.libreoffice.org/10977 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2014-09-10fdo#80926 Don't move anchors of invalid pagesJan-Marek Glogowski
If the anchor is valid, check if its page is valid too, before moving anchors on view change. Change-Id: Idffdfdb786cb29a105c06d652e6ad7315abfb4c5 Reviewed-on: https://gerrit.libreoffice.org/10976 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2014-09-10Fix single node CopyRangeJan-Marek Glogowski
Previously there was a restriction for the range to contain at least two nodes. Change-Id: Iadf21d3928303c2ab8df0d93dabd969ed1ff7e09 Reviewed-on: https://gerrit.libreoffice.org/10972 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2014-09-10Normalize SwDBManager::Merge{MailFiles,Documents}Jan-Marek Glogowski
There is still a difference, if run mail merge throught one or the other function (MM wizard or UNO). Change-Id: Ia372bd3edea4c8dfb58e045fc8fed2efcb2a4fde Reviewed-on: https://gerrit.libreoffice.org/10971 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2014-09-10sw: [loplugin:externandnotdefined]Michael Stahl
It turns out that document compare / merge and master document insert file are all the callers of SwFindDocShell() so move the fix-up there... Change-Id: I912a464c3acab8d0adb7b5b659d62f629a15cb70
2014-09-10WaE: implicit conversion of literal of type 'int' to 'bool'Tor Lillqvist
Change-Id: Ie21c61d718d720ec6bac741cd17e807123f47129
2014-09-10more fixes for SfxItemStateNoel Grandin
In commit 88a874fc "convert SfxItemState constants to a proper enum" I made some mistakes in converting bitwise logic to boolean logic. I fixed one of those places in commit 7ad83656 "fix bitwise->logic conversion in SfxItemState commit" This commit fixes the other places where I converted bitwise to normal boolean logic. I also validated that none of the existing code tries to uses combinations of these enum values. This commit also introduces an exception-throwing check in the one place where the enum is explicitly cast to make sure that no combinations sneak in. Change-Id: I545f7d17b76c4fd999078867caec314e83ffe165 Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2014-09-10Replace uses of old SFX_ITEM_AVAILABLE alias with SFX_ITEM_DEFAULTStephan Bergmann
Change-Id: I88eeac06413fc3935cbbdb357ff8bf9acaa383a8
2014-09-10Replace uses of old SFX_ITEM_ON alias with SFX_ITEM_SETStephan Bergmann
Change-Id: I64be7ca711dcd3ea7c4d5840a30f2f701d055e1b
2014-09-10fdo#83655: sw: RSID-only hint assertion when inserting in master documentMichael Stahl
For the temporary document there is no layout so SwTxtNode::MakeFrm() isn't called. (regression from 6db39dbd7378351f6476f6db25eb7110c9cfb291) Change-Id: I711d32a81519edd6840cc29f5cd9dbc57ef21982
2014-09-10Add debug documents to SwDBManager::MergeMailFilesJan-Marek Glogowski
Just like the debug documents in SwDBManager::MergeDocuments. Change-Id: I275575853c80d4e19d6df5ba9d8dc689353d7c85 Reviewed-on: https://gerrit.libreoffice.org/10970 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2014-09-10Add debug messages for sw.{createcopy,docappend}Jan-Marek Glogowski
This adds a lot of SAL_INFO messages to SwDoc::CreateCopy and SwDoc::Append. Change-Id: Ie924e20698bec84482fcc5496175a9e29245729e Reviewed-on: https://gerrit.libreoffice.org/10969 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2014-09-10MM: introduce SwDoc::Append helper functionJan-Marek Glogowski
This drops all the specialized, workaround code from MM, introduced to use the SwFEShell::Paste function and additionally merges and renames SwDoc::Paste into SwDoc::Append. There is still a little common codepath, therefore this adds comments to always update both functions. Change-Id: I704b3ef3257dd977dac95e16e25049ff8ade97ed Reviewed-on: https://gerrit.libreoffice.org/10967 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2014-09-10IDocumentContentOperations::CopyRange: fix commentMiklos Vajna
Change-Id: Ide5705323579aa5ea1e725685acb7421f416cf04
2014-09-09MM: always copy the internal documentJan-Marek Glogowski
There is really no need to create the first document via UNO createClone(), which is also slower then the internal copy. Actually createClone also calls createCopy, but without initializing the document. Change-Id: I2d1ee6e12e37caf1b0d9bfa393fb4240516628e9 Reviewed-on: https://gerrit.libreoffice.org/10966 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2014-09-09semibold->boldCaolán McNamara
Change-Id: I563f4530f2003ea3090cd15696ea53143f7b3aa6
2014-09-09abi#10076 RTF export: handle frames without a valid anchor pointMiklos Vajna
Ideally all frames have an anchor point in the maFrames vector, as provided by MSWordExportBase. If that's not the case, then we have no idea what would be a valid anchor point: just export those as inline, as we did before. Change-Id: I81134d9fb8dc4ca166084964d277ac02ceccde7b
2014-09-09Replace the whole content for copied documentsJan-Marek Glogowski
If the document is initialized in CreateCopy, it already contains the initial empty paragraph. So we have to delete the content from initial document, as we're going to replace the whole content with the pasted document. Change-Id: Ie6a64dcb070f7d611dfde97f2c1a721834b4167b Reviewed-on: https://gerrit.libreoffice.org/10963 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2014-09-09Resolves: fdo#83251 menu on master doc insert disappearsCaolán McNamara
on releaseing mouse button Change-Id: Ia2f8da6e62d708744707b8187d5961fe12169eb8
2014-09-09fdo#82496: Change picture option by rightclickingJennifer Liebel
Change-Id: I31fb1a1f89030610a9d11b9236e8cde22dbc0ca5 Reviewed-on: https://gerrit.libreoffice.org/11332 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-09-09fdo#83428 Add test case for custom property dropped in docxHeena Gupta
Reviewed on: https://gerrit.libreoffice.org/11346 Change-Id: I8afc0ae1351b4c8bb25f864040b99832b1bed3c1
2014-09-08coverity#704947 Dereference after null checkCaolán McNamara
Change-Id: Id6eb50de48b8a674d7b48d1256b1529637155eb1
generated by cgit (git 2.34.1) at 2024-07-19 22:46:59 +0000