AgeCommit message (Collapse)AuthorFilesLines
2013-11-26EMF+: Parse and render custom line cap data.libreoffice-4-0Jan Holesovsky2-33/+290
Contains the following commits: * EMF+: Small cleanup & more logging in preparation for line starts & ends. * EMF+: Parse custom line cap data for start and end line caps. * EMF+: Render custom line cap data. * EMF+: Set the stroke attributes on the custom line caps. Change-Id: If35ef1c44f34f5d5e6c50789c907105d03e96fca Reviewed-on: Reviewed-by: Andras Timar <> Tested-by: Andras Timar <>
2013-11-26EMF+: Implement line dashing.Jan Holesovsky1-2/+49
Conflicts: cppcanvas/source/mtfrenderer/emfplus.cxx Change-Id: I9eb21c0a8b5baa5b0080845f61b12fc65034d959 Reviewed-on: Reviewed-by: Andras Timar <> Tested-by: Andras Timar <>
2013-11-26fdo#61272: Do the mapping correctly both for WMF and EMF.Jan Holesovsky4-58/+123
Turns out that for the WMF, we already had everything set up correctly, we were just overwriting the right settings with default data again :-) - fix that. Includes the following commits: * Revert "wmf-mm-text-1.diff: Fix WMF rendering, n#417818" * Revert "wmf-mm-text.diff: Fix WMF rendering, n#417818" * fdo#56886 EMF: Fixes some scaling problems of clipped regions, Twips Change-Id: I14b0c12b10f58eb7031f9da712dee76344c75159 Reviewed-on: Reviewed-by: Andras Timar <> Tested-by: Andras Timar <>
2013-11-26EMF+: Stroke size is always supposed to be absolute.Jan Holesovsky1-1/+1
Conflicts: cppcanvas/source/mtfrenderer/emfplus.cxx Change-Id: I7221311e5dee6384dc2d1c071bf6f1c61811895a Reviewed-on: Reviewed-by: Andras Timar <> Tested-by: Andras Timar <>
2013-10-29i123485 secured file import scanning existing pagesArmin Le Grand1-4/+11
(cherry picked from commit 04b38114b0ca4be9895d8f9fa842b6cb390c8036 and adapted to the rewritten scanBuildPageChainCache) Reviewed-on: Reviewed-by: Michael Meeks <> Tested-by: Michael Meeks <> (cherry picked from commit dfa1afd0e8b7ae9c706c4a3171a04752e24230b0) Conflicts: sot/source/sdstor/stgstrms.cxx Change-Id: Ib90d0563be5aeb69aa14c28b3304e42f3cc46162 Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>
2013-10-29fdo#33798 msidbFeatureAttributesUIDisallowAbsent for hidden feat.Andras Timar1-0/+1
Change-Id: I0c8788f88b3c219e789af7f8bfa79e5dd31c5b3a Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2013-10-17fdo#70319 "exponent followed by at least on digit" also for special case 0.0Stephan Bergmann2-0/+10
(cherry picked from commit 7bbd58eafc3146abcefc73d2d1ca6869bb47ef5a) Conflicts: sal/rtl/math.cxx Change-Id: I07e7917417b8a22cf6d64f2b7a447f9084b9fa2d Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>
2013-10-17Resolves: rhbz#1015594 CVE-2013-2924 use-after-freeEike Rathke2-0/+44
Added icu4c.10318.CVE-2013-2924_changeset_34076_icu-49.patch from assigned to Backported to 4-0 and ICU 49 from 970eca0d3040dbf61a9c91943b4b1281fdbcf48c Change-Id: I33ba5569919878123909d032a0ed7bed43a4c549 Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2013-10-15resolved fdo#70319 exponent must be followed by at least one digitEike Rathke2-0/+18
Change-Id: Icdd22fa0f1efcdd18cfea7cb48e1cbf2cf8d3533 (cherry picked from commit f20feba4c43c34fd2ee05b4658b0de0248c08eb9) Reviewed-on: Reviewed-by: Michael Stahl <> Tested-by: Michael Stahl <>
2013-10-15CID#736943 clamp no of ttc entries to physical maxCaolán McNamara1-0/+33
Change-Id: Ic63defe9c14c6ee2b86bd5b7730a570238ca3981 (cherry picked from commit 225539ab08043b6937fdd67d9ae308ebd4104646) Reviewed-on: Reviewed-by: Michael Stahl <> Tested-by: Michael Stahl <>
2013-10-14fdo#67796: sw: fix table cursor when setting language in status barMichael Stahl1-5/+11
Unfortunately it turns out that the neat hack in commit b227a8e4d65e4bbfe991aed9342fe3e30eca8639 does not work unless something actually _deletes_ the current m_pTblCrsr between Push() and Pop(), e.g. by calling SwCrsrShell::ClearMark() or KillPams(). It would be possible to do some invalidation of m_pTblCrsr in SwCrsrShell::ClearUpCrsrs() or UpdateCrsr(), to set it's bChg flag or perhaps call ParkTblCrsr(); not sure if doing that is an improvement; certainly it shouldn't be tried in a 4.0.6 backport. So work around the problem locally in SwTextShell::Execute(). Conflicts: sw/source/ui/shells/textsh1.cxx Change-Id: I2981506b3065e824532deda28d21dad4a5734a8c (cherry picked from commit 9533e01713c0170bdae030429de38756d9c5ca74) Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2013-10-14fdo#64495: sw: fix regex search for soft hyphen \xADMichael Stahl1-2/+7
The problem is that the soft hyphen apparently needs special handling, and SwPaM::DoSearch() looked for the no longer supported legacy syntax, not for any of the unicode character syntax that ICU regex supports. Conflicts: sw/source/core/crsr/findtxt.cxx Change-Id: I754296d2cf9286242e083cc7906ce3b8fda78dd5 (cherry picked from commit dca5163b6ef206ceb1f2d56feb7546c1929afe60) Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2013-10-13fixed another "Out of bounds substring access"Eike Rathke1-6/+5
Introduced with 3c2a26c84e70fd996855181d319970e2230b2459 Didn't have consequences here because the result was used to check for a "startsWith" condition which it wouldn't had matched anyway. However, use the real startsWith() now. (cherry picked from commit b1caf176a44b6979d2e0ea47f495a3dacf86e197) With 5688ab5ba457ea9a50152570d161a11a1d093994 in 4-0 we should have this as well. Conflicts: sc/source/ui/docshell/tablink.cxx Change-Id: Ia1d558fc106d9a2010ad41c30f7eb2a2a480c59b Reviewed-on: Reviewed-by: Markus Mohrhard <> Tested-by: Markus Mohrhard <>
2013-10-11Fail fast at least in debug buildsStephan Bergmann1-1/+1
(cherry picked from commit 57a28dc9556b4e6fff337e0eb9d0d8abc5223161) Conflicts: sal/rtl/strtmpl.cxx Change-Id: I266d5cf5b98827617f7ed65c94a772e28808f386 Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>
2013-10-11fdo#70143: fix SwDoc::ReplaceRangeImpl()Arnaud Versini1-3/+9
Fix fdo#70143 by reporting swaping of positions (regression from 6b08fe833186a04f9aef698a540d3a7493ac4519, which changed SwUndoReplace::Impl::SetEnd to use the wrongly set end position in rPam) Change-Id: I14c6f58bc5c1418c69eb565d42f1829856eed58c (cherry picked from commit 9685d20f2a0526a4c454cea1bd947eccbaeefa84) Fixes regex replace of "$" with nothing (to delete line breaks). Change-Id: If7ec1e5f524f7bb308a2949ace16cb8aa6989106 (cherry picked from commit f011a5c5071ed4a60f0ee7117608b72cecbb958d) Reviewed-on: Reviewed-by: Arnaud Versini <> Tested-by: Caolán McNamara <> Reviewed-by: Caolán McNamara <>
2013-10-11resolved fdo#69948 honor a detected FilterNameEike Rathke1-6/+25
TypeDetection::queryTypeByDescriptor() adds the FilterName property to the MediaDescriptor, use that if present. Strangely enough the sequence returned by XNameAccess::getByName(sType) of the type detection contains an empty PreferredFilter value so that is useless in this scenario. (cherry picked from commit 823278dd095d754d0f673ef140c36c9fa7ebeffd) Conflicts: sfx2/source/appl/fileobj.cxx Backported. Change-Id: I5cdc9fe71e35bdb7c511739c7f7728134941649a Reviewed-on: Reviewed-by: Kohei Yoshida <> Tested-by: Kohei Yoshida <>
2013-10-10Updated coreAndras Timar1-0/+0
Project: dictionaries 009e9843e39257dcfe065bbaa48833710dcbcea3 updated pt dictionary Change-Id: I9380049c2e0b6716287c71aa2693f40dc78facf6 Reviewed-on: Reviewed-by: Norbert Thiebaud <> Tested-by: Norbert Thiebaud <>
2013-10-09CID#736174 yikes, sizeof(char[]) includes 0, so 4 not 3Caolán McNamara1-1/+1
Change-Id: Ia54ecab9e08485ebffe98dc064f328360c17a120 (cherry picked from commit 8254648828e4f4d65a0516e160e5732f3d85765a) Reviewed-on: Reviewed-by: Michael Stahl <> Tested-by: Michael Stahl <>
2013-10-09fdo#64400: DXF import filter: fix OUString handlingMichael Stahl9-126/+110
The DXF import filter stores all strings read from the file in char[DXF_MAX_STRING_LEN+1] arrays, and then calls OUString constructor with that which then asserts because the string is actually shorter than the size of the array... avoid that by converting from char* to OString. Actually this also fixes the actual bug: the weird lines in the exported PDF were tiny Text elements from the document, repeated. (cherry picked from commit 96852a89da058084b2acf5ff706d9679b127b29a) Conflicts: filter/source/graphicfilter/idxf/dxf2mtf.cxx filter/source/graphicfilter/idxf/dxfblkrd.hxx filter/source/graphicfilter/idxf/dxfentrd.hxx filter/source/graphicfilter/idxf/dxftblrd.hxx Change-Id: I93c52788f88fe5d21968d450d029ed5db101d88b Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2013-10-09fdo#52004 set resolution of .dmg background image to 72DPIAndras Timar1-0/+0
Apparently Mac OS X looks at the DPI value, not to the actual pixel size of the image. Change-Id: I9fd43228e4d2e05397f798ed4902d7d80ef2145f Reviewed-on: Reviewed-by: Tor Lillqvist <> Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2013-10-08fdo#62994 reportbuilder survive empty formulaLionel Elie Mamane1-0/+2
Change-Id: I1da053871d107730ad9a135deb48313d8a877d89 (cherry picked from commit 0089d3ae9442f26695ae742f5fbdeeaf698861f2) Signed-off-by: Michael Stahl <>
2013-10-08WaE [-Wstrict-overflow] assuming signed overflow does not occurEike Rathke1-2/+2
... when assuming that (X - c) <= X is always true ... or that (X + c) < X is always false Change-Id: Ib2313827cd6358ced0141b41cba753896b676e28 (cherry picked from commit ca576e0804324bbb36b697543cbe992e34d4b951) Reviewed-on: Reviewed-by: Michael Stahl <> Tested-by: Michael Stahl <>
2013-10-07fdo#70196: Python 2 compatibility for UNO import error handlingDavid Bolen1-8/+9
Add backwards compatibility support for Python 2 to the earlier change in fdo#66025 to improve import error handling under Python 3. Change-Id: I47bf8ef255c4c2a3e4a2754414977aaa8ed32483 Signed-off-by: Stephan Bergmann <> (cherry picked from commit df1076965f63eedc6cc104c96b993ab598b8b1d4)
2013-10-04Resolves: #i123417# handle subsetting of empty ttf compound glyphs gracefullyHerbert Dürr1-2/+5
(cherry picked from commit d519b07ecd4b67cedf1fe3e1860ef33a48a01ae4) Signed-off-by: Caolán McNamara <> Conflicts: vcl/source/fontsubset/sft.cxx Change-Id: I51d4a97f1f01be49cb5ab058019cd153e23437bd (cherry picked from commit 6489f97fc428446c53c17f885963776cdcc21490) Signed-off-by: Caolán McNamara <>
2013-10-04fdo#69384 fix impress -> writer copy&pasteMiklos Vajna3-2/+40
Regression from 2ade07126971b79c92f729fae5709f2e2e2b495c (fdo#62044 RTF import: don't overwrite existing styles when pasting, 2013-06-04), during paste, if existing style was found, then the intention was to skip that style, but instead we tried to create one. (cherry picked from commit 5ebe826caf75e8d00656b3333385bf0bbc05cb27) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx writerfilter/source/dmapper/StyleSheetTable.cxx Change-Id: I83adaf9fe6b8a578fa60c21b9463fabde7707d7e Reviewed-on: Reviewed-by: Michael Stahl <> Tested-by: Michael Stahl <>
2013-10-04fdo#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 Reviewed-on: Reviewed-by: Michael Stahl <> Tested-by: Michael Stahl <>
2013-10-03Updated coreNagy Akos1-0/+0
Project: dictionaries 2eadd8dc30f766ddf6975a435b47b4ec7502f51d
2013-10-03Resolves: rhbz#1013844 fdo#47482 encrypted OOo 1.0 docs cannot be reopenedCaolán McNamara3-5/+39
Workaround for the encrypted 1.0 documents generated by Libreoffice <= 3.6 with the new encryption format and using SHA256, but missing a specified startkey of SHA256 Change-Id: Ib1acc4441b5adc6721cb3cde7a1191aa978e9a1b (cherry picked from commit 11ad93f4ba84f190c908e92a2c960f7a9fa800c0) Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2013-10-02rhbz#1014010: Missing dependencies in isBootstrapType listStephan Bergmann1-24/+28
...the list has been fixed now by copying its elements into an ENTRIES file and running "unoidl-write udkapi/ @ENTITIES TEMP && unoidl-read TEMP >/dev/null" and adding any reported unknown entities until it succeeds. However, the updated list lead to deadlock when css.reflection.ParamInfo UnoType resolves css.reflection.XIdlClass UnoType resolves css.reflection.XIdlMethod UnoType resolves css.reflection.ParamInfo UnoType, so broke the circle by no longer resolving the interface methods' return and parameter types in InterfaceType::dumpMethodsCppuDecl (which is why those type infos are only generated on demand anyway; looks like this had been a careless thinko in the generation of comprehensive type info that had remained unnoticed all the time). (cherry picked from commit 254f59f623f58c320175a06a2c93bcee7868b623) Conflicts: codemaker/source/cppumaker/cpputype.cxx Change-Id: I50ef2fde16242298e055c6fa5971e70fad1a2b68 Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2013-10-01bump product version to, reset number to 0Christian Lohmaier2-21/+21
Change-Id: I19edf97ee1e4011c953cac7c63acb0c2ce4e8559
2013-10-01bring helpcontent2 to libreoffice-4-0 branchChristian Lohmaier1-0/+0
Change-Id: I0aaa58ba4ac11d56a2ea8203bf16c3f4c782d2dc
2013-10-01Updated coreChristian Lohmaier1-0/+0
Project: translations 06359830b9ee9f304f01ccd9e2fe063c6d256b08
2013-10-01All the content of cppuhelper/source/compat.cxx must be in namespace cppuStephan Bergmann1-0/+4
(cherry picked from commit 69f1846f4095a9dc607a0e568980d8625d657c94) Conflicts: cppuhelper/source/compat.cxx Change-Id: I30dde10d1c299dbd9c0b2cb2fa025ce432df6cce Reviewed-on: Reviewed-by: Michael Stahl <> Tested-by: Michael Stahl <>
2013-09-30fdo#69450 - IDF_ATTRIB & IDF_CONTENTS must be disjoint.Michael Meeks1-1/+1
Change-Id: Ib971824a7f274334012b872acec65310535ad767 Signed-off-by: Markus Mohrhard <>
2013-09-23fdo#54686 Treat hard blank as soft blank in numberLaurent Balland-Poirier2-10/+11
AutoCorrect option "Add non-breaking space in French..." insert non-breaking space (hard blank) and avoid recognition of percent number and time number. This patch treats hard blanks as soft blank in number format recognition Rev.#1: change #define to const variable. Same change in svxaccor Rev.#2: improvements Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <> (cherry picked from commit 2f4d7eacabd62db35777682bcca353e142e024bf) Conflicts: editeng/source/misc/svxacorr.cxx svl/source/numbers/zforfind.cxx (cherry picked from commit 1ca4b1bae11704a1119a9c680c6ae5b85ea1b31e) Signed-off-by: Eike Rathke <> Conflicts: editeng/source/misc/svxacorr.cxx Change-Id: I30c2c36778cb53a0238a0829043dad4d709f97d2
2013-09-19Resolves: fdo#69220 crash in doc (ww6)Caolán McNamara1-1/+15
Change-Id: I5a09d121a0b0342f28ba5d2d39027b27e9c9eba2 (cherry picked from commit 2e93541d00f9d4aaa6ad2aeb35ee0c901d216cc0) Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2013-09-19Resolves: fdo#67697 source formatting option list in autocorrectCaolán McNamara2-4/+19
regression from 0513e10635c85fc1aa214948de4992d4b76d555c "fdo#49350 Speedup "OK" action of auto-correct dialog" (cherry picked from commit 95e566b9a0df06d130e118181058273f034bcf2c) Conflicts: cui/source/tabpages/autocdlg.cxx Change-Id: Iede6063729433beb3ac50dbdb45230c1d774cea0 Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2013-09-19Resolves: fdo#34987 skip autoheight reset if it will be set to the same valueCaolán McNamara1-2/+43
Triggered by aa9af08b389a106fcfb53842ac7669b208a27205 which explicitly sets rSet.Put( SdrTextAutoGrowHeightItem(FALSE) ); so there is something set on the style which is being overwritten. The code here resets the style to the default of "true" before going on to set it to the explicit "false" again. In that window of time the master shapes listen to the property change, on being set to autoheight they resize and on being unset, they remain stuck on their autoheight calculated size. Reviewed-on: Reviewed-by: mhofmann <> Reviewed-by: Thorsten Behrens <> Tested-by: Thorsten Behrens <> (cherry picked from commit 14e7a290dab7fead66ef6ff7f94c6a425d80ceb6) Conflicts: xmloff/source/draw/ximpstyl.cxx Change-Id: I567a791b2bbbcb3a1a111633fabf509142984645 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <> (cherry picked from commit 0964a73d03bf9f5b9f485ff39f97c7e7b54339b3) Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2013-09-19fdo#41833: fix visual cursor position after resizingIvan Timofeev1-1/+1
SetOutputArea updates a cursor position, SetVisArea doesn't => call SetOutputArea after SetVisArea. Change-Id: Ie8f079cb3d567f759c84587a8072b98fab43588b (cherry picked from commit ddbcb6687722314b37cfda3170596ac7a4f69602) Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2013-09-18fdo#40100 make function YEARFRAC comply with ODF Version 1.2Lionel Elie Mamane1-20/+52
example of wrong result: =YEARFRAC(DATE(2023;1;1);DATE(2024;1;1);1) Pretty much by definition, this should be exactly 1, but it currently returns slightly less. Change-Id: I5ebb2ecde49dfca8a6191d2a7c11b9581669f455 Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>
2013-09-17fdo#64455 Handle unknown color in color lineLaurent Balland-Poirier1-1/+37
Change-Id: Ice4205056cc64ae50bd3c8136aeae6f648adbd0b Signed-off-by: Ivan Timofeev <>
2013-09-17fdo#68874: Highlighter icon doesn't change color if no text is selectedIvan Timofeev1-1/+1
the problem is that bChoiceFromPalette becomes false too early when StateChanged is called with nSID=SID_ATTR_CHAR_COLOR_BACKGROUND_EXT (we don't handle it in the switch) and the following call with nSID=SID_ATTR_CHAR_COLOR_BACKGROUND (which we actually want to handle) is no-op. Change-Id: I024f6a443535411648bda44576e838c3d863e7de (cherry picked from commit 1d0e18703523139e5fd6d11b6f3d72bb0b368036) Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2013-09-16fdo#69091: Copying data from Base-table to Calc by drag and dropJulien Nabet1-1/+1
Depending on whether the data source is registered, either rDescriptor[svx::daDataSource] or rDescriptor[svx::daDatabaseLocation] will be filled in (and should be used). Luckily, ODataAccessDescriptor provides a utility function that will automatically return the one that is set. Use that instead of hardcoding svx::daDataSource. Thank you Lionel! Change-Id: I02673e7924c4323915dea579015326194c3f5077 Reviewed-on: Tested-by: Lionel Elie Mamane <> Reviewed-by: Lionel Elie Mamane <>
2013-09-15fix for fdo#69173 crasherNoel Power1-0/+3
the layout changes for the basic IDE ( for the object browser and object catalog ) seem flacky, I have seen since those changes have been introduced some strange ( but random ) behaviour ( like the odd unrepeatable core ( maybe related to this ) and also sometimes Modules appearing in the tree under the wrong nodes etc. I'm no expert in the basic IDE code but this patch seems to fix the problem. However there is one drawback, in the core inducing scenario the tree view ( object catalog ) dissappears, this is because the patch suppresses the problematic layout in this case ( as the layout seem not to be currently able to deal with 'no-existent' (recently) deleted current window ) Probably in this scenario a fallback currentwin (instead of nil) could be set this would behave better but ideally. Ultimately the layout class should probably be modified ( possibly redesigned ) Change-Id: I9d1e23bd6fc4aae32aa78da8278c318f7051136a
2013-09-11CID#736212 clip word 2 pap boundsCaolán McNamara6-1/+13
and add a unit test for the word 2..5 formats (cherry picked from commit 5d8a9d56de7c1217cfdbe2288c1a3a9128c3dbb5) Conflicts: sw/qa/core/filters-test.cxx Change-Id: I6c7c26be6092acbb81282080de6c393d92ad5dd4 Reviewed-on: Reviewed-by: Michael Stahl <> Tested-by: Michael Stahl <>
2013-09-09Work around GCC 4.8 -Werror=format= in python3Stephan Bergmann2-0/+16
...complainging that "‘PyArg_ParseTuple’ is an unrecognized format function type." Change-Id: I125af6669010c4c9c1a18cc7c1a4895acc89338b (cherry picked from commit c6cfd44717643b0630b5f8fd3262c243fdaaf239)
2013-09-06fdo#68313 fix combining diacritics problem with Graphite fontsLászló Németh2-3/+3
Change-Id: I042a32cc9c025efcd25ccf95427bee5d6d4024fb
2013-09-06Resolves: fdo#68081 why would I want a spinner that doesn't repeatCaolán McNamara1-1/+1
surely WB_SPIN should imply repeat in the first place, *shrug* Change-Id: I1e4cb5a01d473cd0f8d907d566cd26d51a81da93 (cherry picked from commit f96771165ea145a759f1bab76cd34bb70def04f6) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-09-05Consistently use rtl_getAppCommandArg hereStephan Bergmann1-1/+1
...2a9c1d1a75b7d4e79dfbc6be3dada1a1e959e58e "Make dialogs fail with an exception in headless tests" missed one of the osl_getCommandArg calls, which can lead to problems when there are any -env: arguments preceeding the --display argument. Reported by renduly on IRC. Change-Id: I98dd24be840d561dce51034088f3e44adff9f2ff (cherry picked from commit 379a53017447fbf2a459f82ae8905b6683e80e8d) Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2013-09-03fdo#68839: ODF import: fix name of multi-image frameMichael Stahl4-7/+34
When multiple image child elements are inside a frame, each one is imported and gets unique name via SwDoc::SetFlyName(). But the retained one is not necessarily the first one, which is the only one that may have the original name. Also the solveMultipleImages needs to return a smart pointer, as nothing else keeps the image contexts alive. (regression from 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70) (cherry picked from commit b69d152cfa1da868ba960345d72ba78f9f8e1b35) Conflicts: xmloff/source/core/xmlmultiimagehelper.cxx xmloff/source/draw/ximpshap.cxx xmloff/source/text/XMLTextFrameContext.cxx Change-Id: I28a8a752f3eed176cc2ebb4c9af11a0dd4d18ea6 Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>