summaryrefslogtreecommitdiff
path: root/writerfilter/source
AgeCommit message (Collapse)AuthorFilesLines
2013-03-05Merge branch 'distro/suse/suse-3.6' of ssh://logerrit/core into suse-3.6Petr Mladek1-1/+4
2013-03-04fdo#61000: writerfilter: filter out unsupported list tab stopsMichael Stahl1-1/+7
Change-Id: Ic9d31eba84b1d8d9cf93d8289621a65d43521a8b (cherry picked from commit dbb74ee9950dc706ea4fde3397a4c1d19b172fa9) Reviewed-on: https://gerrit.libreoffice.org/2465 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-03-04Merge tag 'libreoffice-3.6.5.2' into suse-3.6Petr Mladek13-155/+248
Tag libreoffice-3.6.5.2 Conflicts: editeng/source/editeng/impedit3.cxx instsetoo_native/util/openoffice.lst oovbaapi/UnoApi_oovbaapi.mk sc/source/filter/oox/workbookhelper.cxx sc/source/ui/app/scmod.cxx sc/source/ui/cctrl/checklistmenu.cxx solenv/inc/minor.mk writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/DomainMapper_Impl.hxx writerfilter/source/dmapper/PropertyMap.cxx Change-Id: I7ea70b82b3b874cbe78354d5dd97307e63842e72
2013-03-04Make LO buildable again after the GraphicFilter move.Jan Holesovsky1-1/+4
Conflicts: cui/source/dialogs/SpellDialog.cxx editeng/source/items/frmitems.cxx filter/qa/cppunit/filters-pict-test.cxx sd/source/filter/grf/sdgrffilter.cxx sd/source/ui/app/sddll.cxx svgio/source/svgreader/svgimagenode.cxx svtools/Library_svt.mk svtools/Module_svtools.mk svtools/Package_inc.mk svtools/source/filter/exportdialog.cxx svx/source/core/graphichelper.cxx svx/source/dialog/compressgraphicdialog.cxx sw/source/ui/shells/grfshex.cxx sw/source/ui/uiview/view2.cxx sw/source/ui/utlui/glbltree.cxx test/source/bootstrapfixture.cxx tubes/source/contacts.cxx vcl/Library_vcl.mk vcl/qa/cppunit/graphicfilter/filters-test.cxx vcl/source/filter/FilterConfigCache.cxx vcl/source/filter/graphicfilter.cxx writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: I3455a7294b136400f32163626d5a7a7f2bfa898c
2013-02-22Fixed conflict resolution problemsCédric Bosdonnat1-1/+0
Change-Id: Icfe653b3a5f307d21a8c99ce4c133234aa36378b
2013-02-21n#779642: table positions need to be stacked to handle nested tableCédric Bosdonnat3-6/+27
(cherry picked from commit 36c64bc194714d60a5c18f63bcfc0f721c2056db) Conflicts: writerfilter/source/dmapper/DomainMapperTableManager.hxx Change-Id: If592f5a2f29c207daf9a603a4332da9bc8c5ae3b
2013-02-20n#779642: Fixed floating tables import in writerfilterCédric Bosdonnat6-56/+143
(cherry picked from commit d0cde9640b52ccfbb28ed1f65bba0927afd7b69b) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx writerfilter/source/dmapper/DomainMapperTableManager.cxx writerfilter/source/dmapper/DomainMapperTableManager.hxx writerfilter/source/dmapper/TablePositionHandler.cxx writerfilter/source/dmapper/TablePositionHandler.hxx Change-Id: I706d36358db98524bdf5d1caf0f0543b9170b0bc
2013-02-18n#779642: ignore framePr inside table or the table import won't workCédric Bosdonnat2-3/+4
Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx
2013-01-09fdo#58933 RTF import: avoid fake pars / cells when having graphic inside cellsMiklos Vajna1-3/+4
Regression from 8063e36115a11ddf3db05928db9287947beee74d. (cherry picked from commit 555bc780c83114220012e198b5471a0d7452fb32) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: Ied422751783a00983bd137d6151e0d58217ef76d Reviewed-on: https://gerrit.libreoffice.org/1618 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-01-08n#793998 sw: add TabOverMargin compat modeMiklos Vajna1-0/+1
In case the right margin is larger then the tab position (e.g. the right margin of 7cm, there is a tab position at 16cm and right margin begins at 9cm), we have a conflicting case. In Word, the tab has priority, so in this conflicting case, the text can be outside the specified margin. In Writer, the right margin has priority. Add a compat flag to let the tab have priority in Writer as well for Word formats. This is similar to TabOverflow, but that was only applied to left tabs and only in case there were no characters after the tabs in the paragraph. (cherry picked from commit bdfc6363d66aa079512cc8008996b633f693fed1) Conflicts: sw/inc/IDocumentSettingAccess.hxx sw/inc/doc.hxx sw/source/core/doc/doc.cxx sw/source/core/doc/docnew.cxx sw/source/filter/xml/xmlimp.cxx sw/source/ui/uno/SwXDocumentSettings.cxx writerfilter/source/filter/ImportFilter.cxx Change-Id: Ib07abd5db1daa916b8b4d9530d09d4d0c4af026e
2013-01-04n#793262 DOCX: import w:tcMar inside w:tcMiklos Vajna2-1/+25
These were ignored previously, and in case they contained some margins, the resulting table was potentially smaller than necessary. (cherry picked from commit 672de66ff8ad6d1fbf8a198ee518c996611b9e2d)
2013-01-04n#793262 fix DOCX import of last empty header/footer para char propsMiklos Vajna1-2/+15
At the end of the header/footer import, the last empty paragraph was removed. In case the last but one paragraph was empty, but had character properties (e.g. a custom font size), the removal changed these, and used the character properties of the last paragraph instead. Simply dispose the last paragraph, this way character properties are always kept. (cherry picked from commit e8b661dd0aed9b35104e910acbb814748a2c3af0) Conflicts: writerfilter/source/dmapper/DomainMapper_Impl.cxx Change-Id: Ic78f197fe99458becb9d86901bee6dfcb7076a13
2013-01-02n#793401, fdo#53175: Don't load the default values of the styles in writerfilterCédric Bosdonnat1-0/+2
...or we may have some additional properties set on some styles. (cherry picked from commit b95d203bc17c83ec0fe5139f519d53ed1d842d3a) Conflicts: sw/inc/IDocumentSettingAccess.hxx sw/inc/doc.hxx sw/source/core/doc/doc.cxx sw/source/ui/uno/SwXDocumentSettings.cxx writerfilter/source/filter/ImportFilter.cxx Change-Id: I5a5d307931a2a6c1f25bd2da93381d8de65c2480
2012-12-28fdo#57678 fix import of RTF_PARD between RTF_CELL and RTF_ROWMiklos Vajna1-3/+8
(cherry picked from commits 6fc868c6535932bedfa0fc51d8dd5a1814d73ee8 and c58981ca3dbf65c998acf979fb104534991b08c4) Change-Id: I3e3d0de98c9df1a5f9041f6a7dd03b92efb5d0f5 Reviewed-on: https://gerrit.libreoffice.org/1482 Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com> Tested-by: Muthu Subramanian K <muthusuba@gmail.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-12-21Resolves: fdo#49587 apparent loop in style hierarchyCaolán McNamara1-1/+8
Change-Id: I32317a1a6500377f7e7bb98d1dcc65ad86feb9a2 (cherry picked from commit 7e3923520c27ff139bc3abab35a1c01e1a785fb1) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-12-21fdo#54473 fdo#57133 fix RTF import of character stylesMiklos Vajna1-1/+1
Regression from commit d2d77fd86e6cb7341e113557e2cfe3d7948759bd (cherry picked from commit 41890bf714803969515578b47e63fa9730ea7090) Change-Id: I7accc5c383de3fa53c12527766c3fc155bfa9863 Reviewed-on: https://gerrit.libreoffice.org/1235 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-12-17n#792778 DOCX import: parse group shapes in oox onlyMiklos Vajna1-17/+25
Previously textframes inside groupshapes were tried to be imported as TextFrames, but then their addition to a GroupShape failed, so the text simply ended up as a normal paragraph. Fix this by importing members of groupshapes as drawinglayer objects, just like how the WW8 import does. Also fix two testcases, which implicitely tested that the groupshape VML element is ignored on import. (cherry picked from commits 7fe05dc95d0c9a584e07483c04b13c071d55293f and d5c934d150cb6cea5f96cbbee4fb5e8312bf027e) Conflicts: oox/source/vml/vmlshape.cxx oox/source/vml/vmltextbox.cxx Change-Id: I1a9fba8a5fd532203a825e55b1d5996277ea12fa
2012-12-12Resolves: fdo#49587 apparent loop in style hierarchyCaolán McNamara1-1/+8
Change-Id: I32317a1a6500377f7e7bb98d1dcc65ad86feb9a2 (cherry picked from commit 7e3923520c27ff139bc3abab35a1c01e1a785fb1) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-12-04fdo#54473 fdo#57133 fix RTF import of character stylesMiklos Vajna1-1/+1
Regression from commit d2d77fd86e6cb7341e113557e2cfe3d7948759bd (cherry picked from commit 41890bf714803969515578b47e63fa9730ea7090) Change-Id: I7accc5c383de3fa53c12527766c3fc155bfa9863 Reviewed-on: https://gerrit.libreoffice.org/1235 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-12-01fdo#57708 fix RTF import of pictures right before text framesMiklos Vajna2-1/+10
Change-Id: Ibfeaadd5b48fd48c2c1f20de5dc272d9a326bfc4 (cherry picked from commit 8063e36115a11ddf3db05928db9287947beee74d) Reviewed-on: https://gerrit.libreoffice.org/1215 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2012-12-01fdo#57708 fix fake page break problem during RTF importMiklos Vajna3-35/+51
The core of this change is: so far the continous section break at the end of the document was sent as a normal section break. This was introduced in commit 892d33c8d5033b4f8f7889bf91d257f55adf0e1f, probably as a workaround (sadly it's not documented and I no longer remember). Don't do this, since it causes additional page breaks during import. Instead, fix properly whatever was broken after getting rid of this workaround. (cherry picked from commits b836bf389d1150c9cafbb0aefa641af2316e536c and 3f13a8255be93cd3b697f42d691b35418eb87114) Conflicts: writerfilter/source/dmapper/PropertyMap.cxx writerfilter/source/rtftok/rtfdocumentimpl.cxx writerfilter/source/rtftok/rtfdocumentimpl.hxx Change-Id: I28c372d539c150fe21ff9db31209f9935a5e9063 Reviewed-on: https://gerrit.libreoffice.org/1214 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2012-12-01split qnametostr up to try and make .o's small enough for ppc64Caolán McNamara5-82/+89
i.e. relocation truncated to fix: R_PPC64_TOC16_DS while I'm at it merge the standalone header/footer files into the .xslt and simplify the makefile. (cherry picked from commit 4ee0ee4971119b0460fc3e7819a23acd34202dc4) Conflicts: writerfilter/CustomTarget_source.mk writerfilter/source/resourcemodel/qnametostrfooter Change-Id: Iee0e9b5dd96868f49f1bed22fb5dc6d28c8cef81 Reviewed-on: https://gerrit.libreoffice.org/1201 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2012-11-28bigendian utext mixup triggering regression test failureCaolán McNamara1-26/+25
text takes a pointer to a sal_uInt8 buffer but utext takes a pointer to a sal_Unicode buffer passing a sal_uInt8 sequence of e.g. "\x0D\x00" to utext only happens to work on little endian machines to represent 0x000D, its 0x0D00 on bigendian. for more excitement text and utext do not share the same logic! Various special chars are treated different in text vs utext so we can't simply blindly change utext() calls to text() calls and get the same behaviour without reworking those. So keep the text()/utext() calls as they are, but change what's passed to be the right thing. Change-Id: I66696530c4a9482690c461146bdcf0a507b39b68 (cherry picked from commit 49f2a69fa7d8eaa23d77519ac29748f4dc3e4c5a) Reviewed-on: https://gerrit.libreoffice.org/1188 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2012-11-19n#780645 DOCX import: add support for fixed column widthMiklos Vajna2-1/+72
In general, DOCX tables provide a grid for the table, then use spans in case different number of cells are used in different rows. In this case, the cell width is ignored, as the wished width can be counted from the grid and span values. However, it's also valid to simply provide more cells then the amount defined by the grid, and in this case the cell width should decide the final width of the cells. This commit adds support for this later case. (cherry picked from commit ad913681c0e0cdaaa706329f518f59ee54b86d43) Conflicts: writerfilter/source/dmapper/DomainMapperTableManager.cxx Change-Id: I0dd6c1f0c06f81c2afa00489b7ad1f33ff300a7c
2012-11-14fdo#55525 import RTF_TRLEFTMiklos Vajna1-0/+37
Additionally: 1) Make sure cell margins are zero when they are not defined. 2) Handle cellx values in case of a negative left margin. (cherry picked from commit c4b91ae3178011c66c76c711c1a6469ba658872e) Change-Id: I9b8fb700b6459e622396c98e4344aba79f62c96e Reviewed-on: https://gerrit.libreoffice.org/1058 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
2012-11-07fdo#52989 ignore provided size of JPEG files during RTF importMiklos Vajna2-3/+7
See commit 66fa759b for rationale, this fix just does the same for JPEG files as well. (cherry picked from commit ebc61e11cdb02f5cc33aeabead3d191eaf0d23d3) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I6a9ead5f4b4b9c4661cae99501bd7c14a2a79409 Reviewed-on: https://gerrit.libreoffice.org/991 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2012-11-07fdo#48442 fix default hori/vert frame anchor during RTF importMiklos Vajna1-4/+6
We used to send nothing when we got nothing, but this is not correct: \pvmrg and \phmrg is the default in RTF, but not in Writer. (cherry picked from commit 7b7bee4ed5722ce59ffd3394a0330d71d69d66b3) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I9f69e282e68f0828c8b5ba98657cad1dd0715eb3 Reviewed-on: https://gerrit.libreoffice.org/993 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2012-11-06fdo#52989 ignore provided size of JPEG files during RTF importMiklos Vajna2-3/+7
See commit 66fa759b for rationale, this fix just does the same for JPEG files as well. (cherry picked from commit ebc61e11cdb02f5cc33aeabead3d191eaf0d23d3) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I6a9ead5f4b4b9c4661cae99501bd7c14a2a79409 Reviewed-on: https://gerrit.libreoffice.org/991 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2012-11-06fdo#48442 fix default hori/vert frame anchor during RTF importMiklos Vajna1-4/+6
We used to send nothing when we got nothing, but this is not correct: \pvmrg and \phmrg is the default in RTF, but not in Writer. (cherry picked from commit 7b7bee4ed5722ce59ffd3394a0330d71d69d66b3) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I9f69e282e68f0828c8b5ba98657cad1dd0715eb3 Reviewed-on: https://gerrit.libreoffice.org/993 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2012-11-05fdo#55493 fix RTF import of specific PNG imageMiklos Vajna1-6/+12
The image was special in that the resulting Graphic's GetPrefMapMode().GetMapUnit() wasn't MAP_PIXEL. (cherry picked from commit 5ef0f1dc9a70c20fe6879832b782a0c34724353f) Conflicts: writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: I681e344a042721b99f6cb2e599f9c65156d219a4 Reviewed-on: https://gerrit.libreoffice.org/860 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2012-11-05fdo#52208 DOCX import: don't always ignore cont sect break at the doc endMiklos Vajna2-2/+11
Regression from commit 1fdd61db155cf63d5dd55cc2bfb45af33796e131, continuous section break does make sense at the end of the doc, if the previous type was a non-continuous. (cherry picked from commit abd4ffadf30e02284290ea35e8f45d9ffd8eb5ee) Change-Id: I6d82c67e068d8dc3ce1edb1a5fe6ad293afd805d Reviewed-on: https://gerrit.libreoffice.org/877 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2012-11-05Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6Petr Mladek5-73/+30
Conflicts: desktop/source/app/sofficemain.cxx instsetoo_native/util/openoffice.lst solenv/inc/minor.mk Change-Id: I3e9510067c7173f6c71368e70ba6dfe168c5318e
2012-10-31n#785767 import NS_ooxml::LN_CT_TrPrBase_gridBeforeMiklos Vajna2-3/+8
Change-Id: Id7f1471b49af52e6f6b0515ccd1fe8e12c50d9b5
2012-10-31n#785767 import NS_ooxml::LN_CT_TrPrBase_gridAfterMiklos Vajna2-1/+8
Change-Id: I4cb64ae2b2f2dbf643e38c5208eb759f265acafd
2012-10-30n#780645 docx import: properly import table positionPierre-Eric Pelloux-Prayer1-16/+11
This a follow up of commit 53b7f7df0617bcbd7bbef9a34ef53e5097eb16dc Reviewed-on: https://gerrit.libreoffice.org/714 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz> (cherry picked from commit 3cb619bd15a6017f253891f4c377fc790d8aae82) Change-Id: Ia0f79ca24418636af14162e9f339237d847dc221
2012-10-29Revert "n#778140 fix import of w:fldSimple character properties"Miklos Vajna2-8/+1
This reverts commit 29982fd31b163730ad54c414bf772e021af31e9b. It turns out that this hack is not really needed for n#778140, but it causes problems, for example in case of n#775899.
2012-10-29DOCX: w:doNotUseHTMLParagraphAutoSpacing should affect AddParaTableSpacingMiklos Vajna2-2/+2
commit 5d4bd2f97128adecc5b11699e98c934be3c3a462 unconditionally enabled AddParaTableSpacing doc setting, which broke the layout of some documents, e.g. n#778836. Fix this by doing what the WW8 importer does: enable the setting only in case the w:doNotUseHTMLParagraphAutoSpacing tag is present. (cherry picked from commit 68338abfd657ad5511a8a77b431ace8ad465c35e) Conflicts: writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/filter/ImportFilter.cxx Change-Id: I104259a1f37f28e3c4362eb638a134b593fcb851
2012-10-19fdo#46669 sw: RTF paste should not change page stylesMiklos Vajna5-8/+24
(cherry picked from commit 4f1ba0486241bd239e46b71405662db8e10d9b96) Conflicts: writerfilter/inc/dmapper/DomainMapper.hxx writerfilter/source/dmapper/DomainMapper.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/DomainMapper_Impl.hxx writerfilter/source/filter/RtfFilter.cxx Change-Id: Ic163a639fae9de838258b3cca9567a29ab875a35 Reviewed-on: https://gerrit.libreoffice.org/878 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2012-10-19fdo#52208 DOCX import: don't always ignore cont sect break at the doc endMiklos Vajna2-2/+11
Regression from commit 1fdd61db155cf63d5dd55cc2bfb45af33796e131, continuous section break does make sense at the end of the doc, if the previous type was a non-continuous. (cherry picked from commit abd4ffadf30e02284290ea35e8f45d9ffd8eb5ee) Change-Id: I6d82c67e068d8dc3ce1edb1a5fe6ad293afd805d Reviewed-on: https://gerrit.libreoffice.org/877 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2012-10-19fdo#55493 fix RTF import of specific PNG imageMiklos Vajna1-6/+12
The image was special in that the resulting Graphic's GetPrefMapMode().GetMapUnit() wasn't MAP_PIXEL. (cherry picked from commit 5ef0f1dc9a70c20fe6879832b782a0c34724353f) Conflicts: writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: I681e344a042721b99f6cb2e599f9c65156d219a4 Reviewed-on: https://gerrit.libreoffice.org/860 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2012-10-11n#783638 DOCX import of wp:inline's distT/B/L/R attributesMiklos Vajna1-9/+19
Change-Id: I181fcae021eed07608b06744b469628e4d78ccba (cherry picked from commit 847c5c1339bf0cfd9f3e3c92e8d81ef32bee6c21)
2012-10-10add editeng::ConvertBorderWidthFromWord:Michael Stahl1-65/+4
Replace the 2 duplicate implementations of this in ww8 and writerfilter with a common one. Differences were: 2) ww8 doubles the with, writerfilter does not 13) unsupported, mapped to THINTHICK_SMALLGAP vs. THICKTHIN_SMALLGAP 22) unsupported, mapped to DASHED vs. SOLID 26) INSET not supported in writerfilter 27) OUTSET not supported in writerfilter Change-Id: I533b77394388e736f38d70284a6a11061d81e813 (cherry picked from commit ecd70a727d7f559ebda1dd726cea1be472948270) Reviewed-on: https://gerrit.libreoffice.org/846 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-10-04fdo#44278: fix leaked image when import docxCédric Bosdonnat1-0/+4
Unused temporary XShape need to be disposed to avoid remaining garbage in the document. Change-Id: Iaf6e720a1c47605136f7f9ccafb605cab6dc260a (cherry picked from commit f1fc7c5655dde547b721b3afffabcd8bdbe0add2) Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2012-10-03probably a rather ugly hack for inline text frame in a table (bnc#780851)Luboš Luňák2-3/+17
Change-Id: I2bd76799cf0a5da09664d0e1b1a9adb466633be1
2012-10-02n#780563: Fixed table import in shapes table handler was missingCédric Bosdonnat1-0/+1
Change-Id: I7720cfc706d9612fcc1e8a53b13a31f22b91d99e
2012-10-02n#779627: fixed writerfilter import of grid when there are nested tablesCédric Bosdonnat2-12/+14
When a nested table is ended, it resets the m_nCell to 0... and thus the filter forgets about the previous cells of the outer table row it is importing. Using a vector to store the m_nCell values for each table solves the problem Change-Id: I8007960f4c95d713bfedc6b815d5783a5d25af23
2012-10-02n#779627: forgot to remove a debug fprintfCédric Bosdonnat1-1/+0
Change-Id: Idba155358166db358b0ef36b71a0bcf5abf77ce9
2012-10-02n779627: docx import of table styles, why not copy the ids?Cédric Bosdonnat1-1/+3
Change-Id: I72188eef689c656b56e2c19e60e0104a1e6d87bf
2012-10-02n#779627: added quite some compat options from the ww8 filter on writerfilterCédric Bosdonnat1-0/+14
Change-Id: I9e8dee39f63a08517eb654e33747bd8c95d84b59
2012-10-02n#775270: clip pictures instead of scaling they don't fitCédric Bosdonnat1-0/+1
Word clips pictures that are bigger than a page instead of scaling them down. This patch introduces a new compatibility option to allow clipping a picture in Writer instead of scaling it down. Conflicts: sw/inc/IDocumentSettingAccess.hxx sw/inc/doc.hxx sw/source/core/doc/doc.cxx sw/source/core/doc/docnew.cxx sw/source/filter/xml/xmlimp.cxx sw/source/ui/uno/SwXDocumentSettings.cxx writerfilter/source/filter/ImportFilter.cxx Change-Id: I4defbee05be81e23ec28a2ed272eaf4e4cc6faf5
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-19 03:38:18 +0000