summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-10-08tweaks to Mac OS X configcp-4.0-17-1Andras Timar1-0/+3
Change-Id: I95ae32fa9fb811ee0a081a8e64a8fafa19b94461
2013-10-08set resolution of DMG folder background image to 72DPIAndras Timar1-0/+0
Change-Id: Iacfedb43e5333d98baf4d30ab69b0c85f47dbbf3
2013-10-07I don't know what we wantTor Lillqvist1-2/+3
Change-Id: Idf204c665f3656949817b3851957e21c05cd76b6
2013-10-04Bump for 4.0-17Andras Timar2-14/+14
Change-Id: I725c090eee8094e85a64c18816af2ace8aaa010b
2013-10-04bnc#779620 DOCX import: try harder to convert floating tables to text framesMiklos Vajna5-14/+54
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-10-04n#834720: Labels wrongly interpreted as dates.Muthu Subramanian1-3/+1
If the numFormat is available we should probably use that.
2013-10-04Bump for 4.0-16Andras Timar2-14/+14
Change-Id: Ia7d8e427295b813268b74a8cfb4b8a1e686aa3d8
2013-10-04bnc#825891 fdo#37606 SwWrtShell::SelAll(): fix for doc starting with tableMiklos Vajna12-6/+144
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-10-04Don't build helpTor Lillqvist1-1/+0
The construction of helppacks for OS X seems broken anyway, ERROR: Could not find Apple script osx_install_helppack.applescript! at .../solenv/bin/modules/installer/simplepackage.pm line 372. Change-Id: I8241705d7263bff9a32525916182536b71afec47
2013-10-04Nah, was not a good ideaTor Lillqvist1-0/+1
Change-Id: Ic7f463c99c97c907b0312d51465ea0d6e8a96ef1
2013-10-03Maybe we want helppack integration, let's tryTor Lillqvist1-1/+0
Change-Id: I322ce0c53df535a5e8a1528726baf4eb2f901df8
2013-10-03Don't build separate helppacks unless --without-helppack-integrationTor Lillqvist1-1/+1
Change-Id: I3c49f1190128bd062346ef75729595048a053d41
2013-10-03Use MD5SUM from the environment, not a hardcoded md5sum commandTor Lillqvist2-2/+2
Change-Id: Ic46319173e3893bed75d5d1469c8a17728bce2d3
2013-10-03We want a multilingual OS X app bundleTor Lillqvist1-12/+4
For the Collabora build, with just a limited set of UI languages, we don't want separate langpack installer apps. Change-Id: I8a8a958299df6714d9e5ccefa1eb92664a1e6e32
2013-10-03Corresponding change here, tooTor Lillqvist1-3/+0
Change-Id: If6ac1b2b85214bb84df75feeb4b95d51b049529e
2013-10-03remove ~un-used scripting language bits from config.Michael Meeks2-5/+0
Change-Id: I1db0351adb5bb20684871c8f4f840e6536b9eb5d
2013-10-03Add first draft of Collabora distro-config file for OS XTor Lillqvist1-0/+29
Change-Id: I88bae998946066d0a505c7cff06eb9cadcd4e7ed
2013-10-03Don't include X11 headers for OS XTor Lillqvist1-1/+1
Change-Id: I72e9568fe18eb412110384aab940da002140bf0b
2013-10-02fdo#58144 - disable the ARP 'Remove' button on Windows XPAndras Timar6-0/+6
Windows installer on Windows XP cannot display messages, when the installer database is encoded in UTF-8 and support for CTL languages is not installed. This patch is a workaround, it disables the 'Remove' button in Control Panel's Add or Remove Programs applet, so the user has to choose 'Change', and has to uninstall LibreOffice with the Wizard, which does not exhibit the problem. Initially this bug was not expected, when we changed the enconding from legacy codepages to UTF-8 - I would say irreversibly. Then the severity of the bug was underestimated, because usually uninstallation needs no user interaction, so it does not matter, if the text is unreadable. However, in some circumstances uninstallation needs to reboot the computer, and the user needs to understand the question, whether to reboot now or later. Change-Id: I7d6b4e82cbe4142d23c29313e43a90fa43944b2f
2013-10-02disable Liberation fonts on WindowsAndras Timar1-0/+3
Change-Id: Ida3e242fa6197d452cef66c692daf70efe3cbf5b
2013-09-29I forgot to add -d swith to signtoolAndras Timar2-26/+34
The UAC prompt shows a temporary random Program Name for msi, if the -d switch is not given. One more change: probably it is not wise to print the password of code signing key in clear text to log and to screen. Change-Id: I1f555754eee19708bbd7a3c70280fe662c77fc3a
2013-09-20change ARP support info data for Collaboracp-4.0-15-2Andras Timar5-25/+25
Change-Id: I5bfcb3bedf9f91b3e8a13911bfd047b5ed68587b
2013-09-19add Collabora EULAcp-4.0-15-1Andras Timar4-486/+254
Change-Id: I8df9623519d6d2ec294b32d6c3d0081c2c128700
2013-09-17Enable code signing on WindowsAndras Timar3-14/+63
Change-Id: I5538c56498e926504a0c2d217d0c69b94b1b1551
2013-09-16remove visible artifact from CP startscreen imageAndras Timar1-0/+0
Change-Id: Ic9787df11c30292aaa05ed241350be65da5d0c5d
2013-09-15add config file for Collabora Linux buildsAndras Timar1-0/+59
Change-Id: I0567d304b4e559d2e11f6a9c677930a368b79e70
2013-09-15Collabora brandingAndras Timar10-12/+322
Change-Id: I6d41e0e0331c0d57fe8b31931c070b0633dd3e63
2013-09-15build full installset instead of patchAndras Timar2-2/+2
Change-Id: I515d81a35659df36c90e40992fd0c21f59f0feaf
2013-09-15add config file for Collabora WIndows buildsAndras Timar1-0/+35
Change-Id: I3d33c53ab472ea96500c9c5d4940601f7e7dbf3d
2013-09-11Bump for 4.0-15suse-4.0-15Andras Timar2-14/+14
Change-Id: Ibfb122a2034ab5362f0439c51280576912f48c2e
2013-09-11n#834722: Chart shown flipped.Muthu Subramanian1-1/+2
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 Timar2-14/+14
Change-Id: I358cb24d01ce33bc95f5b49611b34148195ca52e
2013-09-06bnc#779642 VML import: handle drawinglayer rectangle char spacingMiklos Vajna5-0/+37
Change-Id: I79fa72c9235682030d23a03fdb0c7c40370c4a8a (cherry picked from commit 4cbc41bc4eaa822829e68c1ee11eafe834bb7da7)
2013-09-06bnc#779642 VML import: handle drawinglayer rectangle insetMiklos Vajna1-0/+9
Change-Id: If8b064ca9a52bb02ff41f07e00142702a29df818 (cherry picked from commit 870a2394a87c77740daf41e1aa81b130113f8e00)
2013-09-06bnc#779642 VML import: import result of sdt fieldsMiklos Vajna1-0/+5
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 Vajna2-0/+9
Change-Id: Ifcbf622a04a4b3f06d95c079d5e13ec3f505268f (cherry picked from commit ef53d4aec2a3d690de2c7cdaf73ca95bbe29a433)
2013-09-06bnc#779642 fdo#46361 oox: handle w:jc for groupshape textboxesMiklos Vajna4-14/+60
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 Vajna1-0/+3
Change-Id: Ib78891614256b197cefbe766a4a4a9c76219f1cf (cherry picked from commit b1f78c44c1acc246f06a963383232c9bf649a06b)
2013-09-06bnc#779642 fdo#46361 oox: handle multiple w:p for groupshape textboxesMiklos Vajna4-1/+15
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 Vajna4-0/+32
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 Timar2-14/+14
Change-Id: I9dfce7d5ece26409172d6e2e8cdd8aaa966e637a
2013-09-03fdo#68607 bnc#816593 DomainMapperTableHandler: don't always start a frameMiklos Vajna6-1/+44
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 Vajna7-1/+45
(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 Vajna3-0/+49
(cherry picked from commit 17e904ed66c3caf87e658b9d3a18d7b13f4a0b52) Change-Id: I9dce59ecd8a2d2bfadb8c7273cd46c6c0cf17774
2013-09-03bnc#816593 DOCX import: fix auto table width wrt nested tablesMiklos Vajna8-11/+80
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-Prayer1-1/+3
Change-Id: I07f0f47fcbd3d463d7831820cde338d8d59d9b68 (cherry picked from commit 194ba3a2cacbb5438dfcb8fb35167055e01ca251)
2013-09-03bnc#816593 DOCX import: let w:before not overwrite w:beforeAutospacingMiklos Vajna1-2/+4
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 Vajna1-4/+3
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 Mladek6-8/+22
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 Vajna2-0/+39
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