summaryrefslogtreecommitdiff
path: root/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
AgeCommit message (Collapse)AuthorFilesLines
2020-10-18tdf#124176: Use pragma once instead of include guardsmariamfahmy1-4/+1
Change-Id: Ib9fd7e3ffbe8760edf4a108342aa5ed03c453b01 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104487 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2020-07-20compact namespace: writerfilterNoel Grandin1-3/+2
Change-Id: I1dd3aff6c08fb2bce031abd6e88603a4ec9077fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99012 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-05-04tdf#132514 DOCX import: fix lost table style with footerLászló Németh1-9/+0
Table paragraphs collected for table style processing were mixed when both body text and footer contain tables, i.e. clearing paragraph vector at processing the first table resulted missing paragraph vector and table style processing for the other one. Now tables in footer, also nested tables collect their paragraphs in separated table paragraph vectors. Regression from commit 6c5da2cd7af5c2d90e4d8e9635ba8c9989c87923 (tdf#119054 DOCX: fix not table style based bottom margin). Change-Id: Ib8568d8379cfb7da869120cdc7fe12895252d661 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93415 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2020-03-16Revert "loplugin:constfields in writerfilter"Noel Grandin1-2/+2
This reverts commit e7c6c05ae5a62e1705ffda97c5405eecd1f62a1e. Change-Id: I9072c4ef9c1a941ac3169e2b53dfd25ae7863770 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90545 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-20tdf#42949 Fix IWYU warnings in writerfilter/Gabor Kelemen1-1/+0
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I47ff7eecabc87081eb953c5970a3cbd56c86d728 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88897 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-02-19tdf#118812 DOCX import: fix table style preference – part 2László Németh1-1/+10
Apply table styles according to OOXML and – in the case of font sizes – MSO exception "overrideTableStyleFontSizeAndJustification". Fix temporary regression in styles of paragraph portions, table cell regions and nested tables from commit f15d67442972c5f69c71925a6bfa5aa1a39d54eb (tdf#129575 DOCX import: fix table style preference). Unit test document was created by Justin Luth. Change-Id: I7b076ac27f5b44d44934b7efb18ac4a878f8b596 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88869 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2020-02-12tdf#129575 DOCX import: fix table style preferenceLászló Németh1-1/+1
handling by recognizing docDefault properties instead of default-value based heuristics. Change-Id: I3bab9d85d77d0e5f1c357121b1caf02cbe4899c4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88457 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-02-12Revert "revert obsolete writerfilter hacks for tdf#119054 and tdf#128752"László Németh1-0/+2
This reverts commit 749fd6508504cf3b2e3822eca52a67fa36d75fb8. Change-Id: Iad4cd836e2908e2c21e70013f88af213b3a1822d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88142 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2019-12-02revert obsolete writerfilter hacks for tdf#119054 and tdf#128752Justin Luth1-2/+0
These are obsoleted in LibreOffice 6.5 by tdf#118947's commit 6bced3c6a1bf8d4652dd6ba75e41b128ce1bfc5c Both of these hacks were backported to 6.4, but I have no intention of backporting my patch. Change-Id: Ie639b9d55d90d25b58e140fba443fce98f2d7ba1 Reviewed-on: https://gerrit.libreoffice.org/84125 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2019-11-19tdf#119054 DOCX: fix not table style based bottom marginLászló Németh1-0/+3
in table cells, ie. using paragraph styles with bottom margin setting or direct paragraph formatting of bottom margin. Both of them overwrite the table style based bottom margin. Change-Id: I527b16c24fe47df8412291089ff86fadd3f9430b Reviewed-on: https://gerrit.libreoffice.org/82800 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org>
2018-09-13loplugin:constfields in writerfilterNoel Grandin1-2/+2
Change-Id: Ibe380e1fb35d9defc478d459a988f9f6df13bf35 Reviewed-on: https://gerrit.libreoffice.org/60427 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-07-10tdf#79877 perf loading docx file, writerfilter/ improvementsNoel Grandin1-3/+3
this improves load time by 20%. We switch from shared_ptr to tools::SvRef to manage the objects I noticed some double inheritance like this: DomainMapper LoggedProperties Properties SvRefBase LoggedTable Table SvRefBase so to be safe I made all the ref-count-base-class inheritance virtual. Change-Id: Ia3de9733f5c6966e8171f43d083dcc087040b8cd Reviewed-on: https://gerrit.libreoffice.org/57022 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-10-05writerfilter: consistently use "" and <> in include directivesMike Kaganski1-2/+2
[cpp.include] tells that includes in <> are searched in implementation-defined places; includes in "" are searched in other implementation-defined places, and is unsuccessful, then as if they were in <>. MS VisualStudio IDE uses paths configured for the project for includes in <>, and starts with current file paths for includes in "". So, using <> for includes in current source file's directory missing from configured project paths makes IDE show unsuccessful includes and unknown identifiers. This fixes includes in writerfilter source directory. Change-Id: I0bc1147aa68c305afd0c119418f07b655783a466 Reviewed-on: https://gerrit.libreoffice.org/43138 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-05-05loplugin:checkunusedparams in writerfilterNoel Grandin1-2/+1
Change-Id: I52860115a65a23651b6f96363c6f8e5baa78cfad Reviewed-on: https://gerrit.libreoffice.org/37278 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-04-20Related: tdf#106690 DOCX import: don't reduce auto-space accross cellsMiklos Vajna1-0/+2
As suggested at <https://gerrit.libreoffice.org/#/c/36142/>, and it indeed matches the Word behavior. Change-Id: I1ba5b70fc5a7acab52fa4baf816e9f6cd2f913ba Reviewed-on: https://gerrit.libreoffice.org/36719 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-02-09tdf#105852: don't merge cells if there were no merge continuationMike Kaganski1-2/+2
In RTF, it's possible to start a cells merge using \clmgf, and simply omit following cells in the row - they must merge automatically. This makes HorizontallyMergedCell::m_nLastCol/Row uninitialized. Previously, the uninitialized values arrived as 0,0 - thus the first range's cell got merged with cell 0,0. This change prevents the merge; in scenario above, absence of additional cells in row will create merged cell automatically. Change-Id: I68b84b7ec70d9512c541a077689369fa4a8dc0c5 Reviewed-on: https://gerrit.libreoffice.org/34079 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2016-11-10writerfilter: remove never read m_xTableRangeMiklos Vajna1-2/+0
Its last user was writerfilter::dmapper::DomainMapperTableHandler::getTable(), removed in commit 6ea66657ebca5b3ec63f93b496b812888e0d53c9 (loplugin:unusedmethods writerfilter, 2015-07-20). Change-Id: Ibaf536d4dd8f01f4413c3cec033db7438501e58c
2016-11-08tdf#79329 DOCX import: fix missing outer table with floattable at cell startMiklos Vajna1-1/+1
The bug document has a normal table, then its C1 cell starts with a nested table, which is floating. The problem is that converting the nested table to a textframe invalidates the start text range of the C1 cell in the outer table we store, so the conversion of the outer table from text to table fails. This never worked, so to avoid the regression just don't convert inner floating tables to textframes when they're anchored at the cell start. A more general fix in the future can be addressing the actual invalidation of the cell start/end text ranges, and then this specific fix will not be necessary anymore. Change-Id: I12cefa41977cf719b07b0fb3ef9ec423c17ef3b1 Reviewed-on: https://gerrit.libreoffice.org/30685 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-11-04update loplugin:unnnecessaryvirtual to handler destructorsNoel Grandin1-2/+2
and update modules writerfilter..xmloff with the resulting changes Change-Id: I54d19c22ddb0ff579b32e4934d266c925b19305c Reviewed-on: https://gerrit.libreoffice.org/30530 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-04-12clang-tidy performance-unnecessary-value-param in writerfilterNoel Grandin1-3/+3
Change-Id: I1f61be80ac1ebe42668580b09a261e7e3af1a403
2016-01-29writerfilter: uno::Sequence -> std::vector for table rangesMiklos Vajna1-6/+2
Change-Id: If9ea1786a8a4b66288267e6bd6ffca7dfe651e6a
2016-01-28writerfilter: uno::Sequence -> std::vector for table row rangesMiklos Vajna1-4/+2
Change-Id: I16ade5392354ddf030e6ca8969560c56adb0a8f9
2016-01-27writerfilter: uno::Sequence -> std::vector for table cell rangesMiklos Vajna1-1/+1
Change-Id: I858aa0f97d70f245cf5a3d24909de512b33b1249
2016-01-21writerfilter: can use a plain instance for the cell sequence hereMiklos Vajna1-2/+1
Change-Id: I47fee680b6022cc2402341bf523243c526bc8890
2016-01-20writerfilter: can use a plain instance for the row sequence hereMiklos Vajna1-2/+1
Change-Id: Ic9211192310f6a5b36f4ee4637828d96d8f1f7b7
2015-12-22writerfilter: can use a plain instance for the table sequence hereMiklos Vajna1-2/+1
Change-Id: I34dc9cad5e7fb95eee2b0587e0a6b731571d6933
2015-07-21loplugin:unusedmethods writerfilterNoel Grandin1-1/+0
Change-Id: I52441115e14da6c1bcd7ba4926a0f3cc0620366e Reviewed-on: https://gerrit.libreoffice.org/17236 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2015-07-08writerfilter: remove not needed TableDataHandler interfaceMiklos Vajna1-8/+34
Only DomainMapperTableHandler implemented it, and all clients can use that directly, no need for this abstraction here. Change-Id: I800b9eddcfddee643c725c29d9f15db3c9aab02c
2015-07-06remove some unnecessary typedefs around uno::ReferenceNoel Grandin1-14/+9
Not very useful these days, since we have the css:: prefix to reduce verbosity. Found with a search like: git grep -nP 'typedef .*uno::Reference.*<.*>\s+\w+;' | grep -v 'std::' Change-Id: I16f41c53837ec5c613545ae45df38b0daddcbadd Reviewed-on: https://gerrit.libreoffice.org/16730 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-06-23tdf#87460 DOCX import: fix missing endnote in floattableMiklos Vajna1-0/+4
Writer doesn't support foot or endnotes in TextFrames, so they are not supported in OOXML floattables, either. In the past, floattables were imported as normal tables, that's how this worked. Restore the old situation till the core limitation is there, so we at least don't regress. Change-Id: I4eb62617e3131176f7371e9ca69f11bc9e948a0b
2015-04-11writerfilter: no need to spell out com::sun::star, css is enoughMiklos Vajna1-8/+8
Change-Id: I7dfcb041509508969135a325bdef709de7a8218f Reviewed-on: https://gerrit.libreoffice.org/15247 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2015-02-06fdo#75757: Remove inheritance from std::vectorMatthew Pottage1-2/+2
Deprecated comphelper/sequenceasvector.hxx. Rewritten code using it. Using instead the functions containerToSequence and sequenceToContainer, found in include/comphelper/sequence.hxx. One class that inherits from it (in framework/inc/stdtypes.h), and the code using that has been left. Signed-off-by: Michael Stahl <mstahl@redhat.com> Conflicts: writerfilter/source/dmapper/DomainMapper.cxx writerfilter/source/dmapper/TblStylePrHandler.hxx writerfilter/source/dmapper/WrapPolygonHandler.hxx Change-Id: Ice61c94ffb052e389281aebb7cdf185134221061
2015-01-26new loplugin: change virtual methods to non-virtualNoel Grandin1-4/+1
Where we can prove that the virtual method is never overriden. In the case of pure-virtual methods, we remove the method entirely. Sometimes this leads to entire methods and fields being eliminated. Change-Id: I138ef81c95f115dbd8c023a83cfc7e9d5d6d14ae
2014-12-30writerfilter: boost::shared_ptr -> c++11 std::shared_ptrMiklos Vajna1-4/+4
Change-Id: Ib5649d8979093bb147c61eebcf95a472ad899672
2014-12-06No need to have TableDataHandler as a templateMiklos Vajna1-3/+2
Change-Id: If19feb011db4027bae6f0c59b48967657c36b7a8
2014-11-30writerfilter: only dmapper needs TableManager.hxxMiklos Vajna1-1/+1
Change-Id: I3354f82a3dd0a598b5405ab32c5d1b0d370829c3
2014-10-13Avoid manual realloc, use comphelper::SequenceAsVector insteadMiklos Vajna1-1/+2
Change-Id: I26c6bcf7361bbb787fcb4133d05b0a668fd72d01
2014-07-22writerfilter: pass uno::Reference by reference, more dmapper...Michael Stahl1-1/+2
Change-Id: I9eba51e3fe2a50488d2ff9320bf68fe6ae65040d
2014-05-19writerfilter: remove using namespace from headersThomas Arnhold1-1/+1
Change-Id: Ibbb234a15de9ddb71552ef083ade72d2ac724ee0
2014-04-19fixincludeguards.sh: writerfilterThomas Arnhold1-3/+3
2014-03-27Second batch of adding SAL_OVERRIDE to overriding function declarationsStephan Bergmann1-6/+6
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
2014-02-03Remove needless WRITERFILTER_DLLPRIVATE annotationsStephan Bergmann1-1/+1
Change-Id: I8149471775d623f52231d12f05a28e98b33fae6a
2014-01-23coverity#1158417 Uninitialized scalar fieldCaolán McNamara1-2/+4
Change-Id: I120eb012151b799b84974222c08b02d0cb73975c
2013-12-27Related: fdo#65090 DOCX import: handle w:hMerge cell propertyMiklos Vajna1-1/+16
Change-Id: I82f334426715fd1a1f0105b86f763d41e66f32da
2013-08-15DOCX import: handle custom left cell margin for float table positionMiklos Vajna1-2/+0
Change-Id: I5bc51b739c663d3e123c9d7fb4c2a70f01f8c841
2013-08-14DOCX import: fixed horizontal position of floating tablesMiklos Vajna1-1/+3
In Word, just like normal tables, floating tables should be positioned in a way that the start of the cell text has the same horizontal position as normal paragraph text. To emulate this, first the table should be moved left by the table border distance, then also by the border with / 2; as done for non-floating tables already. Change-Id: I581311fbb08009e6c1839106e8f615d078a4a705
2012-09-20docx import: position table using tblInd OR tblCellMarPierre-Eric Pelloux-Prayer1-1/+1
Previously cell-margin was unconditionnaly used to compute table position. Office only does so on top-level tables and if tblInd is missing. Change-Id: I183647bcf090d5822b3f2e04e097c8bbd277168d
2012-06-28re-base on ALv2 code. Includes:Michael Meeks1-23/+14
Avoid some uses of non portable #!/bin/bash in shell scripts. Patch contributed by Pedro Giffuni http://svn.apache.org/viewvc?view=revision&revision=1235297
2011-06-20gnumake4: switching gbuildizationBjoern Michaelsen1-19/+10
* mostly switching to gnumake4/writerfilter10 gbuild implementation (thanks mst, hb)
2011-06-19Merge branch 'master' into feature/gnumake4Bjoern Michaelsen1-1/+4
Conflicts: filter/source/config/cache/filtercache.cxx filter/source/odfflatxml/makefile.mk oox/Library_oox.mk oox/Makefile oox/Module_oox.mk oox/Package_generated.mk oox/Package_inc.mk oox/prj/build.lst oox/prj/d.lst oox/prj/makefile.mk oox/source/dump/makefile.mk unoxml/Library_unordf.mk unoxml/Library_unoxml.mk writerfilter/CppunitTest_writerfilter_doctok.mk writerfilter/Library_writerfilter.mk writerfilter/Module_writerfilter.mk writerfilter/Package_inc.mk writerfilter/inc/resourcemodel/TagLogger.hxx writerfilter/inc/resourcemodel/WW8ResourceModel.hxx writerfilter/prj/build.lst writerfilter/prj/makefile.mk writerfilter/qa/complex/ooxml/makefile.mk writerfilter/qa/cppunittests/doctok/makefile.mk writerfilter/qa/cppunittests/doctok/testdoctok.cxx writerfilter/qa/cppunittests/xxml/testXXML.cxx writerfilter/source/dmapper/DomainMapper.cxx writerfilter/source/dmapper/DomainMapperTableHandler.cxx writerfilter/source/dmapper/DomainMapperTableManager.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/FontTable.cxx writerfilter/source/dmapper/GraphicHelpers.cxx writerfilter/source/dmapper/PropertyIds.cxx writerfilter/source/dmapper/PropertyMap.cxx writerfilter/source/dmapper/SettingsTable.cxx writerfilter/source/dmapper/StyleSheetTable.cxx writerfilter/source/dmapper/TablePropertiesHandler.cxx writerfilter/source/dmapper/TblStylePrHandler.cxx writerfilter/source/dmapper/ThemeTable.cxx writerfilter/source/doctok/WW8DocumentImpl.cxx writerfilter/source/doctok/resourcesimpl.xsl writerfilter/source/filter/WriterFilter.cxx writerfilter/source/generated.mk writerfilter/source/ooxml/OOXMLDocumentImpl.cxx writerfilter/source/ooxml/OOXMLFactory.cxx writerfilter/source/ooxml/OOXMLFactory.hxx writerfilter/source/ooxml/OOXMLStreamImpl.cxx writerfilter/source/ooxml/RefAndPointer.hxx writerfilter/source/resourcemodel/TagLogger.cxx writerfilter/unocomponent/component.cxx writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx