summaryrefslogtreecommitdiff
path: root/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
AgeCommit message (Collapse)AuthorFilesLines
2014-09-30Related: fdo#73608 don't crash on missing table stylesCaolán McNamara1-1/+15
(cherry picked from commit 5fd7382651d64f77e8ad1d9a5c053f52f3641f9f) Conflicts: writerfilter/source/dmapper/DomainMapperTableHandler.cxx Change-Id: I340b43b7afc4c5c4d6dc8e4ed182279240306540 Resolves: fdo#73608 bail out on loop in style sheet hierarchy Change-Id: I03975d1ce8eaceceb4d5c263eb11c1521bcd57eb (cherry picked from commit be18133e84120625734a09380594ee89b23c4322) Reviewed-on: https://gerrit.libreoffice.org/11680 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-07-06bnc#865381 DOCX import: handle w:jc=center inside w:textDirection=btLrMiklos Vajna1-0/+17
Change-Id: I102c70429457515b34e74cb8e82e1417e6276d1d (cherry picked from commit 3325e0f206ce864730468c3556ce06760042c157) Reviewed-on: https://gerrit.libreoffice.org/10049 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-03-27Revert "rhbz#1075124: writerfilter: fix tables with negative left margin"Luboš Luňák1-12/+12
It appears that this was just a workaround that incidentally worked. Making the negative value even larger (in abs value) doesn't seem to make a difference for MSO, but LO fails again. A proper fix (better workaround?) will follow. This reverts commit 2e558f32ef79948858723b9781fbd388850b462b. Change-Id: I56fd5e9d7ce9aa178f7e508f8e7ac3bc0ff2b971 Reviewed-on: https://gerrit.libreoffice.org/8763 Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-03-12rhbz#1075124: writerfilter: fix tables with negative left marginMichael Stahl1-12/+12
SvxBoxItem::nLeftDist is unsigned; the bugdoc sets a very large value due to wrap-around which causes the table content not to be displayed. DomainMapperTableHandler::endTableGetTableStyle() tweaks the rInfo.nLeftBorderDistance by adding half the border line width to it, which makes it positive; at that point the value has already been used to init table::TableBorderDistances, so move that downward so it gets the positive value too. Change-Id: Ied2331b93f2e95845d7e8b2cc06e89e1ab24296e (cherry picked from commit 76aa23c59b4c81ea7b9d974a1a0a9e39c6bf8741) Reviewed-on: https://gerrit.libreoffice.org/8537 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-18fdo#74357 DOCX import: fix nested tables anchored inside tablesMiklos Vajna1-1/+4
Regression from bbef85c157169efa958ea1014d91d467cb243e6f (bnc#779620 DOCX import: try harder to convert floating tables to text frames, 2013-10-01), the conversion of nested tables is delayed by default till we know the page size. However, in case the anchor is in a table, we should convert it right away, because the conversion of the parent table would invalidate our XTextRange references. (cherry picked from commit e5fd7c2dacf3c128cdc62622e736ce8abbc578a5) Change-Id: Id41556e721c6e1c7239e4ea25abd57c999d2219b Reviewed-on: https://gerrit.libreoffice.org/8080 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-12-28fdo#65090 RTF filter: import RTF_CLMGF and RTF_CLMRGMiklos Vajna1-2/+41
These describe an explicit horizontal merge, that is not something Word itself creates, but it turns out the Calc RTF export does. (cherry picked from commits bb562304c1e1c61a882e6db65806cfdf8601bcbf, 97dcf77841d19d344d58d5bdacdab141cdea4817 and 6eb02ac8a77f9f89f256b190281029f6cbd60d95) Change-Id: I1b6ec10bb8e8bd40e24791ccc96f2f066dd0d5d5
2013-11-15Fixed for spacing between lines in table is getting preserve.PriyankaGaikwad1-0/+3
Problem Description: In "w:spacing" value of "w:line" attribute value in table is not getting is preserved. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/6678 Change-Id: I2b0284a22da3a828c81876960f488049be4f8681
2013-10-14writerfilter: fix dbglevel=2 buildMiklos Vajna1-3/+3
Change-Id: Icc20bb1de73c119efdb9dd80f35cdb9f2d342529
2013-10-09Kill PropertyDefinition; use PropValue instead.Jan Holesovsky1-30/+24
PropertyDefinition was introduced long ago, probably in order not to have to touch larger amount of code when it turned out that it was necessary to store more information in PropertyMap - otherwise even then it was more logical to extend the value from uno::Any only to some structure. PropertyMap's API itself is quite non-convenient, it is half-way between direct access to the std::map it is derived from, and something built on top of that. In the long run I believe we want to make _PropertyMap member of PropertyMap, not an ancestor, and change the API; if anybody cares enough, that is ;-) Change-Id: Ib8e9bfc4561f003b78ab6ce6620722e251f661d6
2013-10-01bnc#779620 DOCX import: try harder to convert floating tables to text framesMiklos Vajna1-14/+11
Since 78d1f1c2835b9fae0f91ed771fc1d594c7817502, we convert floating tables to text frames only in case it's possible that there will be wrapping, to give better results for multi-page tables, which are multi-page, and technically floating ones, but that has no effect on the layout. The problem was that we try to do this decision too early, effectively the page width and margins were counted from the default letter size, instead of the actual values, which did not arrive at the time of the decision. Fix this by moving this logic at the section end. Change-Id: Ic1fbceb54c8ec223ed01836fafe6220bb3b2410a
2013-09-03fdo#68607 bnc#816593 DomainMapperTableHandler: don't always start a frameMiklos Vajna1-1/+14
This is a port of commit 8fe8bd6c3b5b1a539b7370f8c457fa69c061d2de "Related: fdo#61594 SwWW8ImplReader::StartApo: don't always start a frame" from the WW8 filter to the DOCX one. (regression from edc4861a68e0269b83b17e0ec57912a1ce4220ad) Change-Id: If1bb4a8a3786aacd618585cf859b57ce9be85c51
2013-08-29bnc#816593 DOCX filter: import paragraph spacing from table styleMiklos Vajna1-0/+38
Change-Id: I9dce59ecd8a2d2bfadb8c7273cd46c6c0cf17774
2013-08-15DOCX import: handle custom left cell margin for float table positionMiklos Vajna1-15/+22
Change-Id: I5bc51b739c663d3e123c9d7fb4c2a70f01f8c841
2013-08-14DOCX import: fixed horizontal position of floating tablesMiklos Vajna1-7/+23
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
2013-07-05writerfilter: PropertyMap::Insert's bIsTextProperty parameter is unusedMiklos Vajna1-28/+28
Change-Id: I2d55043490f895ef439e88bcd1fed51b857255be
2013-07-04writerfilter::dmapper::PropertyDefinition::bIsTextProperty is never readMiklos Vajna1-14/+14
Change-Id: I9d0ce39c1c47d8b89bd675ce91f6cfe2e9c3a061
2013-05-28n#816593: Floating table width import fix: adjust the frame widthCédric Bosdonnat1-3/+17
Change-Id: I8212bc5981418f6cbd514bf5002e6a5dbdf53152
2013-04-03writerfilter: fix silly init causing trivial STL assertion in testMichael Stahl1-2/+2
(regression from 35b75ed510f49ff64cd86b38e228c2b5b9a9f3fc) Change-Id: I4342fd619f4d1f760b8fef2594a67b9fb7cd8f0e
2013-04-03ooxmlimport: conditional table styles fixedSJacobi1-25/+77
Change-Id: I84f1d7c718dfc120b76364479ca68f63d2549b9f Reviewed-on: https://gerrit.libreoffice.org/3175 Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Tested-by: Thorsten Behrens <tbehrens@suse.com>
2013-03-28fixed table width, supporting rel table width, fixed grid handlingSJacobi1-2/+13
Change-Id: I28e66ed19e22f0e520f6b16a86a9e032e03d5bd8 Reviewed-on: https://gerrit.libreoffice.org/3110 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-21n#779642: table positions need to be stacked to handle nested tableCédric Bosdonnat1-1/+1
2013-02-20n#779642: Fixed floating tables import in writerfilterCédric Bosdonnat1-40/+6
2013-01-11docx import: fix incorrect nested table marginsPierre-Eric Pelloux-Prayer1-1/+3
Change-Id: I07f0f47fcbd3d463d7831820cde338d8d59d9b68
2012-10-30writerfilter: clean up PropertyMap::insert mess:Michael Stahl1-7/+7
Rumor has it that MSVC 2010 has problems choosing the right overload in PropertyMap::insert call, which is no surprise as that is a ridiculous piece of garbage. Special bonus points for having another class TablePropsRef that must have a call compatible method because it's used as parameter to the same templates, and for the call with a pointer converted to boolean implicitly in StyleSheetTable.cxx:163. Also remove the silly boolean parameter while at it, just have 2 methods instead. Change-Id: I022d5dd7008f3e6c510d94e19fbacbf04bcf1986
2012-10-13writerfilter: fix new clang warningsMiklos Vajna1-11/+11
Change-Id: I0f7cec0f300290fe3ea465f344cfda642824ed0b
2012-10-02Make Clang happyMiklos Vajna1-2/+2
Change-Id: I69c886d0a1875ec674f40c2422dc1490418c1da3
2012-10-02docx import: properly import table positionPierre-Eric Pelloux-Prayer1-16/+11
This a follow up of commit 53b7f7df0617bcbd7bbef9a34ef53e5097eb16dc Change-Id: Ia0f79ca24418636af14162e9f339237d847dc221 Reviewed-on: https://gerrit.libreoffice.org/714 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2012-10-02docx import: set table above/bottom spacing to 0Pierre-Eric Pelloux-Prayer1-0/+5
Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I3e0397dd3d5d14f1e584ac7bc3d22d4638393b06
2012-09-20docx import: position table using tblInd OR tblCellMarPierre-Eric Pelloux-Prayer1-2/+22
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-09-18deprecate oustringostreaminserter.hxxNorbert Thiebaud1-1/+1
the intent of this header has canged over time. now it is already systematically included with ustring.hxx and the operator overload it provide fit nicely there... Just to be safe, since that include as been added to the api during the 3.5 timeframe and therefore is already in 'production' the header remain and simply attempt to include ustring.hxx but a warning is issued indicating that this header should not be used anymore... in a couple of major release we will thenr emove it completely All internal users of that header are converted. Change-Id: I8934c55f089e29d78c0f5649b7c87b2ecf024bad Reviewed-on: https://gerrit.libreoffice.org/634 Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-08-21n#775899 initial docx import of w:vertAnchor inside w:tblpPrMiklos Vajna1-1/+64
Change-Id: I5c848a8d4c860a83d6729b8db40f744afad906d5
2012-07-21dmapper: rtl::OUString -> OUStringMiklos Vajna1-9/+9
Change-Id: Ib14cf2731a451226deb4aa27fd05420a0daaba4f
2012-07-01Remove unused definesThomas Arnhold1-1/+0
Change-Id: Ic36b131ee9964a6671f7f41e1cad1631c43ad565
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
2012-04-27WaE: msvc2008 unused variablesCaolán McNamara1-0/+2
Change-Id: If956faf42dcc5625c490e685d6ca69bb07e00188
2012-02-27clarify ambiguitiesCaolán McNamara1-1/+1
2012-01-23Fix for fdo43460 Part XLV getLength() to isEmpty()Olivier Hallot1-1/+1
Part XLV Modules writerfilter, writerperfect
2012-01-09catch exception by constant referenceTakeshi Abe1-2/+2
2011-12-24dmapper: clog -> SAL_WARNMiklos Vajna1-7/+2
2011-12-05sw, fixed some missing include in dbglevel>1Cédric Bosdonnat1-4/+2
2011-11-08sw, writerfilter: fixed debug builds and output dmapper table messagesCédric Bosdonnat1-1/+3
2011-10-07WaE: unreferenced local variableTor Lillqvist1-0/+2
2011-08-04dmapper: m_xText may be nullMiklos Vajna1-5/+9
2011-07-27 #if -> #ifdef for conditional compilationLuboš Luňák1-2/+2
2011-07-27avoid iterator retreating before the start of an empty listLuboš Luňák1-1/+1
2011-06-20gnumake4: switching gbuildizationBjoern Michaelsen1-63/+3
* mostly switching to gnumake4/writerfilter10 gbuild implementation (thanks mst, hb)
2011-06-19Merge branch 'master' into feature/gnumake4Bjoern Michaelsen1-113/+99
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
2011-06-17debug table structure, remove lcl_printProperties [hg:08e908d8968c]Henning Brinkmann1-0/+58
2011-06-17removed output to stderr [hg:9467e7f6cd60]Henning Brinkmann1-3/+3
2011-06-17imported patch cppcheck [hg:d55fc25e48ab]Henning Brinkmann1-0/+2
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-18 14:07:38 +0000