summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-10-03Bump for 4.0-17suse-4.0-17Andras Timar
Change-Id: I725c090eee8094e85a64c18816af2ace8aaa010b
2013-10-02bnc#779620 DOCX import: try harder to convert floating tables to text framesMiklos Vajna
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 (cherry picked from commit bbef85c157169efa958ea1014d91d467cb243e6f) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx writerfilter/source/dmapper/DomainMapper_Impl.hxx
2013-09-22n#834720: Labels wrongly interpreted as dates.Muthu Subramanian
If the numFormat is available we should probably use that.
2013-09-22Bump for 4.0-16Andras Timar
Change-Id: Ia7d8e427295b813268b74a8cfb4b8a1e686aa3d8
2013-09-20bnc#825891 fdo#37606 SwWrtShell::SelAll(): fix for doc starting with tableMiklos Vajna
SwWrtShell::SelAll() can now detect if the body text starts with a table, and if so, it explicitly selects the whole document, not just the first cell of the starting table. Also, SwCrsrShell::EndAction() now checks for this "select all and doc starts with table" situation, and if that's the case, it activates a special select all mode, so layout can act accordingly. (cherry picked from commit 3b11e66ab89c201591d8be8f1ab1af1aba11a821) Conflicts: sw/source/core/crsr/crsrsh.cxx sw/source/core/layout/trvlfrm.cxx fdo#37606 SwWrtShell: fix select all when doc starts with table and cursor ... ... is outside that table (cherry picked from commit 4b6445dba6bb5b2aed3edb4878ecb327446286e9) fdo#37606 SwEditShell::DeleteSel(): handle document starting with a table If the whole document is selected and the document starts with a table, then we used to delete the contents of the document, except the starting table, which was just cleared. Change this and do what is expected: remove the table as well, so the document will have a single empty paragraph only. (cherry picked from commit 0fb4adcff534e3841cf6df0e2363fb0797af7022) Conflicts: sw/source/core/edit/eddel.cxx fdo#37606 SwEditShell: fix copying when doc starts with a table ... ... and the whole document was selected The problem is that the cursor starts at the first cell of the starting table, but when copying, we want to copy the preceding startnode and tablenode as well. (cherry picked from commit 49505336a629a75f4fb48bbe0c532b402e857ed4) fdo#37606 testcase (cherry picked from commit f5fa78d75abac3dbe0f9edf9e9106f63ca5dca53) Conflicts: sw/qa/extras/odfimport/odfimport.cxx Change-Id: I60d34906a90a5143163e516f618648cf7178430e Conflicts: sw/CppunitTest_sw_odfimport.mk sw/inc/viewsh.hxx sw/qa/extras/odfimport/odfimport.cxx sw/source/core/crsr/crsrsh.cxx sw/source/core/view/vnew.cxx
2013-09-11Bump for 4.0-15suse-4.0-15Andras Timar
Change-Id: Ibfb122a2034ab5362f0439c51280576912f48c2e
2013-09-11n#834722: Chart shown flipped.Muthu Subramanian
Auto and manual axis positioning seems to cause a problem. Needs to be tested with more charts.
2013-09-09Bump for 4.0-14suse-4.0-14Andras Timar
Change-Id: I358cb24d01ce33bc95f5b49611b34148195ca52e
2013-09-06bnc#779642 VML import: handle drawinglayer rectangle char spacingMiklos Vajna
Change-Id: I79fa72c9235682030d23a03fdb0c7c40370c4a8a (cherry picked from commit 4cbc41bc4eaa822829e68c1ee11eafe834bb7da7)
2013-09-06bnc#779642 VML import: handle drawinglayer rectangle insetMiklos Vajna
Change-Id: If8b064ca9a52bb02ff41f07e00142702a29df818 (cherry picked from commit 870a2394a87c77740daf41e1aa81b130113f8e00)
2013-09-06bnc#779642 VML import: import result of sdt fieldsMiklos Vajna
We can't have e.g. placeholder fields on drawinglayer rectangles, but at least the result of the field is now imported. Change-Id: I135f205c4231645f11f824495993c4dbea4135ed (cherry picked from commit 3847de4b724f4f435bb68bceef9a5e187c3f363c)
2013-09-06bnc#779642 fdo#46361 oox: handle w:color for groupshape textboxesMiklos Vajna
Change-Id: Ifcbf622a04a4b3f06d95c079d5e13ec3f505268f (cherry picked from commit ef53d4aec2a3d690de2c7cdaf73ca95bbe29a433)
2013-09-06bnc#779642 fdo#46361 oox: handle w:jc for groupshape textboxesMiklos Vajna
Change-Id: I21391d9a9f5b5173b599006287b33fdaab3c0c75 (cherry picked from commit 5a737fca37cd5a5f90aa03a30688d447677d3b8a) Conflicts: oox/inc/oox/vml/vmltextbox.hxx
2013-09-06bnc#779642 fdo#46361 oox: handle w:br for groupshape textboxesMiklos Vajna
Change-Id: Ib78891614256b197cefbe766a4a4a9c76219f1cf (cherry picked from commit b1f78c44c1acc246f06a963383232c9bf649a06b)
2013-09-06bnc#779642 fdo#46361 oox: handle multiple w:p for groupshape textboxesMiklos Vajna
One testcase had to be adjusted, as it seems previously we stripped all newlines at the end (I consider that as a bug), and now we only strip the last one (so the resulting number of paragraphs on the shape and in the source document equal). Change-Id: Ic22b96c2992b53c72e2609e2286622173b86065c (cherry picked from commit f24e4c74d7d6a7d95090c6fa6a584fed7787706c)
2013-09-06bnc#779642 VML import: fix TextHorizontalAdjust when layout-flow is verticalMiklos Vajna
The shape had no special properties about hori/vert text adjustment, so it should be hori left / vert top. Then it has vertical layout-flow, so vert should be top and hori should be right (vert was center). Change-Id: Ia89d8587b6a822ead45198dc5d1ba23907cc3567 (cherry picked from commit b10afb26296e33c77e94a6eda3f2c36c4d34c2aa)
2013-09-03Bump for 4.0-13suse-4.0-13Andras Timar
Change-Id: I9dfce7d5ece26409172d6e2e8cdd8aaa966e637a
2013-09-03fdo#68607 bnc#816593 DomainMapperTableHandler: don't always start a frameMiklos Vajna
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) (cherry picked from commit 78d1f1c2835b9fae0f91ed771fc1d594c7817502) Change-Id: If1bb4a8a3786aacd618585cf859b57ce9be85c51
2013-09-03bnc#816593 DOCX import: ignore page breaks in tablesMiklos Vajna
(cherry picked from commit 7d3778e0ef9f54f3c8988f1b84d58e7002d6c625) Conflicts: writerfilter/source/dmapper/DomainMapper.cxx Change-Id: Ibb250148d41d1929fa17dd993bb71c93c0e09dcf Conflicts: writerfilter/source/dmapper/DomainMapper_Impl.cxx
2013-09-03bnc#816593 DOCX filter: import paragraph spacing from table styleMiklos Vajna
(cherry picked from commit 17e904ed66c3caf87e658b9d3a18d7b13f4a0b52) Change-Id: I9dce59ecd8a2d2bfadb8c7273cd46c6c0cf17774
2013-09-03bnc#816593 DOCX import: fix auto table width wrt nested tablesMiklos Vajna
This is a backport of the fix + 3 other commits from master, which were needed to make the testcase pass on -4-1 as well. (cherry picked from commits 74c5ed19f430327988194cdcd6bdff09591a93fa, 824cc4bf4ae9035d4108e8da8e81eb57284f0b54, 53d27a30ce5f2c9f7d37a4089286116854c16215 and 76d1ca523ddcf89cc269fe51c70e66066943ef5a) Change-Id: I62a1f526cf1d4e4056daa1495d61f1b9f5c0b1b2 Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx writerfilter/source/dmapper/DomainMapperTableManager.cxx
2013-09-03bnc#816593 docx import: fix incorrect nested table marginsPierre-Eric Pelloux-Prayer
Change-Id: I07f0f47fcbd3d463d7831820cde338d8d59d9b68 (cherry picked from commit 194ba3a2cacbb5438dfcb8fb35167055e01ca251)
2013-09-03bnc#816593 DOCX import: let w:before not overwrite w:beforeAutospacingMiklos Vajna
And do the same for w:after / w:afterAutospacing. The spec says that if w:beforeAutospacing is read, w:before should be ignored, this implies that if we already had w:beforeAutospacing, w:before should not overwrite the already existing top margin. (cherry picked from commit de516780bf2d5f74afe643033bfc528c53013902) Conflicts: writerfilter/source/dmapper/DomainMapper.cxx Change-Id: I9437cb5c6fc352a360e27aa279d0a789706c5578
2013-09-03bnc#816593 DOCX import: fix auto para spacing without compat optionMiklos Vajna
Paragraph auto spacing (before and after) without the w:doNotUseHTMLParagraphAutoSpacing compat option was incorrect. (cherry picked from commit 279ff2e03371542d014bf281e73282ba8080cf6b) Conflicts: writerfilter/source/dmapper/DomainMapper.cxx Change-Id: I56d6153f7c489de7fceaf6fab7325c42ee8f9cae
2013-08-29make the tinderbox information more reliable in the about dialog (fdo#58034)Petr Mladek
Pass the information via config/config_buildid.h. Then cui/source/dialogs/about.cxx will get rebuilt also in the incremental build. Also allow to set EXTRA_BUILDID also via environment variable. This is much easier with tinderboxed that work with static autogen.input. Change-Id: Ic0b0d13f031c988c096bfd4533e650e245a0ad74 Reviewed-on: https://gerrit.libreoffice.org/5680 Reviewed-by: Luboš Luňák <l.lunak@suse.cz> Tested-by: Luboš Luňák <l.lunak@suse.cz>
2013-08-26bnc#834035 DOCX export: fix hyperlinks of illustration indexMiklos Vajna
We used to export raw Writer bookmarks, but that's not valid in OOXML. Instead, it has normal bookmarks around the sequence fields, so use them if they are available. Change-Id: I0ef2ff7967c2802b53752c9505ef6db4cc2b8265 (cherry picked from commit e9275c08acc2f4f1c925f78b56a1089515cd9a37) Conflicts: sw/source/filter/ww8/docxattributeoutput.cxx
2013-08-26bnc#834035 Introduce msfilter::util::findQuotedText()Miklos Vajna
This was in writerfilter, but we'll need it soon in sw as well, so move it down to msfilter. Change-Id: I8efe02b6bbe8f391d9e14857ed58dbae184d5632 (cherry picked from commit 750f0ebf97d19d1cf305dabe72d52ad6e90adf70) Conflicts: include/filter/msfilter/util.hxx writerfilter/source/dmapper/DomainMapper_Impl.cxx
2013-08-22bnc#835985: When printing handouts using the default, 'Order' did not count.Jan Holesovsky
"Left to right, then down" was the same as "Top to bottom, then right" when printing handout; set the 6 pages explicitly as the default. Change-Id: I4a5f58c8fcf2efdc85ad7bb23bde791c5fb87584
2013-08-22Bump for 4.0-12suse-4.0-12Andras Timar
Change-Id: I2289f47a27d50c0f6949d8f8b2a5ea38b943d4fe
2013-08-22n#831457: Placeholders text size is not correct.Muthu Subramanian
Placeholders (or shapes without text imported from the files) have wrong font size. This is because the size (and probably other text attributes) aren't applied from the mastertextlist to the shape itself.
2013-08-22Bump for 4.0-11Andras Timar
Change-Id: I4c2d47065d945050a20a01d1d03cd1d0092aa2d3
2013-08-16fix for bnc#834705 missing drop downs for autofilterNoel Power
After commit fc861c7088e9b639a1c2c80f8ba4535c798aeb34 there is now an order dependency, between any ScPatternAttr flags indirectly set and SheetDataBuffer::finalizeImport which sets the attributes directly for a column So the ATTR_MERGE_FLAG that has ScMergeFlagAttr ( and associated SC_MF_AUTO flag ) is scrubbed when by the direct writting of the attribute from SheetDataBuffer::finalizeImport -> Document::SetAttrEntries I've reordered that Table import here and split the finalize ( which happens before heetDataBuffer::finalizeImport ) so that the databaseranges which were created before sheet import still happens, the autofilter part of the import is now deferred ( until after SheetDataBuffer::finalizeImport ) Change-Id: I11bb45ee7b330760fd93ecca30b23399414ac3a7
2013-08-14w:spacing in a paragraph should also apply to as-char objects (bnc#780044)Luboš Luňák
Otherwise global w:spacing will be used even if overriden locally. Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx Change-Id: I01f0a3a323566f6e29faf73bf9d2ba874565eb42
2013-08-09n#816593: docx consecutive tables with different tblpPr needs to be splitCédric Bosdonnat
When importing docx with 2 <w:tbl> following each other, we have 2 possible behaviors: either merge them as one table as we did before or split them into two tables. The tables need to be split if they have different floating position properties. This required the ooxml tokenizer to repeat the table properties for each row of the table: or how would we know we don't need to split the table? The basic idea behind this hack is to temporarily store the table position and table properties before saving them. Thus we can compare them at the end of the row and decide to split the table or not. Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I2e3e70dfe7386090fe356575ee9d0e81aa031dc4
2013-08-08bnc#823651 WW8 import: fix paragraph style in empty first page headerMiklos Vajna
The problem was that the first page SwFmtHeader / SwFmtFooter wasn't created in case the header/footer text was empty, even if fTitlePage was set. (cherry picked from commit 4bc063090c06f0c34980a3852f684b42ab25c501) Conflicts: sw/qa/extras/ww8import/ww8import.cxx Change-Id: I5e58419161bcc663e2beb0338b95877469e0fd3c
2013-08-07avoid crash when no table grid is givenLuboš Luňák
The document may contain just <w:tblGrid/> and <w:tblW w:w="0" w:type="auto"/> . It appears we do not handle the auto width properly at all, but at least don't crash. Change-Id: Ibdc9d1ad69c13456acd347a151ec8739bcb98855
2013-08-07fdo#67498 RTF import: fix missing margins vs continuous section breaksMiklos Vajna
The document had 3 sections, separated by continuous section breaks. Previously only margins from the last section were imported, this way the first page had default margins. Now margins are also applied when we hit continuous section breaks. This way margin values from the last section break affecting the page wins. A later commit could improve this further by setting the minimum of these and setting a section margin for each non-minimal sections. Change-Id: I4d9a4585e795220533909bd1d467d933caaa0d71 Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
2013-08-07Bump for 4.0-10suse-4.0-10Andras Timar
Change-Id: I2122ef126835822b29f6eff2c36c9380b9676a79
2013-08-07compatibility setting for MS Word wrapping text in less space (bnc#822908)Luboš Luňák
The document itself is stupid and uses a SURROUND_THROUGH object with a number of empty lines that make it act is if it in fact was SURROUND_NONE, rather than actually disabling wrapping for the object and be done with it. But the difference was that Word still managed to fit those empty lines next to the object into the little space that was there, while LO already considered the space too small. So keep a compatibility setting for Word documents in order to avoid problems with such lame documents and hopefully that's enough. Change-Id: I7d17b90de381fd86914ce5efd9c5a29fe4850edc
2013-08-05fdo#66474 DOCX import: fix handling of mixed fixed/auto cell widthsMiklos Vajna
Instead of checking if any cells have fixed width, check if all calls have fixed with. Regression from 74c5ed19f430327988194cdcd6bdff09591a93fa. Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I58d3d16cbaa2c54a8a1ac309910336c72dcb39b7
2013-08-05Bump for 4.0-9suse-4.0-9Andras Timar
Change-Id: Icc9361fb59f2a22e25e21655352eb3e113d82dde
2013-08-05bnc#593612: workaround for grpFillFelix Zhang
Change-Id: Ib75f2e5e0d77b5a65c6d3d75e7dd477251948bcc (cherry picked from commit 3b35ad42ed8bea8cab32e2131c81b03c8347cb67) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2013-08-01DOCX import fix for table with auto sizeAdam Co
Reviewed-on: https://gerrit.libreoffice.org/4496 Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: Ic86f4f142e579bdef3e954492e1c1e382a545739
2013-07-24followup fix for bnc#823935 exported xlsx causes errors for mso2007Noel Power
previously we added 'file://' scheme to hyperlink urls detected as SMB but.. this is just how linux detects those windows share urls, on windows those urls are detected simply as FILE urls. So... we need to add the scheme if either FILE or SMB ( basically just relax the patch a little ) Change-Id: Ie9a2b0c9e297ee08352db88ad9a21583978dbe3d (cherry picked from commit 40dd3d6e4ed8ed6a2f1c3f953955f9932c0c95ce)
2013-07-18n#825976: Fixed missing part of conditionCédric Bosdonnat
Change-Id: Icc41828e3c2bd088fb5f7dd876f62c077ddf65ce
2013-07-18n#825976: Table of Illustration has hyperlinks by default like TOCCédric Bosdonnat
...and that fixes the formatting of hyperlinks in docx Tableoof Illustrations. Change-Id: I990f31a8c9d0d56f58b7b87e368010576d8c8c0d
2013-07-18n#825976: handle TOC \h field for illustrations tables in writerfilterCédric Bosdonnat
Change-Id: I9ebc91d5f0e706dc1e316e0aa8494af7aec4da4e
2013-07-18n#819822: XLSX Chart import with internal data table.Muthu Subramanian
When the import with xlsx ranges fail - try with internal data table. Ported from: 7da06efd74be6500895bab6e5e8ed485914ff45e and: da4ec594da45210a1f97d31ecb3e7f9c127954e5
2013-07-17fdo#39904, n#825976: implement hyperlinks for Illustrations indexCédric Bosdonnat
Change-Id: I6f682c382e7ab0e06259b335247fdcebd7412942
2013-07-17n#820077: Import images with duotone filter.suse-4.0-8Muthu Subramanian
Also, contains implementation for a simple duotone filter. (Port from commit: 8b716072410bcfd252739fb953d5ac198e27a895)
generated by cgit (git 2.34.1) at 2025-01-17 07:24:21 +0000